diff --git a/pages/member/memberdetails.vue b/pages/member/memberdetails.vue
index 73307ce..a47810b 100644
--- a/pages/member/memberdetails.vue
+++ b/pages/member/memberdetails.vue
@@ -27,7 +27,7 @@
{{shopUserInfo.amount || '0.00'}}储值
-
+
{{shopUserInfo.accountPoints || '0'}}积分
@@ -134,6 +134,11 @@
shopId: this.shopId,
type: 'index',
})
+ } else if ( type == 2 ) {
+ uni.pro.navigateTo('/pagesPoints/index/index', {
+ shopId: this.shopId,
+ type: 'member',
+ })
} else if ( type == 3 ) {
uni.pro.navigateTo('user/coupon', {
shopId: this.shopId,
diff --git a/pagesOrder/components/paymentMethod.vue b/pagesOrder/components/paymentMethod.vue
index 6e5f1ac..bca72fa 100644
--- a/pagesOrder/components/paymentMethod.vue
+++ b/pagesOrder/components/paymentMethod.vue
@@ -86,11 +86,19 @@
payAmount:{
immediate: true,
handler (newVal) {
+ if ( this.amountVIP.amount < newVal) {
+ // #ifdef MP-WEIXIN
+ this.radiovalue = 2
+ // #endif
+ // #ifdef MP-ALIPAY
+ this.radiovalue = 3
+ // #endif
+ }
if ( newVal <= 0 ) {
this.radiovalue = 1
- let name = this.paymentMethodName[this.radiovalue-1].name;
- this.$emit("groupChange",{type:this.radiovalue ,name: name })
}
+ let name = this.paymentMethodName[this.radiovalue-1].name;
+ this.$emit("groupChange",{type:this.radiovalue ,name: name })
}
},
rechargeFreeChecked:{
diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue
index 6cde1d9..a609723 100644
--- a/pagesOrder/confirm_order/index.vue
+++ b/pagesOrder/confirm_order/index.vue
@@ -880,7 +880,6 @@
}
let params = {
- "tableId": this.tableCode , //桌台码
"shopId": uni.cache.get('shopId'),
"userId": uni.cache.get('userInfo').id,
"sendType": this.sendType,
@@ -892,6 +891,7 @@
if ( this.userCouponInfos ) {
params.userCouponInfos = this.userCouponInfos
}
+ if ( this.tableCode && this.sendType == "table") { params.tableId = this.tableCode; }
let res = await this.api.creatOrder(params)
this.listinfoid = res.data.id;
if ( this.storeInfo.registerType == 'restaurant') {
diff --git a/pagesOrder/order_detail/index.vue b/pagesOrder/order_detail/index.vue
index 5dbd98b..f5bc5a9 100644
--- a/pagesOrder/order_detail/index.vue
+++ b/pagesOrder/order_detail/index.vue
@@ -138,7 +138,8 @@
this.$refs.orderInfoAfterRef.childOnShow();
})
}
- if ( this.listinfo ) {
+ console.log(JSON.stringify(this.listinfo))
+ if ( JSON.stringify(this.listinfo) != '{}' ) {
this.getAount();
}
},