diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 8782f0b..e9ddc62 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -183,12 +183,14 @@
}
function toPay() {
+ const userId=orderDetail.info.userId||''
go.to('PAGES_ORDER_PAY', {
tableId: options.tableId|| orderDetail.info.tableId,
tableName: options.name,
masterId: options.masterId,
orderId: orderDetail.info.id,
- discount: 1
+ discount: 1,
+ userId
})
}
diff --git a/pagesOrder/index/index.vue b/pagesOrder/index/index.vue
index 0257049..de60ea0 100644
--- a/pagesOrder/index/index.vue
+++ b/pagesOrder/index/index.vue
@@ -81,7 +81,7 @@
order.setVal('hasAjax',true)
}
onPullDownRefresh(()=>{
- pageData.order.query.page=0
+ order.setQuery('page',0)
init()
})
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index a7ccf25..4560c98 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -37,7 +37,7 @@
-
@@ -45,11 +45,11 @@
{{item.payName}}
-
- ¥{{user.amount||'0'}}
+
+
@@ -117,6 +117,7 @@
onLoad
} from '@dcloudio/uni-app'
import * as Api from '@/http/yskApi/Instead.js'
+ import {queryAllShopUser} from '@/http/yskApi/shop-user.js'
import * as orderApi from '@/http/yskApi/order.js'
import infoBox from '@/commons/utils/infoBox.js'
import editDiscount from '@/components/my-components/edit-discount.vue'
@@ -124,6 +125,8 @@
let payStatus = ref(null) //loading success
let timer = null
+
+ let user=ref({amount:0});
function clear() {
clearInterval(timer)
@@ -182,7 +185,10 @@
pays.payTypes.list = payTypeList
}
- function changePayType(i) {
+ function changePayType(i,item) {
+ if(item.payType=='vipPay'&&user.value.amount*1 {
+ onLoad(async(opt) => {
orderApi.$getOrderPayUrl({
orderId: opt.orderId
}).then(res => {
@@ -274,6 +279,13 @@
})
console.log(opt);
Object.assign(order, opt)
+ const payTypeList = await Api.$getPayType()
+ pays.payTypes.list = payTypeList
+ if(order.userId){
+ queryAllShopUser({id:opt.userId}).then(res=>{
+ user.value=res.content[0]||opt
+ })
+ }
init()
})