Skip to content

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

Merge remote-tracking branch 'origin/master'

parents ea61fd97 df9b00ac
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 13 deletions
src/api/api.js
View file @ e158cd4e
......@@ -371,7 +371,7 @@ export default {
fetchPostImg(url, params, method = 'POST') {
var langVal = url.indexOf('?') == -1 ? '?lang=' + lang : '&lang=' + lang,_this = this;
if(publicFun.getCookie("userInfo")) {
// if(publicFun.getCookie("userInfo")) {
return new Promise((resolve, reject) => {
axios({
method: method,
......@@ -400,7 +400,7 @@ export default {
}
})
})
}
// }
},
fetchUploadImg(url, params, method = 'POST') {
......
src/common/lang/en.js
View file @ e158cd4e
......@@ -1975,6 +1975,8 @@ module.exports = {
postevent:'Post event',
eventcover:'Event cover',
eventcoveren:'The recommended size is 750 * 450px, JPG, PNG, JPEG format, the picture is less than 5M',
eventcoveren1:'The recommended size is ',
eventcoveren2:'，JPG、PNG、JPEG format, the picture is less than 5M',
activities:'Activities',
plactivities:'Please enter event content',
activitytime:'Event time',
......
src/common/lang/zh.js
View file @ e158cd4e
......@@ -2072,6 +2072,8 @@ module.exports = {
postevent:'发布活动',
eventcover:'活动封面',
eventcoveren:'建议尺寸750*450px，JPG、PNG、JPEG格式，图片小于5M',
eventcoveren1:'建议尺寸',
eventcoveren2:'，JPG、PNG、JPEG格式，图片小于5M',
activities:'活动内容',
plactivities:'请输入活动内容',
activitytime:'活动时间',
......
src/views/publishactivity/proactivity.vue
View file @ e158cd4e
......@@ -32,7 +32,7 @@
</div>
</el-form-item>
<el-form-item v-if="$route.query.type == '5'" :label="$t('pubactivities.backgroundimage')+'：'" prop="backgroundImg" ref="formbackgroundImg" style="width: 100%;">
<p class="imgTitle">{{$t('pubactivities.eventcoveren')}}</p>
<p class="imgTitle">{{$t('pubactivities.eventcoveren1')}}750*630{{$t('pubactivities.eventcoveren1')}}</p>
<div class="uploadImg">
<up-img :actionUrl="'/base/upload/uploadOriginalImg'" @dataEvent="uploadbackgroundImg" :channelPic="formData.backgroundImg" :upmax="5"></up-img>
</div>
......@@ -99,7 +99,7 @@
</el-form-item>
<el-form-item :label="$t('pubactivities.answerimage')+'：'" prop="luckyBackground" ref="formluckybackground" style="width: 100%;">
<el-input v-show="false" v-model="formData.luckyBackground"></el-input>
<p class="imgTitle">{{$t('pubactivities.eventcoveren')}}</p>
<p class="imgTitle">{{$t('pubactivities.eventcoveren1')}}750*240{{$t('pubactivities.eventcoveren1')}}</p>
<div class="uploadImg">
<up-img :actionUrl="'/base/upload/uploadOriginalImg'" @dataEvent="uploadluckybackground" :channelPic="formData.luckyBackground" :upmax="5"></up-img>
</div>
......@@ -112,14 +112,14 @@
</el-form-item>
<el-form-item :label="$t('pubactivities.accountimg')+'：'" prop="officialAccount" ref="formofficialAccount" style="width: 100%;">
<el-input v-show="false" v-model="formData.officialAccount"></el-input>
<p class="imgTitle">{{$t('pubactivities.eventcoveren')}}</p>
<p class="imgTitle">{{$t('pubactivities.eventcoveren1')}}400*400{{$t('pubactivities.eventcoveren1')}}</p>
<div class="uploadImg">
<up-img :actionUrl="'/base/upload/uploadOriginalImg'" @dataEvent="uploadofficialAccount" :channelPic="formData.officialAccount" :upmax="5"></up-img>
</div>
</el-form-item>
<el-form-item :label="$t('pubactivities.qrimg')+'：'" prop="groupCode" ref="formgroupCode" style="width: 100%;">
<el-input v-show="false" v-model="formData.groupCode"></el-input>
<p class="imgTitle">{{$t('pubactivities.eventcoveren')}}</p>
<p class="imgTitle">{{$t('pubactivities.eventcoveren1')}}400*400{{$t('pubactivities.eventcoveren1')}}</p>
<div class="uploadImg">
<up-img :actionUrl="'/base/upload/uploadOriginalImg'" @dataEvent="uploadgroupCode" :channelPic="formData.groupCode" :upmax="5"></up-img>
</div>
......
src/views/publishactivity/richtext.vue
View file @ e158cd4e
......@@ -44,6 +44,7 @@
if(response.code == 0) {
insert(response.result.fileUpload)
} else {
this.$emit('dataEvent_img',true);
this.$message.error(response.msgCode);
}
})
......
src/views/topicpage/topicdetail.vue
View file @ e158cd4e
......@@ -75,7 +75,7 @@
<!-- maxlength="5000"-->
<!-- show-word-limit-->
<!-- ></el-input>-->
<rich-text @dataEvent="statedata" :istopic="richstate" :channelIntroduction="discussContent"></rich-text>
<rich-text @dataEvent="statedata" @dataEvent_img="imglose" :istopic="richstate" :channelIntroduction="discussContent"></rich-text>
<div style="line-height: 55px;">
<div class="gendisplay">
<div class="gendisplay" style="width: 400px;">
......@@ -198,10 +198,10 @@
</div>
<div>
<div style="margin: 15px 0;color:#1A1A1E;line-height: 24px;" @click="eventtopiccontent($event)">
<span v-if="item.alltext" v-html="publicFun.analyzeEmoji(item.discussContentlin+'...')"></span>
<span v-else v-html="publicFun.analyzeEmoji(item.discussContentconst)"></span>
<span v-if="item.alltext" v-html="item.pcState==1?(item.discussContentlin+(item.discussContentlin.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span>
<span v-else v-html="item.pcState==1?item.discussContentconst:publicFun.analyzeEmoji(item.discussContentconst)"></span>
<i
v-if="publicFun.getTextInRichtext(item.discussContentconst).length>140"
@click="item.alltext = !item.alltext"
style="color: #5D78FF;cursor: pointer">
{{item.alltext?'全文':'收起'}}
......@@ -779,7 +779,7 @@
item.discussContentconst = this.publicFun.getTitlewith(item.discussContent,item.projectList);
item.iscomment = false; //初始讨论下的评论输入
item.isemjovisible = false;//初始讨论下的评论表情
item.alltext = true; //讨论全文是否展开
item.alltext = item.pcState==0?(item.discussContent.length>140?true:false):(item.simpleContent.length>140?true:false); //讨论全文是否展开
item.visibledian = false; //讨论右上角操作
item.wordarea = ''; //评论文字
item.commentsState = true; //公开私密
......@@ -812,6 +812,12 @@
return false;
});
},
imglose(){
if(!this.publicFun.getCookie("userInfo")){
this.$refs.login.isexpertVisible();
return
}
},
//添加话题讨论
pushdiscuss(){
if(!this.publicFun.getCookie("userInfo")){
......@@ -985,7 +991,7 @@
item.discussContentconst = this.publicFun.getTitlewith(item.discussContent,item.projectList);
item.iscomment = false; //初始讨论下的评论输入
item.isemjovisible = false;//初始讨论下的评论表情
item.alltext = true; //讨论全文是否展开
item.alltext = item.pcState==0?(item.discussContent.length>140?true:false):(item.simpleContent.length>140?true:false); //讨论全文是否展开
item.visibledian = false; //讨论右上角操作
item.wordarea = ''; //评论文字
item.commentsState = true; //公开私密
......@@ -1014,7 +1020,7 @@
item.isdiscussHotList = true; //热门
item.iscomment = false; //初始讨论下的评论输入
item.isemjovisible = false;//初始讨论下的评论表情
item.alltext = true; //讨论全文是否展开
item.alltext = item.pcState==0?(item.discussContent.length>140?true:false):(item.simpleContent.length>140?true:false); //讨论全文是否展开
item.visibledian = false; //讨论右上角操作
item.wordarea = ''; //评论文字
item.commentsState = true; //公开私密
......
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