From 387c73f9ac2febe9e8fb091b494a07f57de2b41a Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Thu, 10 Apr 2025 14:01:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b-rx-commodity-item.vue                   |  7 ++++++-
 components/b-rx-sku-popup/b-rx-sku-popup.vue  | 20 ++++++++++++++++---
 .../components/shop-cart/shop-cart.vue        |  4 ++--
 .../order/orders-settlement/settlement.vue    | 14 +++++++++----
 4 files changed, 35 insertions(+), 10 deletions(-)

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 e5edc74..04ea596 100644
--- a/components/b-rx-commodity-item/b-rx-commodity-item.vue
+++ b/components/b-rx-commodity-item/b-rx-commodity-item.vue
@@ -16,7 +16,11 @@
 				<view class="b-rx-commodity-item-commodity-infor-money">
 					<view class="b-rx-commodity-item-commodity-infor-money-price">
 						<text class="b-rx-commodity-item-commodity-infor-money-yang">x</text>
-						<text class="b-rx-commodity-item-commodity-infor-money-amount">{{item['num']?item['num']:item['amount']}}</text>
+						<view>
+							<text class="b-rx-commodity-item-commodity-infor-money-amount">
+								{{item['num']?item['num']:item['amount']}}
+							</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -42,6 +46,7 @@
 			</view>
 			<view class="num" v-else-if="!item['original_price'] && BrandInfor['brand_id'] == 10">
 				￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
+				<text v-if="item['add_price']">(+{{item['add_price']}})</text>
 			</view>
 		</view>
 	</view>
diff --git a/components/b-rx-sku-popup/b-rx-sku-popup.vue b/components/b-rx-sku-popup/b-rx-sku-popup.vue
index 7c35839..c162235 100644
--- a/components/b-rx-sku-popup/b-rx-sku-popup.vue
+++ b/components/b-rx-sku-popup/b-rx-sku-popup.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="b-rx-sku-popup">
-		<u-popup :show="show" @close="show = false" round="20" closeable zIndex="20080">
+		<u-popup :show="show" @close="show = false" mode="bottom" round="20" closeable zIndex="20080" >
 			<view class="commodity-sku">
 				<!-- 商品图 -->
 				<view class="commodity-sku-cover">
@@ -39,6 +39,7 @@
 						</view>
 					</template>
 				</view>
+				<view style="height: 200rpx"></view>
 				<view class="commodity-sku-Infor">
 					<view class="commodity-sku-Infor-left">
 						<view class="commodity-sku-Infor-left-Price">
@@ -194,10 +195,17 @@
 </script>
 
 <style lang="scss">
+	.b-rx-sku-popup {
+		overflow: hidden;
+		position: fixed;
+		z-index: 999;
+	}
 	// 规格弹框样式
 	.commodity-sku {
+		height: 100vh;
+		overflow-y: scroll;
 		&-cover {
-			// height: 560rpx;
+			height: 560rpx;
 			height: auto;
 			position: relative;
 
@@ -296,7 +304,9 @@
 			align-items: center;
 			padding: 32rpx;
 			border-top: 1rpx solid rgba(102, 102, 102, 0.1);
-
+			position: fixed;
+			bottom: 0rpx;
+			background-color: #fff;
 			&-left {
 				&-Price {
 					color: #FF780F;
@@ -328,4 +338,8 @@
 			}
 		}
 	}
+	
+	.u-popup__content {
+		overflow-y: scroll !important;
+	}
 </style>
diff --git a/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue b/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
index 5691ba6..2f8b95c 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
+++ b/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
@@ -208,8 +208,8 @@
 											<view class="MDL-Cart-Popup-item-commodity-infor-money">
 												<view class="MDL-Cart-Popup-item-commodity-infor-money-price">
 													<text class="MDL-Cart-Popup-item-commodity-infor-money-yang">￥</text>
-													<text class="MDL-Cart-Popup-item-commodity-infor-money-amount">{{(item['pay_price'] * item['num'])}}</text>
-													<!-- <text class="MDL-Cart-Popup-item-commodity-infor-money-amount">{{RetainDecimalPoint((item['pay_price'] * item['num']))}}</text> -->
+													<text class="MDL-Cart-Popup-item-commodity-infor-money-amount" v-if="item.pay_price">{{(item.pay_price * item.num)}}</text>
+													<text class="MDL-Cart-Popup-item-commodity-infor-money-amount" v-else>{{(item.adj_pay * item.num)}}</text>
 												</view>
 											</view>
 										</view>
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index b112bf8..f894f6b 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -22,7 +22,8 @@
 						<view class="text-wrapper_1">
 							<text lines="1" class="text_7">¥</text>
 							<!-- <text lines="1" class="text_8">{{_amount(item['adj_pay'] * item['num'])}}</text> -->
-							<text lines="1" class="text_8">{{item['adj_pay'] * item['num']}}</text>
+							<text lines="1" class="text_8">{{__amount(item['bt_price'] * item['num'])}}</text>
+							<text lines="1" class="text_8 del">{{__amount(item['adj_pay'] * item['num'])}}</text>
 						</view>
 						<text lines="1" class="text_9">×{{item['num']}}</text>
 					</view>
@@ -282,6 +283,7 @@
 			
 			getCart() {
 				let products = [];
+				this.shoptotalnum = 0;
 				// 因为进入时暂时获取不到deepClone方法所以使用反转化
 				let newobj = JSON.parse(JSON.stringify(this['GetCartList2']));
 				for (let i = 0; i < newobj['length']; i++) {
@@ -654,7 +656,11 @@
 		font-family: PingFang-SC-Medium;
 		text-align: center;
 		white-space: nowrap;
-		line-height: 22rpx;
+		line-height: 22rpx;
+		.del {
+			text-decoration: line-through;
+			padding-left: 20rpx;
+		}
 	}
 
 	.text_7 {
@@ -963,7 +969,7 @@
 			border-color: var(--Checkboxborder) !important;
 			padding: 5rpx;
 			position: relative;
-
+			
 			&::after {
 				content: '';
 				position: absolute;
@@ -971,7 +977,7 @@
 				height: 12rpx;
 				border-radius: 50%;
 				border: 3rpx solid #ffffff;
-				background-color: var(--Checkboxborder);
+				background-color: #FFBC0D;
 				left: 50%;
 				top: 50%;
 				transform: translate(-50%, -50%);