Skip to content

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

Merge remote-tracking branch 'origin/master'

parents c3178158 c0745c4c
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 79 deletions
src/common/lang/en.js
View file @ 0c39ecec
...@@ -1912,6 +1912,7 @@ module.exports = { ...@@ -1912,6 +1912,7 @@ module.exports = {
myJoin:"Participated Events", myJoin:"Participated Events",
timeZone:"TimeZone", timeZone:"TimeZone",
recommendFor:"Recommended for you", recommendFor:"Recommended for you",
relatedInformation:'related Information',
date:"Date", date:"Date",
signUpDialogTitle: "Sign up", signUpDialogTitle: "Sign up",
liveTitle:" Live", liveTitle:" Live",
...@@ -1970,6 +1971,8 @@ module.exports = { ...@@ -1970,6 +1971,8 @@ module.exports = {
shareFriend:"Share to friends", shareFriend:"Share to friends",
shareComment:"Share to moments", shareComment:"Share to moments",
industryReportZy:"Insight into industry development, speak with data, and interpret technical directions, the industry research reports you want are here.", industryReportZy:"Insight into industry development, speak with data, and interpret technical directions, the industry research reports you want are here.",
close:'Close',
open:'Open',
}, },
...@@ -2049,6 +2052,11 @@ module.exports = { ...@@ -2049,6 +2052,11 @@ module.exports = {
addone:'Add one', addone:'Add one',
create:'Create', create:'Create',
deletefield:'Delete field', deletefield:'Delete field',
ContactDetails:'Contact Details',
guesttitle: 'title',
guestDesc:'Guest Profile',
guestUp:'Up',
guestDown:'Down',
guestname:'Guest name', guestname:'Guest name',
plguestname:'Please enter guest name', plguestname:'Please enter guest name',
guestTitle:'Guest Title', guestTitle:'Guest Title',
......
src/common/lang/zh.js
View file @ 0c39ecec
...@@ -2007,6 +2007,7 @@ module.exports = { ...@@ -2007,6 +2007,7 @@ module.exports = {
myJoin: "我参与的活动", myJoin: "我参与的活动",
timeZone: "时区", timeZone: "时区",
recommendFor: "为您推荐", recommendFor: "为您推荐",
relatedInformation:'相关内容',
date: "时间", date: "时间",
signUpDialogTitle: "我要报名", signUpDialogTitle: "我要报名",
liveTitle: " 直播", liveTitle: " 直播",
...@@ -2062,6 +2063,9 @@ module.exports = { ...@@ -2062,6 +2063,9 @@ module.exports = {
shareFriend: "分享给朋友", shareFriend: "分享给朋友",
shareComment: "分享到朋友圈", shareComment: "分享到朋友圈",
industryReportZy: "洞悉行业发展，用数据说话，解读技术方向，你想要的行业研究报告都在这里。", industryReportZy: "洞悉行业发展，用数据说话，解读技术方向，你想要的行业研究报告都在这里。",
close:'收起',
open:'展开',
}, },
//活动 //活动
...@@ -2140,6 +2144,11 @@ module.exports = { ...@@ -2140,6 +2144,11 @@ module.exports = {
addone: '新增一条', addone: '新增一条',
create: '创建', create: '创建',
deletefield: '删除字段', deletefield: '删除字段',
ContactDetails:'嘉宾联系方式',
guestDesc:'嘉宾简介',
guestUp:'上移',
guestDown:'下移',
guesttitle: '嘉宾title',
guestname: '嘉宾名称', guestname: '嘉宾名称',
plguestname: '请输入嘉宾名称', plguestname: '请输入嘉宾名称',
guestTitle: '嘉宾Title', guestTitle: '嘉宾Title',
......
src/views/categorypage/category.vue
View file @ 0c39ecec
...@@ -182,11 +182,11 @@ ...@@ -182,11 +182,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" " prop="otherContent" v-if="isotherContent"> <el-form-item label=" " v-if="isotherContent">
<el-input style="width: 300px;" maxlangth="36" v-model="formData.otherContent" placeholder="请输入内容"></el-input> <el-input @input="$forceUpdate()" style="width: 300px;" maxlength="50" v-model="formData.otherContent" placeholder="请输入内容"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="重要信息补充：" prop="supplementInfo"> <el-form-item label="重要信息补充：" prop="supplementInfo">
<el-input type="textarea" :rows="4" maxlangth="500" style="width: 300px;" placeholder="例如：联系方式/联系人/大赛名称/履约名称等信息补充" v-model="formData.supplementInfo"></el-input> <el-input @input="$forceUpdate()" type="textarea" :rows="4" maxlength="500" style="width: 300px;" placeholder="例如：联系方式/联系人/大赛名称/履约名称等信息补充" v-model="formData.supplementInfo"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row style="padding-top: 20px;text-align: center"> <el-row style="padding-top: 20px;text-align: center">
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
//校验 //校验
rules: { rules: {
supplementInfo: [{required: true,message:'请输入重要信息补充',trigger: 'blur'}], supplementInfo: [{required: true,message:'请输入重要信息补充',trigger: 'blur'}],
otherContent: [{required: true,message:'请输入内容',trigger: 'blur'}], // otherContent: [{required: true,message:'请输入内容',trigger: 'blur'}],
categoryCode: [{required: true,message:'请选择分类',trigger: 'change'}], categoryCode: [{required: true,message:'请选择分类',trigger: 'change'}],
linprojectLabelDTOList: [{required: true,message:'请选择标签',trigger: 'change'}], linprojectLabelDTOList: [{required: true,message:'请选择标签',trigger: 'change'}],
}, },
...@@ -264,6 +264,10 @@ ...@@ -264,6 +264,10 @@
closeSensor(){ closeSensor(){
this.$refs['formData'].resetFields(); this.$refs['formData'].resetFields();
this.isotherContent = false; this.isotherContent = false;
this.formData = {
linprojectLabelDTOList:[],
otherContent:'',
};
}, },
tagging(row){ tagging(row){
if(row.categoryCode){ if(row.categoryCode){
...@@ -271,11 +275,12 @@ ...@@ -271,11 +275,12 @@
if(response.code == 0) { if(response.code == 0) {
let linprojectLabelDTOList = []; let linprojectLabelDTOList = [];
this.formData = response.result; this.formData = response.result;
this.formData.otherContent = '';
for(let i in this.formData.projectLabelDTOList){ for(let i in this.formData.projectLabelDTOList){
linprojectLabelDTOList.push(this.formData.projectLabelDTOList[i].labelCode) linprojectLabelDTOList.push(this.formData.projectLabelDTOList[i].labelCode)
if(this.formData.projectLabelDTOList[i].labelCode == 'LT08'){ if(this.formData.projectLabelDTOList[i].labelCode == 'LT08'){
this.isotherContent = true; this.isotherContent = true;
this.formData.otherContent = this.formData.projectLabelDTOList[i].otherContent; if(this.formData.projectLabelDTOList[i].otherContent)this.formData.otherContent = this.formData.projectLabelDTOList[i].otherContent;
} }
} }
this.formData.linprojectLabelDTOList = linprojectLabelDTOList; this.formData.linprojectLabelDTOList = linprojectLabelDTOList;
...@@ -297,6 +302,7 @@ ...@@ -297,6 +302,7 @@
window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+row.projectId+'&state=0'); window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+row.projectId+'&state=0');
}, },
supplementContent(){ supplementContent(){
this.$forceUpdate();
for(let i in this.formData.linprojectLabelDTOList){ for(let i in this.formData.linprojectLabelDTOList){
if(this.formData.linprojectLabelDTOList[i] == 'LT08'){ if(this.formData.linprojectLabelDTOList[i] == 'LT08'){
this.isotherContent = true; this.isotherContent = true;
...@@ -310,9 +316,17 @@ ...@@ -310,9 +316,17 @@
setamount(){ setamount(){
this.$refs.formData.validate((valid) => { this.$refs.formData.validate((valid) => {
if(valid) { if(valid) {
if(this.formData.linprojectLabelDTOList.length == 0){
this.$message.error('请选择标签');
return
}
let projectLabelDTOList = []; let projectLabelDTOList = [];
for(let i in this.formData.linprojectLabelDTOList){ for(let i in this.formData.linprojectLabelDTOList){
if( this.formData.linprojectLabelDTOList[i] == 'LT08'){ if( this.formData.linprojectLabelDTOList[i] == 'LT08'){
if(this.formData.otherContent == ''){
this.$message.error('请输入内容');
return
}
projectLabelDTOList.push({labelCode:this.formData.linprojectLabelDTOList[i],otherContent:this.formData.otherContent}); projectLabelDTOList.push({labelCode:this.formData.linprojectLabelDTOList[i],otherContent:this.formData.otherContent});
}else{ }else{
projectLabelDTOList.push({labelCode:this.formData.linprojectLabelDTOList[i]}); projectLabelDTOList.push({labelCode:this.formData.linprojectLabelDTOList[i]});
...@@ -327,6 +341,7 @@ ...@@ -327,6 +341,7 @@
linprojectLabelDTOList:[], linprojectLabelDTOList:[],
}; };
this.getselectCoreProjectList(); this.getselectCoreProjectList();
this.authcountdata();
} else { } else {
this.$message.error(response.msgCode); this.$message.error(response.msgCode);
} }
...@@ -499,7 +514,7 @@ ...@@ -499,7 +514,7 @@
item.industryId = item.dictKey; item.industryId = item.dictKey;
item.screenchildList = null; item.screenchildList = null;
} ); } );
this.subjfectlist = response.result; if(response.result)this.subjfectlist = response.result;
} else { } else {
this.$message.error(response.msgCode); this.$message.error(response.msgCode);
} }
......
src/views/findeventpage/newEventdetail.vue
View file @ 0c39ecec
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
{{eventdata.channelTitle}} {{eventdata.channelTitle}}
</p> </p>
<div class="information_1"> <div class="information_1">
<span class="readCount">浏览 {{eventdata.readCountStr}}</span> <span class="readCount">{{$t('activityInfo.viewCount')}} {{eventdata.readCountStr}}</span>
<span class="baseData">{{eventdata.baseDataList?eventdata.baseDataList[0].dataName:''}}</span> <span v-if="eventdata.baseDataList&&eventdata.baseDataList[0]" class="baseData">{{eventdata.baseDataList?eventdata.baseDataList[0].dataName:''}}</span>
<span class="hasLive" v-if="eventdata.hasLive == 1">直播</span> <span class="hasLive" v-if="eventdata.hasLive == 1">{{$t('activityInfo.liveTitle')}}</span>
<span class="drawTime" v-if="eventdata.drawTime">距活动还有 <i style="color: #FFA801;">{{eventdata.drawTime}}</i> {{eventdata.timeType==1?'分钟':eventdata.timeType==2?'小时':eventdata.timeType==3?'天':''}}</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>
<div class="gendisplay information_2"> <div class="gendisplay information_2">
<div> <div>
<p>时区：{{eventdata.timeZoneName}}</p> <p>{{$t('activityInfo.timeZone')}}：{{eventdata.timeZoneName}}</p>
<p>活动时间：{{eventdata.channelStartTime}} - {{eventdata.channelStartTime}}</p> <p>{{$t('activityInfo.activitytime')}}：{{eventdata.channelStartTime}} - {{eventdata.channelStartTime}}</p>
<p>报名截止：{{eventdata.activityEndTime}}</p> <p>{{$t('activityInfo.applyEnd')}}：{{eventdata.activityEndTime}}</p>
<p>发起人：{{eventdata.channelOriginateName}} <p>{{$t('activityInfo.activityCreated')}}：{{eventdata.channelOriginateName}}
<span v-if="eventdata.isOfficial"><img style="height: 15px;" :src="$i18n.locale=='zh-CN'?require('../../assets/img/apply/official@2x.png'):require('../../assets/img/apply/officialEn.png')" alt=""></span> <span v-if="eventdata.isOfficial"><img style="height: 15px;" :src="$i18n.locale=='zh-CN'?require('../../assets/img/apply/official@2x.png'):require('../../assets/img/apply/officialEn.png')" alt=""></span>
</p> </p>
</div> </div>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<i class="iconfont icon-zhibo"></i> {{$t('activityInfo.liveHasEnd')}} <i class="iconfont icon-zhibo"></i> {{$t('activityInfo.liveHasEnd')}}
</span> </span>
</span> </span>
<p>分享到：<i @click="vueQrVisible = !vueQrVisible" style="cursor: pointer;" class="iconfont icon-gongzhonghao"></i></p> <p>{{$t('shareInfo.shareTitle')}}：<i @click="vueQrVisible = !vueQrVisible" style="cursor: pointer;" class="iconfont icon-gongzhonghao"></i></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
<div class="p_tabs" v-if="guestList.length != 0"> <div class="p_tabs" v-if="guestList.length != 0">
<div class="gendisplay p_tabs_title"> <div class="gendisplay p_tabs_title">
<p> <p>
<span>活动嘉宾<i></i></span> <span>{{$t('activityInfo.activityGuest')}}<i></i></span>
</p> </p>
<p @click="isguestchecked = !isguestchecked" v-if="guestList.length>4"> <p @click="isguestchecked = !isguestchecked" v-if="guestList.length>4">
{{isguestchecked?'收起':'展开'}} {{isguestchecked?$t('shareInfo.close'):$t('shareInfo.open')}}
<i class="iconfont" :class="isguestchecked?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i> <i class="iconfont" :class="isguestchecked?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i>
</p> </p>
</div> </div>
...@@ -81,12 +81,12 @@ ...@@ -81,12 +81,12 @@
{{item.empTitle}} {{item.empTitle}}
</i> </i>
</p> </p>
<div v-if="$i18n.locale=='zh-CN'"> <div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'">
<popoverBardbar v-if="item.isFriend == 2&&item.empId" :row="item"></popoverBardbar> <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-if="item.isFriend != 2&&item.empId" @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar> <btnbar v-else @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
</div> </div>
</div> </div>
<el-tooltip placement="top-start" effect="light"> <el-tooltip v-if="item.empIntroduction" placement="top-start" effect="light">
<div slot="content" style="width: 200px;">{{item.empIntroduction}}</div> <div slot="content" style="width: 200px;">{{item.empIntroduction}}</div>
<p class="ellipsisFont1" style="color:#1A1A1E;height: 20px;max-width: 90%;">{{item.empIntroduction}}</p> <p class="ellipsisFont1" style="color:#1A1A1E;height: 20px;max-width: 90%;">{{item.empIntroduction}}</p>
</el-tooltip> </el-tooltip>
...@@ -98,19 +98,19 @@ ...@@ -98,19 +98,19 @@
<div class="p_tabs"> <div class="p_tabs">
<div class="gendisplay p_tabs_title"> <div class="gendisplay p_tabs_title">
<p> <p>
<span>活动详情<i></i></span> <span>{{$t('Otherjson.activityview')}}<i></i></span>
</p> </p>
<p v-if="guestList.length != 0" @click="isIntroduction = !isIntroduction"> <p v-if="guestList.length != 0" @click="isIntroduction = !isIntroduction">
{{isIntroduction?'收起':'展开'}} {{isIntroduction?$t('shareInfo.close'):$t('shareInfo.open')}}
<i class="iconfont" :class="isIntroduction?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i> <i class="iconfont" :class="isIntroduction?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i>
</p> </p>
</div> </div>
<div id="htmldetail" :style="isIntroduction&&guestList.length == 0?'':'height: 400px;overflow: hidden;'" v-html="eventdata.channelIntroduction"></div> <div id="htmldetail" :style="isIntroduction||guestList.length == 0?'':'height: 400px;overflow: hidden;'" v-html="eventdata.channelIntroduction"></div>
</div> </div>
<div class="p_tabs" v-if="participateList.length != 0"> <div class="p_tabs" v-if="participateList.length != 0">
<div class="gendisplay p_tabs_title"> <div class="gendisplay p_tabs_title">
<p> <p>
<span>最近参与<i></i></span> <span>{{$t('activityInfo.recentParticipated')}}<i></i></span>
</p> </p>
</div> </div>
<div class="participate_user gendisplay"> <div class="participate_user gendisplay">
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<img class="userImg_vip" v-if="item.isProfessor == 1" src="../../assets/img/proFeedBack/vip.png" alt=""> <img class="userImg_vip" v-if="item.isProfessor == 1" src="../../assets/img/proFeedBack/vip.png" alt="">
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt=""> <img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span> </span>
<p @click="tohome(item.empId)" class="ellipsisFont1">{{item.empName}}</p> <p @click="tohome(item.empId)" class="ellipsisFont1 mouseHover">{{item.empName}}</p>
<p class="ellipsisFont1">{{item.empTitle}}</p> <p class="ellipsisFont1">{{item.empTitle}}</p>
<div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'"> <div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar> <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar>
...@@ -129,10 +129,10 @@ ...@@ -129,10 +129,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="p_tabs" v-if="resourcesList.length != 0&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'"> <div class="p_tabs" v-if="resourcesList.length == 0&&recommendList.length != 0&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'">
<div class="gendisplay p_tabs_title"> <div class="gendisplay p_tabs_title">
<p> <p>
<span>为您推荐<i></i></span> <span>{{$t('activityInfo.recommendFor')}}<i></i></span>
</p> </p>
</div> </div>
<div> <div>
...@@ -156,9 +156,9 @@ ...@@ -156,9 +156,9 @@
<div class="gendisplay signup"> <div class="gendisplay signup">
<p class="ellipsisFont1">{{item.channelLabel}}</p> <p class="ellipsisFont1">{{item.channelLabel}}</p>
<div v-if="item.channelType!=5&&userInfo&&userInfo.empId!=item.createdBy||item.channelType!=5&&!userInfo"> <div v-if="item.channelType!=5&&userInfo&&userInfo.empId!=item.createdBy||item.channelType!=5&&!userInfo">
<span v-if="item.activityState==2&&!item.isApply" @click="handleApply(item)">{{item.viewDesc?item.viewDesc:$t('activityInfo.freeApply')}}</span> <span v-if="item.activityState==2&&!item.isApply">{{item.viewDesc?item.viewDesc:$t('activityInfo.freeApply')}}</span>
<span v-if="item.channelType!=4&&item.activityState==2&&item.isApply">{{$t("activityInfo.hasApply")}}</span> <span v-if="item.channelType!=4&&item.activityState==2&&item.isApply">{{$t("activityInfo.hasApply")}}</span>
<span v-if="item.channelType==4&&item.activityState==2&&item.isApply" @click="handleToSuccess">{{$t("commonTitle.vipLookTitle")}}</span> <span v-if="item.channelType==4&&item.activityState==2&&item.isApply">{{$t("commonTitle.vipLookTitle")}}</span>
<span v-if="item.activityState>2">{{item.activityState==4?$t("activityInfo.hasFilled"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span> <span v-if="item.activityState>2">{{item.activityState==4?$t("activityInfo.hasFilled"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span v-if="item.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span> <span v-if="item.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span>
</div> </div>
...@@ -179,19 +179,19 @@ ...@@ -179,19 +179,19 @@
<span class="eventbtn" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span> <span class="eventbtn" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span>
</span> </span>
</div> </div>
<div class="shareIt gendisplay" v-if="resourcesList&&resourcesList.length<=4"> <div class="shareIt gendisplay" v-if="resourcesList&&resourcesList.length<=4&&$i18n.locale=='zh-CN'">
<div> <div>
<VueQRCodeComponent :text="urltext" :size="100" :margin="0"></VueQRCodeComponent> <VueQRCodeComponent :text="url" :size="100" :margin="0"></VueQRCodeComponent>
</div> </div>
<div> <div>
<p>微信扫一扫</p> <p>微信扫一扫</p>
<span>分享此活动给朋友/朋友圈</span> <span>分享此活动给朋友/朋友圈</span>
</div> </div>
</div> </div>
<div class="right_tabs" v-if="(resourcesList.length != 0||recommendList.length != 0)&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'"> <div class="right_tabs" v-if="((resourcesList.length != 0||recommendList.length != 0)&&eventdata.channelType != 2&&$i18n.locale=='zh-CN')||(recommendList.length != 0&&eventdata.channelType == 2)">
<div class="gendisplay right_tabs_title"> <div class="gendisplay right_tabs_title">
<p> <p>
<span style="font-size: 16px;">{{resourcesList.length == 0?'为您推荐':'相关内容'}}<i></i></span> <span style="font-size: 16px;">{{resourcesList.length == 0?$t('activityInfo.recommendFor'):$t('activityInfo.relatedInformation')}}<i></i></span>
</p> </p>
</div> </div>
<div class="recommendType" v-if="resourcesList.length != 0"> <div class="recommendType" v-if="resourcesList.length != 0">
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
}; };
api.getRecommendActivity(params).then(response => { api.getRecommendActivity(params).then(response => {
if(response.code == 0) { if(response.code == 0) {
this.recommendList = response.result; if(response.result)this.recommendList = response.result;
} else { } else {
this.$toast(response.msgCode); this.$toast(response.msgCode);
} }
...@@ -782,11 +782,13 @@ ...@@ -782,11 +782,13 @@
} }
>p:nth-child(2){ >p:nth-child(2){
color: #1A1A1E; color: #1A1A1E;
width: 70px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
overflow: hidden; overflow: hidden;
} }
>p:nth-child(3){ >p:nth-child(3){
width: 70px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
font-size: 12px; font-size: 12px;
......
src/views/findeventpage/userlist.vue
View file @ 0c39ecec
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i> <i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
</p> </p>
<div style="margin-right: 10px;" v-if="item.empId != userInfo.empId"> <div style="margin-right: 10px;" v-if="item.empId != userInfo.empId">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2&&item.empId" :row="item" :placement="true"></popoverBardbar> <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
<btnbar v-if="item.isFriend != 2&&item.empId" :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar> <btnbar v-else :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
</div> </div>
</div> </div>
<p @click="item.empId?tohome(item):''" class="ellipsisFont1" style="color:#AAAAAA;overflow: hidden;"> <p @click="item.empId?tohome(item):''" class="ellipsisFont1" style="color:#AAAAAA;overflow: hidden;">
......
src/views/industryreportspage/pushindustry.vue
View file @ 0c39ecec
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
if(this.isflag == 0){ if(this.isflag == 0){
this.$refs.formreport.clearValidate(); this.$refs.formreport.clearValidate();
} }
if((this.formData.reportContent&&this.formData.reportContent.length == 11)||!this.formData.reportContent){ if(this.formData.reportContent&&this.publicFun.unique(this.formData.reportContent).length == 0&&this.formData.reportContent&&this.formData.reportContent.length < 30){
this.$message.error('请输入报告介绍') this.$message.error('请输入报告介绍')
return return
} }
......
src/views/peoplehomepage/introductionbar.vue
View file @ 0c39ecec
<template> <template>
<div> <div>
<div class="p_jobs p_tabs" v-if="(workList&&workList.length == 0)&&(educationList&&educationList.length == 0)&&(dynamicList&&dynamicList.length == 0)"> <div class="p_jobs p_tabs" v-if="(workList == null||workList&&workList.length == 0)&&(educationList == null||educationList&&educationList.length == 0)&&(dynamicList&&dynamicList.length == 0)">
<div> <div>
<p class="noIntegral"> <p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt=""> <img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
getMyDynamicList(){ getMyDynamicList(){
api.selectMyDynamicList({empId:this.id?this.id:this.userInfo.empId}).then((res)=>{ api.selectMyDynamicList({empId:this.id?this.id:this.userInfo.empId}).then((res)=>{
if(res.code==0){ if(res.code==0){
this.dynamicList = res.result; if(res.result)this.dynamicList = res.result;
}else{ }else{
this.$message.error(res.msg); this.$message.error(res.msg);
} }
......
src/views/peoplehomepage/tabActivitybar.vue
View file @ 0c39ecec
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
<i class="iconfont icon-zhibo"></i> <i class="iconfont icon-zhibo"></i>
{{item.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.baseLive.liveState == 1?$t('activityInfo.living'):item.baseLive.liveState==2&&item.baseLive.liveBack == 0?$t('activityInfo.liveBack'):$t('activityInfo.liveTitle')}} {{item.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.baseLive.liveState == 1?$t('activityInfo.living'):item.baseLive.liveState==2&&item.baseLive.liveBack == 0?$t('activityInfo.liveBack'):$t('activityInfo.liveTitle')}}
</span> </span>
<span style="font-size: 14px;" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId,ismyevent:1}})"> <span style="font-size: 14px;" @click="myeventdetail(item)">
{{item.channelTitle}} {{item.channelTitle}}
</span> </span>
</p> </p>
<p class="ellipsisFont1" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p> <p class="ellipsisFont1" @click="myeventdetail(item)">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<p @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p> <p @click="myeventdetail(item)">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
<p> <p>
<span style="color:#0ABB87;margin-right: 20px;">{{item.channelType==5?$t('pubactivities.participated'):$t('activityInfo.hasApply')}}</span> <span style="color:#0ABB87;margin-right: 20px;">{{item.channelType==5?$t('pubactivities.participated'):$t('activityInfo.hasApply')}}</span>
<span style="margin-right: 20px;">&nbsp;<i v-if="item.channelCityStr" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span> <span style="margin-right: 20px;">&nbsp;<i v-if="item.channelCityStr" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span>
...@@ -86,7 +86,8 @@ ...@@ -86,7 +86,8 @@
methods: { methods: {
myeventdetail(row){ myeventdetail(row){
// this.$router.push({path:'/myeventdetail',query:{id:row.channelId,ismyevent:1}}); // this.$router.push({path:'/myeventdetail',query:{id:row.channelId,ismyevent:1}});
window.open(this.publicFun.getCurrentHrefEnv()+"/myeventdetail?id="+row.channelId+'&ismyevent=1'); window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id=" + row.channelId + "&ismyevent=0&type=" + row.channelType);
// window.open(this.publicFun.getCurrentHrefEnv()+"/myeventdetail?id="+row.channelId+'&ismyevent=1');
}, },
//打开直播 //打开直播
openeventlive(row){ openeventlive(row){
......
src/views/peoplehomepage/userContactbar.vue
View file @ 0c39ecec
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
totalItemCount: 0 totalItemCount: 0
}, },
search: { search: {
empId:this.$route.query.id?this.$route.query.id:this.userInfo.empId, empId:this.$route.query.id?Number(this.$route.query.id):this.userInfo.empId,
otherEmpId:row.empId, otherEmpId:row.empId,
}, },
sort: {} sort: {}
......
src/views/publishactivity/proactivity.vue
View file @ 0c39ecec
...@@ -204,13 +204,13 @@ ...@@ -204,13 +204,13 @@
style="width: 100%"> style="width: 100%">
<el-table-column type="index" :label="$t('pubactivities.serialnumber')" align="center" width="80"> <el-table-column type="index" :label="$t('pubactivities.serialnumber')" align="center" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="guestContact" label="嘉宾联系方式" align="center"> <el-table-column prop="guestContact" :label="$t('pubactivities.ContactDetails')" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="guestName" label="嘉宾姓名" align="center"> <el-table-column prop="guestName" :label="$t('pubactivities.guestname')" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="guestTitle" label="嘉宾title" align="center"> <el-table-column prop="guestTitle" :label="$t('pubactivities.guesttitle')" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="guestDesc" label="嘉宾简介" align="center"> <el-table-column prop="guestDesc" :label="$t('pubactivities.guestDesc')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" effect="light"> <el-tooltip placement="top" effect="light">
<div slot="content" style="width: 300px;line-height: 20px;">{{scope.row.guestDesc}}</div> <div slot="content" style="width: 300px;line-height: 20px;">{{scope.row.guestDesc}}</div>
...@@ -226,16 +226,16 @@ ...@@ -226,16 +226,16 @@
<el-button type="text" @click="deleteguest(scope.$index,guestlist)"> <el-button type="text" @click="deleteguest(scope.$index,guestlist)">
{{$t('pubactivities.delete')}} {{$t('pubactivities.delete')}}
</el-button> </el-button>
<el-button :disabled="scope.$index===0" type="text" @click="moveUp(scope.$index,scope.row,guestlist)">上移</el-button> <el-button :disabled="scope.$index===0" type="text" @click="moveUp(scope.$index,scope.row,guestlist)">{{$t('pubactivities.guestUp')}}</el-button>
<el-button :disabled="scope.$index===(guestlist.length-1)" type="text" @click="moveDown(scope.$index,scope.row,guestlist)">下移</el-button> <el-button :disabled="scope.$index===(guestlist.length-1)" type="text" @click="moveDown(scope.$index,scope.row,guestlist)">{{$t('pubactivities.guestDown')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="exchangeNum" label="与TA交换名片人数" align="center"> <el-table-column v-if="$i18n.locale=='zh-CN'" prop="exchangeNum" label="与TA交换名片人数" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.exchangeNum?scope.row.exchangeNum:0}} {{scope.row.exchangeNum?scope.row.exchangeNum:0}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="短信提醒" width="100" align='center'> <el-table-column v-if="$i18n.locale=='zh-CN'" label="短信提醒" width="100" align='center'>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.exchangeNum&&scope.row.exchangeNum>=1" <el-button v-if="scope.row.exchangeNum&&scope.row.exchangeNum>=1"
:disabled="scope.row.sendMsg == 1" :disabled="scope.row.sendMsg == 1"
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<el-form-item v-if="formData.versionType == 0&&$i18n.locale=='zh-CN'" label="相关内容：" style="width: 100%;"> <el-form-item v-if="formData.versionType == 0&&$i18n.locale=='zh-CN'" label="相关内容：" style="width: 100%;">
<el-button type="primary" plain @click="resourcesVisible = true">添加内容</el-button> <el-button type="primary" plain @click="resourcesVisible = true">添加内容</el-button>
</el-form-item> </el-form-item>
<div style="margin: 0 30px 30px 180px;"> <div v-if="formData.versionType == 0&&$i18n.locale=='zh-CN'" style="margin: 0 30px 30px 180px;">
<el-table <el-table
tooltip-effect="dark" tooltip-effect="dark"
class="projectTable" class="projectTable"
...@@ -541,22 +541,22 @@ ...@@ -541,22 +541,22 @@
<!--新增嘉宾--> <!--新增嘉宾-->
<el-dialog :title="$t('pubactivities.addguests')" :visible.sync="guestVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensorguest" class="dialogWrap"> <el-dialog :title="$t('pubactivities.addguests')" :visible.sync="guestVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensorguest" class="dialogWrap">
<el-form :inline="true" label-width="210px" :model="guestform" :rules="guestrules" ref="guestform" class="contnetform300s"> <el-form :inline="true" label-width="210px" :model="guestform" :rules="guestrules" ref="guestform" class="contnetform300s">
<el-form-item label="嘉宾联系方式：" prop="guestContact"> <el-form-item :label="$t('pubactivities.ContactDetails')+'：'" prop="guestContact">
<el-input style="width:370px;" maxlength="36" @blur="isempAccountblur" v-model="guestform.guestContact" :placeholder="$t('pubactivities.plguestname')"></el-input> <el-input @input="$forceUpdate()" style="width:370px;" maxlength="36" @blur="isempAccountblur" v-model="guestform.guestContact" :placeholder="$t('partner.otherReason')+$t('pubactivities.ContactDetails')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('pubactivities.guestname')+'：'" prop="guestName"> <el-form-item :label="$t('pubactivities.guestname')+'：'" prop="linguestName">
<el-input :disabled="guestform.guestName&&guestform.empId?true:false" style="width:370px;" maxlength="36" v-model="guestform.guestName" :placeholder="$t('pubactivities.plguestname')"></el-input> <el-input @input="$forceUpdate()" :disabled="guestform.guestName&&guestform.empId?true:false" style="width:370px;" maxlength="36" v-model="guestform.linguestName" :placeholder="$t('pubactivities.plguestname')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('pubactivities.guestTitle')+'：'" prop="guestTitle"> <el-form-item :label="$t('pubactivities.guestTitle')+'：'" prop="guestTitle">
<el-input :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="嘉宾介绍：" prop="guestDesc"> <el-form-item :label="$t('pubactivities.guestDesc')+'：'" prop="guestDesc">
<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('pubactivities.plguestname')"></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">
<el-input v-show="false" v-model="guestform.guestPic"></el-input>
<p class="imgTitle">{{$t('pubactivities.guesttext')}}</p> <p class="imgTitle">{{$t('pubactivities.guesttext')}}</p>
<div class="uploadImg"> <div class="uploadImg">
<el-input v-if="false" v-model="guestform.guestPic"></el-input>
<img v-if="guestform.guestPic&&guestform.empId?true:false" :src="guestform.guestPic" style="width: 120px;height: 120px;" alt=""> <img v-if="guestform.guestPic&&guestform.empId?true:false" :src="guestform.guestPic" style="width: 120px;height: 120px;" alt="">
<up-img v-else :actionUrl="'/base/upload/uploadLogo'" :channelPic="guestform.guestPic" @dataEvent="guestimg" :upmax="0.2"></up-img> <up-img v-else :actionUrl="'/base/upload/uploadLogo'" :channelPic="guestform.guestPic" @dataEvent="guestimg" :upmax="0.2"></up-img>
</div> </div>
...@@ -634,7 +634,9 @@ ...@@ -634,7 +634,9 @@
data() { data() {
return { return {
resourcesVisible:false, resourcesVisible:false,
resourcesform:{}, resourcesform:{
title:'',
},
resourcesTypelist:[ resourcesTypelist:[
{key:'RAT01',label:'话题'}, {key:'RAT01',label:'话题'},
{key:'RAT02',label:'活动'}, {key:'RAT02',label:'活动'},
...@@ -691,7 +693,7 @@ ...@@ -691,7 +693,7 @@
}, },
guestrules:{ guestrules:{
guestContact: [{required: true, validator:validate.checkMobileAndEmail, trigger: 'blur'}], guestContact: [{required: true, validator:validate.checkMobileAndEmail, trigger: 'blur'}],
guestName: [{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'}],
}, },
...@@ -789,7 +791,10 @@ ...@@ -789,7 +791,10 @@
fielditem:null, fielditem:null,
editVisible:false, editVisible:false,
editindex:null, editindex:null,
guestform:{}, guestform:{
guestPic:'',
guestContact:'',
},
guestlist:[], guestlist:[],
urltext:'', urltext:'',
timeZoneData:[],//时区 timeZoneData:[],//时区
...@@ -826,6 +831,8 @@ ...@@ -826,6 +831,8 @@
} }
}, },
getsearchResources(val){ getsearchResources(val){
this.resourcesTitlelist = []
this.resourcesform.title = '';
let params = { let params = {
pagination: { pagination: {
number: 99999, number: 99999,
...@@ -838,7 +845,6 @@ ...@@ -838,7 +845,6 @@
}; };
api.searchResources(params).then(response => { api.searchResources(params).then(response => {
if(response.code == 0) { if(response.code == 0) {
this.resourcesTitlelist = []
response.result.records.forEach((item) => { response.result.records.forEach((item) => {
this.resourcesTitlelist.push({ this.resourcesTitlelist.push({
address: item.resourceId, address: item.resourceId,
...@@ -855,7 +861,9 @@ ...@@ -855,7 +861,9 @@
}); });
}, },
closeResources(){ closeResources(){
this.resourcesform = {}; this.resourcesform = {
title:'',
};
this.resourcesTitlelist = {}; this.resourcesTitlelist = {};
}, },
newOpen(row){ newOpen(row){
...@@ -923,6 +931,7 @@ ...@@ -923,6 +931,7 @@
// } // }
// }, // },
isempAccountblur(){ isempAccountblur(){
this.$forceUpdate();
this.$refs['guestform'].validateField('guestContact', empAccountError => { //验证手机号码是否正确 this.$refs['guestform'].validateField('guestContact', empAccountError => { //验证手机号码是否正确
var guestContact = this.guestform.guestContact; var guestContact = this.guestform.guestContact;
if (!empAccountError) { if (!empAccountError) {
...@@ -934,11 +943,17 @@ ...@@ -934,11 +943,17 @@
if(response.result){ if(response.result){
this.guestform = response.result; this.guestform = response.result;
this.guestform.linguestDesc = this.guestform.guestDesc; this.guestform.linguestDesc = this.guestform.guestDesc;
this.guestform.linguestName = this.guestform.guestName;
}else{ }else{
this.guestform = {}; if(this.guestform.empId){
this.guestform.guestContact = guestContact; this.guestform = {
guestPic:'',
guestContact:'',
};
this.guestform.guestContact = guestContact;
}
} }
this.$refs['guestform'].resetFields(); // this.$refs['guestform'].resetFields();
} else { } else {
this.$message.error(response.msg); this.$message.error(response.msg);
} }
...@@ -986,8 +1001,11 @@ ...@@ -986,8 +1001,11 @@
}, },
//新增嘉宾弹框关闭 //新增嘉宾弹框关闭
closeSensorguest(){ closeSensorguest(){
this.guestform = {}; this.guestform = {
// this.$refs['guestform'].resetFields(); guestPic:'',
guestContact:'',
};
this.$refs['guestform'].resetFields();
}, },
//邀请嘉宾 //邀请嘉宾
addguest(){ addguest(){
...@@ -1030,6 +1048,7 @@ ...@@ -1030,6 +1048,7 @@
if(response.code == 0) { if(response.code == 0) {
this.guestform = response.result; this.guestform = response.result;
this.guestform.linguestDesc = this.guestform.guestDesc; this.guestform.linguestDesc = this.guestform.guestDesc;
this.guestform.linguestName = this.guestform.guestName;
this.guestVisible = true; this.guestVisible = true;
} else { } else {
this.$message.error(response.msg); this.$message.error(response.msg);
...@@ -1053,6 +1072,7 @@ ...@@ -1053,6 +1072,7 @@
} }
} }
this.guestform.guestDesc = this.guestform.linguestDesc; this.guestform.guestDesc = this.guestform.linguestDesc;
this.guestform.guestName = this.guestform.linguestName;
let urls = this.guestform.guestId?'/base/guests/editGuestsInfo':'/base/guests/addGuestsInfo'; let urls = this.guestform.guestId?'/base/guests/editGuestsInfo':'/base/guests/addGuestsInfo';
api.addGuestsInfo(urls,this.guestform).then(response => { api.addGuestsInfo(urls,this.guestform).then(response => {
if(response.code == 0) { if(response.code == 0) {
......
src/views/topicpage/commentdetail.vue
View file @ 0c39ecec
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
:src="commentdataimg" :src="commentdataimg"
:preview-src-list="getSrcList(commentdata.discussUrl.split(','),index)"> :preview-src-list="getSrcList(commentdata.discussUrl.split(','),index)">
</el-image> </el-image>
来自：<i @click="totopic" style="color: red;cursor: pointer;">{{contentdata.topicTitle}}</i> 来自：<i @click="totopic" style="color: #5D78FF;cursor: pointer;">#{{contentdata.topicTitle}}#</i>
<!-- 讨论分享、评论、点赞操作--> <!-- 讨论分享、评论、点赞操作-->
<div class="gendisplay operating"> <div class="gendisplay operating">
<p> <p>
......
src/views/topicpage/discussall.vue
View file @ 0c39ecec
<template> <template>
<div class="foutdivdiscuss"> <div class="foutdivdiscuss">
<div class="divclasschild"> <div class="divclasschild">
<div class="descContentcal gendisplay" v-if="moderatorSetting.descContent&&moderatorSetting.showDesc==1"> <div class="descContentcal gendisplay" v-if="moderatorSetting.showDesc==0">
<img src="../../assets/img/mobile/laba@2x.png" alt="" style="width: 23px;position: absolute;left: 15px;bottom: 9px;"> <img src="../../assets/img/mobile/laba@2x.png" alt="" style="width: 23px;position: absolute;left: 15px;bottom: 9px;">
<p @click="moderatorSetting.descUrl?descUrletail():''" :style="moderatorSetting.descUrl?'cursor: pointer;':''" style="width: 100%;height: 40px;overflow: hidden;line-height: 40px;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p> <p @click="descUrletail()" style="width: 100%;height: 40px;overflow: hidden;line-height: 40px;cursor: pointer;" class="ellipsisFont1">{{moderatorSetting.descContent}}</p>
</div> </div>
<div class="gendisplay"> <div class="gendisplay">
<div style="background: #FFFFFF;border-radius: 3px;"> <div style="background: #FFFFFF;border-radius: 3px;">
......
src/views/topicpage/topicall.vue
View file @ 0c39ecec
...@@ -161,9 +161,9 @@ ...@@ -161,9 +161,9 @@
</el-form-item> </el-form-item>
<el-form-item label="配置公告的话题："> <el-form-item label="配置公告的话题：">
<div class="gendisplay"> <div class="gendisplay">
<el-date-picker style="width: 200px;" @change="" v-model="searchAnnounce.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker> <el-date-picker style="width: 200px;" @change="searchTopic" v-model="searchAnnounce.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authBegin')"></el-date-picker>
<p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p> <p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 200px;" v-model="searchAnnounce.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker> <el-date-picker style="width: 200px;" @change="searchTopic" v-model="searchAnnounce.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
</div> </div>
</el-form-item> </el-form-item>
<el-row :gutter="20" style="margin: 20px 0"> <el-row :gutter="20" style="margin: 20px 0">
......
src/views/topicpage/topicdetail.vue
View file @ 0c39ecec
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
</div> </div>
<div> <div>
<div style="margin: 15px 0;color:#1A1A1E;line-height: 24px;overflow: hidden;" @click="eventtopiccontent($event)"> <div style="margin: 15px 0;color:#1A1A1E;line-height: 24px;overflow: hidden;" @click="eventtopiccontent($event)">
<span v-if="item.alltext" v-html="item.pcState==1?(item.simpleContent+(item.simpleContent.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span> <span v-if="item.alltext" v-html="item.pcState==1?(item.simpleContent.slice(0,140)+(item.simpleContent.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"></span>
<span v-else v-html="item.pcState==1?item.simpleContent:publicFun.analyzeEmoji(item.discussContentconst)"></span> <span v-else v-html="item.pcState==1?item.discussContent:publicFun.analyzeEmoji(item.discussContentconst)"></span>
<i <i
v-if="publicFun.getTextInRichtext(item.discussContentconst).length>140" v-if="publicFun.getTextInRichtext(item.discussContentconst).length>140"
@click="item.alltext = !item.alltext" @click="item.alltext = !item.alltext"
......
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