Commit 8a432753 authored by zhangyanni's avatar zhangyanni

话题

parent c89ff242
......@@ -2131,7 +2131,7 @@ i, em {
width: .23rem;
height: .26rem;
}
.commentElDialog, .shareDialog, .commentElTopicDialog {
.commentElDialog, .shareDialog, .commentElTopicDialog,.commentElMarrowDialog {
.el-dialog__header {
margin: 0 .2rem;
height: 1.1rem;
......@@ -2175,6 +2175,22 @@ i, em {
top: 0;
bottom: unset;
}
.commentElMarrowDialog .el-dialog {
position: fixed;
top: unset;
bottom: 0;
.el-dialog__header {
border-bottom: 1px solid #E8EAF3;
}
.dialog-footer{
display: flex;
justify-content: center;
.el-button{
flex: 1;
}
}
}
.moreDialog .el-dialog {
margin-top: 0 !important;
border-radius: unset;
......@@ -3369,4 +3385,8 @@ i, em {
transform: scale(0.5, 0.5);
box-sizing: border-box;
}
#marrowCommentInput{
border: unset;
padding-top: .3rem;
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -20,6 +20,9 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="yemianweikong" unicode="&#59020;" d="M807.253 100.693V599.04c0 34.133-20.48 61.44-44.373 61.44H273.067c-23.894 0-44.374-25.6-44.374-61.44v-498.347h-22.186V599.04c0 46.08 29.013 83.627 66.56 83.627h488.106c37.547 0 66.56-37.547 66.56-83.627v-498.347h-20.48z m22.187 0h-22.187V599.04c0 34.133-20.48 61.44-44.373 61.44H273.067c-23.894 0-44.374-25.6-44.374-61.44v-498.347h-22.186V599.04c0 46.08 29.013 83.627 66.56 83.627h488.106c37.547 0 66.56-37.547 66.56-83.627l1.707-498.347zM517.12 40.96c-40.96 0-80.213-10.24-116.053-32.427-49.494 66.56-126.294 104.107-209.92 104.107-59.734 0-116.054-20.48-162.134-56.32-5.12-3.413-5.12-10.24-1.706-15.36 3.413-5.12 10.24-5.12 15.36-1.707 42.666 34.134 95.573 52.907 148.48 52.907 80.213 0 151.893-39.253 196.266-104.107l6.827-8.533 8.533 6.827c34.134 22.186 71.68 34.133 112.64 34.133 37.547 0 73.387-10.24 105.814-29.013l8.533-5.12 6.827 8.533c44.373 63.147 117.76 98.987 194.56 98.987 52.906 0 105.813-17.067 146.773-51.2 5.12-3.414 11.947-3.414 15.36 1.706 3.413 5.12 3.413 11.947-1.707 15.36-46.08 35.84-102.4 56.32-160.426 56.32-80.214 0-157.014-37.546-206.507-100.693-32.427 15.36-69.973 25.6-107.52 25.6zM884.053 20.48c-20.48 17.067-47.786 25.6-75.093 22.187-27.307-3.414-51.2-18.774-66.56-40.96-3.413-5.12-1.707-11.947 3.413-15.36 5.12-3.414 11.947-1.707 15.36 1.706 10.24 13.654 23.894 23.894 40.96 29.014 23.894 6.826 49.494 1.706 69.974-13.654 5.12-3.413 11.946-3.413 15.36 1.707 0 3.413 0 10.24-3.414 15.36zM667.307 773.12h58.026c3.414 0 5.12-3.413 5.12-5.12 0-3.413-3.413-5.12-5.12-5.12h-58.026c-3.414 0-5.12 3.413-5.12 5.12-1.707 1.707 1.706 5.12 5.12 5.12zM701.44 795.307v-58.027c0-3.413-3.413-5.12-5.12-5.12s-5.12 3.413-5.12 5.12v58.027c0 3.413 3.413 5.12 5.12 5.12s5.12-1.707 5.12-5.12zM100.693 382.293H128c1.707 0 3.413-1.706 3.413-3.413s-1.706-3.413-3.413-3.413h-27.307c-1.706 0-3.413 1.706-3.413 3.413s1.707 3.413 3.413 3.413zM116.053 392.533v-25.6c0-1.706-1.706-3.413-3.413-3.413s-3.413 1.707-3.413 3.413V394.24c0 1.707 1.706 3.413 3.413 3.413 1.707-1.706 3.413-3.413 3.413-5.12z m778.24-109.226H921.6c1.707 0 3.413-1.707 3.413-3.414s-1.706-3.413-3.413-3.413h-27.307c-1.706 0-3.413 1.707-3.413 3.413V281.6l3.413 1.707zM911.36 293.547v-27.307c0-1.707-1.707-3.413-3.413-3.413s-3.414 1.706-3.414 3.413v27.307c0 1.706 1.707 3.413 3.414 3.413s3.413-1.707 3.413-3.413zM93.867 604.16h47.786c3.414 0 5.12-1.707 5.12-5.12 0-3.413-1.706-5.12-5.12-5.12H93.867c-1.707 0-1.707 0-3.414 1.707s-1.706 1.706-1.706 3.413 1.706 5.12 5.12 5.12zM122.88 622.933v-47.786c0-3.414-1.707-5.12-5.12-5.12-3.413 0-5.12 1.706-5.12 5.12v47.786c0 3.414 1.707 5.12 5.12 5.12 1.707 0 5.12-3.413 5.12-5.12z m747.52 39.254h47.787c3.413 0 5.12-1.707 5.12-5.12s-1.707-5.12-5.12-5.12H870.4c-3.413 0-5.12 1.706-5.12 5.12s3.413 5.12 5.12 5.12zM899.413 680.96v-47.787c0-3.413-1.706-5.12-5.12-5.12-3.413 0-5.12 1.707-5.12 5.12V680.96c0 3.413 1.707 5.12 5.12 5.12 3.414 0 5.12-3.413 5.12-5.12zM370.347 459.093c-17.067 0-30.72 13.654-30.72 30.72s13.653 30.72 30.72 30.72 30.72-13.653 30.72-30.72c0-8.533-3.414-15.36-8.534-22.186-6.826-5.12-13.653-8.534-22.186-8.534z m-6.827 29.014c3.413 0 8.533 1.706 10.24 5.12s1.707 8.533 0 11.946c-1.707 3.414-6.827 5.12-10.24 5.12-6.827 0-10.24-5.12-10.24-11.946-1.707-5.12 3.413-10.24 10.24-10.24z m293.547-29.014c-17.067 0-30.72 13.654-30.72 30.72s13.653 30.72 30.72 30.72 30.72-13.653 30.72-30.72c0-8.533-3.414-15.36-8.534-22.186-6.826-5.12-13.653-8.534-22.186-8.534z m-6.827 29.014c3.413 0 8.533 1.706 10.24 5.12s1.707 8.533 0 11.946c-1.707 3.414-6.827 5.12-10.24 5.12-6.827 0-10.24-5.12-10.24-11.946-1.707-5.12 3.413-10.24 10.24-10.24zM296.96 225.28l68.267 22.187-35.84 20.48c-1.707 1.706-3.414 3.413-3.414 5.12 0 1.706 1.707 3.413 3.414 5.12s3.413 1.706 5.12 0l44.373-25.6 56.32 17.066-35.84 23.894c-1.707 1.706-1.707 3.413-1.707 5.12 0 1.706 1.707 3.413 3.414 5.12 1.706 1.706 3.413 0 5.12 0l42.666-27.307 71.68 22.187c-15.36 35.84-73.386 49.493-134.826 29.013-40.96-17.067-69.974-49.493-88.747-102.4z m225.28 59.733l-35.84-11.946c0-1.707 1.707-3.414 0-3.414l-15.36-51.2c-1.707-1.706-3.413-3.413-6.827-3.413s-3.413 3.413-3.413 6.827l15.36 49.493-71.68-22.187-17.067-49.493c0-1.707-1.706-3.413-3.413-3.413s-3.413 0-5.12 1.706c-1.707 1.707-1.707 3.414-1.707 5.12l15.36 42.667-93.866-29.013h-3.414c47.787-34.134 92.16-44.374 133.12-30.72 61.44 18.773 98.987 61.44 93.867 98.986z m-228.693-66.56c0-1.706 0-1.706 0 0zM680.96 378.88c46.08 11.947 87.04 32.427 122.88 59.733 3.413 3.414 3.413 6.827 0 10.24-1.707 3.414-6.827 3.414-10.24 1.707-32.427-27.307-71.68-46.08-116.053-58.027-3.414-1.706-6.827-5.12-5.12-8.533 1.706-3.413 5.12-6.827 8.533-5.12z m-51.2-105.813C747.52 302.08 849.92 353.28 935.253 424.96c3.414 3.413 3.414 6.827 0 10.24-1.706 3.413-6.826 3.413-10.24 1.707-85.333-69.974-184.32-119.467-300.373-148.48-3.413-1.707-6.827-5.12-5.12-8.534 1.707-5.12 5.12-8.533 10.24-6.826z" horiz-adv-x="1024" />
<glyph glyph-name="quxiaojinghua" unicode="&#59019;" d="M35.328 770.048l96.768-96.768L0 502.784l512-534.528 159.232 166.4 188.928-188.928 56.32 56.32L91.648 825.856l-56.32-55.808z m476.672-691.2L102.4 507.392l85.504 110.08 152.064-152.064-48.128-43.52 220.16-231.936 50.176 53.248 54.272-54.272-104.448-110.08zM762.88 724.48l158.72-217.088-196.096-205.312 54.272-54.272L1024 502.784l-230.4 296.96H230.4l-1.024-1.536 73.728-73.728zM616.96 410.624l53.76-53.76 61.44 65.024-56.32 50.176z" horiz-adv-x="1024" />
......
......@@ -439,7 +439,7 @@ export default {
},
//用户角色 角色类型(1系统管理员:2运营:3普通小B用户:4vip小B用户:5销售:6普通大B用户:7vip大B用户:8C端用户)
//用户角色 角色类型(1系统管理员:2运营:3普通小B用户:4vip小B用户:5销售:6普通大B用户:7vip大B用户:8C端用户 10版主
getUserRoleFunc() {
var userInfo = this.getUserInfoCookieType() ? JSON.parse(require('js-base64').Base64.decode(this.getUserInfoCookieType())) : null,
roleType = [];
......@@ -874,6 +874,22 @@ export default {
}
var newStr = str;
return newStr.unique();
},
//重新给数组某个元素赋值
resetElementForArray(arr,val,newDataArr,data){
var ind;
arr.forEach((item,index)=>{
if(newDataArr&&(item[val] == newDataArr[val])) {
ind = index;
}
if(data){
if((item[val] == data)) {
ind = index;
}
}
})
return ind;
}
......
This diff is collapsed.
......@@ -9,7 +9,7 @@
:close-on-click-modal="true"
:modal-append-to-body="false"
>
<comment @publishComment="publishComment" @showDialogAndroid="showDialogAndroid" :faceVisible="visible" :isEmpty="isEmpty" :isHasReward="isHasReward" :topicTitle="topicTitle" :commentType="1" :replyCreatedBy="replyCreatedBy?replyCreatedBy:''"></comment>
<comment :isTopicList="isList" :placeholderVal="Object.keys(topicInfo).length>0?(topicInfo.discussTips?topicInfo.discussTips:'发表讨论,10个字以上才可以发布。'):''" @publishComment="publishComment" @showDialogAndroid="showDialogAndroid" :faceVisible="visible" :isEmpty="isEmpty" :isHasReward="isHasReward" :topicTitle="topicTitle" :commentType="1" :replyCreatedBy="replyCreatedBy?replyCreatedBy:''"></comment>
</el-dialog>
</div>
</template>
......@@ -70,6 +70,14 @@
commentType:{
type:Number,
default:1 //1话题
},
isList:{
type:Boolean,
default:false
},
topicInfo:{
type:Object,
default:()=>{}
}
},
methods:{
......@@ -94,7 +102,7 @@
params = {
discussContent:contentVal,
discussUrl:data.discussUrl,
topicId:this.$route.query.id,
topicId:data.topicId?data.topicId:this.$route.query.id,
id:this.isReply||this.isDeepReply?this.commentsId:undefined,
commentsReplyId:this.isDeepReply?this.commentsDeepId:undefined,
replyBy:this.isDeepReply?this.replyCreatedBy:undefined,
......
......@@ -196,15 +196,8 @@
<span class="hongbao" v-if="item.contentDetail.isHasReward>0"><i
class="iconfont icon-hongbao-"></i></span>
</div>
<!--<div class="createdInfo" v-if="item.contentDetail.isHasReward>0||(item.contentDetail.isHasReward==0&&(item.contentDetail.expertCountStr==0||item.contentDetail.expertCountStr==null))">-->
<!--<span>发起方:</span>-->
<!--<span>{{item.contentDetail.topicInitiator}}</span>-->
<!--</div>-->
<!--<div class="createdInfo" v-if="item.contentDetail.isHasReward==0&&item.contentDetail.expertCountStr!=0&&item.contentDetail.expertCountStr!=null">-->
<!--<span>{{item.contentDetail.expertCountStr}}位超级大咖参与其中</span>-->
<!--</div>-->
<div class="createdInfo professorInfo">
<span v-if="item.contentDetail.isHasReward==0&&item.contentDetail.expertCountStr!=0&&item.contentDetail.expertCountStr!=null">{{item.contentDetail.expertCountStr}}位超级大咖参与其中</span>
<span v-if="item.contentDetail.isHasReward==0&&item.contentDetail.expertCountStr!=0&&item.contentDetail.expertCountStr!=null">专家入驻 {{item.contentDetail.expertCountStr}}</span>
<span style="max-width: 70%;width: 70%;"
v-if="item.contentDetail.isHasReward>0||(item.contentDetail.isHasReward==0&&(item.contentDetail.expertCountStr==0||item.contentDetail.expertCountStr==null))"><span
style="color: #555555;">发起方:</span>{{item.contentDetail.topicInitiator}}</span>
......
......@@ -39,7 +39,7 @@
</div>
<div class="createdInfo"
v-if="item.baseTopic.isOpenReward==0&&item.baseTopic.expertCount>0">
<span>{{item.expertCount}}位超级大咖参与其中</span>
<span>专家入驻 {{item.expertCount}}</span>
</div>
<div class="createdInfo"
v-if="item.baseTopic.isOpenReward>0||item.baseTopic.isOpenReward==0&&(item.baseTopic.professorCount==0||item.baseTopic.professorCount==null)">
......@@ -99,36 +99,6 @@
<span>{{item.baseContent.contentBrowseStr}}&nbsp;&nbsp;阅读</span>
</p>
</div>
<!--<div class="leftInfo" :style="{backgroundImage:'url('+require('../../../assets/img/bigBusinessLogo@2x.png')+')'}">-->
<!--</div>-->
<!--<div class="rightInfo">-->
<!--<div class="topicTitle">-->
<!--<span>#</span><span class="articleTitle">疫情挚爱大疫情挚爱大疫情挚爱大疫情挚爱大疫情挚爱大疫情挚爱大疫情挚爱大疫情挚爱大</span><span>#</span>-->
<!--</div>-->
<!--<div class="createdInfo">-->
<!--<span>发起方:</span>-->
<!--<span>呵呵呵呵呵呵呵呵呵呵呵呵呵呵</span>-->
<!--</div>-->
<!--&lt;!&ndash;<div class="createdInfo" v-if="item.isHasReward==0&&item.expertCount>0">&ndash;&gt;-->
<!--&lt;!&ndash;<span>{{item.expertCount}}位超级大咖参与其中</span>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;<div class="createdInfo" v-if="item.isHasReward>0||item.isHasReward==0&&item.expertCount==0">&ndash;&gt;-->
<!--&lt;!&ndash;<span>发起方:</span>&ndash;&gt;-->
<!--&lt;!&ndash;<span>{{item.topicInitiator}}</span>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;<div class="createdInfo" v-if="item.isHasReward==0&&item.expertCount>0">&ndash;&gt;-->
<!--&lt;!&ndash;<span>{{item.expertCount}}位超级大咖参与其中</span>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;<p class="itemButton">&ndash;&gt;-->
<!--&lt;!&ndash;<span>阅读&nbsp;&nbsp;{{item.readCountStr}}</span>&ndash;&gt;-->
<!--&lt;!&ndash;</p>&ndash;&gt;-->
<!--<p class="itemButton">-->
<!--<span>阅读&nbsp;&nbsp;999999</span>-->
<!--<span>讨论&nbsp;&nbsp;4399</span>-->
<!--</p>-->
<!--</div>-->
</div>
</li>
<li v-for="item in tableData" class="subjectLi" v-if="commentType==3&&userlogo">
......
......@@ -152,5 +152,15 @@ export default {
//获取专家信息
getProfessorAxios(params){
return api.fetchLogin("/base/professor/selectProfessorById?empId="+params)
},
//选择话题圈子
selectTopicCircleAxios(params){
return api.fetchLoadingPost("/business/topic/selectFirstTopicList",params);
},
//二级话题
selectSecondTopicAxios(params){
return api.fetchLoadingPost("/business/topic/selectSecondTopicList",params);
}
}
\ No newline at end of file
......@@ -101,7 +101,7 @@
class="articleTitle">{{item.topicTitle}}</span><span>#</span>
</div>
<div class="createdInfo" v-if="item.isOpenReward==0&&item.professorNum>0">
<span>{{item.professorNum}}位超级大咖参与其中</span>
<span>专家入驻 {{item.professorNum}}</span>
</div>
<div class="createdInfo"
v-if="item.isOpenReward==1||(item.isOpenReward==0&&(item.professorNum==0||item.professorNum==null))">
......
......@@ -3,7 +3,7 @@ import Qs from 'qs';
export default {
//获取话题列表
getTopicListAxios(params){
return api.fetchLoadingLogin("/business/topic/selectTopicList",params);
return api.fetchLoadingLogin("/business/topic/selectIndistinguishableLevelTopicList",params);
},
//获取话题详情
......@@ -115,6 +115,25 @@ export default {
//根据话题title获取topicId
getTopicIdByTopicTitle(params){
return api.fetchLoadingGet("/business/topic/selectTopicByTitle?topicTitle="+params);
}
},
//获取频道列表
getChannelListAxios(){
return api.fetchLoadingLogin("/business/topic/selectClassifyList");
},
//加入话题
joinTopicAxios(params1,params2){
return api.fetchGet("/business/topic/joinTopic?topicId="+params1+"&joinState="+params2);
},
//设置精华/取消精华
addOrDelModerator(params){
return api.fetchLoadingGet("/business/topic/addOrDelModerator?"+Qs.stringify(params));
},
//删除回复
deleteReplyAxios(params1,params2){
return api.fetchLoadingGet("/business/topic/deleteCommentsChildById?id="+params1+"&commentsId="+params2);
}
}
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -32,6 +32,7 @@
<div class="rightInfo">
<p>
<span>{{tableData[0].nickName}}</span>
<span class="moderatorImg" v-if="tableData[0].moderator"></span>
<span class="medal" @click="handleToMedal(tableData[0])"
:class="'medal'+itemMedal.id"
v-if="tableData[0].empMedalList!=null&&tableData[0].empMedalList.length>0"
......@@ -74,6 +75,7 @@
<div class="rightInfo">
<p>
<span>{{item.isProfessor>0?item.empName:item.nickName}}</span>
<span class="moderatorImg" v-if="item.moderator"></span>
<span class="medal" :class="'medal'+itemMedal.id"
@click="handleToMedal(item)"
v-if="item.empMedalList!=null&&item.empMedalList.length>0"
......@@ -619,6 +621,16 @@
> span.medal5 {
background-position-y: -174px;
}
>span.moderatorImg{
width: .2rem;
height: .2rem;
display: inline-block;
background-image: url("../../../assets/img/mobile/moderator.png");
background-position-x: 0;
background-size: contain;
background-repeat: no-repeat;
margin-right: .05rem;
}
}
& > p.timeStr {
padding: .2rem 0;
......@@ -793,6 +805,16 @@
> span.medal5 {
background-position-y: -174px;
}
>span.moderatorImg{
width: .2rem;
height: .2rem;
display: inline-block;
background-image: url("../../../assets/img/mobile/moderator.png");
background-position-x: 0;
background-size: contain;
background-repeat: no-repeat;
margin-right: .05rem;
}
}
}
.bottomInfo {
......
<template>
<div>
<el-dialog class="commentElMarrowDialog"
:visible.sync="visible"
:before-close="handleClose"
width="100%"
title="您认为这条发布的讨论内容为:"
:lock-scroll="true"
:show-close="false"
:close-on-click-modal="false"
:modal-append-to-body="false"
>
<div class="starWrap">
<div v-for="item in starList" @click="currentStar=item" :class="currentStar==item?'activeDiv':''">
<i class="iconfont icon-xingxing" v-for="starNum in item"></i>
</div>
</div>
<div class="divHeight8px"></div>
<div class="commentInput">
<el-input @blur.prevent="handleToParent"
id="marrowCommentInput"
ref="textareaRef"
@focus="handleShowEle"
autofocus
type="textarea"
v-model="textareaMap"
resize="none" rows="6"
suffix-icon="iconfont icon-bianji"
:maxlength="200"
placeholder="请填写评级理由"
>
</el-input>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose">取 消</el-button>
<el-button type="danger" @click="handleConfirm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {Toast} from 'mint-ui';
import api from './api';
export default {
name: "setMarrowCmpt",
data(){
return{
colors:['#FF5D5D','#FF5D5D','#FF5D5D'],
starList:[1,2,3],
currentStar:-1,
textareaMap:"",
marrowData:{},
disabledFlag:0
}
},
props: {
visible: {
type: Boolean,
default: false
},
discussId: {
type: Number,
default: 0
},
pathfrom: "",
isSetTop:{
type: Boolean,
default: false
}
},
methods:{
handleClose(){
this.$emit("marrowVisibleFunc");
},
handleConfirm(){
var that = this;
if(this.disabledFlag==0){
this.disabledFlag++;
if(this.currentStar>-1){
this.marrowData.starRate = this.currentStar;
this.marrowData.starRateReason = this.textareaMap;
this.$emit("marrowVisibleFunc",this.marrowData);
}else{
this.$toast({
message: "请选择星级",
duration: 2000,
className: 'noticeError'
});
}
setTimeout(function () {
that.disabledFlag = 0;
}, 1000)
}else{
setTimeout(function () {
that.disabledFlag = 0;
}, 1000)
}
},
handleToParent() {
if (navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
globalMsg.$emit("scrollToTop");
}
this.$emit("showDialogAndroid",false);
},
//获取焦点信息
handleShowEle(event) {
var u = navigator.userAgent;
if(u.indexOf('Android') > -1 || u.indexOf('Adr') > -1){
this.$emit("showDialogAndroid",true);
}
}
},
mounted(){
globalMsg.$on("emptyVal",()=>{
this.currentStar =-1;
this.textareaMap = "";
})
}
}
</script>
<style scoped lang="scss">
.starWrap{
padding: .4rem .3rem;
display: flex;
>div{
border-radius: .06rem;
border: 1px solid #E8E8E8;
flex: 1;
margin: 0 .1rem;
padding: .25rem 0;
display: flex;
justify-content: center;
align-items: center;
.icon-xingxing:before{
color: #FFBBBB;
font-size: .46rem;
}
&.activeDiv{
border-color: #ff5d5d;
.icon-xingxing:before{
color: #ff5d5d;
}
}
}
}
.commentInput{
/*height: 2.6rem;*/
}
</style>
\ No newline at end of file
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