diff --git a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue index 78cd7eb..a6e740a 100644 --- a/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue +++ b/pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue @@ -168,16 +168,9 @@ const wxPayFd = (order) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShow.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(order.id) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShow.value = false //关闭遮罩 - },2000) + wxPay(order.id) } function showLoading() { //加载弹窗 @@ -229,6 +222,10 @@ }, fail(e) { + }, + complete () { + hideLoading() + isShow.value = false //关闭遮罩 } }) }catch(error) { diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue index 860d81f..8239d84 100644 --- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue +++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue @@ -134,6 +134,7 @@ const isShowMask = ref(false) let wxPayTimer = null; let loading = false; + let point = 0 let isLoading = ref(false) const bkgUrl = ref(bookUrl + '/photoProductsOrderDetail/bkg.png') onLoad(() => { @@ -206,7 +207,9 @@ } - const changeState = async (index:any) => { + const changeState = (index:any) => { + if (point === index) return + point = index if (!isShow.value[index]) { for (var i = 0; i < 3; i ++ ) { if (i == index) { @@ -242,16 +245,9 @@ const wxPayFd = (oid) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShowMask.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(oid) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShowMask.value = false //关闭遮罩 - },2000) + wxPay(oid) } const wxPay = async ( oid )=> { //传入订单id diff --git a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue index 27ec7d2..7020a1b 100644 --- a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue +++ b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue @@ -123,7 +123,6 @@ import { onPullDownRefresh } from '@dcloudio/uni-app'; import { getFonts } from '../../../common/globalFont'; import { onLoad } from "@dcloudio/uni-app"; - const items = ref([null, null, null, null]) const isShowUnderLine = ref([true, false, false, false, false]) let orderStatusList = ['全部', '待支付', '待发货', '待收货', '交易成功'] const color = ref(new Array(5).fill('#323232')) @@ -189,7 +188,7 @@ }); } - const isSelectedState = async (val) => { + const isSelectedState = (val) => { if (point.value === val) return point.value = val for (var i = 0; i < 5; i++) { @@ -287,6 +286,8 @@ orderList.value[i].operationList = [true, true, false, false, false, true] } else if (order.orderStatus === '交易成功') { orderList.value[i].operationList = [true, false, false, false, false, false] + }else { + orderList.value[i].operationList = [true, false, false, false, false, false] } } } @@ -394,16 +395,9 @@ const wxPayFd = (oid) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShow.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(oid) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShow.value = false //关闭遮罩 - },2000) + wxPay(oid) } function showLoading() { //加载弹窗 diff --git a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue index 1a91733..f1d5371 100644 --- a/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue +++ b/pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue @@ -197,16 +197,9 @@ } const wxPayFd = (order) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShow.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(order.id) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShow.value = false //关闭遮罩 - },2000) + wxPay(order.id) } function showLoading() { //加载弹窗 @@ -257,9 +250,15 @@ }, fail(e) { + }, + complete () { + hideLoading() + isShow.value = false //关闭遮罩 } }) }catch(error) { + hideLoading() + isShow.value = false //关闭遮罩 uni.showModal({ title: '提示', content: '支付失败，请刷新后重试', diff --git a/pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue b/pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue index 03778bf..ac03112 100644 --- a/pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue +++ b/pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue @@ -76,7 +76,7 @@ import emitter from '../../../utils/emitter'; import { JudgeIsNullity, dealResult } from '../../../common/globalFunction'; import contactsComponentVue from '../../order/component/contactsComponent.vue'; -import { getFonts } from '../../../common/globalFont'; + import { getFonts } from '../../../common/globalFont'; const period = ref(0) let id = 0 const clothesInfo = ref({}) @@ -215,12 +215,9 @@ import { getFonts } from '../../../common/globalFont'; }) return ; } - clearTimeout(wxPayTimer) showLoading() isShow.value = true - wxPayTimer = setTimeout(async () => { - await createOrder() - }, 1000) + createOrder() } function showLoading() { //加载弹窗 if (!loading) { diff --git a/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue b/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue index 0cfc2ac..300ae1b 100644 --- a/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue +++ b/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue @@ -225,16 +225,9 @@ const wxPayFd = (order) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShow.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(order.id) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShow.value = false //关闭遮罩 - },2000) + wxPay(order.id) } function showLoading() { //加载弹窗 @@ -285,7 +278,11 @@ getOrderById(oid) }, fail(e) { - + + }, + complete () { + hideLoading() + isShow.value = false //关闭遮罩 } }) }catch(error) { diff --git a/pages/my-order/myOrderList/myOrderList.vue b/pages/my-order/myOrderList/myOrderList.vue index 2df92c2..054ed17 100644 --- a/pages/my-order/myOrderList/myOrderList.vue +++ b/pages/my-order/myOrderList/myOrderList.vue @@ -218,7 +218,7 @@ - const isSelectedState = async (val) => { + const isSelectedState = (val) => { if (point.value === val) return point.value = val for (var i = 0; i < 5; i ++ ) { @@ -285,16 +285,9 @@ const wxPayFd = (order) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShow.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(order.id, order.orderType) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShow.value = false //关闭遮罩 - },2000) + wxPay(order.id, order.orderType) } function showLoading() { //加载弹窗 @@ -342,17 +335,11 @@ content: '支付成功', showCancel: false }) - if (type === 'product') { - uni.redirectTo({ - url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid - }) - } else { - uni.redirectTo({ - url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid - }) - } }, fail(e) { + + }, + complete () { if (type === 'product') { uni.redirectTo({ url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid @@ -503,6 +490,8 @@ orderList.value[i].operationList = [false, false, true, false, false, false] } else if (order.orderStatus === '交易成功') { orderList.value[i].operationList = [false, false, false, false, false, true] + }else { + orderList.value[i].operationList = [false, false, false, false, false, true] } } } diff --git a/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue b/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue index e0dc563..9108699 100644 --- a/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue +++ b/pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue @@ -196,16 +196,9 @@ const wxPayFd = (order) => { //微信支付按钮防抖 - clearTimeout(wxPayTimer) showLoading() isShow.value = true //打开遮罩 - wxPayTimer = setTimeout(async () => { - await wxPay(order.id) - }, 1000) - setTimeout(()=>{ - hideLoading() - isShow.value = false //关闭遮罩 - },2000) + wxPay(order.id) } function showLoading() { //加载弹窗 @@ -257,6 +250,10 @@ }, fail(e) { + }, + complete () { + hideLoading() + isShow.value = false //关闭遮罩 } }) }catch(error) { diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue index 69d99c3..8989be9 100644 --- a/pages/order/product-waitpay/product-waitpay.vue +++ b/pages/order/product-waitpay/product-waitpay.vue @@ -381,11 +381,11 @@ const wxPay = async( oid )=> { //传入订单id content: '支付成功', showCancel: false }) - uni.redirectTo({ - url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid - }) }, fail(e) { + + }, + complete () { uni.redirectTo({ url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid }) @@ -423,12 +423,9 @@ const wxPay = async( oid )=> { //传入订单id }) return ; } - clearTimeout(wxPayTimer) showLoading() isShow.value = true - wxPayTimer = setTimeout(async () => { - await createOrder() - }, 1000) + createOrder() } function showLoading() { //加载弹窗 if (!loading) { diff --git a/pages/order/serviceWaitPay/serviceWaitPay.vue b/pages/order/serviceWaitPay/serviceWaitPay.vue index d55c720..44fe1e7 100644 --- a/pages/order/serviceWaitPay/serviceWaitPay.vue +++ b/pages/order/serviceWaitPay/serviceWaitPay.vue @@ -423,11 +423,11 @@ content: '支付成功', showCancel: false }) - uni.redirectTo({ - url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid - }) }, fail(e) { + + }, + complete () { uni.redirectTo({ url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid }) @@ -464,12 +464,9 @@ }) return ; } - clearTimeout(wxPayTimer) showLoading() isShow.value = true - wxPayTimer = setTimeout(async () => { - await createOrder() - }, 1000) + createOrder() } function showLoading() { //加载弹窗 if (!loading) { diff --git a/pages/order/singleGoodOrder/singleGoodOrder.vue b/pages/order/singleGoodOrder/singleGoodOrder.vue index badfc10..847f22f 100644 --- a/pages/order/singleGoodOrder/singleGoodOrder.vue +++ b/pages/order/singleGoodOrder/singleGoodOrder.vue @@ -321,12 +321,9 @@ const updateAddressHandler = (val) => { }) return ; } - clearTimeout(wxPayTimer) showLoading() isShow.value = true - wxPayTimer = setTimeout(async () => { - await createOrder() - }, 1000) + createOrder() } @@ -493,11 +490,11 @@ const wxPay = async ( oid )=> { //传入订单id content: '支付成功', showCancel: false }) - uni.redirectTo({ - url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid - }) }, fail(e) { + + }, + complete () { uni.redirectTo({ url: '/pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail?id=' + oid }) diff --git a/pages/order/singleServiceWait/singleServiceWait.vue b/pages/order/singleServiceWait/singleServiceWait.vue index 6f122bd..485a068 100644 --- a/pages/order/singleServiceWait/singleServiceWait.vue +++ b/pages/order/singleServiceWait/singleServiceWait.vue @@ -417,11 +417,11 @@ content: '支付成功', showCancel: false }) - uni.redirectTo({ - url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid - }) }, fail(e) { + + }, + complete () { uni.redirectTo({ url: '/pages/my-order/myServiceOrderDetail/myServiceOrderDetail?id=' + oid }) @@ -463,12 +463,9 @@ }) return ; } - clearTimeout(wxPayTimer) showLoading() isShow.value = true - wxPayTimer = setTimeout(async () => { - await createOrder() - }, 1000) + createOrder() } function showLoading() { //加载弹窗