From 13172e75446452388f0e4a0c4aac7e696e1b21da Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 14:53:44 +0800
Subject: [PATCH] fix: 二期需求
---
packages/components/src/utils/common.ts | 5 ++
apps/taro/src/app.ts | 3 +
packages/components/src/views/Order/components/ElectricOrder.vue | 5 ++
packages/components/src/views/Order/components/GasOrder.vue | 5 ++
packages/components/src/views/Order/components/PhoneOrder.vue | 5 ++
apps/taro/src/pages/home/index.vue | 1
apps/taro/src/app.config.ts | 29 ++++++++++++++
apps/taro/src/constants/tabBar.ts | 8 +++-
apps/taro/src/pages/mine/index.vue | 1
apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue | 6 +-
10 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/apps/taro/src/app.config.ts b/apps/taro/src/app.config.ts
index 78bdba1..ce306b0 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: '#3a71ff',
+ backgroundColor: '#fff',
+ borderStyle: 'black',
+ custom: true,
+ },
+ };
+
export default defineAppConfig({
entryPagePath: 'pages/home/index',
pages: ['pages/home/index', 'pages/mine/index'],
diff --git a/apps/taro/src/app.ts b/apps/taro/src/app.ts
index edf0893..fcdd16e 100644
--- a/apps/taro/src/app.ts
+++ b/apps/taro/src/app.ts
@@ -50,6 +50,9 @@
// 瀵瑰簲 onLaunch
onLaunch(options) {
+ if (options.query?.channelId) {
+ console.log('options: ', options);
+ }
// 濡傛灉鏄敹钘忚繘鍏�
if (options.query.collect) {
Taro.reLaunch({
diff --git a/apps/taro/src/constants/tabBar.ts b/apps/taro/src/constants/tabBar.ts
index 405c9bd..e69188c 100644
--- a/apps/taro/src/constants/tabBar.ts
+++ b/apps/taro/src/constants/tabBar.ts
@@ -1,4 +1,8 @@
+import Taro from '@tarojs/taro';
+let res = Taro.getLaunchOptionsSync();
+console.log('getLaunchOptionsSync: ', res);
+
export const TabBarPageRouter = {
- Home: '/pages/home/index',
- Mine: '/pages/mine/index',
+ Home: `/pages/home/index?channelId=${res.query?.channelId}`,
+ Mine: `/pages/mine/index?channelId=${res.query?.channelId}`,
};
diff --git a/apps/taro/src/pages/home/index.vue b/apps/taro/src/pages/home/index.vue
index ddcb1e6..08b103c 100644
--- a/apps/taro/src/pages/home/index.vue
+++ b/apps/taro/src/pages/home/index.vue
@@ -16,6 +16,7 @@
import Taro from '@tarojs/taro';
import { OrderInputType } from '@life-payment/constants';
import { RechargeGrid } from '@life-payment/components';
+import CustomTabBar from '../../custom-tab-bar/index';
const userStore = useUserStore();
diff --git a/apps/taro/src/pages/mine/index.vue b/apps/taro/src/pages/mine/index.vue
index c2285c1..6ed70bb 100644
--- a/apps/taro/src/pages/mine/index.vue
+++ b/apps/taro/src/pages/mine/index.vue
@@ -64,7 +64,6 @@
// Taro.showShareMenu({
// showShareItems: ['shareAppMessage'],
// });
-
Taro.useShareAppMessage((res) => {
return {
title: `${userDetail.value?.contacter}鍚嶇墖`,
diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index 85256c2..b67fd9e 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -41,15 +41,15 @@
lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
) {
if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟) {
- Taro.navigateTo({
+ Taro.redirectTo({
url: `${RouterPath.rechargeResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
});
} else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟) {
- Taro.navigateTo({
+ Taro.redirectTo({
url: `${RouterPath.rechargeElectricResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
});
} else if (lifePayOrderType === LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟) {
- Taro.navigateTo({
+ Taro.redirectTo({
url: `${RouterPath.rechargeGasResult}?orderNo=${orderNo}&lifePayOrderType=${lifePayOrderType}`,
});
}
diff --git a/packages/components/src/utils/common.ts b/packages/components/src/utils/common.ts
index 8ec6d2a..cece529 100644
--- a/packages/components/src/utils/common.ts
+++ b/packages/components/src/utils/common.ts
@@ -161,7 +161,10 @@
) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛;
}
- if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.宸查��娆�) {
+ if (
+ lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.宸查��娆� ||
+ payStatus === LifeRechargeConstants.LifePayStatusEnum.宸查��娆�
+ ) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.宸查��娆�;
}
if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳) {
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 9b842e5..6391340 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -47,7 +47,10 @@
/>
<OrderCardItem
- v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
+ v-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+ "
label="瀹屾垚鏃堕棿:"
:value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
/>
diff --git a/packages/components/src/views/Order/components/GasOrder.vue b/packages/components/src/views/Order/components/GasOrder.vue
index b5b3215..2c225aa 100644
--- a/packages/components/src/views/Order/components/GasOrder.vue
+++ b/packages/components/src/views/Order/components/GasOrder.vue
@@ -39,7 +39,10 @@
:value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
/>
<OrderCardItem
- v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
+ v-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+ "
label="瀹屾垚鏃堕棿:"
:value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
/>
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index 3599309..e938035 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/packages/components/src/views/Order/components/PhoneOrder.vue
@@ -39,7 +39,10 @@
:value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
/>
<OrderCardItem
- v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
+ v-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+ "
label="瀹屾垚鏃堕棿:"
:value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
/>
--
Gitblit v1.9.1