From c5743e1072ed629d721f45db8237874ac9a5df45 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 26 二月 2025 10:16:38 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/Order/components/ElectricOrder.vue | 2 +-
packages/components/src/views/Order/components/PhoneOrder.vue | 2 +-
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 2 +-
apps/taro/src/stores/modules/system.ts | 12 +++++++-----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/apps/taro/src/stores/modules/system.ts b/apps/taro/src/stores/modules/system.ts
index d19b6a9..65d531c 100644
--- a/apps/taro/src/stores/modules/system.ts
+++ b/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) {}
},
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 601b2b2..d398daf 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/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>
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index 126dbf5..1dadc9a 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/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>
diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 3eba4e3..39475ba 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/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);
}
},
--
Gitblit v1.9.1