Merge remote-tracking branch 'origin/master'

src/views/peoplehomepage/contactbar.vue

@@ -29,7 +29,7 @@
                             </p>
                         </div>
                         <p @click="tohome(item)" class="ellipsisFont1" style="color:#1A1A1E;height: 24px;">{{item.empIntroduction?item.empIntroduction:'暂无简介'}}</p>
-                        <p style="color:#AAAAAA;height: 22px;">
+                        <p style="color:#AAAAAA;">
                             <span v-if="item.relationType == 0"></span>
                             <span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
                             <span v-if="item.relationType == 2">TA 是来自 {{ item.relationValue }} 的校友</span>
@@ -324,6 +324,9 @@
                     font-size: 12px;
                     line-height: 24px;
                 }
+                >p:last-child{
+                    line-height: 18px;
+                }
             }
         }
     }

src/views/peoplehomepage/editInfo.vue

@@ -134,7 +134,7 @@
         </el-form>
 
 <!--        添加工作经历-->
-        <el-dialog title="添加工作经历 (从当前工作往前填写)" :visible.sync="visiblejobs" :append-to-body="true" :close-on-click-modal="false" @close="closejobs" class="dialogWrap dialogWrap600 dialogWraptopic">
+        <el-dialog title="添加工作经历 " :visible.sync="visiblejobs" :append-to-body="true" :close-on-click-modal="false" @close="closejobs" class="dialogWrap dialogWrap600 dialogWraptopic">
             <div class="centerQrCode" style="margin: 0 50px;">
                 <el-form label-position="right" :model="workdata" :rules="workrules" ref="workdata" label-width="120px" class="contnetform180" >
                     <el-form-item label="职位：" prop="workName">
@@ -163,6 +163,7 @@
                     </el-form-item>
                 </el-form>
             </div>
+            <span style="color: #ADB2CD;position: absolute;top: 22px;left: 140px;">(从当前工作往前填写) </span>
             <el-row style="padding-top: 20px;text-align: center;border-top: 1px solid #E4E6F2;">
                 <el-button @click="closejobs">取 消</el-button>
                 <el-button type="primary" @click="pushjobs">保存</el-button>
@@ -171,7 +172,7 @@
 
 
 <!--        添加教育经历-->
-        <el-dialog title="添加教育经历 (从最高学历开始填写)" :visible.sync="visibleeducation" :append-to-body="true" :close-on-click-modal="false" @close="closeeducation" class="dialogWrap dialogWrap600 dialogWraptopic">
+        <el-dialog title="添加教育经历 " :visible.sync="visibleeducation" :append-to-body="true" :close-on-click-modal="false" @close="closeeducation" class="dialogWrap dialogWrap600 dialogWraptopic">
             <div class="centerQrCode" style="margin: 0 50px;">
                 <el-form label-position="right" :model="educationdata" :rules="educationrules" ref="educationdata" label-width="120px" class="contnetform180" >
                     <el-form-item label="学校：" prop="schoolName"  ref="schoolNames">
@@ -190,6 +191,7 @@
                     </el-form-item>
                 </el-form>
             </div>
+            <span style="color: #ADB2CD;position: absolute;top: 22px;left: 140px;">(从最高学历开始填写) </span>
             <el-row style="padding-top: 20px;text-align: center;border-top: 1px solid #E4E6F2;">
                 <el-button @click="closeeducation">取 消</el-button>
                 <el-button type="primary" @click="pusheducation">保存</el-button>

src/views/peoplehomepage/peoplehome.vue

@@ -449,6 +449,12 @@
             },
             //查看联系方式
             empContact(){
+                this.empContactstate = {
+                    isConstact:true,
+                };
+                this.empContactData = {
+                    baseEmpInformation:{},
+                };
                 api.selectBaseEmpContact({otherEmpId:this.$route.query.id}).then((res)=>{
                     if(res.code==0){
                         this.empContactstate = res.result;