diff --git a/share_project/src/main/resources/static/browse.html b/share_project/src/main/resources/static/browse.html
index 30f306c4147a920c200945ed3b4389f84583fc83..13f629c7e681a2770a1b36c5b0c9af99fe13749a 100644
--- a/share_project/src/main/resources/static/browse.html
+++ b/share_project/src/main/resources/static/browse.html
@@ -19,9 +19,11 @@
     <!-- 顶部 -->
     <div class="large">
         <header id="nav" v-cloak>
-            <div class="logo">
-                <img src="images/logo.png" alt="">
-            </div>
+            <a href="/share/index.html">
+                <div class="logo">
+                    <img src="images/logo.png" alt="">
+                </div>
+            </a>
 
             <div class="choice">
                 <a href="/share/browse.html?type=search&key=">
diff --git a/share_project/src/main/resources/static/css/browse.css b/share_project/src/main/resources/static/css/browse.css
index ea4f7b00a903085adc33f3d0c329c2496572bd1c..6d91bf04d96f9ac71d2a44790a35cb5418a04a1f 100644
--- a/share_project/src/main/resources/static/css/browse.css
+++ b/share_project/src/main/resources/static/css/browse.css
@@ -169,7 +169,7 @@ textarea {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
@@ -631,17 +631,17 @@ input:-ms-input-placeholder {
 
 .pjname {
     width: 320px;
-    height: 21px;
+    height: 24px;
 }
 
 .price {
     width: 164px;
-    height: 21px;
+    height: 24px;
 }
 
 .place {
     width: 164px;
-    height: 21px;
+    height: 24px;
 }
 
 .type {
@@ -667,7 +667,7 @@ input:-ms-input-placeholder {
 
 .skill {
     width: 470px;
-    height: 21px;
+    height: 24px;
 }
 
 .bonus {
@@ -718,7 +718,10 @@ input:-ms-input-placeholder {
 
 .bottom {
     height: 100px;
+    width: 100%;
+    float: left;
     text-align: center;
+    margin-top: 24px;
 }
 
 .projectInfo {
diff --git a/share_project/src/main/resources/static/css/chats.css b/share_project/src/main/resources/static/css/chats.css
index 8de2e291e89bc9fb81fc3de53e9a8e94f5c97fcd..491aaa181792ea979453a237aaf960ef2d22fd3e 100644
--- a/share_project/src/main/resources/static/css/chats.css
+++ b/share_project/src/main/resources/static/css/chats.css
@@ -182,7 +182,7 @@ input:focus {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
diff --git a/share_project/src/main/resources/static/css/index.css b/share_project/src/main/resources/static/css/index.css
index 7d80a00beb1eddaf32a662dec83c78267c35391b..642d6b747e8251af960e0d3ab0c980b9bb386602 100644
--- a/share_project/src/main/resources/static/css/index.css
+++ b/share_project/src/main/resources/static/css/index.css
@@ -128,7 +128,7 @@ body {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
diff --git a/share_project/src/main/resources/static/css/individual-home copy.css b/share_project/src/main/resources/static/css/individual-home copy.css
index 487677204014a84e1caf3f613a80c6c0eccf8864..82d0ff4c9e27fa26512a34575b116855210c5041 100644
--- a/share_project/src/main/resources/static/css/individual-home copy.css	
+++ b/share_project/src/main/resources/static/css/individual-home copy.css	
@@ -1,144 +1,145 @@
-
-body{
-  background-image: url("../images/background.png");
+body {
+    background-image: url("../images/background.png");
 }
+
 .large {
-  position: absolute;
-  top: 0px;
-  left: 0;
-  width: 100%;
-  height: 48px;
-  background: #FFFFFF;
-  box-shadow: 0px 7px 6px 1px rgba(60, 60, 60, 0.05);
-  z-index: 999;
+    position: absolute;
+    top: 0px;
+    left: 0;
+    width: 100%;
+    height: 48px;
+    background: #FFFFFF;
+    box-shadow: 0px 7px 6px 1px rgba(60, 60, 60, 0.05);
+    z-index: 999;
 }
 
 .logo {
-  position: absolute;
-  top: 11px;
-  left: 54px;
-  width: 75px;
-  height: 30px;
+    position: absolute;
+    top: 11px;
+    left: 54px;
+    width: 75px;
+    height: 30px;
 }
 
 .logo img {
-  width: 100%;
-  height: auto;
+    width: 100%;
+    height: auto;
 }
 
 .browse,
 .publish {
-  position: absolute;
-  top: 0px;
-  left: 263px;
-  width: 120px;
-  height: 48px;
-  font-size: 15px;
-  font-weight: 300;
-  font-family: SourceHanSansCN-Light;
-  color: #3C3C3C;
-  text-align: center;
-  line-height: 48px;
+    position: absolute;
+    top: 0px;
+    left: 263px;
+    width: 120px;
+    height: 48px;
+    font-size: 15px;
+    font-weight: 300;
+    font-family: SourceHanSansCN-Light;
+    color: #3C3C3C;
+    text-align: center;
+    line-height: 48px;
 }
 
 .choice .publish {
-  left: 383px;
+    left: 383px;
 }
 
 .current {
-  background: #FDFAEB;
-  font-family: SourceHanSansCN-Bold;
-  font-size: 15px;
-  font-weight: bold;
-  color: #FADA3C;
-  line-height: 48px;
-  height: 48px;
+    background: #FDFAEB;
+    font-family: SourceHanSansCN-Bold;
+    font-size: 15px;
+    font-weight: bold;
+    color: #FADA3C;
+    line-height: 48px;
+    height: 48px;
 }
 
 .current::after {
-  content: "";
-  display: block;
-  width: 31px;
-  height: 4px;
-  background: #FADA3C;
-  border-radius: 2px;
-  margin: -3px auto;
+    content: "";
+    display: block;
+    width: 31px;
+    height: 4px;
+    background: #FADA3C;
+    border-radius: 2px;
+    margin: -3px auto;
 }
 
 
 /* 头像 */
 
 .message {
-  position: absolute;
-  top: 13px;
-  right: 147px;
-  width: 19px;
-  height: 21px;
+    position: absolute;
+    top: 13px;
+    right: 147px;
+    width: 19px;
+    height: 21px;
 }
 
 .message img:nth-child(1) {
-  width: 100%;
-  height: auto;
+    width: 100%;
+    height: auto;
 }
 
 .message img:nth-child(2) {
-  position: absolute;
-  top: 0;
-  right: -3px;
-  width: 13px;
-  height: 13px;
+    position: absolute;
+    top: 0;
+    right: -3px;
+    width: 13px;
+    height: 13px;
 }
 
 .pic {
-  position: absolute;
-  top: 12px;
-  right: 80px;
-  width: 27px;
-  height: 27px;
+    position: absolute;
+    top: 12px;
+    right: 80px;
+    width: 27px;
+    height: 27px;
 }
 
 .pic img {
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
 }
 
 
 /* 头像下的列表 */
 
 .pic ul {
-  margin-left: -10.5px;
-  width: 48px;
-  height: 52px;
-  background: #FFFFFF;
-  border: 1px solid #EEEEEE;
-  border-radius: 0px 0px 3px 3px;
- 
+    margin-left: -10.5px;
+    width: 48px;
+    height: 77px;
+    background: #FFFFFF;
+    border: 1px solid #EEEEEE;
+    border-radius: 0px 0px 3px 3px;
 }
 
 .pic li {
-  width: 48px;
-  height: 26px;
-  font-size: 6px;
-  font-family: SourceHanSansCN-Light;
-  font-weight: 300;
-  color: #666666;
-  transform: scale(0.85);
-  line-height: 28px;
+    width: 48px;
+    height: 26px;
+    font-size: 6px;
+    font-family: SourceHanSansCN-Light;
+    font-weight: 300;
+    color: #666666;
+    transform: scale(0.85);
+    line-height: 28px;
 }
 
 .pic ul li:hover {
-  color: #EEC708;
+    color: #EEC708;
 }
 
+
 /* 中间个人中心模块基本样式 */
-.person-nav{
-  width: 211px;
-  height: 356px;
-  background-color: #FFF;
-  border: 2px solid #F9F8F7;
-  box-shadow: 0px 0px 5px  #F9F8F7;
-  position: relative;
-  top: 80px;
-  left: 173px;
+
+.person-nav {
+    width: 211px;
+    height: 356px;
+    background-color: #FFF;
+    border: 2px solid #F9F8F7;
+    box-shadow: 0px 0px 5px #F9F8F7;
+    position: relative;
+    top: 80px;
+    left: 173px;
 }
\ No newline at end of file
diff --git a/share_project/src/main/resources/static/css/person-home.css b/share_project/src/main/resources/static/css/person-home.css
index cf39916f3f5655fb94622c4e8408435b579046eb..1f75d0a071b9ed12e08b0b91d4e49acff619558f 100644
--- a/share_project/src/main/resources/static/css/person-home.css
+++ b/share_project/src/main/resources/static/css/person-home.css
@@ -155,7 +155,7 @@ body {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
diff --git a/share_project/src/main/resources/static/css/person-info.css b/share_project/src/main/resources/static/css/person-info.css
index 4e3069c8cec56d6bbcdf7e23249d9816fbbfcec5..16947f6b16ca1b0f75db6ae328733e9f78cc26c9 100644
--- a/share_project/src/main/resources/static/css/person-info.css
+++ b/share_project/src/main/resources/static/css/person-info.css
@@ -109,7 +109,7 @@ body {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
diff --git a/share_project/src/main/resources/static/css/project-details.css b/share_project/src/main/resources/static/css/project-details.css
index d30db54397a5e9e27c9ad1be575cf0e0716d1046..5ec4d23907b524150f19d67a649de72898e70f22 100644
--- a/share_project/src/main/resources/static/css/project-details.css
+++ b/share_project/src/main/resources/static/css/project-details.css
@@ -155,7 +155,7 @@ body {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
diff --git a/share_project/src/main/resources/static/css/search.css b/share_project/src/main/resources/static/css/search.css
index 8ff81138e425e54ba4171e41e9922d1ff150385b..1346e95bb2f3c6aa365eb45fd2f12ae5f900351d 100644
--- a/share_project/src/main/resources/static/css/search.css
+++ b/share_project/src/main/resources/static/css/search.css
@@ -2,6 +2,11 @@ body {
     background-color: #fefdfa;
 }
 
+.link-logo {
+    position: relative;
+    z-index: 9999;
+}
+
 .logo {
     float: left;
     width: 91px;
@@ -130,7 +135,7 @@ body {
 .pic ul {
     margin-left: -10.5px;
     width: 48px;
-    height: 52px;
+    height: 77px;
     background: #FFFFFF;
     border: 1px solid #EEEEEE;
     border-radius: 0px 0px 3px 3px;
@@ -231,6 +236,7 @@ body {
 .hot li {
     float: left;
     display: block;
+    margin-top: 5px;
 }
 
 .hot li a {
diff --git a/share_project/src/main/resources/static/js/page/chat.js b/share_project/src/main/resources/static/js/page/chat.js
index 735f6aab5dced5a175383cc00a1a09cbe0fd9368..85a1b51ecae766eaca2d4a67c89bedd60cc3a25a 100644
--- a/share_project/src/main/resources/static/js/page/chat.js
+++ b/share_project/src/main/resources/static/js/page/chat.js
@@ -294,7 +294,7 @@ const app = new Vue({
             // 添加sendUser属性 然后添加到本来的列表中
             chatMsg.sendUser = this.username;
             // 格式化日期
-            chatMsg.sendTime = this.dateFormat(new Date(), 'yyyy-mm-dd hh:mm:ss');
+            chatMsg.sendTime = this.dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss');
             // 添加進去聊天历史列表
             this.currentChatHistory.push(chatMsg);
 
diff --git a/share_project/src/main/resources/static/js/page/person-home.js b/share_project/src/main/resources/static/js/page/person-home.js
index d5a5e7681522f6f67a433b65033efde97c01978e..8fc84e7323bec3a7ac04d86cf0d492ea418205a3 100644
--- a/share_project/src/main/resources/static/js/page/person-home.js
+++ b/share_project/src/main/resources/static/js/page/person-home.js
@@ -46,7 +46,6 @@ var personHome = new Vue({
                 }
             }
         },
-
         // 封装函数 返回地址栏中的参数
         getUrlParam: function() {
             // 获取地址栏的东西 看看是要做什么事情
diff --git a/share_project/src/main/resources/static/js/page/project-details.js b/share_project/src/main/resources/static/js/page/project-details.js
index 47a161e03f68ffd83ca1057f2821c00449f2bd3d..1199433356277904b883962b411ed2c032a50b2d 100644
--- a/share_project/src/main/resources/static/js/page/project-details.js
+++ b/share_project/src/main/resources/static/js/page/project-details.js
@@ -20,8 +20,13 @@ var projDetails = new Vue({
         this.checkIsLogin();
         var map = this.getUrlParam();
         if (map != '') {
+<<<<<<< HEAD
+            if (map.type == 'demond') {
+                var url = 'http://zshare.free.idcfengye.com/share/user/' + map.publisher + '/demand/' + map.projectId;
+=======
             if (map.type == 'demand') {
                 var url = '/share/user/' + map.publisher + '/demand/' + map.projectId;
+>>>>>>> master
                 // 发送请求获取项目详情
                 await axios.get(url).then(res => {
                     if (res.data.status == '1') {
@@ -30,7 +35,12 @@ var projDetails = new Vue({
                     }
                 });
             } else if (map.type == 'skill') {
+<<<<<<< HEAD
+                // http://zshare.free.idcfengye.com/share/user/admin/skill/8
+                var url = 'http://zshare.free.idcfengye.com/share/user/' + map.publisher + '/skill/' + map.projectId;
+=======
                 var url = '/share/user/' + map.publisher + '/skill/' + map.projectId;
+>>>>>>> master
                 // 发送请求获取项目详情
                 await axios.get(url).then(res => {
                     if (res.data.status == '1') {
@@ -123,7 +133,11 @@ var projDetails = new Vue({
                 var picArr = [];
                 for (var i = 0; i < arr.length; i++) {
                     console.log(arr[i]);
+<<<<<<< HEAD
+                    var url = 'http://zshare.free.idcfengye.com/share/user/getUserInfo?username=' + arr[i];
+=======
                     var url = 'share/user/getUserInfo?username=' + arr[i];
+>>>>>>> master
                     axios.get(url).then(res => {
                         picArr.push(res.data.data.userPicture);
                     });
@@ -147,7 +161,11 @@ var projDetails = new Vue({
                 var picArr = [];
                 for (var i = 0; i < arr.length; i++) {
                     console.log(arr[i]);
+<<<<<<< HEAD
+                    var url = 'http://zshare.free.idcfengye.com/share/user/getUserInfo?username=' + arr[i];
+=======
                     var url = '/share/user/getUserInfo?username=' + arr[i];
+>>>>>>> master
                     await axios.get(url).then(res => {
                         console.log(res.data);
                         picArr.push(res.data.data.userPicture);
diff --git a/share_project/src/main/resources/static/person-home.html b/share_project/src/main/resources/static/person-home.html
index fc332eea90cf72d50a3ad2c6c8d5de42ea25bf01..0c601efc932c749818b4ae49c0c5747b9155d8fe 100644
--- a/share_project/src/main/resources/static/person-home.html
+++ b/share_project/src/main/resources/static/person-home.html
@@ -17,9 +17,12 @@
     <!-- 顶部 -->
     <div class="large">
         <header id="nav" v-cloak>
-            <div class="logo">
-                <img src="images/logo.png" alt="">
-            </div>
+            <a href="/share/index.html">
+                <div class="logo">
+                    <img src="images/logo.png" alt="">
+                </div>
+            </a>
+
 
             <div class="choice">
                 <a href="/share/browse.html?type=search&key=">
diff --git a/share_project/src/main/resources/static/search.html b/share_project/src/main/resources/static/search.html
index 694757d2eccb158df5567ba64728e4d73f05fe70..bf5de1a9f90ab7cf45f257962c9e8ae08a3e2558 100644
--- a/share_project/src/main/resources/static/search.html
+++ b/share_project/src/main/resources/static/search.html
@@ -14,7 +14,7 @@
 
 <body>
     <div class="box">
-        <a href="/share/index.html">
+        <a href="/share/index.html" class="link-logo">
             <div class="logo">
                 <img src="images/logo.png" alt="">
             </div>