From 337c9f5fe3956021fb32db5054dfb395c7801beb Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 07 三月 2025 17:41:16 +0800
Subject: [PATCH] fix: 对接
---
apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue | 2 +-
packages/components/src/assets/icon-free-gas.png | 0
packages/components/tsconfig.json | 2 +-
packages/components/vite.config.ts | 4 +---
packages/components/package.json | 2 ++
apps/taro/src/pages/home/index.vue | 6 ++++++
packages/core/package.json | 1 +
apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue | 2 +-
packages/components/src/styles/rechargeGrid.scss | 2 +-
packages/components/src/views/RechargeGrid/RechargeGrid.vue | 7 ++++++-
packages/core-vue/package.json | 1 +
11 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/apps/taro/src/pages/home/index.vue b/apps/taro/src/pages/home/index.vue
index be8d149..8fdfb9a 100644
--- a/apps/taro/src/pages/home/index.vue
+++ b/apps/taro/src/pages/home/index.vue
@@ -4,6 +4,7 @@
<RechargeGrid
@phoneBillRecharge="goPhoneBillRecharge"
@electricityBillRecharge="goElectricityBillRecharge"
+ @gasBillRecharge="goGasBillRecharge"
/>
</ContentView>
</PageLayoutWithBg>
@@ -30,6 +31,11 @@
url: `${RouterPath.electricBillRecharge}`,
});
});
+const goGasBillRecharge = useAccessLogin(() => {
+ Taro.navigateTo({
+ url: `${RouterPath.electricBillRecharge}`,
+ });
+});
</script>
<style lang="scss">
diff --git a/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
index b3b1ddc..20db8bc 100644
--- a/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <ContentScrollView :paddingH="false">
+ <ContentScrollView :paddingH="false" style="background-color: #fff">
<electricBillRecharge @goPay="goPay" :isDev="isDev" />
</ContentScrollView>
</template>
diff --git a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
index ac20e67..0f57138 100644
--- a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <ContentScrollView :paddingH="false">
+ <ContentScrollView :paddingH="false" style="background-color: #fff">
<PhoneBillRecharge @goPay="goPay" :isDev="isDev" />
</ContentScrollView>
</template>
diff --git a/packages/components/package.json b/packages/components/package.json
index 941dc76..d0288b9 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -2,6 +2,7 @@
"name": "@life-payment/components",
"main": "src/index.ts",
"module": "./src/index.ts",
+ "source": "./src/index.ts",
"version": "0.0.6",
"scripts": {
"clean": "rimraf dist",
@@ -16,6 +17,7 @@
],
"exports": {
".": {
+ "source": "./src/index.ts",
"import": "./src/index.ts",
"require": "./src/index.ts"
},
diff --git a/packages/components/src/assets/icon-free-gas.png b/packages/components/src/assets/icon-free-gas.png
new file mode 100644
index 0000000..8f2beed
--- /dev/null
+++ b/packages/components/src/assets/icon-free-gas.png
Binary files differ
diff --git a/packages/components/src/styles/rechargeGrid.scss b/packages/components/src/styles/rechargeGrid.scss
index aa9ae8e..861eedf 100644
--- a/packages/components/src/styles/rechargeGrid.scss
+++ b/packages/components/src/styles/rechargeGrid.scss
@@ -18,7 +18,7 @@
}
.common-content {
- padding: 0 boleGetCssVar('size', 'body-padding-h2');
+ padding: 0 boleGetCssVar('size', 'body-padding-h');
}
.parValue-radio-group {
diff --git a/packages/components/src/views/RechargeGrid/RechargeGrid.vue b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
index 2240b76..eb467b3 100644
--- a/packages/components/src/views/RechargeGrid/RechargeGrid.vue
+++ b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
@@ -1,11 +1,14 @@
<template>
<MainCell title="鐢熸椿缂磋垂">
- <Grid square :gutter="20" :column-num="2" class="recharge-grid-wrapper">
+ <Grid square :gutter="20" :column-num="3" 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>
+ <GridItem class="recharge-grid-item" text="鐕冩皵" @click="emit('gasBillRecharge')">
+ <img :src="IconFreeGas" class="recharge-grid-item-icon" />
</GridItem>
</Grid>
</MainCell>
@@ -16,6 +19,7 @@
import { Grid, GridItem } from '@nutui/nutui-taro';
import IconFreePhone from '../../assets/icon-free-phone.png';
import IconFreeDian from '../../assets/icon-free-dian.png';
+import IconFreeGas from '../../assets/icon-free-gas.png';
defineOptions({
name: 'RechargeGrid',
@@ -28,5 +32,6 @@
const emit = defineEmits<{
(e: 'phoneBillRecharge'): void;
(e: 'electricityBillRecharge'): void;
+ (e: 'gasBillRecharge'): void;
}>();
</script>
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
index a5ecc88..796f041 100644
--- a/packages/components/tsconfig.json
+++ b/packages/components/tsconfig.json
@@ -5,7 +5,7 @@
"rootDir": "src",
"ignoreDeprecations": "5.0",
"paths": {
- "@life-payment/*": ["../../packages/*"]
+ "@life-payment/*": ["../*"]
},
"composite": true,
"types": [
diff --git a/packages/components/vite.config.ts b/packages/components/vite.config.ts
index 01e3a5d..4a28a3b 100644
--- a/packages/components/vite.config.ts
+++ b/packages/components/vite.config.ts
@@ -40,8 +40,6 @@
],
}),
- dts({
- tsconfigPath: './tsconfig.json',
- }),
+ dts(),
],
});
diff --git a/packages/core-vue/package.json b/packages/core-vue/package.json
index e05a794..4f8a1f9 100644
--- a/packages/core-vue/package.json
+++ b/packages/core-vue/package.json
@@ -3,6 +3,7 @@
"main": "src/index.ts",
"module": "./src/index.ts",
"types": "./dist/types/index.d.ts",
+ "source": "./src/index.ts",
"version": "0.0.3",
"scripts": {
"dev": "modern dev",
diff --git a/packages/core/package.json b/packages/core/package.json
index 3038bc2..7bf753a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,6 +3,7 @@
"main": "src/index.ts",
"module": "./src/index.ts",
"types": "./dist/types/index.d.ts",
+ "source": "./src/index.ts",
"version": "0.0.2",
"scripts": {
"dev": "modern dev",
--
Gitblit v1.9.1