From 5dd9eb5d8a69fa8c2b66706434a6cc7748ff4786 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 三月 2025 14:31:52 +0800
Subject: [PATCH] fix: 二期需求
---
packages/services/api/typings.d.ts | 20 +++++++++++++++-----
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 1 +
packages/core/src/lifeRechargeServices.ts | 1 +
packages/components/src/hooks/index.ts | 2 +-
packages/services/api/LifePay.ts | 2 +-
packages/services/api/Account.ts | 2 +-
6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/packages/components/src/hooks/index.ts b/packages/components/src/hooks/index.ts
index 1f8861f..1849770 100644
--- a/packages/components/src/hooks/index.ts
+++ b/packages/components/src/hooks/index.ts
@@ -54,7 +54,7 @@
return await blLifeRecharge.services.getPhoneParValue({ showLoading: false });
},
select(data) {
- return data.phoneParValue ?? [];
+ return data?.phoneParValue ?? [];
},
placeholderData: () => ({} as PhoneParValueResponse),
});
diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index c825572..435a7c9 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -98,6 +98,7 @@
lifePayType: blLifeRecharge.constants.LifePayTypeEnum.WxPay,
openId: props.openId,
attach: Date.now().toString(),
+ payAppId: props.appId,
};
let res = await blLifeRecharge.services.getPayOrderForJsAPI(params);
return res;
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index c4d1300..69c431f 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -380,6 +380,7 @@
lifePayType?: LifeRechargeConstants.LifePayTypeEnum;
openId?: string;
attach?: string;
+ payAppId?: string;
}
export interface ModelPaymentMiniPay {
diff --git a/packages/services/api/Account.ts b/packages/services/api/Account.ts
index cafe3a1..e91fee7 100644
--- a/packages/services/api/Account.ts
+++ b/packages/services/api/Account.ts
@@ -301,7 +301,7 @@
/** life pay鎵嬫満楠岃瘉鐮佺櫥褰� POST /api/Account/LifePayPhoneMesssageCodeLogin */
export async function lifePayPhoneMesssageCodeLogin(
- body: API.PhoneMesssageCodeLoginInput,
+ body: API.LifePayPhoneMesssageCodeLoginInput,
options?: API.RequestConfig
) {
return request<string>('/api/Account/LifePayPhoneMesssageCodeLogin', {
diff --git a/packages/services/api/LifePay.ts b/packages/services/api/LifePay.ts
index 1a41c6e..0808f78 100644
--- a/packages/services/api/LifePay.ts
+++ b/packages/services/api/LifePay.ts
@@ -68,7 +68,7 @@
body: API.GetPayOrderForJsAPIInput,
options?: API.RequestConfig
) {
- return request<API.ModelPayPrePayId>('/api/LifePay/GetPayOrderForJsAPI', {
+ return request<API.ModelPaymentMiniPay>('/api/LifePay/GetPayOrderForJsAPI', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
diff --git a/packages/services/api/typings.d.ts b/packages/services/api/typings.d.ts
index e59b986..7724c53 100644
--- a/packages/services/api/typings.d.ts
+++ b/packages/services/api/typings.d.ts
@@ -5504,14 +5504,14 @@
interface ElectricSupportAreaChildCityListOutput {
cityName?: string;
cityParentId?: string;
- ciytId?: string;
+ cityId?: string;
}
interface ElectricSupportAreaListOutput {
childCityList?: ElectricSupportAreaChildCityListOutput[];
cityName?: string;
cityParentId?: string;
- ciytId?: string;
+ cityId?: string;
electricType?: string;
parValue?: string[];
rate?: number;
@@ -7794,6 +7794,7 @@
lifePayType?: LifePayTypeEnum;
openId?: string;
attach?: string;
+ payAppId?: string;
}
interface GetPermissionListResultDto {
@@ -12261,6 +12262,11 @@
type LifePayOrderTypeEnum = 10 | 20;
+ interface LifePayPhoneMesssageCodeLoginInput {
+ /** 鎵嬫満鍙� */
+ phoneNumber: string;
+ }
+
interface LifePayRateListOutput {
rateType?: LifePayRateTypeEnum;
rate?: number;
@@ -12700,9 +12706,13 @@
defaultValue?: any;
}
- interface ModelPayPrePayId {
- prepayId?: string;
- code?: string;
+ interface ModelPaymentMiniPay {
+ nonceStr?: string;
+ package?: string;
+ signType?: string;
+ paySign?: string;
+ timestamp?: string;
+ timeExpire?: string;
message?: string;
}
--
Gitblit v1.9.1