From 8f7bae4a2b70bb3aeb1c2289a7f5dd6a826e88de Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 01 四月 2025 09:55:38 +0800
Subject: [PATCH] fix: 四期需求
---
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 2 ++
apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue | 11 +++++++++++
packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue | 10 +++++-----
packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue | 10 +++++-----
apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue | 11 +++++++++++
packages/components/src/views/GasBillRecharge/GasBillRecharge.vue | 3 +++
6 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
index 773dc57..d1ea12e 100644
--- a/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
@@ -12,6 +12,7 @@
:isFocus="isFocus"
:showAliPay="!isInWeChat"
:showWeixinPay="isInWeChat"
+ @missName="handleMissName"
/>
</ContentScrollView>
</template>
@@ -23,6 +24,7 @@
import { isInAlipay, isInWeChat, isH5, isWeb } from '@/utils/env';
import { useUser, useFocus, useEnsureOpenId } from '@/hooks';
import { WXPayAppId } from '@/constants';
+import { Message } from '@/utils';
defineOptions({
name: 'InnerPage',
@@ -45,4 +47,13 @@
url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟}`,
});
}
+
+async function handleMissName(userAccountId: string) {
+ try {
+ await Message.confirm({ message: '璇峰厛瀹屽杽鎵嬫満鍙锋墍灞炴満涓诲鍚�' });
+ RouteHelper.navigateTo({
+ url: `${RouterPath.editElectricUserAccount}?id=${userAccountId}`,
+ });
+ } catch (error) {}
+}
</script>
diff --git a/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
index 2bdc9a8..a545c37 100644
--- a/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
@@ -12,6 +12,7 @@
:isFocus="isFocus"
:showAliPay="!isInWeChat"
:showWeixinPay="isInWeChat"
+ @missName="handleMissName"
/>
</ContentScrollView>
</template>
@@ -23,6 +24,7 @@
import { isInAlipay, isInWeChat, isH5, isWeb } from '@/utils/env';
import { useUser, useFocus, useEnsureOpenId } from '@/hooks';
import { WXPayAppId } from '@/constants';
+import { Message } from '@/utils';
defineOptions({
name: 'InnerPage',
@@ -45,4 +47,13 @@
url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟}`,
});
}
+
+async function handleMissName(userAccountId: string) {
+ try {
+ await Message.confirm({ message: '璇峰厛瀹屽杽鎵嬫満鍙锋墍灞炴満涓诲鍚�' });
+ RouteHelper.navigateTo({
+ url: `${RouterPath.editGasUserAccount}?id=${userAccountId}`,
+ });
+ } catch (error) {}
+}
</script>
diff --git a/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue b/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue
index 4068c98..43369c5 100644
--- a/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue
+++ b/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue
@@ -6,6 +6,7 @@
v-bind="props"
@go-pay="emit('goPay', $event)"
@paySuccess="emit('paySuccess', $event)"
+ @missName="emit('missName', $event)"
/>
</template>
@@ -33,6 +34,7 @@
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
(e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
const preSetForm = reactive({
@@ -42,6 +44,7 @@
gasAccount: '',
remark: '',
areaList: [] as string[],
+ name: '',
});
provide(GasBillRechargeContextKey, {
diff --git a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
index 4e4ed7a..36439cc 100644
--- a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
+++ b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
@@ -136,6 +136,7 @@
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
(e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
const { goTo } = useGasBillRechargeContext();
@@ -207,14 +208,13 @@
const formRef = ref<any>(null);
function handleSubmit() {
- if (!form.name) {
- state.show = true;
- state.msg = '璇峰厛瀹屽杽鎵�灞炴埛涓诲鍚�';
- return;
- }
if (!formRef.value) return;
formRef.value.validate().then(({ valid, errors }: any) => {
if (valid) {
+ if (!form.name) {
+ emit('missName', form.currentUserAccountId);
+ return;
+ }
recharge();
}
});
diff --git a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
index e41b479..1e6c6c7 100644
--- a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
+++ b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
@@ -138,6 +138,7 @@
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
(e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
const { goTo } = useElectricBillRechargeContext();
@@ -215,14 +216,13 @@
const formRef = ref<any>(null);
function handleSubmit() {
- if (!form.name) {
- state.show = true;
- state.msg = '璇峰厛瀹屽杽鎵�灞炴埛涓诲鍚�';
- return;
- }
if (!formRef.value) return;
formRef.value.validate().then(({ valid, errors }: any) => {
if (valid) {
+ if (!form.name) {
+ emit('missName', form.currentUserAccountId);
+ return;
+ }
recharge();
}
});
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 3bc5c22..83e9ab9 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -5,6 +5,7 @@
v-bind="props"
@go-pay="emit('goPay', $event)"
@paySuccess="emit('paySuccess', $event)"
+ @missName="emit('missName', $event)"
/>
</template>
@@ -27,6 +28,7 @@
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
(e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
const stepperInfo = useStepper(['step1', 'step2'], 'step2');
--
Gitblit v1.9.1