From 201ca4f20ce2dd1b2e4c5ec0a7f09f377e923195 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 15 八月 2025 16:32:28 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/pages/mine/index.vue | 59 +++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 43 insertions(+), 16 deletions(-) diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue index b1746f9..37cfe96 100644 --- a/apps/cMiniApp/src/pages/mine/index.vue +++ b/apps/cMiniApp/src/pages/mine/index.vue @@ -16,18 +16,18 @@ <div class="mine-avatar-wrapper" @click="goLogin"> <UserAvatar :size="52" class="mine-avatar" /> <div class="user-info" v-if="isLogin"> - <div class="user-info-item">{{ userDetail?.userName ?? '' }}</div> + <div class="user-info-item">{{ userDetail?.name ?? '' }}</div> <div class="user-info-auth"> <div class="user-info-auth-item"> <div class="user-info-unCertified" v-if="isCertified"> + <img :src="IconAuth" class="user-info-unCertified-icon" /> + <div class="user-info-unCertified-text">宸插疄鍚�</div> + </div> + <div class="user-info-unCertified" v-else> <div class="user-info-unCertified-text">鏈疄鍚�</div> <div class="user-info-unCertified-btn" @click.stop="goAuthentication"> 绔嬪嵆瀹炲悕 </div> - </div> - <div class="user-info-unCertified" v-else> - <img :src="IconAuth" class="user-info-unCertified-icon" /> - <div class="user-info-unCertified-text">宸插疄鍚�</div> </div> </div> <div class="user-info-auth-item"> @@ -50,29 +50,44 @@ </UserHomeTopView> </ContentView> <ContentScrollView v-if="isLogin" class="mine-content-scroll-view"> - <!-- <List class="mine-list-wrapper mine-balance"> + <List class="mine-list-wrapper mine-balance"> <div class="mine-balance-title">鎴戠殑浣欓</div> - <div class="mine-balance-money">锟{ toThousand(100) }}</div> - <div class="mine-balance-btn"> + <div class="mine-balance-money">锟{ toThousand(0) }}</div> + <div class="mine-balance-btn" @click="goMineWallet"> 杩涘叆鎴戠殑閽卞寘 <img :src="IconArrow" class="mine-balance-btn-icon" /> </div> - </List> --> + </List> <List class="mine-list-wrapper mine-order-list"> <div class="mine-order-list-title"> <div class="mine-order-list-title-text">鎴戠殑璁㈠崟</div> <img :src="IconArrow" class="mine-order-list-title-icon" /> </div> <div class="mine-order-list-content"> - <nut-badge class="mine-order-list-item" top="8" :value="8" @click="goMineSign"> + <nut-badge + class="mine-order-list-item" + top="8" + :value="userDetail?.taskCount ?? 0" + @click="goMineSign" + > <img :src="IconOrderSign" class="mine-order-list-icon" /> <div class="mine-order-list-text">鎴戠殑鎶ュ悕</div> </nut-badge> - <nut-badge class="mine-order-list-item" top="8" :value="8" @click="goMineHire"> + <nut-badge + class="mine-order-list-item" + top="8" + :value="userDetail?.hirePassTaskCount ?? 0" + @click="goMineHire" + > <img :src="IconOrderHire" class="mine-order-list-icon" /> - <div class="mine-order-list-text">宸插綍鐢�</div> + <div class="mine-order-list-text">宸插畨鎺�</div> </nut-badge> - <nut-badge class="mine-order-list-item" top="8" :value="8" @click="goMineCancel"> + <nut-badge + class="mine-order-list-item" + top="8" + :value="userDetail?.hireRefuseTaskCount ?? 0" + @click="goMineCancel" + > <img :src="IconOrderCancel" class="mine-order-list-icon" /> <div class="mine-order-list-text">宸插彇娑�</div> </nut-badge> @@ -106,13 +121,21 @@ import { useSystemStore } from '@/stores/modules/system'; import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue'; import { toThousand } from '@12333/utils'; +import { useQuery } from '@tanstack/vue-query'; +import * as authServices from '@12333/services/apiV2/auth'; -const { userDetail, isCertified } = useUser(); +const { userDetail, isCertified, updateUserInfo } = useUser(); const isLogin = useIsLogin(); const systemStore = useSystemStore(); const { goLoginFn } = useGoLogin(); const bgHeight = computed(() => 133 + systemStore.navHeight); + +Taro.useDidShow(() => { + if (isLogin.value) { + updateUserInfo(); + } +}); function goLogin() { if (!isLogin.value) { @@ -136,9 +159,9 @@ Taro.useShareAppMessage((res) => { return { - title: `${userDetail.value?.contacter}鍚嶇墖`, + // title: `${userDetail.value?.contacter}鍚嶇墖`, // path: `${RouterPath.userHomePage}?userId=${userDetail.value?.userId}`, - imageUrl: userDetail.value?.avatarUrl, + // imageUrl: userDetail.value?.avatarUrl, }; }); @@ -160,6 +183,10 @@ function goMineAgreementSign() { goPage(RouterPath.mineAgreementSign); } + +function goMineWallet() { + goPage(RouterPath.mineWallet); +} </script> <style lang="scss"> -- Gitblit v1.9.1