admin/zbAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug修复

Browse Source
This commit is contained in:
kaizheng(郑凯) 2025-03-03 19:30:42 +08:00
parent 5672b74037
commit 6c1c2ccd53
8 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/circle/components/forbidSpeak.vue
View File

@ -66,6 +66,8 @@ export default {
userPhone: this.formProhibition.phone, userPhone: this.formProhibition.phone,
scope: this.scope, scope: this.scope,
content: this.formProhibition.content content: this.formProhibition.content
? this.formProhibition.content
: ""
}; };
addCommentBlack(data).then(res => { addCommentBlack(data).then(res => {
if (res.code === 0) { if (res.code === 0) {

12
src/views/circle/detail/components/bannedUserList.vue
View File

@ -62,7 +62,8 @@ export default {
this.searchMsg(); this.searchMsg();
}, },
modifyStateObj(value) { modifyStateObj(value) {
if (value.modifyType) { // modifyType: 1审核通过 2禁言操作
if (value.modifyType === 2) {
this.searchMsg(); this.searchMsg();
} }
} }
@ -81,10 +82,12 @@ export default {
if (ret && ret.code === 0 && ret.data.list) { if (ret && ret.code === 0 && ret.data.list) {
const list = ret.data.list; const list = ret.data.list;
list.forEach(item => { list.forEach(item => {
item.privateUserId = item.phone; item.userId = item.phone;
item.privateUserName = item.userName; item.nickName = item.userName;
item.isForbidden = 1; item.isForbidden = 1;
this.userIdsObj[item.privateUserId] = item; item.joinTime = item.startTime;
item.expireTime = item.endTime;
this.userIdsObj[item.userId] = item;
}); });
this.list = this.list.concat(list); this.list = this.list.concat(list);
this.hasNext = ret.data.list.length === this.params.size; this.hasNext = ret.data.list.length === this.params.size;
@ -92,6 +95,7 @@ export default {
this.loading = false; this.loading = false;
}, },
searchMsg() { searchMsg() {
this.params.lastId = "";
this.hasNext = true; this.hasNext = true;
this.params.current = 0; this.params.current = 0;
this.list = []; this.list = [];

25
src/views/circle/detail/components/components/userItems.vue
View File

@ -13,18 +13,20 @@
<div>操作</div> <div>操作</div>
</dt> </dt>
<dd v-for="item in list" :key="item.id"> <dd v-for="item in list" :key="item.id">
<div><img src="" alt="" /></div> <div>
<img :src="item.headPicUrl || defaultAvatar.student" alt="" />
</div>
<div> <div>
<div> <div>
<p>{{ item.privateUserId }}</p> <p>{{ item.userId }}</p>
<p>{{ item.privateUserName }}</p> <p>{{ item.nickName }}</p>
</div> </div>
</div> </div>
<div> <div>
<p>数据缺失</p> <p>{{ item.joinTime }}</p>
</div> </div>
<div> <div>
<p>数据缺失</p> <p>{{ item.expireTime }}</p>
</div> </div>
<div> <div>
<div> <div>
@ -80,6 +82,9 @@ export default {
}, },
data() { data() {
return { return {
defaultAvatar: {
student: require("@/assets/images/defaultAvatar/student.png")
},
currentUserObj: {} // 当前操作的用户 currentUserObj: {} // 当前操作的用户
}; };
}, },
@ -101,7 +106,7 @@ export default {
}) })
.then(() => { .then(() => {
removeCommentBlack({ removeCommentBlack({
userPhone: item.privateUserId, userPhone: item.userId,
productId: this.groupId, productId: this.groupId,
productType: 41 productType: 41
}).then(res => { }).then(res => {
@ -113,7 +118,7 @@ export default {
}); });
item.isForbidden = 2; item.isForbidden = 2;
this.modifyStateCallback({ this.modifyStateCallback({
userId: item.privateUserId, userId: item.userId,
isForbidden: 2, isForbidden: 2,
modifyType: 2 modifyType: 2
}); });
@ -125,15 +130,15 @@ export default {
this.currentUserObj = item; this.currentUserObj = item;
const forbidSpeakRef = this.$refs.forbidSpeakRef; const forbidSpeakRef = this.$refs.forbidSpeakRef;
forbidSpeakRef.dialogFormVisible = true; forbidSpeakRef.dialogFormVisible = true;
forbidSpeakRef.formProhibition.userName = item.privateUserName; forbidSpeakRef.formProhibition.userName = item.nickName;
forbidSpeakRef.formProhibition.phone = item.privateUserId; forbidSpeakRef.formProhibition.phone = item.userId;
forbidSpeakRef.formProhibition.content = item.content; forbidSpeakRef.formProhibition.content = item.content;
} }
}, },
forbidSpeakCallback() { forbidSpeakCallback() {
this.currentUserObj.isForbidden = 1; this.currentUserObj.isForbidden = 1;
this.modifyStateCallback({ this.modifyStateCallback({
userId: this.currentUserObj.privateUserId, userId: this.currentUserObj.userId,
isForbidden: 1, isForbidden: 1,
modifyType: 2 modifyType: 2
}); });

5
src/views/circle/detail/components/newsList.vue
View File

@ -13,7 +13,10 @@
:src="item.advisor ? item.advisor.avatar : defaultAvatar.teacher" :src="item.advisor ? item.advisor.avatar : defaultAvatar.teacher"
/> />
<img v-else-if="item.userType === 3" :src="defaultAvatar.assistant" /> <img v-else-if="item.userType === 3" :src="defaultAvatar.assistant" />
<img v-else-if="item.userType === 2" :src="defaultAvatar.student" /> <img
v-else-if="item.userType === 2"
:src="item.userHeadPicUrl || defaultAvatar.student"
/>
<div class="news-info"> <div class="news-info">
<div class="news-info-top"> <div class="news-info-top">
<div class="news-user"> <div class="news-user">

37
src/views/circle/detail/components/privateList.vue
View File

@ -2,7 +2,7 @@
<div class="list-wrap"> <div class="list-wrap">
<div class="search"> <div class="search">
<el-input <el-input
v-model.trim="keyword" v-model.trim="params.nickName"
size="mini" size="mini"
placeholder="请输入用户昵称" placeholder="请输入用户昵称"
clearable clearable
@ -25,7 +25,14 @@
<!-- <el-badge is-dot class="item" <!-- <el-badge is-dot class="item"
><img :src="defaultAvatar.student" alt="" /> ><img :src="defaultAvatar.student" alt="" />
</el-badge> --> </el-badge> -->
<img :src="defaultAvatar.student" alt="" /> <img
:src="
item.userType !== 2
? item.privateUserHeadPicUrl || defaultAvatar.student
: item.userHeadPicUrl
"
alt=""
/>
</div> </div>
<div class="user-info"> <div class="user-info">
<p> <p>
@ -73,11 +80,11 @@ export default {
filterList: [], filterList: [],
list: [], list: [],
params: { params: {
current: 0, lastId: "",
id: null, nickName: "",
groupId: null,
size: 10 size: 10
}, },
keyword: "",
loading: false, loading: false,
hasNext: true hasNext: true
}; };
@ -89,8 +96,8 @@ export default {
}, },
watch: { watch: {
groupId(value) { groupId(value) {
this.params.id = value; this.params.groupId = value;
this.keyword = ""; this.params.nickName = "";
this.searchMsg(); this.searchMsg();
}, },
privateNewMsg(msg) { privateNewMsg(msg) {
@ -114,13 +121,16 @@ export default {
this.$emit("toPrivateChat", item); this.$emit("toPrivateChat", item);
}, },
async getPrivateChatList() { async getPrivateChatList() {
if (this.loading) return;
this.loading = true; this.loading = true;
this.params.current++;
const ret = await getPrivateChatList(this.params).catch(() => { const ret = await getPrivateChatList(this.params).catch(() => {
this.loading = false; this.loading = false;
}); });
if (ret && ret.code === 0 && ret.data.list) { if (ret && ret.code === 0 && ret.data.list) {
let list = ret.data.list; let list = ret.data.list;
if (ret.data.list.length) {
this.params.lastId = ret.data.list[ret.data.list.length - 1].id;
}
list = ret.data.list.sort((x, y) => { list = ret.data.list.sort((x, y) => {
return ( return (
new Date(y.createTime).getTime() - new Date(x.createTime).getTime() new Date(y.createTime).getTime() - new Date(x.createTime).getTime()
@ -135,23 +145,16 @@ export default {
}); });
this.list = this.list.concat(list); this.list = this.list.concat(list);
this.filterList = this.list; this.filterList = this.list;
this.hasNext = ret.data.list.length === this.params.size; this.hasNext = ret.data.hasNext;
} }
this.loading = false; this.loading = false;
}, },
async searchMsg() { async searchMsg() {
this.params.lastId = "";
this.hasNext = true; this.hasNext = true;
this.list = []; this.list = [];
this.userIdsMsgObj = {}; this.userIdsMsgObj = {};
this.params.current = 0;
await this.getPrivateChatList(); await this.getPrivateChatList();
// if (this.keyword) {
// this.filterList = this.list.filter(item => {
// const userName =
// item.userType !== 2 ? item.privateUserName : item.userName;
// return userName.includes(this.keyword);
// });
// }
} }
} }
}; };

29
src/views/circle/detail/components/userList.vue
View File

@ -2,7 +2,7 @@
<div class="list-wrap"> <div class="list-wrap">
<div class="search"> <div class="search">
<el-input <el-input
v-model="params.userName" v-model="params.nickName"
size="mini" size="mini"
placeholder="请输入用户昵称" placeholder="请输入用户昵称"
clearable clearable
@ -40,12 +40,12 @@ export default {
}, },
data() { data() {
return { return {
loading: true, loading: false,
hasNext: true, hasNext: true,
params: { params: {
userName: "", nickName: "",
current: 0, lastId: "",
id: null, groupId: null,
size: 10 size: 10
}, },
list: [], list: [],
@ -54,8 +54,8 @@ export default {
}, },
watch: { watch: {
groupId(value) { groupId(value) {
this.params.id = value; this.params.groupId = value;
this.params.userName = ""; this.params.nickName = "";
this.searchMsg(); this.searchMsg();
}, },
modifyStateObj(value) { modifyStateObj(value) {
@ -70,29 +70,34 @@ export default {
this.$emit("modifyStateCallback", item); this.$emit("modifyStateCallback", item);
}, },
async getList() { async getList() {
if (this.loading) return;
this.loading = true; this.loading = true;
this.params.current++;
const ret = await getCustomerList(this.params).catch(() => { const ret = await getCustomerList(this.params).catch(() => {
this.loading = false; this.loading = false;
}); });
if (ret && ret.code === 0 && ret.data.list) { if (ret && ret.code === 0 && ret.data.list) {
const list = ret.data.list; const list = ret.data.list;
if (ret.data.list.length) {
this.params.lastId = ret.data.list[ret.data.list.length - 1].id;
}
list.forEach((item, index) => { list.forEach((item, index) => {
if (this.userIdsObj[item.privateUserId]) { if (this.userIdsObj[item.userId]) {
list.splice(index, 1); list.splice(index, 1);
} else { } else {
this.userIdsObj[item.privateUserId] = item; this.userIdsObj[item.userId] = item;
item.isForbidden = item.commentBlackStatus; // 是否禁言 1：是 2否
item.userHeadPicUrl = item.headPicUrl; // 用户头像
} }
}); });
this.list = this.list.concat(list); this.list = this.list.concat(list);
this.hasNext = ret.data.list.length === this.params.size; this.hasNext = ret.data.hasNext;
} }
this.loading = false; this.loading = false;
}, },
searchMsg() { searchMsg() {
this.params.lastId = "";
this.hasNext = true; this.hasNext = true;
this.params.current = 0;
this.userIdsObj = {}; this.userIdsObj = {};
this.list = []; this.list = [];
this.getList(); this.getList();

2
src/views/circle/detail/components/userLnteractList.vue
View File

@ -18,7 +18,7 @@
> >
<li v-for="(item, index) in list" :key="index"> <li v-for="(item, index) in list" :key="index">
<div class="new-header"> <div class="new-header">
<img :src="defaultAvatar.student" /> <img :src="item.userHeadPicUrl || defaultAvatar.student" />
<div class="news-info"> <div class="news-info">
<div class="news-info-top"> <div class="news-info-top">
<div class="news-user"> <div class="news-user">

4
src/views/circle/detail/index.vue
View File

@ -183,9 +183,7 @@
/> />
<userList <userList
v-show="userTabIndex === 1" v-show="userTabIndex === 1"
:key="1"
:group-id="detail.id" :group-id="detail.id"
:type="1"
:modify-state-obj="modifyStateObj" :modify-state-obj="modifyStateObj"
@toPrivateChat="toPrivateChat" @toPrivateChat="toPrivateChat"
@modifyStateCallback="modifyStateCallback" @modifyStateCallback="modifyStateCallback"
@ -198,9 +196,7 @@
/> />
<bannedUserList <bannedUserList
v-show="userTabIndex === 3" v-show="userTabIndex === 3"
:key="2"
:group-id="detail.id" :group-id="detail.id"
:type="2"
:modify-state-obj="modifyStateObj" :modify-state-obj="modifyStateObj"
@modifyStateCallback="modifyStateCallback" @modifyStateCallback="modifyStateCallback"
@toPrivateChat="toPrivateChat" @toPrivateChat="toPrivateChat"