From 538e4f454ba3126ef92278ab9cb675adb9e3b287 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 27 三月 2025 09:30:55 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue | 11 +++++++++++
packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue | 2 ++
packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue | 10 +++++-----
packages/components/src/components/RechargeTipsView/RechargeTipsView.vue | 12 ++++++------
apps/taro/config/prod.js | 6 +++---
5 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/apps/taro/config/prod.js b/apps/taro/config/prod.js
index 7f97930..dfeba17 100644
--- a/apps/taro/config/prod.js
+++ b/apps/taro/config/prod.js
@@ -3,9 +3,9 @@
module.exports = {
env: {
NODE_ENV: '"production"',
- BASE_URL: '"https://api.81812333.com"',
- BASE_URL_H5: '"https://api.81812333.com"',
- BASE_URL_JX: '"https://api.jx818.com"',
+ BASE_URL: '"https://jfapi.81812333.com"',
+ BASE_URL_H5: '"https://jfapi.81812333.com"',
+ BASE_URL_JX: '"https://jfapi.81812333.com"',
WEMAP_KEY: 'DYRBZ-ZGPCF-X3OJN-N2AA3-JWUCE-HEBXJ',
WXPayAppId: '"wxf940ff1d35a98493"',
diff --git a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
index 9c3ddcd..4b3e585 100644
--- a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/phoneBillRecharge/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.editPhoneUserAccount}?id=${userAccountId}`,
+ });
+ } catch (error) {}
+}
</script>
diff --git a/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue b/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue
index 09d4ce7..eaa93a0 100644
--- a/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue
+++ b/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue
@@ -1,19 +1,19 @@
<template>
<div class="recharge-tips-view">
- <div class="recharge-tips-title">鍏呭�奸』鐭�</div>
- <div class="recharge-tips-content">
+ <!-- <div class="recharge-tips-title">鍏呭�奸』鐭�</div> -->
+ <!-- <div class="recharge-tips-content">
<div class="recharge-tips-top">
<slot name="tips-top">
*鍚屼竴鍙风爜鍏呭�兼湡闂淬�愬垏鍕垮骞冲彴閲嶅鍏呭�笺�戯紒锛侊紒鍦ㄤ笅鍗曞墠锛岃鍔″繀浠旂粏闃呰鍏憡鍐呭锛侊紒锛佽嫢鎺ュ埌闄岀敓鏉ョ數锛岃鍕胯交淇★紒锛侊紒
</slot>
</div>
- <!-- <div class="recharge-tips-list">
+ <div class="recharge-tips-list">
<div class="recharge-tips-item" v-for="(item, index) in props.tips" :key="index">
{{ index + 1 }}.{{ item }}
</div>
- </div> -->
- <RichContent :content="introInfo" size="small" />
- </div>
+ </div>
+ </div> -->
+ <RichContent :content="introInfo" size="small" />
</div>
</template>
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
index 516240a..196f20f 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
@@ -5,6 +5,7 @@
v-bind="props"
@go-pay="emit('goPay', $event)"
@paySuccess="emit('paySuccess', $event)"
+ @missName="emit('missName', $event)"
/>
</template>
@@ -30,6 +31,7 @@
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
(e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
provide(PhoneBillRechargeContextKey, {
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
index 433e3ab..c88cf46 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
@@ -160,6 +160,7 @@
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
(e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
const { lifePayPhoneRate } = useGetRate();
@@ -196,14 +197,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();
}
});
--
Gitblit v1.9.1