Merge remote-tracking branch 'origin/master'

src/views/categorypage/category.vue

@@ -59,7 +59,7 @@
                     </el-table-column>
                     <el-table-column prop="empName" label="提交人" width="100" align="center">
                         <template slot-scope="scope">
-                            <span :class="scope.row.submitType == '2'?'colora':'colorb'" style="padding: 3px 8px;border-radius: 3px;color: #ffffff">{{scope.row.submitType == '0' ? $t('operationjson.selfsubmissioned'): scope.row.submitType == '1' ? $t('operationjson.submissioned') : ''}}</span>
+                            <span :class="scope.row.submitType == 0?'colora':'colorb'" style="padding: 3px 8px;border-radius: 3px;color: #ffffff">{{scope.row.submitType == '0' ? $t('operationjson.selfsubmissioned'): scope.row.submitType == '1' ? $t('operationjson.submissioned') : ''}}</span>
                             <p>{{scope.row.submitName}}</p>
                         </template>
                     </el-table-column>

src/views/conmanagementpage/contentdetail.vue

@@ -83,15 +83,15 @@
                         </div>
                         <div v-for="(item,index) in commentsList" :key="index">
                             <div style="width: 50px;">
-                                <div style="position: relative;">
-                                    <img @click="tohome(item.createdBy)" v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 50px;height: 50px;">
-                                    <img @click="tohome(item.createdBy)" v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 50px;height: 50px;">
+                                <div style="position: relative;cursor: pointer;" @click="tohome(item.createdBy)">
+                                    <img v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 50px;height: 50px;">
+                                    <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 50px;height: 50px;">
                                     <img v-if="item.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 15px;">
                                 </div>
                             </div>
                             <div class="paragraph">
                                 <div class="gendisplay">
-                                    <p style="margin-right: 5px">
+                                    <p style="margin-right: 5px;cursor: pointer;" class="mouseHover" @click="tohome(item.createdBy)">
                                         {{item.nickName}}
                                     </p>
                                     <p>

src/views/findeventpage/oldEventdetail.vue

@@ -44,7 +44,7 @@
                             <i class="iconfont icon-zhibo" style="font-size: 14px;"></i>
                             {{$t('activityInfo.watchLive')}}
                         </el-button>
-                        <el-button v-if="eventdata.baseLive.liveState==2&&eventdata.baseLive.liveBack == 0" type="primary" round style="width: 130px;font-size: 14px;">
+                        <el-button class="background: #409eff;" v-if="eventdata.baseLive.liveState==2&&eventdata.baseLive.liveBack == 0" type="primary" round style="width: 130px;font-size: 14px;">
                             <i class="iconfont icon-zhibo" style="font-size: 14px;"></i>
                             {{$t('activityInfo.liveBack')}}
                         </el-button>

src/views/findeventpage/userlist.vue

@@ -22,8 +22,8 @@
                         <p @click="item.empId?tohome(item):''" class="ellipsisFont1" style="color:#AAAAAA;overflow: hidden;">
                             {{item.isProfessor||item.isModerator||item.isGuest?item.empTitle:item.workName}}
                         </p>
-                        <p style="color:#AAAAAA;">
-                            {{item.orgName}}
+                        <p style="color:#AAAAAA;overflow: hidden;width: 100%;" class="ellipsisFont1">
+                            {{item.orgName?item.orgName:item.empIntroduction}}
                         </p>
                     </div>
                 </div>

src/views/integralpage/guessdetail.vue

@@ -399,6 +399,7 @@
         width: 50px;
         height: 50px;
         margin-right: 10px;
+        cursor: pointer;
     }
     .userGuide{
         width: 100%;

src/views/integralpage/guessranking.vue

@@ -45,7 +45,7 @@
                         <li v-for="(item,index) in guessdata.guessLeaderboardList" :key="index" v-if="index>2">
                             <span class="n_no">{{index+1}}</span>
                             <span class="n10_img" @click="tohome(item.empId)"><img :src="item.empLogo&&item.empLogo.length>1?item.empLogo:require('../../assets/img/defaultlogo.png')" alt=""></span>
-                            <span class="n10_name" @click="tohome(item.empId)">{{item.nickName}}</span>
+                            <span class="n10_name mouseHover" @click="tohome(item.empId)">{{item.nickName}}</span>
                             <span :class="guesstypes==2?'hoveHighlight':''" class="no10_no"><b>{{item.winRate}}%</b>胜率</span>
                             <span :class="guesstypes==3?'hoveHighlight':''" class="no10_sl"><b>{{item.winIntegral}}</b>赢取积分</span>
                             <span :class="guesstypes==1?'hoveHighlight':''" class="no10_cs"><b>{{item.guessNum}}</b>参与次数</span>

src/views/netWorkpage/networkring.vue

@@ -21,8 +21,8 @@
                                 <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:''}}</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 class="ellipsisFont1" style="cursor: pointer;" @click="tohome(item)" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empIntroduction}}</p>
+                                <p class="ellipsisFont1" style="cursor: pointer;" @click="tohome(item)" v-else>{{item.orgName?item.orgName:item.empIntroduction}}</p>
                                 <p>
                                     <span v-if="item.relationType == 0"></span>
                                     <span v-if="item.relationType == 1">有 {{item.relationValue}} 位共同联系人</span>

src/views/netWorkpage/searchUserlist.vue

@@ -10,7 +10,7 @@
                     </span>
                     <div>
                         <p @click="tohome(item)">
-                            <span>{{item.empName}}</span>
+                            <span class="mouseHover">{{item.empName}}</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>

src/views/publishactivity/proactivity.vue

@@ -241,7 +241,7 @@
                                                                :disabled="scope.row.sendMsg == 1"
                                                                type="text"
                                                                @click="guestmsg(scope.row)">
-                                                        {{scope.row.sendMsg==0?'发短息提醒':'已发短信'}}
+                                                        {{scope.row.sendMsg==0?'发送提醒':'已发送'}}
                                                     </el-button>
                                                 </template>
                                             </el-table-column>
@@ -250,7 +250,7 @@
                                     <el-form-item v-if="formData.versionType == 0&&$i18n.locale=='zh-CN'" label="相关内容：" style="width: 100%;">
                                         <el-button type="primary" plain @click="resourcesVisible = true">添加内容</el-button>
                                     </el-form-item>
-                                    <div v-if="formData.versionType == 0&&$i18n.locale=='zh-CN'" style="margin: 0 30px 30px 180px;">
+                                    <div v-show="formData.versionType == 0&&$i18n.locale=='zh-CN'" style="margin: 0 30px 30px 180px;">
                                         <el-table
                                                 tooltip-effect="dark"
                                                 class="projectTable"
@@ -768,6 +768,7 @@
                 inputValue:'',//添加小标签
                 tagIf:false,
                 tagBtn:true,
+                isEditevent:true,
                 provinceData:[],//获取省份列表
                 cityData:[],//获取城市列表
                 provinceIf:false,
@@ -1014,6 +1015,7 @@
                     this.$message.error(this.$t('pubactivities.maxaddguests'));
                 }else{
                     this.guestVisible=true;
+                    this.isEditevent = true;
                 }
             },
             //嘉宾发短信消息
@@ -1051,6 +1053,7 @@
                         this.guestform.linguestDesc = this.guestform.guestDesc;
                         this.guestform.linguestName = this.guestform.guestName;
                         this.guestVisible = true;
+                        this.isEditevent = false;
                     } else {
                         this.$message.error(response.msg);
                     }
@@ -1064,7 +1067,7 @@
             subguest(){
                 this.$refs.guestform.validate((valid) => {
                     if(valid) {
-                        if(this.guestform.guestId){
+                        if(this.guestform.guestId&&this.isEditevent){
                             for(let i in this.guestlist){
                                 if(this.guestlist[i].guestId == this.guestform.guestId){
                                     this.$message.error('此嘉宾已存在，请勿重复添加');

src/views/publishactivity/pubactivities.vue

@@ -77,7 +77,7 @@
                             <el-button v-if="scope.row.hasLive == 1&&scope.row.liveState!=2" type="text" @click="getprocessLiveState(scope.row)">
                                 {{scope.row.liveState==0?$t('livedata.start'):scope.row.liveState==1?$t('livedata.finish'):''}}
                             </el-button>
-                            <el-button v-if="scope.row.hasLive == 1" type="text" @click="processCard(scope.row)">
+                            <el-button v-if="scope.row.hasLive == 1&&scope.row.versionType==0" type="text" @click="processCard(scope.row)">
                                 {{scope.row.exchangeCards==0?'关闭交换名片':scope.row.exchangeCards==1?'开启交换名片':''}}
                             </el-button>
                             <el-button v-if="scope.row.channelType == 5" type="text" @click="$router.push({path:'/moneystatistics',query:{channelId:scope.row.channelId}})">

src/views/topicpage/commentdetail.vue

@@ -17,7 +17,7 @@
                             </div>
                             <div style="font-size: 12px;margin-left: 15px;line-height: 18px;">
                                 <div v-if="commentdata.userInfo" class="gendisplay">
-                                    <p style="margin-right: 5px;font-size: 12px;">
+                                    <p class="mouseHover" style="margin-right: 5px;font-size: 12px;cursor: pointer;" @click="tohome(commentdata.userInfo.empId)">
                                         {{commentdata.userInfo.isProfessor?commentdata.userInfo.empName:commentdata.userInfo.nickName}}
                                     </p>
                                     <p v-if="commentdata.userInfo.isModerator" style="margin: -1px 5px 0;">
@@ -28,7 +28,7 @@
                                         ></span>
                                     </p>
                                 </div>
-                                <p class="ellipsisFont1" style="width: 100%;overflow: hidden;height: 15px;"><i style="margin-right: 15px;">{{commentdata.createdTimeStr}}</i>{{commentdata.userInfo.professorIntroduction}}</p>
+                                <p class="ellipsisFont1" style="width: 100%;overflow: hidden;height: 15px;"><i style="margin-right: 15px;">{{commentdata.createdTimeStr}}</i><i style="cursor: pointer;" @click="tohome(commentdata.userInfo.empId)">{{commentdata.userInfo.professorIntroduction}}</i></p>
                             </div>
                         </div>
                         <div>
@@ -129,7 +129,7 @@
                                 <li v-for="(commentscommentdata,commentindex) in contentList" :key="commentindex+commentscommentdata.discussId">
                                     <div class="gendisplay" style="border-top: 1px solid #F2F2F2;padding-top: 20px;border-radius: 3px;">
                                         <div style="width: 36px;">
-                                            <div style="position: relative;">
+                                            <div style="position: relative;cursor: pointer;">
                                                 <img @click="tohome(commentscommentdata.createdBy)" v-if="commentscommentdata.empLogo" :src="commentscommentdata.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
                                                 <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
                                                 <img v-if="commentscommentdata.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
@@ -137,7 +137,7 @@
                                         </div>
                                         <div class="paragraph">
                                             <div v-if="commentdata.userInfo" class="gendisplay">
-                                                <p style="margin-right: 5px;font-size: 12px;">
+                                                <p class="mouseHover" style="margin-right: 5px;font-size: 12px;cursor: pointer;" @click="tohome(commentscommentdata.createdBy)">
                                                     {{commentscommentdata.isProfessor == 1?commentscommentdata.empName:commentscommentdata.nickName}}
                                                 </p>
                                                 <p v-if="commentscommentdata.moderator" style="margin: -1px 5px 0;">

src/views/topicpage/discussall.vue

@@ -103,12 +103,12 @@
                         <el-tabs v-model="activeName">
                             <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                 <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
-                                    <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                        <div style="position: relative;cursor: pointer;" @click="tohome(item)">
+                                    <div @click="tohome(item)" class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
+                                        <div style="position: relative;cursor: pointer;">
                                             <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                             <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
                                         </div>
-                                        <p class="ellipsisFont1" style="color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;line-height: 20px;">
+                                        <p class="ellipsisFont1 mouseHover" style="cursor: pointer;color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;line-height: 20px;">
                                             {{item.empName}}
                                         </p>
                                     </div>
@@ -145,13 +145,13 @@
                             <el-tabs v-model="activeName">
                                 <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                     <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
-                                        <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                            <p style="position: relative;cursor: pointer;" @click="tohome(item)">
+                                        <div @click="tohome(item)" class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
+                                            <p style="position: relative;cursor: pointer;">
                                                 <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
                                                 <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
 
                                             </p>
-                                            <p class="ellipsisFont1" style="color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;line-height: 20px;">
+                                            <p class="ellipsisFont1 mouseHover" style="cursor: pointer;color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;line-height: 20px;">
                                                 {{item.empName}}
                                             </p>
                                         </div>

src/views/topicpage/topicdetail.vue

@@ -157,13 +157,13 @@
                             </p>
                             <div style="padding: 15px 15px 0 15px;">
                                 <div class="gendisplay">
-                                    <div style="position: relative;">
+                                    <div style="position: relative;cursor: pointer;">
                                         <img @click="tohome(item.userInfo.empId)" :src="item.userInfo.empLogo?item.userInfo.empLogo:require('../../assets/img/defaultlogo.png')" style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
                                         <img v-if="item.userInfo.isProfessor" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
                                     </div>
                                     <div style="font-size: 12px;margin-left: 15px;line-height: 18px;">
                                         <div v-if="item.userInfo" class="gendisplay">
-                                            <p style="margin-right: 5px;font-size: 12px;">
+                                            <p class="mouseHover" style="margin-right: 5px;font-size: 12px;cursor: pointer;" @click="tohome(item.userInfo.empId)">
                                                 {{item.userInfo.isProfessor?item.userInfo.empName:item.userInfo.nickName}}
                                             </p>
                                             <p v-if="item.userInfo.isModerator" style="margin: -1px 5px 0;">
@@ -174,7 +174,7 @@
                                                ></span>
                                             </p>
                                         </div>
-                                        <p class="ellipsisFont1" style="width: 100%;overflow: hidden;height: 15px;"><i style="margin-right: 15px;">{{item.createdTimeStr}}</i>{{item.userInfo.professorIntroduction}}</p>
+                                        <p class="ellipsisFont1" style="width: 100%;overflow: hidden;height: 15px;"><i style="margin-right: 15px;">{{item.createdTimeStr}}</i><i style="cursor: pointer;" @click="tohome(item.userInfo.empId)">{{item.userInfo.professorIntroduction}}</i></p>
                                     </div>
                                 </div>
                                 <div>

src/views/topicpage/topictype.vue

@@ -105,21 +105,21 @@
                                 <div style="margin:0 30px 20px 0;">
                                     <div v-for="(item,index) in professorlist" :key="index">
                                         <el-tooltip placement="top" popper-class="boxShadowTip" effect="light">
-                                            <div class="gendisplay" style="padding: 20px 20px 0 20px;">
-                                                <div style="position: relative;cursor: pointer;"  @click="tohome(item)">
+                                            <div  @click="tohome(item)" class="gendisplay" style="padding: 20px 20px 0 20px;">
+                                                <div style="position: relative;cursor: pointer;">
                                                     <img v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                     <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                     <img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
                                                 </div>
                                                 <div style="margin: 10px 0 0 15px;font-size: 14px;">
-                                                    <p style="color:#1A1A1E;">{{item.empName}}</p>
-                                                    <p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 24px;overflow: hidden;">{{item.professorIntroduction}}</p>
+                                                    <p class="mouseHover" style="color:#1A1A1E;cursor: pointer;">{{item.empName}}</p>
+                                                    <p class="ellipsisFont1" style="cursor: pointer;margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 24px;overflow: hidden;">{{item.professorIntroduction}}</p>
                                                 </div>
                                             </div>
 
                                             <div slot="content">
                                                 <div class="gendisplay">
-                                                    <div style="position: relative;" @click="tohome(item)">
+                                                    <div style="position: relative;">
                                                         <img v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                         <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                         <img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
@@ -143,12 +143,12 @@
                         <el-tabs v-model="activeName">
                             <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                 <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
-                                    <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                        <div style="position: relative;cursor: pointer;" @click="tohome(item)">
+                                    <div @click="tohome(item)" class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
+                                        <div style="position: relative;cursor: pointer;">
                                             <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                             <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
                                         </div>
-                                        <p class="ellipsisFont1" style="color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;line-height: 20px;">
+                                        <p class="ellipsisFont1 mouseHover" style="cursor: pointer;color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;line-height: 20px;">
                                             {{item.empName}}
                                         </p>
                                     </div>