From 60b9c62a3165f304a933cbac304ac3d43a24f722 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 17 四月 2025 09:25:09 +0800
Subject: [PATCH] fix: 优化

---
 packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue       |    2 +-
 packages/core/src/lifeRecharge.ts                                                |    5 ++++-
 packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue           |    2 +-
 packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue |    4 +++-
 packages/components/src/hooks/index.ts                                           |    6 +++---
 packages/components/src/views/RechargeGrid/RechargeGrid.vue                      |    6 +++---
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/components/src/hooks/index.ts b/packages/components/src/hooks/index.ts
index 9946e0e..b8ce406 100644
--- a/packages/components/src/hooks/index.ts
+++ b/packages/components/src/hooks/index.ts
@@ -53,7 +53,7 @@
     return (
       lifePayRateList.value.find(
         (x) => x.rateType === blLifeRecharge.constants.LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸
-      )?.rate ?? 100
+      )?.rate ?? 0
     );
   });
 
@@ -64,7 +64,7 @@
     return (
       lifePayRateList.value.find(
         (x) => x.rateType === blLifeRecharge.constants.LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸
-      )?.rate ?? 100
+      )?.rate ?? 0
     );
   });
 
@@ -75,7 +75,7 @@
     return (
       lifePayRateList.value.find(
         (x) => x.rateType === blLifeRecharge.constants.LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸
-      )?.rate ?? 100
+      )?.rate ?? 0
     );
   });
 
diff --git a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
index 36439cc..7b4588a 100644
--- a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
+++ b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
@@ -51,7 +51,7 @@
                 {{ blLifeRecharge.getRechargeParValue(item, lifePayGasRate) }}鍏�
               </div>
             </div>
-            <div class="discountTag">{{ lifePayGasRate }}鎶�</div>
+            <div class="discountTag" v-if="lifePayGasRate > 0">{{ lifePayGasRate }}鎶�</div>
           </div>
         </NutRadio>
       </NutRadioGroup>
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
index c88cf46..099fdef 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
@@ -55,7 +55,7 @@
                 {{ blLifeRecharge.getRechargeParValue(item, lifePayPhoneRate) }}鍏�
               </div>
             </div>
-            <div class="discountTag">{{ lifePayPhoneRate }}鎶�</div>
+            <div class="discountTag" v-if="lifePayPhoneRate > 0">{{ lifePayPhoneRate }}鎶�</div>
           </div>
         </NutRadio>
       </NutRadioGroup>
diff --git a/packages/components/src/views/RechargeGrid/RechargeGrid.vue b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
index 705f3af..7f9b4f1 100644
--- a/packages/components/src/views/RechargeGrid/RechargeGrid.vue
+++ b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
@@ -3,15 +3,15 @@
     <Grid square :gutter="20" :column-num="2" class="recharge-grid-wrapper">
       <GridItem class="recharge-grid-item" text="璇濊垂" @click="emit('phoneBillRecharge')">
         <img :src="IconFreePhone" class="recharge-grid-item-icon" />
-        <div class="discountTag">{{ lifePayPhoneRate }}鎶�</div>
+        <div class="discountTag" v-if="lifePayPhoneRate > 0">{{ lifePayPhoneRate }}鎶�</div>
       </GridItem>
       <GridItem class="recharge-grid-item" text="鐢佃垂" @click="emit('electricityBillRecharge')">
         <img :src="IconFreeDian" class="recharge-grid-item-icon" />
-        <div class="discountTag">{{ lifePayElectricRate }}鎶�</div>
+        <div class="discountTag" v-if="lifePayElectricRate > 0">{{ lifePayElectricRate }}鎶�</div>
       </GridItem>
       <!-- <GridItem class="recharge-grid-item" text="鐕冩皵" @click="emit('gasBillRecharge')">
         <img :src="IconFreeGas" class="recharge-grid-item-icon" />
-        <div class="discountTag">{{ lifePayGasRate }}鎶�</div>
+        <div class="discountTag" v-if="lifePayGasRate > 0">{{ lifePayGasRate }}鎶�</div>
       </GridItem> -->
     </Grid>
   </MainCell>
diff --git a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
index 1e6c6c7..c3c7a81 100644
--- a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
+++ b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
@@ -57,7 +57,9 @@
                 {{ blLifeRecharge.getRechargeParValue(item, lifePayElectricRate) }}鍏�
               </div>
             </div>
-            <div class="discountTag">{{ lifePayElectricRate }}鎶�</div>
+            <div class="discountTag" v-if="lifePayElectricRate > 0">
+              {{ lifePayElectricRate }}鎶�
+            </div>
           </div>
         </NutRadio>
       </NutRadioGroup>
diff --git a/packages/core/src/lifeRecharge.ts b/packages/core/src/lifeRecharge.ts
index d523104..a2e318a 100644
--- a/packages/core/src/lifeRecharge.ts
+++ b/packages/core/src/lifeRecharge.ts
@@ -57,7 +57,10 @@
   }
 
   getRechargeParValue(amount: number | string, rate: number) {
-    return ((Number(amount) * rate) / 100).toFixed(2);
+    if (rate > 0) {
+      return ((Number(amount) * rate) / 100).toFixed(2);
+    }
+    return Number(amount).toFixed(2);
   }
 
   MaxParValue = 300;

--
Gitblit v1.9.1