diff --git a/components/b-Shopping-Cart/b-Shopping-Cart.vue b/components/b-Shopping-Cart/b-Shopping-Cart.vue
index c451e03..aa39fd9 100644
--- a/components/b-Shopping-Cart/b-Shopping-Cart.vue
+++ b/components/b-Shopping-Cart/b-Shopping-Cart.vue
@@ -1,1169 +1,1169 @@
-<template>
-	<view class="b-Shopping-Cart">
-		<!-- 肯德基 -->
-		<template v-if="BrandInfor['brand_id'] == 1">
-			<!-- 购物车 -->
-			<view class="shoppingcart">
-				<view class="left">
-					<view class="left-img">
-						<image class="img" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''"
-							:src="qnyurl('gouwuceicon.png')" mode="aspectFill">
-						</image>
-						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
-						</u-badge>
-					</view>
-					<view class="price">
-						<text class="yang">￥</text>
-						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
-					</view>
-				</view>
-				<view class="right" @tap="create" :class="[Shoplength > 0?'right2':'']">
-					{{Shoplength > 0?'选好了':'未选择商品'}}
-				</view>
-			</view>
-			<!-- 购物车弹框 -->
-			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
-				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
-				<view class="popupcontent">
-					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
-						<template v-for="(item,index) in MealList">
-							<view class="popupcontent-item" :key='index'>
-								<!-- 商品 -->
-								<view class="name">
-									{{item['product_name']}}
-								</view>
-								<!-- 价格 -->
-								<view class="money">
-									<view class="price">
-										<text class="yang">￥</text>
-										<text
-											class="amount">{{RetainDecimalPoint(item['pay_price'] * item['num'])}}</text>
-									</view>
-								</view>
-								<!-- 数量 -->
-								<view class="quantity">
-									<image class="img" :src="qnyurl('jian.png')" mode="" @tap="reducecommodity(item)">
-									</image>
-									<view class="num">
-										{{item['num']}}
-									</view>
-									<image class="img" :src="qnyurl('jia.png')" mode="" @tap="Addcommodity(item)">
-									</image>
-								</view>
-							</view>
-						</template>
-					</scroll-view>
-				</view>
-			</u-popup>
-		</template>
-
-		<!-- 瑞幸购物车 -->
-		<template v-if="BrandInfor['brand_id'] == 13">
-			<!-- 购物车 -->
-			<view class="shoppingcart-rx">
-				<view class="shoppingcart-rx-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
-					<view class="shoppingcart-rx-left-img">
-						<image class="img" :src="qnyurl('shopping.png','rx')" mode="aspectFill">
-						</image>
-						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
-						</u-badge>
-					</view>
-					<view class="shoppingcart-rx-left-price">
-						<text class="yang">￥</text>
-						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
-					</view>
-				</view>
-				<view class="shoppingcart-rx-right" @tap="create" :class="[Shoplength > 0?'right2':'']">
-					{{Shoplength > 0?'结算':'未选择商品'}}
-				</view>
-			</view>
-			<!-- 购物车弹框 -->
-			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
-				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
-				<view class="popupcontent-rx">
-					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
-						<view class="popupcontent-rx-top">
-							<view class="text">
-								已选商品
-							</view>
-							<view class="popupcontent-rx-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="popupcontent-rx-item" :key='index'>
-								<view class="popupcontent-rx-item-commodity">
-									<view class="popupcontent-rx-item-commodity-img">
-										<image class="img" :src="item['product_img']" mode=""></image>
-									</view>
-									<view class="popupcontent-rx-item-commodity-infor">
-										<!-- 商品 -->
-										<view class="popupcontent-rx-item-commodity-infor-name">
-											{{item['product_name']}}
-										</view>
-										<view class="popupcontent-rx-item-commodity-infor-sku">
-											{{item['sku'].join('/')}}
-										</view>
-										<!-- 价格 -->
-										<view class="popupcontent-rx-item-commodity-infor-money">
-											<view class="popupcontent-rx-item-commodity-infor-money-price">
-												<text
-													class="popupcontent-rx-item-commodity-infor-money-yang">￥</text>
-												<text
-													class="popupcontent-rx-item-commodity-infor-money-amount">{{RetainDecimalPoint(item['pay_price'] * item['num'])}}</text>
-											</view>
-										</view>
-									</view>
-								</view>
-
-								<!-- 数量 -->
-								<view class="quantity">
-									<image class="img" :src="qnyurl('reduce.png','rx')" mode=""
-										@tap="reducecommodity(item)">
-									</image>
-									<view class="num">
-										{{item['num']}}
-									</view>
-									<image class="img" :src="qnyurl('add.png','rx')" mode="" @tap="Addcommodity(item)">
-									</image>
-								</view>
-							</view>
-						</template>
-					</scroll-view>
-				</view>
-			</u-popup>
-		</template>
-		
-		<!-- 星巴克 -->
-		<template v-if="BrandInfor['brand_id'] == 10">
-			<!-- 购物车 -->
-			<view class="shoppingcart-xbk">
-				<view class="shoppingcart-xbk-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
-					<view class="shoppingcart-xbk-left-img">
-						<image class="img" :src="qnyurl('shopping.png','xbk')" mode="heightFix">
-						</image>
-						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
-						</u-badge>
-					</view>
-					<view class="shoppingcart-xbk-left-price">
-						<text class="yang">￥</text>
-						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
-					</view>
-				</view>
-				<view class="shoppingcart-xbk-right" @tap="create" :class="[Shoplength > 0?'right2':'']">
-					{{Shoplength > 0?'结算':'未选择商品'}}
-				</view>
-			</view>
-			<!-- 购物车弹框 -->
-			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
-				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
-				<view class="popupcontent-xbk">
-					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
-						<view class="popupcontent-xbk-top">
-							<view class="text">
-								已选商品
-							</view>
-							<view class="popupcontent-xbk-top-empty" @tap="EMPTY(GetShopInfor['restaurant_id'])">
-								<image class="img" :src="qnyurl('qingkong.png','xbk')" mode=""></image>
-								<text>清空购物车</text>
-							</view>
-						</view>
-						<template v-for="(item,index) in MealList">
-							<view class="popupcontent-xbk-item" :key='index'>
-								<view class="popupcontent-xbk-item-commodity">
-									<view class="popupcontent-xbk-item-commodity-img">
-										<image class="img" :src="item['product_img']" mode=""></image>
-									</view>
-									<view class="popupcontent-xbk-item-commodity-infor">
-										<!-- 商品 -->
-										<view class="popupcontent-xbk-item-commodity-infor-name">
-											{{item['product_name']}}
-										</view>
-										<view class="popupcontent-xbk-item-commodity-infor-sku">
-											{{item['sku'].join('/')}}
-										</view>
-										<!-- 价格 -->
-										<view class="popupcontent-xbk-item-commodity-infor-money">
-											<view class="popupcontent-xbk-item-commodity-infor-money-price">
-												<text
-													class="popupcontent-xbk-item-commodity-infor-money-yang">￥</text>
-												<text
-													class="popupcontent-xbk-item-commodity-infor-money-amount">{{RetainDecimalPoint((item['pay'] * item['num']))}}</text>
-											</view>
-										</view>
-									</view>
-								</view>
-		
-								<!-- 数量 -->
-								<view class="quantity">
-									<image class="img" :src="qnyurl('reduce.png','xbk')" mode=""
-										@tap="reducecommodity(item)">
-									</image>
-									<view class="num">
-										{{item['num']}}
-									</view>
-									<image class="img" :src="qnyurl('add.png','xbk')" mode="" @tap="Addcommodity(item)">
-									</image>
-								</view>
-							</view>
-						</template>
-					</scroll-view>
-				</view>
-			</u-popup>
-		</template>
-	
-		<!-- 麦当劳 -->
-		<template v-if="BrandInfor['brand_id'] == 5">
-			<!-- 购物车 -->
-			<view class="shoppingcart-mdl">
-				<view class="shoppingcart-mdl-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
-					<view class="shoppingcart-mdl-left-img">
-						<image class="img" :src="qnyurl('gouwuceicon.png','mdl')" mode="heightFix">
-						</image>
-						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
-						</u-badge>
-					</view>
-					<view class="shoppingcart-mdl-left-price">
-						<text class="yang">￥</text>
-						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
-					</view>
-				</view>
-				<view class="shoppingcart-mdl-right theme-Union-Class-5-1" @tap="create" :class="[Shoplength > 0?'right2':'']">
-					{{Shoplength > 0?'结算':'未选择商品'}}
-				</view>
-			</view>
-			<!-- 购物车弹框 -->
-			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
-				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
-				<view class="popupcontent-mdl">
-					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
-						<view class="popupcontent-mdl-top">
-							<view class="text">
-								已选商品
-							</view>
-							<view class="popupcontent-mdl-top-empty" @tap="EMPTY(GetShopInfor['restaurant_id'])">
-								<image class="img" :src="qnyurl('qingkong.png','xbk')" mode=""></image>
-								<text>清空购物车</text>
-							</view>
-						</view>
-						<template v-for="(item,index) in MealList">
-							<view class="popupcontent-mdl-item" :key='index'>
-								<view style="display: flex;justify-content:space-between;margin-bottom: 15rpx;">
-									<view class="popupcontent-mdl-item-commodity">
-										<view class="popupcontent-mdl-item-commodity-img">
-											<image class="img" :src="item['product_img']" mode=""></image>
-										</view>
-										<view class="popupcontent-mdl-item-commodity-infor">
-											<!-- 商品 -->
-											<view class="popupcontent-mdl-item-commodity-infor-name">
-												{{item['product_name']}}
-											</view>
-											<!-- 价格 -->
-											<view class="popupcontent-mdl-item-commodity-infor-money">
-												<view class="popupcontent-mdl-item-commodity-infor-money-price">
-													<text
-														class="popupcontent-mdl-item-commodity-infor-money-yang">￥</text>
-													<text
-														class="popupcontent-mdl-item-commodity-infor-money-amount">{{RetainDecimalPoint((item['pay_price'] * item['num']))}}</text>
-												</view>
-											</view>
-										</view>
-									</view>
-									<!-- 数量 -->
-									<view class="quantity">
-										<view :class="`Reduce-Button theme-Union-Class-${BrandInfor['brand_id']}-2`" @tap.stop="reducecommodity(item)">
-											<view>-</view>
-										</view>
-										<view class="num">
-											{{item['num']}}
-										</view>
-										<view
-										 :class="`Add-Button theme-Union-Class-${BrandInfor['brand_id']}-1`"
-										 @tap.stop="Addcommodity(item)">
-											<view>+</view>
-										</view>
-									</view>
-								</view>
-								<view class="popupcontent-mdl-item-commodity-infor-sku">
-									{{item['sku']}}
-								</view>
-							</view>
-						</template>
-					</scroll-view>
-				</view>
-			</u-popup>
-		</template>
-	</view>
-</template>
-
-<script>
-	// vuex
-	// import {
-	// 	mapGetters,
-	// 	mapMutations,
-	// 	mapActions
-	// } from 'vuex';
-	// 混入
-	import mixin from '@/static/js/mixin/mixin.js';
-	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
-	export default {
-		mixins: [mixin,restaurantmixins],
-		name: "b-Shopping-Cart",
-		props:{
-			tabbar:{
-				type:Array,
-				default:()=>[],
-			}
-		},
-		data() {
-			return {
-				// 购物车
-				MealList: [],
-				// 购物车合计
-				totalPrice: 0,
-				// 购物车弹框显示变量
-				shoppingshow: false,
-			};
-		},
-		computed: {
-			// ...mapGetters({
-			// 	// 获取品牌Id
-			// 	BrandInfor: 'shopping/BrandInfor',
-			// 	// 获取餐厅信息
-			// 	GetShopInfor: 'shopping/GetShopInfor',
-			// 	// 获取购物车
-			// 	GetCartList: 'shopping/GetCartList',
-			// }),
-			//当前商店购物信息
-			// shopCart() {
-			// 	try {
-			// 		return {
-			// 			...this['GetCartList']
-			// 		};
-			// 	} catch (e) {
-			// 		return {}
-			// 	}
-			// },
-
-			// 获取购物车长度
-			Shoplength() {
-				if (this['MealList']['length'] <= 0) {
-					this['shoppingshow'] = false;
-				}
-				return this['MealList']['length'];
-			}
-		},
-		watch: {
-			GetCartList: {
-				deep: true,
-				immediate: true,
-				handler(val) {
-					console.log(val, 'GetCartList');
-					this.initCategoryNum();
-				}
-			}
-		},
-	
-		methods: {
-			/**
-			 * @本地数据与当前餐厅数格式化
-			 * */ 
-			initCategoryNum() {
-				console.log(this['tabbar'],'-----------');
-				// 因为该方法是每次商品数据变更都会重新加载,所以不用考虑是否会重复添加问题
-				if (this['tabbar']['length'] <= 0) return;
-				console.log(this.GetCartList,'进入initCategoryNum');
-				console.time()
-				// 先将菜单数据整合成一个数组
-				let shoparr = [];
-				let newArr = [];
-				let Price = 0;
-				this['tabbar'].map(item => {
-					shoparr.push(...item['foods'])
-				});
-				// 将所有商品的id取出
-				let commodityids = shoparr.map(item => item['product_id']);
-				// 循环购物车
-				console.log(Object.keys(this['GetCartList']),'*********');
-				let list = Object.keys(this['GetCartList']);
-				console.log(list,'进入initCategoryNum');
-				for (let i = 0; i < list['length']; i++) {
-					console.log('*********');
-					// 将item转为数字
-					let id = +Object.keys(this['GetCartList'])[i];
-					// // 在commodityids中查找item
-					let index = commodityids.indexOf(id);
-					let item = {};
-					if (index != -1) {
-						item = {
-							// ...this['GetCartList'][id],
-							...shoparr[index],
-							num: this['GetCartList'][id]['num'],
-							sku: this['GetCartList'][id]['sku'],
-							sku_code: this['GetCartList'][id]['sku_code'],
-							restaurant_id: this['GetShopInfor']['restaurant_id'],
-							// 加入购物车时会根据商品原价与算选规格价格计算得到规格价格加上原价的实际价格
-							pay: this['GetCartList'][id]['pay'] || 0
-						};
-						
-						newArr.push(item);
-						if(this['BrandInfor']['brand_id'] == 10){
-							Price += ((+item['pay']) * item['num']);
-						}else{
-							Price += ((+item['pay_price']) * item['num']);
-						}
-						// 此处逻辑是将同商品下的不同规格数据取出来
-						if (this['GetCartList'][id]['Differentskulist'] && this['GetCartList'][id]['Differentskulist'][
-								'length'
-							] > 0) {
-							for (let i = 0; i < this['GetCartList'][id]['Differentskulist']['length']; i++) {
-								let _item = this['GetCartList'][id]['Differentskulist'][i];
-								console.log(_item);
-								_item = {
-									...shoparr[index],
-									num: _item['num'],
-									sku: _item['sku'],
-									sku_code: _item['sku_code'],
-									// 加入购物车时会根据商品原价与算选规格价格计算得到规格价格加上原价的实际价格
-									pay:_item['pay']
-								};
-								this['GetCartList'][id]['Differentskulist'][i] = _item;
-							};
-							newArr.push(...this['GetCartList'][id]['Differentskulist']);
-							if(this['BrandInfor']['brand_id'] == 10){
-								Price += this['GetCartList'][id]['Differentskulist'].map(e => e['pay'] * e['num'])
-									.reduce((a, b) => a + b);
-							}else{
-								Price += this['GetCartList'][id]['Differentskulist'].map(e => e['pay_price'] * e['num'])
-									.reduce((a, b) => a + b);
-							}
-						}
-
-					} else {
-						// 后期处理存在购物车但是店铺已下架商品
-					}
-				};
-				console.log(newArr,'newArrnewArrnewArrnewArr');
-				this['MealList'] = newArr;
-				this['totalPrice'] = Price;
-				console.timeEnd()
-				console.log('结束initCategoryNum');
-			},
-
-
-			/**
-			 * @添加数量/增加商品
-			 * */
-			Addcommodity(item) {
-				console.log(item);
-				console.log(this,'*-*-*')
-				this.ADD_CART({
-					commodity: item
-				})
-			},
-
-			/**
-			 * @减少/删除商品
-			 * */
-			reducecommodity(item) {
-				this.REDUCE_CART(item)
-			},
-
-			/**
-			 * @创建订单页面
-			 * */
-			create() {
-				if (this['Shoplength'] <= 0) return;
-				this['$parent']['loading'] = true;
-				let self = this;
-				self.SETREPLACE(self['MealList']);
-				switch (this['BrandInfor']['brand_id']) {
-					case 1:
-						uni.navigateTo({
-							url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
-							success: () => {
-								this['$parent']['loading'] = false;
-							}
-						});
-						break;
-					case 5:
-						uni.navigateTo({
-							url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
-							success: () => {
-								this['$parent']['loading'] = false;
-							}
-						});
-						break;
-					case 13:
-						uni.navigateTo({
-							url: `/pages/restaurant/order/orders-settlement/rx-orders-settlement`,
-							success: () => {
-								this['$parent']['loading'] = false;
-							}
-						});
-						break;
-					case 10:
-						uni.navigateTo({
-							url: `/pages/restaurant/order/orders-settlement/xbk_orders_settlement`,
-							success: () => {
-								this['$parent']['loading'] = false;
-							}
-						});
-						break;
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	// 肯德基
-	.shoppingcart {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 20075;
-		background-color: #333333;
-		.left {
-			flex: 1;
-			height: 100rpx;
-			display: flex;
-			align-items: center;
-			padding-left: 50rpx;
-
-			&-img {
-				position: relative;
-
-				.img {
-					width: 65rpx;
-					height: 65rpx;
-					margin-right: 25rpx;
-				}
-			}
-
-
-			.price {
-				color: #ffffff;
-				display: flex;
-				align-items: baseline;
-
-				.yang {
-					font-size: 26rpx;
-				}
-
-				.amount {
-					font-size: 50rpx;
-				}
-			}
-		}
-
-		// 未选择商品样式
-		.right {
-			width: 235rpx;
-			height: 100rpx;
-			background: #DFDFDF;
-			color: #333333;
-			text-align: center;
-			line-height: 100rpx;
-		}
-
-		// 已选择商品样式
-		.right2 {
-			background: #C63836 !important;
-			color: #ffffff !important;
-		}
-	}
-
-	.popupcontent {
-		width: 100%;
-		// padding-bottom: calc();
-		height: 642rpx;
-		background-color: #ffffff;
-
-		&-item {
-			width: 100%;
-			margin-bottom: 20rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 32rpx;
-			box-sizing: border-box;
-
-			.name {
-				font-size: $FONTSIZE26;
-				max-width: 336rpx;
-				min-width: 336rpx;
-				word-break: break-all;
-				display: -webkit-box;
-				-webkit-line-clamp: 1;
-				-webkit-box-orient: vertical;
-				overflow: hidden;
-
-			}
-
-			.money {
-				color: $THEMECOLOR1;
-				max-width: 115rpx;
-				min-width: 115rpx;
-				text-align: center;
-
-				.yang {
-					font-size: $FONTSIZE22;
-				}
-
-				.price {
-					font-size: $FONTSIZE30;
-				}
-			}
-
-			.quantity {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: $FONTSIZE36;
-
-				.num {
-					max-width: 100rpx;
-					min-width: 100rpx;
-					text-align: center;
-				}
-
-				.img {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-		}
-
-	}
-
-	// 瑞幸
-	.shoppingcart-rx {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 20075;
-		background-color: #ffffff;
-		align-items: center;
-		padding: 0 32rpx;
-
-		&-left {
-			flex: 1;
-			height: 100rpx;
-			display: flex;
-			align-items: center;
-
-			&-img {
-				position: relative;
-
-				.img {
-					width: 65rpx;
-					height: 65rpx;
-					margin-right: 25rpx;
-				}
-			}
-
-
-			&-price {
-				color: #000000;
-				display: flex;
-				align-items: baseline;
-
-				.yang {
-					font-size: 26rpx;
-				}
-
-				.amount {
-					font-size: 50rpx;
-				}
-			}
-		}
-
-		&-right {
-			width: 225rpx;
-			height: 77rpx;
-			background: #0122A4;
-			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
-			border-radius: 48rpx;
-			text-align: center;
-			color: #ffffff;
-			line-height: 77rpx;
-		}
-	}
-
-	.popupcontent-rx {
-		width: 100%;
-		// padding-bottom: calc();
-		height: 642rpx;
-		background-color: #ffffff;
-
-		.popupcontent-rx-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;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 32rpx;
-			box-sizing: border-box;
-
-			&-commodity {
-				display: flex;
-
-				&-img {
-					width: 120rpx;
-					height: 120rpx;
-
-					.img {
-						width: 100%;
-						height: 100%;
-						border-radius: 10rpx;
-					}
-				}
-
-				&-infor {
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-					padding-left: 22rpx;
-
-					&-name {
-						font-size: $FONTSIZE30;
-						max-width: 336rpx;
-						min-width: 336rpx;
-						word-break: break-all;
-						display: -webkit-box;
-						-webkit-line-clamp: 1;
-						-webkit-box-orient: vertical;
-						overflow: hidden;
-					}
-
-					&-sku {
-						color: #999999;
-						font-size: $FONTSIZE22;
-					}
-
-					&-money {
-						color: $THEMECOLOR1;
-						max-width: 115rpx;
-						min-width: 115rpx;
-						text-align: center;
-						color: #FF780F;
-
-						&-yang {
-							font-size: $FONTSIZE22;
-						}
-
-						&-price {
-							display: flex;
-							align-items: center;
-							font-size: $FONTSIZE30;
-						}
-					}
-				}
-
-
-
-			}
-
-			.quantity {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: $FONTSIZE36;
-
-				.num {
-					max-width: 100rpx;
-					min-width: 100rpx;
-					text-align: center;
-				}
-
-				.img {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-		}
-	}
-
-	// 星巴克
-	.shoppingcart-xbk {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 20075;
-		background-color: #ffffff;
-		align-items: center;
-		padding: 0 32rpx;
-	
-		&-left {
-			flex: 1;
-			height: 100rpx;
-			display: flex;
-			align-items: center;
-	
-			&-img {
-				position: relative;
-	
-				.img {
-					width: 65rpx;
-					height: 65rpx;
-					margin-right: 25rpx;
-				}
-			}
-	
-	
-			&-price {
-				color: #000000;
-				display: flex;
-				align-items: baseline;
-	
-				.yang {
-					font-size: 26rpx;
-				}
-	
-				.amount {
-					font-size: 50rpx;
-				}
-			}
-		}
-	
-		&-right {
-			width: 225rpx;
-			height: 77rpx;
-			background: #00AF66;
-			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
-			border-radius: 48rpx;
-			text-align: center;
-			color: #ffffff;
-			line-height: 77rpx;
-		}
-	}
-	
-	.popupcontent-xbk {
-		width: 100%;
-		// padding-bottom: calc();
-		height: 642rpx;
-		background-color: #ffffff;
-	
-		.popupcontent-xbk-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;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 32rpx;
-			box-sizing: border-box;
-	
-			&-commodity {
-				display: flex;
-	
-				&-img {
-					width: 120rpx;
-					height: 120rpx;
-	
-					.img {
-						width: 100%;
-						height: 100%;
-						border-radius: 10rpx;
-					}
-				}
-	
-				&-infor {
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-					padding-left: 22rpx;
-	
-					&-name {
-						font-size: $FONTSIZE30;
-						max-width: 336rpx;
-						min-width: 336rpx;
-						word-break: break-all;
-						display: -webkit-box;
-						-webkit-line-clamp: 1;
-						-webkit-box-orient: vertical;
-						overflow: hidden;
-					}
-	
-					&-sku {
-						color: #999999;
-						font-size: $FONTSIZE22;
-					}
-	
-					&-money {
-						color: $THEMECOLOR1;
-						max-width: 115rpx;
-						min-width: 115rpx;
-						text-align: center;
-						color: #FF780F;
-	
-						&-yang {
-							font-size: $FONTSIZE22;
-						}
-	
-						&-price {
-							display: flex;
-							align-items: center;
-							font-size: $FONTSIZE30;
-						}
-					}
-				}
-	
-	
-	
-			}
-	
-			.quantity {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: $FONTSIZE36;
-	
-				.num {
-					max-width: 100rpx;
-					min-width: 100rpx;
-					text-align: center;
-				}
-	
-				.img {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-		}
-	}
-
-	// 肯德基
-	.shoppingcart-mdl {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 20075;
-		background-color: #ffffff;
-		align-items: center;
-		padding: 0 32rpx;
-	
-		&-left {
-			flex: 1;
-			height: 100rpx;
-			display: flex;
-			align-items: center;
-	
-			&-img {
-				position: relative;
-	
-				.img {
-					width: 65rpx;
-					height: 65rpx;
-					margin-right: 25rpx;
-				}
-			}
-	
-	
-			&-price {
-				color: #000000;
-				display: flex;
-				align-items: baseline;
-	
-				.yang {
-					font-size: 26rpx;
-				}
-	
-				.amount {
-					font-size: 50rpx;
-				}
-			}
-		}
-	
-		&-right {
-			width: 225rpx;
-			height: 77rpx;
-			background: #00AF66;
-			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
-			border-radius: 48rpx;
-			text-align: center;
-			color: #ffffff;
-			line-height: 77rpx;
-		}
-	}
-	
-	.popupcontent-mdl {
-		width: 100%;
-		// padding-bottom: calc();
-		height: 642rpx;
-		background-color: #ffffff;
-	
-		.popupcontent-mdl-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;
-			padding: 32rpx;
-			box-sizing: border-box;
-	
-			&-commodity {
-				display: flex;
-	
-				&-img {
-					width: 120rpx;
-					height: 120rpx;
-	
-					.img {
-						width: 100%;
-						height: 100%;
-						border-radius: 10rpx;
-					}
-				}
-	
-				&-infor {
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-					padding-left: 22rpx;
-	
-					&-name {
-						font-size: $FONTSIZE30;
-						max-width: 336rpx;
-						min-width: 336rpx;
-						word-break: break-all;
-						display: -webkit-box;
-						-webkit-line-clamp: 1;
-						-webkit-box-orient: vertical;
-						overflow: hidden;
-					}
-	
-					&-sku {
-						color: #999999;
-						font-size: $FONTSIZE22;
-					}
-	
-					&-money {
-						color: $THEMECOLOR1;
-						max-width: 115rpx;
-						min-width: 115rpx;
-						text-align: center;
-						color: #FF780F;
-	
-						&-yang {
-							font-size: $FONTSIZE22;
-						}
-	
-						&-price {
-							display: flex;
-							align-items: center;
-							font-size: $FONTSIZE30;
-						}
-					}
-				}
-	
-	
-	
-			}
-	
-			.quantity {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: $FONTSIZE36;
-	
-				.num {
-					max-width: 100rpx;
-					min-width: 100rpx;
-					text-align: center;
-				}
-	
-				.img {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-		}
-	}
-</style>
+<template>
+	<view class="b-Shopping-Cart">
+		<!-- 肯德基 -->
+		<template v-if="BrandInfor['brand_id'] == 1">
+			<!-- 购物车 -->
+			<view class="shoppingcart">
+				<view class="left">
+					<view class="left-img">
+						<image class="img" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''"
+							:src="qnyurl('gouwuceicon.png')" mode="aspectFill">
+						</image>
+						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
+						</u-badge>
+					</view>
+					<view class="price">
+						<text class="yang">￥</text>
+						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
+					</view>
+				</view>
+				<view class="right" @tap="create" :class="[Shoplength > 0?'right2':'']">
+					{{Shoplength > 0?'选好了':'未选择商品'}}
+				</view>
+			</view>
+			<!-- 购物车弹框 -->
+			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
+				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
+				<view class="popupcontent">
+					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
+						<template v-for="(item,index) in MealList">
+							<view class="popupcontent-item" :key='index'>
+								<!-- 商品 -->
+								<view class="name">
+									{{item['product_name']}}
+								</view>
+								<!-- 价格 -->
+								<view class="money">
+									<view class="price">
+										<text class="yang">￥</text>
+										<text
+											class="amount">{{RetainDecimalPoint(item['pay_price'] * item['num'])}}</text>
+									</view>
+								</view>
+								<!-- 数量 -->
+								<view class="quantity">
+									<image class="img" :src="qnyurl('jian.png')" mode="" @tap="reducecommodity(item)">
+									</image>
+									<view class="num">
+										{{item['num']}}
+									</view>
+									<image class="img" :src="qnyurl('jia.png')" mode="" @tap="Addcommodity(item)">
+									</image>
+								</view>
+							</view>
+						</template>
+					</scroll-view>
+				</view>
+			</u-popup>
+		</template>
+
+		<!-- 瑞幸购物车 -->
+		<template v-if="BrandInfor['brand_id'] == 13">
+			<!-- 购物车 -->
+			<view class="shoppingcart-rx">
+				<view class="shoppingcart-rx-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
+					<view class="shoppingcart-rx-left-img">
+						<image class="img" :src="qnyurl('shopping.png','rx')" mode="aspectFill">
+						</image>
+						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
+						</u-badge>
+					</view>
+					<view class="shoppingcart-rx-left-price">
+						<text class="yang">￥</text>
+						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
+					</view>
+				</view>
+				<view class="shoppingcart-rx-right" @tap="create" :class="[Shoplength > 0?'right2':'']">
+					{{Shoplength > 0?'结算':'未选择商品'}}
+				</view>
+			</view>
+			<!-- 购物车弹框 -->
+			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
+				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
+				<view class="popupcontent-rx">
+					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
+						<view class="popupcontent-rx-top">
+							<view class="text">
+								已选商品
+							</view>
+							<view class="popupcontent-rx-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="popupcontent-rx-item" :key='index'>
+								<view class="popupcontent-rx-item-commodity">
+									<view class="popupcontent-rx-item-commodity-img">
+										<image class="img" :src="item['product_img']" mode=""></image>
+									</view>
+									<view class="popupcontent-rx-item-commodity-infor">
+										<!-- 商品 -->
+										<view class="popupcontent-rx-item-commodity-infor-name">
+											{{item['product_name']}}
+										</view>
+										<view class="popupcontent-rx-item-commodity-infor-sku">
+											{{item['sku'].join('/')}}
+										</view>
+										<!-- 价格 -->
+										<view class="popupcontent-rx-item-commodity-infor-money">
+											<view class="popupcontent-rx-item-commodity-infor-money-price">
+												<text
+													class="popupcontent-rx-item-commodity-infor-money-yang">￥</text>
+												<text
+													class="popupcontent-rx-item-commodity-infor-money-amount">{{RetainDecimalPoint(item['pay_price'] * item['num'])}}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+
+								<!-- 数量 -->
+								<view class="quantity">
+									<image class="img" :src="qnyurl('reduce.png','rx')" mode=""
+										@tap="reducecommodity(item)">
+									</image>
+									<view class="num">
+										{{item['num']}}
+									</view>
+									<image class="img" :src="qnyurl('add.png','rx')" mode="" @tap="Addcommodity(item)">
+									</image>
+								</view>
+							</view>
+						</template>
+					</scroll-view>
+				</view>
+			</u-popup>
+		</template>
+		
+		<!-- 星巴克 -->
+		<template v-if="BrandInfor['brand_id'] == 10">
+			<!-- 购物车 -->
+			<view class="shoppingcart-xbk">
+				<view class="shoppingcart-xbk-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
+					<view class="shoppingcart-xbk-left-img">
+						<image class="img" :src="qnyurl('shopping.png','xbk')" mode="heightFix">
+						</image>
+						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
+						</u-badge>
+					</view>
+					<view class="shoppingcart-xbk-left-price">
+						<text class="yang">￥</text>
+						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
+					</view>
+				</view>
+				<view class="shoppingcart-xbk-right" @tap="create" :class="[Shoplength > 0?'right2':'']">
+					{{Shoplength > 0?'结算':'未选择商品'}}
+				</view>
+			</view>
+			<!-- 购物车弹框 -->
+			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
+				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
+				<view class="popupcontent-xbk">
+					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
+						<view class="popupcontent-xbk-top">
+							<view class="text">
+								已选商品
+							</view>
+							<view class="popupcontent-xbk-top-empty" @tap="EMPTY(GetShopInfor['restaurant_id'])">
+								<image class="img" :src="qnyurl('qingkong.png','xbk')" mode=""></image>
+								<text>清空购物车</text>
+							</view>
+						</view>
+						<template v-for="(item,index) in MealList">
+							<view class="popupcontent-xbk-item" :key='index'>
+								<view class="popupcontent-xbk-item-commodity">
+									<view class="popupcontent-xbk-item-commodity-img">
+										<image class="img" :src="item['product_img']" mode=""></image>
+									</view>
+									<view class="popupcontent-xbk-item-commodity-infor">
+										<!-- 商品 -->
+										<view class="popupcontent-xbk-item-commodity-infor-name">
+											{{item['product_name']}}
+										</view>
+										<view class="popupcontent-xbk-item-commodity-infor-sku">
+											{{item['sku'].join('/')}}
+										</view>
+										<!-- 价格 -->
+										<view class="popupcontent-xbk-item-commodity-infor-money">
+											<view class="popupcontent-xbk-item-commodity-infor-money-price">
+												<text
+													class="popupcontent-xbk-item-commodity-infor-money-yang">￥</text>
+												<text
+													class="popupcontent-xbk-item-commodity-infor-money-amount">{{RetainDecimalPoint((item['pay'] * item['num']))}}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+		
+								<!-- 数量 -->
+								<view class="quantity">
+									<image class="img" :src="qnyurl('reduce.png','xbk')" mode=""
+										@tap="reducecommodity(item)">
+									</image>
+									<view class="num">
+										{{item['num']}}
+									</view>
+									<image class="img" :src="qnyurl('add.png','xbk')" mode="" @tap="Addcommodity(item)">
+									</image>
+								</view>
+							</view>
+						</template>
+					</scroll-view>
+				</view>
+			</u-popup>
+		</template>
+	
+		<!-- 麦当劳 -->
+		<template v-if="BrandInfor['brand_id'] == 5">
+			<!-- 购物车 -->
+			<view class="shoppingcart-mdl">
+				<view class="shoppingcart-mdl-left" @tap="Shoplength > 0?shoppingshow = !shoppingshow:''">
+					<view class="shoppingcart-mdl-left-img">
+						<image class="img" :src="qnyurl('gouwuceicon.png','mdl')" mode="heightFix">
+						</image>
+						<u-badge type="error" v-if="Shoplength > 0" absolute :value="Shoplength" :offset="[0,5]">
+						</u-badge>
+					</view>
+					<view class="shoppingcart-mdl-left-price">
+						<text class="yang">￥</text>
+						<text class="amount">{{RetainDecimalPoint(totalPrice)}}</text>
+					</view>
+				</view>
+				<view class="shoppingcart-mdl-right theme-Union-Class-5-1" @tap="create" :class="[Shoplength > 0?'right2':'']">
+					{{Shoplength > 0?'结算':'未选择商品'}}
+				</view>
+			</view>
+			<!-- 购物车弹框 -->
+			<u-popup :round="15" :overlayStyle="{bottom:'100rpx'}" bottom="100rpx" closeOnClickOverlay
+				@close="shoppingshow = false" :show="shoppingshow" mode="bottom">
+				<view class="popupcontent-mdl">
+					<scroll-view :scroll-top="0" scroll-y style="height: 642rpx;">
+						<view class="popupcontent-mdl-top">
+							<view class="text">
+								已选商品
+							</view>
+							<view class="popupcontent-mdl-top-empty" @tap="EMPTY(GetShopInfor['restaurant_id'])">
+								<image class="img" :src="qnyurl('qingkong.png','xbk')" mode=""></image>
+								<text>清空购物车</text>
+							</view>
+						</view>
+						<template v-for="(item,index) in MealList">
+							<view class="popupcontent-mdl-item" :key='index'>
+								<view style="display: flex;justify-content:space-between;margin-bottom: 15rpx;">
+									<view class="popupcontent-mdl-item-commodity">
+										<view class="popupcontent-mdl-item-commodity-img">
+											<image class="img" :src="item['product_img']" mode=""></image>
+										</view>
+										<view class="popupcontent-mdl-item-commodity-infor">
+											<!-- 商品 -->
+											<view class="popupcontent-mdl-item-commodity-infor-name">
+												{{item['product_name']}}
+											</view>
+											<!-- 价格 -->
+											<view class="popupcontent-mdl-item-commodity-infor-money">
+												<view class="popupcontent-mdl-item-commodity-infor-money-price">
+													<text
+														class="popupcontent-mdl-item-commodity-infor-money-yang">￥</text>
+													<text
+														class="popupcontent-mdl-item-commodity-infor-money-amount">{{RetainDecimalPoint((item['pay_price'] * item['num']))}}</text>
+												</view>
+											</view>
+										</view>
+									</view>
+									<!-- 数量 -->
+									<view class="quantity">
+										<view :class="`Reduce-Button theme-Union-Class-${BrandInfor['brand_id']}-2`" @tap.stop="reducecommodity(item)">
+											<view>-</view>
+										</view>
+										<view class="num">
+											{{item['num']}}
+										</view>
+										<view
+										 :class="`Add-Button theme-Union-Class-${BrandInfor['brand_id']}-1`"
+										 @tap.stop="Addcommodity(item)">
+											<view>+</view>
+										</view>
+									</view>
+								</view>
+								<view class="popupcontent-mdl-item-commodity-infor-sku">
+									{{item['sku']}}
+								</view>
+							</view>
+						</template>
+					</scroll-view>
+				</view>
+			</u-popup>
+		</template>
+	</view>
+</template>
+
+<script>
+	// vuex
+	// import {
+	// 	mapGetters,
+	// 	mapMutations,
+	// 	mapActions
+	// } from 'vuex';
+	// 混入
+	import mixin from '@/static/js/mixin/mixin.js';
+	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
+	export default {
+		mixins: [mixin,restaurantmixins],
+		name: "b-Shopping-Cart",
+		props:{
+			tabbar:{
+				type:Array,
+				default:()=>[],
+			}
+		},
+		data() {
+			return {
+				// 购物车
+				MealList: [],
+				// 购物车合计
+				totalPrice: 0,
+				// 购物车弹框显示变量
+				shoppingshow: false,
+			};
+		},
+		computed: {
+			// ...mapGetters({
+			// 	// 获取品牌Id
+			// 	BrandInfor: 'shopping/BrandInfor',
+			// 	// 获取餐厅信息
+			// 	GetShopInfor: 'shopping/GetShopInfor',
+			// 	// 获取购物车
+			// 	GetCartList: 'shopping/GetCartList',
+			// }),
+			//当前商店购物信息
+			// shopCart() {
+			// 	try {
+			// 		return {
+			// 			...this['GetCartList']
+			// 		};
+			// 	} catch (e) {
+			// 		return {}
+			// 	}
+			// },
+
+			// 获取购物车长度
+			Shoplength() {
+				if (this['MealList']['length'] <= 0) {
+					this['shoppingshow'] = false;
+				}
+				return this['MealList']['length'];
+			}
+		},
+		watch: {
+			GetCartList: {
+				deep: true,
+				immediate: true,
+				handler(val) {
+					console.log(val, 'GetCartList');
+					this.initCategoryNum();
+				}
+			}
+		},
+	
+		methods: {
+			/**
+			 * @本地数据与当前餐厅数格式化
+			 * */ 
+			initCategoryNum() {
+				console.log(this['tabbar'],'-----------');
+				// 因为该方法是每次商品数据变更都会重新加载,所以不用考虑是否会重复添加问题
+				if (this['tabbar']['length'] <= 0) return;
+				console.log(this.GetCartList,'进入initCategoryNum');
+				console.time()
+				// 先将菜单数据整合成一个数组
+				let shoparr = [];
+				let newArr = [];
+				let Price = 0;
+				this['tabbar'].map(item => {
+					shoparr.push(...item['foods'])
+				});
+				// 将所有商品的id取出
+				let commodityids = shoparr.map(item => item['product_id']);
+				// 循环购物车
+				console.log(Object.keys(this['GetCartList']),'*********');
+				let list = Object.keys(this['GetCartList']);
+				console.log(list,'进入initCategoryNum');
+				for (let i = 0; i < list['length']; i++) {
+					console.log('*********');
+					// 将item转为数字
+					let id = +Object.keys(this['GetCartList'])[i];
+					// // 在commodityids中查找item
+					let index = commodityids.indexOf(id);
+					let item = {};
+					if (index != -1) {
+						item = {
+							// ...this['GetCartList'][id],
+							...shoparr[index],
+							num: this['GetCartList'][id]['num'],
+							sku: this['GetCartList'][id]['sku'],
+							sku_code: this['GetCartList'][id]['sku_code'],
+							restaurant_id: this['GetShopInfor']['restaurant_id'],
+							// 加入购物车时会根据商品原价与算选规格价格计算得到规格价格加上原价的实际价格
+							pay: this['GetCartList'][id]['pay'] || 0
+						};
+						
+						newArr.push(item);
+						if(this['BrandInfor']['brand_id'] == 10){
+							Price += ((+item['pay']) * item['num']);
+						}else{
+							Price += ((+item['pay_price']) * item['num']);
+						}
+						// 此处逻辑是将同商品下的不同规格数据取出来
+						if (this['GetCartList'][id]['Differentskulist'] && this['GetCartList'][id]['Differentskulist'][
+								'length'
+							] > 0) {
+							for (let i = 0; i < this['GetCartList'][id]['Differentskulist']['length']; i++) {
+								let _item = this['GetCartList'][id]['Differentskulist'][i];
+								console.log(_item);
+								_item = {
+									...shoparr[index],
+									num: _item['num'],
+									sku: _item['sku'],
+									sku_code: _item['sku_code'],
+									// 加入购物车时会根据商品原价与算选规格价格计算得到规格价格加上原价的实际价格
+									pay:_item['pay']
+								};
+								this['GetCartList'][id]['Differentskulist'][i] = _item;
+							};
+							newArr.push(...this['GetCartList'][id]['Differentskulist']);
+							if(this['BrandInfor']['brand_id'] == 10){
+								Price += this['GetCartList'][id]['Differentskulist'].map(e => e['pay'] * e['num'])
+									.reduce((a, b) => a + b);
+							}else{
+								Price += this['GetCartList'][id]['Differentskulist'].map(e => e['pay_price'] * e['num'])
+									.reduce((a, b) => a + b);
+							}
+						}
+
+					} else {
+						// 后期处理存在购物车但是店铺已下架商品
+					}
+				};
+				console.log(newArr,'newArrnewArrnewArrnewArr');
+				this['MealList'] = newArr;
+				this['totalPrice'] = Price;
+				console.timeEnd()
+				console.log('结束initCategoryNum');
+			},
+
+
+			/**
+			 * @添加数量/增加商品
+			 * */
+			Addcommodity(item) {
+				console.log(item);
+				console.log(this,'*-*-*')
+				this.ADD_CART({
+					commodity: item
+				})
+			},
+
+			/**
+			 * @减少/删除商品
+			 * */
+			reducecommodity(item) {
+				this.REDUCE_CART(item)
+			},
+
+			/**
+			 * @创建订单页面
+			 * */
+			create() {
+				if (this['Shoplength'] <= 0) return;
+				this['$parent']['loading'] = true;
+				let self = this;
+				self.SETREPLACE(self['MealList']);
+				switch (this['BrandInfor']['brand_id']) {
+					case 1:
+						uni.navigateTo({
+							url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
+							success: () => {
+								this['$parent']['loading'] = false;
+							}
+						});
+						break;
+					case 5:
+						uni.navigateTo({
+							url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
+							success: () => {
+								this['$parent']['loading'] = false;
+							}
+						});
+						break;
+					case 13:
+						uni.navigateTo({
+							url: `/pages/restaurant/order/orders-settlement/rx-orders-settlement`,
+							success: () => {
+								this['$parent']['loading'] = false;
+							}
+						});
+						break;
+					case 10:
+						uni.navigateTo({
+							url: `/pages/restaurant/order/orders-settlement/xbk_orders_settlement`,
+							success: () => {
+								this['$parent']['loading'] = false;
+							}
+						});
+						break;
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 肯德基
+	.shoppingcart {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 20075;
+		background-color: #333333;
+		.left {
+			flex: 1;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			padding-left: 50rpx;
+
+			&-img {
+				position: relative;
+
+				.img {
+					width: 65rpx;
+					height: 65rpx;
+					margin-right: 25rpx;
+				}
+			}
+
+
+			.price {
+				color: #ffffff;
+				display: flex;
+				align-items: baseline;
+
+				.yang {
+					font-size: 26rpx;
+				}
+
+				.amount {
+					font-size: 50rpx;
+				}
+			}
+		}
+
+		// 未选择商品样式
+		.right {
+			width: 235rpx;
+			height: 100rpx;
+			background: #DFDFDF;
+			color: #333333;
+			text-align: center;
+			line-height: 100rpx;
+		}
+
+		// 已选择商品样式
+		.right2 {
+			background: #C63836 !important;
+			color: #ffffff !important;
+		}
+	}
+
+	.popupcontent {
+		width: 100%;
+		// padding-bottom: calc();
+		height: 642rpx;
+		background-color: #ffffff;
+
+		&-item {
+			width: 100%;
+			margin-bottom: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 32rpx;
+			box-sizing: border-box;
+
+			.name {
+				font-size: $FONTSIZE26;
+				max-width: 336rpx;
+				min-width: 336rpx;
+				word-break: break-all;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+				overflow: hidden;
+
+			}
+
+			.money {
+				color: $THEMECOLOR1;
+				max-width: 115rpx;
+				min-width: 115rpx;
+				text-align: center;
+
+				.yang {
+					font-size: $FONTSIZE22;
+				}
+
+				.price {
+					font-size: $FONTSIZE30;
+				}
+			}
+
+			.quantity {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $FONTSIZE36;
+
+				.num {
+					max-width: 100rpx;
+					min-width: 100rpx;
+					text-align: center;
+				}
+
+				.img {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+		}
+
+	}
+
+	// 瑞幸
+	.shoppingcart-rx {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 20075;
+		background-color: #ffffff;
+		align-items: center;
+		padding: 0 32rpx;
+
+		&-left {
+			flex: 1;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+
+			&-img {
+				position: relative;
+
+				.img {
+					width: 65rpx;
+					height: 65rpx;
+					margin-right: 25rpx;
+				}
+			}
+
+
+			&-price {
+				color: #000000;
+				display: flex;
+				align-items: baseline;
+
+				.yang {
+					font-size: 26rpx;
+				}
+
+				.amount {
+					font-size: 50rpx;
+				}
+			}
+		}
+
+		&-right {
+			width: 225rpx;
+			height: 77rpx;
+			background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
+			border-radius: 48rpx;
+			text-align: center;
+			color: #ffffff;
+			line-height: 77rpx;
+		}
+	}
+
+	.popupcontent-rx {
+		width: 100%;
+		// padding-bottom: calc();
+		height: 642rpx;
+		background-color: #ffffff;
+
+		.popupcontent-rx-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;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 32rpx;
+			box-sizing: border-box;
+
+			&-commodity {
+				display: flex;
+
+				&-img {
+					width: 120rpx;
+					height: 120rpx;
+
+					.img {
+						width: 100%;
+						height: 100%;
+						border-radius: 10rpx;
+					}
+				}
+
+				&-infor {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding-left: 22rpx;
+
+					&-name {
+						font-size: $FONTSIZE30;
+						max-width: 336rpx;
+						min-width: 336rpx;
+						word-break: break-all;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+						overflow: hidden;
+					}
+
+					&-sku {
+						color: #999999;
+						font-size: $FONTSIZE22;
+					}
+
+					&-money {
+						color: $THEMECOLOR1;
+						max-width: 115rpx;
+						min-width: 115rpx;
+						text-align: center;
+						color: #FF780F;
+
+						&-yang {
+							font-size: $FONTSIZE22;
+						}
+
+						&-price {
+							display: flex;
+							align-items: center;
+							font-size: $FONTSIZE30;
+						}
+					}
+				}
+
+
+
+			}
+
+			.quantity {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $FONTSIZE36;
+
+				.num {
+					max-width: 100rpx;
+					min-width: 100rpx;
+					text-align: center;
+				}
+
+				.img {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+		}
+	}
+
+	// 星巴克
+	.shoppingcart-xbk {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 20075;
+		background-color: #ffffff;
+		align-items: center;
+		padding: 0 32rpx;
+	
+		&-left {
+			flex: 1;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+	
+			&-img {
+				position: relative;
+	
+				.img {
+					width: 65rpx;
+					height: 65rpx;
+					margin-right: 25rpx;
+				}
+			}
+	
+	
+			&-price {
+				color: #000000;
+				display: flex;
+				align-items: baseline;
+	
+				.yang {
+					font-size: 26rpx;
+				}
+	
+				.amount {
+					font-size: 50rpx;
+				}
+			}
+		}
+	
+		&-right {
+			width: 225rpx;
+			height: 77rpx;
+			background: #00AF66;
+			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
+			border-radius: 48rpx;
+			text-align: center;
+			color: #ffffff;
+			line-height: 77rpx;
+		}
+	}
+	
+	.popupcontent-xbk {
+		width: 100%;
+		// padding-bottom: calc();
+		height: 642rpx;
+		background-color: #ffffff;
+	
+		.popupcontent-xbk-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;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 32rpx;
+			box-sizing: border-box;
+	
+			&-commodity {
+				display: flex;
+	
+				&-img {
+					width: 120rpx;
+					height: 120rpx;
+	
+					.img {
+						width: 100%;
+						height: 100%;
+						border-radius: 10rpx;
+					}
+				}
+	
+				&-infor {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding-left: 22rpx;
+	
+					&-name {
+						font-size: $FONTSIZE30;
+						max-width: 336rpx;
+						min-width: 336rpx;
+						word-break: break-all;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+						overflow: hidden;
+					}
+	
+					&-sku {
+						color: #999999;
+						font-size: $FONTSIZE22;
+					}
+	
+					&-money {
+						color: $THEMECOLOR1;
+						max-width: 115rpx;
+						min-width: 115rpx;
+						text-align: center;
+						color: #FF780F;
+	
+						&-yang {
+							font-size: $FONTSIZE22;
+						}
+	
+						&-price {
+							display: flex;
+							align-items: center;
+							font-size: $FONTSIZE30;
+						}
+					}
+				}
+	
+	
+	
+			}
+	
+			.quantity {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $FONTSIZE36;
+	
+				.num {
+					max-width: 100rpx;
+					min-width: 100rpx;
+					text-align: center;
+				}
+	
+				.img {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+		}
+	}
+
+	// 肯德基
+	.shoppingcart-mdl {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 20075;
+		background-color: #ffffff;
+		align-items: center;
+		padding: 0 32rpx;
+	
+		&-left {
+			flex: 1;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+	
+			&-img {
+				position: relative;
+	
+				.img {
+					width: 65rpx;
+					height: 65rpx;
+					margin-right: 25rpx;
+				}
+			}
+	
+	
+			&-price {
+				color: #000000;
+				display: flex;
+				align-items: baseline;
+	
+				.yang {
+					font-size: 26rpx;
+				}
+	
+				.amount {
+					font-size: 50rpx;
+				}
+			}
+		}
+	
+		&-right {
+			width: 225rpx;
+			height: 77rpx;
+			background: #00AF66;
+			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
+			border-radius: 48rpx;
+			text-align: center;
+			color: #ffffff;
+			line-height: 77rpx;
+		}
+	}
+	
+	.popupcontent-mdl {
+		width: 100%;
+		// padding-bottom: calc();
+		height: 642rpx;
+		background-color: #ffffff;
+	
+		.popupcontent-mdl-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;
+			padding: 32rpx;
+			box-sizing: border-box;
+	
+			&-commodity {
+				display: flex;
+	
+				&-img {
+					width: 120rpx;
+					height: 120rpx;
+	
+					.img {
+						width: 100%;
+						height: 100%;
+						border-radius: 10rpx;
+					}
+				}
+	
+				&-infor {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding-left: 22rpx;
+	
+					&-name {
+						font-size: $FONTSIZE30;
+						max-width: 336rpx;
+						min-width: 336rpx;
+						word-break: break-all;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+						overflow: hidden;
+					}
+	
+					&-sku {
+						color: #999999;
+						font-size: $FONTSIZE22;
+					}
+	
+					&-money {
+						color: $THEMECOLOR1;
+						max-width: 115rpx;
+						min-width: 115rpx;
+						text-align: center;
+						color: #FF780F;
+	
+						&-yang {
+							font-size: $FONTSIZE22;
+						}
+	
+						&-price {
+							display: flex;
+							align-items: center;
+							font-size: $FONTSIZE30;
+						}
+					}
+				}
+	
+	
+	
+			}
+	
+			.quantity {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $FONTSIZE36;
+	
+				.num {
+					max-width: 100rpx;
+					min-width: 100rpx;
+					text-align: center;
+				}
+	
+				.img {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/components/b-page-home/b-page-home-rx.vue b/components/b-page-home/b-page-home-rx.vue
index 81bdcc3..0320544 100644
--- a/components/b-page-home/b-page-home-rx.vue
+++ b/components/b-page-home/b-page-home-rx.vue
@@ -386,7 +386,7 @@
 		padding: 15rpx 32rpx;
 	}
 	.confirmButton{
-		background: #0122A4;
+		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 		border-radius: 43px;
 		color: #ffffff;
 		font-size: 30rpx;
diff --git a/components/b-restaurant-order-status/b-restaurant-order-status.vue b/components/b-restaurant-order-status/b-restaurant-order-status.vue
index 07f09a9..240d03b 100644
--- a/components/b-restaurant-order-status/b-restaurant-order-status.vue
+++ b/components/b-restaurant-order-status/b-restaurant-order-status.vue
@@ -1,268 +1,268 @@
-<template>
-	<view class="b-restaurant-order-status">
-		<!-- 订单状态 -->
-		<!-- 瑞幸订单状态 -->
-		<template v-if="InforData['brand_id'] == 13">
-			<view class="rx-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
-				<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
-					:src="qnyurl('Unpaid.png','rx')" mode=""></image>
-				<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
-					:src="qnyurl('NotServed.png','rx')" mode=""></image>
-				<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
-					:src="qnyurl('cancel.png','rx')" mode=""></image>
-				<!-- 订单状态 -->
-				<view class="rx-Order-status-Title">
-					{{InforData['status'] | OrderState}}
-				</view>
-				<!-- 未支付 -->
-				<template v-if="InforData['status'] == OrderStatus0">
-					<view class="rx-Order-status-time">
-						剩余付款时间 {{wait_for}}
-					</view>
-					<view class="rx-Order-status-pay" :style="BtnStyle" @tap="payments">
-						立即支付
-					</view>
-					<view class="rx-Order-status-wait">
-						若您已支付请耐心等待商家结算
-					</view>
-				</template>
-				<!-- 待出餐 -->
-				<template v-if="InforData['status'] == OrderStatus1">
-					<view class="rx-Order-status-wait">
-						下单成功，取餐码生成中，请稍后查看
-					</view>
-				</template>
-			</view>
-			<!-- 已经出餐 -->
-			<view class="rx-Order-status-take style" v-else>
-				<view class="rx-Order-status-take-code">
-					<text class="text1">取餐码</text>
-					<text class="text2">{{InforData['codes'].join('')}}</text>
-				</view>
-				<view class="rx-Order-status-take-codeimg">
-					<img class="img" :src="InforData['qrcode']" alt="">
-				</view>
-			</view>
-		</template>
-
-
-		<template v-if="InforData['brand_id'] == 10">
-			<view class="xbk-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
-				<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
-					:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
-				<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
-					:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
-				<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
-					:src="qnyurl('cancel.png','xbk')" mode=""></image>
-				<!-- 订单状态 -->
-				<view class="xbk-Order-status-Title">
-					{{InforData['status'] | OrderState}}
-				</view>
-				<!-- 未支付 -->
-				<template v-if="InforData['status'] == OrderStatus0">
-					<view class="xbk-Order-status-time">
-						剩余付款时间 {{wait_for}}
-					</view>
-					<view class="xbk-Order-status-pay" @tap="payments">
-						立即支付
-					</view>
-					<view class="xbk-Order-status-wait">
-						若您已支付请耐心等待商家结算
-					</view>
-				</template>
-				<!-- 待出餐 -->
-				<template v-if="InforData['status'] == OrderStatus1">
-					<view class="xbk-Order-status-wait">
-						排队下单中，请耐心等待
-					</view>
-					<view class="xbk-Order-status-Tips">
-						本页面可关闭，将短信通知取单号，或稍后查询我的订单
-					</view>
-				</template>
-			</view>
-			<!-- 已经出餐 -->
-			<view class="xbk-Order-status-take style" v-else>
-				<view class="codes" v-for="(item,index) in InforData['codes']">
-					<view class="codes-img">
-						<image class="img" :src="qnyurl('Password.png','xbk')" mode=""></image>
-					</view>
-					<view class="codes-Password">
-						口令{{index+1}}：{{item}}
-					</view>
-				</view>
-			</view>
-		</template>
-
-	</view>
-</template>
-
-<script>
-	import mixin from '@/static/js/mixin/mixin.js';
-	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
-	export default {
-		mixins: [mixin,restaurantmixins],
-		name: "b-restaurant-order-status",
-		props: {
-			InforData: {
-				type: Object,
-				default: () => {}
-			}
-		},
-		computed: {
-			BtnStyle() {
-				let style = {};
-				switch (this['InforData']['brand_id']) {
-					case 1:
-						style['color'] = uni.$u.addUnit('#C63836');
-						style['border'] = uni.$u.addUnit('1px solid #DC7473');
-						break;
-					case 10:
-						style['color'] = uni.$u.addUnit('#ffffff');
-						style['background-color'] = uni.$u.addUnit('#00AF66');
-						// style['border'] = uni.$u.addUnit('1px solid #00AF66');
-						break;
-					case 13:
-						style['color'] = uni.$u.addUnit('#ffffff');
-						style['border'] = uni.$u.addUnit('1px solid #4A6FE7');
-						break;
-				};
-				return style;
-			}
-		},
-		mounted() {
-			if (this['InforData']['status'] == this['OrderStatus0']) {
-				this.tiem(this['InforData']['status'], this['InforData']['createtime'])
-			};
-		},
-		data() {
-			return {};
-		},
-		methods: {
-			payments() {
-				this.$emit('payments', {
-					order_sn: this['InforData']['order_sn'],
-					restaurant_id: this['InforData']['restaurant_id']
-				});
-
-			},
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f8f8f8;
-		padding: 32rpx;
-		box-sizing: border-box;
-	}
-
-	.b-restaurant-order-status {
-		width: 100%;
-		height: 100%;
-
-		.style {
-			border-radius: 20rpx;
-			background-color: #ffffff;
-		}
-
-		// 瑞幸待出餐/未支付/已取消状态
-		.rx-Order-status {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			padding: 35rpx 0;
-
-			&-Img {
-				width: 108rpx;
-				height: 108rpx;
-			}
-
-			&-Title {
-				font-size: 36rpx;
-				margin-bottom: 20rpx;
-
-			}
-
-			&-time {
-				color: #666666;
-				font-size: 26rpx;
-				margin-bottom: 20rpx;
-			}
-
-			&-pay {
-				width: 220rpx;
-				height: 60rpx;
-				color: #ffffff;
-				font-size: 28rpx;
-				background: #0122A4;
-				border-radius: 30rpx;
-				text-align: center;
-				line-height: 60rpx;
-			}
-
-			&-wait {
-				background: #F7F8FA;
-				border-radius: 28rpx;
-				padding: 15rpx 30rpx;
-				color: #666666;
-				font-size: 26rpx;
-			}
-
-			// 星巴克
-			&-Tips {
-				color: #999999;
-				font-size: 24rpx;
-			}
-		}
-
-		// 瑞幸订单完成状态
-		.rx-Order-status-take {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			padding: 15rpx 0;
-
-			&-code {
-				display: flex;
-				align-items: center;
-
-				.text1 {
-					color: #000000;
-					font-size: 26rpx;
-					margin-right: 15rpx;
-				}
-
-				.text2 {
-					color: #4B6FE7;
-					font-size: 52rpx;
-				}
-			}
-
-
-			&-codeimg {
-				width: 234rpx;
-				height: 235rpx;
-
-				.img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-	}
-
-	.b-restaurant-order-status {
-		width: 100%;
-		height: 100%;
-	
-		.style {
-			border-radius: 20rpx;
-			background-color: #ffffff;
-		}
-	
-		
-	
-	}
-</style>
+<template>
+	<view class="b-restaurant-order-status">
+		<!-- 订单状态 -->
+		<!-- 瑞幸订单状态 -->
+		<template v-if="InforData['brand_id'] == 13">
+			<view class="rx-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
+				<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
+					:src="qnyurl('Unpaid.png','rx')" mode=""></image>
+				<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
+					:src="qnyurl('NotServed.png','rx')" mode=""></image>
+				<image class="rx-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
+					:src="qnyurl('cancel.png','rx')" mode=""></image>
+				<!-- 订单状态 -->
+				<view class="rx-Order-status-Title">
+					{{InforData['status'] | OrderState}}
+				</view>
+				<!-- 未支付 -->
+				<template v-if="InforData['status'] == OrderStatus0">
+					<view class="rx-Order-status-time">
+						剩余付款时间 {{wait_for}}
+					</view>
+					<view class="rx-Order-status-pay" :style="BtnStyle" @tap="payments">
+						立即支付
+					</view>
+					<view class="rx-Order-status-wait">
+						若您已支付请耐心等待商家结算
+					</view>
+				</template>
+				<!-- 待出餐 -->
+				<template v-if="InforData['status'] == OrderStatus1">
+					<view class="rx-Order-status-wait">
+						下单成功，取餐码生成中，请稍后查看
+					</view>
+				</template>
+			</view>
+			<!-- 已经出餐 -->
+			<view class="rx-Order-status-take style" v-else>
+				<view class="rx-Order-status-take-code">
+					<text class="text1">取餐码</text>
+					<text class="text2">{{InforData['codes'].join('')}}</text>
+				</view>
+				<view class="rx-Order-status-take-codeimg">
+					<img class="img" :src="InforData['qrcode']" alt="">
+				</view>
+			</view>
+		</template>
+
+
+		<template v-if="InforData['brand_id'] == 10">
+			<view class="xbk-Order-status style" v-if="InforData['status'] != 2 && InforData['status'] != 4">
+				<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus0"
+					:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
+				<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus1"
+					:src="qnyurl('Unpaid.png','xbk')" mode=""></image>
+				<image class="xbk-Order-status-Img" v-if="InforData['status'] == OrderStatus5"
+					:src="qnyurl('cancel.png','xbk')" mode=""></image>
+				<!-- 订单状态 -->
+				<view class="xbk-Order-status-Title">
+					{{InforData['status'] | OrderState}}
+				</view>
+				<!-- 未支付 -->
+				<template v-if="InforData['status'] == OrderStatus0">
+					<view class="xbk-Order-status-time">
+						剩余付款时间 {{wait_for}}
+					</view>
+					<view class="xbk-Order-status-pay" @tap="payments">
+						立即支付
+					</view>
+					<view class="xbk-Order-status-wait">
+						若您已支付请耐心等待商家结算
+					</view>
+				</template>
+				<!-- 待出餐 -->
+				<template v-if="InforData['status'] == OrderStatus1">
+					<view class="xbk-Order-status-wait">
+						排队下单中，请耐心等待
+					</view>
+					<view class="xbk-Order-status-Tips">
+						本页面可关闭，将短信通知取单号，或稍后查询我的订单
+					</view>
+				</template>
+			</view>
+			<!-- 已经出餐 -->
+			<view class="xbk-Order-status-take style" v-else>
+				<view class="codes" v-for="(item,index) in InforData['codes']">
+					<view class="codes-img">
+						<image class="img" :src="qnyurl('Password.png','xbk')" mode=""></image>
+					</view>
+					<view class="codes-Password">
+						口令{{index+1}}：{{item}}
+					</view>
+				</view>
+			</view>
+		</template>
+
+	</view>
+</template>
+
+<script>
+	import mixin from '@/static/js/mixin/mixin.js';
+	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
+	export default {
+		mixins: [mixin,restaurantmixins],
+		name: "b-restaurant-order-status",
+		props: {
+			InforData: {
+				type: Object,
+				default: () => {}
+			}
+		},
+		computed: {
+			BtnStyle() {
+				let style = {};
+				switch (this['InforData']['brand_id']) {
+					case 1:
+						style['color'] = uni.$u.addUnit('#C63836');
+						style['border'] = uni.$u.addUnit('1px solid #DC7473');
+						break;
+					case 10:
+						style['color'] = uni.$u.addUnit('#ffffff');
+						style['background-color'] = uni.$u.addUnit('#00AF66');
+						// style['border'] = uni.$u.addUnit('1px solid #00AF66');
+						break;
+					case 13:
+						style['color'] = uni.$u.addUnit('#ffffff');
+						style['border'] = uni.$u.addUnit('1px solid #4A6FE7');
+						break;
+				};
+				return style;
+			}
+		},
+		mounted() {
+			if (this['InforData']['status'] == this['OrderStatus0']) {
+				this.tiem(this['InforData']['status'], this['InforData']['createtime'])
+			};
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			payments() {
+				this.$emit('payments', {
+					order_sn: this['InforData']['order_sn'],
+					restaurant_id: this['InforData']['restaurant_id']
+				});
+
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f8f8f8;
+		padding: 32rpx;
+		box-sizing: border-box;
+	}
+
+	.b-restaurant-order-status {
+		width: 100%;
+		height: 100%;
+
+		.style {
+			border-radius: 20rpx;
+			background-color: #ffffff;
+		}
+
+		// 瑞幸待出餐/未支付/已取消状态
+		.rx-Order-status {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 35rpx 0;
+
+			&-Img {
+				width: 108rpx;
+				height: 108rpx;
+			}
+
+			&-Title {
+				font-size: 36rpx;
+				margin-bottom: 20rpx;
+
+			}
+
+			&-time {
+				color: #666666;
+				font-size: 26rpx;
+				margin-bottom: 20rpx;
+			}
+
+			&-pay {
+				width: 220rpx;
+				height: 60rpx;
+				color: #ffffff;
+				font-size: 28rpx;
+				background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+				border-radius: 30rpx;
+				text-align: center;
+				line-height: 60rpx;
+			}
+
+			&-wait {
+				background: #F7F8FA;
+				border-radius: 28rpx;
+				padding: 15rpx 30rpx;
+				color: #666666;
+				font-size: 26rpx;
+			}
+
+			// 星巴克
+			&-Tips {
+				color: #999999;
+				font-size: 24rpx;
+			}
+		}
+
+		// 瑞幸订单完成状态
+		.rx-Order-status-take {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 15rpx 0;
+
+			&-code {
+				display: flex;
+				align-items: center;
+
+				.text1 {
+					color: #000000;
+					font-size: 26rpx;
+					margin-right: 15rpx;
+				}
+
+				.text2 {
+					color: #4B6FE7;
+					font-size: 52rpx;
+				}
+			}
+
+
+			&-codeimg {
+				width: 234rpx;
+				height: 235rpx;
+
+				.img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+	}
+
+	.b-restaurant-order-status {
+		width: 100%;
+		height: 100%;
+	
+		.style {
+			border-radius: 20rpx;
+			background-color: #ffffff;
+		}
+	
+		
+	
+	}
+</style>
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 75c55d1..c162235 100644
--- a/components/b-rx-sku-popup/b-rx-sku-popup.vue
+++ b/components/b-rx-sku-popup/b-rx-sku-popup.vue
@@ -329,7 +329,7 @@
 			&-right {
 				width: 254rpx;
 				height: 86rpx;
-				background: #0122A4;
+				background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 				box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 				border-radius: 43rpx;
 				text-align: center;
diff --git a/components/b-shop-item/b-rx-shop-item.vue b/components/b-shop-item/b-rx-shop-item.vue
index d4da44b..54adc38 100644
--- a/components/b-shop-item/b-rx-shop-item.vue
+++ b/components/b-shop-item/b-rx-shop-item.vue
@@ -1,271 +1,271 @@
-<template>
-	<view class="b-rx-shop-item">
-		<view class="b-rx-shop-item-commodity">
-			<image class="b-rx-shop-item-commodity-img" :src="item['product_img']" mode=""></image>
-		</view>
-		<view class="b-rx-shop-item-commodity-infor">
-			<!-- 商品标题 -->
-			<view class="b-rx-shop-item-commodity-infor-title b-rx-shop-item-commodity-infor-bottom">
-				{{item['product_name']}}
-			</view>
-			<!-- 补贴金额 -->
-			<view v-if="item['max_deduction'] > 0"
-				class="b-rx-shop-item-commodity-infor-discount b-rx-shop-item-commodity-infor-bottom">
-				最高补贴{{RetainDecimalPoint(item['max_deduction'])}}面额
-			</view>
-			<!-- 价格 -->
-			<view class="b-rx-shop-item-commodity-infor-original-price b-rx-shop-item-commodity-infor-bottom">
-				<text class="yang">原价:￥</text>
-				<text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text>
-			</view>
-			<!-- 优惠补贴后的价格 -->
-			<view class="b-rx-shop-item-commodity-infor-price b-rx-shop-item-commodity-infor-bottom">
-				<text class="yang">补贴后价格:￥</text>
-				<text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text>
-			</view>
-			<!-- 直接添加商品 -->
-			<!-- <view class="b-kfc-shop-item-commodity-infor-shopping-cart" v-if="shopCart['num'] > 0">
-				<image class="img" :src="qnyurl('reduce.png','rx')" mode=""
-					@tap="reducecommodity"></image>
-				<view class="num">
-					{{shopCart['num']}}
-				</view>
-				<image class="img" :src="qnyurl('add.png','rx')" mode="" @tap="GetCommodity"></image>
-			</view> -->
-			<!-- 需要选择规格 -->
-			<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku" @tap="$u.debounce(GetCommodity, 800,true)">
-				<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku-btn" :style="[Btnstyle]">
-					 <u-badge v-if="NumValu > 0" :offset="[-6,-5]" max="99" absolute :value="NumValu"></u-badge>
-					选规格
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * @肯德基店铺商品组件
-	 * */
-	// 混入
-	import mixin from '@/static/js/mixin/mixin.js';
-	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
-	// 接口请求
-	import {
-		menuDetailsAPI,
-	} from '@/request/restaurant/index.js';
-	import {
-		mapMutations
-	} from 'vuex'
-	export default {
-		mixins: [mixin, restaurantmixins],
-		name: "b-rx-shop-item",
-		props: {
-			item: {
-				type: Object,
-				default: () => {}
-			}
-		},
-		data() {
-			return {};
-		},
-		computed: {
-			//当前商店购物信息
-			shopCart: function() {
-				try {
-					return this['GetCartList'][this['item']['product_id']];
-				} catch (e) {
-					return 0
-				}
-			},
-			
-			NumValu(){
-				try{
-					return this['GetCartList'][this['item']['product_id']]['num']
-				}catch(e){
-					return 0
-				}
-			},
-
-			// 按钮颜色
-			Btnstyle() {
-				if (this['BrandInfor']['brand_id'] == 10) {
-					return {
-						'background': '#00AF66'
-					};
-				}
-				if (this['BrandInfor']['brand_id'] == 13) {
-					return {
-						'background': '#0122A4'
-					};
-				}
-			}
-		},
-		methods: {
-			...mapMutations({
-				SetcommodityInfor: 'shopping/SETINFOR'
-			}),
-			// 获取商品规格
-			GetCommodity() {
-				uni.showLoading({
-					title: '加载中...'
-				});
-				let parameters = {
-					brand_id: this['BrandInfor']['brand_id'],
-					restaurant_id: this['GetShopInfor']['restaurant_id'],
-					product_id: this['item']['product_id']
-				}
-				menuDetailsAPI(parameters).then(res => {
-					uni.hideLoading();
-					// 设置初始数量
-					res['data']['num'] = 1;
-					this.SetcommodityInfor(res['data']);
-					if (this['BrandInfor']['brand_id'] == 10) {
-						// H5端不可用
-						// this['$parent']['$parent']['$parent']['$refs']['b-xbk-sku-popup']['show'] = true;
-						this.$emit('skupopup','b-xbk-sku-popup');
-						console.log(this['BrandInfor']['brand_id'],'执行1')
-					};
-					
-					if (this['BrandInfor']['brand_id'] == 13) {
-						this.$emit('skupopup','b-rx-sku-popup');
-						// H5端不可用
-						// this['$parent']['$parent']['$parent']['$refs']['b-rx-sku-popup']['show'] = true;
-						console.log(this['BrandInfor']['brand_id'],'执行2')
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.b-rx-shop-item {
-		width: 100%;
-		height: auto;
-		display: flex;
-		justify-content: flex-start;
-
-		&-commodity {
-			width: 220rpx;
-			height: 195rpx;
-			max-width: 220rpx;
-			max-height: 195rpx;
-			min-width: 220rpx;
-			min-height: 195rpx;
-			border-radius: 10rpx;
-			overflow: hidden;
-
-			&-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		&-commodity-infor {
-			flex: 1;
-			padding-left: 22rpx;
-
-			&-bottom {
-				margin-bottom: 15rpx;
-			}
-
-			&-title {
-				font-size: $FONTSIZE26;
-				color: $THEMECOLOR4;
-			}
-
-			&-discount {
-				background-color: #FFDADA;
-				border-radius: 50rpx;
-				color: $THEMECOLOR1;
-				font-size: $FONTSIZE22;
-				padding: 5rpx 15rpx;
-				display: inline-block;
-			}
-
-			&-original-price {
-				.yang {
-					font-size: $FONTSIZE22;
-				}
-
-				.price {
-					font-size: $FONTSIZE22;
-				}
-			}
-
-			&-price {
-				color: $THEMECOLOR1;
-
-				.yang {
-					font-size: $FONTSIZE22;
-				}
-
-				.price {
-					font-size: $FONTSIZE30;
-				}
-			}
-
-			&-shopping-cart {
-				flex: 1;
-				height: 60rpx;
-				display: flex;
-				justify-content: flex-end;
-				font-size: 36rpx;
-				align-items: center;
-
-				.num {
-					max-width: 100rpx;
-					min-width: 100rpx;
-					text-align: center;
-				}
-
-				.img {
-					width: 42rpx;
-					height: 42rpx;
-				}
-			}
-
-			&-shopping-cart-sku {
-				flex: 1;
-				height: 60rpx;
-				display: flex;
-				justify-content: flex-end;
-				font-size: 36rpx;
-				align-items: center;
-
-				&-btn {
-					width: 106rpx;
-					height: 50rpx;
-					position: relative;
-					border-radius: 25rpx;
-					color: #ffffff;
-					text-align: center;
-					line-height: 50rpx;
-					font-size: 24rpx;
-				}
-			}
-		}
-	}
-
-
-	.b-kfc-shop-item-commodity-infor-shopping-cart {
-		flex: 1;
-		height: 60rpx;
-		display: flex;
-		justify-content: flex-end;
-		font-size: 36rpx;
-		align-items: center;
-
-		.num {
-			max-width: 100rpx;
-			min-width: 100rpx;
-			text-align: center;
-		}
-
-		.img {
-			width: 42rpx;
-			height: 42rpx;
-		}
-	}
-</style>
+<template>
+	<view class="b-rx-shop-item">
+		<view class="b-rx-shop-item-commodity">
+			<image class="b-rx-shop-item-commodity-img" :src="item['product_img']" mode=""></image>
+		</view>
+		<view class="b-rx-shop-item-commodity-infor">
+			<!-- 商品标题 -->
+			<view class="b-rx-shop-item-commodity-infor-title b-rx-shop-item-commodity-infor-bottom">
+				{{item['product_name']}}
+			</view>
+			<!-- 补贴金额 -->
+			<view v-if="item['max_deduction'] > 0"
+				class="b-rx-shop-item-commodity-infor-discount b-rx-shop-item-commodity-infor-bottom">
+				最高补贴{{RetainDecimalPoint(item['max_deduction'])}}面额
+			</view>
+			<!-- 价格 -->
+			<view class="b-rx-shop-item-commodity-infor-original-price b-rx-shop-item-commodity-infor-bottom">
+				<text class="yang">原价:￥</text>
+				<text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text>
+			</view>
+			<!-- 优惠补贴后的价格 -->
+			<view class="b-rx-shop-item-commodity-infor-price b-rx-shop-item-commodity-infor-bottom">
+				<text class="yang">补贴后价格:￥</text>
+				<text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text>
+			</view>
+			<!-- 直接添加商品 -->
+			<!-- <view class="b-kfc-shop-item-commodity-infor-shopping-cart" v-if="shopCart['num'] > 0">
+				<image class="img" :src="qnyurl('reduce.png','rx')" mode=""
+					@tap="reducecommodity"></image>
+				<view class="num">
+					{{shopCart['num']}}
+				</view>
+				<image class="img" :src="qnyurl('add.png','rx')" mode="" @tap="GetCommodity"></image>
+			</view> -->
+			<!-- 需要选择规格 -->
+			<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku" @tap="$u.debounce(GetCommodity, 800,true)">
+				<view class="b-rx-shop-item-commodity-infor-shopping-cart-sku-btn" :style="[Btnstyle]">
+					 <u-badge v-if="NumValu > 0" :offset="[-6,-5]" max="99" absolute :value="NumValu"></u-badge>
+					选规格
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * @肯德基店铺商品组件
+	 * */
+	// 混入
+	import mixin from '@/static/js/mixin/mixin.js';
+	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
+	// 接口请求
+	import {
+		menuDetailsAPI,
+	} from '@/request/restaurant/index.js';
+	import {
+		mapMutations
+	} from 'vuex'
+	export default {
+		mixins: [mixin, restaurantmixins],
+		name: "b-rx-shop-item",
+		props: {
+			item: {
+				type: Object,
+				default: () => {}
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			//当前商店购物信息
+			shopCart: function() {
+				try {
+					return this['GetCartList'][this['item']['product_id']];
+				} catch (e) {
+					return 0
+				}
+			},
+			
+			NumValu(){
+				try{
+					return this['GetCartList'][this['item']['product_id']]['num']
+				}catch(e){
+					return 0
+				}
+			},
+
+			// 按钮颜色
+			Btnstyle() {
+				if (this['BrandInfor']['brand_id'] == 10) {
+					return {
+						'background': '#00AF66'
+					};
+				}
+				if (this['BrandInfor']['brand_id'] == 13) {
+					return {
+						'background': 'linear-gradient(-77deg, #4A6FE7, #83ACFF)'
+					};
+				}
+			}
+		},
+		methods: {
+			...mapMutations({
+				SetcommodityInfor: 'shopping/SETINFOR'
+			}),
+			// 获取商品规格
+			GetCommodity() {
+				uni.showLoading({
+					title: '加载中...'
+				});
+				let parameters = {
+					brand_id: this['BrandInfor']['brand_id'],
+					restaurant_id: this['GetShopInfor']['restaurant_id'],
+					product_id: this['item']['product_id']
+				}
+				menuDetailsAPI(parameters).then(res => {
+					uni.hideLoading();
+					// 设置初始数量
+					res['data']['num'] = 1;
+					this.SetcommodityInfor(res['data']);
+					if (this['BrandInfor']['brand_id'] == 10) {
+						// H5端不可用
+						// this['$parent']['$parent']['$parent']['$refs']['b-xbk-sku-popup']['show'] = true;
+						this.$emit('skupopup','b-xbk-sku-popup');
+						console.log(this['BrandInfor']['brand_id'],'执行1')
+					};
+					
+					if (this['BrandInfor']['brand_id'] == 13) {
+						this.$emit('skupopup','b-rx-sku-popup');
+						// H5端不可用
+						// this['$parent']['$parent']['$parent']['$refs']['b-rx-sku-popup']['show'] = true;
+						console.log(this['BrandInfor']['brand_id'],'执行2')
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.b-rx-shop-item {
+		width: 100%;
+		height: auto;
+		display: flex;
+		justify-content: flex-start;
+
+		&-commodity {
+			width: 220rpx;
+			height: 195rpx;
+			max-width: 220rpx;
+			max-height: 195rpx;
+			min-width: 220rpx;
+			min-height: 195rpx;
+			border-radius: 10rpx;
+			overflow: hidden;
+
+			&-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		&-commodity-infor {
+			flex: 1;
+			padding-left: 22rpx;
+
+			&-bottom {
+				margin-bottom: 15rpx;
+			}
+
+			&-title {
+				font-size: $FONTSIZE26;
+				color: $THEMECOLOR4;
+			}
+
+			&-discount {
+				background-color: #FFDADA;
+				border-radius: 50rpx;
+				color: $THEMECOLOR1;
+				font-size: $FONTSIZE22;
+				padding: 5rpx 15rpx;
+				display: inline-block;
+			}
+
+			&-original-price {
+				.yang {
+					font-size: $FONTSIZE22;
+				}
+
+				.price {
+					font-size: $FONTSIZE22;
+				}
+			}
+
+			&-price {
+				color: $THEMECOLOR1;
+
+				.yang {
+					font-size: $FONTSIZE22;
+				}
+
+				.price {
+					font-size: $FONTSIZE30;
+				}
+			}
+
+			&-shopping-cart {
+				flex: 1;
+				height: 60rpx;
+				display: flex;
+				justify-content: flex-end;
+				font-size: 36rpx;
+				align-items: center;
+
+				.num {
+					max-width: 100rpx;
+					min-width: 100rpx;
+					text-align: center;
+				}
+
+				.img {
+					width: 42rpx;
+					height: 42rpx;
+				}
+			}
+
+			&-shopping-cart-sku {
+				flex: 1;
+				height: 60rpx;
+				display: flex;
+				justify-content: flex-end;
+				font-size: 36rpx;
+				align-items: center;
+
+				&-btn {
+					width: 106rpx;
+					height: 50rpx;
+					position: relative;
+					border-radius: 25rpx;
+					color: #ffffff;
+					text-align: center;
+					line-height: 50rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+
+
+	.b-kfc-shop-item-commodity-infor-shopping-cart {
+		flex: 1;
+		height: 60rpx;
+		display: flex;
+		justify-content: flex-end;
+		font-size: 36rpx;
+		align-items: center;
+
+		.num {
+			max-width: 100rpx;
+			min-width: 100rpx;
+			text-align: center;
+		}
+
+		.img {
+			width: 42rpx;
+			height: 42rpx;
+		}
+	}
+</style>
diff --git a/components/b-shop-list-item/b-shop-list-item.vue b/components/b-shop-list-item/b-shop-list-item.vue
index c1dbf15..17da306 100644
--- a/components/b-shop-list-item/b-shop-list-item.vue
+++ b/components/b-shop-list-item/b-shop-list-item.vue
@@ -233,7 +233,7 @@
 	// 	.btn {
 	// 		width: 470rpx;
 	// 		height: 86rpx;
-	// 		background: #0122A4;
+	// 		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 	// 		border-radius: 43rpx;
 	// 		font-size: 30rpx;
 	// 		color: #ffffff;
diff --git a/components/新建文件夹/b-Shopping-Cart/b-Shopping-Cart.vue b/components/新建文件夹/b-Shopping-Cart/b-Shopping-Cart.vue
index 49b5596..36c6efa 100644
--- a/components/新建文件夹/b-Shopping-Cart/b-Shopping-Cart.vue
+++ b/components/新建文件夹/b-Shopping-Cart/b-Shopping-Cart.vue
@@ -607,7 +607,7 @@
 		&-right {
 			width: 225rpx;
 			height: 77rpx;
-			background: #0122A4;
+			background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 			border-radius: 48rpx;
 			text-align: center;
diff --git a/components/新建文件夹/b-page-home/b-page-home-rx.vue b/components/新建文件夹/b-page-home/b-page-home-rx.vue
index 0b33a62..02a4323 100644
--- a/components/新建文件夹/b-page-home/b-page-home-rx.vue
+++ b/components/新建文件夹/b-page-home/b-page-home-rx.vue
@@ -386,7 +386,7 @@
 		padding: 15rpx 32rpx;
 	}
 	.confirmButton{
-		background: #0122A4;
+		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 		border-radius: 43px;
 		color: #ffffff;
 		font-size: 30rpx;
diff --git a/components/新建文件夹/b-shop-item/b-rx-shop-item.vue b/components/新建文件夹/b-shop-item/b-rx-shop-item.vue
index d2a8c10..6dc2dfb 100644
--- a/components/新建文件夹/b-shop-item/b-rx-shop-item.vue
+++ b/components/新建文件夹/b-shop-item/b-rx-shop-item.vue
@@ -96,7 +96,7 @@
 				}
 				if (this['BrandInfor']['brand_id'] == 13) {
 					return {
-						'background': '#0122A4'
+						'background': 'linear-gradient(-77deg, #4A6FE7, #83ACFF)'
 					};
 				}
 			}
diff --git a/components/新建文件夹/b-shop-list-item/b-shop-list-item.vue b/components/新建文件夹/b-shop-list-item/b-shop-list-item.vue
index c1dbf15..17da306 100644
--- a/components/新建文件夹/b-shop-list-item/b-shop-list-item.vue
+++ b/components/新建文件夹/b-shop-list-item/b-shop-list-item.vue
@@ -233,7 +233,7 @@
 	// 	.btn {
 	// 		width: 470rpx;
 	// 		height: 86rpx;
-	// 		background: #0122A4;
+	// 		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 	// 		border-radius: 43rpx;
 	// 		font-size: 30rpx;
 	// 		color: #ffffff;
diff --git a/pages/diy/orders/order-infor/order-infor.vue b/pages/diy/orders/order-infor/order-infor.vue
index 05a4f6a..b8f6875 100644
--- a/pages/diy/orders/order-infor/order-infor.vue
+++ b/pages/diy/orders/order-infor/order-infor.vue
@@ -503,7 +503,7 @@
 					height: 60rpx;
 					color: #ffffff;
 					font-size: 28rpx;
-					background: #0122A4;
+					background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 					border-radius: 30rpx;
 					text-align: center;
 					line-height: 60rpx;
diff --git a/pages/restaurant/home/home.vue b/pages/restaurant/home/home.vue
index 4ef2482..b0d4fd3 100644
--- a/pages/restaurant/home/home.vue
+++ b/pages/restaurant/home/home.vue
@@ -1198,7 +1198,7 @@
 	}
 
 	.confirmButton {
-		// background: #0122A4;
+		// background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 		border-radius: 43px;
 		color: #ffffff;
 		font-size: 30rpx;
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 df6035f..76f86ab 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/rx.scss
+++ b/pages/restaurant/home/shop_home/components/shop-cart/rx.scss
@@ -48,7 +48,7 @@
 		&-right {
 			width: 225rpx;
 			height: 77rpx;
-			background: #0122A4;
+			background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 			border-radius: 48rpx;
 			text-align: center;
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 c13ea88..880e526 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
@@ -6,31 +6,36 @@
 		
 		<!-- 麦当劳/肯德基 -->
 		<view class="shop_home-commodity-infor" v-if="BrandInfor['brand_id'] == 1 || BrandInfor['brand_id'] == 5">
-			<!-- 商品标题 -->
-			<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">{{item['product_price']}}</text>
-				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> -->
-			</view>
-			<!-- 优惠补贴后的价格 -->
-			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
-				<text class="yang">补贴后价格:￥</text>
-				<text class="price">{{item['bt_price']}}</text>
-				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</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>
+				<!-- 商品标题 -->
+				<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
+					{{item['product_name']}}
+				</view>
+				<view class="flex">
+					<!-- 优惠补贴后的价格 -->
+					<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
+						<text class="price">¥{{item['bt_price']}}</text>
+						<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
+					</view>
+					<!-- 价格 -->
+					<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
+						<text class="price">￥{{item['product_price']}}</text>
+						<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'])}}</text> -->
+					</view>
+				</view>
+				<!-- 消费补贴卡 -->
+				<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 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>
 			<!-- 该商品为套餐商品并且套餐中有可选商品则显示为选规格 -->
 			<view class="shop_home-commodity-infor-cart-sku" v-if="ISSpecifications" @tap="$u.debounce(Addcommodity, 800,true)">
@@ -57,30 +62,32 @@
 		<!-- 星巴克/瑞幸 -->
 		<view class="shop_home-commodity-infor" v-if="BrandInfor['brand_id'] == 10 || BrandInfor['brand_id'] == 13">
 			<!-- 商品标题 -->
-			<view class="shop_home-commodity-infor-title shop_home-commodity-infor-bottom">
-				{{item['product_name']}}
-			</view>
-			<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-title shop_home-commodity-infor-bottom">
+					{{item['product_name']}}
 				</view>
-				<!-- 价格 -->
-				<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom huaxian">
-					<text class="price">¥{{item['product_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>
-			<!-- 消费补贴卡 -->
-			<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 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 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 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>
 			<!-- 选规格 -->
@@ -366,7 +373,6 @@
 			flex-direction: column;
 			justify-content: space-between;
 			&-bottom {
-				// margin-bottom: 12rpx;
 			}
 			
 			.huaxian {
@@ -381,7 +387,12 @@
 			&-title {
 				font-size: $FONTSIZE30;
 				color: $THEMECOLOR4;
-				font-weight: 600;
+				font-weight: 600;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				overflow: hidden;
+				text-overflow: ellipsis;
 			}
 
 			&-discount {
diff --git a/pages/restaurant/order/order-details/details.vue b/pages/restaurant/order/order-details/details.vue
index 59dd4cb..0ca8977 100644
--- a/pages/restaurant/order/order-details/details.vue
+++ b/pages/restaurant/order/order-details/details.vue
@@ -702,7 +702,7 @@
 					height: 60rpx;
 					color: #ffffff;
 					font-size: 28rpx;
-					background: #0122A4;
+					background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
 					border-radius: 30rpx;
 					text-align: center;
 					line-height: 60rpx;
diff --git a/static/js/config.js b/static/js/config.js
index 0a177f8..3bfb6f3 100644
--- a/static/js/config.js
+++ b/static/js/config.js
@@ -620,7 +620,7 @@ const config = {
 			// 自定义普通按钮样式
 			BtnStyle: [{
 				color: '#FFFFFF',
-				background: '#0122A4',
+				background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
 			}],
 			// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
 			OrderStatus: {
@@ -772,7 +772,7 @@ const config = {
 			// 自定义普通按钮样式
 			BtnStyle: [{
 				color: '#FFFFFF',
-				background: '#0122A4',
+				background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
 			}],
 			// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
 			OrderStatus: {