Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-02-18 01:13:42 +08:00

View File

@@ -55,12 +55,12 @@
<div class="intime">进行中</div> <div class="intime">进行中</div>
</div> </div>
<div class="allbtn"> <div class="allbtn">
<button :class="`btnone ${state.searchType == 1 ? 'active' : ''}`" @click="nowPost(state.info.discussDtoList[0].discussId)"> <button :class="`btnone ${state.searchType == 1 ? 'active' : ''}`" @click="nowPost(state.info.discussDtoList[0].id)">
最新 最新
</button> </button>
<button <button
:class="`btnone ${state.searchType == 2 ? 'active' : ''}`" :class="`btnone ${state.searchType == 2 ? 'active' : ''}`"
style="margin-left: 20px" @click="hotPost(state.info.discussDtoList[0].discussId)"> style="margin-left: 20px" @click="hotPost(state.info.discussDtoList[0].id)">
最热 最热
</button> </button>
</div> </div>
@@ -239,7 +239,7 @@ request(DISCUSS_LIST, {
}).then(e=>{ }).then(e=>{
console.log('112233---->',e) console.log('112233---->',e)
state.info = e.data; state.info = e.data;
getPostList(e.data.discussDtoList[0].discussId); getPostList(e.data.discussDtoList[0].id);
}).catch(err=>{ }).catch(err=>{
console.log(err) console.log(err)
}) })
@@ -287,7 +287,7 @@ function handleCurrentChange(e, k) {
console.log('分页打印', e, k) console.log('分页打印', e, k)
state.currentPage = e; state.currentPage = e;
state.pageNo = e; state.pageNo = e;
getPostList(state.info.discussDtoList[0].discussId); getPostList(state.info.discussDtoList[0].id);
} }
@@ -339,7 +339,7 @@ const postAdd = () => {
"commentNum": 0, "commentNum": 0,
"content": valueHtml.value, "content": valueHtml.value,
"ctime": "", "ctime": "",
"discussId": state.info.discussDtoList[0].discussId, "discussId": state.info.discussDtoList[0].id,
"id": 0, "id": 0,
"mtime": "", "mtime": "",
"praiseNum": 0, "praiseNum": 0,
@@ -358,7 +358,7 @@ const postAdd = () => {
if(res.code==200){ if(res.code==200){
dialogVisible.value = false; dialogVisible.value = false;
ElMessage.success("发帖成功"); ElMessage.success("发帖成功");
getPostList(state.info.discussDtoList[0].discussId); getPostList(state.info.discussDtoList[0].id);
titleName.value = ""; titleName.value = "";
valueHtml.value = ""; valueHtml.value = "";
} }