Skip to content

T
techbook
Commit 4852e702 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a90a80af b455b384
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 21 deletions
public/css/common.scss
View file @ 4852e702
......@@ -443,6 +443,14 @@ i {
/*! autoprefixer: on */
-webkit-line-clamp: 2;
}
.ellipsisFont3{
overflow: hidden;
display: -webkit-box;
/*! autoprefixer: off */
-webkit-box-orient : vertical;
/*! autoprefixer: on */
-webkit-line-clamp: 3;
}
.ellipsisFont5{
overflow: hidden;
display: -webkit-box;
......
src/views/assistantpage/redenvelopes.vue
View file @ 4852e702
......@@ -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/moderatorpage/moderatorlist.vue
View file @ 4852e702
......@@ -84,7 +84,7 @@
<el-form-item label="版主介绍：" prop="moderatorIntroduction">
<el-input maxlength="500" v-model="expertData.moderatorIntroduction" type="textarea" :rows="4"></el-input>
</el-form-item>
<el-form-item label="专家头像：">
<el-form-item label="版主头像：">
<p class="imgTitle">请确保图片清晰、完整，仅支持PNG，JPG,JPEG，最大不超过2M。</p>
<div v-if="expertData.isUpdate == 2">
<img :src="expertData.empLogo" style="width: 128px;height: 128px;border-radius: 3px;">
......@@ -121,7 +121,7 @@
let valuespace = (rule, value, callback) => {
var reg = /^[a-zA-Z\u4e00-\u9fa5 ]{2,36}$/,reg1 = /^\s+$/g;
if (reg.test(value)&&reg1.test(value)) {
callback(new Error('专家名称格式错误'))
callback(new Error('版主名称格式错误'))
} else {
callback()
}
......@@ -144,7 +144,7 @@
},
expertrules: {
account: [{required: true, validator:validate.checkMobileAndEmail, trigger: 'blur'}],
empName: [{required: true,message: '请输入专家名称',trigger: 'blur'},
empName: [{required: true,message: '请输入版主名称',trigger: 'blur'},
{validator: valuespace, trigger: 'blur'}],
moderatorTitle: [{required: true,message: '请输入版主title',trigger: 'blur'}],
moderatorIntroduction: [{required: true,message: '请输入版主介绍',trigger: 'blur'}],
......
src/views/publishactivity/richtext.vue
View file @ 4852e702
<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 @ 4852e702
......@@ -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 @ 4852e702
......@@ -65,7 +65,7 @@
</p>
<div class="gendisplay" style="margin-top: 5px;color: #AAAAAA;font-size: 12px;">
<p>阅读 {{itemchild.topicBrowseStr}}</p>
<p style="margin: 0 10px;">讨论 {{itemchild.topicDiscuss}}</p>
<p style="margin: 0 10px;">讨论 {{itemchild.topicDiscussStr}}</p>
<p>成员 {{itemchild.joinCount}}</p>
</div>
</div>
......@@ -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 @ 4852e702
......@@ -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>
......@@ -77,7 +77,7 @@
</div>
</div>
<el-row style="padding-top: 20px;text-align: center">
<el-button type="primary" @click="pushdiscuss">确定</el-button>
<el-button type="primary" @click="pushdiscuss" :disabled="btnpush">确定</el-button>
<el-button @click="closeSensor">取 消</el-button>
</el-row>
</el-dialog>
......@@ -118,15 +118,23 @@
topic_count:1,
topic_count2:1,
topicId:'',
btnpush:true,
changediscussTips:'',
}
},
props:['topicid'],
props:['topicid','discussTips'],
components:{
richText
},
methods: {
statedata(val){
this.discussContent = val;
let textlength = this.publicFun.unique(this.publicFun.getTextInRichtext(this.discussContent));
if(textlength&&textlength.length>10){
this.btnpush = false;
}else{
this.btnpush = true;
}
},
//添加弹框关闭
closeSensor(){
......@@ -136,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;
......@@ -227,10 +237,6 @@
this.$message.error('请选择话题');
return;
}
if(this.discussContent == ''){
this.$message.error('内容不能为空');
return;
}
let params = {
discussContent:this.discussContent,
simpleContent:this.publicFun.getTextInRichtext(this.discussContent),
......
src/views/topicpage/topicdetail.vue
View file @ 4852e702
This diff is collapsed.
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