From c24cdd854e258712408a7904bdb401c49e3f07c1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 28 八月 2025 13:09:08 +0800
Subject: [PATCH] fix: 修改通道充值提示语
---
packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
packages/components/src/hooks/index.ts | 10 ++++++++--
2 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/packages/components/src/hooks/index.ts b/packages/components/src/hooks/index.ts
index b8ce406..6eca483 100644
--- a/packages/components/src/hooks/index.ts
+++ b/packages/components/src/hooks/index.ts
@@ -263,18 +263,24 @@
type UseSetUserAccountBySelectOptions = {
lifePayOrderType: MaybeRef<LifeRechargeConstants.LifePayOrderTypeEnum>;
onSetUserAccount: (currentUserAccount: UserAccountListOutput) => any;
+ getDefaultUserAccount?: (
+ userAccountList: UserAccountListOutput[]
+ ) => UserAccountListOutput | undefined;
};
export function useSetUserAccountBySelect({
lifePayOrderType,
onSetUserAccount,
+ getDefaultUserAccount = (data) => data[0],
}: UseSetUserAccountBySelectOptions) {
const { userAccountAllList } = useUserAccountAllList({
lifePayOrderType: lifePayOrderType,
onSuccess(data) {
if (data.length > 0) {
- const currentUserAccount = data[0];
- onSetUserAccount?.(currentUserAccount);
+ const currentUserAccount = getDefaultUserAccount(data);
+ if (currentUserAccount) {
+ onSetUserAccount?.(currentUserAccount);
+ }
}
},
});
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
index 9cc85e9..43e7e4c 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
@@ -13,7 +13,7 @@
direction="horizontal"
class="par-account-list"
v-if="userAccountAllList.length > 0"
- @change="handleUserAccountChange"
+ @change="_handleUserAccountChange"
>
<NutRadio
:label="item.id"
@@ -97,7 +97,7 @@
<ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
</template>
</ConfirmDialog>
- <NutToast :msg="state.msg" v-model:visible="state.show" type="warn" cover />
+ <NutToast :msg="state.msg" v-model:visible="state.show" type="warn" cover :duration="3000" />
</NutForm>
</template>
@@ -163,12 +163,30 @@
form.phone = currentUserAccount.content;
form.ispCode = currentUserAccountExtraProperties.ispCode;
form.name = currentUserAccountExtraProperties.name;
-
form.remark = currentUserAccount.remark;
-
changeIspCode(form.ispCode as any);
},
+ getDefaultUserAccount(userAccountList) {
+ const defaultUserAccount = userAccountList.find((x) => {
+ const currentUserAccountExtraProperties = JSON.parse(
+ x.extraProperties
+ ) as PhoneUserAccountExtraProperties;
+ return isCanRecharge(currentUserAccountExtraProperties.ispCode);
+ });
+ return defaultUserAccount;
+ },
});
+
+function _handleUserAccountChange(userAccountId: string) {
+ const currentUserAccount = userAccountAllList.value.find((x) => x.id === userAccountId);
+ const currentUserAccountExtraProperties = JSON.parse(
+ currentUserAccount.extraProperties
+ ) as PhoneUserAccountExtraProperties;
+ if (!checkCanRecharge(currentUserAccountExtraProperties.ispCode)) {
+ // return;
+ }
+ handleUserAccountChange(userAccountId);
+}
function handleAddUserAccount() {
goTo('step1');
@@ -244,11 +262,24 @@
const currentOrderNo = ref('');
+function isCanRecharge(ispCode: string) {
+ return ispCode !== blLifeRecharge.constants.IspCode.yidong;
+}
+
+function checkCanRecharge(ispCode: string) {
+ if (!isCanRecharge(ispCode)) {
+ //閫氶亾姝ｅ湪鍗囩骇锛岀粰鎮ㄥ甫鏉ヤ笉渚垮敖鎯呰皡瑙�
+ state.msg =
+ '灏婃暚鐨勭敤鎴凤紝涓烘彁渚涙洿瀹夊叏銆佺ǔ瀹氱殑鍏呭�兼湇鍔★紝绉诲姩鍏呭�奸�氶亾姝ｅ湪杩涜鍗囩骇缁存姢锛岀淮鎶ゆ湡闂存殏鏃犳硶鍙戣捣鍏呭��';
+ state.show = true;
+ return false;
+ }
+ return true;
+}
+
async function goPay() {
try {
- if (form.ispCode === blLifeRecharge.constants.IspCode.yidong) {
- state.msg = '鏆備笉鏀寔绉诲姩鍙风爜鍏呭��';
- state.show = true;
+ if (!checkCanRecharge(form.ispCode)) {
return;
}
let params: LifePhoneDataCreateLifePayOrderInput = {
--
Gitblit v1.9.1