From ad032ad0889156572271868601d6665e560318b4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 06 三月 2025 13:04:29 +0800
Subject: [PATCH] fix: 对接
---
apps/taro/src/subpackages/login/loginByForm/loginByForm.vue | 2 +-
apps/taro/src/hooks/user.ts | 6 ++++--
apps/taro/src/pages/home/index.vue | 3 +--
apps/taro/src/utils/env.ts | 4 ++--
packages/core/src/lifeRechargeServices.ts | 14 ++++++++++++--
packages/core/src/types.ts | 3 ++-
apps/taro/config/index.js | 4 ++--
apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue | 6 +++---
8 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/apps/taro/config/index.js b/apps/taro/config/index.js
index 940dfcb..6ded296 100644
--- a/apps/taro/config/index.js
+++ b/apps/taro/config/index.js
@@ -98,7 +98,7 @@
url: {
enable: true,
config: {
- limit: 1024, // 璁惧畾杞崲灏哄涓婇檺
+ limit: 2024, // 璁惧畾杞崲灏哄涓婇檺
},
},
cssModules: {
@@ -212,7 +212,7 @@
url: {
enable: true,
config: {
- limit: 1024, // 璁惧畾杞崲灏哄涓婇檺
+ limit: 2024, // 璁惧畾杞崲灏哄涓婇檺
},
},
cssModules: {
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index a652bd0..d30eebd 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -87,8 +87,10 @@
Taro.useReady(async () => {
try {
//@ts-ignore
- if (!code && isInWeChat && !wxCode.value) {
- location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf940ff1d35a98493&redirect_uri=${location.href}&response_type=code&scope=snsapi_base#wechat_redirect`;
+ if (!code && isInWeChat && !wxCode.value && location?.replace) {
+ location.replace(
+ `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf940ff1d35a98493&redirect_uri=${location.href}&response_type=code&scope=snsapi_base#wechat_redirect`
+ );
}
if (!!code && !wxCode.value) {
userStore.setWxCode(router.params.code ?? '');
diff --git a/apps/taro/src/pages/home/index.vue b/apps/taro/src/pages/home/index.vue
index 1c09530..be8d149 100644
--- a/apps/taro/src/pages/home/index.vue
+++ b/apps/taro/src/pages/home/index.vue
@@ -10,10 +10,9 @@
</template>
<script setup lang="ts">
-import { useUser, useAccessLogin, useTabRouteEnhance } from '@/hooks';
+import { useAccessLogin } from '@/hooks';
import { useUserStore } from '@/stores/modules/user';
import Taro from '@tarojs/taro';
-import IconLogo from '@/assets/home/icon-logo.png';
import { OrderInputType } from '@life-payment/constants';
import { RechargeGrid } from '@life-payment/components';
diff --git a/apps/taro/src/subpackages/login/loginByForm/loginByForm.vue b/apps/taro/src/subpackages/login/loginByForm/loginByForm.vue
index 4dcafa5..cc23e73 100644
--- a/apps/taro/src/subpackages/login/loginByForm/loginByForm.vue
+++ b/apps/taro/src/subpackages/login/loginByForm/loginByForm.vue
@@ -11,7 +11,7 @@
>
<img :src="IconTabBg1" alt="" class="loginB-form-tab-item-bg1" />
<div class="loginB-form-tab-item-content">
- <div class="loginB-form-tab-item-text">楠岃瘉鐮佺櫥褰�</div>
+ <div class="loginB-form-tab-item-text">鐧诲綍</div>
<div class="loginB-form-tab-item-line"></div>
</div>
</div>
diff --git a/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue b/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue
index 44426f2..b73ebc3 100644
--- a/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue
+++ b/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue
@@ -9,7 +9,7 @@
type="text"
/>
</nut-form-item>
- <nut-form-item label="" class="bole-form-item" prop="verificationCode" required>
+ <!-- <nut-form-item label="" class="bole-form-item" prop="verificationCode" required>
<nut-input
v-model.trim="form.verificationCode"
class="bole-input-text"
@@ -24,7 +24,7 @@
></ProFormCaptcha>
</template>
</nut-input>
- </nut-form-item>
+ </nut-form-item> -->
</nut-form>
<LargeButton class="login-btn" @click="handleLogin" :loading="form.loading">鐧诲綍</LargeButton>
<!-- <div class="go-register-btn" @click="goRegister">绔嬪嵆娉ㄥ唽</div> -->
@@ -96,7 +96,7 @@
let res = await blLifeRecharge.login(
{
phoneNumber: form.phoneNumber,
- code: form.verificationCode,
+ // code: form.verificationCode,
},
{
showLoading: false,
diff --git a/apps/taro/src/utils/env.ts b/apps/taro/src/utils/env.ts
index adcea3c..de4ca0a 100644
--- a/apps/taro/src/utils/env.ts
+++ b/apps/taro/src/utils/env.ts
@@ -14,5 +14,5 @@
export const isMobile = isH5 || isWeChat || isApp;
export const isWeb = isH5 || isPC;
-export const isInAlipay = /AlipayClient/i.test(navigator.userAgent);
-export const isInWeChat = /MicroMessenger/i.test(navigator.userAgent);
+export const isInAlipay = /AlipayClient/i.test(navigator?.userAgent);
+export const isInWeChat = /MicroMessenger/i.test(navigator?.userAgent);
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index 6e3e758..e39d156 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -7,7 +7,17 @@
export class BlLifeRechargeServices<TResponse = any, TRequestOptions = any> {
private request: IRequest;
constructor({ axiosConfig }: BlLifeRechargeServicesOptions<TResponse, TRequestOptions>) {
- this.request = Request.create(axiosConfig);
+ this.request = Request.create({
+ ...axiosConfig,
+ // baseURL: isWeb ? process.env.BASE_URL_H5 : process.env.BASE_URL,
+ timeout: 10 * 1000,
+ headers: {
+ Accept: 'application/json, text/plain, */*',
+ 'Content-Type': 'application/json',
+ 'X-Requested-With': 'XMLHttpRequest',
+ },
+ withCredentials: true,
+ });
}
async lifePayPhoneMesssageCodeLogin(body: PhoneMesssageCodeLoginInput, options?: RequestConfig) {
@@ -152,7 +162,7 @@
/** 鎵嬫満鍙� */
phoneNumber: string;
/** 楠岃瘉鐮� */
- code: string;
+ // code: string;
}
export interface LifePayRateListOutput {
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 9bb5bd1..f26f0da 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -1,7 +1,8 @@
import { type RequestConfig } from 'senior-request';
+import { type AxiosRequestConfig } from 'axios';
export type BlLifeRechargeServicesOptions<TResponse = any, TRequestOptions = any> = {
- axiosConfig?: RequestConfig<TResponse, TRequestOptions>;
+ axiosConfig?: Omit<RequestConfig<TResponse, TRequestOptions>, keyof AxiosRequestConfig>;
};
export type BlLifeRechargeAccountModelOptions = {
--
Gitblit v1.9.1