Skip to content

P
pica-admin-IM
提交 364e6fea 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-Iteration3-0513' into release

上级 2f114a0f c953cf00
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 872 行增加 和 841 行删除
package-lock.json
浏览文件 @ 364e6fea
此差异已折叠。
src/App.vue
浏览文件 @ 364e6fea
......@@ -17,7 +17,6 @@
</el-container>
</div>
</template>
<script>
import VHeader from './views/layout/header.vue'
import VSlidebar from './views/layout/slidebar.vue'
......@@ -103,7 +102,6 @@ export default {
}
}
</script>
<style lang="scss">
// @import './style/common';
@import './style/global';
......
src/style/common.scss
浏览文件 @ 364e6fea
......@@ -14,7 +14,7 @@ body, div, span, header, footer, nav, section, aside, article, ul, dl, dt, dd, l
border: none;
// color: #333;
font-weight: normal;
font-family: "PingFangSC", "Microsoft Yahei";
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB","Microsoft YaHei", SimSun, "sans-serif";
box-sizing: border-box;
-webkit-tap-highlight-color:transparent;
-webkit-font-smoothing: antialiased;
......
src/views/discuss/add-edit.vue
浏览文件 @ 364e6fea
......@@ -28,8 +28,8 @@
<el-form-item label="内容发布控制">
<div>
<span class="label-name">话题</span>
<el-radio v-model="form.ht" label="1" disabled>允许</el-radio>
<el-radio v-model="form.ht" label="0" disabled>不允许</el-radio>
<el-radio v-model="form.ht" label="1" >允许</el-radio>
<el-radio v-model="form.ht" label="0" >不允许</el-radio>
</div>
<div>
<span class="label-name">评论</span>
......@@ -65,6 +65,11 @@
<el-input v-model="form.commentBtnText" size="mini" style="width: 100px;" :maxLength="maxBtn"></el-input>
</div>
</el-form-item>
<el-form-item label="话题详情页评论文案" required label-width="140px">
<div>
<el-input v-model="form.commentDetails" size="mini" style="width: 100px;" :maxLength="maxBtn"></el-input>
</div>
</el-form-item>
<el-form-item label="备注">
<el-col :span="8">
......@@ -119,6 +124,7 @@ export default {
rz:8,
topicBtnText:'发布话题',
commentBtnText:'发布评论',
commentDetails:'全部评论',
displayTopicBtn:true,//是否显示发布话题按钮
dispalyCommentBtn:true,//是否显示评论按钮
remark:'',
......@@ -194,12 +200,18 @@ export default {
return;
}
if(this.form.commentDetails == ''){
this.showError('话题详情页评论文案');
return;
}
auditRules = Number(this.form.wz) + Number(this.form.tp)
let parm = {
"auditrules": auditRules,
"commentbtntext": this.form.commentBtnText,
"commentDetails": this.form.commentDetails,
//"deleteflag": 0,
//"derivedid": 0,
"category": this.form.deriverName,
......@@ -255,6 +267,7 @@ export default {
this.form.subject = res.data.subject
this.form.topicBtnText = res.data.topicbtntext == null ? '' : res.data.topicbtntext
this.form.commentBtnText = res.data.commentbtntext
this.form.commentDetails = res.data.commentDetails
this.form.remark = res.data.remark
//开放客群
......
src/views/discuss/index.vue
浏览文件 @ 364e6fea
......@@ -51,7 +51,6 @@
</el-col>
</el-form>
</el-row>
<el-table
:data="tableData"
style="width: 100%" v-loading="loading">
......@@ -223,7 +222,6 @@ export default {
})
this.getData()
},
creatFun(index){
if(index == 1){
this.$router.push({path: '/report-set'})
......@@ -310,5 +308,3 @@ export default {
}
}
</style>
\ No newline at end of file
src/views/topicManage/index.vue
浏览文件 @ 364e6fea
......@@ -53,25 +53,31 @@
:data="tableData"
style="width: 100%" v-loading="loading">
<el-table-column type="index" prop="topOrder" label="排序" min-width="50" align="center"></el-table-column>
<el-table-column prop="id" label="Id" min-width="50" align="center"></el-table-column>
<el-table-column prop="subject" label="话题名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="createdName" label="创建人" min-width="50" align="center"></el-table-column>
<el-table-column prop="createdtime" label="创建日期" min-width="100" align="center"></el-table-column>
<el-table-column prop="modifiedName" label="最后修改人" min-width="100" align="center"></el-table-column>
<el-table-column prop="modifiedName" label="话题来源" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.official ? '官方' : '用户'}}</span>
</template>
</el-table-column>
<el-table-column prop="modifiedtime" label="修改日期" min-width="100" align="center"></el-table-column>
<el-table-column prop="status" label="状态" min-width="80" align="center">
<template slot-scope="scope">
<span>{{ scope.row.official ? '已发布' : '未发布'}}</span>
<span v-if="!scope.row.official">已发布</span>
<span v-else>{{ scope.row.releaseStatus == 1 ? '已发布' : '未发布'}}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="edit(scope.row)">编辑</el-button> <el-button type="primary" v-if="scope.row.releaseStatus == 0" size="small" @click="optFun(scope.row)" disabled>发布</el-button>
<el-button type="primary" v-if="scope.row.releaseStatus == 1" size="small" @click="optFun(scope.row)" disabled>下线</el-button>
<el-button disabled v-if="scope.$index == 0" type="info" size="small" @click="topicManage(scope.row)">置顶</el-button>
<el-button v-else type="primary" size="small" @click="topicManage(scope.row)">置顶</el-button>
<el-button type="primary" size="small" @click="edit(scope.row)">编辑</el-button>
<el-button type="primary" v-if="!scope.row.official" size="small" @click="optFun(scope.row)" disabled>下线</el-button>
<el-button type="primary" v-if="scope.row.releaseStatus == 1 && scope.row.official" size="small" @click="optFun(scope.row)" >下线</el-button>
<el-button type="primary" v-if="scope.row.releaseStatus != 1 && scope.row.official" size="small" @click="optFun(scope.row)" >发布</el-button>
<el-button v-if="scope.row.toporder == 0" type="primary" size="small" @click="topicManage(scope.row,'置顶')">置顶</el-button>
<el-button v-else type="primary" size="small" @click="topicManage(scope.row,'取消置顶')">取消置顶</el-button>
</template>
</el-table-column>
<div slot="empty">
......@@ -163,7 +169,7 @@ export default {
created() {
this.discussId = Number(this.$route.query.id);
this.discussId = Number(this.$route.query.id)
this.getData()
//this.sun()
},
......@@ -179,7 +185,7 @@ export default {
getFun(obj){
console.log(obj)
this.isShow = false;
this.isShow = false
if(obj){
this.getData()
}
......@@ -254,22 +260,39 @@ export default {
});
},
topicManage(item){
// 置顶
topicManage(item,str){
///topic/topicTop
console.log(item)
let _this = this;
_this.GET('/interaction/topic/topicTop',{topicId: item.id}).then((res) => {
let status = 0;
if(str == '置顶'){
status = 1
}else if(str == '取消置顶'){
status = 2
}
this.$confirm('确定要'+str+'该讨论吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
_this.GET('/interaction/topic/topicTop',{topicId: item.id, topNum: status}).then((res) => {
if(res.code == "000000") {
_this.$message({
type: 'success',
message: '操作成功!'
});
_this.setTimeFun()
}
}).catch(function (error) {
// this.$message.error(error);
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
})
})
},
setTimeFun(){
setTimeout(()=>{
......@@ -282,13 +305,14 @@ export default {
let status = 0,str = '',_this = this,index = 0;
str = row.releaseStatus == 1 ? '下架' : '发布'
if(row.releaseStatus == 1){
index = 0
}else if(row.releaseStatus == 0){
index = 2
}else if(row.releaseStatus == 2){
index = 1
}
let parm = {
topic:{
id: row.id,official:index
id: row.id,
releaseStatus:index
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或