Merge remote-tracking branch 'origin/master'

src/common/lang/en.js

@@ -2204,7 +2204,7 @@ module.exports = {
         Events:'Events',
         nodata:'No Data',
         Password:'Password',
-
+        Savedsuccessfully:'Saved Successfully',
 
 
     }

src/common/lang/zh.js

@@ -2300,6 +2300,7 @@ module.exports = {
         Events:'个活动',
         nodata:'暂无数据',
         Password:'密码',
+        Savedsuccessfully:'保存成功',
     }
 
 

src/views/netWorkpage/networkring.vue

@@ -20,7 +20,7 @@
                                 </span>
                                 <p class="hover_cursor" @click="tohome(item)">{{item.empName}}</p>
                                 <p class="ellipsisFont1" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empTitle}}</p>
-                                <p class="ellipsisFont1" v-else>{{item.workName?item.workName:item.empIntroduction}}</p>
+                                <p class="ellipsisFont1" v-else>{{item.workName?item.workName:''}}</p>
                                 <p class="ellipsisFont1" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empIntroduction}}</p>
                                 <p class="ellipsisFont1" v-else>{{item.orgName?item.orgName:item.empIntroduction}}</p>
                                 <p>

src/views/peoplehomepage/contactbar.vue

@@ -18,7 +18,9 @@
                         <div class="gendisplay">
                             <p @click="tohome(item)">
                                 <i class="hover_cursor">{{item.empName}}</i>
-                                <i style="font-size: 12px;padding-left:10px;font-weight: normal;">{{item.workName}}</i>
+                                <i style="font-size: 12px;padding-left:10px;font-weight: normal;">
+                                    {{item.isProfessor == 1||item.isModerator == 1?item.empTitle:item.workName}}
+                                </i>
                             </p>
                             <btnbar @successState="successState" :row="item" :index="index" :btnType="1"></btnbar>
                         </div>

src/views/peoplehomepage/editInfo.vue

@@ -652,7 +652,7 @@
                         this.formData.empId = this.empInfo.empId;
                         api.improveInformation(this.formData).then(response => {
                             if(response.code == 0) {
-                                this.$message.success('保存成功');
+                                this.$message.success(this.$t('mineInfo.Savedsuccessfully'));
                             } else {
                                 this.$message.error(response.msg);
                             }

src/views/peoplehomepage/peoplehome.vue

@@ -81,10 +81,11 @@
                                         ></span>
                                     </p>
                                 </div>
-                                <div v-if="$route.query.id&&$route.query.id!=userInfo.empId" class="btn_topic">
+                                <div v-if="$route.query.id&&$route.query.id!=userInfo.empId" class="btn_topic gendisplay">
                                     <span @click="addEmpContact" v-if="empRelationstate.contactState == 0">交换名片</span>
                                     <span @click="addEmpContact" style="background: #AAAAAA;box-shadow:none;" v-if="empRelationstate.contactState == 1">等待通过</span>
-                                    <span style="background: #AAAAAA;box-shadow:none;" v-if="empRelationstate.contactState == 2">互为联系人</span>
+<!--                                    <span style="background: #AAAAAA;box-shadow:none;" v-if="empRelationstate.contactState == 2">互为联系人</span>-->
+                                    <popoverBardbar style="margin-left: 40px;" v-if="empRelationstate.contactState == 2" :ishome="true" :row="userInfoData"></popoverBardbar>
                                     <span @click="isEmpContact" style="background: #FF9E29;box-shadow: 0px 3px 10px 1px rgba(255, 158, 41, 0.4);" v-if="empRelationstate.concernState == 0">
                                         <i v-if="empRelationstate.concernState == 0" class="iconfont icon-jiahao"></i>
                                         {{empRelationstate.concernState == 0?'关注':'已关注'}}
@@ -224,6 +225,7 @@
     import commonWork from "./commonWork";
     import commonSchool from "./commonSchool";
     import VueQRCodeComponent from "vue-qrcode-component";
+    import popoverBardbar from "./popoverBardbar";
     export default {
         name : "peoplehome",
         data() {
@@ -251,7 +253,7 @@
             }
         },
         components:{
-            contactbar,introductionbar,tabsbar,mineMedal,followers,contactPerson,empConcern,commonWork,commonSchool,VueQRCodeComponent
+            contactbar,introductionbar,tabsbar,mineMedal,followers,contactPerson,empConcern,commonWork,commonSchool,VueQRCodeComponent,popoverBardbar
         },
         methods:{
             cancelBtn () {

src/views/peoplehomepage/popoverBardbar.vue

@@ -46,7 +46,7 @@
                     <span>{{empContactData.queryValue}}</span>
                 </div>
             </div>
-            <p slot="reference" @click="empContact(row)" class="bard_btn">
+            <p slot="reference" @click="empContact(row)" class="bard_btn" :class="ishome?'bard_btnhome':''">
                 查看电子名片
             </p>
         </el-popover>
@@ -83,7 +83,7 @@
             }
         },
         components:{VueQRCodeComponent},
-        props:['row'],
+        props:['row','ishome'],
         methods:{
             cancelBtn () {
                 this.$refs.popover.doClose();
@@ -202,6 +202,16 @@
         font-size: 14px;
         font-weight: bold;
     }
+    .bard_btnhome{
+        width: 160px!important;
+        background: #5D78FF;
+        color: #ffffff;
+        font-size: 16px!important;
+        height: 42px!important;
+        line-height: 42px!important;
+        border-radius: 26px!important;
+        box-shadow: 0px 2px 5px 1px rgba(93, 120, 255, 0.4);
+    }
     .bard_btn:hover{
         background: #5D78FF;
         color: #ffffff;

src/views/peoplehomepage/tabAttentionbar.vue

@@ -12,7 +12,7 @@
                         </span>
                         <div>
                             <p class="hover_cursor" @click="tohome(item)">{{item.empName}}</p>
-                            <p>
+                            <p class="ellipsisFont1">
                                 <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>
@@ -186,6 +186,9 @@
         >p:nth-child(2){
             font-size: 12px;
             color:#AAAAAA;
+            height: 17px;
+            line-height: 17px;
+            overflow: hidden;
         }
     }
     >p:last-child{

src/views/peoplehomepage/tabNewsbar.vue

@@ -30,7 +30,7 @@
                 </i>
                 </p>
                 <div v-if="item.messageType == 1">
-                    <p><i @click="tohome(item)">{{item.empName}}</i>想添加您为联系人，<i @click="tohome(item)">查看TA的资料</i></p>
+                    <p><i @click="tohome(item)">{{item.empName}}</i>想与您交换名片，<i @click="tohome(item)">查看TA的资料</i></p>
                     <p>{{item.createdTimeStr}}</p>
                 </div>
                 <div v-else class="messageType_left">

src/views/peoplehomepage/userContactbar.vue

@@ -23,7 +23,7 @@
                         @current-change="handleCurrentChange"
                         background
                         :page-sizes="[10, 20, 30, 40, 50]"
-                        :page-size="10"
+                        :page-size="6"
                         :current-page="cur_page"
                         layout=" total, prev, pager, next"
                         :total="totalListResult">
@@ -56,7 +56,7 @@
             // 分页导航
             handleCurrentChange(val) {
                 this.cur_page = val;
-                this.getCommonContact();
+                this.getCommonContact(this.rowData);
             },
             //共同联系人
             getCommonContact(row){
@@ -68,7 +68,7 @@
                         totalItemCount: 0
                     },
                     search: {
-                        empId:this.userInfo.empId,
+                        empId:this.$route.query.id?this.$route.query.id:this.userInfo.empId,
                         otherEmpId:row.empId,
                     },
                     sort: {}