From 0cf1b417c68013df89504088c471fd113676391a Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 14 八月 2025 17:11:03 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/bMiniApp/src/pages/mine/index.vue | 65 ++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 20 deletions(-) diff --git a/apps/bMiniApp/src/pages/mine/index.vue b/apps/bMiniApp/src/pages/mine/index.vue index 70e0c29..27499bb 100644 --- a/apps/bMiniApp/src/pages/mine/index.vue +++ b/apps/bMiniApp/src/pages/mine/index.vue @@ -17,60 +17,76 @@ <UserAvatar :size="60" class="mine-avatar" /> <div class="user-info" v-if="isLogin"> <div class="user-info-item"> - <div class="user-info-item-name">{{ userDetail?.userName ?? '123' }}</div> + <div class="user-info-item-name">{{ userDetail?.name ?? '' }}</div> <div class="user-info-item-gender"> - <img v-if="1" :src="IconMale" class="user-info-item-gender-icon" /> - <img v-else :src="IconFemale" class="user-info-item-gender-icon" /> + <img + v-if="userDetail?.gender === EnumUserGender.Male" + :src="IconMale" + class="user-info-item-gender-icon" + /> + <img + v-else-if="userDetail?.gender === EnumUserGender.Female" + :src="IconFemale" + class="user-info-item-gender-icon" + /> </div> - <div class="user-info-item-position">绠$悊鍛�</div> + <div class="user-info-item-position">{{ (userDetail?.roles ?? []).join(',') }}</div> </div> <div class="user-info-item"> <template v-if="isCertified"> + <div class="user-info-certified-text"> + {{ userDetail?.enterpriseName ?? '' }} + </div> + <div class="user-info-certified-btn">宸茶璇�</div> + </template> + <template v-else> <div class="user-info-unCertified-text">鏈璇�</div> <div class="user-info-unCertified-btn" @click.stop="goAuthentication"> 绔嬪嵆璁よ瘉 </div> - </template> - <template v-else> - <div class="user-info-certified-text"> - {{ userDetail?.customerName ?? '123' }} - </div> - <div class="user-info-certified-btn">宸茶璇�</div> </template> </div> </div> <div class="mine-go-login" v-else>鍘荤櫥褰�</div> </div> </template> - <!-- <div class="mine-business-card"> - <div class="mine-business-card-item"> + <div class="mine-business-card" v-if="isLogin"> + <div class="mine-business-card-item" @click="goBusinessCard"> <img class="mine-business-card-item-icon" :src="IconBusinessCard" alt="" /> <div class="mine-business-card-item-text">鎴戠殑鐢靛瓙鍚嶇墖</div> </div> <div class="mine-business-card-btn"> - <nut-button type="info">閫掑悕鐗�</nut-button> + <nut-button type="info" @click="goBusinessCard">閫掑悕鐗�</nut-button> </div> - </div> --> + </div> </UserHomeTopView> <template v-if="isLogin"> <div class="mine-content-record"> <div class="mine-content-record-item" @click="goMineFavorites"> <img class="mine-content-record-item-icon" :src="IconCollect" alt="" /> - <nut-badge top="0" right="0" :value="8" color="#FF7D00"> + <nut-badge top="0" right="0" :value="8" color="#FF7D00" hidden> <div class="mine-content-record-item-text">鎴戠殑鏀惰棌</div> </nut-badge> </div> <div class="mine-content-record-item" @click="goMineContactRecord"> <img class="mine-content-record-item-icon" :src="IconRecord" alt="" /> - <nut-badge top="0" right="0" :value="8" color="#FF7D00"> + <nut-badge top="0" right="0" :value="8" color="#FF7D00" hidden> <div class="mine-content-record-item-text">鑱旂郴璁板綍</div> </nut-badge> </div> </div> <Cell :title="'鏇村鏈嶅姟'" class="mine-content-service"> <div class="mine-content-service-list"> - <TaskDetailWelfareItem :icon="IconFinance" text="璐㈠姟绠$悊"></TaskDetailWelfareItem> - <TaskDetailWelfareItem :icon="IconRealName" text="浼佷笟瀹炲悕"></TaskDetailWelfareItem> + <TaskDetailWelfareItem + :icon="IconFinance" + text="璐㈠姟绠$悊" + @click="goFinance" + ></TaskDetailWelfareItem> + <TaskDetailWelfareItem + :icon="IconRealName" + text="浼佷笟瀹炲悕" + @click.stop="goAuthentication" + ></TaskDetailWelfareItem> <TaskDetailWelfareItem :icon="IconSetting" text="璁剧疆" @@ -104,6 +120,7 @@ import { useUserStore } from '@/stores/modules/user'; import { useQueryClient } from '@tanstack/vue-query'; import { TaskDetailWelfareItem } from '@12333/components'; +import { EnumUserGender } from '@12333/constants'; const userStore = useUserStore(); const queryClient = useQueryClient(); @@ -136,9 +153,9 @@ Taro.useShareAppMessage((res) => { return { - title: `${userDetail.value?.contacter}鍚嶇墖`, + title: `${userDetail.value?.name}鍚嶇墖`, // path: `${RouterPath.userHomePage}?userId=${userDetail.value?.userId}`, - imageUrl: userDetail.value?.avatarUrl, + imageUrl: userDetail.value?.avatar, }; }); @@ -152,6 +169,14 @@ goPage(RouterPath.mineContactRecord); } +function goBusinessCard() { + goPage(RouterPath.businessCard); +} + +function goFinance() { + goPage(RouterPath.mineFinanceManage); +} + async function handleLoginout() { try { await Message.confirm({ -- Gitblit v1.9.1