fix: 二期需求

zhengyiming

2025-03-13 13172e75446452388f0e4a0c4aac7e696e1b21da

fix: 二期需求

 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'],

 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({

 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}`,
};

 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();


 apps/taro/src/pages/mine/index.vue

@@ -64,7 +64,6 @@
// Taro.showShareMenu({
//   showShareItems: ['shareAppMessage'],
// });

Taro.useShareAppMessage((res) => {
  return {
    title: `${userDetail.value?.contacter}名片`,

 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}`,
    });
  }

 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.退款待审核) {

 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')"
        />

 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')"
        />

 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')"
        />