From dfb8f993f691eedc558d52347b1a93a105f6b0d2 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 03 三月 2025 16:43:14 +0800
Subject: [PATCH] fix: 对接
---
apps/taro/src/utils/request/index.ts | 4 +-
apps/taro/src/hooks/user.ts | 1
packages/core/src/lifeRecharge.ts | 8 ++--
packages/core/src/lifeRechargeServices.ts | 36 +++---------------
packages/core/src/types.ts | 18 +++-----
apps/taro/src/hooks/router.ts | 2
apps/taro/src/utils/blLifeRecharge.ts | 4 +-
7 files changed, 22 insertions(+), 51 deletions(-)
diff --git a/apps/taro/src/hooks/router.ts b/apps/taro/src/hooks/router.ts
index b1236c1..448a183 100644
--- a/apps/taro/src/hooks/router.ts
+++ b/apps/taro/src/hooks/router.ts
@@ -54,7 +54,7 @@
const isTabbarPage = Object.values(TabBarPageRouter).some((x) =>
latestRoute.value.toLowerCase().includes(x.toLowerCase())
);
- if (isTabbarPage) {
+ if (isTabbarPage && isInAlipay) {
Taro.reLaunch({
url: router.path,
success() {
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index e651456..a652bd0 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -58,7 +58,6 @@
const isAuth = computed(() => !needAuth || isLogin.value);
const router = Taro.useRouter();
- console.log('222', 222);
useInitWeixinJSBridge();
Taro.useReady(async () => {
diff --git a/apps/taro/src/utils/blLifeRecharge.ts b/apps/taro/src/utils/blLifeRecharge.ts
index b62221b..e1a6594 100644
--- a/apps/taro/src/utils/blLifeRecharge.ts
+++ b/apps/taro/src/utils/blLifeRecharge.ts
@@ -1,9 +1,9 @@
import { BlLifeRecharge } from '@life-payment/core-vue';
-import { request } from './request';
+import { config } from './request';
import { getStorageVirtualUserId } from './storage';
export const blLifeRecharge = new BlLifeRecharge({
- request,
+ axiosConfig: config,
userId: getStorageVirtualUserId()?.virtualUserId ?? '',
phoneNumber: getStorageVirtualUserId()?.virtualPhoneNumber ?? '',
});
diff --git a/apps/taro/src/utils/request/index.ts b/apps/taro/src/utils/request/index.ts
index 4d74dc6..c2ff674 100644
--- a/apps/taro/src/utils/request/index.ts
+++ b/apps/taro/src/utils/request/index.ts
@@ -49,7 +49,7 @@
REDIRECT = 9,
}
// 涓庡悗绔害瀹氱殑鍝嶅簲鏁版嵁鏍煎紡
-interface ResponseStructure {
+export interface ResponseStructure {
success: boolean;
data: any;
/**
@@ -94,7 +94,7 @@
withCredentials: true,
};
-const config: RequestConfig<ResponseStructure, IRequestOptions> = {
+export const config: RequestConfig<ResponseStructure, IRequestOptions> = {
...AxiosOptions,
errorConfig: {
diff --git a/packages/core/src/lifeRecharge.ts b/packages/core/src/lifeRecharge.ts
index a041d82..26c02a5 100644
--- a/packages/core/src/lifeRecharge.ts
+++ b/packages/core/src/lifeRecharge.ts
@@ -3,18 +3,18 @@
PhoneMesssageCodeLoginInput,
RequestConfig,
} from './lifeRechargeServices';
-import { IRequest, BlLifeRechargeOptions } from './types';
+import { BlLifeRechargeOptions } from './types';
import { LifeRechargeConstants } from './lifeRechargeConstants';
import { BlLifeRechargeAccountModel } from './lifeRechargeAccountModel';
-export class BlLifeRecharge<T extends IRequest = IRequest> {
- services: BlLifeRechargeServices<T>;
+export class BlLifeRecharge<TResponse = any, TRequestOptions = any> {
+ services: BlLifeRechargeServices<TResponse, TRequestOptions>;
accountModel: BlLifeRechargeAccountModel;
static constants = LifeRechargeConstants;
constants = LifeRechargeConstants;
- constructor(options: BlLifeRechargeOptions<T>) {
+ constructor(options: BlLifeRechargeOptions<TResponse, TRequestOptions>) {
this.services = new BlLifeRechargeServices(options);
this.accountModel = new BlLifeRechargeAccountModel({
userId: options.userId,
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index 4127822..6e3e758 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -1,37 +1,13 @@
-import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-import { IRequest, BlLifeRechargeServicesOptions } from './types';
+import { BlLifeRechargeServicesOptions } from './types';
import { LifeRechargeConstants } from './lifeRechargeConstants';
+import { Request, IRequest } from 'senior-request';
export interface RequestConfig {}
-export class BlLifeRechargeServices<T extends IRequest> {
- private request: T;
- request2: T;
- constructor({ request, axiosOptions }: BlLifeRechargeServicesOptions<T>) {
- this.request = request;
- const axiosInstance = axios.create(axiosOptions);
- // @ts-expect-error
- this.request2 = (url: string, opts: any = { method: 'GET' }) => {
- return new Promise((resolve, reject) => {
- axiosInstance
- .request({ ...opts, url })
- .then((res) => {
- //@ts-ignore
- resolve(res);
- })
- .catch((error) => {
- try {
- // const handler = config?.errorConfig?.errorHandler;
- // if (handler) {
- // handler(error, opts, config);
- // }
- } catch (e) {
- reject(e);
- }
- reject(error);
- });
- });
- };
+export class BlLifeRechargeServices<TResponse = any, TRequestOptions = any> {
+ private request: IRequest;
+ constructor({ axiosConfig }: BlLifeRechargeServicesOptions<TResponse, TRequestOptions>) {
+ this.request = Request.create(axiosConfig);
}
async lifePayPhoneMesssageCodeLogin(body: PhoneMesssageCodeLoginInput, options?: RequestConfig) {
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 125ebe4..9bb5bd1 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -1,14 +1,7 @@
-import { AxiosRequestConfig } from 'axios';
+import { type RequestConfig } from 'senior-request';
-export interface IRequestOptions extends AxiosRequestConfig {}
-
-export interface IRequest {
- <T = any>(url: string, opts: IRequestOptions): Promise<T>;
-}
-
-export type BlLifeRechargeServicesOptions<T extends IRequest> = {
- request: T;
- axiosOptions?: AxiosRequestConfig;
+export type BlLifeRechargeServicesOptions<TResponse = any, TRequestOptions = any> = {
+ axiosConfig?: RequestConfig<TResponse, TRequestOptions>;
};
export type BlLifeRechargeAccountModelOptions = {
@@ -16,5 +9,8 @@
phoneNumber?: string;
};
-export type BlLifeRechargeOptions<T extends IRequest> = BlLifeRechargeServicesOptions<T> &
+export type BlLifeRechargeOptions<
+ TResponse = any,
+ TRequestOptions = any
+> = BlLifeRechargeServicesOptions<TResponse, TRequestOptions> &
BlLifeRechargeAccountModelOptions & {};
--
Gitblit v1.9.1