From 58c6417603cc9e4c1012ba4fc4c6306dcb0e2324 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 09:34:53 +0800
Subject: [PATCH] fix: 对接
---
/dev/null | 24 ------------
apps/taro/packages/components/assets/icon-free-dian.png | 0
packages/components/src/components/Input/ChooseInput.vue | 1
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 20 ++++-----
apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue | 11 +++++
apps/taro/packages/components/assets/icon-back-top.png | 0
packages/components/src/views/RechargeResultView/RechargeResultView.vue | 9 +---
7 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/apps/taro/packages/components/assets/icon-back-top.png b/apps/taro/packages/components/assets/icon-back-top.png
new file mode 100644
index 0000000..0b64e13
--- /dev/null
+++ b/apps/taro/packages/components/assets/icon-back-top.png
Binary files differ
diff --git a/apps/taro/packages/components/assets/icon-free-dian.png b/apps/taro/packages/components/assets/icon-free-dian.png
new file mode 100644
index 0000000..a8f48ec
--- /dev/null
+++ b/apps/taro/packages/components/assets/icon-free-dian.png
Binary files differ
diff --git a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
index d1ea8c1..aaede98 100644
--- a/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue
@@ -1,6 +1,11 @@
<template>
<ContentScrollView>
- <SelectPayTypeView style="margin-top: 40px" @paySuccess="handePaySuccess" />
+ <SelectPayTypeView
+ style="margin-top: 40px"
+ :orderNo="orderNo"
+ :lifePayOrderType="lifePayOrderType"
+ @paySuccess="handePaySuccess"
+ />
</ContentScrollView>
</template>
@@ -12,6 +17,10 @@
name: 'selectPayType',
});
+const router = Taro.useRouter();
+const orderNo = router.params?.orderNo ?? '';
+const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');
+
function handePaySuccess(
orderNo: string,
lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
diff --git a/packages/components/src/components/Input/ChooseInput.vue b/packages/components/src/components/Input/ChooseInput.vue
index 6486c46..3cdd425 100644
--- a/packages/components/src/components/Input/ChooseInput.vue
+++ b/packages/components/src/components/Input/ChooseInput.vue
@@ -19,6 +19,7 @@
<script setup lang="ts">
import { RectRight } from '@nutui/icons-vue-taro';
+import { Input as NutInput } from '@nutui/nutui-taro';
defineOptions({
name: 'ChooseInput',
diff --git a/packages/components/src/views/Order/Order.vue b/packages/components/src/views/Order/Order.vue
deleted file mode 100644
index ecfc8de..0000000
--- a/packages/components/src/views/Order/Order.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
- <div class="order-wrapper">
- <nut-tabs v-model="orderType">
- <nut-tab-pane title="璇濊垂璁㈠崟" pane-key="1">
- <PhoneOrder></PhoneOrder>
- </nut-tab-pane>
- <nut-tab-pane title="鐢佃垂璁㈠崟" pane-key="2">
- <ElectricOrder></ElectricOrder>
- </nut-tab-pane>
- </nut-tabs>
- </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import PhoneOrder from './components/PhoneOrder.vue';
-import ElectricOrder from './components/ElectricOrder.vue';
-
-defineOptions({
- name: 'Order',
-});
-
-const orderType = ref(1);
-</script>
diff --git a/packages/components/src/views/RechargeResultView/RechargeResultView.vue b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
index 4d89ab3..f439b89 100644
--- a/packages/components/src/views/RechargeResultView/RechargeResultView.vue
+++ b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
@@ -14,8 +14,7 @@
</template>
<script setup lang="ts">
-import Taro from '@tarojs/taro';
-import { BlLifeRecharge } from '@life-payment/components';
+import { LifeRechargeConstants } from '../../utils';
defineOptions({
name: 'RechargeResultView',
@@ -23,15 +22,13 @@
type Props = {
title?: string;
+ orderNo?: string;
+ lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
};
const props = withDefaults(defineProps<Props>(), {
title: '鏀粯鎴愬姛锛屽厖鍊兼灏嗗湪0-24灏忔椂鍐呭埌璐�',
});
-
-const router = Taro.useRouter();
-const orderNo = router.params?.orderNo ?? '';
-const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');
const emit = defineEmits<{
(e: 'goBackHome'): void;
diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 1511491..9561582 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -14,7 +14,6 @@
<script setup lang="ts">
import IconWeixin from '../../../assets/icon-weixin-pay.png';
import IconAliPay from '../../../assets/icon-alipay.png';
-import Taro from '@tarojs/taro';
import {
useLifeRechargeContext,
SetLifePayOrderPayTypeInput,
@@ -26,9 +25,12 @@
name: 'SelectPayTypeView',
});
-// type Props = {};
+type Props = {
+ orderNo?: string;
+ lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
+};
-// const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {});
const emit = defineEmits<{
(
@@ -37,10 +39,6 @@
lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
): void;
}>();
-
-const router = Taro.useRouter();
-const orderNo = router.params?.orderNo ?? '';
-const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');
const { blLifeRecharge } = useLifeRechargeContext();
@@ -56,7 +54,7 @@
async function setLifePayOrderPayType(lifePayType: LifeRechargeConstants.LifePayTypeEnum) {
try {
let params: SetLifePayOrderPayTypeInput = {
- orderNo: orderNo,
+ orderNo: props.orderNo,
lifePayType: lifePayType,
};
return await blLifeRecharge.services.setLifePayOrderPayType(params);
@@ -64,11 +62,11 @@
}
useQuery({
- queryKey: ['platformServicePayServices/getPayStatusByOrderNo', orderNo],
+ queryKey: ['platformServicePayServices/getPayStatusByOrderNo', props.orderNo],
queryFn: async () => {
return await blLifeRecharge.services.getPayStatusByOrderNo(
{
- orderNo,
+ orderNo: props.orderNo,
},
{
showLoading: false,
@@ -77,7 +75,7 @@
},
onSuccess(data) {
if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) {
- emit('paySuccess', orderNo, lifePayOrderType);
+ emit('paySuccess', props.orderNo, props.lifePayOrderType);
}
},
refetchInterval: 1000 * 3,
--
Gitblit v1.9.1