Merge remote-tracking branch 'origin/master'

src/components/index/PageTopindex.vue

@@ -646,7 +646,7 @@
     }
 
     .istop_fixed_title{
-        z-index: 999;
+        z-index: 9999;
         position: fixed;
         top: 0;
         left: 0;

src/views/bigbusiness/pages/requireDetail.vue

@@ -909,7 +909,7 @@
             text-align: left;
             position: sticky;
             position: -webkit-sticky;
-            top: 60px;
+            top: 44px;
             z-index: 2000;
             box-shadow:0px 1px 8px 0px rgba(52,52,76,0.05);
             i{

src/views/findeventpage/eventlive.vue

 <template>
     <div>
         <iframe name = "child" id = "child" src="live.html" frameborder="0" scrolling="no" style="position:related;top: 2.8px;left: 0px;width: 100%;height: 100vh;border: medium none;"></iframe>
-        <div v-if="$i18n.locale=='zh-CN'" @click="isuserClick" class="event_iconchange">
+        <div v-if="$i18n.locale=='zh-CN'&&!userClick" @click="isuserClick" class="event_iconchange">
             <el-tooltip class="item" effect="dark" content="互换名片，拓展人脉圈" placement="top-start">
                 <img class="event_iconchange_img" src="../../assets/img/changeImg.png" alt="">
             </el-tooltip>
@@ -10,7 +10,7 @@
             <div @click="userClick = false" class="event_l"></div>
             <div class="event_r" :class="userClick?'event_rshow':''">
                 <img @click="userClick = false" src="../../assets/img/pull.png" :style="userClick?'':'display: none;'">
-                <div class="gendisplay event_title">
+                <div class="gendisplay event_title" v-if="userClick">
                     <div>
                         <span @click="titleHover = 0" :class="titleHover == 0?'title_hover':''">交换名片</span>
                     </div>
@@ -41,6 +41,8 @@
     import api from './api/api';
     import userlist from "./userlist";
     import newslist from "./newslist";
+    import $ from 'jquery';//非必要
+
     export default {
         name: "live",
         beforeDestroy() { // 在组件生命周期结束的时候销毁。
@@ -100,12 +102,13 @@
         mounted() {
             globalMsg.$emit('topisInit', false);
             globalMsg.$emit('sendIndex', 3);
-            // document.getElementsByTagName("body")[0].style.overflow = "hidden";
+            document.getElementsByTagName("body")[0].style.overflow = "hidden";
             this.userHistory(0);
         },
-        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
-            this.userHistory(1);
+        beforeRouteLeave(to,from,next) { // 在组件生命周期结束的时候销毁。、
+            // this.userHistory(1);
             document.getElementsByTagName("body")[0].style.overflow = "auto";
+            next();
         },
         created() {
             this.getNickName();
@@ -119,6 +122,7 @@
         position: fixed;
         bottom: 85px;
         right: 10px;
+        z-index: 999;
         .event_iconchange_img{
             width: 70px;
             cursor: pointer;

src/views/keySearchpage/topiclist.vue

@@ -35,8 +35,8 @@
                         </div>
                         <div class="discuss_content">
 
-                            <span @click="todetail(item,1)" v-if="publicFun.getTextInRichtext(item.discussContent).length<140" v-html="item.discussContent?(item.pcState==0?publicFun.analyzeEmoji(item.discussContent):publicFun.getTextInRichtext(item.discussContent)):''"></span>
-                            <span @click="todetail(item,1)" v-else v-html="item.discussContent?(item.pcState==0?publicFun.analyzeEmoji(item.discussContent):publicFun.getTextInRichtext(item.discussContent.substr(0, 140))):''"></span>
+                            <span @click="todetail(item,1)" v-if="publicFun.getTextInRichtext(item.discussContent).length<140" v-html="item.discussContent?(item.pcState==0?publicFun.analyzeEmoji(item.discussContent):publicFun.getTextInRichtext(item.simpleContent)):''"></span>
+                            <span @click="todetail(item,1)" v-else v-html="item.discussContent?(item.pcState==0?publicFun.analyzeEmoji(item.discussContent):publicFun.getTextInRichtext(item.simpleContent.substr(0, 140))):''"></span>
                             <span @click="todetail(item,1)" v-if="publicFun.getTextInRichtext(item.discussContent).length>140">...<i style="color:#5D78FF;">全文</i></span>
                             <p>来自于 <i style="color:#5D78FF;" @click="todetail(item,2)">#{{item.topicTitle}}#</i></p>
                         </div>

src/views/netWorkpage/searchUserlist.vue

@@ -90,7 +90,7 @@
             },
             initialSearchRecommend(){
                 this.cur_page = 1;
-                this.getuserSearchList();
+                this.getuserSearch();
             },
             //推荐用户
             getuserSearchList(){

src/views/peoplehomepage/introductionbar.vue

@@ -158,6 +158,7 @@
                     <p>
                         <span>{{item.schoolName}}</span>
                         <span v-if="item.majorName">{{item.majorName}}</span>
+                        <span v-if="item.degreeName">{{item.degreeName}}</span>
                     </p>
                 </div>
             </div>

src/views/peoplehomepage/tabNewsbar.vue

@@ -52,7 +52,7 @@
                             我不同意与<i @click="tohome(item)">{{item.empName}}</i>交换名片
                         </span>
                         <span v-else>
-                            <i @click="tohome(item)">{{item.empName}}</i>不同意您添加TA为联系人
+                            <i @click="tohome(item)">{{item.empName}}</i>不同意与您交换名片
                         </span>
                     </p>
                     <p v-if="item.messageType == 5"><i @click="tohome(item)">{{item.empName}}</i>赞了您的评论</p>
@@ -61,7 +61,7 @@
                             我同意与<i @click="tohome(item)">{{item.empName}}</i>交换名片
                         </span>
                         <span v-else>
-                            <i @click="tohome(item)">{{item.empName}}</i>同意您添加TA为联系人
+                            <i @click="tohome(item)">{{item.empName}}</i>同意与您交换名片
                         </span>
                     </p>
                 </div>