From be661965399aac1a93f2a57f79d9fbce7cda8ba2 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 26 二月 2025 14:13:41 +0800 Subject: [PATCH] fix: 对接 --- packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue index 4309f0c..a343098 100644 --- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue +++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue @@ -4,10 +4,11 @@ <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" v-if="showWeixinPay" @click="handleWeixinPayByJsApi"> + <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> @@ -21,6 +22,8 @@ GetPayOrderForJsAPIInput, } from '@life-payment/core-vue'; import { useQuery } from '@tanstack/vue-query'; +import { Toast as NutToast } from '@nutui/nutui-taro'; +import { onMounted, reactive, ref, computed } from 'vue'; defineOptions({ name: 'SelectPayTypeView', @@ -35,6 +38,7 @@ isInWeChat?: boolean; isH5?: boolean; appId?: string; + isFocus?: boolean; }; const props = withDefaults(defineProps<Props>(), { @@ -50,6 +54,11 @@ ): void; (e: 'payOrderForJsAPISuccess'): void; }>(); + +const state = reactive({ + show: false, + msg: '', +}); const { blLifeRecharge } = useLifeRechargeContext(); @@ -67,12 +76,14 @@ if (props.isInWeChat) { handleWeixinPayByJsApi(); } else { - try { - let res = await setLifePayOrderPayType(blLifeRecharge.constants.LifePayTypeEnum.WxPay); - if (res) { - location.href = res; - } - } catch (error) {} + // try { + // let res = await setLifePayOrderPayType(blLifeRecharge.constants.LifePayTypeEnum.WxPay); + // if (res) { + // location.href = res; + // } + // } catch (error) {} + state.msg = '璇峰湪寰俊涓墦寮�'; + state.show = true; } } } @@ -103,6 +114,12 @@ if (res.err_msg == 'get_brand_wcpay_request:ok') { // 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛� //res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈狅紝鍟嗘埛闇�杩涗竴姝ヨ皟鐢ㄥ悗绔煡鍗曠‘璁ゆ敮浠樼粨鏋溿�� + } else if (res.err_msg == 'system:access_denied') { + state.msg = '璇峰湪鎵嬫満寰俊涓墦寮�'; + state.show = true; + } else { + state.msg = res.err_msg; + state.show = true; } } ); @@ -133,10 +150,11 @@ ); }, onSuccess(data) { - if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) { + if (data !== blLifeRecharge.constants.LifePayStatusEnum.鏈敮浠�) { emit('paySuccess', props.orderNo, props.lifePayOrderType); } }, refetchInterval: 1000 * 3, + enabled: computed(() => props.isFocus), }); </script> -- Gitblit v1.9.1