Skip to content

T
techbook
Commit 113cc64f authored by anxixi's avatar anxixi
Browse files
Options

话题相关功能

parent 61954255
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 19 deletions
src/views/assistantpage/redenvelopes.vue
View file @ 113cc64f
......@@ -87,12 +87,13 @@
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<p>{{scope.row.innerStatus==0?'未发放':scope.row.innerStatus==1?'发放失败':scope.row.innerStatus==2?'未领取':scope.row.innerStatus==3?'已领取':scope.row.innerStatus==4?'已过期':(scope.row.userSubscribe == 1?'已关注':'未关注')}}</p>
<p v-if="scope.row.userSubscribe == 1">{{scope.row.innerStatus==0?'未发放':scope.row.innerStatus==1?'发放失败':scope.row.innerStatus==2?'未领取':scope.row.innerStatus==3?'已领取':scope.row.innerStatus==4?'已过期':'未发放'}}</p>
<p v-else>{{scope.row.noticeState == 1?'已发过提示':'- -'}}</p>
</template>
</el-table-column>
<el-table-column :label="$t('listjson.action')" width="200" align='center' fixed="right">
<template slot-scope="scope">
<div v-if="false">
<div v-if="scope.row.userSubscribe==1&&(scope.row.innerStatus==0||scope.row.innerStatus==null)">
<el-button type="text" @click="sendStarPackets(5,scope.row)">
5元
</el-button>
......@@ -106,7 +107,7 @@
其他金额
</el-button>
</div>
<el-button type="text" @click="setsendTipsMsg(scope.row)" v-if="scope.row.noticeState != 1||scope.row.innerStatus==0">
<el-button type="text" @click="setsendTipsMsg(scope.row)" v-if="scope.row.noticeState == 0&&scope.row.userSubscribe==0">
给用户发一条短信通知
</el-button>
<el-button v-if="scope.row.innerStatus&&scope.row.innerStatus!=0" type="text" @click="amountinfo(scope.row)">
......
src/views/index/pages/index.vue
View file @ 113cc64f
......@@ -206,7 +206,7 @@
<div>
<span v-if="item.professorCount==0" class="ellipsisFont1" style="max-width: 100px;">发起方：<i style="color:#5D78FF;">{{item.topicInitiator}}</i></span>
<p class="hotimg" v-else>
<span style="color:#5D78FF;margin-right: 30px;">{{item.professorCount}} 位超级大咖 参与讨论</span>
<span style="color:#5D78FF;margin-right: 30px;">专家入驻{{item.professorCount}} 位</span>
<img v-if="item.baseTopicProfessorList&&index<6" v-for="(items,index) in item.baseTopicProfessorList" :key="index" :src="items.empLogo" alt="">
</p>
</div>
......
src/views/topicpage/commentdetail.vue
View file @ 113cc64f
......@@ -13,19 +13,19 @@
<div style="position: relative;">
<img 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.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
<img v-if="commentdata.userInfo.isProfessor" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
</div>
<div style="font-size: 12px;margin-left: 15px;line-height: 18px;">
<div v-if="commentdata.userInfo" class="gendisplay">
<p style="margin-right: 5px;font-size: 12px;">
{{commentdata.isProfessor == 1?commentdata.userInfo.empName:commentdata.userInfo.nickName}}
{{commentdata.userInfo.isProfessor?commentdata.userInfo.empName:commentdata.userInfo.nickName}}
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="commentdata.userInfo.empMedalList!=null&&commentdata.userInfo.empMedalList.length>0" v-for="itemMedal in commentdata.userInfo.empMedalList"
></span>
</p>
</div>
<p>{{commentdata.createdTimeStr}}</p>
<p class="ellipsisFont1" style="width: 100%;overflow: hidden;"><i style="margin-right: 15px;">{{commentdata.createdTimeStr}}</i>{{commentdata.userInfo.professorIntroduction}}</p>
</div>
</div>
<div>
......@@ -248,7 +248,7 @@
<p>{{commentscommentdata.createdTimeStr}}</p>
<p style="font-size: 12px;">
<span @click="dictdialog(commentscommentdata,3)"><i style="font-size: 12px" class="iconfont icon-guzhangtousu"></i> 举报</span>
<span v-if="publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList&&empId==commentdata.baseModeratorList[0].empId)" style="margin-left: 30px;" @click="deletedauthority(commentscommentdata.id,commentindex,contentList)"><i style="font-size: 12px" class="iconfont icon-lajitongshanchu"></i> 删除</span>
<span v-if="publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId)" style="margin-left: 30px;" @click="deletedauthority(commentscommentdata.id,commentindex,contentList)"><i style="font-size: 12px" class="iconfont icon-lajitongshanchu"></i> 删除</span>
<span style="margin-left: 30px;" @click="commentscommentdata.iscomment = !commentscommentdata.iscomment"><i style="font-size: 12px" class="iconfont icon-pinglun"></i> 回复</span>
<span style="margin-left: 30px;" :style="commentscommentdata.isHasHot?'color:#5d78ff':''" @click="topiczan(commentscommentdata,true)"><i style="font-size: 12px" class="iconfont icon-zan1"></i> {{commentscommentdata.likeNumberStr == 0?'赞':commentscommentdata.likeNumberStr}}</span>
</p>
......@@ -261,7 +261,7 @@
</div>
</div>
<!-- ...每条评论右上角操作-->
<div style="position: absolute;right: 15px;top: 15px;" v-if="empId!=commentdata.createdBy||(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList&&empId==commentdata.baseModeratorList[0].empId))">
<div style="position: absolute;right: 15px;top: 15px;" v-if="empId!=commentdata.createdBy||(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))">
<el-popover
popper-class="userpopover"
placement="top"
......@@ -271,11 +271,11 @@
<i style="margin-right: 5px;" class="iconfont icon-guzhangtousu"></i>
举报
</span>
<span @click="istopState(commentdata)" :style="empId!=commentdata.createdBy?'padding-left: 10px;border-left: 1px solid #FFFFFF;':''" style="cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.isStar!=1">
<span @click="istopState(commentdata)" :style="empId!=commentdata.createdBy?'padding-left: 10px;border-left: 1px solid #FFFFFF;':''" style="cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.isStar!=1">
<i class="iconfont" :class="commentdata.topState==0?'icon-zhiding':'icon-quxiaozhiding'"></i>
{{commentdata.topState==0?'置顶':'取消置顶'}}
</span>
<span @click="isstarstate(commentdata)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.topState!=1">
<span @click="isstarstate(commentdata)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.topState!=1">
<i class="iconfont" :class="commentdata.isStar==0?'icon-jiajinghuax':'icon-quxiaojinghua'"></i>
{{commentdata.isStar==0?'精华':'取消精华'}}
</span>
......@@ -345,6 +345,7 @@
userInfo:{},
discussContent:'',
discussUrl:'',
baseModeratorList:[],
},
empuser:{},
urltext:'',
......
src/views/topicpage/discussall.vue
View file @ 113cc64f
......@@ -117,8 +117,49 @@
{{moderatorUnfold?'展开':'收起'}} <i class="iconfont" :class="moderatorUnfold?'icon-xiala':'icon-xiala-copy'" style="font-size: 12px"></i>
</p>
</div>
<topicbar :state="1" :hottopiclist="hottopiclist"></topicbar>
<topicbar id="topicbar" :state="1" :hottopiclist="hottopiclist"></topicbar>
<div class="topic_right animation_right" v-if="istopicbar" style="position: fixed;top: 40px;">
<div class="publish_topic">
<p @click="clkdiscussdialog">
<span>
<i class="iconfont icon-bianji1"></i> 发表
</span>
</p>
</div>
<div class="projectTabaddtopic y_moderator">
<el-tabs v-model="activeName">
<el-tab-pane label="招募版主" name="first">
<div class="gendisplay zm_moderator">
<p>
<span @click="visible = true">版主权益</span>
<span @click="visible2 = true">申请版主</span>
</p>
</div>
</el-tab-pane>
</el-tabs>
</div>
<div class="projectTabaddtopic y_moderator" v-if="moderatorCount&&moderatorCount>=1">
<el-tabs v-model="activeName">
<el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
<div style="margin:0 30px 20px 0;">
<div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
<p>
<img :src="item.empLogo" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
</p>
<p class="ellipsisFont1" style="color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;">
{{item.empName}}
</p>
</div>
</div>
</el-tab-pane>
</el-tabs>
<p @click="getModerator(moderatorUnfold?20:4)" v-if="moderatorCount&&moderatorCount>4">
{{moderatorUnfold?'展开':'收起'}} <i class="iconfont" :class="moderatorUnfold?'icon-xiala':'icon-xiala-copy'" style="font-size: 12px"></i>
</p>
</div>
</div>
</div>
</div>
</div>
......@@ -185,6 +226,7 @@
isdiscussdialog:false,
moderatorCount:0,
isdialoglogin:false,
istopicbar:false,
}
},
components:{
......@@ -290,6 +332,12 @@
}
}
}
let topicbar = this.$el.querySelector("#topicbar").offsetTop;
if(scroll>topicbar+530){
this.istopicbar = true;
}else{
this.istopicbar = false;
}
if(scroll>280){
this.positions = true;
}else{
......@@ -467,4 +515,59 @@
margin-bottom: 20px;
position: relative;
}
.animation_right{
-webkit-animation: fadeInOut .5s;
-moz-animation: fadeInOut .5s;
-ms-animation: fadeInOut .5s;
-o-animation: fadeInOut .5s;
}
//动画淡入淡出
@-webkit-keyframes fadeInOut {
0% {
opacity: 0
}
100% {
opacity: 1
}
}
@-moz-keyframes fadeInOut {
0% {
opacity: 0
}
100% {
opacity: 1
}
}
@-ms-keyframes fadeInOut {
0% {
opacity: 0
}
100% {
opacity: 1
}
}
@-o-keyframes fadeInOut {
0% {
opacity: 0
}
100% {
opacity: 1
}
}
@keyframes fadeInOut {
0% {
opacity: 0
}
100% {
opacity: 1
}
}
</style>
\ No newline at end of file
src/views/topicpage/topicbar.vue
View file @ 113cc64f
......@@ -14,7 +14,7 @@
&nbsp;
</p>
<div style="width: calc(100% - 95px);">
<span v-if="item.isOpenReward!=1&&item.professorCount!=0" class="ellipsisFont1" style="line-height: 28px;max-width: 100%;color:#5D78FF;">{{item.professorCount}}位超级大咖参与其中</span>
<span v-if="item.isOpenReward!=1&&item.professorCount!=0" class="ellipsisFont1" style="line-height: 28px;max-width: 100%;color:#5D78FF;">专家入驻{{item.professorCount}}位</span>
<span v-if="item.isOpenReward==1||item.professorCount==0" class="ellipsisFont1" style="line-height: 28px;max-width: 100%;">发起方： <i style="color:#5D78FF;">{{item.topicInitiator}}</i></span>
<div style="color: #AAAAAA;line-height: 28px;">
<span>阅读 {{item.topicBrowseStr}}</span>
......
src/views/topicpage/topicdetail.vue
View file @ 113cc64f
......@@ -149,12 +149,12 @@
<div style="position: relative;">
<img v-if="item.userInfo.empLogo" :src="item.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="item.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
<img v-if="item.userInfo.isProfessor" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
</div>
<div style="font-size: 12px;margin-left: 15px;line-height: 18px;">
<div v-if="item.userInfo" class="gendisplay">
<p style="margin-right: 5px;font-size: 12px;">
{{item.isProfessor == 1?item.userInfo.empName:item.userInfo.nickName}}
{{item.userInfo.isProfessor?item.userInfo.empName:item.userInfo.nickName}}
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="item.userInfo.empMedalList!=null&&item.userInfo.empMedalList.length>0" v-for="itemMedal in item.userInfo.empMedalList"
......@@ -162,7 +162,7 @@
</p>
</div>
<p class="ellipsisFont1" style="width: 100%;overflow: hidden;">{{item.isProfessor==1?item.userInfo.professorIntroduction:item.createdTimeStr}}</p>
<p class="ellipsisFont1" style="width: 100%;overflow: hidden;"><i style="margin-right: 15px;">{{item.createdTimeStr}}</i>{{item.userInfo.professorIntroduction}}</p>
</div>
</div>
<div>
......@@ -242,7 +242,7 @@
type="textarea"
:autosize="{ minRows: 2,maxRows: 5}"
style="width: 100%;"
:placeholder="'回复'+(item.isProfessor == 1?item.userInfo.empName:item.userInfo.nickName)"
:placeholder="'回复'+(item.userInfo.isProfessor == 1?item.userInfo.empName:item.userInfo.nickName)"
v-model="item.wordarea"
maxlength="1000"
></el-input>
......@@ -280,13 +280,13 @@
<div style="position: relative;">
<img v-if="commentsitem.empLogo" :src="commentsitem.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="commentsitem.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
<img v-if="commentsitem.userInfo.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
</div>
</div>
<div class="paragraph">
<div class="gendisplay">
<p style="margin-right: 5px;font-size: 12px;">
{{commentsitem.isProfessor == 1?commentsitem.empName:commentsitem.nickName}}
{{commentsitem.userInfo.isProfessor == 1?commentsitem.empName:commentsitem.nickName}}
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="commentsitem.empMedalList!=null&&commentsitem.empMedalList.length>0" v-for="itemMedal in commentsitem.empMedalList"
......
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