zhengyiming
2025-02-26 c5743e1072ed629d721f45db8237874ac9a5df45
fix: 对接
4个文件已修改
18 ■■■■■ 已修改文件
apps/taro/src/stores/modules/system.ts 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/Order/components/ElectricOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/Order/components/PhoneOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/taro/src/stores/modules/system.ts
@@ -86,8 +86,14 @@
    setNavigationBarHeight(systemInfo: Taro.getSystemInfoSync.Result) {
      try {
        const { right, height, width, top } = Taro.getMenuButtonBoundingClientRect();
        if (!isWeb) {
          const { right, height, width, top } = Taro.getMenuButtonBoundingClientRect();
          this.menuButtonHeight = height;
          this.menuButtonWidth = width;
          this.menuButtonTop = top;
          this.menuButtonRightDistance = systemInfo.screenWidth - right;
        }
        let navigationBarHeight = 0;
        if (systemInfo.platform === 'android') {
@@ -95,10 +101,6 @@
        } else {
          navigationBarHeight = 44;
        }
        this.menuButtonHeight = height;
        this.menuButtonWidth = width;
        this.menuButtonTop = top;
        this.menuButtonRightDistance = systemInfo.screenWidth - right;
        this.navigationBarHeight = navigationBarHeight;
      } catch (error) {}
    },
packages/components/src/views/Order/components/ElectricOrder.vue
@@ -44,7 +44,7 @@
          <OrderCardItem label="退款金额:" :value="`¥${toThousand(item?.payAmount)}`" danger />
          <OrderCardItem
            label="退款时间:"
            :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
            :value="item?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
          >
          </OrderCardItem>
        </template>
packages/components/src/views/Order/components/PhoneOrder.vue
@@ -36,7 +36,7 @@
          <OrderCardItem label="退款金额:" :value="`¥${toThousand(item?.payAmount)}`" danger />
          <OrderCardItem
            label="退款时间:"
            :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
            :value="item?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
          >
          </OrderCardItem>
        </template>
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -143,7 +143,7 @@
    );
  },
  onSuccess(data) {
    if (data === blLifeRecharge.constants.LifePayStatusEnum.已支付) {
    if (data !== blLifeRecharge.constants.LifePayStatusEnum.未支付) {
      emit('paySuccess', props.orderNo, props.lifePayOrderType);
    }
  },