diff --git a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue index ec36981..2e6b312 100644 --- a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue +++ b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue @@ -28,7 +28,7 @@ - 积分: + 预估积分: {{item['integral']}} @@ -78,7 +78,7 @@ - 积分: + 预估积分: {{item['integral']}} @@ -114,7 +114,7 @@ - 积分: + 预估积分: {{item['integral']}} diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index 36f1460..8c50da8 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -385,12 +385,10 @@ // 是否使用券 isCoin() { this.use_coin = !this.use_coin; - this.getCart() }, isBroker() { this.use_broker = !this.use_broker; - this.getCart() }, /** @@ -467,7 +465,6 @@ return_url:`/pages/restaurant/order/order-details/details?order_sn=${res.data.order_sn}` }); } - // let redirect_url = '/pages/restaurant/order/order-details/details'; // uni.hideLoading(); diff --git a/static/js/mixin/PayMixin.js b/static/js/mixin/PayMixin.js index 88379e4..ce49927 100644 --- a/static/js/mixin/PayMixin.js +++ b/static/js/mixin/PayMixin.js @@ -65,13 +65,17 @@ class Payment { .map(([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`) .join('&'); + wx.miniProgram.navigateTo({ url: `/pages/extension/shop/wxPay/wxPay?${queryString}` }); - // 延迟两秒后H5内部跳转 setTimeout(()=>{ uni.hideLoading(); + + // 支付完成返回点餐首页 + window.history.back(); + // if(return_url){ // // 是否需要关闭调起支付的页面 // if(redirect){