zhengyiming
2025-04-17 60b9c62a3165f304a933cbac304ac3d43a24f722
fix: 优化
6个文件已修改
25 ■■■■■ 已修改文件
packages/components/src/hooks/index.ts 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/RechargeGrid/RechargeGrid.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/core/src/lifeRecharge.ts 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
    );
  });
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>
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>
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>
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>
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;