diff --git a/src/pages.json b/src/pages.json index ec3e5978..23e56f15 100644 --- a/src/pages.json +++ b/src/pages.json @@ -267,6 +267,13 @@ "navigationBarTitleText": "关于", "navigationStyle": "custom" } + }, + { + "path": "gender-choose", + "style": { + "navigationBarTitleText": "选择性别", + "navigationStyle": "custom" + } } ] }, diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 3759985f..82d5eb5b 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -113,8 +113,7 @@ - - + + + @@ -194,7 +195,7 @@ refreshList(); }); - const { listData, loadMoreStatus, refreshList, listLoadMore } = useScroll( + const { isRefreshing, listData, loadMoreStatus, refreshList, listLoadMore } = useScroll( RecentApi.quickPage, params, ); @@ -308,7 +309,11 @@ } // 喜欢 - const handleLike = () => { - uni.showToast({ title: '功能开发中...' }); + const handleLike = async () => { + await RecentApi.recentOperate({ + memberId: userDetail.value.member.memberId, + memberRecentId: userDetail.value.id, + action: 'MEMBER_COLLECT', + }); }; diff --git a/src/pages/profile/gender-choose.vue b/src/pages/profile/gender-choose.vue new file mode 100644 index 00000000..cb215676 --- /dev/null +++ b/src/pages/profile/gender-choose.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/sheep/components/user-card/user-card.vue b/src/sheep/components/user-card/user-card.vue index 5456ba00..71b3f1ca 100644 --- a/src/sheep/components/user-card/user-card.vue +++ b/src/sheep/components/user-card/user-card.vue @@ -3,7 +3,7 @@ diff --git a/src/sheep/store/user.js b/src/sheep/store/user.js index 245b90de..5e06b163 100644 --- a/src/sheep/store/user.js +++ b/src/sheep/store/user.js @@ -55,6 +55,9 @@ const user = defineStore({ return; } this.userInfo = data; + if (data.sex !== 1 && data.sex !== 2) { + return uni.reLaunch({ url: '/pages/profile/gender-choose' }); + } return Promise.resolve(data); }, @@ -112,7 +115,7 @@ const user = defineStore({ // 获取最新信息 await this.getInfo(); this.getWallet(); - this.getNumData(); + // this.getNumData(); // 获取订单、优惠券等其他资产信息 return this.userInfo; }, @@ -133,7 +136,7 @@ const user = defineStore({ await this.updateUserData(); // 加载购物车 - cart().getList(); + // cart().getList(); // 登录后设置全局分享参数 $share.getShareInfo(); diff --git a/src/static/gender-man.png b/src/static/gender-man.png new file mode 100644 index 00000000..36be54dd Binary files /dev/null and b/src/static/gender-man.png differ diff --git a/src/static/gender-woman.png b/src/static/gender-woman.png new file mode 100644 index 00000000..75c4b88d Binary files /dev/null and b/src/static/gender-woman.png differ diff --git a/unocss.config.ts b/unocss.config.ts index de12bcbc..93eadc62 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -15,7 +15,6 @@ export default { ], shortcuts: [ { - 'border-base': 'border border-gray-500_10', 'flex-col-center': 'flex flex-col justify-center items-center', 'flex-row-center': 'flex flex-row justify-center items-center', 'flex-col': 'flex flex-col',