Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 3a6df800 6b5f2fc6
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 53 deletions
src/views/findeventpage/eventlive.vue
View file @ e1d31cbb
<template>
<div>
<iframe name = "child" id = "child" src="live.html" frameborder="0" scrolling="no" style="position:related;top: 2.8px;left: 0px;width: 100%;height: 100vh;border: medium none;"></iframe>
<div v-if="$i18n.locale=='zh-CN'&&!userClick&&isVisible" @click="isuserClick" class="event_iconchange">
<div v-if="$i18n.locale=='zh-CN'&&!userClick&&isVisible&&eventdata.versionType == 0" @click="isuserClick" class="event_iconchange">
<el-tooltip class="item" effect="dark" content="互换名片，拓展人脉圈" placement="top-start">
<img class="event_iconchange_img" src="../../assets/img/changeImg.png" alt="">
</el-tooltip>
......@@ -59,6 +59,7 @@
isVisible:false,
activityId:Number(this.$route.query.id),
isVisibleTimer:null,
eventdata:{},
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
},
......@@ -129,11 +130,25 @@
that.isShowChange(true);
},60000*5);
},
getActivityDetails(){
api.getActivityDetails(this.$route.query.id).then(response => {
if(response.code == 0) {
this.eventdata = response.result;
} else {
this.$message.error(response.msgCode);
}
})
.catch(error => {
console.log("提交出错");
return false;
});
},
},
mounted() {
globalMsg.$emit('topisInit', false);
globalMsg.$emit('sendIndex', 3);
document.getElementsByTagName("body")[0].style.overflow = "hidden";
this.getActivityDetails();
this.userHistory(0);
if(this.$i18n.locale=='zh-CN'){
this.isShowChange();
......
src/views/findeventpage/newEventdetail.vue
View file @ e1d31cbb
......@@ -16,15 +16,16 @@
<span class="readCount">{{$t('activityInfo.viewCount')}} {{eventdata.readCountStr}}</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="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 class="gendisplay information_2">
<div>
<p>{{$t('activityInfo.timeZone')}}：{{eventdata.versionType==0?$t('pubactivities.beijingtime'):eventdata.timeZoneName}}</p>
<p>{{$t('activityInfo.activityTime')}}：{{eventdata.channelStartTime}} - {{eventdata.channelStartTime}}</p>
<p>{{$t('activityInfo.activityTime')}}：{{eventdata.channelStartTime}} - {{eventdata.channelEndTime}}</p>
<p>{{$t('activityInfo.applyEnd')}}：{{eventdata.activityEndTime}}</p>
<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-else><img style="width: 24px;" src="../../assets/img/vipIcon@2x.png" alt=""></span>
</p>
</div>
<div>
......@@ -77,11 +78,11 @@
<div class="gendisplay">
<p @click="item.empId?tohome(item.empId):''">
<i class="hover_cursor mouseHover">{{item.empName}}</i>
<i style="font-size: 12px;padding-left:10px;font-weight: normal;">
<i style="font-size: 12px;padding-left:10px;font-weight: normal;cursor: pointer;">
{{item.empTitle}}
</i>
</p>
<div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'&&item.isFriend != 3">
<div v-if="(item.empId != userInfo.empId||item.empId == null)&&$i18n.locale=='zh-CN'&&item.isFriend != 3">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-else @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
</div>
......@@ -159,7 +160,7 @@
<span v-if="item.activityState==2&&!item.isApply">{{item.viewDesc?item.viewDesc:$t('activityInfo.freeApply')}}</span>
<i style="color: #0ABB87;" v-if="item.channelType!=4&&item.activityState==2&&item.isApply">{{$t("activityInfo.hasApply")}}</i>
<i style="color: #aaaaaa;" v-if="item.channelType==4&&item.activityState==2&&item.isApply">{{$t("commonTitle.vipLookTitle")}}</i>
<i style="color: #FF5D5D" v-if="item.activityState>2">{{item.activityState==4?$t("activityInfo.hasFilled"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</i>
<i style="color: #9197B4" v-if="item.activityState>2">{{item.activityState==4?$t("activityInfo.hasFilled"):item.activityState==3?$t("activityInfo.applyEnd"):item.activityState==5?$t("activityInfo.activityEnd"):""}}</i>
<i style="color: #9197B4" v-if="item.activityState==1">{{$t("activityInfo.activityNoBegin")}}</i>
</div>
</div>
......@@ -169,9 +170,9 @@
</div>
</div>
<div class="right_module">
<div :class="[positions&&!is_positions?'positionfixed':'',is_positions?'isposition':'']">
<div class="btnOperating" v-if="positions">
<span :class="$i18n.locale=='zh-CN'?'':'iszh-CN'" class="btn_margin-right" v-if="eventdata.channelType!=5&&userInfo&&userInfo.empId!=eventdata.createdBy||eventdata.channelType!=5&&!userInfo">
<div :class="[positions?'positionfixed':'']">
<div class="btnOperating" v-if="positions&&(eventdata.channelType!=5&&userInfo&&userInfo.empId!=eventdata.createdBy||eventdata.channelType!=5&&!userInfo)">
<span :class="$i18n.locale=='zh-CN'?'':'iszh-CN'" class="btn_margin-right">
<span class="eventbtn" v-if="eventdata.activityState==2&&!eventdata.isApply" @click="handleApply(eventdata)">{{eventdata.viewDesc?eventdata.viewDesc:$t('activityInfo.freeApply')}}</span>
<span class="eventbtn" v-if="eventdata.channelType!=4&&eventdata.activityState==2&&eventdata.isApply">{{$t("activityInfo.hasApply")}}</span>
<span class="eventbtn" v-if="eventdata.channelType==4&&eventdata.activityState==2&&eventdata.isApply" @click="handleToSuccess">{{$t("commonTitle.vipLookTitle")}}</span>
......@@ -179,13 +180,13 @@
<span class="eventbtn" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span>
</span>
</div>
<div class="shareIt gendisplay" v-if="resourcesList&&resourcesList.length<=4&&$i18n.locale=='zh-CN'">
<div class="shareIt gendisplay" v-if="(resourcesList&&resourcesList.length<=4)||!positions">
<div>
<VueQRCodeComponent :text="url" :size="100" :margin="0"></VueQRCodeComponent>
</div>
<div>
<p>微信扫一扫</p>
<span>分享此活动给朋友/朋友圈</span>
<p>{{$t("commonTitle.shareTitle")}}</p>
<!-- <span>分享此活动给朋友/朋友圈</span>-->
</div>
</div>
<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)">
......@@ -578,13 +579,12 @@
},
menu(){
let scroll = document.documentElement.scrollTop || document.body.scrollTop;
let divhtmldetail = document.getElementById('divtop')?document.getElementById('divtop').offsetHeight:0;
console.log(divhtmldetail+'=============='+scroll)
if( divhtmldetail - scroll < 650){
this.is_positions = true;
}else{
this.is_positions = false;
}
// let divhtmldetail = document.getElementById('divtop')?document.getElementById('divtop').offsetHeight:0;
// if( divhtmldetail - scroll < 650){
// this.is_positions = true;
// }else{
// this.is_positions = false;
// }
if(scroll>250){
this.positions = true;
}else{
......@@ -945,6 +945,8 @@
border-radius: 10px;
background: #ffffff;
padding: 15px 18px;
justify-content: center;
align-items: center;
>div:first-child{
padding: 10px;
border: 1px solid #F2F2F2;
......@@ -952,9 +954,10 @@
}
>div:last-child{
>p{
margin: 30px 0 15px;
font-size: 16px;
font-weight: bold;
margin: 0 10px;
font-size: 14px;
line-height: 24px;
/*font-weight: bold;*/
color: #1A1A1E;
}
>span{
......
src/views/kolExpert/kolExpertManage.vue
View file @ e1d31cbb
......@@ -18,11 +18,11 @@
<p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 180px;" v-model="searchs.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
<el-button type="primary" style="width: 100px;margin-left: 20px" @click="searchCik">{{$t('operationjson.search')}}</el-button>
<el-button type="primary" plain style="width: 100px;margin-left: 20px" @click="resetCik">重置</el-button>
<el-button type="primary" plain style="width: 100px;margin: 0 50px 0 20px;" @click="resetCik">重置</el-button>
</div>
</template>
</el-form-item>
<el-form-item class="formcontentnk">
<el-form-item>
<el-input placeholder="请输入关键字" @keyup.enter.native="searchCik" v-model="searchs.content" class="input-with-select" style="width: 290px">
<el-button slot="append" icon="el-icon-search" @click="searchCik"></el-button>
</el-input>
......
src/views/mobile/logined.vue
View file @ e1d31cbb
......@@ -32,7 +32,7 @@
<tabCmpt v-if="visible&&isMobile==1" :isMargin="isMargin"></tabCmpt>
<PageBottom v-if="isMobile!=1&&!isLeftShow" @itemBtn="sendbtn" @aboutwebtn="aboutwebtn"
style="z-index: 1;position: relative;"></PageBottom>
style="z-index: 10;position: relative;"></PageBottom>
</div>
</template>
......
src/views/peoplehomepage/contactbar.vue
View file @ e1d31cbb
......@@ -17,14 +17,14 @@
<div>
<div class="gendisplay">
<p @click="tohome(item)">
<i class="hover_cursor">{{item.empName}}</i>
<i style="font-size: 12px;padding-left:10px;font-weight: normal;">
<i class="hover_cursor mouseHover">{{item.empName}}</i>
<i style="font-size: 12px;padding-left:10px;font-weight: normal;cursor: pointer;">
{{item.isProfessor == 1||item.isModerator == 1?item.empTitle:item.workName}}
</i>
</p>
<btnbar @successState="successState" :row="item" :index="index" :btnType="1"></btnbar>
</div>
<p @click="tohome(item)" class="ellipsisFont1" style="color:#1A1A1E;height: 24px;">{{item.orgName?item.orgName:item.empIntroduction}}</p>
<p @click="tohome(item)" class="ellipsisFont1" style="color:#1A1A1E;height: 24px;cursor: pointer;">{{item.orgName?item.orgName:item.empIntroduction}}</p>
<p style="color:#AAAAAA;">
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
......
src/views/publishactivity/proactivity.vue
View file @ e1d31cbb
......@@ -220,7 +220,7 @@
</el-table-column>
<el-table-column :label="$t('listjson.action')" width="100" align='center'>
<template slot-scope="scope">
<el-button type="text" @click="editguest(scope.row)">
<el-button type="text" @click="editguest(scope.row,scope.$index)">
{{$t('Otherjson.edittext')}}
</el-button>
<el-button type="text" @click="deleteguest(scope.$index,guestlist)">
......@@ -265,7 +265,7 @@
</el-table-column>
<el-table-column prop="title" label="标题">
<template slot-scope="scope">
<p @click="newOpen(scope.row)">{{scope.row.resourceTitle}}</p>
<p @click="newOpen(scope.row)" style="color: #5D78FF;cursor: pointer;">{{scope.row.resourceTitle}}</p>
</template>
</el-table-column>
<el-table-column :label="$t('listjson.action')" width="140" align='center'>
......@@ -881,7 +881,7 @@
return
}
}
if(this.formData.resourceList.length>=6){
if(this.formData.resourceList.length>=4){
this.$message.error('已添加上限');
return
}
......@@ -940,6 +940,7 @@
let params = {
guestContact:this.guestform.guestContact
};
let editIndex = this.guestform.editIndex;
api.getAccountInfo(params).then(response => {
if(response.code == 0) {
if(response.result){
......@@ -955,6 +956,7 @@
this.guestform.guestContact = guestContact;
}
}
this.guestform.editIndex = editIndex;
// this.$refs['guestform'].resetFields();
} else {
this.$message.error(response.msg);
......@@ -1046,10 +1048,11 @@
});
},
//编辑嘉宾
editguest(row){
editguest(row,index){
api.getGuestsInfo(row.guestId).then(response => {
if(response.code == 0) {
this.guestform = response.result;
this.guestform.editIndex = index;
this.guestform.linguestDesc = this.guestform.guestDesc;
this.guestform.linguestName = this.guestform.guestName;
this.guestVisible = true;
......@@ -1067,7 +1070,7 @@
subguest(){
this.$refs.guestform.validate((valid) => {
if(valid) {
if(this.guestform.guestId&&this.isEditevent){
if(this.isEditevent&&this.guestform.guestId){
for(let i in this.guestlist){
if(this.guestlist[i].guestId == this.guestform.guestId){
this.$message.error('此嘉宾已存在，请勿重复添加');
......@@ -1080,8 +1083,9 @@
let urls = this.guestform.guestId?'/base/guests/editGuestsInfo':'/base/guests/addGuestsInfo';
api.addGuestsInfo(urls,this.guestform).then(response => {
if(response.code == 0) {
if(this.isEditevent)this.guestlist.push(this.guestform);
if(!this.isEditevent)this.$set(this.guestlist, this.guestform.editIndex, this.guestform);
this.guestform.guestId = response.result;
this.guestlist.push(this.guestform);
this.guestVisible = false;
} else {
this.$message.error(response.msg);
......
src/views/topicpage/commentdetail.vue
View file @ e1d31cbb
......@@ -10,7 +10,7 @@
<div style="background: #FFFFFF;border-radius: 3px;position: relative">
<div style="padding: 15px 15px 0 15px;">
<div class="gendisplay">
<div style="position: relative;">
<div style="position: relative;cursor: pointer;">
<img @click="tohome(commentdata.userInfo.empId)" v-if="commentdata.userInfo.empLogo" :src="commentdata.userInfo.empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
<img v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
<img v-if="commentdata.userInfo.isProfessor" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
......@@ -302,13 +302,13 @@
<el-tab-pane label="话题版主" name="first">
<div style="margin:0 30px 20px 0;">
<div>
<div class="gendisplay" style="padding: 20px 20px 0 20px;">
<div class="gendisplay" style="padding: 20px 20px 0 20px;cursor: pointer;">
<div style="position: relative;">
<img @click="tohome(contentdata.baseModeratorList[0].empId)" v-if="contentdata.baseModeratorList[0].empLogo" :src="contentdata.baseModeratorList[0].empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;top: 47px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<div @click="tohome(contentdata.baseModeratorList[0].empId)" style="margin: 10px 0 0 15px;cursor: pointer;">
<p style="color:#1A1A1E;">{{contentdata.baseModeratorList[0].empName}}</p>
<p class="ellipsisFont3" style="margin-top: 10px;color: #AAAAAA;width: 100%;max-height: 60px;overflow: hidden;">{{contentdata.baseModeratorList[0].moderatorIntroduction}}</p>
</div>
......@@ -336,28 +336,28 @@
<div style="margin:0 30px 20px 0;">
<div v-for="(item,index) in professorlist" :key="index">
<div class="gendisplay" style="padding: 20px 20px 0 20px;">
<div style="position: relative;">
<div style="position: relative;cursor: pointer;">
<img @click="tohome(item.empId)" v-if="item.empLogo" :src="item.empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<p style="color:#1A1A1E;">{{item.empName}}</p>
<p @click="tohome(item.empId)" class="mouseHover" style="color:#1A1A1E;cursor: pointer;">{{item.empName}}</p>
<el-tooltip placement="top" effect="light">
<div slot="content" style="width: 400px;">
<div class="gendisplay">
<div style="position: relative;">
<div @click="tohome(item.empId)" style="position: relative;cursor: pointer;">
<img v-if="item.empLogo" :src="item.empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<p style="color:#1A1A1E;">{{item.empName}}</p>
<div @click="tohome(item.empId)" style="margin: 10px 0 0 15px;cursor: pointer;">
<p class="mouseHover" style="color:#1A1A1E;">{{item.empName}}</p>
<p style="margin-top: 10px;color: #AAAAAA">{{item.professorIntroduction}}</p>
</div>
</div>
</div>
<p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 20px;overflow: hidden;">{{item.professorIntroduction}}</p>
<p @click="tohome(item.empId)" class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 20px;overflow: hidden;cursor: pointer;">{{item.professorIntroduction}}</p>
</el-tooltip>
</div>
</div>
......@@ -773,7 +773,7 @@
};
if(childrow){
if(this.publicFun.unique(childrow.wordarea).length<10){
// this.$message.error('内容不能为空');
this.$message.error('您输入的内容未达到10个字，请修改后重试！');
return;
}
params.commentsContent = childrow.wordarea;
......@@ -783,7 +783,7 @@
params.commentsState = childrow.commentsState?0:1;
}else{
if(this.publicFun.unique(row.wordarea).length<10){
// this.$message.error('内容不能为空');
this.$message.error('您输入的内容未达到10个字，请修改后重试！');
return;
}
params.commentsContent = row.wordarea;
......
src/views/topicpage/topicdetail.vue
View file @ e1d31cbb
......@@ -120,7 +120,7 @@
<!-- </div>-->
<!-- </div>-->
<!-- </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-bottom: 15px;">
<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;">
<span style="background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;">公告</span>
......@@ -298,7 +298,7 @@
</div>
<div class="paragraph">
<div class="gendisplay">
<p style="margin-right: 5px;font-size: 12px;">
<p class="mouseHover" style="margin-right: 5px;font-size: 12px;cursor: pointer;">
{{commentsitem.isProfessor == 1?commentsitem.empName:commentsitem.nickName}}
</p>
<p v-if="commentsitem.moderator" style="margin: -1px 5px 0;">
......@@ -481,14 +481,14 @@
<div style="margin:0 30px 20px 0;">
<div>
<div class="gendisplay" style="padding: 20px 20px 0 20px;">
<div style="position: relative;">
<div style="position: relative;cursor: pointer;">
<img @click="tohome(contentdata.baseModeratorList[0].empId)" v-if="contentdata.baseModeratorList[0].empLogo" :src="contentdata.baseModeratorList[0].empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img @click="tohome(contentdata.baseModeratorList[0].empId)" v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;top: 47px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<p @click="tohome(contentdata.baseModeratorList[0].empId)" style="color:#1A1A1E;cursor: pointer;">{{contentdata.baseModeratorList[0].empName}}</p>
<p class="ellipsisFont3" style="margin-top: 10px;color: #AAAAAA;width: 100%;max-height: 60px;overflow: hidden;">{{contentdata.baseModeratorList[0].moderatorIntroduction}}</p>
<p class="mouseHover" @click="tohome(contentdata.baseModeratorList[0].empId)" style="color:#1A1A1E;cursor: pointer;">{{contentdata.baseModeratorList[0].empName}}</p>
<p class="ellipsisFont3" @click="tohome(contentdata.baseModeratorList[0].empId)" style="margin-top: 10px;color: #AAAAAA;width: 100%;max-height: 60px;overflow: hidden;cursor: pointer;">{{contentdata.baseModeratorList[0].moderatorIntroduction}}</p>
</div>
</div>
</div>
......@@ -520,7 +520,7 @@
<img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<p @click="tohome(item.empId)" style="color:#1A1A1E;cursor: pointer;">{{item.empName}}</p>
<p class="mouseHover" @click="tohome(item.empId)" style="color:#1A1A1E;cursor: pointer;">{{item.empName}}</p>
<el-tooltip placement="top" effect="light">
<div slot="content" style="width: 400px;">
<div class="gendisplay">
......@@ -535,7 +535,7 @@
</div>
</div>
</div>
<p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 20px;overflow: hidden;">{{item.professorIntroduction}}</p>
<p class="ellipsisFont1" @click="tohome(item.empId)" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 20px;overflow: hidden;cursor: pointer;">{{item.professorIntroduction}}</p>
</el-tooltip>
</div>
</div>
......@@ -1369,6 +1369,7 @@
if(childrow){
if(this.publicFun.unique(childrow.wordarea).length<10){
// this.$message.error('内容不能为空');
this.$message.error('您输入的内容未达到10个字，请修改后重试！');
return;
}
params.commentsContent = childrow.wordarea;
......@@ -1378,7 +1379,7 @@
params.commentsState = childrow.commentsState?0:1;
}else{
if(this.publicFun.unique(row.wordarea).length<10){
// this.$message.error('内容不能为空');
this.$message.error('您输入的内容未达到10个字，请修改后重试！');
return;
}
params.commentsContent = row.wordarea;
......
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