From c98b9a05d06adc3e1974a0994bfb36272ea4a1bd Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Thu, 3 Apr 2025 12:03:20 +0800
Subject: [PATCH] =?UTF-8?q?fix":=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 +
.../b-rx-commodity-item.vue | 9 ++-
.../orders-settlement/orders-settlement.vue | 16 +++--
.../order/orders-settlement/settlement.vue | 15 +++--
static/js/mixin/PayMixin.js | 63 ++++++++++---------
5 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/App.vue b/App.vue
index 57bdd46..19f646f 100644
--- a/App.vue
+++ b/App.vue
@@ -110,6 +110,7 @@
restaurant_id: this['globalData']['parameters'].restaurant_id,
restaurant_name: this['globalData']['parameters'].restaurant_name,
special: false,
+ distance: this['globalData']['parameters'].distance
})
};
}
diff --git a/components/b-rx-commodity-item/b-rx-commodity-item.vue b/components/b-rx-commodity-item/b-rx-commodity-item.vue
index a4958da..e5edc74 100644
--- a/components/b-rx-commodity-item/b-rx-commodity-item.vue
+++ b/components/b-rx-commodity-item/b-rx-commodity-item.vue
@@ -37,8 +37,8 @@
￥{{item['pay_price']}}
- ￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}
- ￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}
+ ￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}
+ ￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}
￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
@@ -134,10 +134,9 @@
.quantity {
// display: flex;
- // justify-content: space-between;
+ // justify-content: space-between;
font-size: 30rpx;
- flex: 1;
- color: #4A6FE7;
+ color: #3A6FE7;
.num {
text-align: center;
}
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index bc488be..ac146c0 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -163,12 +163,18 @@
- 抵用券
- {{computedTotal.used_broker}}
+ 抵用券抵扣
+
+ -
+ {{computedTotal.used_broker}}
+
- 余额
- {{computedTotal.used_coin}}
+ 余额抵扣
+
+ -
+ {{computedTotal.used_coin}}
+
@@ -428,8 +434,10 @@
wx.miniProgram.navigateTo({
url: `/pages/goods/order_list/index`
});
+ uni.hideLoading();
}, 1000)
} else {
+ uni.showLoading({ title: '支付成功, 跳转订单页' });
this.$Payment.H5TOWX_Payment({
datas: res['data'],
shopInfo: from.products,
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index 06059fe..7cb94ab 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -138,12 +138,18 @@
- 抵用券
- {{computedTotal.used_broker}}
+ 抵用券抵扣
+
+ -
+ {{computedTotal.used_broker}}
+
- 余额
- {{computedTotal.used_coin}}
+ 余额抵扣
+
+ -
+ {{computedTotal.used_coin}}
+
@@ -377,6 +383,7 @@
wx.miniProgram.navigateTo({
url: `/pages/goods/order_list/index`
});
+ uni.hideLoading();
}, 1000)
} else {
this.$Payment.H5TOWX_Payment({
diff --git a/static/js/mixin/PayMixin.js b/static/js/mixin/PayMixin.js
index 1742a08..a66e635 100644
--- a/static/js/mixin/PayMixin.js
+++ b/static/js/mixin/PayMixin.js
@@ -50,23 +50,23 @@ class Payment {
wx.miniProgram.navigateTo({
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}`
});
-
// 延迟两秒后H5内部跳转
- // setTimeout(()=>{
- // uni.hideLoading();
- // if(return_url){
- // // 是否需要关闭调起支付的页面
- // if(redirect){
- // uni.redirectTo({
- // url:return_url
- // });
- // }else{
- // uni.navigateTo({
- // url:return_url
- // })
- // }
- // }
- // },2000)
+ setTimeout(()=>{
+ uni.hideLoading();
+ // if(return_url){
+ // // 是否需要关闭调起支付的页面
+ // if(redirect){
+ // uni.redirectTo({
+ // url:return_url
+ // });
+ // }else{
+ // uni.navigateTo({
+ // url:return_url
+ // })
+ // }
+ // }
+ uni.hideLoading();
+ },2000)
}catch(e){
console.log(e)
uni.hideLoading();
@@ -101,22 +101,23 @@ class Payment {
// // return
// location.href = res['data']['openlink'];
// // 延迟两秒后H5内部跳转
- setTimeout(()=>{
- uni.hideLoading();
- if(return_url){
- // 是否需要关闭调起支付的页面
- if(redirect){
- uni.redirectTo({
- url:return_url
- });
- }else{
- uni.navigateTo({
- url:return_url
- })
- }
- }
- },2000)
+ // setTimeout(()=>{
+ // uni.hideLoading();
+ // if(return_url){
+ // // 是否需要关闭调起支付的页面
+ // if(redirect){
+ // uni.redirectTo({
+ // url:return_url
+ // });
+ // }else{
+ // uni.navigateTo({
+ // url:return_url
+ // })
+ // }
+ // }
+ // },2000)
// })
+ uni.hideLoading();
}
}else{
OrderData['WechatRetreat'] = true;