From 64ddedba86d07b1979c5582bbd6ca152016de294 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 31 十二月 2025 11:04:14 +0800
Subject: [PATCH] fix: bug
---
apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue
index 3fce0dc..d3a25cb 100644
--- a/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -64,7 +64,6 @@
import * as authServices from '@12333/services/apiV2/auth';
import { NODE_ENV } from '@/constants';
import { subscribeMessageTemplateIdsForC } from '@12333/constants';
-import { ResponseStructure } from '@/utils/request';
console.log('NODE_ENV: ', NODE_ENV);
defineOptions({
@@ -96,7 +95,6 @@
const wxIndentityRes = ref<API.LoginCommandCallback>();
const wxMiniAppUserLoginRes = ref<API.LoginCommandCallback>();
-const wxmpLoginRes = ref<ResponseStructure<API.LoginCommandCallback>>();
const isAccount = ref(false);
@@ -118,11 +116,7 @@
type: AppLocalConfig.userType,
enterpriseType: AppLocalConfig.enterpriseType,
};
- wxmpLoginRes.value = (await authServices.wxmpLogin(params, {
- getResponse: true,
- })) as ResponseStructure<API.LoginCommandCallback>;
- console.log('wxmpLoginRes.value: ', wxmpLoginRes.value);
- wxMiniAppUserLoginRes.value = wxmpLoginRes.value.data;
+ wxMiniAppUserLoginRes.value = await authServices.wxmpLogin(params);
if (wxMiniAppUserLoginRes.value?.isBindPhoneNumber) {
isAccount.value = true;
}
@@ -134,10 +128,6 @@
try {
const { errMsg, code } = ev.detail;
console.log('errMsg: ', errMsg, isLoginByWeb.value);
- if (!wxmpLoginRes.value.success) {
- Message.error(wxmpLoginRes.value.msg);
- return;
- }
if (errMsg === 'getPhoneNumber:ok') {
if (isLoginByWeb.value) {
// let res = await userStore.wxMiniAppPhoneAuthLoginFromScan(
@@ -149,6 +139,13 @@
// handleLoginSuccess();
// }
} else {
+ let loginRes = await Taro.login();
+ const params: API.WxmpLoginCommand = {
+ code: loginRes.code,
+ type: AppLocalConfig.userType,
+ enterpriseType: AppLocalConfig.enterpriseType,
+ };
+ wxMiniAppUserLoginRes.value = await authServices.wxmpLogin(params);
let res = await userStore.getTokenByPhone(ev.detail, wxMiniAppUserLoginRes.value);
if (res) {
handleLoginSuccess();
--
Gitblit v1.10.0