From 538e4f454ba3126ef92278ab9cb675adb9e3b287 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 27 三月 2025 09:30:55 +0800 Subject: [PATCH] Merge branch 'master' into dev-1.3 --- apps/taro/src/pages/mine/index.vue | 59 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 18 deletions(-) diff --git a/apps/taro/src/pages/mine/index.vue b/apps/taro/src/pages/mine/index.vue index 2717095..d9e2f4d 100644 --- a/apps/taro/src/pages/mine/index.vue +++ b/apps/taro/src/pages/mine/index.vue @@ -13,13 +13,19 @@ <div class="mine-page-top-view" @click="goLogin"> <img class="mine-avatar" :src="DefaultAvatar" alt="" /> <div class="user-info"> - <div class="user-info-name" v-if="isLogin">{{ userDetail?.userName ?? '123' }}</div> + <div class="user-info-name" v-if="isLogin">{{ hiddenPhoneNumber(virtualPhoneNumber) }}</div> <div class="mine-go-login" v-else>鐧诲綍</div> </div> </div> <ContentScrollView> <List class="mine-list-wrapper"> <ListItem title="璁㈠崟绠$悊" @click="goOrderManage"></ListItem> + <ListItem title="鎴峰彿绠$悊" @click="goUserAccountList"></ListItem> + <template v-if="isChannelAccount"> + <ListItem title="鏁版嵁鐪嬫澘" @click="goDashboard"></ListItem> + <ListItem title="鎺ㄥ箍浜岀淮鐮�" @click="goShareQrcode"></ListItem> + </template> + <ListItem v-if="isWeb" title="鍦ㄧ嚎瀹㈡湇" @click="handleChat"></ListItem> <ListItem v-if="isLogin" title="閫�鍑虹櫥褰�" @click="goLogout"></ListItem> </List> </ContentScrollView> @@ -35,12 +41,16 @@ import { useSystemStore } from '@/stores/modules/system'; import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue'; import { useUserStore } from '@/stores/modules/user'; -import { useUserStoreWithOut } from '@/stores/modules/user'; +import { Message } from '@/utils'; +import { isWeb } from '@/utils/env'; +import { useLifeRechargeContext } from '@life-payment/core-vue'; +import { hiddenPhoneNumber } from '@life-payment/utils'; -const { userDetail } = useUser(); +const { userDetail, virtualPhoneNumber, isChannelAccount } = useUser(); const isLogin = useIsLogin(); const systemStore = useSystemStore(); const userStore = useUserStore(); +const { blLifeRecharge } = useLifeRechargeContext(); const { goLoginFn } = useGoLogin(); const bgHeight = computed(() => 133 + systemStore.navHeight); @@ -52,28 +62,41 @@ } function goPage(routeName: string) { - Taro.navigateTo({ + RouteHelper.navigateTo({ url: routeName, }); } -Taro.showShareMenu({ - showShareItems: ['shareAppMessage'], -}); - -Taro.useShareAppMessage((res) => { - return { - title: `${userDetail.value?.contacter}鍚嶇墖`, - // path: `${RouterPath.userHomePage}?userId=${userDetail.value?.userId}`, - imageUrl: userDetail.value?.avatarUrl, - }; -}); +// Taro.showShareMenu({ +// showShareItems: ['shareAppMessage'], +// }); +// Taro.useShareAppMessage((res) => { +// return { +// title: `${userDetail.value?.contacter}鍚嶇墖`, +// // path: `${RouterPath.userHomePage}?userId=${userDetail.value?.userId}`, +// imageUrl: userDetail.value?.avatarUrl, +// }; +// }); const goOrderManage = useAccessLogin(() => goPage(RouterPath.order)); +const goUserAccountList = useAccessLogin(() => goPage(RouterPath.userAccountList)); +const goShareQrcode = useAccessLogin(() => goPage(RouterPath.shareQrcode)); +const goDashboard = useAccessLogin(() => goPage(RouterPath.dashboard)); -function goLogout() { - userStore.logout(); - useUserStoreWithOut().logout(); +async function goLogout() { + try { + await Message.confirm({ + message: '纭畾瑕侀��鍑虹櫥褰曞悧锛�', + }); + userStore.logout(); + blLifeRecharge.loginout(); + } catch (error) {} +} + +function handleChat() { + if (isWeb) { + window.open('https://work.weixin.qq.com/kfid/kfcd24e0c60fd91099e', '_blank'); + } } </script> -- Gitblit v1.9.1