From 86beddf2fa04190adeb5efaced0a7dd0492e1730 Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Fri, 17 Jul 2026 10:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/shop-item/shop-item.vue        | 64 ++++++++++---------
 pages/restaurant/home/shop_home/shop_home.vue |  2 +-
 .../orders-settlement/orders-settlement.vue   |  2 +
 request/request.js                            |  2 +-
 4 files changed, 39 insertions(+), 31 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 50891ab..c13ea88 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
@@ -60,32 +60,28 @@
 			<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
 				{{item['product_name']}}
 			</view>
-			<!-- 补贴金额 -->
-			<!-- <view class="shop_home-commodity-infor-discount shop_home-commodity-infor-bottom">
-				最高补贴{{RetainDecimalPoint(item['max_deduction'])}}元
-			</view> -->
-			<!-- 价格 -->
-			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
-				<text class="yang">原价:￥</text>
-				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> -->
-				<text class="price">{{item['product_price']}}</text>
-			</view>
-			<!-- 优惠补贴后的价格 -->
-			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
-				<text class="yang">补贴后价格:￥</text>
-				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
-				<text class="price">{{item['bt_price']}}</text>
+			<view class="flex">
+				<!-- 优惠补贴后的价格 -->
+				<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
+					<text class="price">¥{{item['bt_price']}}</text>
+				</view>
+				<!-- 价格 -->
+				<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
+					<text class="price">¥{{item['product_price']}}</text>
+				</view>
 			</view>
 			<!-- 消费补贴卡 -->
-			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
+			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="item['subsidy_card_price']">
 				<text class="yang">消费补贴卡:￥</text>
 				<text class="price">{{item['subsidy_card_price']}}</text>
 			</view>
 			<!-- 积分 -->
-			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
-				<text class="yang">预估积分:</text>
-				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
-				<text class="price">{{item['integral']}}</text>
+			<view v-else>
+				<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
+					<text class="yang">预估积分:</text>
+					<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
+					<text class="price">{{item['integral']}}</text>
+				</view>
 			</view>
 			<!-- 选规格 -->
 			<view class="shop_home-commodity-infor-cart-sku" @tap="$u.debounce(Addcommodity, 800,true)">
@@ -364,16 +360,28 @@
 		}
 
 		&-commodity-infor {
-			flex: 1;
+			flex: 1;
+			display: flex;
 			padding-left: 22rpx;
-
+			flex-direction: column;
+			justify-content: space-between;
 			&-bottom {
 				// margin-bottom: 12rpx;
+			}
+			
+			.huaxian {
+				margin-left: 20rpx;
+				color: gray;
+				text-decoration: line-through;
+				.price {
+					font-size: 24rpx !important;
+				}
 			}
 
 			&-title {
-				font-size: $FONTSIZE26;
-				color: $THEMECOLOR4;
+				font-size: $FONTSIZE30;
+				color: $THEMECOLOR4;
+				font-weight: 600;
 			}
 
 			&-discount {
@@ -387,13 +395,14 @@
 
 			&-price {
 				color: $THEMECOLOR1;
-
+				
 				.yang {
 					font-size: $FONTSIZE22;
 				}
 
 				.price {
-					font-size: $FONTSIZE30;
+					font-size: $FONTSIZE30;
+					font-weight: 600;
 				}
 			}
 
@@ -418,13 +427,10 @@
 			}
 			
 			&-cart-sku {
-				flex: 1;
-				height: 60rpx;
 				display: flex;
 				justify-content: flex-end;
 				font-size: 36rpx;
 				align-items: center;
-			
 				&-btn {
 					width: 106rpx;
 					height: 50rpx;
diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue
index 78e004f..8f10d28 100644
--- a/pages/restaurant/home/shop_home/shop_home.vue
+++ b/pages/restaurant/home/shop_home/shop_home.vue
@@ -107,7 +107,7 @@
 			return {
 				// 肯德基
 				// 顶部通知
-				topNotice: '当前6人正在下单，获取取餐码等待时间为1-2分钟，景区和交通枢纽不支持线上点餐～',
+				topNotice: '当前5人正在下单，获取取餐码等待时间为1-2分钟，景区和交通枢纽不支持线上点餐～',
 				show: false,
 
 				suspend: config['suspend'],
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 1cd5ec8..acc0ca9 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -468,6 +468,8 @@
 				
 				// 创建订单
 				createFoodOrder(from).then(res => {
+					console.log(res, '创建订单返回')
+					
 					let redirect_url = '/pages/restaurant/order/order-details/details';
 					uni.hideLoading();
 					
diff --git a/request/request.js b/request/request.js
index a5e47e9..ff550d7 100644
--- a/request/request.js
+++ b/request/request.js
@@ -134,7 +134,7 @@ class Request {
 						// #ifdef H5
 						if (infor['data']['status'] == 110002) {
 							window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`;
-							// window.location.href = `http://10.210.254.176:8081/JXH5/#/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`;
+							// window.location.href = `https://10.210.254.143:1024/JXH5/#/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`;
 						}
 						// #endif
 						if (infor['data']['msg'] == '产品错误' || infor['data']['msg'] == '产品不存在') {