From 7ed1e4f30ba4d8204152cb157ceaee07374da080 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 17 三月 2025 14:29:14 +0800
Subject: [PATCH] fix: 修改支付方式选择

---
 packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue |   98 +++++++++++++++++++++++-------------------------
 1 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 6df3a0e..4e927c5 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -1,79 +1,75 @@
 <template>
   <div class="select-pay-type-view">
-    <div class="select-pay-type-view-item" @click="handleAliPay">
+    <div class="select-pay-type-view-item" v-if="showAliPay" @click="handleAliPay">
       <img class="select-pay-type-view-item-icon" :src="IconAliPay" />
       <div class="select-pay-type-view-item-text">鏀粯瀹濇敮浠�</div>
     </div>
-    <div class="select-pay-type-view-item">
+    <div class="select-pay-type-view-item" v-if="showWeixinPay" @click="handleWeixinPay">
       <img class="select-pay-type-view-item-icon" :src="IconWeixin" />
       <div class="select-pay-type-view-item-text">寰俊鏀粯</div>
     </div>
+    <NutToast :msg="state.msg" v-model:visible="state.show" type="warn" cover />
   </div>
 </template>
 
 <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,
-  LifeRechargeConstants,
-} from '../../utils';
-import { useQuery } from '@tanstack/vue-query';
+import IconWeixin from '../../assets/icon-weixin-pay.png';
+import IconAliPay from '../../assets/icon-alipay.png';
+import { LifeRechargeConstants } from '@life-payment/core-vue';
+import { Toast as NutToast } from '@nutui/nutui-taro';
+import { computed, toRef } from 'vue';
+import { useSelectPayType, useGetPayStatusByOrderNo } from '../../hooks/selectPayType';
 
 defineOptions({
   name: 'SelectPayTypeView',
 });
 
-// type Props = {};
+type Props = {
+  orderNo?: string;
+  lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
+  showAliPay?: boolean;
+  showWeixinPay?: boolean;
+  openId?: string;
+  isInWeChat?: boolean;
+  isH5?: boolean;
+  appId?: string;
+  isFocus?: boolean;
+};
 
-// const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {
+  showAliPay: true,
+  showWeixinPay: true,
+});
 
 const emit = defineEmits<{
-  (e: 'paySuccess', id: number): void;
+  (
+    e: 'paySuccess',
+    orderNo: string,
+    lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
+  ): void;
+  (e: 'payOrderForJsAPISuccess'): void;
 }>();
 
-const router = Taro.useRouter();
-const orderNo = router.params?.orderNo ?? '';
+const { state, invokeAliPay, invokeWeixinPay } = useSelectPayType({
+  openId: toRef(props, 'openId'),
+  isInWeChat: toRef(props, 'isInWeChat'),
+  isH5: toRef(props, 'isH5'),
+  appId: toRef(props, 'appId'),
+});
 
-const { blLifeRecharge } = useLifeRechargeContext();
-
-async function handleAliPay() {
-  try {
-    let res = await setLifePayOrderPayType(blLifeRecharge.constants.LifePayTypeEnum.AliPay);
-    if (res) {
-      location.href = res;
-    }
-  } catch (error) {}
+function handleAliPay() {
+  invokeAliPay(props.orderNo);
 }
 
-async function setLifePayOrderPayType(lifePayType: LifeRechargeConstants.LifePayTypeEnum) {
-  try {
-    let params: SetLifePayOrderPayTypeInput = {
-      orderNo: orderNo,
-      lifePayType: lifePayType,
-    };
-    return await blLifeRecharge.services.setLifePayOrderPayType(params);
-  } catch (error) {}
+function handleWeixinPay() {
+  invokeWeixinPay(props.orderNo);
 }
 
-// useQuery({
-//   queryKey: ['platformServicePayServices/getPlaformServicePayQRCode', orderNo],
-//   queryFn: async () => {
-//     return await blLifeRecharge.services.getPayStatusByOrderNo(
-//       {
-//         orderNo,
-//       },
-//       {
-//         showLoading: false,
-//       }
-//     );
-//   },
-//   onSuccess(data) {
-//     if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) {
-//     }
-//   },
-//   refetchInterval: 1000 * 3,
-// });
+useGetPayStatusByOrderNo({
+  orderNo: toRef(props, 'orderNo'),
+  enabled: computed(() => props.isFocus),
+  onPaySuccess() {
+    emit('paySuccess', props.orderNo, props.lifePayOrderType);
+  },
+});
 </script>

--
Gitblit v1.9.1