Skip to content

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

Merge remote-tracking branch 'origin/master'

parents c778240c f47ccf88
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 121 deletions
public/css/pc.scss
View file @ 0aa3e5e9
......@@ -60,6 +60,10 @@
color: #232323;
}
.mouseHover:hover{
color: #5D78FF!important;
}
table {
border-collapse: collapse;
table-layout: fixed;
......
src/views/categorypage/category.vue
View file @ 0aa3e5e9
......@@ -133,7 +133,7 @@
</el-table-column>
<el-table-column :label="$t('listjson.action')" width="100" align='center'>
<template slot-scope="scope">
<el-button v-if="search.categoryCode == ''" type="text" @click="tagging(scope.row)">{{scope.row.categoryCode?'修改标签':'打标签'}}</el-button>
<el-button type="text" @click="tagging(scope.row)">{{scope.row.categoryCode?'修改标签':'打标签'}}</el-button>
<el-button type="text" @click="handopen(scope.row)">{{$t('listjson.seeaction')}}</el-button>
</template>
</el-table-column>
......
src/views/findeventpage/api/api.js
View file @ 0aa3e5e9
......@@ -39,8 +39,8 @@ export default {
return api.fetchLoadingGet('/base/activity/getActivityGuestList?' +Qs.stringify(params));
},
//活动详情最近参与
getActivityNewestJoin (params){
return api.fetchLoadingGet('/base/activity/getActivityNewestJoin?' +Qs.stringify(params));
getActivityJoinList (params){
return api.fetchLoadingGet('/base/activity/getActivityJoinList?' +Qs.stringify(params));
},
//活动详情活动推荐
getRecommendActivity (params){
......
src/views/findeventpage/eventpage.vue
View file @ 0aa3e5e9
......@@ -16,7 +16,7 @@
<i class="iconfont icon-zhibo" style="font-size: 16px;position: absolute;left: 8px;top: 0px;"></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')}}
</span>
<span @click="toeventdetail(item)">
<span class="mouseHover" @click="toeventdetail(item)">
{{item.channelTitle}}
</span>
</p>
......
src/views/findeventpage/newEventdetail.vue
View file @ 0aa3e5e9
......@@ -15,7 +15,7 @@
<div class="information_1">
<span>浏览 {{eventdata.readCountStr}}</span>
<span>{{eventdata.channelLabelList?eventdata.channelLabelList[0]:''}}</span>
<span>直播</span>
<span v-if="eventdata.hasLive == 1">直播</span>
<span v-if="eventdata.drawTime">距活动还有 <i style="color: #FFA801;">{{eventdata.drawTime}}</i> {{eventdata.timeType==1?'分钟':eventdata.timeType==2?'小时':eventdata.timeType==3?'天':''}}</span>
</div>
<div class="gendisplay information_2">
......@@ -49,7 +49,7 @@
<i class="iconfont icon-zhibo"></i> {{$t('activityInfo.liveHasEnd')}}
</span>
</span>
<p>分享到：<i class="iconfont icon-gongzhonghao"></i></p>
<p>分享到：<i @click="vueQrVisible = !vueQrVisible" style="cursor: pointer;" class="iconfont icon-gongzhonghao"></i></p>
</div>
</div>
</div>
......@@ -61,31 +61,34 @@
<p>
<span>活动嘉宾<i></i></span>
</p>
<p @click="isguestchecked = !isguestchecked" v-if="guestList.length>2">
<p @click="isguestchecked = !isguestchecked" v-if="guestList.length>4">
{{isguestchecked?'收起':'展开'}}
<i class="iconfont" :class="isguestchecked?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i>
</p>
</div>
<div class="guestpage gendisplay">
<div class="gendisplay " v-if="isguestchecked||index<2" v-for="(item,index) in guestList" :style="index%2==1?'padding-left:25px;':'padding-right:25px;'">
<span class="userImg">
<img class="userinfo_img" :src="item.guestPic?item.guestPic:require('../../assets/img/defaultlogo.png')" alt="">
<div class="gendisplay " v-if="isguestchecked||index<4" v-for="(item,index) in guestList" :style="index%2==1?'padding-left:25px;':'padding-right:25px;'">
<span class="userImg" @click="item.empId?tohome(item.empId):''">
<img class="userinfo_img" :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.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="">
</span>
<div>
<div class="gendisplay">
<p>
<i class="hover_cursor">{{item.guestName}}</i>
<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;">
{{item.guestTitle}}
{{item.empTitle}}
</i>
</p>
<btnbar @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
<div v-if="item.empId != userInfo.empId">
<popoverBardbar v-if="item.isFriend == 2&&item.empId" :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>
</div>
</div>
<el-tooltip placement="top-start" effect="light">
<div slot="content" style="width: 200px;">{{item.guestDesc}}</div>
<p class="ellipsisFont1" style="color:#1A1A1E;height: 20px;max-width: 90%;">{{item.guestDesc}}</p>
<div slot="content" style="width: 200px;">{{item.empIntroduction}}</div>
<p class="ellipsisFont1" style="color:#1A1A1E;height: 20px;max-width: 90%;">{{item.empIntroduction}}</p>
</el-tooltip>
</div>
......@@ -97,29 +100,32 @@
<p>
<span>活动详情<i></i></span>
</p>
<p @click="isIntroduction = !isIntroduction">
<p v-if="guestList.length != 0" @click="isIntroduction = !isIntroduction">
{{isIntroduction?'收起':'展开'}}
<i class="iconfont" :class="isIntroduction?'icon-xiala-copy':'icon-xiala'" style="font-size: 12px;transform: scale(0.6);display: inline-block;"></i>
</p>
</div>
<div id="htmldetail" :style="isIntroduction?'':'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 class="p_tabs">
<div class="p_tabs" v-if="participateList.length != 0">
<div class="gendisplay p_tabs_title">
<p>
<span>最近参与<i></i></span>
</p>
</div>
<div class="participate_user gendisplay">
<div v-for="(item,index) in userRelationlist">
<div v-for="(item,index) in participateList">
<span class="userImg">
<img class="userinfo_img" :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.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="">
</span>
<p>fqfqw</p>
<p>fqwfqw</p>
<btnbar :row="item" :index="index" :btnType="1"></btnbar>
<p class="ellipsisFont1">{{item.empName}}</p>
<p class="ellipsisFont1">{{item.empTitle}}</p>
<div v-if="item.empId != userInfo.empId">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-else @loginState="loginState" @successState="participateSuccess" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
</div>
</div>
</div>
</div>
......@@ -137,7 +143,7 @@
:style="{backgroundImage:'url('+(item.channelPic?item.channelPic:require('../../assets/img/defaultlogo.png'))+')'}">
</p>
<div>
<p class="ellipsisFont1">{{item.channelTitle}}</p>
<p class="ellipsisFont1 mouseHover">{{item.channelTitle}}</p>
<div>
<p>{{item.timeZoneName}}</p>
<p>
......@@ -149,8 +155,12 @@
</div>
<div class="gendisplay signup">
<p class="ellipsisFont1">{{item.channelLabel}}</p>
<div>
<p>免费报名</p>
<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.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.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>
</div>
</div>
</div>
......@@ -159,11 +169,17 @@
</div>
</div>
<div class="right_module">
<div :style="positions?'position: fixed;top: 40px;z-index: -1;':''">
<div :style="positions?'position: fixed;top: 40px;z-index: 0;width: 320px;':''">
<div class="btnOperating" v-if="positions">
<span class="eventbtn">立即报名</span>
<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">
<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>
<span class="eventbtn" v-if="eventdata.activityState>2">{{eventdata.activityState==4?$t("activityInfo.hasFilled"):eventdata.activityState==3?$t("activityInfo.applyEnd"):eventdata.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
<span class="eventbtn" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span>
</span>
</div>
<div class="shareIt gendisplay">
<div class="shareIt gendisplay" v-if="resourcesList&&resourcesList.length<=4">
<div>
<VueQRCodeComponent :text="urltext" :size="100" :margin="0"></VueQRCodeComponent>
</div>
......@@ -197,7 +213,7 @@
<i class="typeCovermark">{{item.resourceType=='RAT01'?'话题':item.resourceType=='RAT02'?'活动':item.resourceType=='RAT03'?'报告':item.resourceType=='RAT04'?'文章':'话题'}}</i>
</div>
<div>
<p class="ellipsisFont1">{{item.resourceTitle}}</p>
<p class="ellipsisFont1 mouseHover">{{item.resourceTitle}}</p>
<p v-if="item.resourceType=='RAT01'">参与数 {{item.joinStr}} <i>阅读 {{item.browseStr}}</i></p>
<p v-if="item.resourceType=='RAT02'">{{item.activityTimeStr}}</p>
<p v-if="item.resourceType=='RAT03'">{{item.dataName}} <i>下载量 {{item.downloadStr}}</i></p>
......@@ -216,7 +232,7 @@
<i class="typeCovermark">活动</i>
</div>
<div>
<p class="ellipsisFont1">{{item.channelTitle}}</p>
<p class="ellipsisFont1 mouseHover">{{item.channelTitle}}</p>
<p>{{item.channelStartTime}} - {{item.channelEndTime}}</p>
</div>
</div>
......@@ -248,6 +264,7 @@
import signupbar from "./signupbar";
import expertVisible from "../../components/login/quicklogin";
import qrCmpt from "../../components/common/qrcodeCmpt";
import popoverBardbar from "../peoplehomepage/popoverBardbar";
export default {
name: "newEventdetail",
......@@ -260,6 +277,7 @@
isguestchecked:false,
resourcesList:[],
recommendList:[],
participateList:[],
positions:false,
isIntroduction:false,
vueQrVisible:false,
......@@ -267,11 +285,24 @@
secondStepInfo:{},
activeName:"first",
url:this.publicFun.getCurrentHrefEnv()+"/activitydetail?id="+this.$route.query.id+'&isApply=1&type='+this.$route.query.type,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : {},
}
},
components:{btnbar,VueQRCodeComponent,signupbar,expertVisible,qrCmpt},
components:{btnbar,VueQRCodeComponent,signupbar,expertVisible,qrCmpt,popoverBardbar},
methods:{
//去主页
tohome(id){
if(!this.publicFun.getUserInfoCookieType()){
this.$refs.login.isexpertVisible();
return
}else{
window.open(this.publicFun.getCurrentHrefEnv() + "/peoplehome?id="+id);
}
},
//调取快捷登录
loginState(){
this.$refs.login.isexpertVisible();
},
successlogin(){
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
this.getActivityDetails();
......@@ -342,9 +373,11 @@
},
//交换名片
successState(row,index){
row.baseEmpRelationDTO.isFriend = row.baseEmpRelationDTO.isApplyToGuest==1?0:row.baseEmpRelationDTO.isApplyToGuest==2?1:row.baseEmpRelationDTO.isApplyToGuest==3?2:'';
this.$set(this.guestList, index, row.baseEmpRelationDTO);
},
participateSuccess(row,index){
this.$set(this.participateList, index, row.baseEmpRelationDTO);
},
//嘉宾列表
activityGuestList(){
let params = {
......@@ -355,9 +388,6 @@
api.getActivityGuestList(params).then(response => {
if(response.code == 0) {
if(response.result.records){
response.result.records.forEach( (item) =>{
item.isFriend = item.isApplyToGuest==1?0:item.isApplyToGuest==2?1:item.isApplyToGuest==3?2:''
});
this.guestList = response.result.records;
}
} else {
......@@ -381,17 +411,15 @@
}
},
//最近参与
activityNewestJoin(){
activityJoinList(){
let params = {
activityId:this.$route.query.id,
count:7,
pageIndex:1,
pageSize:7,
};
api.getActivityNewestJoin(params).then(response => {
api.getActivityJoinList(params).then(response => {
if(response.code == 0) {
// response.result.records.forEach( (item) =>{
// item.isFriend = item.isApplyToGuest==1?0:item.isApplyToGuest==2?1:item.isApplyToGuest==3?2:''
// });
// this.guestList = response.result.records;
this.participateList = response.result.records;
} else {
this.$toast(response.msgCode);
}
......@@ -558,7 +586,7 @@
window.addEventListener('scroll', this.menu);
this.getActivityDetails();
this.activityGuestList();
this.activityNewestJoin();
this.activityJoinList();
this.activityResourcesById();
this.recommendActivity();
},
......@@ -662,9 +690,9 @@
font-weight: bold;
}
.information_1{
margin: 30px 0;
margin: 20px 0;
>span{
margin-right: 20px;
margin-right: 15px;
}
>span:nth-child(1){
color: #7A7A7A;
......@@ -674,12 +702,14 @@
font-size: 12px;
border: 1px solid #5D78FF;
padding: 2px 5px;
border-radius: 2px;
}
>span:nth-child(3){
background: #FF5D5D;
color: #ffffff;
font-size: 12px;
padding: 2.5px 5px;
border-radius: 2px;
}
>span:nth-child(4){
color: #7A7A7A;
......@@ -691,16 +721,19 @@
.information_2{
color: #1A1A1E;
>div:nth-child(1){
line-height: 24px;
line-height: 30px;
width: calc(100% - 320px);
}
>div:nth-child(2){
width: 320px;
text-align: center;
margin-top: 20px;
>p{
color: #7A7A7A;
margin-top: 38px;
margin-top: 28px;
line-height: 21px;
>i{
font-size: 20px;
color: #00C800;
}
}
......@@ -722,10 +755,13 @@
box-shadow: 0px 3px 10px 1px rgba(93, 120, 255, 0.4);
}
.participate_user{
margin-top: 20px;
>div{
text-align: center;
margin-right: 50px;
>span{
display: inline-block;
height: 70px;
.userinfo_img{
width: 70px;
height: 70px;
......@@ -736,11 +772,15 @@
}
>p:nth-child(2){
color: #1A1A1E;
height: 22px;
line-height: 22px;
overflow: hidden;
}
>p:nth-child(3){
height: 22px;
line-height: 22px;
font-size: 12px;
overflow: hidden;
color: #AAAAAA;
}
}
......@@ -811,7 +851,7 @@
flex-wrap: wrap;
.recommend_content{
width: 50%;
margin-top: 30px;
margin-top: 20px;
cursor: pointer;
.recommend_top{
.eventCoverimg{
......@@ -827,6 +867,8 @@
color: #1A1A1E;
font-weight: bold;
height: 22px;
line-height: 22px;
overflow: hidden;
}
>div{
color: #69697A;
......@@ -846,7 +888,7 @@
>div{
width: 40%;
text-align: right;
>p{
>span{
display: inline-block;
color: #5D78FF;
padding: 3px 12px;
......
src/views/findeventpage/userlist.vue
View file @ 0aa3e5e9
......@@ -3,7 +3,7 @@
<el-scrollbar style="height: 100%">
<div class="p_tabs_content" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
<div class="gendisplay " v-for="(item,index) in userRelationlist">
<span class="userImg" @click="tohome(item)">
<span class="userImg" @click="item.empId?tohome(item):''">
<img class="userinfo_img" :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.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="">
......@@ -11,16 +11,16 @@
<div>
<div class="gendisplay">
<p>
<i @click="tohome(item)" class="hover_cursor">{{item.empName}}</i>
<i @click="item.empId?tohome(item):''" class="hover_cursor">{{item.empName}}</i>
<i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
</p>
<div style="margin-right: 10px;" v-if="item.empId != userInfo.empId">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
<btnbar v-if="item.isFriend != 2" :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2&&item.empId" :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>
</div>
</div>
<p @click="tohome(item)" style="color:#AAAAAA;">
{{item.isProfessor||item.isModerator?item.empTitle:item.workName}}
<p @click="item.empId?tohome(item):''" class="ellipsisFont1" style="color:#AAAAAA;overflow: hidden;">
{{item.isProfessor||item.isModerator||item.isGuest?item.empTitle:item.workName}}
</p>
<p style="color:#AAAAAA;">
{{item.orgName}}
......
src/views/index.vue
View file @ 0aa3e5e9
......@@ -9,7 +9,7 @@
<router-view @itemBtn="sendbtns" />
</div>
</div>
<PageBottom @itemBtn="sendbtn" @aboutwebtn="aboutwebtn" style="z-index: 1;position: relative;"></PageBottom>
<PageBottom @itemBtn="sendbtn" @aboutwebtn="aboutwebtn" style="z-index: 10;position: relative;"></PageBottom>
</div>
</template>
<script>
......
src/views/index/pages/index.vue
View file @ 0aa3e5e9
......@@ -68,7 +68,7 @@
@click="handleMore('detail',item.contentType == 'activity'?'/eventdetail':item.contentType == 'guess'?'/guessDetail':item.contentType== 'topic'?'/topicDetails':'/',item,true)">
<span class="hot_lable">热门</span>
<span style="color: #1A1A1E;">{{item.contentType == 'activity'?'活动':item.contentType == 'guess'?'竞猜':item.contentType== 'topic'?'话题':''}} <i style="margin: 0 3px;">|</i></span>
<span style="color: #1A1A1E;">{{item.contentType == 'activity'?item.contentDetail.channelTitle:item.contentType == 'guess'?item.contentDetail.guessTitle:item.contentType== 'topic'?'#'+item.contentDetail.topicTitle+'#':''}}</span>
<span class="mouseHover" style="color: #1A1A1E;">{{item.contentType == 'activity'?item.contentDetail.channelTitle:item.contentType == 'guess'?item.contentDetail.guessTitle:item.contentType== 'topic'?'#'+item.contentDetail.topicTitle+'#':''}}</span>
</p>
<div class="gendisplay">
<p v-if="item.contentType == 'activity'">{{item.contentDetail.activityStartTime}} - <span v-html="getsubstring(item.contentDetail.activityEndTime,4)"></span></p>
......@@ -121,7 +121,7 @@
</i>
</div>
<p @click="handleMore('detail','/eventdetail',item)" class="ellipsisFont2" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">{{item.channelTitle}}</p>
<p @click="handleMore('detail','/eventdetail',item)" class="ellipsisFont2 mouseHover" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">{{item.channelTitle}}</p>
<div style="font-size: 12px;">
<p class="ellipsisFont1" style="width: 100%;height: 18px;overflow: hidden;">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<div class="gendisplay">
......@@ -136,7 +136,7 @@
<div style="text-align: center;margin-top: 25px;">
<span v-if="userInfo&&userInfo.empId!=item.createdBy||!userInfo">
<span style="color: #0ABB87;padding: 6px 20px;border: 1px solid #0ABB87;border-radius: 20px;" v-if="item.isJoin==1&&item.activityState != 3">{{$t('activityInfo.hasApply')}}</span>
<span v-if="item.activityState == 2&&item.isJoin==2"><el-button type="primary" @click="handleApply(item)" round plain size="mini" style="width: 90px;font-size: 14px;"><i style="font-weight: bold">{{$t('activityInfo.freeApply')}}</i></el-button></span>
<span v-if="item.activityState == 2&&item.isJoin==2"><el-button type="primary" @click="handleApply(item)" round plain size="mini" style="padding:0 15px;font-size: 14px;line-height: 28px;"><i style="font-weight: bold">{{item.viewDesc?item.viewDesc:$t('activityInfo.freeApply')}}</i></el-button></span>
<span v-if="item.activityState == 3">{{$t('activityInfo.applyEnd')}}</span>
<span style="color: #FF5D5D" v-if="item.activityState == 4&&item.isJoin==2">{{$t('activityInfo.hasFilled')}}</span>
<span style="color: #9197B4" v-if="item.activityState == 5&&item.isJoin==2">{{$t('activityInfo.activityEnd')}}</span>
......@@ -166,7 +166,7 @@
</p>
<div style="width: calc(100% - 165px);">
<div class="gendisplay">
<p class="ellipsisFont1" style="color:#1A1A1E;font-size: 16px;font-weight: bold;max-width: calc(100% - 30px);height: 22px;overflow: hidden;">#{{item.topicTitle}}#</p>
<p class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 16px;font-weight: bold;max-width: calc(100% - 30px);height: 22px;overflow: hidden;">#{{item.topicTitle}}#</p>
<i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;font-weight: normal;"></i>
</div>
<p class="ellipsisFont2" style="color:#69697A;margin: 8px 0;font-size: 12px;line-height: 22px;max-height: 44px;overflow: hidden;">
......@@ -213,7 +213,7 @@
</p>
</div>
</div>
<p class="ellipsisFont2" @click="toeventdetail(item)" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">
<p class="ellipsisFont2 mouseHover" @click="toeventdetail(item)" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">
{{item.guessTitle}}
</p>
</li>
......@@ -234,7 +234,7 @@
:style="{backgroundImage:'url('+(item.logoUrl?item.logoUrl:require('../../../assets/img/index/prodefaultLogo.png'))+')'}">
</p>
<div style="padding-left: 15px;font-size: 12px;width: calc(100% - 40px);">
<p class="ellipsisFont1" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">{{item.projectName}}</p>
<p class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">{{item.projectName}}</p>
<div class="gendisplay" style="margin-top: 5px;color: #AAAAAA;font-size: 12px;">
<p class="ellipsisFont1" style="max-width: 70%;margin-right: 20px;height: 17px;overflow: hidden;">{{item.projectModel}}</p>
<p>{{item.local}}</p>
......@@ -258,7 +258,7 @@
:style="{backgroundImage:'url('+(item.logoUrl?item.logoUrl:require('../../../assets/img/bigBusiness@2x.png'))+')'}">
</p>
<div style="padding-left: 15px;font-size: 12px;width: calc(100% - 40px);">
<p class="ellipsisFont1" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">{{item.companyName}}</p>
<p class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">{{item.companyName}}</p>
<div style="margin-top: 5px;color: #AAAAAA;font-size: 12px;">
<p class="ellipsisFont1" style="max-width: 95%;margin-right: 10px;height: 17px;overflow: hidden;line-height: 17px;">{{item.industryPurpose}}</p>
</div>
......@@ -279,7 +279,7 @@
<div class="cooperation_img">
<img :src="item.images" alt="">
</div>
<p class="ellipsisFont1" style="width: 100%;height: 22px;overflow: hidden;">{{item.pcontent}}</p>
<p class="ellipsisFont1 mouseHover" style="width: 100%;height: 22px;overflow: hidden;">{{item.pcontent}}</p>
<p style="color: #AAAAAA;font-size: 12px;margin-top: 10px;font-weight: normal;">{{item.spancontent}}</p>
</li>
</ul>
......@@ -303,7 +303,7 @@
&nbsp;
</p>
<div>
<p class="ellipsisFont2" style="color:#1A1A1E;height: 50px;font-weight: bold;">{{item.contentTitle}}</p>
<p class="ellipsisFont2 mouseHover" style="color:#1A1A1E;height: 50px;font-weight: bold;">{{item.contentTitle}}</p>
<p style="color: #AAAAAA;font-size: 12px;">
<span>{{item.contentBrowseStr}} 阅读</span>
<span style="margin: 0 15px;">{{item.publishTimeStr}}</span>
......@@ -313,7 +313,7 @@
</div>
<p v-else class="gendisplay" style="margin-bottom: 12px;line-height: 20px;">
<i style="color:#5D78FF;padding-left: 10px;">&bull;&nbsp;&nbsp;</i>
<span class="ellipsisFont1" style="color:#1A1A1E;width: 310px;height: 20px;line-height: 22px;">{{item.contentTitle}}</span>
<span class="ellipsisFont1 mouseHover" style="color:#1A1A1E;width: 310px;height: 20px;line-height: 22px;">{{item.contentTitle}}</span>
<span style="width:calc(100% - 300px);text-align: right;color: #AAAAAA;">{{item.publishTimeStr}}</span>
</p>
</li>
......@@ -338,13 +338,13 @@
<img v-if="item.isProfessor==1" src="../../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
</p>
<div style="margin-left: 15px;font-size: 12px;">
<p style="color:#1A1A1E;">{{item.isProfessor == 1?item.empName:item.nickName}}</p>
<p class="mouseHover" style="color:#1A1A1E;">{{item.isProfessor == 1?item.empName:item.nickName}}</p>
<p class="ellipsisFont1" style="margin-top: 5px;color: #AAAAAA;width: 100%;height: 17px;overflow: hidden;line-height: 17px;">{{item.isProfessor==1?item.professorIntroduction:item.createdTimeStr}}</p>
</div>
</div>
<p @click="handleMore('detail','/topicDetails',item)" v-if="item.simpleContent" class="ellipsisFont2" style="margin: 10px 0;line-height: 24px;width: 100%;max-height: 48px;overflow: hidden;color: #1A1A1E;" v-html="item.pcState==1?publicFun.getTextInRichtext(item.simpleContent):publicFun.analyzeEmoji(item.simpleContent)"></p>
<div @click="handleMore('detail','/topicDetails',item)" class="gendisplay" style="padding: 10px;background: #F5F5F5;">
<p style="width: calc(100% - 82px);color:#1A1A1E;">#{{item.baseTopic.topicTitle}}#</p>
<p class="mouseHover" style="width: calc(100% - 82px);color:#1A1A1E;">#{{item.baseTopic.topicTitle}}#</p>
<p style="width: 82px;"><img class="imgInfo" style="height: 56px;width: 82px;border-radius: 3px;border: none;" :style="{backgroundImage:'url('+(item.baseTopic.topicCover?item.baseTopic.topicCover:require('../../../assets/img/topicbackground.jpg'))+')'}" alt=""></p>
</div>
</div>
......@@ -372,7 +372,7 @@
<img v-if="index == 2" style="width: 24px;height: 22px;margin-top: 5px;" src="../../../assets/img/rankingindex3.png" alt="">
<p style="line-height: 34px;width: 24px;text-align: center;" v-if="index>2">{{index+1}}</p>
<img @click="tohome(item.empId)" style="height: 34px;width: 34px;border-radius: 50%;margin: 0 20px;cursor: pointer;" :src="item.empLogo&&item.empLogo.length>1?item.empLogo:require('../../../assets/img/defaultlogo.png')" alt="">
<p class="ellipsisFont1" @click="tohome(item.empId)" style="width: 90px;height: 34px;overflow: hidden;line-height: 34px;cursor: pointer;">{{item.nickName}}</p>
<p class="ellipsisFont1 mouseHover" @click="tohome(item.empId)" style="width: 90px;height: 34px;overflow: hidden;line-height: 34px;cursor: pointer;">{{item.nickName}}</p>
</div>
<div class="gendisplay" style="width: calc(100% - 210px);text-align: right;line-height: 34px;font-weight: normal;">
<p style="width: calc(100% - 80px);text-align: left;">胜率：<i style="font-weight: bold;">{{item.winRate}}%</i></p>
......@@ -397,7 +397,7 @@
<img style="width: 35px;" src="../../../assets/img/industryreport/pdf@2x.png" alt="">
</p>
<div>
<p class="ellipsisFont2" @click="downloaddetail(item)" style="color:#1A1A1E;line-height: 20px;margin-bottom: 10px;">{{item.reportTitle}}</p>
<p class="ellipsisFont2 mouseHover" @click="downloaddetail(item)" style="color:#1A1A1E;line-height: 20px;margin-bottom: 10px;">{{item.reportTitle}}</p>
<div class="gendisplay" style="color: #AAAAAA;font-size: 12px;">
<p class="gendisplay" style="width: 200px;">
<span class="ellipsisFont1" @click="downloaddetail(item)" v-if="item.baseDataVO" style="max-width: 100px;margin-right: 10px;height: 15px;">{{item.baseDataVO.dataName}}</span>
......
src/views/industryreportspage/industrybar.vue
View file @ 0aa3e5e9
......@@ -8,7 +8,7 @@
<img style="width: 35px;" src="../../assets/img/industryreport/pdf@2x.png" alt="">
</p>
<div>
<p class="ellipsisFont2" @click="gocontentdetail(item)" style="color:#1A1A1E;line-height: 20px;margin-bottom: 10px;">{{item.reportTitle}}</p>
<p class="ellipsisFont2 mouseHover" @click="gocontentdetail(item)" style="color:#1A1A1E;line-height: 20px;margin-bottom: 10px;">{{item.reportTitle}}</p>
<div style="color: #AAAAAA;font-size: 12px;">
<p class="gendisplay">
<span class="ellipsisFont1" @click="gocontentdetail(item)" v-if="item.baseDataVO" style="max-width: 100px;margin-right: 10px;height: 15px;">{{item.baseDataVO.dataName}}</span>
......
src/views/integralpage/popularguessbar.vue
View file @ 0aa3e5e9
......@@ -8,7 +8,7 @@
<div class="gendisplay">
<p class="imgInfo" style="width: 80px;height: 56px;" :style="{backgroundImage:'url('+(item.coverUrl)+')'}">
</p>
<p style="width: 225px;">{{item.guessTitle}}</p>
<p class="mouseHover" style="width: 225px;">{{item.guessTitle}}</p>
</div>
<div class="gendisplay" style="font-size: 12px;margin-top: 10px;color:#AAAAAA;">
<div style="width: calc(100% - 150px);">
......
src/views/peoplehomepage/btnbar.vue
View file @ 0aa3e5e9
......@@ -158,7 +158,7 @@
otherEmpId:this.row.empId,
queryType:0,
dataId:this.channelId?this.channelId:this.eventId,
guestId:row.id?row.id:null,
guestId:row.guestId?row.guestId:null,
dataType:this.channelId?1:this.eventId?1:null,
};
api.addEmpContact(params).then((res)=>{
......
src/views/peoplehomepage/introductionbar.vue
View file @ 0aa3e5e9
......@@ -116,19 +116,21 @@
</el-row>
</div>
</div>
<div class="p_jobs p_tabs">
<div class="gendisplay p_tabs_title">
<p>
<span>工作经历<i></i></span>
</p>
</div>
<div v-if="workList == null || workList.length == 0">
<div class="p_jobs p_tabs" v-if="(workList == null || (workList&&workList.length == 0))&&(educationList == null || (educationList&&educationList.length == 0))">
<div>
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
<div v-else class="jobs_content">
</div>
<div class="p_jobs p_tabs" v-if="workList != null || (workList&&workList.length != 0)">
<div class="gendisplay p_tabs_title">
<p>
<span>工作经历<i></i></span>
</p>
</div>
<div class="jobs_content">
<div v-for="(item,index) in workList" class="gendisplay">
<p><i class="iconfont icon-gongzuojingli"></i></p>
<p>
......@@ -140,19 +142,13 @@
</div>
</div>
</div>
<div class="p_education p_tabs">
<div class="p_education p_tabs" v-if="educationList != null || (educationList&&educationList.length != 0)">
<div class="gendisplay p_tabs_title">
<p>
<span>教育经历<i></i></span>
</p>
</div>
<div v-if="educationList == null || educationList.length == 0">
<p class="noIntegral">
<img src="../../assets/img/mobile/noIntegral@2x.png" alt="">
<span>暂无数据</span>
</p>
</div>
<div v-else class="jobs_content">
<div class="jobs_content">
<div v-for="(item,index) in educationList" class="gendisplay">
<p><i class="iconfont icon-jiaoyujingli" style="color:#B7E5CC;"></i></p>
<p>
......
src/views/publishactivity/proactivity.vue
View file @ 0aa3e5e9
......@@ -551,7 +551,7 @@
<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-form-item>
<el-form-item label="嘉宾介绍：" prop="guestDesc">
<el-input :disabled="guestform.guestDesc&&guestform.empId?true:false" style="width:370px;"type="textarea" maxlength="200" :rows="2" v-model="guestform.guestDesc" :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('pubactivities.plguestname')"></el-input>
</el-form-item>
<el-form-item :label="$t('pubactivities.guestPhotos')+'：'" ref="guestimg" prop="guestPic">
<p class="imgTitle">{{$t('pubactivities.guesttext')}}</p>
......@@ -596,7 +596,7 @@
<el-dialog title="添加内容" :visible.sync="resourcesVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeResources" width="600px" class="dialogWrap">
<el-form label-position="right" label-width="120px" style="margin:0 100px 0 60px">
<el-form-item label="类型：">
<el-select style="width:270px;" v-model="resourcesform.resourceType" placeholder="'请选择'" @change="getsearchResources(resourcesform.resourceType)">
<el-select style="width:270px;" v-model="resourcesform.resourceType" placeholder="请选择" @change="getsearchResources(resourcesform.resourceType)">
<el-option v-for="item in resourcesTypelist" :key="item.key" :label="item.label" :value="item.key">
</el-option>
</el-select>
......@@ -832,7 +832,8 @@
numberOfPages: 1,
},
search: {
resourceType:val
resourceType:val,
channelId:this.$route.query.channelId,
}
};
api.searchResources(params).then(response => {
......@@ -855,6 +856,7 @@
},
closeResources(){
this.resourcesform = {};
this.resourcesTitlelist = {};
},
newOpen(row){
let pageType = row.resourceType == 'RAT01'?'topicDetails':row.resourceType == 'RAT02'?'eventdetail':row.resourceType == 'RAT03'?'industryReportDetail':row.resourceType == 'RAT04'?'articleDetail':'';
......@@ -869,6 +871,10 @@
return
}
}
if(this.formData.resourceList.length>=6){
this.$message.error('已添加上限');
return
}
this.formData.resourceList.push({
resourceTitle:this.resourcesform.title,
resourceType:this.resourcesform.resourceType,
......@@ -927,10 +933,12 @@
if(response.code == 0) {
if(response.result){
this.guestform = response.result;
this.guestform.linguestDesc = this.guestform.guestDesc;
}else{
this.guestform = {};
this.guestform.guestContact = guestContact;
}
this.$refs['guestform'].resetFields();
} else {
this.$message.error(response.msg);
}
......@@ -1021,6 +1029,7 @@
api.getGuestsInfo(row.guestId).then(response => {
if(response.code == 0) {
this.guestform = response.result;
this.guestform.linguestDesc = this.guestform.guestDesc;
this.guestVisible = true;
} else {
this.$message.error(response.msg);
......@@ -1043,6 +1052,7 @@
}
}
}
this.guestform.guestDesc = this.guestform.linguestDesc;
let urls = this.guestform.guestId?'/base/guests/editGuestsInfo':'/base/guests/addGuestsInfo';
api.addGuestsInfo(urls,this.guestform).then(response => {
if(response.code == 0) {
......
src/views/publishactivity/pubactivities.vue
View file @ 0aa3e5e9
......@@ -59,7 +59,10 @@
<el-button type="text" @click="urlclk(scope.row)">
{{$t('commonTitle.vipLookTitle')}}
</el-button>
<el-button v-if="scope.row.channelState == 1||scope.row.channelState == 2||scope.row.channelState == 3" type="text" @click="$router.push({path:'/addproactivity',query:{channelId:scope.row.channelId,type:scope.row.channelType,edit:true}})">
<el-button type="text" @click="newopen(scope.row)">
pc{{$t('commonTitle.vipLookTitle')}}
</el-button>
<el-button v-if="scope.row.channelState != 0" type="text" @click="$router.push({path:'/addproactivity',query:{channelId:scope.row.channelId,type:scope.row.channelType,edit:true}})">
{{$t('Otherjson.edittext')}}
</el-button>
<el-button v-if="scope.row.channelState == 3||scope.row.channelState == 4" type="text" @click="$router.push({path:'/applyactivity',query:{channelTitle:scope.row.channelTitle,type:scope.row.channelType,channelId:scope.row.channelId}})">
......@@ -159,6 +162,9 @@
return false;
});
},
newopen(val){
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id="+val.channelId+'&ismyevent=0&type='+val.channelType);
},
// 分页导航
handleCurrentChange(val) {
this.cur_page = val;
......
src/views/topicpage/commentdetail.vue
View file @ 0aa3e5e9
......@@ -661,7 +661,7 @@
return
}
if(this.publicFun.unique(row.wordarea).length<10){
// this.$message.error('内容不能为空');
this.$message.error('您输入的内容未达到10个字，请修改后重试！');
return;
}
let params = {
......
src/views/topicpage/discussall.vue
View file @ 0aa3e5e9
<template>
<div class="foutdivdiscuss">
<div class="divclasschild">
<div class="descContentcal gendisplay" v-if="moderatorSetting.descContent&&moderatorSetting.descContent.length>1">
<div class="descContentcal gendisplay" v-if="moderatorSetting.descContent&&moderatorSetting.showDesc==1">
<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>
</div>
......@@ -31,7 +31,7 @@
</p>
<div style="text-align: left;width: calc(100% - 150px);">
<p class="gendisplay" style="color:#1A1A1E;font-size: 16px;">
<span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
<span class="ellipsisFont1 mouseHover" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
<i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
</p>
<p class="ellipsisFont2" style="color:#69697A;margin: 10px 0 10px;font-size: 14px;line-height: 22px;height: 44px;">{{itemchild.topicDescription}}</p>
......@@ -56,7 +56,7 @@
</p>
<div style="padding-left: 15px;font-size: 12px;width: calc(100% - 100px);">
<p class="gendisplay">
<span class="ellipsisFont1" style="color:#1A1A1E;font-size: 14px;font-weight: bold;max-width: calc(100% - 10px);height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
<span class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 14px;font-weight: bold;max-width: calc(100% - 10px);height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
<i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 17px;"></i>
</p>
<div style="line-height: 24px;margin-top: 5px;">
......@@ -104,7 +104,7 @@
<el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
<div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
<div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
<div style="position: relative;" @click="tohome(item)">
<div style="position: relative;cursor: pointer;" @click="tohome(item)">
<img :src="item.empLogo?item.empLogo:require('../../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;bottom: 0px;width: 15px;">
</div>
......@@ -146,7 +146,7 @@
<el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
<div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
<div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
<p style="position: relative;" @click="tohome(item)">
<p style="position: relative;cursor: pointer;" @click="tohome(item)">
<img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
......
src/views/topicpage/discussdialog.vue
View file @ 0aa3e5e9
......@@ -4,6 +4,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" :discussTips="discussTips?discussTips:changediscussTips" :channelIntroduction="discussContent" :istopicTips="true"></rich-text>
<p v-if="btnpush" style="margin: 15px 0;color: red;">您输入的内容未达到10个字，请修改后重试！</p>
<p v-if="sensitiveTextstate" style="margin: 15px 0;color: red;">{{sensitiveText}}</p>
<div class="gendisplay topic_select" v-if="!topicid">
<div style="margin-right: 20px;">
......@@ -79,7 +80,7 @@
</div>
<el-row style="padding-top: 20px;text-align: center">
<el-button @click="closeSensor">取 消</el-button>
<el-button type="primary" @click="pushdiscuss" :disabled="btnpush">确定</el-button>
<el-button type="primary" @click="pushdiscuss">确定</el-button>
</el-row>
</el-dialog>
</div>
......@@ -119,7 +120,7 @@
topic_count:1,
topic_count2:1,
topicId:'',
btnpush:true,
btnpush:false,
changediscussTips:'',
sensitiveText:'',
sensitiveTextstate:false,
......@@ -132,12 +133,6 @@
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(){
......@@ -240,6 +235,13 @@
this.$message.error('请选择话题圈子');
return;
}
let textlength = this.publicFun.unique(this.publicFun.getTextInRichtext(this.discussContent));
if(textlength&&textlength.length<10){
this.btnpush = true;
return;
}else{
this.btnpush = false;
}
let params = {
discussContent:this.discussContent,
simpleContent:this.publicFun.getTextInRichtext(this.discussContent),
......
src/views/topicpage/topicbar.vue
View file @ 0aa3e5e9
......@@ -6,7 +6,7 @@
<div class="content">
<div v-for="(item,index) in hottopiclist" @click="todetail(item)" :key="index">
<p style="color:#1A1A1E;font-size: 14px;margin-bottom: 15px;">
<span>#{{item.topicTitle}}#</span>
<span class="mouseHover">#{{item.topicTitle}}#</span>
<i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 17px;"></i>
</p>
<div class="gendisplay" style="font-size: 12px;">
......
src/views/topicpage/topicdetail.vue
View file @ 0aa3e5e9
......@@ -126,11 +126,13 @@
<el-tab-pane label="精华" name="second"></el-tab-pane>
</el-tabs>
</div>
<div v-if="(NormalDiscussstate==1&&contentList.length==0)||(NormalDiscussstate==0&&contentList.length==0&&discussTopList.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 style="color:#C8CBE0;">暂无数据</p>
</div>
<div v-if="discussTopList&&discussTopList.length>=1&&NormalDiscussstate == 0" style="background: #ffffff;border-radius: 3px;padding:15px 17px;margin-top: 15px;">
<div v-if="(discussTopList&&discussTopList.length>=1&&NormalDiscussstate == 0)||(contentdata.baseTopicSetting&&contentdata.baseTopicSetting.showDesc == 1)" style="background: #ffffff;border-radius: 3px;padding:15px 17px;margin-top: 15px;">
<div v-if="contentdata.baseTopicSetting&&contentdata.baseTopicSetting.showDesc == 1" @click="tourldetail(contentdata.baseTopicSetting)" 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>
<i @click="">contentdata.baseTopicSetting.descContent</i>
</p>
</div>
<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;">
<span style="background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;">置顶</span>
......@@ -139,6 +141,10 @@
<p style="width: 42px;line-height: 28px;color: #AAAAAA;">{{item.topTime}}</p>
</div>
</div>
<div v-if="(NormalDiscussstate==1&&contentList.length==0)||(NormalDiscussstate==0&&contentList.length==0&&discussTopList.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 style="color:#C8CBE0;">暂无数据</p>
</div>
<ul class="infinite-list contentlist_ul" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
<li v-for="(item,index) in contentList" :key="index" style="margin-top: 15px;border-radius: 3px;position: relative;">
<img v-if="item.isStar == 1&&NormalDiscussstate==0" src="../../assets/img/mobile/marrow.png" alt="" style="position: absolute;right: 0px;top: 30px;z-index: 99;width: 80px;">
......@@ -809,6 +815,9 @@
this.$router.push({path:'/discussdetail',query:{id:row.topicId,disId:row.id}});
globalMsg.$emit('maidianfunc',({type:'report-topic-discuss-read',topicId:row.topicId,topicDiscussId:row.id}));
},
tourldetail(val){
window.open(this.publicFun.getCurrentHrefEnv()+val.descUrl);
},
//表情拼接
emojstate(val,state){
let content = this.discussContent;
......@@ -1230,7 +1239,7 @@
return
}
if(this.publicFun.unique(row.wordarea).length<10){
// this.$message.error('内容不能为空');
this.$message.error('您输入的内容未达到10个字，请修改后重试！');
return;
}
let params = {
......
src/views/topicpage/topictype.vue
View file @ 0aa3e5e9
......@@ -15,7 +15,7 @@
</p>
<div style="text-align: left;width: calc(100% - 150px);">
<p class="gendisplay" style="color:#1A1A1E;font-size: 16px;">
<span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{item.topicTitle}}# </span>
<span class="ellipsisFont1 mouseHover" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{item.topicTitle}}# </span>
<i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
</p>
<p v-if="(item.secondList&&item.secondList.length==1)||(item.secondList&&item.secondList.length==0)" class="ellipsisFont2" style="color:#69697A;margin: 10px 0 5px;font-size: 12px;line-height: 22px;height: 44px;overflow: hidden;">{{item.topicDescription}}</p>
......@@ -45,7 +45,7 @@
</p>
<div style="padding-left: 15px;font-size: 12px;width: calc(100% - 100px);">
<p class="gendisplay">
<span class="ellipsisFont1" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
<span class="ellipsisFont1 mouseHover" style="color:#1A1A1E;font-size: 14px;font-weight: bold;width: 100%;height: 18px;overflow: hidden;">#{{itemchild.topicTitle}}#</span>
<i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 17px;"></i>
</p>
<div style="line-height: 24px;margin-top: 5px;">
......@@ -70,7 +70,7 @@
</p>
<div style="text-align: left;width: calc(100% - 100px);">
<p class="gendisplay" style="color:#1A1A1E;font-size: 14px;">
<span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
<span class="ellipsisFont1 mouseHover" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{itemchild.topicTitle}}# </span>
<i v-if="itemchild.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
</p>
<p class="ellipsisFont1" style="color:#69697A;margin: 6px 0 1px;font-size: 12px;line-height: 22px;height: 22px;overflow: hidden;">{{itemchild.topicDescription}}</p>
......@@ -106,7 +106,7 @@
<div v-for="(item,index) in professorlist" :key="index">
<el-tooltip placement="top" popper-class="boxShadowTip" effect="light">
<div class="gendisplay" style="padding: 20px 20px 0 20px;">
<div style="position: relative;" @click="tohome(item)">
<div style="position: relative;cursor: pointer;" @click="tohome(item)">
<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;">
......@@ -144,7 +144,7 @@
<el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
<div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
<div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
<div style="position: relative;" @click="tohome(item)">
<div style="position: relative;cursor: pointer;" @click="tohome(item)">
<img :src="item.empLogo?item.empLogo:require('../../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;bottom: 0px;width: 15px;">
</div>
......
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