From eb97ee0951c5b91f42c9277aa043fca7f54356d6 Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Thu, 17 Apr 2025 18:32:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  3 +-
 pages/film/filmSeat.vue                       |  3 +-
 pages/pages-recharge/myDiamond/index.vue      |  3 +-
 .../shop_home/components/shop-cart/kdj.scss   | 31 +++++++++-
 .../shop_home/components/shop-cart/mdl.scss   |  2 +-
 .../shop_home/components/shop-cart/rx.scss    |  2 +-
 .../components/shop-cart/shop-cart.vue        | 41 ++++++++++---
 .../shop_home/components/shop-cart/xbk.scss   |  2 +-
 .../orders-settlement/orders-settlement.vue   | 38 ++++++-------
 .../order/orders-settlement/settlement.vue    | 57 ++++++++++++-------
 static/js/mixin/mixin.js                      |  6 +-
 11 files changed, 127 insertions(+), 61 deletions(-)

diff --git a/main.js b/main.js
index b3e7406..6343acb 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,8 @@ import App from './App'
 import store from './store';
 import prototype from '@/static/js/toolclass/prototype.js';
 import H5 from "@/static/js/index.js";
-import newconfig from "@/static/js/newconfig.js";
+import newconfig from "@/static/js/newconfig.js";
+
 Vue.use(newconfig);
 Vue.prototype.$store = store;
 Vue.prototype.$tst = 1;
diff --git a/pages/film/filmSeat.vue b/pages/film/filmSeat.vue
index 19afcea..e559eec 100644
--- a/pages/film/filmSeat.vue
+++ b/pages/film/filmSeat.vue
@@ -767,7 +767,8 @@
 		}
 
 		/deep/ .u-modal__title {
-			display: none !important;
+			display: none !important;
+			padding-bottom: 20rpx !important;
 		}
 	}
 
diff --git a/pages/pages-recharge/myDiamond/index.vue b/pages/pages-recharge/myDiamond/index.vue
index 27d5763..51efd41 100644
--- a/pages/pages-recharge/myDiamond/index.vue
+++ b/pages/pages-recharge/myDiamond/index.vue
@@ -189,7 +189,8 @@
 			color: #333333;
 			background: linear-gradient(117deg, #FFFBF7 0%, #FFF5EB 100%);
 			padding-bottom: 26rpx;
-			padding-top: 26rpx;
+			padding-top: 26rpx;
+			padding-bottom: 20rpx !important;
 		}
 
 		/deep/.u-modal__button-group {
diff --git a/pages/restaurant/home/shop_home/components/shop-cart/kdj.scss b/pages/restaurant/home/shop_home/components/shop-cart/kdj.scss
index 4e84186..612d318 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/kdj.scss
+++ b/pages/restaurant/home/shop_home/components/shop-cart/kdj.scss
@@ -5,7 +5,7 @@
 		box-shadow: 0px 0px 18px 0px rgba(0, 0, 0, 0.1);
 		border-radius: 20rpx 20rpx 0 0;
 		width: 100%;
-		height: 210rpx;
+		height: 100rpx;
 		flex-direction: row;
 		display: flex;
 		position: fixed;
@@ -66,7 +66,34 @@
 		// padding-bottom: calc();
 		height: 642rpx;
 		background-color: #ffffff;
-
+		.KDJ-Cart-Popup-top {
+			width: 100%;
+			height: 87rpx;
+			border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+			padding: 0 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 26rpx;
+			
+			.text {
+				color: #666666;
+			}
+			
+			&-empty {
+				color: #666666;
+				display: flex;
+				align-items: center;
+				padding: 15rpx 0 15rpx 15rpx;
+			
+				.img {
+					width: 29rpx;
+					height: 31rpx;
+					margin-right: 15rpx;
+				}
+			}
+		}
+		
 		&-item {
 			width: 100%;
 			margin-bottom: 20rpx;
diff --git a/pages/restaurant/home/shop_home/components/shop-cart/mdl.scss b/pages/restaurant/home/shop_home/components/shop-cart/mdl.scss
index e9bc904..ef49234 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/mdl.scss
+++ b/pages/restaurant/home/shop_home/components/shop-cart/mdl.scss
@@ -4,7 +4,7 @@
 		background-color: white;
 		border-radius: 20rpx 20rpx 0 0;
 		width: 100%;
-		height: 210rpx;
+		height: 140rpx;
 		flex-direction: row;
 		display: flex;
 		position: fixed;
diff --git a/pages/restaurant/home/shop_home/components/shop-cart/rx.scss b/pages/restaurant/home/shop_home/components/shop-cart/rx.scss
index e0c82c5..13b59dd 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/rx.scss
+++ b/pages/restaurant/home/shop_home/components/shop-cart/rx.scss
@@ -4,7 +4,7 @@
 		background-color: white;
 		border-radius: 20rpx 20rpx 0 0;
 		width: 100%;
-		height: 210rpx;
+		height: 140rpx;
 		flex-direction: row;
 		display: flex;
 		position: fixed;
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 2f8b95c..5fd7814 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
@@ -2,7 +2,7 @@
 	<view class="shop_home">
 		<template v-if="BrandInfor['brand_id'] == 1">
 			<!-- 购物车 -->
-			<view class="KDJ-Cart">
+			<view class="KDJ-Cart" :style="deviceOS == 'iOS'? 'height: 200rpx' : ''">
 				<view class="left">
 					<view class="left-img">
 						<image class="img" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''"
@@ -14,7 +14,7 @@
 					<view class="price">
 						<text class="yang">￥</text>
 						<!-- <text class="amount">{{RetainDecimalPoint(totalPrice)}}</text> -->
-						<text class="amount">{{totalPrice}}</text>
+						<text class="amount">{{_fixed(totalPrice)}}</text>
 					</view>
 				</view>
 				<view class="right" @tap="create" :class="[Shoplength > 0?'right2':'']">
@@ -26,6 +26,15 @@
 				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
 				<view class="KDJ-Cart-Popup">
 					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
+						<view class="KDJ-Cart-Popup-top">
+							<view class="text">
+								已选商品
+							</view>
+							<view class="KDJ-Cart-Popup-top-empty" @tap="EMPTY(GetShopInfor['restaurant_id'])">
+								<image class="img" :src="qnyurl('qingkong.png','rx')" mode=""></image>
+								<text>清空购物车</text>
+							</view>
+						</view>
 						<template v-for="(item,index) in MealList">
 							<view class="KDJ-Cart-Popup-item" :key='index'>
 								<!-- 商品 -->
@@ -36,7 +45,7 @@
 								<view class="money">
 									<view class="price">
 										<text class="yang">￥</text>
-										<text class="amount">{{item['adj_pay'] * item['num']}}</text>
+										<text class="amount">{{_fixed(item['adj_pay'] * item['num'])}}</text>
 										<!-- <text class="amount">{{RetainDecimalPoint(item['pay_price'] * item['num'])}}</text> -->
 									</view>
 								</view>
@@ -157,10 +166,11 @@
 					</scroll-view>
 				</view>
 			</u-popup>
-		</template>
+		</template>
+		
 		<template v-if="BrandInfor['brand_id'] == 5">
-			<!-- 购物车 -->
-			<view class="MDL-Cart">
+			<!-- 购物车 -->
+			<view class="MDL-Cart" :style="deviceOS == 'iOS'? 'height: 200rpx' : ''">
 				<view class="MDL-Cart-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
 					<view class="MDL-Cart-left-img">
 						<image class="img" :src="qnyurl('gouwuceicon.png','mdl')" mode="heightFix">
@@ -240,7 +250,7 @@
 		</template>
 		<template v-if="BrandInfor['brand_id'] == 10">
 				<!-- 购物车 -->
-				<view class="XBK-Cart">
+				<view class="XBK-Cart" :style="deviceOS == 'iOS'? 'height: 200rpx' : ''">
 					<view class="XBK-Cart-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
 						<view class="XBK-Cart-left-img">
 							<image class="img" :src="qnyurl('shopping.png','xbk')" mode="heightFix">
@@ -329,7 +339,7 @@
 		</template>
 		<template v-if="BrandInfor['brand_id'] == 13">
 			<!-- 购物车 -->
-			<view class="RX-Cart">
+			<view class="RX-Cart" :style="deviceOS == 'iOS'? 'height: 200rpx' : ''">
 				<view class="RX-Cart-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
 					<view class="RX-Cart-left-img">
 						<image class="img" :src="qnyurl('shopping.png','rx')" mode="aspectFill">
@@ -451,8 +461,21 @@
 					this['shoppingshow'] = false;
 				}
 				return this['MealList']['length'];
+			},
+			
+			deviceOS() {
+			  const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+			  
+			  if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
+			    return 'iOS';
+			  } else if (/android/i.test(userAgent)) {
+			    return 'Android';
+			  }
+			  
+			  return 'Unknown';
 			}
-		},
+		},
+		
 		watch: {
 			GetCartList: {
 				deep: true,
diff --git a/pages/restaurant/home/shop_home/components/shop-cart/xbk.scss b/pages/restaurant/home/shop_home/components/shop-cart/xbk.scss
index 1ae782a..24f6f44 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/xbk.scss
+++ b/pages/restaurant/home/shop_home/components/shop-cart/xbk.scss
@@ -4,7 +4,7 @@
 		background-color: white;
 		border-radius: 20rpx 20rpx 0 0;
 		width: 100%;
-		height: 210rpx;
+		height: 140rpx;
 		flex-direction: row;
 		display: flex;
 		position: fixed;
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index e345495..8c5a0e9 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -126,7 +126,7 @@
 		</view>
 
 		<!-- 确认门店信息 -->
-		<u-modal :show="show" title="请确认自取门店" closeOnClickOverlay @close="show = false">
+		<u-modal :show="show" title="请确认自取门店" closeOnClickOverlay @close="show = false" @confirm="confirmClick()" @cancel="show = false">
 			<template v-slot:default>
 				<view class="default-content">
 					<view class="location-Img">
@@ -148,10 +148,10 @@
 			<template v-slot:confirmButton>
 				<view class="confirmButton">
 					<view class="btn replace" @tap="navigateBack(2, true, 0)"
-						:style="{border:`1rpx solid ${Brand()['ThemeColor']}`,color:Brand()['ThemeColor']}">
+						:style="{border:`2rpx solid ${Brand()['ThemeColor']}`,color:Brand()['ThemeColor']}">
 						更换门店
 					</view>
-					<view class="btn confirm" @tap="confirmClick" :style="Brand()['customStyle']['BtnStyle'][0]">
+					<view class="btn confirm" @tap="$u.throttle(confirmClick, 1000)" :style="Brand()['customStyle']['BtnStyle'][0]">
 						就是这家
 					</view>
 				</view>
@@ -226,6 +226,7 @@
 	} from 'vuex';
 	// 商品组件
 	import bRxCommodityItem from '@/components/b-rx-commodity-item/b-rx-commodity-item.vue'
+	
 	let self;
 	export default {
 		mixins: [mixin, restaurantmixins, calculationamountmixin],
@@ -416,13 +417,15 @@
 			/**
 			 * @确认
 			 * */
-			confirmClick() {
-				this['show'] = false;
+			confirmClick() {
+				this['show'] = false;
+				
+				uni.showLoading({
+					title: '支付中...',
+					mask: true
+				});
+				
 				let self = this;
-				uni.showLoading({
-					title: '支付中...'
-				});
-				// 解绑
 				let from = JSON.parse(JSON.stringify(self['FormInfor']))
 				if (typeof from['products'] == 'object') {
 					from['products'] = JSON.stringify(from['products'])
@@ -467,18 +470,8 @@
 							shopInfo: from.products,
 							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();
-					// // 调起支付
-					// this.payment({
-					// 	order_sn: res['data']['order_sn'],
-					// 	// 仅微信环境下存在参数
-					// 	money:res['data']['money'],
-					// 	type: res['data']['type'],
-					// 	redirect_url,
-					// });
+						uni.hideLoading();
+					}
 				})
 			},
 
@@ -1030,7 +1023,8 @@
 			font-size: 30rpx;
 			line-height: 86rpx;
 			text-align: center;
-			border-radius: 43rpx;
+			border-radius: 43rpx;
+			font-weight: 500;
 		}
 	}
 	
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index 7d71278..9d40d09 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -13,7 +13,7 @@
 
 		<!-- 商品列表 -->
 		<view class="box_3">
-			<text lines="1" class="text_5">餐品详情</text>
+			<text lines="1" class="text_5">餐品详情</text>
 			<template v-for="(item,index) in FormInfor['products']">
 				<view class="commodity-item" :key="index" @tap="ischoiceDiscount(index)">
 					<!-- 商品 -->
@@ -27,7 +27,9 @@
 						</view>
 						<text lines="1" class="text_9">×{{item['num']}}</text>
 					</view>
-
+					<view class="text_4">
+						{{item.sku}}
+					</view>
 					<view class="section_5">
 						<!-- <view class="text-group_1">
 							<text lines="1" class="text_14">可用消费补贴卡余额抵扣￥{{_amount(item['max_deduction'] * item['num'])}}</text>
@@ -134,13 +136,13 @@
 				</view>
 			</view>
 			<text lines="1" class="text_28"></text>
-			<button class="button_1" :class="`theme-Union-Class-${BrandInfor['brand_id']}-1`" @tap="settlement">
+			<button class="button_1" :class="`theme-Union-Class-${BrandInfor['brand_id']}-1`" @tap="$u.throttle(settlement, 500)">
 				<text lines="1" class="text_29">结算</text>
 			</button>
 		</view>
 		
 		<!-- 确认门店信息 -->
-		<u-modal :show="show" title="请确认自取门店" closeOnClickOverlay @close="show = false">
+		<u-modal :show="show" title="请确认自取门店" closeOnClickOverlay @close="show = false" @confirm="confirmClick()" @cancel="show = false">
 			<template v-slot:default>
 				<view class="default-content">
 					<view class="location-Img">
@@ -162,10 +164,10 @@
 			<template v-slot:confirmButton>
 				<view class="confirmButton">
 					<view class="btn replace" @tap="navigateBack(2, true, 0)"
-						:style="{border:`1rpx solid ${Brand()['ThemeColor']}`,color:Brand()['ThemeColor']}">
+						:style="{border:`2rpx solid ${Brand()['ThemeColor']}`,color:Brand()['ThemeColor']}">
 						更换门店
 					</view>
-					<view class="btn confirm" @tap="confirmClick" :style="Brand()['customStyle']['BtnStyle'][0]">
+					<view class="btn confirm" @tap="$u.throttle(confirmClick, 1000)" :style="Brand()['customStyle']['BtnStyle'][0]">
 						就是这家
 					</view>
 				</view>
@@ -235,7 +237,8 @@
 		getPhoneAPI,
 		computedOfflineOrder,
 		createFoodOrder
-	} from '@/request/restaurant/index.js';
+	} from '@/request/restaurant/index.js';
+
 	let self;
 	export default {
 		mixins: [mixin, restaurantmixins, calculationamountmixin],
@@ -416,13 +419,17 @@
 			},
 			
 			confirmClick() {
+				this['show'] = false;
+				
+				uni.showLoading({
+					title: '支付中...',
+					mask: true
+				});
+				
 				let FormInfor = JSON.parse(JSON.stringify(self['FormInfor']))
 				if (typeof FormInfor['products'] == 'object') {
 					FormInfor['products'] = JSON.stringify(FormInfor['products'])
 				}
-				uni.showLoading({
-					title: '支付中...'
-				});
 				FormInfor.phone = FormInfor.phone_number;
 				FormInfor.products = JSON.parse(FormInfor.products)
 				
@@ -458,6 +465,7 @@
 							shopInfo: FormInfor.products,
 							return_url:`/pages/restaurant/order/order-details/details?order_sn=${res.data.order_sn}`
 						});
+						uni.hideLoading();
 					}
 				})
 			},
@@ -613,7 +621,8 @@
 		flex-direction: row;
 		display: flex;
 		justify-content: space-between;
-		align-items: center;
+		align-items: center;
+		margin-bottom: 10rpx;
 	}
 
 	.section_5 {
@@ -920,22 +929,22 @@
 		width: 211rpx;
 		height: 27rpx;
 		color: rgba(51, 51, 51, 1);
-		font-size: $FONTSIZE28;
+		font-size: $FONTSIZE30;
 		font-family: PingFangSC-Semibold;
 		text-align: left;
 		white-space: nowrap;
-		line-height: $FONTSIZE28;
+		line-height: $FONTSIZE30;
 	}
 
 	.text_25 {
 		width: 211rpx;
 		height: 27rpx;
 		color: rgba(198, 56, 54, 1);
-		font-size: $FONTSIZE28;
+		font-size: $FONTSIZE30;
 		font-family: PingFangSC-Semibold;
 		text-align: left;
 		white-space: nowrap;
-		line-height: $FONTSIZE28;
+		line-height: $FONTSIZE30;
 	}
 
 	.text_26 {
@@ -1005,9 +1014,9 @@
 
 		.Checkbox {
 			margin-right: 20rpx;
-			width: 24rpx;
-			height: 24rpx;
-			border: 1rpx solid #D3D6DB;
+			width: 30rpx;
+			height: 30rpx;
+			border: 2rpx solid #D3D6DB;
 			border-radius: 50%;
 			overflow: hidden;
 		}
@@ -1020,8 +1029,8 @@
 			&::after {
 				content: '';
 				position: absolute;
-				width: 12rpx;
-				height: 12rpx;
+				width: 18rpx;
+				height: 18rpx;
 				border-radius: 50%;
 				border: 3rpx solid #ffffff;
 				background-color: #FFBC0D;
@@ -1045,12 +1054,13 @@
 	// 商品数量/余额
 	.Commodity {
 		color: #333333;
-		font-size: 28rpx;
+		font-size: 30rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		background-color: #ffffff;
 		padding: 32rpx;
+		font-weight: bold;
 	}
 	
 	.confirmButton {
@@ -1075,6 +1085,7 @@
 			line-height: 86rpx;
 			text-align: center;
 			border-radius: 43rpx;
+			font-weight: 500;
 		}
 	}
 	
@@ -1155,5 +1166,9 @@
 			}
 	
 		}
+	}
+	
+	.itemamount {
+		margin-bottom: 10rpx;
 	}
 </style>
diff --git a/static/js/mixin/mixin.js b/static/js/mixin/mixin.js
index d684b35..4b18770 100644
--- a/static/js/mixin/mixin.js
+++ b/static/js/mixin/mixin.js
@@ -190,7 +190,11 @@ computed: {},
 				toFixed: 4
 			})
 		},
-
+		
+		_fixed(num) {
+			return num.toFixed(2)
+		},
+		
 		// 金额格式化(iscarry：true)
 		_amount(num) {
 			return this.RetainDecimalPoints({