Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 5ea0f628 6d706a4e
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 22 deletions
src/common/lang/en.js
View file @ e63c4cfc
...@@ -2248,7 +2248,7 @@ module.exports = { ...@@ -2248,7 +2248,7 @@ module.exports = {
selectIsOrNo:"请选择是否完成签约", selectIsOrNo:"请选择是否完成签约",
suggestTitle:"意向合作内容", suggestTitle:"意向合作内容",
selestSuggestTitle:"请选择意向合作内容", selestSuggestTitle:"请选择意向合作内容",
otherReason:"请输入", otherReason:"Please enter",
isOrNo1:"是否签署合作内容协议（需要对方盖章）", isOrNo1:"是否签署合作内容协议（需要对方盖章）",
selectIsOrNo1:"请选择是否签署合作内容协议", selectIsOrNo1:"请选择是否签署合作内容协议",
intro:"备注说明", intro:"备注说明",
......
src/views/findeventpage/newEventdetail.vue
View file @ e63c4cfc
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</p> </p>
<div class="information_1"> <div class="information_1">
<span class="readCount">{{$t('activityInfo.viewCount')}} {{eventdata.readCountStr}}</span> <span class="readCount">{{$t('activityInfo.viewCount')}} {{eventdata.readCountStr}}</span>
<span v-if="eventdata.baseDataList&&eventdata.baseDataList[0]" class="baseData">{{eventdata.baseDataList?eventdata.baseDataList[0].dataName:''}}</span> <span v-if="eventdata.baseDataList&&eventdata.baseDataList[0]" class="baseData">{{$i18n.locale=='zh-CN'?eventdata.baseDataList[0].dataName:eventdata.baseDataList[0].dataNameEn}}</span>
<span class="hasLive" v-if="eventdata.hasLive == 1">{{$t('activityInfo.liveTitle')}}</span> <span class="hasLive" v-if="eventdata.hasLive == 1">{{$t('activityInfo.liveTitle')}}</span>
<span class="drawTime" v-if="eventdata.drawTime">{{$i18n.locale=='zh-CN'?'距活动还有':''}} <i style="color: #FFA801;">{{eventdata.drawTime}}</i> {{eventdata.timeType==1?$i18n.locale=='zh-CN'?'分钟':'minutes':eventdata.timeType==2?$i18n.locale=='zh-CN'?'小时':'hours':eventdata.timeType==3?$i18n.locale=='zh-CN'?'天':'days':''}}{{$i18n.locale!='zh-CN'?'before the event':''}}</span> <span class="drawTime" v-if="eventdata.drawTime">{{$i18n.locale=='zh-CN'?'距活动还有':''}} <i style="color: #FFA801;">{{eventdata.drawTime}}</i> {{eventdata.timeType==1?$i18n.locale=='zh-CN'?'分钟':'minutes':eventdata.timeType==2?$i18n.locale=='zh-CN'?'小时':'hours':eventdata.timeType==3?$i18n.locale=='zh-CN'?'天':'days':''}}{{$i18n.locale!='zh-CN'?'before the event':''}}</span>
</div> </div>
......
src/views/publishactivity/proactivity.vue
View file @ e63c4cfc
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
<el-form-item :label="$t('pubactivities.guestTitle')+'：'" prop="guestTitle"> <el-form-item :label="$t('pubactivities.guestTitle')+'：'" prop="guestTitle">
<el-input @input="$forceUpdate()" :disabled="guestform.editTitle == true?false:guestform.editTitle == false?true:false" style="width:370px;" maxlength="36" v-model="guestform.guestTitle" :placeholder="$t('pubactivities.plguestTitle')"></el-input> <el-input @input="$forceUpdate()" :disabled="guestform.editTitle == true?false:guestform.editTitle == false?true:false" style="width:370px;" maxlength="36" v-model="guestform.guestTitle" :placeholder="$t('pubactivities.plguestTitle')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('pubactivities.guestDesc')+'：'" prop="guestDesc"> <el-form-item :label="$t('pubactivities.guestDesc')+'：'" prop="linguestDesc">
<el-input @input="$forceUpdate()" :disabled="guestform.guestDesc&&guestform.empId?true:false" style="width:370px;"type="textarea" maxlength="200" :rows="2" v-model="guestform.linguestDesc" :placeholder="$t('partner.otherReason')+$t('pubactivities.guestDesc')"></el-input> <el-input @input="$forceUpdate()" :disabled="guestform.guestDesc&&guestform.empId?true:false" style="width:370px;"type="textarea" maxlength="200" :rows="2" v-model="guestform.linguestDesc" :placeholder="$t('partner.otherReason')+$t('pubactivities.guestDesc')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('pubactivities.guestPhotos')+'：'" ref="guestimg" prop="guestPic"> <el-form-item :label="$t('pubactivities.guestPhotos')+'：'" ref="guestimg" prop="guestPic">
...@@ -696,6 +696,7 @@ ...@@ -696,6 +696,7 @@
linguestName: [{required: true,message: this.$t('pubactivities.plguestname'),trigger: 'blur'}], linguestName: [{required: true,message: this.$t('pubactivities.plguestname'),trigger: 'blur'}],
guestTitle: [{required: true,message: this.$t('pubactivities.plguestTitle'),trigger: 'blur'}], guestTitle: [{required: true,message: this.$t('pubactivities.plguestTitle'),trigger: 'blur'}],
guestPic: [{required: true,message: this.$t('pubactivities.pluploadimg'),trigger: 'blur'}], guestPic: [{required: true,message: this.$t('pubactivities.pluploadimg'),trigger: 'blur'}],
linguestDesc: [{required: true,message: this.$t('partner.otherReason')+this.$t('pubactivities.guestDesc'),trigger: 'blur'}],
}, },
rulesInfo:{ rulesInfo:{
//红包 //红包
...@@ -913,7 +914,7 @@ ...@@ -913,7 +914,7 @@
//弹框嘉宾取消 //弹框嘉宾取消
dialogcancel(){ dialogcancel(){
this.guestVisible=false; this.guestVisible=false;
this.$refs['guestform'].resetFields(); // this.$refs['guestform'].resetFields();
}, },
// 取消 // 取消
cancel(){ cancel(){
...@@ -1005,7 +1006,7 @@ ...@@ -1005,7 +1006,7 @@
guestPic:'', guestPic:'',
guestContact:'', guestContact:'',
}; };
this.$refs['guestform'].resetFields(); // this.$refs['guestform'].resetFields();
}, },
//邀请嘉宾 //邀请嘉宾
addguest(){ addguest(){
......
src/views/topicpage/topicdetail.vue
View file @ e63c4cfc
...@@ -120,12 +120,6 @@ ...@@ -120,12 +120,6 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div style="background: #ffffff;border-radius: 3px;padding: 0 25px;">
<el-tabs class="topic_tab" v-model="dataName" @tab-click="handleClick">
<el-tab-pane label="全部" name="first"></el-tab-pane>
<el-tab-pane label="精华" name="second"></el-tab-pane>
</el-tabs>
</div>
<div v-if="contentdata.baseTopicNotice&&contentdata.baseTopicNotice.isEnable == 1" style="background: #ffffff;border-radius: 3px;padding:15px 17px;margin-top: 15px;"> <div v-if="contentdata.baseTopicNotice&&contentdata.baseTopicNotice.isEnable == 1" style="background: #ffffff;border-radius: 3px;padding:15px 17px;margin-top: 15px;">
<div v-if="contentdata.baseTopicNotice&&contentdata.baseTopicNotice.isEnable == 1" @click="tourldetail(contentdata.baseTopicNotice)" style="margin: 5px 0;"> <div v-if="contentdata.baseTopicNotice&&contentdata.baseTopicNotice.isEnable == 1" @click="tourldetail(contentdata.baseTopicNotice)" style="margin: 5px 0;">
<p style="line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;"> <p style="line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;">
...@@ -133,14 +127,21 @@ ...@@ -133,14 +127,21 @@
<i @click="">{{contentdata.baseTopicNotice.noticeContent}}</i> <i @click="">{{contentdata.baseTopicNotice.noticeContent}}</i>
</p> </p>
</div> </div>
<!-- <div class="gendisplay" v-for="(item,index) in discussTopList" :key="index" @click="tocommentdetail(item)" style="margin: 5px 0;">--> <!-- <div class="gendisplay" v-for="(item,index) in discussTopList" :key="index" @click="tocommentdetail(item)" style="margin: 5px 0;">-->
<!-- <p class="ellipsisFont1" style="width: calc(100% - 42px);line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;height: 28px;overflow: hidden;">--> <!-- <p class="ellipsisFont1" style="width: calc(100% - 42px);line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;height: 28px;overflow: hidden;">-->
<!-- <span style="background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;">置顶</span>--> <!-- <span style="background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;">置顶</span>-->
<!-- <i v-html="item.pcState==0?item.discussContent:item.simpleContent"></i>--> <!-- <i v-html="item.pcState==0?item.discussContent:item.simpleContent"></i>-->
<!-- </p>--> <!-- </p>-->
<!-- <p style="width: 42px;line-height: 28px;color: #AAAAAA;">{{item.topTime}}</p>--> <!-- <p style="width: 42px;line-height: 28px;color: #AAAAAA;">{{item.topTime}}</p>-->
<!-- </div>--> <!-- </div>-->
</div>
<div style="background: #ffffff;border-radius: 3px;padding: 0 25px;">
<el-tabs class="topic_tab" v-model="dataName" @tab-click="handleClick">
<el-tab-pane label="全部" name="first"></el-tab-pane>
<el-tab-pane label="精华" name="second"></el-tab-pane>
</el-tabs>
</div> </div>
<div v-if="(NormalDiscussstate==1&&contentList.length==0)||(NormalDiscussstate==0&&contentList.length==0)" style="text-align: center;height: 300px;padding-top: 80px;background: #ffffff;margin-top: 15px;border-radius: 3px;"> <div v-if="(NormalDiscussstate==1&&contentList.length==0)||(NormalDiscussstate==0&&contentList.length==0)" style="text-align: center;height: 300px;padding-top: 80px;background: #ffffff;margin-top: 15px;border-radius: 3px;">
<p><i style="font-size: 58px;color: #C8CBE0;" class="iconfont icon-hezi501"></i></p> <p><i style="font-size: 58px;color: #C8CBE0;" class="iconfont icon-hezi501"></i></p>
<p style="color:#C8CBE0;">暂无数据</p> <p style="color:#C8CBE0;">暂无数据</p>
...@@ -1291,9 +1292,6 @@ ...@@ -1291,9 +1292,6 @@
this.topicpages = 0; this.topicpages = 0;
api.selectHotAndTopList(this.$route.query.id).then((res) => { api.selectHotAndTopList(this.$route.query.id).then((res) => {
if (res.code == 0) { if (res.code == 0) {
if(res.result.discussTopList){
this.discussTopList = res.result.discussTopList;
}
if(res.result.discussTopList){ if(res.result.discussTopList){
res.result.discussTopList.forEach((item)=>{ res.result.discussTopList.forEach((item)=>{
item.discussContentlin = this.publicFun.getTitlewith(item.pcState==0?(item.discussContent.length>250?item.discussContent.slice(0,250):item.discussContent):(item.simpleContent.length>250?item.simpleContent.slice(0,250):item.simpleContent),item.projectList); item.discussContentlin = this.publicFun.getTitlewith(item.pcState==0?(item.discussContent.length>250?item.discussContent.slice(0,250):item.discussContent):(item.simpleContent.length>250?item.simpleContent.slice(0,250):item.simpleContent),item.projectList);
...@@ -1320,7 +1318,6 @@ ...@@ -1320,7 +1318,6 @@
for(let i in res.result.discussTopList){ for(let i in res.result.discussTopList){
this.contentList.push(res.result.discussTopList[i]); this.contentList.push(res.result.discussTopList[i]);
} }
// this.discussTopList = res.result.discussTopList;
} }
if(res.result.discussHotList){ if(res.result.discussHotList){
res.result.discussHotList.forEach((item)=>{ res.result.discussHotList.forEach((item)=>{
......
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