diff --git a/pages.json b/pages.json index 65a2571..c9984a2 100644 --- a/pages.json +++ b/pages.json @@ -1168,7 +1168,10 @@ }, { "path": "classify/order/paymentResult", + "style": { + "navigationBarBackgroundColor": "#3da7e7", + "backgroundColorTop": "#3da7e7", "navigationBarTitleText": "支付结果", "enablePullDownRefresh": false } diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue index cf2801b..959528f 100644 --- a/pages/user/order_list/order_list.vue +++ b/pages/user/order_list/order_list.vue @@ -297,7 +297,6 @@ pageNum: this.pageNum, pageSize: this.pageSize } - getUserOrderList(params).then(res => { if (res.return_code == '000000' && res.return_data.list != '') { uni.hideLoading(); diff --git a/physical-merchants/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue index dff8bb9..e1c19a2 100644 --- a/physical-merchants/classify/cart/cart.vue +++ b/physical-merchants/classify/cart/cart.vue @@ -375,6 +375,7 @@ }, // 结算 settleAccount() { + if (!this.isHaveGoods()) return; if (this.priceAll > 0) { @@ -471,11 +472,11 @@ goodsEditNum(params).then(res => { if (res.return_code == '000000') { - uni.showToast({ - title: res.return_data, - icon: 'none', - duration: 2000 - }) + // uni.showToast({ + // title: res.return_data, + // icon: 'none', + // duration: 2000 + // }) } else { //增加数量失败 // this.cartList.map(item=>{ diff --git a/physical-merchants/classify/order/pay.vue b/physical-merchants/classify/order/pay.vue index 4e5a2b0..0f98df7 100644 --- a/physical-merchants/classify/order/pay.vue +++ b/physical-merchants/classify/order/pay.vue @@ -1,8 +1,8 @@