From ff7aa74ab1b234f168950ac4e67efe3ee080cbca Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Fri, 11 Apr 2025 15:53:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E6=8A=B5=E7=94=A8=E5=88=B8=E6=8A=B5=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/shop_home/components/shop-item/shop-item.vue       | 6 +++---
 .../order/orders-settlement/orders-settlement.vue           | 3 ---
 static/js/mixin/PayMixin.js                                 | 6 +++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

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 @@
 			</view>
 			<!-- 积分 -->
 			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
-				<text class="yang">积分:</text>
+				<text class="yang">预估积分:</text>
 				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
 				<text class="price">{{item['integral']}}</text>
 			</view>
@@ -78,7 +78,7 @@
 			</view>
 			<!-- 积分 -->
 			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
-				<text class="yang">积分:</text>
+				<text class="yang">预估积分:</text>
 				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
 				<text class="price">{{item['integral']}}</text>
 			</view>
@@ -114,7 +114,7 @@
 			</view>
 			<!-- 积分 -->
 			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
-				<text class="yang">积分:</text>
+				<text class="yang">预估积分:</text>
 				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
 				<text class="price">{{item['integral']}}</text>
 			</view>
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){