diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 2b7c0199..5082b2e8 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -92,23 +92,23 @@ - 评价1+ + 评价 身材 - + 颜值 - + 耐心 - + 有趣 - + @@ -143,7 +143,7 @@ @click="handleLike" > userDetail.value.memberPhotoList @@ -200,17 +207,20 @@ const { memberId } = options; if (!memberId) return uni.showToast({ title: '参数错误', icon: 'none' }); params.memberId = memberId; - const { data = null } = await RecentApi.getRecentDetail({ id: memberId }); - userDetail.value = data ?? {}; - + await getDetail(); // const instance: any = getCurrentInstance()?.proxy; // const eventChannel = instance.getOpenerEventChannel(); - // eventChannel.on('recentDetail', function (user: any) { // userDetail.value = user; // }); }); + // 获取用户详情 + const getDetail = async () => { + const { data = null } = await RecentApi.getRecentDetail({ id: params.memberId }); + userDetail.value = data ?? {}; + }; + onMounted(() => { refreshList(); }); @@ -310,23 +320,24 @@ // 拉黑 举报 async function actionSelect({ item, index }) { - if (index === 0) { - await RecentApi.recentOperate({ - memberId: userDetail.value.member.memberId, - memberRecentId: userDetail.value.id, - action: 'MEMBER_SHIELD', - }); - return; - } - - if (index === 1) { - await RecentApi.recentOperate({ - memberId: userDetail.value.member.memberId, - memberRecentId: userDetail.value.id, - action: 'MEMBER_REPORT', - reportType: '1', - }); - return; + switch (index) { + case 0: + const { code } = await RecentApi.recentOperate({ + memberId: userDetail.value.member.memberId, + action: 'MEMBER_SHIELD', + }); + if (code === 0) { + uni.showToast({ title: '拉黑成功', icon: 'none' }); + } + break; + case 1: + await RecentApi.recentOperate({ + memberId: userDetail.value.member.memberId, + action: 'MEMBER_REPORT', + }); + if (code === 0) { + uni.showToast({ title: '举报成功', icon: 'none' }); + } } } @@ -334,8 +345,24 @@ const handleLike = async () => { await RecentApi.recentOperate({ memberId: userDetail.value.member.memberId, - memberRecentId: userDetail.value.id, action: 'MEMBER_COLLECT', }); + await getDetail(); }; + + // 评价 + const rate = async () => { + await RecentApi.recentOperate({ + memberId: userDetail.value.member.memberId, + action: 'MEMBER_RATING', + ...rating, + }); + }; + + onHide(() => { + rate(); + }); + onUnload(() => { + rate(); + }); diff --git a/src/pages/message/chat-box.vue b/src/pages/message/chat-box.vue index dce25944..503866a7 100644 --- a/src/pages/message/chat-box.vue +++ b/src/pages/message/chat-box.vue @@ -224,6 +224,7 @@ closable custom-style="height: 600rpx;overflow: hidden;" safe-area-inset-bottom + @close="this.$refs.fileUpload.show()" > 礼物 @@ -1180,6 +1181,7 @@ this.giftList = data?.filter((i) => i.status == '2') ?? []; } this.giftShow = true; + this.$refs.fileUpload.hide(); }, // 赠送礼物 giveGift(item) { diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue index 2f3f68d8..06fd8086 100644 --- a/src/pages/profile/face-verify.vue +++ b/src/pages/profile/face-verify.vue @@ -1,58 +1,295 @@