From aab27de6eee48382c6add3e9ca15023365842f16 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 21 二月 2025 10:12:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront

---
 apps/taro/src/stores/modules/user.ts |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/taro/src/stores/modules/user.ts b/apps/taro/src/stores/modules/user.ts
index 5f6074e..24f87f0 100644
--- a/apps/taro/src/stores/modules/user.ts
+++ b/apps/taro/src/stores/modules/user.ts
@@ -100,7 +100,7 @@
             sessionKey: wxMiniAppUserLoginRes.sessionKey,
             encryptedData: detail.encryptedData,
             iv: detail.iv,
-            wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
+            // wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
           };
           res = await accountServices.wxMiniAppPhoneAuthLogin(params);
           this.loginSuccess(res);
@@ -113,7 +113,7 @@
 
     // 鐢ㄦ埛鎵嬫満楠岃瘉鐮佺櫥鍏�
     async loginByUsername(data: API.PhoneMesssageCodeLoginInput) {
-      let res = await accountServices.phoneMesssageCodeLogin(
+      let res = await accountServices.lifePayPhoneMesssageCodeLogin(
         {
           phoneNumber: data.phoneNumber,
           code: data.code,
@@ -142,12 +142,13 @@
       return res;
     },
 
-    async loginSuccess(res: API.IdentityModelTokenCacheItem) {
-      try {
-        this.setUserInfoAction(res);
-        this.setTokenAction(res);
-        await this.getCurrentUserInfo();
-      } catch (error) {}
+    async loginSuccess(res: API.IdentityModelTokenCacheItem | string) {
+      console.log('res: ', res);
+      // try {
+      //   this.setUserInfoAction(res);
+      //   this.setTokenAction(res);
+      //   await this.getCurrentUserInfo();
+      // } catch (error) {}
     },
 
     async wxMiniAppUserLoginFromScan(wxIndentityRes: API.WxMiniAppIndentityInfo, uuid: string) {
@@ -174,7 +175,7 @@
           sessionKey: wxIndentityRes.sessionKey,
           encryptedData: detail.encryptedData,
           iv: detail.iv,
-          wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
+          // wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
         });
         this.loginSuccess(res);
         return res;

--
Gitblit v1.9.1