支付方式优化,外带订单去除table参数
This commit is contained in:
parent
31e656eb45
commit
32ab643a6b
|
|
@ -27,7 +27,7 @@
|
||||||
<view class="card_bom_item" @click="itemClick(1)">
|
<view class="card_bom_item" @click="itemClick(1)">
|
||||||
<text>{{shopUserInfo.amount || '0.00'}}</text><text>储值</text>
|
<text>{{shopUserInfo.amount || '0.00'}}</text><text>储值</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="card_bom_item">
|
<view class="card_bom_item" @click="itemClick(2)">
|
||||||
<text>{{shopUserInfo.accountPoints || '0'}}</text><text>积分</text>
|
<text>{{shopUserInfo.accountPoints || '0'}}</text><text>积分</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="card_bom_item" @click="itemClick(3)">
|
<view class="card_bom_item" @click="itemClick(3)">
|
||||||
|
|
@ -134,6 +134,11 @@
|
||||||
shopId: this.shopId,
|
shopId: this.shopId,
|
||||||
type: 'index',
|
type: 'index',
|
||||||
})
|
})
|
||||||
|
} else if ( type == 2 ) {
|
||||||
|
uni.pro.navigateTo('/pagesPoints/index/index', {
|
||||||
|
shopId: this.shopId,
|
||||||
|
type: 'member',
|
||||||
|
})
|
||||||
} else if ( type == 3 ) {
|
} else if ( type == 3 ) {
|
||||||
uni.pro.navigateTo('user/coupon', {
|
uni.pro.navigateTo('user/coupon', {
|
||||||
shopId: this.shopId,
|
shopId: this.shopId,
|
||||||
|
|
|
||||||
|
|
@ -86,12 +86,20 @@
|
||||||
payAmount:{
|
payAmount:{
|
||||||
immediate: true,
|
immediate: true,
|
||||||
handler (newVal) {
|
handler (newVal) {
|
||||||
|
if ( this.amountVIP.amount < newVal) {
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
this.radiovalue = 2
|
||||||
|
// #endif
|
||||||
|
// #ifdef MP-ALIPAY
|
||||||
|
this.radiovalue = 3
|
||||||
|
// #endif
|
||||||
|
}
|
||||||
if ( newVal <= 0 ) {
|
if ( newVal <= 0 ) {
|
||||||
this.radiovalue = 1
|
this.radiovalue = 1
|
||||||
|
}
|
||||||
let name = this.paymentMethodName[this.radiovalue-1].name;
|
let name = this.paymentMethodName[this.radiovalue-1].name;
|
||||||
this.$emit("groupChange",{type:this.radiovalue ,name: name })
|
this.$emit("groupChange",{type:this.radiovalue ,name: name })
|
||||||
}
|
}
|
||||||
}
|
|
||||||
},
|
},
|
||||||
rechargeFreeChecked:{
|
rechargeFreeChecked:{
|
||||||
immediate: true,
|
immediate: true,
|
||||||
|
|
|
||||||
|
|
@ -880,7 +880,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
let params = {
|
let params = {
|
||||||
"tableId": this.tableCode , //桌台码
|
|
||||||
"shopId": uni.cache.get('shopId'),
|
"shopId": uni.cache.get('shopId'),
|
||||||
"userId": uni.cache.get('userInfo').id,
|
"userId": uni.cache.get('userInfo').id,
|
||||||
"sendType": this.sendType,
|
"sendType": this.sendType,
|
||||||
|
|
@ -892,6 +891,7 @@
|
||||||
if ( this.userCouponInfos ) {
|
if ( this.userCouponInfos ) {
|
||||||
params.userCouponInfos = this.userCouponInfos
|
params.userCouponInfos = this.userCouponInfos
|
||||||
}
|
}
|
||||||
|
if ( this.tableCode && this.sendType == "table") { params.tableId = this.tableCode; }
|
||||||
let res = await this.api.creatOrder(params)
|
let res = await this.api.creatOrder(params)
|
||||||
this.listinfoid = res.data.id;
|
this.listinfoid = res.data.id;
|
||||||
if ( this.storeInfo.registerType == 'restaurant') {
|
if ( this.storeInfo.registerType == 'restaurant') {
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,8 @@
|
||||||
this.$refs.orderInfoAfterRef.childOnShow();
|
this.$refs.orderInfoAfterRef.childOnShow();
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if ( this.listinfo ) {
|
console.log(JSON.stringify(this.listinfo))
|
||||||
|
if ( JSON.stringify(this.listinfo) != '{}' ) {
|
||||||
this.getAount();
|
this.getAount();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue