diff --git a/src/common/constant.ts b/src/common/constant.ts index 52a5e1f..7633c55 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,11 +1,11 @@ -export const BASE_URL = CURRENT_BASE_URL +// export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 -// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 diff --git a/src/pages/order/components/payment/index.tsx b/src/pages/order/components/payment/index.tsx index 939b0eb..3435922 100644 --- a/src/pages/order/components/payment/index.tsx +++ b/src/pages/order/components/payment/index.tsx @@ -90,11 +90,11 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = // 预存款选择 const advanceRef = useRef(null) - const advanceSelectData = useCallback((val) => { + const advanceSelectData = useCallback(async(val) => { setSubmitData(e => ({ ...e, payment_method: val })) }, []) - const changeSelect = async() => { - await openSubscriptionMessage({ orderId: orderInfo?.id, scenes: ToPay.value }) + const changeSelect = async(e) => { + e.stopPropagation() advanceRef.current.onSelectEven() } @@ -120,12 +120,13 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = return false } // 账期支付,或预付款并且不是剪板才会订阅 - if ( - (submitData.payment_method == PaymentMethodAccountPeriod.value || orderInfo?.status == SaleorderstatusWaitingPrePayment.value) - && orderInfo?.sale_mode != 1 - ) { - await openSubscriptionMessage({ orderId: orderInfo?.id, scenes: ToPay.value }) - } + // if ( + // (submitData.payment_method == PaymentMethodAccountPeriod.value || orderInfo?.status == SaleorderstatusWaitingPrePayment.value) + // && orderInfo?.sale_mode != 1 + // ) { + // await openSubscriptionMessage({ orderId: orderInfo?.id, scenes: ToPay.value }) + // } + await openSubscriptionMessage({ orderId: orderInfo?.id, scenes: ToPay.value }) alert.showLoading('正在支付') let res: any = null if (orderInfo?.should_collect_order_id) { @@ -224,7 +225,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = - + changeSelect(e)}> @@ -232,12 +233,14 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = {advance_payment} - advanceSelectData(PaymentMethodPreDeposit.value)} - onClose={() => advanceSelectData(null)} - /> + e.stopPropagation()}> + advanceSelectData(PaymentMethodPreDeposit.value)} + onClose={() => advanceSelectData(null)} + /> +