From cf810bc44a3e3c25c9c9a3cc4634b4fb4cc08bc6 Mon Sep 17 00:00:00 2001 From: ctw Date: Wed, 3 Dec 2025 18:27:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BA=BA=E8=84=B8=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/profile/components/capsule-cell.vue | 4 +- src/pages/profile/face-verify.vue | 78 +++--- src/pages/profile/profile.vue | 244 ++++++++++-------- src/pages/profile/userinfo.vue | 6 +- 4 files changed, 191 insertions(+), 141 deletions(-) diff --git a/src/pages/profile/components/capsule-cell.vue b/src/pages/profile/components/capsule-cell.vue index da75635b..1522c89b 100644 --- a/src/pages/profile/components/capsule-cell.vue +++ b/src/pages/profile/components/capsule-cell.vue @@ -10,7 +10,7 @@ diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue index 1bf23df0..6f2f8db5 100644 --- a/src/pages/profile/face-verify.vue +++ b/src/pages/profile/face-verify.vue @@ -120,7 +120,7 @@ @@ -191,7 +191,7 @@ diff --git a/src/pages/profile/userinfo.vue b/src/pages/profile/userinfo.vue index df5407ba..98347ba5 100644 --- a/src/pages/profile/userinfo.vue +++ b/src/pages/profile/userinfo.vue @@ -29,7 +29,11 @@ fileMediatype="image" limit="1" mode="grid" - :imageStyles="{ width: '268rpx', height: '268rpx' }" + :imageStyles="{ + width: '268rpx', + height: '268rpx', + border: { width: '6rpx', color: '#D29E52', radius: '50rpx' }, + }" /> From aeafc90ddca862eec355a7037b90013db4519892 Mon Sep 17 00:00:00 2001 From: ctw Date: Thu, 4 Dec 2025 10:44:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home/detail.vue | 61 +++++---- src/pages/profile/face-verify.vue | 2 + src/pages/profile/my-moment.vue | 2 +- src/pages/profile/profile.vue | 9 +- src/pages/profile/set-wechat.vue | 22 +++- src/pages/profile/userinfo.vue | 119 +++++++++--------- src/sheep/api/member/recent.ts | 3 +- .../components/moment-card/moment-card.vue | 27 +++- 8 files changed, 141 insertions(+), 104 deletions(-) diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 5082b2e8..179792b5 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -18,12 +18,7 @@ {{ userDetail.member?.memberCity ? userDetail.member?.memberCity + ' · ' : '' }} {{ userDetail.distance?.toFixed(2) }}km - + @@ -82,6 +77,7 @@ 相册 + 相册暂无照片 - 评价 + + 评价 + {{ userDetail.operationTotal?.recentShieldTotal || 0 }} + 身材 - + 颜值 - + 耐心 - + 有趣 - + @@ -143,7 +143,7 @@ @click="handleLike" > - userDetail.value.memberPhotoList - ?.filter((i) => i.resourceType === 'IMAGE') - .map((item) => item.address), + const photoListUrls = computed( + () => + userDetail.value.memberPhotoList + ?.filter((i) => i.resourceType === 'IMAGE') + .map((item) => item.address) || [], ); onLoad(async (options: any) => { @@ -343,26 +344,20 @@ // 喜欢 const handleLike = async () => { - await RecentApi.recentOperate({ + const { code } = await RecentApi.recentOperate({ memberId: userDetail.value.member.memberId, action: 'MEMBER_COLLECT', }); + if (code !== 0) return; await getDetail(); }; - // 评价 - const rate = async () => { - await RecentApi.recentOperate({ - memberId: userDetail.value.member.memberId, - action: 'MEMBER_RATING', - ...rating, - }); - }; - - onHide(() => { - rate(); - }); - onUnload(() => { - rate(); - }); + // 评分 + // const rate = async () => { + // await RecentApi.recentOperate({ + // memberId: userDetail.value.member.memberId, + // action: 'MEMBER_RATING', + // ...rating, + // }); + // }; diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue index 6f2f8db5..4d02a41b 100644 --- a/src/pages/profile/face-verify.vue +++ b/src/pages/profile/face-verify.vue @@ -375,6 +375,8 @@ break; case 1000: uni.showToast({ title: '您已认证成功', icon: 'none' }); + await UserApi.updateUser(userinfo); + sheep.$store('user').getInfo(); break; case 1001: await RecentApi.cancelFaceVerify({ authId }); diff --git a/src/pages/profile/my-moment.vue b/src/pages/profile/my-moment.vue index 0983488d..4bfa01c6 100644 --- a/src/pages/profile/my-moment.vue +++ b/src/pages/profile/my-moment.vue @@ -21,7 +21,7 @@ @refresh="refreshList" @loadMore="listLoadMore" > - + diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue index 7511a9fb..cbc092a1 100644 --- a/src/pages/profile/profile.vue +++ b/src/pages/profile/profile.vue @@ -106,7 +106,10 @@ :safe-area-inset-bottom="true" > - 我的评价{{ myEvaluation.evaluateCount }} + + 我的评价 + {{ myEvaluation.evaluateCount }} + 身材 @@ -127,7 +130,9 @@ - 综合评分 {{ myEvaluation.avgScore }} + + 综合评分 {{ myEvaluation.avgScore?.toFixed(2) || 0 }} + 微信号 - - 上传我的微信二维码 + 上传您的微信二维码 - + - 语音签名 - - - - - + 基本资料 - - - - - - - - - + + + + + + + + + + - 个人简介 - - - + 个人简介 + + + + - {{ recentTotal.userLikeItTotal }} + + {{ recentTotal.userLikeItTotal || 0 }} + 我喜欢 - {{ recentTotal.userLikeMeTotal }} + + {{ recentTotal.userLikeMeTotal || 0 }} + 喜欢我 @@ -92,7 +96,7 @@ is-link ellipsis :to="item.to" - @click="item.click" + @click="item.onClick" /> @@ -237,16 +241,16 @@ }); }; - // cell菜单 + // 菜单 const MenuCellList = [ { title: '我的收益', value: '', icon: 'wallet', to: '/pages/wechat/index' }, - { title: '访客记录', value: '', icon: 'dong', to: '/pages/profile/view-record' }, + { title: '访客记录', value: '', icon: 'browse', to: '/pages/profile/view-record' }, { title: '认证中心', value: '', icon: 'user', to: '/pages/profile/face-verify' }, { title: '我的动态√', value: '', icon: 'star', to: '/pages/profile/my-moment' }, - { title: '我的评价√', value: '', icon: 'view-module', to: '', click: lookMyEvaluation }, - { title: '问题反馈√', value: '', icon: 'backtop-rectangle', to: '', click: goFeedback }, + { title: '我的评价√', value: '', icon: 'view-module', to: '', onClick: lookMyEvaluation }, + { title: '问题反馈√', value: '', icon: 'backtop-rectangle', to: '', onClick: goFeedback }, // { title: '客服助手', value: '', icon: 'service', to: '' }, - { title: '关注公众号√', value: '获取最新消息', icon: 'qrcode', to: '', click: subOfficial }, + { title: '关注公众号√', value: '获取最新消息', icon: 'qrcode', to: '', onClick: subOfficial }, { title: '设置√', value: '', icon: 'setting1', to: '/pages/profile/setting' }, ]; diff --git a/src/pages/profile/view-record.vue b/src/pages/profile/view-record.vue index ee334140..e0112e56 100644 --- a/src/pages/profile/view-record.vue +++ b/src/pages/profile/view-record.vue @@ -10,32 +10,56 @@ - 1 + + + + + - 2 + + + + - - - - - - - - diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts index 4f50da1a..a7773768 100644 --- a/src/sheep/api/member/recent.ts +++ b/src/sheep/api/member/recent.ts @@ -212,7 +212,7 @@ const RecentApi = { }, // 添加朋友圈或用户详情页面的查看和访问记录 createViewRecord: (data: { - bizType: 'CLASSIFY' | 'RECENT'; + bizType: 'CLASSIFY' | 'RECENT' | 'USER'; viewStartTime: string; viewEndTime: string; }) => { @@ -225,6 +225,30 @@ const RecentApi = { }, }); }, + // 查询我看过的 + getSeenIt: (data: any) => { + return request({ + url: '/member/recent/look/it-page', + method: 'POST', + data, + custom: { + showLoading: true, + loadingMsg: '加载中', + }, + }); + }, + // 查询看过我的 + getSeenMe: (data: any) => { + return request({ + url: '/member/recent/look/me-page', + method: 'POST', + data, + custom: { + showLoading: true, + loadingMsg: '加载中', + }, + }); + }, // 获得用户协议或隐私政策文章 getPromotionArticle: (params: any) => { return request({ diff --git a/src/sheep/components/moment-card/moment-card.vue b/src/sheep/components/moment-card/moment-card.vue index 118cb1f1..2a8fd429 100644 --- a/src/sheep/components/moment-card/moment-card.vue +++ b/src/sheep/components/moment-card/moment-card.vue @@ -65,7 +65,7 @@ @click="handleunLike" /> - {{ operationTotal.recentLikeTotal || 0 }} 喜欢 + {{ operationTotal?.recentLikeTotal || 0 }} 喜欢 diff --git a/src/sheep/components/segmented/segmented.vue b/src/sheep/components/segmented/segmented.vue index 5deb2212..f67122ef 100644 --- a/src/sheep/components/segmented/segmented.vue +++ b/src/sheep/components/segmented/segmented.vue @@ -1,5 +1,6 @@