From add9b3bb61fcc337b02c15e7973967d670e7d3be Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 21 五月 2025 17:17:28 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui

---
 packages/components/src/views/RechargeGrid/RechargeGrid.vue |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/components/src/views/RechargeGrid/RechargeGrid.vue b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
index 2240b76..2da5701 100644
--- a/packages/components/src/views/RechargeGrid/RechargeGrid.vue
+++ b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
@@ -1,21 +1,33 @@
 <template>
-  <MainCell title="鐢熸椿缂磋垂">
-    <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" />
-      </GridItem>
-      <GridItem class="recharge-grid-item" text="鐢佃垂" @click="emit('electricityBillRecharge')">
-        <img :src="IconFreeDian" class="recharge-grid-item-icon" />
-      </GridItem>
-    </Grid>
+  <MainCell title="蹇�熺即璐�">
+    <div class="recharge-list-wrapper">
+      <div class="recharge-list-item" @click="emit('phoneBillRecharge')">
+        <img :src="OssAssets.home.FreePhone" class="recharge-list-item-icon" />
+        <div class="recharge-list-item-text">璇濊垂</div>
+        <NutButton type="primary" class="recharge-list-item-button">绔嬪嵆缂磋垂</NutButton>
+        <div class="discountTag" v-if="lifePayPhoneRate > 0">{{ lifePayPhoneRate }}鎶�</div>
+      </div>
+      <div class="recharge-list-item" @click="emit('electricityBillRecharge')">
+        <img :src="OssAssets.home.FreeDian" class="recharge-list-item-icon" />
+        <div class="recharge-list-item-text">鐢佃垂</div>
+        <NutButton type="primary" class="recharge-list-item-button">绔嬪嵆缂磋垂</NutButton>
+        <div class="discountTag" v-if="lifePayElectricRate > 0">{{ lifePayElectricRate }}鎶�</div>
+      </div>
+      <!-- <div class="recharge-list-item" @click="emit('gasBillRecharge')">
+        <img :src="OssAssets.home.FreeGas" class="recharge-list-item-icon" />
+        <div class="recharge-list-item-text">鐕冩皵璐�</div>
+        <NutButton type="primary" class="recharge-list-item-button">绔嬪嵆缂磋垂</NutButton>
+        <div class="discountTag" v-if="lifePayGasRate > 0">{{ lifePayGasRate }}鎶�</div>
+      </div> -->
+    </div>
   </MainCell>
 </template>
 
 <script setup lang="ts">
 import MainCell from '../../components/Layout/MainCell.vue';
-import { Grid, GridItem } from '@nutui/nutui-taro';
-import IconFreePhone from '../../assets/icon-free-phone.png';
-import IconFreeDian from '../../assets/icon-free-dian.png';
+import { Button as NutButton } from '@nutui/nutui-taro';
+import { OssAssets } from '../../constants';
+import { useGetRate } from '../../hooks';
 
 defineOptions({
   name: 'RechargeGrid',
@@ -28,5 +40,8 @@
 const emit = defineEmits<{
   (e: 'phoneBillRecharge'): void;
   (e: 'electricityBillRecharge'): void;
+  (e: 'gasBillRecharge'): void;
 }>();
+
+const { lifePayPhoneRate, lifePayElectricRate, lifePayGasRate } = useGetRate();
 </script>

--
Gitblit v1.9.1