From 3703bdcb3e0eef4428fb6069649622dd3c60d2c8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 25 二月 2025 14:30:56 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 5 ++
packages/components/src/components/Card/OrderCardItem.vue | 3 +
packages/components/src/utils/common.ts | 10 +++--
packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue | 1
packages/components/src/styles/orderCard.scss | 8 ++++
packages/components/src/views/Order/components/ElectricOrder.vue | 4 +-
packages/components/src/views/Order/components/PhoneOrder.vue | 4 +-
apps/taro/src/styles/nut.scss | 8 ++++
packages/core/src/lifeRechargeServices.ts | 26 ++++++++++++
packages/core/src/types.ts | 1
10 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/apps/taro/src/styles/nut.scss b/apps/taro/src/styles/nut.scss
index ee5295d..ba3b1f1 100644
--- a/apps/taro/src/styles/nut.scss
+++ b/apps/taro/src/styles/nut.scss
@@ -167,4 +167,12 @@
.pro-form-item-tips {
word-break: break-all;
}
+
+ .model-wrapper {
+ .model-footer-wrapper {
+ .nut-button {
+ border-width: 0;
+ }
+ }
+ }
}
diff --git a/packages/components/src/components/Card/OrderCardItem.vue b/packages/components/src/components/Card/OrderCardItem.vue
index f9ed492..3979a54 100644
--- a/packages/components/src/components/Card/OrderCardItem.vue
+++ b/packages/components/src/components/Card/OrderCardItem.vue
@@ -1,5 +1,5 @@
<template>
- <div class="order-card-item">
+ <div class="order-card-item" :class="{ danger }">
<div class="order-card-item-label" :style="{ width: labelWidth, textAlign: textAlign }">
<slot name="label">{{ label }}</slot>
</div>
@@ -19,6 +19,7 @@
value: any;
labelWidth?: any;
textAlign?: any;
+ danger?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
diff --git a/packages/components/src/styles/orderCard.scss b/packages/components/src/styles/orderCard.scss
index e1a853c..fa5da9f 100644
--- a/packages/components/src/styles/orderCard.scss
+++ b/packages/components/src/styles/orderCard.scss
@@ -1,3 +1,5 @@
+@use './common.scss' as *;
+
.order-card {
border: 1px solid #e8e8e8;
border-radius: 12px;
@@ -47,4 +49,10 @@
flex: 1;
min-width: 0;
}
+
+ &.danger {
+ .order-card-item-value {
+ color: boleGetCssVar('color', 'danger');
+ }
+ }
}
diff --git a/packages/components/src/utils/common.ts b/packages/components/src/utils/common.ts
index 7b0b23a..cc890c5 100644
--- a/packages/components/src/utils/common.ts
+++ b/packages/components/src/utils/common.ts
@@ -131,11 +131,13 @@
payStatus?: LifeRechargeConstants.LifePayStatusEnum,
lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum
) {
+ console.log('payStatus: ', payStatus);
if (
- lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
- payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�
+ (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
+ payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
+ payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
) {
- return '鍏呭�兼垚鍔�';
+ return '鏀粯鎴愬姛';
}
if (payStatus === LifeRechargeConstants.LifePayStatusEnum.宸查��娆�) {
return '宸查��娆�';
@@ -144,7 +146,7 @@
lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.宸插畬鎴� &&
payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�
) {
- return '鏀粯鎴愬姛';
+ return '鍏呭�兼垚鍔�';
}
return '';
}
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index a77b9f8..3ad6dcb 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -20,9 +20,9 @@
label="涓嬪崟鏃堕棿:"
:value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
/>
- <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" />
+ <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" danger />
<OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
- <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" />
+ <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
<OrderCardItem
label="鏀粯鏃堕棿:"
:value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index c48d0f7..62f38b1 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/packages/components/src/views/Order/components/PhoneOrder.vue
@@ -14,9 +14,9 @@
label="涓嬪崟鏃堕棿:"
:value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
/>
- <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" />
+ <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" danger />
<OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
- <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" />
+ <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
<OrderCardItem
label="鏀粯鏃堕棿:"
:value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
index eaa5392..c665003 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
@@ -179,7 +179,6 @@
'鍏呭�兼湡闂达紝鑻ュ悓涓�鍙风爜娆鹃」鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紱涓诲壇鍗′笉鍙悓鏃跺厖鍊笺�傚洜涓婅堪鎿嶄綔瀵艰嚧鐨勮祫閲戞崯澶憋紝鐢辩敤鎴疯嚜琛屾壙鎷呫��',
'鏈钩鍙拌瘽璐瑰厖鍊兼湇鍔′笉閫傜敤浜庡凡鍋滄満鍙风爜銆傜數淇″彿鐮佽嫢鏈夋瑺璐癸紝涔熸棤娉曞畬鎴愬厖鍊笺�傜數淇″凡瀹屾垚缁存姢鐨勫尯鍩熷寘鎷細骞夸笢銆佹睙鑻忋�佹箹鍖椼�佸洓宸濄�佹睙瑗裤�佹渤鍖椼�佹渤鍗椼�佺寤恒�佽窘瀹併�傚叾瀹冨尯鍩熸鍦ㄥ垎鎵规杩涜缁存姢涓紝鍦ㄦ鏈熼棿鍙兘浼氬嚭鐜板厖鍊间笉鎴愬姛骞惰嚜鍔ㄩ��娆剧殑鎯呭喌锛岃鎮ㄨ皡瑙ｃ��',
'濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
- '鍞悗鏈嶅姟鏈熶负鍏呭�煎畬鎴愪箣鏃ヨ捣3澶┿�傜敵璇峰敭鍚庢湇鍔℃椂锛岄渶鎻愪緵褰曞睆璇佹嵁锛岃纭鎺ュ彈姝よ姹傚悗鍐嶄笅鍗曪紝閫炬湡骞冲彴涓嶅啀鍙楃悊鍞悗鐢宠銆�',
'鍏呭�煎彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞界數瀛愬彂绁ㄣ��',
];
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 55fc42a..cb77357 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -96,7 +96,10 @@
璇ヤ骇鍝佷负鎱㈠厖妯″紡锛�0-72灏忔椂鍐呭埌璐︼紝浠嬫剰璇峰嬁浠樻锛佸厖鍊煎墠璇蜂粩缁嗛槄璇诲厖鍊奸』鐭ワ紒
</template>
<template #info>
- <ConfirmDialogInfoItem label="鐢电綉绫诲瀷" content="鍥藉鐢电綉" />
+ <ConfirmDialogInfoItem
+ label="鐢电綉绫诲瀷"
+ :content="blLifeRecharge.constants.ElectricTypeText[form.electricType]"
+ />
<ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
<ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
<ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index 753b3b0..cba3e8f 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -6,8 +6,32 @@
export class BlLifeRechargeServices<T extends IRequest> {
private request: T;
- constructor({ request }: BlLifeRechargeServicesOptions<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);
+ });
+ });
+ };
}
async lifePayPhoneMesssageCodeLogin(body: PhoneMesssageCodeLoginInput, options?: RequestConfig) {
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 7cdf304..125ebe4 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -8,6 +8,7 @@
export type BlLifeRechargeServicesOptions<T extends IRequest> = {
request: T;
+ axiosOptions?: AxiosRequestConfig;
};
export type BlLifeRechargeAccountModelOptions = {
--
Gitblit v1.9.1