admin1/jiangchengfeiyi-xiaochengxu
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is lastest update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-25 11:45:37 +08:00
parent c560083ae6
commit 04864e6ed1
12 changed files with 57 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail.vue
View File

@ -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) {

14
pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue
View File

@ -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

14
pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue
View File

@ -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() { //加载弹窗

15
pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue
View File

@ -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: '支付失败，请刷新后重试',

5
pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue
View File

@ -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) {

13
pages/my-order/myGeneralOrderDetail/myGeneralOrderDetail.vue
View File

@ -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() { //加载弹窗
@ -286,6 +279,10 @@
},
fail(e) {
},
complete () {
hideLoading()
isShow.value = false //关闭遮罩
}
})
}catch(error) {

25
pages/my-order/myOrderList/myOrderList.vue
View File

@ -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]
}
}
}

13
pages/my-order/myServiceOrderDetail/myServiceOrderDetail.vue
View File

@ -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) {

11
pages/order/product-waitpay/product-waitpay.vue
View File

@ -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) {

11
pages/order/serviceWaitPay/serviceWaitPay.vue
View File

@ -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) {

11
pages/order/singleGoodOrder/singleGoodOrder.vue
View File

@ -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
})

11
pages/order/singleServiceWait/singleServiceWait.vue
View File

@ -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() { //加载弹窗