From ef302550673f5dfd1f4e97599ece4b335d8a7624 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 三月 2025 09:48:22 +0800
Subject: [PATCH] Merge branch 'dev-1.1'
---
apps/taro/src/pages/mine/index.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/apps/taro/src/pages/mine/index.vue b/apps/taro/src/pages/mine/index.vue
index 2717095..8068ee3 100644
--- a/apps/taro/src/pages/mine/index.vue
+++ b/apps/taro/src/pages/mine/index.vue
@@ -13,7 +13,7 @@
<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">{{ virtualPhoneNumber }}</div>
<div class="mine-go-login" v-else>鐧诲綍</div>
</div>
</div>
@@ -35,12 +35,14 @@
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 { useLifeRechargeContext } from '@life-payment/core-vue';
-const { userDetail } = useUser();
+const { userDetail, virtualPhoneNumber } = useUser();
const isLogin = useIsLogin();
const systemStore = useSystemStore();
const userStore = useUserStore();
+const { blLifeRecharge } = useLifeRechargeContext();
const { goLoginFn } = useGoLogin();
const bgHeight = computed(() => 133 + systemStore.navHeight);
@@ -57,9 +59,9 @@
});
}
-Taro.showShareMenu({
- showShareItems: ['shareAppMessage'],
-});
+// Taro.showShareMenu({
+// showShareItems: ['shareAppMessage'],
+// });
Taro.useShareAppMessage((res) => {
return {
@@ -71,9 +73,14 @@
const goOrderManage = useAccessLogin(() => goPage(RouterPath.order));
-function goLogout() {
- userStore.logout();
- useUserStoreWithOut().logout();
+async function goLogout() {
+ try {
+ await Message.confirm({
+ message: '纭畾瑕侀��鍑虹櫥褰曞悧锛�',
+ });
+ userStore.logout();
+ blLifeRecharge.loginout();
+ } catch (error) {}
}
</script>
--
Gitblit v1.9.1