From 866879aaf4b209e4820d21d11f9569e72dd6e0a5 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 三月 2025 18:00:26 +0800
Subject: [PATCH] fix: 二期需求

---
 packages/components/src/views/electricBillRecharge/electricBillRecharge.vue   |   12 
 packages/components/src/components/Card/AccountAddCard.vue                    |   11 
 packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue |   82 ++++++
 apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue              |   13 +
 apps/taro/src/app.config.ts                                                   |    1 
 packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep1.vue    |   61 ++++
 apps/taro/src/constants/router.ts                                             |    1 
 apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.config.ts  |    3 
 packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue         |  197 +--------------
 packages/components/src/components/Dialog/ConfirmDialogInfoItem.vue           |   20 +
 packages/components/src/styles/components.scss                                |   18 +
 packages/core/src/lifeRecharge.ts                                             |    6 
 packages/components/src/styles/index.scss                                     |    1 
 packages/components/src/styles/card.scss                                      |   69 +++++
 packages/core-vue/package.json                                                |    1 
 packages/components/src/views/PhoneBillRecharge/context.ts                    |   27 ++
 apps/taro/src/subpackages/recharge/rechargeResult/rechargeResult.vue          |    6 
 packages/core/package.json                                                    |    1 
 apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.vue        |   14 +
 packages/components/src/components/Card/AccountList.vue                       |    9 
 packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue    |  192 ++++++++++++++
 packages/components/src/constants/index.ts                                    |    3 
 apps/taro/src/pages/home/index.vue                                            |    2 
 packages/components/src/components/Card/AccountCard.vue                       |   26 ++
 packages/components/src/views/RechargeResultView/RechargeResultView.vue       |    3 
 25 files changed, 586 insertions(+), 193 deletions(-)

diff --git a/apps/taro/src/app.config.ts b/apps/taro/src/app.config.ts
index b6e2fa8..f14357e 100644
--- a/apps/taro/src/app.config.ts
+++ b/apps/taro/src/app.config.ts
@@ -56,6 +56,7 @@
       pages: [
         'phoneBillRecharge/phoneBillRecharge',
         'electricBillRecharge/electricBillRecharge',
+        'gasBillRecharge/gasBillRecharge',
         'selectPayType/selectPayType',
         'rechargeResult/rechargeResult',
         'rechargeElectricResult/rechargeElectricResult',
diff --git a/apps/taro/src/constants/router.ts b/apps/taro/src/constants/router.ts
index 1445fda..f62f6dc 100644
--- a/apps/taro/src/constants/router.ts
+++ b/apps/taro/src/constants/router.ts
@@ -10,6 +10,7 @@
 
   phoneBillRecharge = '/subpackages/recharge/phoneBillRecharge/phoneBillRecharge',
   electricBillRecharge = '/subpackages/recharge/electricBillRecharge/electricBillRecharge',
+  gasBillRecharge = '/subpackages/recharge/gasBillRecharge/gasBillRecharge',
   order = '/subpackages/order/order/order',
   selectPayType = '/subpackages/recharge/selectPayType/selectPayType',
   rechargeResult = '/subpackages/recharge/rechargeResult/rechargeResult',
diff --git a/apps/taro/src/pages/home/index.vue b/apps/taro/src/pages/home/index.vue
index 8fdfb9a..ddcb1e6 100644
--- a/apps/taro/src/pages/home/index.vue
+++ b/apps/taro/src/pages/home/index.vue
@@ -33,7 +33,7 @@
 });
 const goGasBillRecharge = useAccessLogin(() => {
   Taro.navigateTo({
-    url: `${RouterPath.electricBillRecharge}`,
+    url: `${RouterPath.gasBillRecharge}`,
   });
 });
 </script>
diff --git a/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
new file mode 100644
index 0000000..81c8793
--- /dev/null
+++ b/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>鐕冩皵鍏呭��</div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: 'InnerPage',
+});
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+</style>
diff --git a/apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.config.ts b/apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+  disableScroll: true,
+});
diff --git a/apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.vue b/apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.vue
new file mode 100644
index 0000000..a801c75
--- /dev/null
+++ b/apps/taro/src/subpackages/recharge/gasBillRecharge/gasBillRecharge.vue
@@ -0,0 +1,14 @@
+<template>
+  <PageLayout title="鐕冩皵鍏呭��" class="gasBillRecharge-page-wrapper" hasBorder>
+    <InnerPage />
+  </PageLayout>
+</template>
+
+<script setup lang="ts">
+import { PageLayout } from '@/components';
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+  name: 'gasBillRecharge',
+});
+</script>
diff --git a/apps/taro/src/subpackages/recharge/rechargeResult/rechargeResult.vue b/apps/taro/src/subpackages/recharge/rechargeResult/rechargeResult.vue
index 48002a0..15e43fd 100644
--- a/apps/taro/src/subpackages/recharge/rechargeResult/rechargeResult.vue
+++ b/apps/taro/src/subpackages/recharge/rechargeResult/rechargeResult.vue
@@ -1,7 +1,7 @@
 <template>
   <PageLayout title="鍏呭�兼垚鍔�" class="rechargeResult-page-wrapper" hasBorder>
     <ContentScrollView>
-      <RechargeResultView style="margin-top: 40px" @go-back-home="goHome()" />
+      <RechargeResultView style="margin-top: 40px" @go-back-home="goHome()" :orderNo="orderNo" />
     </ContentScrollView>
   </PageLayout>
 </template>
@@ -10,8 +10,12 @@
 import { PageLayout } from '@/components';
 import { goHome } from '@/utils';
 import { RechargeResultView } from '@life-payment/components';
+import Taro from '@tarojs/taro';
 
 defineOptions({
   name: 'rechargeResult',
 });
+
+const router = Taro.useRouter();
+const orderNo = router.params?.orderNo ?? '';
 </script>
diff --git a/packages/components/src/components/Card/AccountAddCard.vue b/packages/components/src/components/Card/AccountAddCard.vue
new file mode 100644
index 0000000..d0e1d5b
--- /dev/null
+++ b/packages/components/src/components/Card/AccountAddCard.vue
@@ -0,0 +1,11 @@
+<template>
+  <div class="account-add-card"><Uploader /> 鏂板鎵嬫満鍙�</div>
+</template>
+
+<script setup lang="ts">
+import { Uploader } from '@nutui/icons-vue-taro';
+
+defineOptions({
+  name: 'AccountAddCard',
+});
+</script>
diff --git a/packages/components/src/components/Card/AccountCard.vue b/packages/components/src/components/Card/AccountCard.vue
new file mode 100644
index 0000000..9ebfb2f
--- /dev/null
+++ b/packages/components/src/components/Card/AccountCard.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="account-card">
+    <div class="account-card-top">
+      <div class="account-card-title">{{ title }}</div>
+      <div class="account-card-actions">
+        <slot name="action" />
+      </div>
+    </div>
+    <div class="account-card-content">{{ content }}</div>
+    <div class="account-card-remark">{{ remark }}</div>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: 'AccountCard',
+});
+
+type Props = {
+  title?: string;
+  content?: string;
+  remark?: string;
+};
+
+const props = withDefaults(defineProps<Props>(), {});
+</script>
diff --git a/packages/components/src/components/Card/AccountList.vue b/packages/components/src/components/Card/AccountList.vue
new file mode 100644
index 0000000..238b5ab
--- /dev/null
+++ b/packages/components/src/components/Card/AccountList.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="par-account-list"></div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: 'AccountList',
+});
+</script>
diff --git a/packages/components/src/components/Dialog/ConfirmDialogInfoItem.vue b/packages/components/src/components/Dialog/ConfirmDialogInfoItem.vue
index b8c3dda..619150e 100644
--- a/packages/components/src/components/Dialog/ConfirmDialogInfoItem.vue
+++ b/packages/components/src/components/Dialog/ConfirmDialogInfoItem.vue
@@ -1,11 +1,16 @@
 <template>
   <div class="confirm-dialog-content-info-item" :class="{ danger }">
-    <div class="confirm-dialog-content-info-item-label">{{ label }}</div>
+    <div class="confirm-dialog-content-info-item-label" :style="{ width: _labelWidth }">
+      {{ label }}
+    </div>
     <div class="confirm-dialog-content-info-item-content">{{ content }}</div>
   </div>
 </template>
 
 <script setup lang="ts">
+import Taro from '@tarojs/taro';
+import { computed } from 'vue';
+
 defineOptions({
   name: 'ConfirmDialogInfoItem',
 });
@@ -14,7 +19,18 @@
   label?: string;
   content?: string | number;
   danger?: boolean;
+  labelWidth?: string | number;
 };
 
-const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {
+  labelWidth: 'auto',
+});
+
+const _labelWidth = computed(() => {
+  if (typeof props.labelWidth === 'string') {
+    return props.labelWidth;
+  }
+
+  return Taro.pxTransform(props.labelWidth);
+});
 </script>
diff --git a/packages/components/src/constants/index.ts b/packages/components/src/constants/index.ts
index 70fec56..071f100 100644
--- a/packages/components/src/constants/index.ts
+++ b/packages/components/src/constants/index.ts
@@ -23,3 +23,6 @@
    */
   Desc,
 }
+
+export const CustomerServicePhone = '16505012333';
+export const CustomerServiceTips = `濡傚厖鍊艰繃绋嬩腑閬囧埌闂锛岃鑱旂郴瀹㈡湇 ${CustomerServicePhone}锛堝懆涓�鍒板懆浜� 9:00-17:30锛塦;
diff --git a/packages/components/src/styles/card.scss b/packages/components/src/styles/card.scss
new file mode 100644
index 0000000..ed333a1
--- /dev/null
+++ b/packages/components/src/styles/card.scss
@@ -0,0 +1,69 @@
+@use './common.scss' as *;
+
+.account-add-card {
+  border-radius: 16px;
+  min-height: 120px;
+  border: 1px solid #e8e8e8;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32px;
+  color: boleGetCssVar('color', 'primary');
+}
+
+.account-card {
+  border-radius: 16px;
+  border: 1px solid #e8e8e8;
+  padding: 28px;
+
+  .account-card-top {
+    display: flex;
+    font-size: 28px;
+    line-height: 32px;
+    align-items: center;
+    margin-bottom: 32px;
+
+    .account-card-title {
+      flex: 1;
+      min-width: 0;
+      @include ellipsis;
+      color: boleGetCssVar('text-color', 'primary');
+    }
+
+    .account-card-actions {
+      display: flex;
+      align-items: center;
+
+      .account-card-action {
+        color: boleGetCssVar('color', 'primary');
+      }
+
+      .account-card-action + .account-card-action {
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .account-card-content {
+    font-size: 36px;
+    font-weight: bold;
+    line-height: 48px;
+    align-items: center;
+    margin-bottom: 32px;
+    color: boleGetCssVar('text-color', 'primary');
+    @include ellipsis;
+  }
+
+  .account-card-remark {
+    font-size: 28px;
+    line-height: 32px;
+    color: boleGetCssVar('text-color', 'secondary');
+    @include ellipsis;
+  }
+}
+
+.par-account-list {
+  .nut-radio--button {
+    margin-bottom: 20px !important;
+  }
+}
diff --git a/packages/components/src/styles/components.scss b/packages/components/src/styles/components.scss
index 4a4951f..0499287 100644
--- a/packages/components/src/styles/components.scss
+++ b/packages/components/src/styles/components.scss
@@ -50,6 +50,7 @@
       .confirm-dialog-content-info-item-label {
         color: boleGetCssVar('text-color', 'regular');
         margin-right: 12px;
+        text-align: left;
       }
 
       .confirm-dialog-content-info-item-content {
@@ -110,6 +111,14 @@
     line-height: 48px;
   }
 
+  .recharge-result-view-subtitle {
+    font-size: 28px;
+    color: boleGetCssVar('text-color', 'primary');
+    margin-bottom: 24px;
+    text-align: center;
+    line-height: 32px;
+  }
+
   .recharge-result-view-tips {
     margin-bottom: 24px;
     font-size: 32px;
@@ -118,12 +127,19 @@
   }
 
   .recharge-result-view-warning {
-    margin-bottom: 40px;
+    margin-bottom: 24px;
     font-size: 24px;
     color: boleGetCssVar('color', 'warning');
     line-height: 32px;
   }
 
+  .recharge-result-view-customerService {
+    margin-bottom: 40px;
+    font-size: 24px;
+    color: boleGetCssVar('text-color', 'primary');
+    line-height: 32px;
+  }
+
   .recharge-result-view-btn-wrapper {
     display: flex;
     justify-content: center;
diff --git a/packages/components/src/styles/index.scss b/packages/components/src/styles/index.scss
index 8ba9564..2e31249 100644
--- a/packages/components/src/styles/index.scss
+++ b/packages/components/src/styles/index.scss
@@ -2,6 +2,7 @@
 @use './var.scss' as *;
 @use './function.scss' as *;
 @use './orderCard.scss' as *;
+@use './card.scss' as *;
 @use './nut.scss' as *;
 @use './layout.scss' as *;
 @use './rechargeGrid.scss' as *;
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
index 1e4764e..5bf3816 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
@@ -1,111 +1,18 @@
 <template>
-  <NutForm
-    :model-value="form"
-    ref="formRef"
-    :rules="rules"
-    label-position="top"
-    class="order-bill-recharge phone"
-  >
-    <NutFormItem label="閫夋嫨杩愯惀鍟�:" class="bole-form-item" prop="ispCode" required>
-      <NutRadioGroup v-model="form.ispCode" direction="horizontal" @change="changeIspCode">
-        <BlRadio
-          :label="key"
-          v-for="(val, key) in BlLifeRecharge.constants.IspCodeText"
-          :key="key"
-          >{{ val }}</BlRadio
-        >
-      </NutRadioGroup>
-    </NutFormItem>
-    <NutFormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
-      <NutInput
-        v-model.trim="form.phone"
-        class="bole-input-text"
-        placeholder="璇峰～鍐欐偍闇�瑕佸厖鍊肩殑鎵嬫満鍙风爜"
-        type="text"
-      />
-    </NutFormItem>
-    <NutFormItem
-      label="濮撳悕"
-      class="bole-form-item"
-      prop="name"
-      required
-      v-if="form.ispCode === BlLifeRecharge.constants.IspCode.dianxin"
-    >
-      <NutInput
-        v-model.trim="form.name"
-        class="bole-input-text"
-        placeholder="璇峰～鍐欐偍鐨勫鍚�"
-        type="text"
-      />
-    </NutFormItem>
-    <NutFormItem label="閫夋嫨鍏呭�奸噾棰�" class="bole-form-item" prop="parValue" required>
-      <NutRadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
-        <NutRadio
-          :label="Number(item)"
-          :key="item"
-          shape="button"
-          v-for="item in parValueList"
-          class="parValue-item"
-        >
-          <div class="parValue-item-inner">
-            <div class="amount-wrapper">
-              <div class="amount">{{ item }}</div>
-              <div class="unit">鍏�</div>
-            </div>
-            <div class="price-wrapper">
-              <div class="price-text">鎶樺悗</div>
-              <div class="price">
-                {{ blLifeRecharge.getRechargeParValue(item, lifePayPhoneRate) }}鍏�
-              </div>
-            </div>
-            <div class="discountTag">{{ lifePayPhoneRate * 100 }}鎶�</div>
-          </div>
-        </NutRadio>
-      </NutRadioGroup>
-    </NutFormItem>
-    <div class="common-content">
-      <nut-button class="recharge-button" type="primary" @click="handleSubmit">
-        <div class="recharge-button-inner">
-          <div>锟{ realParValue }}</div>
-          <div class="recharge-button-text">绔嬪嵆鍏呭��</div>
-        </div>
-      </nut-button>
-      <RechargeTipsView :tips="tips" />
-    </div>
-    <ConfirmDialog v-model:visible="confirmDialogVisible" @ok="goPay">
-      <template #info>
-        <ConfirmDialogInfoItem label="鍏呭�艰处鍙�" :content="form.phone" />
-        <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
-        <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
-        <ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
-      </template>
-    </ConfirmDialog>
-  </NutForm>
+  <PhoneBillRechargeStep1 v-if="current === 'step1'" />
+  <PhoneBillRechargeStep2
+    v-else-if="current === 'step2'"
+    v-bind="props"
+    @go-pay="emit('goPay', $event)"
+  />
 </template>
 
 <script setup lang="ts">
-import {
-  Form as NutForm,
-  FormItem as NutFormItem,
-  RadioGroup as NutRadioGroup,
-  Radio as NutRadio,
-  Input as NutInput,
-  Button as NutButton,
-} from '@nutui/nutui-taro';
-import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
-import { reactive, ref, computed } from 'vue';
-import BlRadio from '../../components/Radio/Radio.vue';
-import { FormValidator } from '../../utils';
-import {
-  useLifeRechargeContext,
-  BlLifeRecharge,
-  LifePhoneDataCreateLifePayOrderInput,
-  LifeRechargeConstants,
-} from '@life-payment/core-vue';
-import RechargeTipsView from '../../components/RechargeTipsView/RechargeTipsView.vue';
-import ConfirmDialog from '../../components/Dialog/ConfirmDialog.vue';
-import ConfirmDialogInfoItem from '../../components/Dialog/ConfirmDialogInfoItem.vue';
-import { useGetRate, useGetPhoneParValue } from '../../hooks';
+import { computed, provide } from 'vue';
+import { useStepper } from 'senin-mini/hooks';
+import { PhoneBillRechargeContextKey } from './context';
+import PhoneBillRechargeStep1 from './PhoneBillRechargeStep1.vue';
+import PhoneBillRechargeStep2 from './PhoneBillRechargeStep2.vue';
 
 defineOptions({
   name: 'PhoneBillRecharge',
@@ -119,88 +26,14 @@
   isDev: false,
 });
 
-const form = reactive({
-  ispCode: '',
-  phone: '',
-  parValue: 0,
-  name: '',
-});
+const stepperInfo = useStepper(['step1', 'step2'], 'step2');
+const current = computed(() => stepperInfo.current.value);
 
 const emit = defineEmits<{
   (e: 'goPay', orderNo: string): void;
 }>();
 
-const { lifePayPhoneRate } = useGetRate();
-const { phoneParValueList } = useGetPhoneParValue();
-
-const parValueList = computed(
-  () => phoneParValueList.value.find((x) => x.ispCode === form.ispCode)?.parValue ?? []
-);
-
-function changeIspCode(val: LifeRechargeConstants.IspCode) {
-  const phoneParValueItem = phoneParValueList.value.find((x) => x.ispCode === val);
-  if (phoneParValueItem.parValue.every((x) => Number(x) !== form.parValue)) {
-    form.parValue = 0;
-  }
-}
-
-const realParValue = computed(() =>
-  blLifeRecharge.getRechargeParValue(form.parValue, lifePayPhoneRate.value)
-);
-const discountParValue = computed(() => form.parValue - Number(realParValue.value));
-
-const { blLifeRecharge } = useLifeRechargeContext();
-
-const rules = reactive<FormRules>({
-  ispCode: [{ required: true, message: '璇烽�夋嫨杩愯惀鍟�' }],
-  phone: [
-    { required: true, message: '璇疯緭鍏ュ厖鍊兼墜鏈哄彿' },
-    { validator: FormValidator.validatorPhoneNumber, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙�' },
-  ],
-  name: [{ required: true, message: '璇疯緭鍏ュ鍚�' }],
-  parValue: [
-    { required: true, message: '璇烽�夋嫨鍏呭�奸噾棰�', validator: FormValidator.validatorNumberNotNull },
-  ],
+provide(PhoneBillRechargeContextKey, {
+  ...stepperInfo,
 });
-
-const formRef = ref<any>(null);
-
-function handleSubmit() {
-  if (!formRef.value) return;
-  formRef.value.validate().then(({ valid, errors }: any) => {
-    if (valid) {
-      recharge();
-    }
-  });
-}
-
-const tips = [
-  '骞冲彴鎻愪緵鎱㈠厖鏈嶅姟锛岃鍗曟彁浜ゅ悗锛岃瘽璐瑰皢浜�0 - 24灏忔椂鍐呭埌璐︺�傝嫢鏈兘鎸夋椂鍒拌处锛岀郴缁熷皢鑷姩鍙戣捣閫�娆俱��',
-  '鍏呭�兼湡闂达紝鑻ュ悓涓�鍙风爜娆鹃」鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紱涓诲壇鍗′笉鍙悓鏃跺厖鍊笺�傚洜涓婅堪鎿嶄綔瀵艰嚧鐨勮祫閲戞崯澶憋紝鐢辩敤鎴疯嚜琛屾壙鎷呫��',
-  '鏈钩鍙拌瘽璐瑰厖鍊兼湇鍔′笉閫傜敤浜庡凡鍋滄満鍙风爜銆傜數淇″彿鐮佽嫢鏈夋瑺璐癸紝涔熸棤娉曞畬鎴愬厖鍊笺�傜數淇″凡瀹屾垚缁存姢鐨勫尯鍩熷寘鎷細骞夸笢銆佹睙鑻忋�佹箹鍖椼�佸洓宸濄�佹睙瑗裤�佹渤鍖椼�佹渤鍗椼�佺寤恒�佽窘瀹併�傚叾瀹冨尯鍩熸鍦ㄥ垎鎵规杩涜缁存姢涓紝鍦ㄦ鏈熼棿鍙兘浼氬嚭鐜板厖鍊间笉鎴愬姛骞惰嚜鍔ㄩ��娆剧殑鎯呭喌锛岃鎮ㄨ皡瑙ｃ��',
-  '濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
-  '鍏呭�煎彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞界數瀛愬彂绁ㄣ��',
-];
-
-const confirmDialogVisible = ref(false);
-
-function recharge() {
-  confirmDialogVisible.value = true;
-}
-
-async function goPay() {
-  try {
-    let params: LifePhoneDataCreateLifePayOrderInput = {
-      userId: blLifeRecharge.accountModel.userId,
-      productData: {
-        ispCode: form.ispCode,
-        parValue: props.isDev ? 0.1 : form.parValue,
-        phone: form.phone,
-        name: form.ispCode === BlLifeRecharge.constants.IspCode.dianxin ? form.name : '',
-      },
-    };
-    let res = await blLifeRecharge.services.createLifePayPhoneOrder(params);
-    emit('goPay', res.orderNo);
-  } catch (error) {}
-}
 </script>
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue
new file mode 100644
index 0000000..fb99f51
--- /dev/null
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeBaseForm.vue
@@ -0,0 +1,82 @@
+<template>
+  <NutForm
+    :model-value="form"
+    ref="formRef"
+    :rules="rules"
+    label-position="top"
+    class="order-bill-recharge phone"
+  >
+    <NutFormItem label="閫夋嫨杩愯惀鍟�:" class="bole-form-item" prop="ispCode" required>
+      <NutRadioGroup v-model="form.ispCode" direction="horizontal">
+        <BlRadio
+          :label="key"
+          v-for="(val, key) in BlLifeRecharge.constants.IspCodeText"
+          :key="key"
+          >{{ val }}</BlRadio
+        >
+      </NutRadioGroup>
+    </NutFormItem>
+    <NutFormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
+      <NutInput
+        v-model.trim="form.phone"
+        class="bole-input-text"
+        placeholder="璇峰～鍐欐偍闇�瑕佸厖鍊肩殑鎵嬫満鍙风爜"
+        type="text"
+      />
+    </NutFormItem>
+    <NutFormItem
+      label="濮撳悕"
+      class="bole-form-item"
+      prop="name"
+      required
+      v-if="form.ispCode === BlLifeRecharge.constants.IspCode.dianxin"
+    >
+      <NutInput
+        v-model.trim="form.name"
+        class="bole-input-text"
+        placeholder="璇峰～鍐欐偍鐨勫鍚�"
+        type="text"
+      />
+    </NutFormItem>
+    <slot></slot>
+  </NutForm>
+</template>
+
+<script setup lang="ts">
+import {
+  Form as NutForm,
+  FormItem as NutFormItem,
+  RadioGroup as NutRadioGroup,
+  Input as NutInput,
+} from '@nutui/nutui-taro';
+import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
+import { reactive, ref, computed } from 'vue';
+import BlRadio from '../../components/Radio/Radio.vue';
+import { FormValidator } from '../../utils';
+import { BlLifeRecharge } from '@life-payment/core-vue';
+
+defineOptions({
+  name: 'PhoneBillRechargeBaseForm',
+});
+
+const form = defineModel<{
+  ispCode: string;
+  phone: string;
+  name: string;
+}>('form');
+
+const rules = reactive<FormRules>({
+  ispCode: [{ required: true, message: '璇烽�夋嫨杩愯惀鍟�' }],
+  phone: [
+    { required: true, message: '璇疯緭鍏ュ厖鍊兼墜鏈哄彿' },
+    { validator: FormValidator.validatorPhoneNumber, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙�' },
+  ],
+  name: [{ required: true, message: '璇疯緭鍏ュ鍚�' }],
+});
+
+const formRef = ref<any>(null);
+
+defineExpose({
+  validate: computed(() => formRef.value.validate),
+});
+</script>
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep1.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep1.vue
new file mode 100644
index 0000000..9afa13b
--- /dev/null
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep1.vue
@@ -0,0 +1,61 @@
+<template>
+  <PhoneBillRechargeBaseForm ref="formRef" v-model:form="form">
+    <div class="common-content">
+      <nut-button class="recharge-button" type="primary" @click="handleNext">
+        <div class="recharge-button-inner">
+          <div class="recharge-button-text">绔嬪嵆鍏呭��</div>
+        </div>
+      </nut-button>
+    </div>
+  </PhoneBillRechargeBaseForm>
+</template>
+
+<script setup lang="ts">
+import {
+  Form as NutForm,
+  FormItem as NutFormItem,
+  RadioGroup as NutRadioGroup,
+  Radio as NutRadio,
+  Input as NutInput,
+  Button as NutButton,
+} from '@nutui/nutui-taro';
+import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
+import { reactive, ref, computed, provide } from 'vue';
+import BlRadio from '../../components/Radio/Radio.vue';
+import { FormValidator } from '../../utils';
+import {
+  useLifeRechargeContext,
+  BlLifeRecharge,
+  LifePhoneDataCreateLifePayOrderInput,
+  LifeRechargeConstants,
+} from '@life-payment/core-vue';
+import RechargeTipsView from '../../components/RechargeTipsView/RechargeTipsView.vue';
+import ConfirmDialog from '../../components/Dialog/ConfirmDialog.vue';
+import ConfirmDialogInfoItem from '../../components/Dialog/ConfirmDialogInfoItem.vue';
+import { useGetRate, useGetPhoneParValue } from '../../hooks';
+import PhoneBillRechargeBaseForm from './PhoneBillRechargeBaseForm.vue';
+import { usePhoneBillRechargeContext } from './context';
+
+defineOptions({
+  name: 'PhoneBillRechargeStep1',
+});
+
+const form = reactive({
+  ispCode: '',
+  phone: '',
+  name: '',
+});
+
+const { goToNext } = usePhoneBillRechargeContext();
+
+const formRef = ref<any>(null);
+
+function handleNext() {
+  if (!formRef.value) return;
+  formRef.value.validate().then(({ valid, errors }: any) => {
+    if (valid) {
+      goToNext();
+    }
+  });
+}
+</script>
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
new file mode 100644
index 0000000..333f782
--- /dev/null
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
@@ -0,0 +1,192 @@
+<template>
+  <NutForm
+    :model-value="form"
+    ref="formRef"
+    :rules="rules"
+    label-position="top"
+    class="order-bill-recharge phone"
+  >
+    <NutFormItem class="bole-form-item">
+      <!-- <AccountAddCard /> -->
+      <NutRadioGroup v-model="val1" direction="horizontal" class="par-account-list">
+        <NutRadio label="1" shape="button">Option 1</NutRadio>
+        <NutRadio label="2" shape="button">Option 2</NutRadio>
+        <NutRadio label="3" shape="button">Option 3</NutRadio>
+        <NutRadio label="4" shape="button">Option 4</NutRadio>
+        <NutRadio label="5" shape="button">Option 5</NutRadio>
+        <NutRadio label="6" shape="button">Option 6</NutRadio>
+      </NutRadioGroup>
+      <AccountCard title="鍏呭�兼墜鏈哄彿" content="18858418480" remark="鐨勫湴鏂归獎鍌茬殑寮�濮嬪拰">
+        <template #action>
+          <div class="account-card-action">鏂板</div>
+        </template>
+      </AccountCard>
+    </NutFormItem>
+
+    <NutFormItem label="閫夋嫨鍏呭�奸噾棰�" class="bole-form-item" prop="parValue" required>
+      <NutRadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
+        <NutRadio
+          :label="Number(item)"
+          :key="item"
+          shape="button"
+          v-for="item in parValueList"
+          class="parValue-item"
+        >
+          <div class="parValue-item-inner">
+            <div class="amount-wrapper">
+              <div class="amount">{{ item }}</div>
+              <div class="unit">鍏�</div>
+            </div>
+            <div class="price-wrapper">
+              <div class="price-text">鎶樺悗</div>
+              <div class="price">
+                {{ blLifeRecharge.getRechargeParValue(item, lifePayPhoneRate) }}鍏�
+              </div>
+            </div>
+            <div class="discountTag">{{ lifePayPhoneRate * 100 }}鎶�</div>
+          </div>
+        </NutRadio>
+      </NutRadioGroup>
+    </NutFormItem>
+    <div class="common-content">
+      <nut-button class="recharge-button" type="primary" @click="handleSubmit">
+        <div class="recharge-button-inner">
+          <div>锟{ realParValue }}</div>
+          <div class="recharge-button-text">绔嬪嵆鍏呭��</div>
+        </div>
+      </nut-button>
+      <RechargeTipsView :tips="tips" />
+    </div>
+    <ConfirmDialog v-model:visible="confirmDialogVisible" @ok="goPay">
+      <template #info>
+        <ConfirmDialogInfoItem label="鍏呭�艰处鍙�" :content="form.phone" />
+        <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
+        <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
+        <ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
+      </template>
+    </ConfirmDialog>
+  </NutForm>
+</template>
+
+<script setup lang="ts">
+import {
+  Form as NutForm,
+  FormItem as NutFormItem,
+  RadioGroup as NutRadioGroup,
+  Radio as NutRadio,
+  Input as NutInput,
+  Button as NutButton,
+} from '@nutui/nutui-taro';
+import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
+import { reactive, ref, computed, provide } from 'vue';
+import { FormValidator } from '../../utils';
+import {
+  useLifeRechargeContext,
+  BlLifeRecharge,
+  LifePhoneDataCreateLifePayOrderInput,
+  LifeRechargeConstants,
+} from '@life-payment/core-vue';
+import RechargeTipsView from '../../components/RechargeTipsView/RechargeTipsView.vue';
+import ConfirmDialog from '../../components/Dialog/ConfirmDialog.vue';
+import ConfirmDialogInfoItem from '../../components/Dialog/ConfirmDialogInfoItem.vue';
+import { useGetRate, useGetPhoneParValue } from '../../hooks';
+import { CustomerServiceTips } from '../../constants';
+import AccountAddCard from '../../components/Card/AccountAddCard.vue';
+import AccountCard from '../../components/Card/AccountCard.vue';
+
+defineOptions({
+  name: 'PhoneBillRechargeStep2',
+});
+
+type Props = {
+  isDev?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+  isDev: false,
+});
+
+const form = reactive({
+  ispCode: '',
+  phone: '',
+  parValue: 0,
+  name: '',
+});
+
+const val1 = ref('');
+
+const emit = defineEmits<{
+  (e: 'goPay', orderNo: string): void;
+}>();
+
+const { lifePayPhoneRate } = useGetRate();
+const { phoneParValueList } = useGetPhoneParValue();
+
+const parValueList = computed(() => {
+  const _parValueList =
+    phoneParValueList.value.find((x) => x.ispCode === form.ispCode)?.parValue ?? [];
+  return blLifeRecharge.filterParValueList(_parValueList);
+});
+
+function changeIspCode(val: LifeRechargeConstants.IspCode) {
+  const phoneParValueItem = phoneParValueList.value.find((x) => x.ispCode === val);
+  if (phoneParValueItem.parValue.every((x) => Number(x) !== form.parValue)) {
+    form.parValue = 0;
+  }
+}
+
+const realParValue = computed(() =>
+  blLifeRecharge.getRechargeParValue(form.parValue, lifePayPhoneRate.value)
+);
+const discountParValue = computed(() => form.parValue - Number(realParValue.value));
+
+const { blLifeRecharge } = useLifeRechargeContext();
+
+const rules = reactive<FormRules>({
+  parValue: [
+    { required: true, message: '璇烽�夋嫨鍏呭�奸噾棰�', validator: FormValidator.validatorNumberNotNull },
+  ],
+});
+
+const formRef = ref<any>(null);
+
+function handleSubmit() {
+  if (!formRef.value) return;
+  formRef.value.validate().then(({ valid, errors }: any) => {
+    if (valid) {
+      recharge();
+    }
+  });
+}
+
+const tips = [
+  '骞冲彴鎻愪緵鎱㈠厖鏈嶅姟锛岃鍗曟彁浜ゅ悗锛岃瘽璐瑰皢浜�0 - 24灏忔椂鍐呭埌璐︺�傝嫢鏈兘鎸夋椂鍒拌处锛岀郴缁熷皢鑷姩鍙戣捣閫�娆俱��',
+  '鍏呭�兼湡闂达紝鑻ュ悓涓�鍙风爜娆鹃」鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紱涓诲壇鍗′笉鍙悓鏃跺厖鍊笺�傚洜涓婅堪鎿嶄綔瀵艰嚧鐨勮祫閲戞崯澶憋紝鐢辩敤鎴疯嚜琛屾壙鎷呫��',
+  '鏈钩鍙拌瘽璐瑰厖鍊兼湇鍔′笉閫傜敤浜庡凡鍋滄満鍙风爜銆傜數淇″彿鐮佽嫢鏈夋瑺璐癸紝涔熸棤娉曞畬鎴愬厖鍊笺�傜數淇″凡瀹屾垚缁存姢鐨勫尯鍩熷寘鎷細骞夸笢銆佹睙鑻忋�佹箹鍖椼�佸洓宸濄�佹睙瑗裤�佹渤鍖椼�佹渤鍗椼�佺寤恒�佽窘瀹併�傚叾瀹冨尯鍩熸鍦ㄥ垎鎵规杩涜缁存姢涓紝鍦ㄦ鏈熼棿鍙兘浼氬嚭鐜板厖鍊间笉鎴愬姛骞惰嚜鍔ㄩ��娆剧殑鎯呭喌锛岃鎮ㄨ皡瑙ｃ��',
+  '濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
+  '鍏呭�煎彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞界數瀛愬彂绁ㄣ��',
+  CustomerServiceTips,
+];
+
+const confirmDialogVisible = ref(false);
+
+function recharge() {
+  confirmDialogVisible.value = true;
+}
+
+async function goPay() {
+  try {
+    let params: LifePhoneDataCreateLifePayOrderInput = {
+      userId: blLifeRecharge.accountModel.userId,
+      productData: {
+        ispCode: form.ispCode,
+        parValue: props.isDev ? 0.1 : form.parValue,
+        phone: form.phone,
+        name: form.ispCode === BlLifeRecharge.constants.IspCode.dianxin ? form.name : '',
+      },
+    };
+    let res = await blLifeRecharge.services.createLifePayPhoneOrder(params);
+    emit('goPay', res.orderNo);
+  } catch (error) {}
+}
+</script>
diff --git a/packages/components/src/views/PhoneBillRecharge/context.ts b/packages/components/src/views/PhoneBillRecharge/context.ts
new file mode 100644
index 0000000..7dff77c
--- /dev/null
+++ b/packages/components/src/views/PhoneBillRecharge/context.ts
@@ -0,0 +1,27 @@
+import type { InjectionKey, UnwrapNestedRefs, Ref } from 'vue';
+import { inject } from 'vue';
+import { UseStepperReturn } from 'senin-mini/hooks';
+
+type PhoneBillRechargeSteps = 'step1' | 'step2';
+
+export interface PhoneBillRechargeContext
+  extends UseStepperReturn<
+    PhoneBillRechargeSteps,
+    PhoneBillRechargeSteps[],
+    PhoneBillRechargeSteps
+  > {
+  //   form: UnwrapNestedRefs<{
+  //     ispCode: string;
+  //     phone: string;
+  //     parValue: number;
+  //     name: string;
+  //   }>;
+}
+
+export const PhoneBillRechargeContextKey: InjectionKey<PhoneBillRechargeContext> = Symbol(
+  'PhoneBillRechargeContextKey'
+);
+
+export function usePhoneBillRechargeContext() {
+  return inject(PhoneBillRechargeContextKey);
+}
diff --git a/packages/components/src/views/RechargeResultView/RechargeResultView.vue b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
index 87727a2..0236549 100644
--- a/packages/components/src/views/RechargeResultView/RechargeResultView.vue
+++ b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="recharge-result-view">
     <div class="recharge-result-view-title">{{ title }}</div>
+    <div class="recharge-result-view-subtitle">璁㈠崟鍙凤細{{ orderNo }}</div>
     <div class="recharge-result-view-tips">
       鍚屼竴鍙风爜鍏呭�兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�
     </div>
     <div class="recharge-result-view-warning">
       濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥!!!
     </div>
+    <div class="recharge-result-view-customerService">{{ CustomerServiceTips }}</div>
     <div class="recharge-result-view-btn-wrapper">
       <div class="recharge-result-view-btn" @click="emit('goBackHome')">鍥為椤�</div>
     </div>
@@ -15,6 +17,7 @@
 
 <script setup lang="ts">
 import { LifeRechargeConstants } from '@life-payment/core-vue';
+import { CustomerServiceTips } from '../../constants';
 
 defineOptions({
   name: 'RechargeResultView',
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 5efa31d..96ee990 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -110,7 +110,7 @@
           label="鐢电綉绫诲瀷"
           :content="blLifeRecharge.constants.ElectricTypeText[form.electricType]"
         />
-        <ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
+        <ConfirmDialogInfoItem :label-width="96" label="鎴峰彿" :content="form.electricAccount" />
         <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
         <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
         <ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
@@ -145,6 +145,7 @@
 import NumberInput from '../../components/Input/NumberInput.vue';
 import { useGetRate, useGetElectricParValue } from '../../hooks';
 import { FormValidator } from '../../utils';
+import { CustomerServiceTips } from '../../constants';
 
 defineOptions({
   name: 'electricBillRecharge',
@@ -175,9 +176,11 @@
 const { lifePayElectricRate } = useGetRate();
 const { electricParValueList } = useGetElectricParValue();
 
-const parValueList = computed(
-  () => electricParValueList.value.find((x) => x.cityName === form.province)?.parValue ?? []
-);
+const parValueList = computed(() => {
+  const parValueList =
+    electricParValueList.value.find((x) => x.cityName === form.province)?.parValue ?? [];
+  return blLifeRecharge.filterParValueList(parValueList);
+});
 
 const electricCityList = computed(
   () => electricParValueList.value.find((x) => x.cityName === form.province)?.childCityList ?? []
@@ -234,6 +237,7 @@
   '涓虹‘淇濆厖鍊奸『鍒╄繘琛岋紝鐩墠骞冲彴涓嶆敮鎸佸娆犳閲戦瓒呰繃1000鍏冪殑璐︽埛杩涜鍏呭�硷紝涓旀瘡娆″厖鍊奸噾棰濆繀椤婚珮浜庢瑺璐规�婚銆�',
   '濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
   '涓嬪崟鏃讹紝璇锋偍鍔″繀鍑嗙‘濉啓瀹屾暣鐨勭渷甯傚強鎴峰彿淇℃伅銆傚厖鍊煎畬鎴愬悗锛屽彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞藉搴旂殑鐢靛瓙鍙戠エ銆�',
+  CustomerServiceTips,
 ];
 
 const confirmDialogVisible = ref(false);
diff --git a/packages/core-vue/package.json b/packages/core-vue/package.json
index 4f8a1f9..613a09c 100644
--- a/packages/core-vue/package.json
+++ b/packages/core-vue/package.json
@@ -2,7 +2,6 @@
   "name": "@life-payment/core-vue",
   "main": "src/index.ts",
   "module": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
   "source": "./src/index.ts",
   "version": "0.0.3",
   "scripts": {
diff --git a/packages/core/package.json b/packages/core/package.json
index 7bf753a..edaca51 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,7 +2,6 @@
   "name": "@life-payment/core",
   "main": "src/index.ts",
   "module": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
   "source": "./src/index.ts",
   "version": "0.0.2",
   "scripts": {
diff --git a/packages/core/src/lifeRecharge.ts b/packages/core/src/lifeRecharge.ts
index 26c02a5..cb24d72 100644
--- a/packages/core/src/lifeRecharge.ts
+++ b/packages/core/src/lifeRecharge.ts
@@ -45,4 +45,10 @@
   getRechargeParValue(amount: number | string, rate: number) {
     return (Number(amount) * rate).toFixed(2);
   }
+
+  MaxParValue = 300;
+
+  filterParValueList(parValueList: string[]) {
+    return parValueList.filter((x) => Number(x) <= this.MaxParValue);
+  }
 }

--
Gitblit v1.9.1