Merge remote-tracking branch 'origin/master'

src/views/assistantpage/redenvelopes.vue

@@ -157,11 +157,14 @@
                     <p>{{amountinfodata.senderName}}</p>
                 </el-form-item>
                 <el-form-item label="ID：">
-                    <p>{{amountinfodata.empId}}</p>
+                    <p>{{amountinfodata.discussId}}</p>
                 </el-form-item>
                 <el-form-item label="账号：">
                     <p>{{amountinfodata.empAccount}}</p>
                 </el-form-item>
+                <el-form-item label="昵称：">
+                    <p>{{amountinfodata.nickName}}</p>
+                </el-form-item>
                 <el-form-item label="姓名：">
                     <p>{{amountinfodata.empName}}</p>
                 </el-form-item>

src/views/topicpage/discussall.vue

@@ -3,7 +3,7 @@
         <div class="divclasschild">
             <div class="descContentcal gendisplay" v-if="moderatorSetting.descContent&&moderatorSetting.descContent.length>1">
                 <img src="../../assets/img/mobile/laba@2x.png" alt="" style="width: 23px;position: absolute;left: 30px;bottom: 9px;">
-                <p @click="moderatorSetting.descUrl?descUrletail():''" :style="moderatorSetting.descUrl?'cursor: pointer;':''" style="width: 100%;height: 20px;overflow: hidden;" class="ellipsisFont1">话题说明：{{moderatorSetting.descContent}}</p>
+                <p @click="moderatorSetting.descUrl?descUrletail():''" :style="moderatorSetting.descUrl?'cursor: pointer;':''" style="width: 100%;height: 20px;overflow: hidden;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p>
             </div>
             <div class="gendisplay">
                 <div style="background: #FFFFFF;border-radius: 3px;">
@@ -257,9 +257,9 @@
             closediscuss(){
                 this.isdiscussdialog = false;
             },
-            pushdataEvent(row){
+            pushdataEvent(id){
                 this.isdiscussdialog = false;
-                this.$refs.childintegral.getintegralCode('ITV001',row.id,5);
+                this.$refs.childintegral.getintegralCode('ITV001',id,5);
             },
             //话题列表
             getselectTopicList(){

src/views/topicpage/discussdialog.vue

@@ -252,7 +252,7 @@
                         api.addTopicDiscuss(params).then(response => {
                             if(response.code == 0) {
                                 this.$message.success('发表成功');
-                                this.$emit('pushdataEvent',response.result);
+                                this.$emit('pushdataEvent',params.topicId);
                                 if(!this.topicid){
                                     this.$router.push({path:"/topicDetails",query:{id:this.topicId}});
                                 }

src/views/topicpage/topicdetail.vue

@@ -311,7 +311,7 @@
                                                         </i>
                                                         <span style="line-height: 20px;" v-html="publicFun.analyzeEmoji(itemchild.commentsContent)"></span>
                                                         <span class="childreplybtn" style="right: 40px;" @click="iscommentclk(commentsitem.childFirstList,itemchild)">回复</span>
-                                                        <span class="childreplybtn"  v-if="empId==item.createdBy" @click="isremoverclk(commentsitem.childFirstList,itemchild,commentsitem,childindex)">删除</span>
+                                                        <span class="childreplybtn" v-if="(publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId))" @click="isremoverclk(commentsitem.childFirstList,itemchild,commentsitem,childindex)">删除</span>
                                                     </div>
 <!--                                                    某人对某人d回复-->
                                                     <div>
@@ -401,7 +401,7 @@
                                                 <p>{{commentsitem.createdTimeStr}}</p>
                                                 <p>
                                                     <span v-if="commentsitem.createdBy!=empId" @click="dictdialog(commentsitem,3)"><i style="font-size: 12px" class="iconfont icon-guzhangtousu"></i> 举报</span>
-                                                    <span v-if="publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId)" style="margin-left: 30px;"  @click="deletedauthority(commentsitem.id,commentindex,item.commentList)"><i style="font-size: 12px" class="iconfont icon-lajitongshanchu"></i> 删除</span>
+                                                    <span v-if="(publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId))||empId==commentsitem.createdBy" style="margin-left: 30px;"  @click="deletedauthority(commentsitem.id,commentindex,item.commentList)"><i style="font-size: 12px" class="iconfont icon-lajitongshanchu"></i> 删除</span>
                                                     <span style="margin-left: 30px;" @click="commentsitem.iscomment = !commentsitem.iscomment"><i style="font-size: 12px" class="iconfont icon-pinglun"></i> 回复</span>
                                                     <span style="margin-left: 30px;"  :style="commentsitem.isHasHot?'color:#5d78ff':''" @click="topiczan(commentsitem,true)"><i style="font-size: 12px" class="iconfont icon-zan1"></i> {{commentsitem.likeNumberStr == 0?'赞':commentsitem.likeNumberStr}}</span>
                                                 </p>
@@ -504,14 +504,17 @@
                                         </div>
                                         <div style="margin: 10px 0 0 15px;">
                                             <p style="color:#1A1A1E;">{{item.empName}}</p>
-                                            <p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA">{{item.professorIntroduction}}</p>
+                                            <el-tooltip placement="top" effect="light">
+                                                <div slot="content" style="width: 300px;">{{item.professorIntroduction}}</div>
+                                                <p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA">{{item.professorIntroduction}}</p>
+                                            </el-tooltip>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </el-tab-pane>
                     </el-tabs>
-                    <p @click="getProfessorpicId(20)" v-if="professorlist&&professorlist.length>=6">
+                    <p @click="getProfessorpicId(professorUnfold?20:5)" v-if="professorlist&&professorlist.length>=6">
                         {{professorUnfold?'展开':'收起'}} <i class="iconfont" :class="professorUnfold?'icon-xiala':'icon-xiala-copy'" style="font-size: 12px"></i>
                     </p>
                 </div>
@@ -666,9 +669,9 @@
             closediscuss(){
                 this.isdiscussdialog = false;
             },
-            pushdataEvent(row){
+            pushdataEvent(id){
                 this.isdiscussdialog = false;
-                this.$refs.childintegral.getintegralCode('ITV001',row.id,5);
+                this.$refs.childintegral.getintegralCode('ITV001',id,5);
             },
             //加入取消加入
             setjoinTopic(){
@@ -1376,9 +1379,10 @@
             },
             //查找话题下专家
             getProfessorpicId(count){
+                this.professorUnfold = !this.professorUnfold;
                 let params = {
                     pagination: {
-                        number: 5,
+                        number: count,
                         numberOfPages: 1,
                     },
                     search:{
@@ -1405,7 +1409,7 @@
                 this.getselectByEmpId();
             }
             this.getselectHotAndTopList();
-            this.getProfessorpicId();
+            this.getProfessorpicId(5);
             api.selectTopicById(this.$route.query.id).then((res) => {
                 if (res.code == 0) {
                     this.contentdata = res.result;

src/views/topicpage/topictype.vue

@@ -220,9 +220,9 @@
             closediscuss(){
                 this.isdiscussdialog = false;
             },
-            pushdataEvent(row){
+            pushdataEvent(id){
                 this.isdiscussdialog = false;
-                this.$refs.childintegral.getintegralCode('ITV001',row.id,5);
+                this.$refs.childintegral.getintegralCode('ITV001',id,5);
             },
             //查询版主
             getModerator(count){