Merge remote-tracking branch 'origin/master'

src/views/netWorkpage/networkSearch.vue

@@ -21,12 +21,12 @@
                             <div>
                                 <p @click="tohome(item)">
                                     <span>{{item.empName}}</span>
-                                    <span style="margin-left: 20px;" v-if="item.isProfessor == 1">{{item.empTitle}}</span>
+                                    <span style="margin-left: 20px;" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empTitle}}</span>
                                     <span style="margin-left: 20px;" v-else>{{item.workName}}</span>
                                     <span style="margin-left: 20px;">{{item.orgName}}</span>
                                 </p>
                                 <p @click="tohome(item)" >{{item.empIntroduction}}</p>
-                                <p>
+                                <p @click="tohome(item)">
                                     <span>{{item.friendCount}} 位联系人</span>
                                     <span style="margin-left: 20px;">{{item.followedCount}} 位关注者</span>
                                 </p>

src/views/peoplehomepage/editInfo.vue

@@ -61,8 +61,8 @@
                                 <div class="gendisplay">
                                     <p>{{item.workName}}</p>
                                     <p>{{item.orgName}}</p>
-                                    <p>{{item.address}}</p>
                                     <p v-if="item.startTime">{{item.startTime}} - {{item.endTime=='now'?'至今':item.endTime}}</p>
+                                    <p>{{item.address}}</p>
                                 </div>
                                 <div>
                                     <i @click="editjobs(item,index)" class="iconfont icon-bianji"></i>
@@ -522,6 +522,7 @@
                                 provinceId:this.workdata.provinceId,
                                 startTime:this.workdata.startTime,
                                 endTime:this.workdata.endTime,
+                                address:this.workdata.address,
                                 id:this.workdata.id?this.workdata.id:null,
                             };
                         }else{
@@ -533,6 +534,7 @@
                                 provinceId:this.workdata.provinceId,
                                 startTime:this.workdata.startTime,
                                 endTime:this.workdata.endTime,
+                                address:this.workdata.address,
                                 id:this.workdata.id?this.workdata.id:null,
                             });
                         }
@@ -836,16 +838,15 @@
             border-bottom: 1px solid #E7E9F5;
             >div:first-child{
                 width: 80%;
-                >p:nth-child(1){
-                    font-weight: bold;
+                >p{
+                    margin-right: 20px;
                     max-width: 200px;
+                    height: 20px;
+                    line-height: 20px;
+                    overflow: hidden;
                 }
-                >p:nth-child(2){
-                    max-width: 300px;
-                    margin: 0 30px;
-                }
-                >p:nth-child(3){
-                    max-width: 200px;
+                >p:nth-child(1){
+                    font-weight: bold;
                 }
             }
             >div:last-child{