From 9e5a47d90455c4770815d32899f660b53fc27110 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 22 五月 2025 13:26:09 +0800 Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui --- apps/taro/src/app.config.ts | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/apps/taro/src/app.config.ts b/apps/taro/src/app.config.ts index c23c86c..cf6f3af 100644 --- a/apps/taro/src/app.config.ts +++ b/apps/taro/src/app.config.ts @@ -1,3 +1,32 @@ +console.log('process.env.TARO_ENV', process.env.TARO_ENV); + +const tabberConifg = + process.env.TARO_ENV === 'h5' + ? ({} as any) + : { + tabBar: { + list: [ + { + pagePath: 'pages/home/index', + iconPath: 'assets/tabbar/icon-home.png', + selectedIconPath: 'assets/tabbar/icon-home-active.png', + text: '棣栭〉', + }, + { + pagePath: 'pages/mine/index', + iconPath: 'assets/tabbar/icon-mine.png', + selectedIconPath: 'assets/tabbar/icon-mine-active.png', + text: '鎴戠殑', + }, + ], + color: '#333', + selectedColor: '#028CFF', + backgroundColor: '#fff', + borderStyle: 'black', + custom: true, + }, + }; + export default defineAppConfig({ entryPagePath: 'pages/home/index', pages: ['pages/home/index', 'pages/mine/index'], @@ -32,8 +61,8 @@ text: '鎴戠殑', }, ], - color: '#333', - selectedColor: '#3a71ff', + color: '#2F303D', + selectedColor: '#028CFF', backgroundColor: '#fff', borderStyle: 'black', custom: true, @@ -60,15 +89,34 @@ 'selectPayType/selectPayType', 'rechargeResult/rechargeResult', 'rechargeElectricResult/rechargeElectricResult', + 'rechargeGasResult/rechargeGasResult', ], }, { root: 'subpackages/order', - pages: ['order/order', 'orderApplyRefund/orderApplyRefund'], + pages: [ + 'order/order', + 'orderApplyRefund/orderApplyRefund', + 'orderRefundResult/orderRefundResult', + ], }, { root: 'subpackages/userAccount', - pages: ['userAccountList/userAccountList'], + pages: [ + 'userAccountList/userAccountList', + 'editGasUserAccount/editGasUserAccount', + 'editPhoneUserAccount/editPhoneUserAccount', + 'editElectricUserAccount/editElectricUserAccount', + ], + }, + { + root: 'subpackages/my', + pages: [ + 'shareQrcode/shareQrcode', + 'dashboard/dashboard', + 'applyAgent/applyAgent', + 'promotionQrcode/promotionQrcode', + ], }, ], // preloadRule: { -- Gitblit v1.9.1