From c5bf3cfc953f9865bd70f109363c2ea4e45c0c96 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 15 五月 2025 17:05:34 +0800
Subject: [PATCH] fix: 修改首页ui
---
packages/components/package.json | 3 +
packages/components/src/constants/index.ts | 2 +
packages/components/src/constants/img.ts | 9 ++++
apps/taro/config/index.js | 4 --
packages/components/src/styles/rechargeGrid.scss | 27 +++++++------
packages/components/src/views/RechargeGrid/RechargeGrid.vue | 40 +++++--------------
6 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/apps/taro/config/index.js b/apps/taro/config/index.js
index 0efa602..3ddf2cc 100644
--- a/apps/taro/config/index.js
+++ b/apps/taro/config/index.js
@@ -251,10 +251,6 @@
})
);
- chain.toConfig().module.rules.forEach((rule) => {
- console.log('rule', JSON.stringify(rule));
- });
-
chain.plugin('unplugin-vue-components').use(
ComponentsPlugin({
include: [/\.[tj]sx?$/, /\.vue$/, /\.vue\?vue/],
diff --git a/packages/components/package.json b/packages/components/package.json
index 90eeea6..fa0e1b6 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -24,6 +24,9 @@
"./src/styles/index.scss": {
"import": "./src/styles/index.scss"
},
+ "./src/assets/*": {
+ "import": "./src/assets/*"
+ },
"./*": "./*"
},
"publishConfig": {
diff --git a/packages/components/src/constants/img.ts b/packages/components/src/constants/img.ts
new file mode 100644
index 0000000..cb5fab6
--- /dev/null
+++ b/packages/components/src/constants/img.ts
@@ -0,0 +1,9 @@
+const OssBasePath = 'https://renliyuan.oss-cn-hangzhou.aliyuncs.com/12333';
+
+export const OssAssets = {
+ home: {
+ FreePhone: `${OssBasePath}/lifePayment/assets/home/icon-free-phone.png`,
+ FreeDian: `${OssBasePath}/lifePayment/assets/home/icon-free-dian.png`,
+ FreeGas: `${OssBasePath}/lifePayment/assets/home/icon-free-gas.png`,
+ },
+};
diff --git a/packages/components/src/constants/index.ts b/packages/components/src/constants/index.ts
index 071f100..82093fa 100644
--- a/packages/components/src/constants/index.ts
+++ b/packages/components/src/constants/index.ts
@@ -1,3 +1,5 @@
+export * from './img';
+
export enum IspCode {
/**涓浗绉诲姩 */
yidong = 'yidong',
diff --git a/packages/components/src/styles/rechargeGrid.scss b/packages/components/src/styles/rechargeGrid.scss
index 9de07be..62edae5 100644
--- a/packages/components/src/styles/rechargeGrid.scss
+++ b/packages/components/src/styles/rechargeGrid.scss
@@ -31,22 +31,23 @@
min-width: 0;
}
+ .recharge-list-item-button {
+ font-size: 26px;
+ height: 48px;
+ padding: 18px;
+ }
+
.discountTag {
position: absolute;
- padding: 8px 16px;
- border-radius: 0px 0 20px 0;
- background: linear-gradient(
- 186deg,
- rgba(255, 129, 45, 0.08) 14.82%,
- rgba(238, 67, 67, 0.08) 91.5%
- );
- color: #fb5100;
- font-size: 24px;
- font-weight: 700;
- line-height: 28px;
+ padding: 0px 20px;
+ border-radius: 0px 16px 0 16px;
+ background: linear-gradient(133deg, #ff6d6e 0%, #ff4d4f 100%);
+ color: #fff;
+ font-size: 20px;
+ line-height: 32px;
position: absolute;
- top: -2px;
- left: -2px;
+ top: -16px;
+ left: 0;
}
}
}
diff --git a/packages/components/src/views/RechargeGrid/RechargeGrid.vue b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
index c99dbee..2da5701 100644
--- a/packages/components/src/views/RechargeGrid/RechargeGrid.vue
+++ b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
@@ -1,35 +1,24 @@
<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" />
- <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" 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" v-if="lifePayGasRate > 0">{{ lifePayGasRate }}鎶�</div>
- </GridItem>
- </Grid> -->
<div class="recharge-list-wrapper">
- <div class="recharge-list-item">
- <img :src="IconFreePhone" class="recharge-list-item-icon" />
+ <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">
- <img :src="IconFreeDian" class="recharge-list-item-icon" />
+ <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">
- <img :src="IconFreeGas" class="recharge-list-item-icon" />
+ <!-- <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>
+ <div class="discountTag" v-if="lifePayGasRate > 0">{{ lifePayGasRate }}鎶�</div>
+ </div> -->
</div>
</MainCell>
</template>
@@ -37,14 +26,7 @@
<script setup lang="ts">
import MainCell from '../../components/Layout/MainCell.vue';
import { Button as NutButton } from '@nutui/nutui-taro';
-import IconFreePhone from '../../assets/icon-free-phone.png';
-console.log(
- 'IconFreePhone: ',
- IconFreePhone,
- new URL('../../assets/icon-free-phone.png', import.meta.url)
-);
-import IconFreeDian from '../../assets/icon-free-dian.png';
-import IconFreeGas from '../../assets/icon-free-gas.png';
+import { OssAssets } from '../../constants';
import { useGetRate } from '../../hooks';
defineOptions({
--
Gitblit v1.9.1