Skip to content

T
techbook
Commit b455b384 authored by anxixi's avatar anxixi
Browse files
Options

话题相关功能

parent 227f0e6a
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 15 deletions
src/views/assistantpage/redenvelopes.vue
View file @ b455b384
......@@ -60,9 +60,9 @@
</el-table-column>
<el-table-column prop="empName" label="姓名" align="center" width="80">
</el-table-column>
<el-table-column prop="userSubscribe" label="是否关注公众号" align="center" width="140">
<el-table-column prop="noticeState" label="是否关注公众号" align="center" width="140">
<template slot-scope="scope">
<p>{{scope.row.userSubscribe == 1?'已关注':'未关注'}}</p>
<p>{{scope.row.noticeState == 1?'已关注':'未关注'}}</p>
</template>
</el-table-column>
<el-table-column label="话题讨论的内容" align="center" width="280">
......@@ -87,7 +87,7 @@
</el-table-column>
<el-table-column :label="$t('listjson.action')" width="200" align='center' fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.innerStatus==0">
<div v-if="scope.row.innerStatus==0||scope.row.innerStatus==null">
<el-button type="text" @click="sendStarPackets(5,scope.row)">
5元
</el-button>
......@@ -101,7 +101,7 @@
其他金额
</el-button>
</div>
<el-button type="text" @click="setsendTipsMsg(scope.row)" v-if="scope.row.userSubscribe != 1">
<el-button type="text" @click="setsendTipsMsg(scope.row)" v-if="scope.row.noticeState != 1">
给用户发一条短信通知
</el-button>
<el-button v-if="scope.row.innerStatus&&scope.row.innerStatus!=0" type="text" @click="amountinfo(scope.row)">
......@@ -166,7 +166,7 @@
<p>{{amountinfodata.sendTime}}</p>
</el-form-item>
<el-form-item label="是否领取红包：">
<p>{{amountinfodata.innerStatus==0?'未发放':amountinfodata.innerStatus==1?'发放失败':amountinfodata.innerStatus==2?'未领取':amountinfodata.innerStatus==3?'已领取':amountinfodatainnerStatus==4?'已过期':'——'}}</p>
<p>{{amountinfodata.innerStatus==0?'未发放':amountinfodata.innerStatus==1?'发放失败':amountinfodata.innerStatus==2?'未领取':amountinfodata.innerStatus==3?'已领取':amountinfodata.innerStatus==4?'已过期':'——'}}</p>
</el-form-item>
<el-form-item label="星级：">
<p>{{amountinfodata.starRate}}颗星</p>
......
src/views/publishactivity/richtext.vue
View file @ b455b384
<template>
<div id="wangeditor">
<div id="wangeditor" style="position: relative">
<div ref="editorElem" style="text-align:left;"></div>
<p v-if="isplaceholder" style="position: absolute;left: 15px;top: 28px;color: #aaaaaa;">{{discussTips}}</p>
</div>
</template>
......@@ -15,9 +16,10 @@
editorContent: '',
uploadHostHeader:'/base/upload/uploadPicture',
ischannelIntroduction:true,
isplaceholder:true,
};
},
props: ['catchData','channelIntroduction','istopic'],
props: ['catchData','channelIntroduction','istopic','discussTips'],
methods:{
},
......@@ -26,6 +28,11 @@
// 编辑器的事件，每次改变会获取其html内容
this.editor.customConfig.onchange = html => {
this.$emit('dataEvent',html);
if(this.publicFun.getTextInRichtext(html)&&this.publicFun.getTextInRichtext(html).length>=1){
this.isplaceholder = false;
}else{
this.isplaceholder = true;
}
// 把这个html通过catchData的方法传入父组件
};
this.editor.customConfig.uploadImgShowBase64 = true; // 使用 base64 保存图片
......@@ -97,6 +104,9 @@
istopic(val){
this.editor.txt.html(this.channelIntroduction)
},
discussTips(val){
this.discussTips = val;
}
}
}
</script>
......
src/views/topicpage/commentdetail.vue
View file @ b455b384
......@@ -248,7 +248,7 @@
<p>{{commentscommentdata.createdTimeStr}}</p>
<p style="font-size: 12px;">
<span @click="dictdialog(commentscommentdata,3)"><i style="font-size: 12px" class="iconfont icon-guzhangtousu"></i> 举报</span>
<span v-if="publicFun.isgetUserRoleFunc(2)" style="margin-left: 30px;" @click="deletedauthority(commentscommentdata.id,commentindex,contentList)"><i style="font-size: 12px" class="iconfont icon-lajitongshanchu"></i> 删除</span>
<span v-if="publicFun.isgetUserRoleFunc(2)||(commentdata.userInfo&&empId==commentdata.userInfo.empId)" style="margin-left: 30px;" @click="deletedauthority(commentscommentdata.id,commentindex,contentList)"><i style="font-size: 12px" class="iconfont icon-lajitongshanchu"></i> 删除</span>
<span style="margin-left: 30px;" @click="commentscommentdata.iscomment = !commentscommentdata.iscomment"><i style="font-size: 12px" class="iconfont icon-pinglun"></i> 回复</span>
<span style="margin-left: 30px;" :style="commentscommentdata.isHasHot?'color:#5d78ff':''" @click="topiczan(commentscommentdata,true)"><i style="font-size: 12px" class="iconfont icon-zan1"></i> {{commentscommentdata.likeNumberStr == 0?'赞':commentscommentdata.likeNumberStr}}</span>
</p>
......
src/views/topicpage/discussall.vue
View file @ b455b384
......@@ -129,7 +129,7 @@
<!-- 积分-->
<dialogintegralbar ref="childintegral"></dialogintegralbar>
<!-- 快速登录-->
<expertVisible ref="login" :registerType="102"></expertVisible>
<expertVisible ref="login" @dataEvent="successlogin" :registerType="102"></expertVisible>
<el-dialog
:visible.sync="visible"
......@@ -184,6 +184,7 @@
moderatorSetting:{},
isdiscussdialog:false,
moderatorCount:0,
isdialoglogin:false,
}
},
components:{
......@@ -205,6 +206,7 @@
//评论
clkdiscussdialog(){
if(!this.publicFun.getUserInfoCookieType()){
this.isdialoglogin = true;
this.$refs.login.isexpertVisible();
return
}
......@@ -314,7 +316,15 @@
console.log("提交出错");
return false;
});
}
},
successlogin(state){
if(state){
if(this.isdialoglogin){
this.isdiscussdialog = true;
this.this.isdialoglogin = false;
}
}
},
},
beforeDestroy() { // 在组件生命周期结束的时候销毁。
window.removeEventListener('scroll', this.menu);
......
src/views/topicpage/discussdialog.vue
View file @ b455b384
......@@ -3,7 +3,7 @@
<!--新增-->
<el-dialog title="发表讨论" :visible.sync="visible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensor" class="dialogWrap dialogWraptopic">
<div class="centerQrCode" style="margin: 0 50px;">
<rich-text @dataEvent="statedata" :istopic="richstate" :channelIntroduction="discussContent"></rich-text>
<rich-text @dataEvent="statedata" :istopic="richstate" :discussTips="discussTips?discussTips:changediscussTips" :channelIntroduction="discussContent"></rich-text>
<div class="gendisplay topic_select" v-if="!topicid">
<div style="margin-right: 20px;">
<p style="margin: 10px 0;color: #1A1A1E;">话题圈子：</p>
......@@ -119,9 +119,10 @@
topic_count2:1,
topicId:'',
btnpush:true,
changediscussTips:'',
}
},
props:['topicid'],
props:['topicid','discussTips'],
components:{
richText
},
......@@ -143,9 +144,11 @@
this.topicFirst2 = row.topicTitle;
this.topicFirstvisible2 = false;
this.topicId = row.topicId;
this.changediscussTips = row.discussTips;
},
topicFirsttype(row){
this.topicFirst = row.topicTitle;
this.changediscussTips = row.discussTips;
this.topicFirstvisible = false;
this.topicFirst2 = '请选择话题';
this.topicId = row.topicId;
......
src/views/topicpage/topicdetail.vue
View file @ b455b384
......@@ -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)" 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)" 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>
......@@ -436,7 +436,7 @@
<i class="iconfont" :class="item.topState==0?'icon-jiajinghuax':'icon-quxiaojinghua'"></i>
{{item.isStar==0?'精华':'取消精华'}}
</span>
<span v-if="publicFun.isgetUserRoleFunc(2)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" @click="deletediscuss(item.id,index)">
<span v-if="publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" @click="deletediscuss(item.id,index)">
<i style="margin-right: 5px;" class="iconfont icon-lajitongshanchu"></i>
删除
</span>
......@@ -531,7 +531,7 @@
<div v-if="isdiscussdialog">
<discussdialog ref="topicdiscuss" @dataEvent="closediscuss" @pushdataEvent="pushdataEvent" :topicid="$route.query.id"></discussdialog>
<discussdialog ref="topicdiscuss" @dataEvent="closediscuss" @pushdataEvent="pushdataEvent" :discussTips="contentdata.discussTips" :topicid="$route.query.id"></discussdialog>
</div>
<!-- 积分-->
<dialogintegralbar ref="childintegral"></dialogintegralbar>
......@@ -604,6 +604,7 @@
discussTopList:[],//置顶数据
NormalDiscussstate:0,//查询状态
isdiscussdialog:false,
isdialoglogin:false,
}
},
components:{
......@@ -616,6 +617,7 @@
//评论
clkdiscussdialog(){
if(!this.publicFun.getUserInfoCookieType()){
this.isdialoglogin = true;
this.$refs.login.isexpertVisible();
return
}
......@@ -1310,6 +1312,10 @@
this.empId = this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())).empId:undefined;
this.getMyproject();
this.getselectByEmpId();
if(this.isdialoglogin){
this.isdiscussdialog = true;
this.this.isdialoglogin = false;
}
}
},
//查找话题下专家
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment