diff --git a/share_project/src/main/resources/static/css/head-pic.css b/share_project/src/main/resources/static/css/head-pic.css
index 6c0f67b7bd10b757e9e20594ed435f6a1477b681..e80d088511bb88621cead750bd771ac2349414a7 100644
--- a/share_project/src/main/resources/static/css/head-pic.css
+++ b/share_project/src/main/resources/static/css/head-pic.css
@@ -9,7 +9,7 @@
   border-radius: 50%;
 }
 .username{
-  margin-left: -9px;
+  margin-left: 3px;
 }
 .female{
   position: absolute;
diff --git a/share_project/src/main/resources/static/css/person-center-modify.css b/share_project/src/main/resources/static/css/person-center-modify.css
index 0dd69c825ef686083e801104b9b88cf529633732..b90af3bf7661d04f3a1fc766be3d3c1ce02d26c7 100644
--- a/share_project/src/main/resources/static/css/person-center-modify.css
+++ b/share_project/src/main/resources/static/css/person-center-modify.css
@@ -16,6 +16,23 @@
   top: 25px;
   left: 43px;
 }
+.changeHeadpic{
+  position: absolute;
+  top: 25px;
+  left: 43px;
+  width: 88px;
+  height: 88px;
+  border-radius: 50%;
+  background-color: rgba(77, 77, 77, .5);
+  cursor: pointer;
+}
+
+.changeHeadpic span{
+  position: absolute;
+  top:33px;
+  left:12px;
+  color: #f9f8f7;
+}
 .user-table1 {
   position: absolute;
   top: 140px;
diff --git a/share_project/src/main/resources/static/person-center.html b/share_project/src/main/resources/static/person-center.html
index 03a6719dffb7fdccfe79bb75541992a9662c611c..5e72c4b270933f0ba3611ca359f8429bcaf12f99 100644
--- a/share_project/src/main/resources/static/person-center.html
+++ b/share_project/src/main/resources/static/person-center.html
@@ -5,21 +5,6 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<<<<<<< HEAD
-  <title>Document</title>
-
-
-  <link rel="stylesheet" href="../static/css/base.css">
-  <link rel="stylesheet" href="../static/css/individual-home copy.css">
-  <link rel="stylesheet" href="../static/css/person-center-material.css">
-  <link rel="stylesheet" href="../static/css/person-center.css">
-  <link rel="stylesheet" href="../static/css/person-center-modify.css">
-  <link rel="stylesheet" href="../static/css/head-pic.css">
-  <link rel="stylesheet" href="../static/css/project.css">
-  <link rel="stylesheet" href="../static/css/account.css">
-
-  <link rel="stylesheet" href="../static/css/private-setting.css">
-=======
   <title>个人中心-最share</title>
 
   <link rel="icon" type="image/x-icon" href="images/favicon.ico">
@@ -33,7 +18,6 @@
   <link rel="stylesheet" href="css/account.css">
   
   <link rel="stylesheet" href="css/private-setting.css">
->>>>>>> master
 
   <script src="js/vue.js"></script>
   <script src="js/vue-router.js"></script>
@@ -51,7 +35,7 @@
       <img :src="userPicture" alt="" class="pic2">
       <span class="female" v-show="sex==0">♀</span>
       <span class="male" v-show="sex==1">♂</span>
-      <h3 class="username">username</h3>
+      <h3 class="username">{{username}}</h3>
     </div>
 
 
@@ -406,7 +390,8 @@
         province:"",
         city:"",
         university:"",
-        major:""
+        major:"",
+        ishover:0
       }
     },
     watch:{
@@ -450,6 +435,10 @@
         this.school = this.school.toString()
         this.certificate = this.certificate.toString()
       },
+      showHeadpic(index){
+        this.ishover = index
+      },
+      
       clicksave() {
         this.tostring1()
         console.log(this.school)
@@ -478,7 +467,10 @@
 
     },
     template: `<div class="modify">
-      <img :src="img" alt="" />
+      <div @mouseenter="showHeadpic(1)" @mouseleave="showHeadpic(0)">
+        <img :src="img" alt="" />
+        <div class="changeHeadpic"  v-show="ishover==1"><span>更改头像</span></div>
+      </div>
 
       <div class="user-information-change">
         <ul class="user-table1">
@@ -569,7 +561,7 @@
         name: "",
         sex: 1,
         telephone: "",
-        school: "",
+        qualification: "",
         certificate: "",
         profile: "",
         username:"xiejiahao",
@@ -825,6 +817,7 @@
           console.log(res.data.data.userPicture)
           this.userPicture = res.data.data.userPicture
           this.sex = res.data.data.sex
+          this.username = res.data.data.username
         })
       }