diff --git a/common/js/websocket.js b/common/js/websocket.js
index c16abae..4a424ca 100644
--- a/common/js/websocket.js
+++ b/common/js/websocket.js
@@ -63,33 +63,37 @@ class webSocketUtils {
 			this.canReconnect = true;
 			clearInterval(this.heartbeatInterval);
 			clearInterval(this.reconnectTimeOut);
-			if (this.connectNum <= 10) {
-				// uni.showLoading({
-				// 	title: `网络连接失败，正尝试第${this.connectNum}次连接`,
-				// 	mask: true
-				// })
-				uni.$emit('message', 1) //进行重连
-				uni.showToast({
-					title: `网络连接失败，正尝试第${this.connectNum}次连接`,
-					icon: 'none',
-				});
-				this.reconnect();
-				this.connectNum += 1;
-			} else {
-				// uni.$emit('connectError');
-				uni.showToast({
-					title: `网络连接失败，请检查网络！`,
-					icon: 'none',
-				});
-				this.connectNum = 1;
-				this.canReconnect = false;
-				this.Close()
-				setTimeout(res => {
-					uni.switchTab({
-						url: '/pages/index/index'
-					})
-					uni.hideLoading()
-				}, 1000)
+			try {
+				if (this.connectNum <= 10) {
+					// uni.showLoading({
+					// 	title: `网络连接失败，正尝试第${this.connectNum}次连接`,
+					// 	mask: true
+					// })
+					uni.$emit('message', 1) //进行重连
+					uni.showToast({
+						title: `网络连接失败，正尝试第${this.connectNum}次连接`,
+						icon: 'none',
+					});
+					this.reconnect();
+					this.connectNum += 1;
+				} else {
+					// uni.$emit('connectError');
+					uni.showToast({
+						title: `网络连接失败，请检查网络！`,
+						icon: 'none',
+					});
+					this.connectNum = 1;
+					this.canReconnect = false;
+					this.Close()
+					setTimeout(res => {
+						uni.switchTab({
+							url: '/pages/index/index'
+						})
+						uni.hideLoading()
+					}, 1000)
+				}
+			} catch (e) {
+				//TODO handle the exception
 			}
 		});
 		// 这里仅是事件监听【如果socket关闭了会执行】
diff --git a/components/l-barrage/l-barrage.vue b/components/l-barrage/l-barrage.vue
new file mode 100644
index 0000000..db93213
--- /dev/null
+++ b/components/l-barrage/l-barrage.vue
@@ -0,0 +1,181 @@
+<template>
+	<view class="l-barrage">
+		<block v-for="(item,index) in items" :key="index">
+			<!-- #ifdef H5 -->
+			<text v-if="item.display" class="aon" :style="{top: `${item.top}%`,color: item.color}">
+				{{item.text}}
+			</text>
+			<!-- #endif -->
+
+			<!-- #ifndef H5 -->
+			<!-- <text v-if="item.display" class="aon" 
+					  :style="{top: `${item.top}%`,color: item.color,
+					  animation: `mymove ${Number(item.time)}s linear forwards`
+					  }"
+					>
+						{{item.text}}
+					</text> -->
+			<view v-if="item.display" class="aon"
+				style=" display: flex;justify-content: center;align-items: center; background-color: #000; padding:10rpx; border-radius: 10rpx;"
+				:style="{top: `${item.top}%`,
+					  animation: `mymove ${Number(item.time)}s linear forwards`
+					  }">
+				<image style="width: 50rpx; height: 50rpx;border-radius: 50%;" :src="avatar"
+					mode="aspectFill"></image>
+				<text style="color: #fff;">
+					{{item.text}}
+				</text>
+			</view>
+			<!-- #endif -->
+		</block>
+	</view>
+</template>
+
+<script>
+	let cycle;
+
+	// 弹幕字体颜色
+	function getRandomColor() {
+		let rgb = []
+		for (let i = 0; i < 3; ++i) {
+			let color = Math.floor(Math.random() * 256).toString(16)
+			color = color.length == 1 ? '0' + color : color
+			rgb.push(color)
+		}
+		return '#' + rgb.join('')
+	}
+
+	export default {
+		name: 'l-barrage',
+		props: {
+			minTime: {
+				type: Number,
+				default: 4
+			},
+			maxTime: {
+				type: Number,
+				default: 9
+			},
+			minTop: {
+				type: Number,
+				default: 8
+			},
+			maxTop: {
+				type: Number,
+				default: 16
+			},
+			avatar:{
+				type:String,
+				default:'@/static/1.gif'
+			}
+		},
+		data() {
+			return {
+				items: [],
+				userInfo: uni.cache.get('userInfo'), //个人信息
+			}
+		},
+		methods: {
+			add(text = '', time = Math.ceil(Math.floor(Math.random() * (this.maxTime - this.minTime + 1) + this
+				.minTime))) {
+				this.items.push({
+					text,
+					time,
+					top: Math.ceil(Math.random() * (this.maxTop - this.minTop + 1) + this.minTop),
+					color: getRandomColor(),
+					display: 1,
+				});
+			},
+			start(items = []) {
+				this.items = [];
+				cycle && (clearInterval(cycle));
+				let i = 0,
+					len = items.length;
+
+				cycle = setInterval(() => {
+					let time = 5;
+					// #ifndef H5
+					time = Math.ceil(Math.floor(Math.random() * (this.maxTime - this.minTime + 1) + this.minTime));
+					// #endif
+
+					if (i < len) {
+						this.add(items[i], time);
+						i++;
+					} else {
+						clearInterval(cycle);
+						setTimeout(() => {
+							this.$emit("end", {});
+						}, time * 1000)
+					}
+				}, 500)
+			}
+		}
+	}
+</script>
+
+<style>
+	.aon {
+		position: fixed;
+		white-space: nowrap;
+
+		animation: mymove 5s linear forwards;
+		animation-timing-function: linear;
+		-webkit-animation-timing-function: linear;
+		animation-fill-mode: forwards;
+	}
+
+	.l-barrage {
+		z-index: 99;
+		width: 100%;
+		position: fixed;
+	}
+
+	@keyframes mymove {
+		from {
+			left: 100%;
+		}
+
+		to {
+			left: -200%;
+		}
+	}
+
+	@-moz-keyframes mymove
+
+	/* Firefox */
+		{
+		from {
+			left: 100%;
+		}
+
+		to {
+			left: -200%;
+		}
+	}
+
+	@-webkit-keyframes mymove
+
+	/* Safari and Chrome */
+		{
+		from {
+			left: 100%;
+		}
+
+		to {
+			left: -200%;
+		}
+	}
+
+	@-o-keyframes mymove
+
+	/* Opera */
+		{
+		from {
+			left: 100%;
+		}
+
+		to {
+			left: -200%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/vastwu-barrage/readme.md b/components/vastwu-barrage/readme.md
deleted file mode 100644
index fa01120..0000000
--- a/components/vastwu-barrage/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# 测试发现h5不支持
-## 如何使用
-```
-<template>
-	<view class="barrage-test">
-		<vastwu-barrage width="750rpx" height="1300rpx" ref="vBarrage"></vastwu-barrage>
-	</view>
-</template>
-<script>
-	const list = ['模拟弹幕效果','宽度如要修改请留意动画是从750rpx到-100%','高度默认100%','随机颜色','随机速度','图标可设置','图标大小可控','可自定义高度轨道','高度轨道数组多长，一屏幕就能播多少列','高度不够不会显示','欢迎使用','不会重叠']
-	import vastwuBarrage from '@/components/vastwu-barrage/vastwu-barrage.vue'
-	export default {
-		components:{vastwuBarrage},
-		data() {
-			return {}
-		},
-		onLoad() {
-			this.$refs.vBarrage.init(list)
-		},
-		methods: {}
-	}
-</script>
-
-<style>
-.barrage-test{
-	background-color: #C0C0C0
-}
-</style>
-```
-
-## 参数说明
-|参数|类型|默认|说明|
-|:-|:-:|-:|-:|
-|trackList|Array|[0,100,200,300,400,500,600,700,800,900,1000]|自定义弹幕轨道，值为距离容器顶部的距离，可根据图标高度自行调整|
-|icon|String|![默认图](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-d0fe8d48-ece3-4582-a195-6929fb47a9c5/43a4f7a7-ff65-4460-b774-1249f31fbef7.png)|默认图标|
-|iconWidth|String|62rpx|图标宽度|
-|iconHeight|String|'86rpx'|图标高度|
-|minTime|Number|7|最短过渡时间|
-|maxTime|Number|10|最长过渡时间|
-|width|String|'100%'|容器宽度|
-|height|String|'100%'|容器高度|
\ No newline at end of file
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 706c58d..c290209 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -16,10 +16,10 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
 // #endif
 
 // #ifdef APP || MP-WEIXIN
-const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上
-const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上
-// const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
-// const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
+// const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上、、
+// const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 
+const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
+const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
 // #endif
 
 // import VConsole from "./vConsole.js"
diff --git a/package.json b/package.json
deleted file mode 100644
index b42c3d9..0000000
--- a/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "devDependencies": {
-    "sass": "^1.69.5",
-    "sass-loader": "^13.3.2"
-  },
-  "dependencies": {
-    "lodash": "^4.17.21"
-  }
-}
diff --git a/pages.json b/pages.json
index 609dce3..9ba0cc5 100644
--- a/pages.json
+++ b/pages.json
@@ -94,6 +94,12 @@
 				"navigationBarTitleText": "订单详情"
 			}
 		},
+		{
+			"path": "pages/order_detail/indexs",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+		},
 		{
 			"path": "pages/order/successful",
 			"style": {
diff --git a/pages/index/index - 副本.vue b/pages/index/index - 副本.vue
deleted file mode 100644
index 6889ec9..0000000
--- a/pages/index/index - 副本.vue	
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-	<view>
-		<view class="banner-wrap">
-			<u-swiper :list="banners" height="440" radius="0" :indicator="banners.length > 1"
-				imgMode="widthFix"></u-swiper>
-		</view>
-		<view class="container">
-			<view class="user-info">
-				<view class="top">
-					<view class="col">
-						<view style="width: 36px; height: 36px;border-radius: 10rpx;">
-							<button open-type="chooseAvatar" @chooseavatar='onChooseAvatar'
-								style="padding: 0;margin: 0; width: 36px; height: 36px;border-radius: 10rpx;">
-								<image style="width: 36px; height: 36px;" v-if="userInfo.avatar" :src="userInfo.avatar" mode="aspectFill">
-								</image>
-								<image style="width: 36px; height: 36px;" v-else src="@/static/avatar.png" mode="aspectFill">
-								</image>
-							</button>
-						</view>
-						<text class="t">{{userInfo.nickName}}</text>
-					</view>
-					<navigator class="ewm-wrap" url="/pages/pay_code/pay_code" hover-class="none">
-						<image class="ewm" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/ewm.png" mode="aspectFit"></image>
-						<text class="t">会员码</text>
-					</navigator>
-				</view>
-				<view class="bottom">
-					<view class="col">
-						<text class="t1 num">{{shopUser.amount || '0'}}</text>
-						<text class="t2">余额</text>
-					</view>
-					<view class="col">
-						<text class="t1 num">{{shopUser.levelConsume || '0'}}</text>
-						<text class="t2">积分</text>
-					</view>
-				</view>
-			</view>
-			<view class="menu-wrap">
-				<view class="top-wrap">
-					<view class="item" @click="scanCodehandle">
-						<image class="bg" src="../../static/index_m2.png" mode="widthFix"></image>
-						<view class="btn">
-							<text class="t">扫码点餐</text>
-						</view>
-					</view>
-					<view class="item" @click="memberindex">
-						<image class="bg" src="../../static/index_m1.png" mode="widthFix"></image>
-						<view class="btn">
-							<text class="t">会员充值</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="footer-banner">
-				<u-swiper :list="footerBanners" radius="20" height="160" :indicator="banners.length > 1"
-					imgMode="widthFix"></u-swiper>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uploadImage from "@/js_sdk/yushijie-ossutil/ossutil/uploadFile.js";
-	export default {
-		data() {
-			return {
-				banners: [require('@/static/banner1.png')],
-				footerBanners: [require('@/static/footer_banner1.png')],
-				userInfo: {},
-				shopInfo:{}
-			};
-		},
-		onLoad() {
-			// #ifdef MP-WEIXIN
-			if (!uni.cache.get('token')) {
-				uni.reLaunch({
-					url: '/pages/login/login'
-				})
-			}
-			// #endif
-		},
-		onShow() {
-			if (uni.cache.get('token')) {
-				this.loginwxuserInfo()
-			}else{
-				uni.reLaunch({
-					url: '/pages/login/login'
-				})
-			}
-		},
-		methods: {
-			async loginwxuserInfo() {
-				let res = await this.api.loginwxuserInfo({
-					userId: uni.cache.get('userInfo').id,
-					shopId: uni.cache.get('shopUser')
-				})
-				if (res.code == 0) {
-					uni.cache.set('userInfo', res.data.userInfo);
-					uni.cache.set('shopUser', res.data.shopUser);
-					uni.cache.set('shopInfo', res.data.shopInfo);
-					this.shopUser = uni.cache.get('shopUser')
-					this.userInfo = uni.cache.get('userInfo')
-					this.shopInfo = uni.cache.get('shopInfo')
-				}
-			},
-			scanCodehandle() {
-				uni.scanCode({
-					success: (res) => {
-						let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
-						if (tableCode) {
-							uni.pro.navigateTo('order_food/order_food', {
-								tableCode: tableCode,
-							})
-						}
-					}
-				})
-
-			},
-			memberindex() {
-				uni.pro.navigateTo('member/index')
-			},
-			getQueryString(url, name) { //解码
-				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
-				var r = url.substr(1).match(reg)
-				if (r != null) {
-					return r[2]
-				}
-				return null;
-			},
-			
-			// / 更换头像
-			onChooseAvatar(e) {
-				uni.showLoading({
-					title: '上传中',
-					mask: true
-				})
-				console.log(e.detail.avatarUrl)
-				let file = e.detail.avatarUrl;
-				uploadImage(file, 'avatar',
-					result => {
-						//将上传后的图片以对象（官方要求的格式）的形式存入uni-file-picker的value值imageValue（imageValue值的结构为数组包对象）用于图片回显
-						// let objAge = {
-						// 	'url': result,
-						// 	'extname': 'png',
-						// 	'name': 'imgss.png'
-						// };
-						// this.userlist.avatar.push(objAge)
-						this.userInfo.avatar = result
-						console.log(this.userInfo.avatar)
-						uni.hideLoading()
-					}, result => {
-						uni.hideLoading()
-					})
-			},
-		}
-
-	};
-</script>
-
-<style scoped lang="scss">
-	.container {
-		padding: 40upx;
-	}
-
-	.user-info {
-		background-color: #fff;
-		padding: 40upx;
-		border-radius: 20upx;
-
-		.top {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			border-bottom: 1upx solid #ececec;
-			padding-bottom: 42upx;
-
-			.col {
-				display: flex;
-				align-items: center;
-
-				.t {
-					margin-left: 20upx;
-				}
-			}
-
-			.ewm-wrap {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.ewm {
-					$size: 50upx;
-					width: $size;
-					height: $size;
-				}
-
-				.t {
-					font-size: 20upx;
-					padding-top: 8upx;
-				}
-			}
-		}
-
-		.bottom {
-			padding-top: 40upx;
-			display: flex;
-
-			.col {
-				flex: 1;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-
-				.t1 {
-					font-size: 38upx;
-				}
-			}
-		}
-	}
-
-	.menu-wrap {
-		padding: 40upx 0 0 0;
-		$gap: 20upx;
-
-		.top-wrap {
-			display: flex;
-			gap: $gap;
-
-			.item {
-				flex: auto;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				background-color: #fff;
-				border-radius: 20upx;
-				position: relative;
-
-				.bg {
-					width: 100%;
-					height: auto;
-					border-radius: $gap;
-				}
-
-				.btn {
-					margin-top: $gap;
-					padding: $gap $gap * 2;
-					border-radius: 100upx;
-					display: flex;
-					justify-content: center;
-					font-size: 32upx;
-					background-color: #fff;
-					box-shadow: 0 12upx 12upx rgba(0, 0, 0, 0.05);
-					position: absolute;
-					bottom: $gap * 2;
-					left: 50%;
-					transform: translateX(-50%);
-					white-space: nowrap;
-				}
-			}
-		}
-	}
-
-	.footer-banner {
-		padding-top: 20upx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 615bb55..3b6b0d0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,223 +1,232 @@
 <template>
 	<view class="content">
-		<!-- 导航栏 -->
-		<view class="navbar" :class="{active:opacity}">
-			<!-- #ifndef APP-PLUS || MP-WEIXIN -->
-			<view class="status-bar"></view>
-			<view class="navbar_tow flex-between"
-				:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
-			<!-- #endif -->
-				<!-- #ifdef APP-PLUS -->
-				<view class="navbar_tow flex-between" :style="{'marginTop':HeighT.heightBar /2+'px'}">
+		<view v-if="showindex">
+			<!-- 导航栏 -->
+			<view class="navbar" :class="{active:opacity}">
+				<!-- #ifndef APP-PLUS || MP-WEIXIN -->
+				<view class="status-bar"></view>
+				<view class="navbar_tow flex-between"
+					:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
 				<!-- #endif -->
-					<!-- #ifdef MP-WEIXIN -->
-					<view class="navbar_tow flex-between"
-						:style="{'height':HeighT.customBar+'px','marginTop':HeighT.heightBar+'px','padding-right':HeighT.custwidth + 'px'}">
+					<!-- #ifdef APP-PLUS -->
+					<view class="navbar_tow flex-between" :style="{'marginTop':HeighT.heightBar /2+'px'}">
 					<!-- #endif -->
-						<!-- 标题搜索框 -->
-						<view class="flex-between">
-							<view class="navbar_tow_one flex-start" @click="uindexlist">
-								<text class="textnth-childone">{{NAME}}</text>
-								<text class="textnth-childtow">{{form.address}}</text>
-								<u-icon style="margin-left: 8rpx;" name="arrow-down-fill" color="#333333"
-									size="16"></u-icon>
-							</view>
-							<view class="navbar_tow_tow flex-start">
-								<input type="text" class="navbar_tow_towinput" v-model="keyword" placeholder="请输入关键字" />
-								<view class="navbar_tow_towview">搜索</view>
-							</view>
-						</view>
-					</view>
-					<!-- 吸顶 -->
-					<view v-if="isFixedTop" class="fourcontent flex-between">
-						<view class="fourcontent_item flex-start" v-for="(item,index) in hometoplist.menu" :key="index"
-							@click="viewHistory(item,index)"
-							:class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''">
-							<text>{{item.name}}</text>
-							<u-icon v-if="item.isChild" style="margin-left: 8rpx;" name="arrow-down-fill"
-								color="#333333" size="16"></u-icon>
-						</view>
-					</view>
-				</view>
-				<!-- 以上都是导航栏处理 -->
-				<!-- 轮播图 -->
-				<swipers :carousel='hometoplist.carousel'></swipers>
-				<!-- 广告 -->
-				<advertisement :bannervo='hometoplist.bannerVO' :itemStyle='itemStyle'
-					:timersetnteritem='timersetInterval' @changeValue="changeParentValue"></advertisement>
-				<!-- 金刚区 -->
-				<diamond :district='hometoplist.district'></diamond>
-				<!-- 今日上线 -->
-				<todaylist :todayList='hometoplist.todayList' :salesList='hometoplist.salesList'></todaylist>
-				<!-- 类目 -->
-				<view class="fourcontent">
-					<!-- 用于防止榻卸 -->
-					<view class="flex-between" style="flex-wrap: inherit;" v-if="!isFixedTop">
-						<view class="fourcontent_item flex-start" v-for="(item,index) in hometoplist.menu" :key="index"
-							@click="viewHistory(item,index)"
-							:class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''">
-							<text style="margin-right: 10rpx;">{{item.name}}</text>
-							<u-icon v-if="item.isChild" style="margin-left: 10rpx;" name="arrow-down-fill"
-								color="#333333" size="16"></u-icon>
-						</view>
-					</view>
-				</view>
-
-				<view class="fivecontent">
-					<!-- <view class="fivecontent" :style="{'height':seighT + 'px'}"> -->
-					<!-- <scroll-view :style="{'height':seighT + 'px'}" scroll-y @scrolltolower="loadMore"
-						scroll-with-animation> -->
-					<view class="fivecontent_item" v-for="(item,index) in homelist" :key="index"
-						@click="fivecontentclick(item)">
-						<view class="fivecontent_item_nav flex-start">
-							<image :src="item.shopImage" mode="aspectFill"></image>
-							<view class="fivecontent_item_nav_left">
-								<view class="fivecontent_item_nav_lefttop flex-between">
-									<view>
-										{{item.shopName}}
-									</view>
-									<view>
-										{{item.districts}}&nbsp;{{item.distances}}
-									</view>
-								</view>
-								<view class="fivecontent_item_nav_lefttopstart flex-start">
-									<view class="fivecontent_item_nav_leftlang flex-start"
-										v-for="(s,index1) in item.shopTag" :key="index1"
-										:style="{'background':s.backColor,'color':s.backColor}">
-										<image class="fivecontent_item_nav_leftlangimage" v-if="s.shareImg"
-											:src="s.shareImg" mode="aspectFill"></image>
-										<text class="fivecontent_item_nav_leftlangtext">{{s.name}}</text>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="fivecontent_item_box">
-							<view class="fivecontent_item_boxitem flex-between">
-								<image :src="`${item.image}?x-oss-process=image/resize,m_lfit,w_192,h_192`"
-									mode="aspectFill"></image>
-								<view class="fivecontent_item_boxitemleft flex-colum-start">
-									<view class="fivecontent_item_boxitemleftone flex-between"
-										style="display: flex;justify-content: space-between;align-items: center;">
-										<view>
-											{{item.productName.length>7?item.productName.substring(0,7)+'...':item.productName}}
-										</view>
-										<text>已抢{{item.realSalesNumber}}份</text>
-									</view>
-									<view class="flex-start flexstartboxfttow">
-										<view class="fivecontent_item_boxitemlefttow flex-start"
-											v-for="(c,index2) in item.proTag" :key="index2"
-											:style="{'background':c.backColor,'color':c.backColor}">
-											<image class="fivecontent_item_boxitemlefttowimage" v-if="c.shareImg"
-												:src="c.shareImg" mode="aspectFill"></image>
-											<text class="fivecontent_item_boxitemlefttowtext">{{c.name}}</text>
-										</view>
-									</view>
-									<view class="indexboxitemleftthere flex-colum-start">
-										<view class="indexboxitemleftthereabsolute">
-											马上抢
-										</view>
-										<view class="indexboxitemlefttheretext flex-start">
-											<view class="fivecontent_item_boxitemlefthere_one flex-start">
-												<text class="flex_startone">到手</text>
-												<text class="flex_starttow">¥{{item.salePrice}}</text>
-											</view>
-											<view class="fivecontent_item_boxitemlefthere_tow">
-												{{item.discount || ''}}折
-											</view>
-											<view class="fivecontent_item_boxitemlefthere_there">
-												¥{{item.originPrice}}
-											</view>
-										</view>
-										<view class="indexboxitemleftthere_countdown flex-between">
-											<text class="indexboxitemleftthere_countdowntext">共省{{item.save}}元</text>
-											<view class="indexboxitemleftthere_countdowntexts">
-												<uni-countdown @timeup="updateCity" :show-day="false"
-													:day="item.end_times.d" :hour="item.end_times.h"
-													:minute="item.end_times.m" :second="item.end_times.s"
-													:indexs='index' color="#FFFFFF" border-color="#00B26A"
-													splitorColor="#FFFFFF" :font-size="10"></uni-countdown>
-
-											</view>
-
-										</view>
-									</view>
-								</view>
-
-							</view>
-						</view>
-					</view>
-					<u-loadmore height='40' :status="form.status" iconSize='24' fontSize='24' />
-					<!-- </scroll-view> -->
-				</view>
-
-
-
-				<!-- 弹出层 -->
-				<u-popup mode="top" :show="showproductlist" @close="closeproductlist" @open="openproductlist">
-					<!-- 导航栏 -->
-					<view class="navbar" :class="{active:opacity}">
-						<!-- #ifndef APP-PLUS || MP-WEIXIN -->
-						<view class="status-bar"></view>
+						<!-- #ifdef MP-WEIXIN -->
 						<view class="navbar_tow flex-between"
-							:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
+							:style="{'height':HeighT.customBar+'px','marginTop':HeighT.heightBar+'px','padding-right':HeighT.custwidth + 'px'}">
 						<!-- #endif -->
-							<!-- #ifdef APP-PLUS -->
-							<view class="status-bar"></view>
-							<view class="navbar_tow flex-between">
-							<!-- #endif -->
-								<!-- #ifdef MP-WEIXIN -->
-								<view class="navbar_tow flex-between"
-									:style="{'height':HeighT.customBar+'px','marginTop':HeighT.heightBar+'px','padding-right':HeighT.custwidth + 'px'}">
-								<!-- #endif -->
-									<!-- 标题搜索框 -->
-									<view class="flex-between">
-										<view class="navbar_tow_one flex-start" @click="uindexlist">
-											<text class="textnth-childone">{{NAME}}</text>
-											<text class="textnth-childtow">{{form.address}}</text>
-											<u-icon style="margin-left: 8rpx;" name="arrow-down-fill" color="#333333"
-												size="16"></u-icon>
+							<!-- 标题搜索框 -->
+							<view class="flex-between">
+								<view class="navbar_tow_one flex-start" @click="uindexlist">
+									<text class="textnth-childone">{{NAME}}</text>
+									<text class="textnth-childtow">{{form.address}}</text>
+									<u-icon style="margin-left: 8rpx;" name="arrow-down-fill" color="#333333"
+										size="16"></u-icon>
+								</view>
+								<view class="navbar_tow_tow flex-start">
+									<input type="text" class="navbar_tow_towinput" v-model="keyword"
+										placeholder="请输入关键字" />
+									<view class="navbar_tow_towview">搜索</view>
+								</view>
+							</view>
+						</view>
+						<!-- 吸顶 -->
+						<view v-if="isFixedTop" class="fourcontent flex-between">
+							<view class="fourcontent_item flex-start" v-for="(item,index) in hometoplist.menu"
+								:key="index" @click="viewHistory(item,index)"
+								:class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''">
+								<text>{{item.name}}</text>
+								<u-icon v-if="item.isChild" style="margin-left: 8rpx;" name="arrow-down-fill"
+									color="#333333" size="16"></u-icon>
+							</view>
+						</view>
+					</view>
+					<!-- 以上都是导航栏处理 -->
+					<!-- 轮播图 -->
+					<swipers :carousel='hometoplist.carousel'></swipers>
+					<!-- 广告 -->
+					<advertisement :bannervo='hometoplist.bannerVO' :itemStyle='itemStyle'
+						:timersetnteritem='timersetInterval' @changeValue="changeParentValue"></advertisement>
+					<!-- 金刚区 -->
+					<diamond :district='hometoplist.district'></diamond>
+					<!-- 今日上线 -->
+					<todaylist :todayList='hometoplist.todayList' :salesList='hometoplist.salesList'></todaylist>
+					<!-- 类目 -->
+					<view class="fourcontent">
+						<!-- 用于防止榻卸 -->
+						<view class="flex-between" style="flex-wrap: inherit;" v-if="!isFixedTop">
+							<view class="fourcontent_item flex-start" v-for="(item,index) in hometoplist.menu"
+								:key="index" @click="viewHistory(item,index)"
+								:class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''">
+								<text style="margin-right: 10rpx;">{{item.name}}</text>
+								<u-icon v-if="item.isChild" style="margin-left: 10rpx;" name="arrow-down-fill"
+									color="#333333" size="16"></u-icon>
+							</view>
+						</view>
+					</view>
+
+					<view class="fivecontent">
+						<!-- <view class="fivecontent" :style="{'height':seighT + 'px'}"> -->
+						<!-- <scroll-view :style="{'height':seighT + 'px'}" scroll-y @scrolltolower="loadMore"
+							scroll-with-animation> -->
+						<view class="fivecontent_item" v-for="(item,index) in homelist" :key="index"
+							@click="fivecontentclick(item)">
+							<view class="fivecontent_item_nav flex-start">
+								<image :src="item.shopImage" mode="aspectFill"></image>
+								<view class="fivecontent_item_nav_left">
+									<view class="fivecontent_item_nav_lefttop flex-between">
+										<view>
+											{{item.shopName}}
 										</view>
-										<view class="navbar_tow_tow flex-start">
-											<input type="text" class="navbar_tow_towinput" v-model="keyword"
-												placeholder="请输入关键字" />
-											<view class="navbar_tow_towview">搜索</view>
+										<view>
+											{{item.districts}}&nbsp;{{item.distances}}
 										</view>
 									</view>
-								</view>
-								<!-- 吸顶 -->
-								<view class="fourcontent flex-between">
-									<view class="fourcontent_item flex-start" v-for="(item,index) in hometoplist.menu"
-										:key="index" @click="viewHistory(item,index)"
-										:class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''">
-										<text>{{item.name}}</text>
-										<u-icon v-if="item.isChild" style="margin-left: 10rpx;" name="arrow-down-fill"
-											color="#333333" size="16"></u-icon>
-									</view>
-								</view>
-								<!-- 显示下拉字段 -->
-
-								<view class="sixcontent" v-if="clickhometoplistmenulist.quilt == '1' ">
-									<view class="sixcontentitemP flex-start" style="padding-bottom:0 ;">
-										<category style="width: 100%;" :categoryList="clickhometoplistmenulist.detail"
-											:subCategoryList="subCategoryList" @categoryMainClick="categoryMainClick"
-											@categorySubClick="categorySubClick">
-										</category>
-									</view>
-								</view>
-								<view class="sixcontent" v-else>
-									<view class="sixcontentitemP flex-colum-start">
-										<view class="sixcontentitemP_item"
-											:class="index == clickdetailindex ?'sixcontentitemP_itemactive':''"
-											v-for="(item,index) in clickhometoplistmenulist.detail" :key="index"
-											@click="clickdetail(item,index)">
-											{{item.name}}
-
+									<view class="fivecontent_item_nav_lefttopstart flex-start">
+										<view class="fivecontent_item_nav_leftlang flex-start"
+											v-for="(s,index1) in item.shopTag" :key="index1"
+											:style="{'background':s.backColor,'color':s.backColor}">
+											<image class="fivecontent_item_nav_leftlangimage" v-if="s.shareImg"
+												:src="s.shareImg" mode="aspectFill"></image>
+											<text class="fivecontent_item_nav_leftlangtext">{{s.name}}</text>
 										</view>
 									</view>
 								</view>
 							</view>
-				</u-popup>
+							<view class="fivecontent_item_box">
+								<view class="fivecontent_item_boxitem flex-between">
+									<image :src="`${item.image}?x-oss-process=image/resize,m_lfit,w_192,h_192`"
+										mode="aspectFill"></image>
+									<view class="fivecontent_item_boxitemleft flex-colum-start">
+										<view class="fivecontent_item_boxitemleftone flex-between"
+											style="display: flex;justify-content: space-between;align-items: center;">
+											<view>
+												{{item.productName.length>7?item.productName.substring(0,7)+'...':item.productName}}
+											</view>
+											<text>已抢{{item.realSalesNumber}}份</text>
+										</view>
+										<view class="flex-start flexstartboxfttow">
+											<view class="fivecontent_item_boxitemlefttow flex-start"
+												v-for="(c,index2) in item.proTag" :key="index2"
+												:style="{'background':c.backColor,'color':c.backColor}">
+												<image class="fivecontent_item_boxitemlefttowimage" v-if="c.shareImg"
+													:src="c.shareImg" mode="aspectFill"></image>
+												<text class="fivecontent_item_boxitemlefttowtext">{{c.name}}</text>
+											</view>
+										</view>
+										<view class="indexboxitemleftthere flex-colum-start">
+											<view class="indexboxitemleftthereabsolute">
+												马上抢
+											</view>
+											<view class="indexboxitemlefttheretext flex-start">
+												<view class="fivecontent_item_boxitemlefthere_one flex-start">
+													<text class="flex_startone">到手</text>
+													<text class="flex_starttow">¥{{item.salePrice}}</text>
+												</view>
+												<view class="fivecontent_item_boxitemlefthere_tow">
+													{{item.discount || ''}}折
+												</view>
+												<view class="fivecontent_item_boxitemlefthere_there">
+													¥{{item.originPrice}}
+												</view>
+											</view>
+											<view class="indexboxitemleftthere_countdown flex-between">
+												<text
+													class="indexboxitemleftthere_countdowntext">共省{{item.save}}元</text>
+												<view class="indexboxitemleftthere_countdowntexts">
+													<uni-countdown @timeup="updateCity" :show-day="false"
+														:day="item.end_times.d" :hour="item.end_times.h"
+														:minute="item.end_times.m" :second="item.end_times.s"
+														:indexs='index' color="#FFFFFF" border-color="#00B26A"
+														splitorColor="#FFFFFF" :font-size="10"></uni-countdown>
 
+												</view>
+
+											</view>
+										</view>
+									</view>
+
+								</view>
+							</view>
+						</view>
+						<u-loadmore height='40' :status="form.status" iconSize='24' fontSize='24' />
+						<!-- </scroll-view> -->
+					</view>
+
+
+
+					<!-- 弹出层 -->
+					<u-popup mode="top" :show="showproductlist" @close="closeproductlist" @open="openproductlist">
+						<!-- 导航栏 -->
+						<view class="navbar" :class="{active:opacity}">
+							<!-- #ifndef APP-PLUS || MP-WEIXIN -->
+							<view class="status-bar"></view>
+							<view class="navbar_tow flex-between"
+								:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
+							<!-- #endif -->
+								<!-- #ifdef APP-PLUS -->
+								<view class="status-bar"></view>
+								<view class="navbar_tow flex-between">
+								<!-- #endif -->
+									<!-- #ifdef MP-WEIXIN -->
+									<view class="navbar_tow flex-between"
+										:style="{'height':HeighT.customBar+'px','marginTop':HeighT.heightBar+'px','padding-right':HeighT.custwidth + 'px'}">
+									<!-- #endif -->
+										<!-- 标题搜索框 -->
+										<view class="flex-between">
+											<view class="navbar_tow_one flex-start" @click="uindexlist">
+												<text class="textnth-childone">{{NAME}}</text>
+												<text class="textnth-childtow">{{form.address}}</text>
+												<u-icon style="margin-left: 8rpx;" name="arrow-down-fill"
+													color="#333333" size="16"></u-icon>
+											</view>
+											<view class="navbar_tow_tow flex-start">
+												<input type="text" class="navbar_tow_towinput" v-model="keyword"
+													placeholder="请输入关键字" />
+												<view class="navbar_tow_towview">搜索</view>
+											</view>
+										</view>
+									</view>
+									<!-- 吸顶 -->
+									<view class="fourcontent flex-between">
+										<view class="fourcontent_item flex-start"
+											v-for="(item,index) in hometoplist.menu" :key="index"
+											@click="viewHistory(item,index)"
+											:class="!item.isChild && viewHistoryindex == index ? 'fourcontent_itemactev':''">
+											<text>{{item.name}}</text>
+											<u-icon v-if="item.isChild" style="margin-left: 10rpx;"
+												name="arrow-down-fill" color="#333333" size="16"></u-icon>
+										</view>
+									</view>
+									<!-- 显示下拉字段 -->
+
+									<view class="sixcontent" v-if="clickhometoplistmenulist.quilt == '1' ">
+										<view class="sixcontentitemP flex-start" style="padding-bottom:0 ;">
+											<category style="width: 100%;"
+												:categoryList="clickhometoplistmenulist.detail"
+												:subCategoryList="subCategoryList"
+												@categoryMainClick="categoryMainClick"
+												@categorySubClick="categorySubClick">
+											</category>
+										</view>
+									</view>
+									<view class="sixcontent" v-else>
+										<view class="sixcontentitemP flex-colum-start">
+											<view class="sixcontentitemP_item"
+												:class="index == clickdetailindex ?'sixcontentitemP_itemactive':''"
+												v-for="(item,index) in clickhometoplistmenulist.detail" :key="index"
+												@click="clickdetail(item,index)">
+												{{item.name}}
+
+											</view>
+										</view>
+									</view>
+								</view>
+					</u-popup>
+
+
+				</view>
+				<indexs v-if="!showindex" :usershopUserinfo='usershopUserinfo'></indexs>
 			</view>
 </template>
 <script>
@@ -228,6 +237,7 @@
 	import advertisement from './components/advertisement.vue'
 	import customSwiper from '@/components/blackmonth-swiper/index'
 	import category from '@/components/qiyue-category/qiyue-category.vue';
+	import indexs from './indexs.vue';
 	export default {
 		components: {
 			swipers,
@@ -236,10 +246,12 @@
 			productlist,
 			advertisement,
 			category,
-			customSwiper
+			customSwiper,
+			indexs
 		},
 		data() {
 			return {
+				showindex: false,
 				NAME: uni.cache.get('NAME'),
 				timersetInterval: '0', //定时器
 				isFixedTop: false, //吸顶是否显示
@@ -276,10 +288,12 @@
 				clickdetailtowlist: [],
 				// 二级菜单
 				categoryList: [],
-				subCategoryList: [] //二级菜单数据
+				subCategoryList: [], //二级菜单数据
+				// 登录后店铺信息
+				usershopUserinfo:{}
 			};
 		},
-		 
+
 		onPageScroll(e) {
 			if (e.scrollTop <= 44) { //搜索导航栏
 				this.opacity = false
@@ -314,56 +328,67 @@
 		onReachBottom() {
 			this.onLoadhome()
 		},
-		onShow() {
-			uni.getLocation({
-				type: 'wgs84',
-				success: async (res) => {
-					let successres = await this.api.geocodelocation({
-						lng: res.longitude,
-						lat: res.latitude,
-					})
-					if (successres.code == 0) {
-						let datastorage = {
-							country: successres.data.addressComponent.country, // "中国"
-							province: successres.data.addressComponent.province, //province: "陕西省"
-							address: successres.data.addressComponent.city, //district: "西安市"
-							district: successres.data.addressComponent.district, //district: "未央区"
+		async onShow() {
+			// 判断显示那个页面
+			if (uni.cache.get('shopUser') && uni.cache.get('token')) {
+				this.showindex = false
+				uni.cache.set('types', 'index');
+				let res = await this.api.shopUserInfo({
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+				})
+				if (res.code == 0) {
+					this.usershopUserinfo = res.data
+				}
+			} else {
+				uni.getLocation({
+					type: 'wgs84',
+					success: async (res) => {
+						let successres = await this.api.geocodelocation({
 							lng: res.longitude,
 							lat: res.latitude,
+						})
+						if (successres.code == 0) {
+							let datastorage = {
+								country: successres.data.addressComponent.country, // "中国"
+								province: successres.data.addressComponent.province, //province: "陕西省"
+								address: successres.data.addressComponent.city, //district: "西安市"
+								district: successres.data.addressComponent.district, //district: "未央区"
+								lng: res.longitude,
+								lat: res.latitude,
+							}
+							uni.cache.set('getLocationstorage', datastorage);
+							this.hometop()
+							this.init_fn()
+							this.timersetInterval = '0'
 						}
-						uni.cache.set('getLocationstorage', datastorage);
-						this.hometop()
-						this.init_fn()
-						this.timersetInterval = '0'
-					}
-				},
-				fail: async (err) => {
-					console.log(err, '获取错误')
-					let successres = await this.api.geocodelocation({
-						lng: '',
-						lat: '',
-					})
-					if (successres.code == 0) {
-						console.log(successres.data.addressComponent.streetNumber.location.split(','))
-						let res = successres.data.addressComponent.streetNumber.location.split(',')
-						// this.form.lng = res[0]
-						// this.form.lat = res[1]
-						let datastorage = {
-							country: successres.data.addressComponent.country, // "中国"
-							province: successres.data.addressComponent.province, //province: "陕西省"
-							address: successres.data.addressComponent.city, //district: "西安市"
-							district: successres.data.addressComponent.district, //district: "未央区"
-							lng: res[0],
-							lat: res[1],
+					},
+					fail: async (err) => {
+						console.log(err, '获取错误') //测试用于app
+						let successres = await this.api.geocodelocation({
+							lng: '',
+							lat: '',
+						})
+						if (successres.code == 0) {
+							console.log(successres.data.addressComponent.streetNumber.location.split(','))
+							let res = successres.data.addressComponent.streetNumber.location.split(',')
+							let datastorage = {
+								country: successres.data.addressComponent.country, // "中国"
+								province: successres.data.addressComponent.province, //province: "陕西省"
+								address: successres.data.addressComponent.city, //district: "西安市"
+								district: successres.data.addressComponent.district, //district: "未央区"
+								lng: res[0],
+								lat: res[1],
+							}
+							uni.cache.set('getLocationstorage', datastorage);
+							this.hometop()
+							this.init_fn()
+							this.timersetInterval = '0'
 						}
-						uni.cache.set('getLocationstorage', datastorage);
-						this.hometop()
-						this.init_fn()
-						this.timersetInterval = '0'
 					}
-				}
-			});
-
+				});
+				this.showindex = true
+			}
 		},
 		methods: {
 			closeproductlist() {
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
new file mode 100644
index 0000000..84889e2
--- /dev/null
+++ b/pages/index/indexs.vue
@@ -0,0 +1,273 @@
+<template>
+	<view>
+		<u-swiper :list="banners" height="460" radius="0" :indicator="banners.length > 1" imgMode="widthFix"></u-swiper>
+		<view class="container">
+			<view class="after"></view>
+			<view class="onecontent flex-between">
+				<view class="onecontentone flex-start">
+					<image :src="userInfo.headImg" mode="aspectFill">
+						<text>{{userInfo.nickName || '无'}}</text>
+				</view>
+				<view class="onecontenttow flex-start">
+					<view class="onecontenttowring flex-colum" @click="memberindex(0)">
+						<text class="onecontenttowringone">{{usershopUserinfo.amount || '0.00'}}</text>
+						<text class="onecontenttowringtow">余额</text>
+					</view>
+					<!-- <view class="onecontenttowring flex-colum">
+						<text class="onecontenttowringone">282</text>
+						<text class="onecontenttowringtow">积分</text>
+					</view> -->
+					<view class="onecontenttowring flex-colum" @click="memberindex(1)">
+						<image class="onecontenttowringone image"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/rwm.png" mode="aspectFill">
+						</image>
+						<text class="onecontenttowringtow">会员码</text>
+					</view>
+				</view>
+			</view>
+			<view class="towcontent flex-between">
+				<view class="towcontentitem flex-colum" @click="scanCodehandle(0)">
+					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/Instore.png" mode="widthFix"
+						style="width: 86.88rpx; height: 140.94rpx;"></image>
+					<text class="towcontentitemtext">店内就餐</text>
+				</view>
+				<view class="towcontentitem flex-colum" @click="scanCodehandle(1)">
+					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/takeaway.png" mode="widthFix"
+						style="width: 128.05rpx; height: 120.41rpx;"></image>
+					<text class="towcontentitemtext">点个外卖</text>
+				</view>
+			</view>
+			<view class="footer-banner">
+			<!-- 	<u-swiper :list="footerBanners" radius="20" height="274" :indicator="banners.length > 1"
+					imgMode="widthFix"></u-swiper> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uploadImage from "@/js_sdk/yushijie-ossutil/ossutil/uploadFile.js";
+	export default {
+		data() {
+			return {
+				banners: ['https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/banner1.png'],
+				footerBanners: ['https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/footer_banner1.png'],
+				userInfo: uni.cache.get('userInfo'),
+			};
+		},
+		props: {
+			usershopUserinfo: {
+				type: Object,
+				default () {
+					return {
+						amount:'',
+						shopName: ""
+					}
+				}
+			},
+		},
+		methods: {
+			scanCodehandle(i) {
+				if (i == 0) {
+					uni.scanCode({
+						success: (res) => {
+							let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
+							uni.cache.set('tableCode', tableCode)
+							if (tableCode) {
+								uni.pro.navigateTo('order_food/order_food')
+							}
+							// let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
+							// if (tableCode) {
+							// 	uni.pro.navigateTo('order_food/order_food', {
+							// 		tableCode: tableCode,
+							// 	})
+							// }
+						}
+					})
+					// uni.navigateTo({
+					// url:'/pages/order_food/order_food'
+					// })
+				} else {
+					uni.showToast({
+						title: '此店铺暂未开通外卖',
+						icon: 'none'
+					})
+				}
+			},
+			memberindex(i) {
+				if (i == 0) {
+					uni.pro.navigateTo('member/memberdetails', {
+						shopId_id: uni.cache.get('shopUser'),
+					})
+				} else {
+					// uni.pro.navigateTo('pay_code/pay_code?shopInfo=', {
+					// 	shopName: this.usershopUserinfo.shopName,
+					// 	amount: this.usershopUserinfo.amount,
+					// 	shopId: uni.cache.get('shopUser')
+					// })
+					let data = {
+						shopName: this.usershopUserinfo.shopName,
+						amount: this.usershopUserinfo.amount,
+						shopId: uni.cache.get('shopUser')
+					}
+					uni.navigateTo({
+						url: '/pages/pay_code/pay_code?shopInfo=' + JSON.stringify(data)
+					})
+				}
+
+
+			},
+			getQueryString(url, name) { //解码
+				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
+				var r = url.substr(1).match(reg)
+				if (r != null) {
+					return r[2]
+				}
+				return null;
+			},
+
+			// / 更换头像
+			onChooseAvatar(e) {
+				uni.showLoading({
+					title: '上传中',
+					mask: true
+				})
+				console.log(e.detail.avatarUrl)
+				let file = e.detail.avatarUrl;
+				uploadImage(file, 'avatar',
+					result => {
+						//将上传后的图片以对象（官方要求的格式）的形式存入uni-file-picker的value值imageValue（imageValue值的结构为数组包对象）用于图片回显
+						// let objAge = {
+						// 	'url': result,
+						// 	'extname': 'png',
+						// 	'name': 'imgss.png'
+						// };
+						// this.userlist.avatar.push(objAge)
+						this.userInfo.avatar = result
+						console.log(this.userInfo.avatar)
+						uni.hideLoading()
+					}, result => {
+						uni.hideLoading()
+					})
+			},
+		}
+
+	};
+</script>
+
+<style scoped lang="scss">
+	page {
+		background: #F6F8FA;
+	}
+
+	.container {
+		border-radius: 0 0 0 40rpx;
+		position: relative;
+		padding: 0 28rpx;
+
+		.after {
+			position: absolute;
+			top:46rpx;
+			right: 0;
+			width: 40rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			text-align: center;
+			background-image: radial-gradient(160rpx at 0px 0px, rgba(0, 0, 0, 0) 40rpx, #f9f9f9 40rpx);
+		}
+
+		.onecontent {
+			width: 100%;
+			margin-top: -86rpx;
+			position: relative;
+			height: 172rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+			border-radius: 14rpx;
+			padding: 0 30rpx;
+
+			.onecontentone {
+				image {
+					width: 108rpx;
+					height: 108rpx;
+					background: #FFFFFF;
+					border: 2rpx solid #707070;
+					border-radius: 50%;
+				}
+
+				text {
+					margin-left: 12rpx;
+					width: 146rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+				}
+			}
+
+			.onecontenttow {
+				.onecontenttowring {
+					margin-left: 32rpx;
+					height: 110rpx;
+					justify-content: flex-end;
+
+					.onecontenttowringone {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 500;
+						font-size: 32rpx;
+						color: #333333;
+					}
+
+					.image {
+						width: 42rpx;
+						height: 42rpx;
+					}
+
+					.onecontenttowringtow {
+						margin-top: 20rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+					}
+				}
+			}
+		}
+
+		.towcontent {
+			margin-top: 48rpx;
+			position: relative;
+			width: 100%;
+			background: #FFFFFF;
+			box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			height: 314rpx;
+			padding: 0 90rpx 0 120rpx;
+
+			&::after {
+				position: absolute;
+				content: '';
+				display: inline-block;
+				height: 188rpx;
+				width: 2rpx;
+				left: 50%;
+				margin-left: -1rpx;
+				background: #D8D8D8;
+			}
+
+			.towcontentitem {
+				.towcontentitemtext {
+					margin-top: 26rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+				}
+			}
+		}
+
+		.footer-banner {
+			margin-top: 48upx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/order_detail - 副本.vue b/pages/order/order_detail - 副本.vue
new file mode 100644
index 0000000..a5e0318
--- /dev/null
+++ b/pages/order/order_detail - 副本.vue	
@@ -0,0 +1,605 @@
+<template>
+	<view class="container">
+		<view class="card">
+			<view class="head">
+				<text class="title">
+					<text>{{listinfo.name}}</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
+					<text> 待支付 </text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'unsend'">
+					<text>待发货</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'closed'">
+					<text>订单完成</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'send'">
+					<text> 已发</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'refunding'">
+					<text>申请退单</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'refund'">
+					<text>退单</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'cancelled'">
+					<text>已取消</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'merge'">
+					<text>合台</text>
+				</text>
+
+			</view>
+			<view class="tag-wrap">
+				<text class="tag" v-if="listinfo.sendType == 'post'">快递</text>
+				<text class="tag" v-if="listinfo.sendType == 'takeaway'">外卖</text>
+				<text class="tag" v-if="listinfo.sendType == 'takeself'">自提</text>
+				<text class="tag" v-if="listinfo.sendType == 'table'">堂食</text>
+			</view>
+			<view v-if="listinfo.tableName">
+				桌号：{{listinfo.tableName}}
+			</view>
+			<view class="number-wrap" style="margin-top: 20rpx;"
+				v-if="listinfo.status != 'unpaid' && listinfo.status != 'paying'&& listinfo.status != 'cancelled'">
+				<text class="t">取餐号</text>
+				<text class="number">{{listinfo.outNumber}}</text>
+			</view>
+		</view>
+		<view class="card">
+			<view class="head border" style="position: relative;">
+				<text class="title">
+					<text>点单详情</text>
+				</text>
+
+				<view style="display: flex;align-items: center;"
+					v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
+					<!-- <text style="font-size:24rpx;">支付时间:</text> -->
+					<uni-countdown :show-day="false" color="#ff0000" border-color="#00B26A" splitorColor="#000"
+						:font-size="14" :hour="0" :minute="listinfo.expiredMinutes" :second="listinfo.expiredSeconds" />
+				</view>
+			</view>
+			<view class="shop-info">
+				<view class="item" v-for="(item,index) in listinfo.details" :key="index">
+					<view class="cover">
+						<c-image width="120" height="120" radius="16" :src='item.productImg'></c-image>
+					</view>
+					<view class="info">
+						<text>{{item.productName}}</text>
+						<text class="n" v-if="item.productSkuName">{{item.productSkuName}}</text>
+						<text class="n">x{{item.num}}</text>
+					</view>
+
+					<view class="price">
+						<text class="i">￥</text>
+						<text class="num">{{item.priceAmount}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="total-wrap">
+				<view class="price">
+					<text>合计：</text>
+					<text class="i">￥</text>
+					<text class="num">{{listinfo.payAmount}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="card">
+			<view class="head border">
+				<text class="title">订单信息</text>
+			</view>
+			<view class="order-info">
+				<view class="row" @click="copyHandle(listinfo.orderNo)">
+					<text class="t">订单信息：</text>
+					<text class="info">{{listinfo.orderNo}}（点击复制）</text>
+				</view>
+				<view class="row">
+					<text class="t">创建时间：</text>
+					<text class="info">{{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="card" style="padding-bottom: 20rpx;" v-if="listinfo.shopQrcode">
+			<image :src="listinfo.shopQrcode" show-menu-by-longpress="true" style="width: 100%;" mode="widthFix">
+			</image>
+		</view>
+		<view class="payType" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
+			<view class="">
+				支付方式
+			</view>
+			<view class="">
+				<u-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChange" :size="28"
+					placement="column">
+					<u-radio activeColor="#ffd158" name="1">
+						<view class="dfs">
+							<image style="width:44rpx;height:44rpx"
+								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/balance.png" mode="">
+							</image>
+							<text style="font-size: 28rpx;margin-left: 16rpx;">
+								微信支付
+							</text>
+						</view>
+					</u-radio>
+					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;">
+					</view>
+					<u-radio activeColor="#ffd158" name="2">
+						<view class="dfs">
+							<image style="width:44rpx;height:44rpx"
+								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png" mode="">
+							</image>
+							<text style="font-size: 28rpx;margin-left: 16rpx;">
+								会员卡支付</text>
+						</view>
+					</u-radio>
+				</u-radio-group>
+				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;">
+					会员卡余额{{ amountVIP?amountVIP.amount:0}} <text
+						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
+						@click="goRecharge">去充值</text>
+				</view>
+			</view>
+		</view>
+		<view :style="{height:height}">
+
+		</view>
+		<view class="fixedview">
+			<view class="flex-between" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
+				<view class="fixedview_one flex-start">
+					<view class="fixedview_oneone">
+						实付金额：
+					</view>
+					<view class="fixedview_onetow">
+						<text>¥</text>{{listinfo.payAmount}}
+					</view>
+				</view>
+				<view class="fixedview_tow" @tap="$u.debounce(showpopupclickddes,500)">
+					立即付款
+				</view>
+			</view>
+		</view>
+		<!-- 支付密码 -->
+		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-if="ispws"></payPassword>
+	</view>
+</template>
+
+<script>
+	import payPassword from '@/components/payPassword.vue'
+	export default {
+		components: {
+			payPassword
+		},
+		data() {
+			return {
+				height: '',
+				pay_type: 1,
+				orderId: '',
+				listinfo: {},
+				radiovalue: '1', //选择支付方式
+				ispws: false,
+				srcimge: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/wx.jpg'
+			};
+		},
+		async onLoad(e) {
+			console.log(e)
+			this.orderId = e.orderId
+		},
+		onShow() {
+			this.orderorderInfo()
+		},
+		onUnload() {
+			uni.switchTab({
+				url: '/pages/order/order'
+			})
+		},
+		methods: {
+			groupChange(n) { //选择支付方式
+				this.radiovalue = n
+			},
+			mountedcreateSelectorQuery() {
+				//#ifdef MP-WEIXIN || H5
+				var query = uni.createSelectorQuery().in(this).select('.fixedview')
+				query.boundingClientRect(ele => {
+					var that = this;
+					console.log(ele, 111)
+					that.height = (ele.height) + "px"
+					that = null;
+					// uni.getSystemInfo({
+					// 	success(res) {
+
+					// 	}
+					// })
+				}).exec();
+				//#endif
+				//#ifdef MP-ALIPAY
+				my.createSelectorQuery().selectAll('.fixedview').boundingClientRect().exec(ele => {
+					var nodeData = ele[0]
+					var that = this;
+					that.height = (nodeData.height) + "px";
+					that = null;
+				})
+				//#endif
+			},
+			async paymodfiyOrderInfo() {
+				let res = await this.api.paymodfiyOrderInfo({
+					orderId: this.listinfo.orderId,
+				})
+			},
+			showpopupclickddes() {
+				// radiovalue为1是微信支付
+				if (this.radiovalue == 1) {
+					this.showpopupclick() //微信支付
+				} else {
+					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+					// console.log(isPwd,'是否设置了支付密码')
+					if (uni.cache.get('userInfo').isPwd == 0) {
+						uni.pro.navigateTo('/pages/user/repairpassword', {
+							shopId_id: uni.cache.get('shopUser')
+						})
+					} else {
+						this.ispws = true
+						this.$nextTick(() => {
+							this.$refs.payPwd.onPayUp();
+						})
+					}
+				}
+			},
+			async showpopupclick() {
+				let res = await this.api.payorderPay({
+					orderId: this.orderId,
+				}) //判断是否支付成功
+				if (res.code == 0) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					// #ifdef MP-WEIXIN
+					uni.requestPayment({
+						provider: 'wxpay', //支付类型-固定值
+						partnerid: res.data.appId, // 微信支付商户号
+						timeStamp: res.data.timeStamp, // 时间戳（单位：秒）
+						nonceStr: res.data.nonceStr, // 随机字符串
+						package: res.data.package, // 固定值
+						signType: res.data.signType, //固定值
+						paySign: res.data.paySign, //签名
+						success: (res) => {
+							uni.showToast({
+								title: "支付成功"
+							})
+							setTimeout(res => {
+								uni.hideLoading()
+								uni.switchTab({
+									url: '/pages/order/order'
+								});
+							}, 500)
+							this.paymodfiyOrderInfo()
+						},
+						fail: (err) => {
+							uni.showToast({
+								icon: 'none',
+								title: '支付失败'
+							})
+							setTimeout(res => {
+								uni.hideLoading()
+								uni.switchTab({
+									url: '/pages/order/order'
+								});
+							}, 500)
+
+						}
+					});
+					// #endif	
+				}
+			},
+			// 余额支付
+			async accountPayevent(pwd) {
+				this.ispws = false
+				let res = await this.api.accountPay({
+					orderId: this.listinfoid,
+					memberId: this.amountVIP.id,
+					// remark: this.remark,
+					pwd
+				})
+				if (res.code == 0) {
+					// data ->1 支付成功
+					// ->2 余额不足
+					// ->3 未设置支付密码，
+					// ->4 不是会员，
+					if (res.data == 1) {
+						this.showToastUppop('支付成功')
+						let _this = this
+
+						uni.requestSubscribeMessage({
+							tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+							complete() {
+								uni.redirectTo({
+									url: '/pages/order/order_detail?orderId=' + _this
+										.listinfoid
+								});
+							},
+						})
+
+					} else if (res.data == 2) {
+						this.showToastUppop('余额不足')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					} else if (res.data == 3) {
+						this.showToastUppop('未设置支付密码')
+						setTimeout(() => {
+							uni.pro.navigateTo('/pages/user/repairpassword', {
+								shopId_id: uni.cache.get('shopUser')
+							})
+						}, 1500)
+
+					} else if (res.data == 4) {
+						this.showToastUppop('非会员请充值')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					}
+
+				}
+
+			},
+			showToastUppop(title) {
+				uni.showToast({
+					icon: 'none',
+					title,
+					success: () => {
+
+					}
+				})
+			},
+			async orderorderInfo() {
+				let res = await this.api.orderorderInfo({
+					orderId: this.orderId
+				})
+				if (res.code == 0) {
+					this.listinfo = res.data
+					this.mountedcreateSelectorQuery()
+				}
+			},
+			copyHandle(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			clickselect(b) {
+				this.pay_type = b
+			},
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.container {
+		padding: 28upx;
+	}
+
+	.payType {
+		padding: 32rpx 34rpx;
+		margin-top: 48rpx;
+		background-color: #fff;
+
+		>view:first-child {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+		}
+
+		>view:last-child {
+			margin-top: 32rpx;
+		}
+
+		.dfs {
+			display: flex;
+			align-items: center;
+		}
+
+	}
+
+	.card {
+		background-color: #fff;
+		border-radius: 20upx;
+		padding: 28upx;
+		margin-bottom: 28upx;
+
+		.head {
+			display: flex;
+			justify-content: space-between;
+
+			&.border {
+				padding-bottom: 28upx;
+				border-bottom: 1upx solid #fafafa;
+			}
+
+			.status {
+				color: #ff0000;
+			}
+		}
+
+		.tag-wrap {
+			padding: 20upx 0;
+			display: flex;
+
+			.tag {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				padding: 0 10upx;
+				color: $color-priamry;
+				border: 1px solid $color-priamry;
+				font-size: 24upx;
+			}
+		}
+
+		.number-wrap {
+			background-color: #fafafa;
+			border-radius: 16upx;
+			padding: 28upx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.number {
+				font-size: 42upx;
+				font-weight: bold;
+			}
+		}
+
+		.price {
+			.i {
+				font-size: 20upx;
+			}
+
+			.num {
+				font-size: 38upx;
+			}
+		}
+
+		.shop-info {
+			padding: 28upx 0;
+
+			.item:nth-child(1) {
+				margin-top: 0;
+			}
+
+			.item {
+				margin-top: 16rpx;
+				display: flex;
+
+				.info {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding-left: 28upx;
+
+					.n {
+						font-size: 24upx;
+						color: #999;
+					}
+				}
+			}
+		}
+
+		.total-wrap {
+			display: flex;
+			justify-content: flex-end;
+			padding-top: 28upx;
+			border-top: 1upx solid #fafafa;
+		}
+
+		.order-info {
+			.row {
+				display: flex;
+				justify-content: space-between;
+				padding-top: 28upx;
+
+				.t {
+					font-size: 24upx;
+					color: #999;
+				}
+
+				.info {
+					font-size: 24upx;
+				}
+			}
+		}
+	}
+
+	.sixcontent {
+		width: 100%;
+		background: #FFFFFF;
+		padding: 32rpx;
+		margin-top: 32rpx;
+		border-radius: 12rpx;
+
+		.sixcontentone {
+			padding-bottom: 28rpx;
+			border-bottom: 1px solid #F7F7F7;
+
+			.sixcontent_one {
+				font-size: 28rpx;
+				font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+
+		.sixcontenttow {
+			.sixcontenttowitem {
+				margin-top: 16rpx;
+
+				.sixcontenttowitemone {
+					image {
+						margin-left: 24rpx;
+						width: 31.37rpx;
+						height: 27.34rpx;
+					}
+
+					.sixcontenttowitemonetext {
+						margin-left: 14rpx;
+						font-size: 28rpx;
+						font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+
+	.fixedview {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+
+		.flex-between {
+			width: 100%;
+			padding: 24rpx 28rpx;
+			background: #FFFFFF;
+
+			.fixedview_one {
+				.fixedview_oneone {
+					font-size: 28rpx;
+					font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
+					font-weight: normal;
+					color: #333333;
+				}
+
+				.fixedview_onetow {
+					font-size: 44rpx;
+					font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
+					font-weight: normal;
+					color: #F45C4C;
+					font-weight: bold;
+
+					text {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.fixedview_tow {
+				background: red;
+				border-radius: 34rpx;
+				padding: 10rpx 44rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/order_detail.vue b/pages/order/order_detail.vue
index c1d5e6f..a25a061 100644
--- a/pages/order/order_detail.vue
+++ b/pages/order/order_detail.vue
@@ -37,8 +37,10 @@
 				<text class="tag" v-if="listinfo.sendType == 'takeself'">自提</text>
 				<text class="tag" v-if="listinfo.sendType == 'table'">堂食</text>
 			</view>
-			<view v-if="listinfo.tableName" style="display: flex;align-items: center;">&nbsp;&nbsp;&nbsp;桌码: <view style="padding: 12rpx 16rpx;background-color: #faf2b6;border-radius: 12rpx;"> {{listinfo.tableName}}</view></view>
-			<view class="number-wrap"
+			<view v-if="listinfo.tableName">
+				桌号：{{listinfo.tableName}}
+			</view>
+			<view class="number-wrap" style="margin-top: 20rpx;"
 				v-if="listinfo.status != 'unpaid' && listinfo.status != 'paying'&& listinfo.status != 'cancelled'">
 				<text class="t">取餐号</text>
 				<text class="number">{{listinfo.outNumber}}</text>
@@ -278,7 +280,7 @@
 		}
 
 		.tag-wrap {
-			padding: 28upx 0;
+			padding: 20upx 0;
 			display: flex;
 
 			.tag {
diff --git a/pages/order_detail/index.vue b/pages/order_detail/index.vue
index e8516ae..861c425 100644
--- a/pages/order_detail/index.vue
+++ b/pages/order_detail/index.vue
@@ -1,59 +1,14 @@
 <template>
 	<view class="container">
-		<view class="card" v-if="listinfo.tableName">
-			<view class="head">
-				<text class="title">
-					<text>{{listinfo.tableName || '空'}}</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'unpaid'">
-					<text>待支付</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'unsend'">
-					<text>待发货</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'closed'">
-					<text>订单完成</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'send'">
-					<text>已发</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'refunding'">
-					<text>申请退单</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'refund'">
-					<text>退单</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'cancelled'">
-					<text>取消订单</text>
-				</text>
-				<text class="status" v-if="listinfo.status == 'merge'">
-					<text>合台</text>
-				</text>
-			</view>
-			<view class="tag-wrap">
-				<text class="tag" v-if="listinfo.sendType == 'post'">快递</text>
-				<text class="tag" v-if="listinfo.sendType == 'takeaway'">外卖</text>
-				<text class="tag" v-if="listinfo.sendType == 'takeself'">自提</text>
-				<text class="tag" v-if="listinfo.sendType == 'table'">堂食</text>
-			</view>
-			<view class="number-wrap" v-if="listinfo.status != 'unpaid'">
-				<text class="t">取餐号</text>
-				<text class="number">{{listinfo.tableName || '空'}}</text>
-			</view>
-		</view>
 		<view class="card">
-			<view class="head border">
-				<text class="title">
-					<text>点单详情</text>
-				</text>
-			</view>
 			<view class="shop-info">
-				<view class="item" v-for="(item,index) in listinfo.detailList" :key="index">
+				<view class="item" v-for="(item,index) in cartLists.data" :key="index">
 					<view class="cover">
 						<c-image width="120" height="120" radius="16" :src='item.coverImg'></c-image>
 					</view>
 					<view class="info">
 						<text>{{item.name}}</text>
+						<text class="n">{{item.skuName}}</text>
 						<text class="n">x{{item.number}}</text>
 					</view>
 					<view class="price">
@@ -62,119 +17,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="total-wrap">
-				<view class="price">
-					<text>合计：</text>
-					<text class="i">￥</text>
-					<text class="num">{{listinfo.amounts}}</text>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="sixcontent">
-			<view class="sixcontentone flex-between" style="padding: 0 0;" @click="orderfoodindex">
-				<view class="sixcontent_one" style="padding: 0 0;">
-					优惠券
-				</view>
-				<text style="color: red;">{{emitorderfoodform.couponsPrice}}</text>
-			</view>
-		</view> -->
-		<!-- <view class="redMoney">
-			<view>
-				<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/hongbao.png"
-					style="width: 30rpx;height: 30.24rpx;;" mode=""></image>
-				红包/抵用券
-			</view>
-			<view @click="orderfoodindex">
-				可用优惠券{{couponAmount}}张
-			</view>
-		</view> -->
-		<!-- 支付方式 -->
-		<view class="payType">
-			<view class="">
-				支付方式
-			</view>
-			<view class="">
-				<u-radio-group v-model="radiovalue1" iconPlacement="right" @change="groupChange" :size="28"
-					placement="column">
-					<u-radio activeColor="#ffd158" name="1">
-						<view class="dfs">
-							<image style="width:44rpx;height:44rpx"
-								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/balance.png" mode="">
-							</image>
-							<text style="font-size: 28rpx;margin-left: 16rpx;">
-								微信支付
-							</text>
-						</view>
-					</u-radio>
-					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;">
-					</view>
-					<u-radio activeColor="#ffd158" name="2">
-						<view class="dfs">
-							<image style="width:44rpx;height:44rpx"
-								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png" mode="">
-							</image>
-							<text style="font-size: 28rpx;margin-left: 16rpx;">
-								会员卡支付</text>
-						</view>
-					</u-radio>
-				</u-radio-group>
-				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;">
-					会员卡余额{{ amountVIP.amount}} <text
-						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
-						@click="goRecharge">去充值</text>
-				</view>
-			</view>
-		</view>
-		<!-- 	<view class="sixcontent"  >
-			<view class="sixcontentone flex-between">
-				<view class="sixcontent_one">
-					支付方式
-				</view>
-			</view>
-			<view class="sixcontenttow">
-				<view class="sixcontenttowitem flex-between" @click="clickselect(1)">
-					<view class="sixcontenttowitemone flex-start">
-						<u-icon name="weixin-fill" color="#999999" size="32"></u-icon>
-						<text class="sixcontenttowitemonetext">微信支付</text>
-					</view>
-					<view class="flex-start">
-						<u-icon v-if="pay_type == 1" name="checkmark-circle-fill" color="#333333" size="26"></u-icon>
-						<u-icon v-else name="checkmark-circle-fill" color="#999999" size="26"></u-icon>
-
-					</view>
-				</view>
-			 <view class="sixcontenttowitem flex-between" @click="clickselect(2)">
-					<view class="sixcontenttowitemone flex-start">
-						<u-icon name="zhifubao" color="#999999" size="26"></u-icon>
-						<text class="sixcontenttowitemonetext">余额支付</text>
-					</view>
-					<view class="flex-start">
-						<u-icon v-if="pay_type == 2" name="checkmark-circle-fill" color="#333333" size="26"></u-icon>
-						<u-icon v-else name="checkmark-circle-fill" color="#999999" size="26"></u-icon>
-					</view>
-				</view> 
-	</view>
-	</view> -->
-		<view :style="{height:height}">
-
-		</view>
-		<view class="fixedview">
-			<view class="flex-between">
-				<view class="fixedview_one flex-start">
-					<view class="fixedview_oneone">
-						实付金额：
-					</view>
-					<view class="fixedview_onetow">
-						<text>¥</text>{{listinfo.amount}}
-					</view>
-					<view class="fixedview_onethere" v-if="emitorderfoodform.couponsPrice">
-						以优惠¥{{emitorderfoodform.couponsPrice}}
-					</view>
-				</view>
-				<view class="fixedview_tow" @tap="$u.debounce(showpopupclickdd, 500)">
-					立即付款
-				</view>
-			</view>
 		</view>
 		<!-- 支付密码 -->
 		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-if="ispws"></payPassword>
@@ -182,6 +24,7 @@
 </template>
 
 <script>
+	// import {object} from 'prop-types';
 	import webSocketUtils from '@/common/js/websocket.js'
 	import payPassword from '@/components/payPassword.vue'
 	export default {
@@ -192,7 +35,7 @@
 			return {
 				height: '',
 				pay_type: 1,
-				listinfoid: '',
+				remark: '',
 				listinfo: {
 					detailList: [],
 					amount: '',
@@ -201,115 +44,54 @@
 				emitorderfoodform: {
 					clickiconone: ''
 				},
-				amountVIP: null,
-				radiovalue1: '1',
-				vipId: null,
 				orderInfo: '',
 				// 可用优惠券数据
 				couponAmount: 0,
 				// 输入支付密码     123
-				passwordArr: [],
 				ispws: false,
+				listinfoid: ''
 			};
 		},
-
-		onUnload() {
-			uni.$off('getMessage')
-			this.ispws = false
-
-		},
-		onLoad(e) {
-			// console.log(e, 140)
-			let res = JSON.parse(e.tableId)
-			this.listinfo.detailList = res
-			this.listinfo.amount = e.amount // 算完了的价格
-			this.listinfo.amounts = e.amount //本来的价格
-			this.handlemessage()
-			uni.$on('message', this.getMessage)
-
-			// 获取余额
-			this.getAount()
-			// 获取可用优惠券数量
-			this.getcoupon()
-			this.vipId = uni.cache.get('userInfo').id
-
-		},
-		onShow() {
-			this.getAount()
-		},
-		created() {
-			uni.$on('emitclickorderfood', (num) => {
-				// 总金额  couponsAmount 优惠卷购买金额   couponsPrice优惠金额 等于1是团购/不等于1
-				if (num.clickiconone == 1) {
-					this.listinfo.amount = (Number(this.listinfo.amounts) + Number(num.couponsPrice) - Number(num
-						.couponsAmount)).toFixed(2)
-				} else {
-					this.listinfo.amount = (Number(this.listinfo.amounts) - Number(num.couponsAmount)).toFixed(2)
+		props: {
+			cartLists: {
+				type: Object,
+				default () {
+					return {
+						amount: '0.00',
+						data: []
+					}
 				}
-				this.emitorderfoodform = num
-				// this.num += num
-			})
+			},
+			radiovalue: {
+				type: String,
+				default: '1'
+			},
+			amountVIP: {
+				type: Object,
+				default () {
+					return {
+
+					}
+				}
+			}
+		},
+		onUnload() {
+			this.ispws = false
 		},
 		methods: {
 			groupChange(n) {
-				// console.log('groupChange', n);
-				this.radiovalue1 = n
-				uni.cache.set('radiovalue1', n)
-			},
-			async getcoupon() {
-				let res = await this.api.userCoupon({
-					"orderNum": this.listinfo.amount,
-					"userId": uni.cache.get('userInfo').id,
-				})
-				if (res.code == 0) {
-					this.couponAmount = res.data
-				}
+				this.radiovalue = n
 			},
 			async getAount() {
 				let res = await this.api.shopUserInfo({
-					// shopId:店铺ID
-					"shopId": this.$store.state.shopId,
+					"shopId": uni.cache.get('shopUser'),
 					"userId": uni.cache.get('userInfo').id,
 				})
 				if (res.code == 0) {
-
 					this.amountVIP = res.data
 				}
 			},
-			getMessage(msg) {
-				if (msg.status != 'success') {
-					uni.showToast({
-						title: msg.msg,
-						icon: "none",
-					})
-					this.socketTicket.Close()
-					uni.$off('getMessage')
-					console.log(msg, 'socke返回数据')
-
-				} else if (msg.type == 'createOrder') {
-					console.log(msg, 'createOrder执行')
-					this.listinfoid = msg.data.id //下单需要的id
-					this.orderInfo = msg.data
-					if (this.radiovalue1 == 1) {
-						this.showpopupclickdds() //微信支付
-					}
-
-				}
-			},
-			handlemessage() {
-				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
-				this.socketTicket = new webSocketUtils(
-					`${uni.conf.baseUrlwws}/websocket/table/${uni.cache.get('tableCode')}/${uni.cache.get('shopUser')}/${uni.cache.get('userInfo').id}`,
-					5000)
-
-			},
-			// 数据处理
-			socketSendMsg(data) {
-				if (this.socketTicket) {
-					this.socketTicket.send(data);
-				}
-			},
-			orderfoodindex() {
+			orderfoodindex() { //优惠劵
 				uni.pro.navigateTo('index/coupons/index', {
 					orderfood: 0,
 					orderId: this.listinfoid,
@@ -327,82 +109,33 @@
 					}
 				});
 			},
-			async paymodfiyOrderInfo() {
+			async paymodfiyOrderInfo() { //支付完成后请求
 				let res = await this.api.paymodfiyOrderInfo({
-					orderId: this.listinfoid
+					orderId: this.listinfoid,
 				})
 			},
-			creactorder(){
-				let data = { //定义socket数据传参
-					"skuId": '',
-					"num": '', //数量
-					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-					"couponsId": this.emitorderfoodform.id ? this.emitorderfoodform.id : '', //优惠券ID,
-					"isYhq": this.emitorderfoodform.id ? 1 : 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
-					"isBuyYhq": this.emitorderfoodform.clickiconone == 1 ? 1 : 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
-					"productId": '', //商品id
-					"shopId": this.$store.state.shopId,
-					"userId": uni.cache.get('userInfo').id,
-					// tableId:uni.cache.get('tableCode')
-				}
-				let res = 0
-				if(res.code==0){
-					this.listinfoid = msg.data.id //下单需要的id
-					this.orderInfo = msg.data
-					if (this.radiovalue1 == 1) {
-						this.showpopupclickdds() //微信支付
-					}
-				}
-			},
-			// 去结算
-			showpopupclick() {
-				let data = { //定义socket数据传参
-					"skuId": '',
-					"num": '', //数量
-					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-					"couponsId": this.emitorderfoodform.id ? this.emitorderfoodform.id : '', //优惠券ID,
-					"isYhq": this.emitorderfoodform.id ? 1 : 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
-					"isBuyYhq": this.emitorderfoodform.clickiconone == 1 ? 1 : 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
-					"productId": '', //商品id
-					"shopId": this.$store.state.shopId,
-					"userId": uni.cache.get('userInfo').id,
-					// tableId:uni.cache.get('tableCode')
-				}
-				this.socketSendMsg(data)
-			},
-			// 去充值
-			goRecharge() {
+			goRecharge() { // 去充值
 				uni.pro.navigateTo('/pages/member/index', {
-					shopId: this.amountVIP.shopId
+					shopId: uni.cache.get('shopUser')
 				})
 			},
-
-			showpopupclickdd() {
-				console.log(this.radiovalue1, 'radiovalue1的值')
-				if (this.radiovalue1 == 1) {
-					// this.showpopupclick() //生成订单
-					this.creactorder()
+			showpopupclickddes(ID) {
+				// radiovalue为1是微信支付
+				this.listinfoid = ID
+				if (this.radiovalue == 1) {
+					this.showpopupclickdds() //微信支付
 				} else {
-					// 判断是否有绑定支付密码
 					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+					// console.log(isPwd,'是否设置了支付密码')
 					if (uni.cache.get('userInfo').isPwd == 0) {
 						uni.pro.navigateTo('/pages/user/repairpassword', {
 							shopId_id: uni.cache.get('shopUser')
 						})
 					} else {
-						if (this.amountVIP.amount > this.listinfo.amount) {
-							this.ispws = true
-							// this.showpopupclick() //生成订单
-							this.creactorder()
-							this.$nextTick(() => {
-								this.$refs.payPwd.onPayUp();
-							})
-						} else {
-							uni.showToast({
-								title: "余额不足"
-							})
-						}
-
+						this.ispws = true
+						this.$nextTick(() => {
+							this.$refs.payPwd.onPayUp();
+						})
 					}
 				}
 			},
@@ -412,10 +145,10 @@
 					orderId: this.listinfoid
 				}) //判断是否支付成功
 				if (res.code == 0) {
-					// uni.showLoading({
-					// 	title: '加载中',
-					// 	mask: true
-					// })
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
 					// #ifdef MP-WEIXIN
 					// 微信支付还是余额支付
 					uni.requestPayment({
@@ -427,51 +160,28 @@
 						signType: res.data.signType, //固定值
 						paySign: res.data.paySign, //签名
 						success: (res) => {
-							uni.showToast({
-								title: "支付成功"
+							let _this = this
+							uni.requestSubscribeMessage({
+								tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+								complete() {
+									uni.showToast({
+										title: "支付成功"
+									})
+									// uni.cache.set('shopUser', '') //删除shopUser
+									_this.paymodfiyOrderInfo()
+									uni.redirectTo({
+										url: '/pages/order/order_detail?orderId=' + _this
+											.listinfoid
+									});
+								},
 							})
-							uni.cache.set('shopUser', '') //删除shopUser
-							this.paymodfiyOrderInfo()
-							setTimeout(res => {
-								// uni.redirectTo({
-								// 	url: '/pages/order/successful?orderId=' + this
-								// 		.listinfoid + '&orderInfo=' + JSON.stringify(
-								// 			this.orderInfo) + '&radiovalue1=' + this
-								// 		.radiovalue1
-								// });
-								uni.redirectTo({
-									url: '/pages/order/order_detail?orderId=' + this
-										.listinfoid
-								});
-							}, 500)
-							// uni.redirectTo({
-							// 	url: "/pages/mall/order/ordersuccess?id=" + datareslane.data
-							// 		.order_id,
-							// });
 						},
-						fail: (err) => {
-							uni.showToast({
-								icon: 'none',
-								title: '支付失败'
-							})
-							setTimeout(res => {
-								// uni.redirectTo({
-								// 	url: '/pages/order/successful?orderId=' + this
-								// 		.listinfoid + '&orderInfo=' + JSON.stringify(
-								// 			this.orderInfo) + '&radiovalue1=' + this
-								// 		.radiovalue1
-								// });
-								uni.redirectTo({
-									url: '/pages/order/order_detail?orderId=' + this
-										.listinfoid
-								});
-							}, 500)
-						},
-						complete: (data) => {
-							console.log(data, '成功与否')
+						fail: () => {
+							uni.hideLoading()
 						}
 					});
 					// #endif	
+					uni.hideLoading()
 				}
 			},
 			// 余额支付
@@ -480,80 +190,103 @@
 				let res = await this.api.accountPay({
 					orderId: this.listinfoid,
 					memberId: this.amountVIP.id,
-					pwd: pwd
+					// remark: this.remark,
+					pwd
 				})
 				if (res.code == 0) {
-					uni.showToast({
-						icon: 'none',
-						title: '支付成功',
-						success: () => {
-							setTimeout(res => {
-								// uni.redirectTo({
-								// 	url: '/pages/order/successful?orderId=' + this
-								// 		.listinfoid + '&orderInfo=' + JSON.stringify(
-								// 			this.orderInfo) + '&radiovalue1=' + this
-								// 		.radiovalue1
-								// });
+					// data ->1 支付成功
+					// ->2 余额不足
+					// ->3 未设置支付密码，
+					// ->4 不是会员，
+					if (res.data == 1) {
+						this.showToastUppop('支付成功')
+						let _this = this
+
+						uni.requestSubscribeMessage({
+							tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+							complete() {
 								uni.redirectTo({
-									url: '/pages/order/order_detail?orderId=' + this
+									url: '/pages/order/order_detail?orderId=' + _this
 										.listinfoid
 								});
-							}, 500)
+							},
+						})
 
+					} else if (res.data == 2) {
+						this.showToastUppop('余额不足')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					} else if (res.data == 3) {
+						this.showToastUppop('未设置支付密码')
+						setTimeout(() => {
+							uni.pro.navigateTo('/pages/user/repairpassword', {
+								shopId_id: uni.cache.get('shopUser')
+							})
+						}, 1500)
+
+					} else if (res.data == 4) {
+						this.showToastUppop('非会员请充值')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					}
 
-						}
-					})
-				} else if (res.data == 1) {
-					setTimeout(() => {
-						// 去充值
-						this.goRecharge()
-					}, 2000)
 				}
 
-
 			},
+			showToastUppop(title) {
+				uni.showToast({
+					icon: 'none',
+					title,
+					success: () => {
 
-			clickselect(b) {
-				this.pay_type = b
+					}
+				})
 			},
 
 		},
-		mounted() {
-			//#ifdef MP-WEIXIN || H5
-			var query = uni.createSelectorQuery().in(this).select('.fixedview')
-			query.boundingClientRect(ele => {
-				var that = this;
-				that.height = (ele.height) + "px";
-				that = null;
-				// uni.getSystemInfo({
-				// 	success(res) {
-
-				// 	}
-				// })
-			}).exec();
-			//#endif
-			//#ifdef MP-ALIPAY
-			my.createSelectorQuery().selectAll('.fixedview').boundingClientRect().exec(ele => {
-				var nodeData = ele[0]
-				var that = this;
-				that.height = (nodeData.height) + "px";
-				that = null;
+		async mounted() {
+			uni.getSystemInfo({
+				success: (data) => {
+					this.height = (data.windowHeight / 2) + "px";
+					console.log(this.height, 1111);
+				}
 			})
-			//#endif
+			// //#ifdef MP-WEIXIN || H5
+			// var query = uni.createSelectorQuery().in(this).select('.fixedview')
+			// query.boundingClientRect(ele => {
+			// 	var that = this;
+			// 	that.height = (ele.height) + "px";
+			// 	that = null;
+			// }).exec();
+			// //#endif
+			// //#ifdef MP-ALIPAY
+			// my.createSelectorQuery().selectAll('.fixedview').boundingClientRect().exec(ele => {
+			// 	var nodeData = ele[0]
+			// 	var that = this;
+			// 	that.height = (nodeData.height) + "px";
+			// 	that = null;
+			// })
+			// //#endif
 		},
 	};
 </script>
 
 <style scoped lang="scss">
 	.container {
-		padding: 28upx;
+		padding: 0 28upx 28upx 28upx 28upx;
+		max-height: 600px;
+		overflow: auto;
 	}
 
 	.card {
 		background-color: #fff;
 		border-radius: 20upx;
 		padding: 28upx;
-		margin-bottom: 28upx;
+		margin-bottom: 48rpx;
 
 		.head {
 			display: flex;
diff --git a/pages/order_detail/indexs.vue b/pages/order_detail/indexs.vue
new file mode 100644
index 0000000..4d8fc4d
--- /dev/null
+++ b/pages/order_detail/indexs.vue
@@ -0,0 +1,803 @@
+<template>
+
+	<view class="container">
+		<view class="card" v-if="listinfo.tableName">
+			<view class="head">
+				<text class="title">
+					<text>{{listinfo.tableName || '空'}}</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'unpaid'">
+					<text>待支付</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'unsend'">
+					<text>待发货</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'closed'">
+					<text>订单完成</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'send'">
+					<text>已发</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'refunding'">
+					<text>申请退单</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'refund'">
+					<text>退单</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'cancelled'">
+					<text>取消订单</text>
+				</text>
+				<text class="status" v-if="listinfo.status == 'merge'">
+					<text>合台</text>
+				</text>
+			</view>
+			<view class="tag-wrap">
+				<text class="tag" v-if="listinfo.sendType == 'post'">快递</text>
+				<text class="tag" v-if="listinfo.sendType == 'takeaway'">外卖</text>
+				<text class="tag" v-if="listinfo.sendType == 'takeself'">自提</text>
+				<text class="tag" v-if="listinfo.sendType == 'table'">堂食</text>
+			</view>
+			<view class="number-wrap"
+				v-if="listinfo.status != 'unpaid' && listinfo.status != 'paying'&& listinfo.status != 'cancelled'">
+				<text class="t">取餐号</text>
+				<text class="number">{{listinfo.outNumber || '空'}}</text>
+			</view>
+		</view>
+		<view class="card" v-if="listinfoid && listinfo">
+			<view class="head border">
+				<text class="title">
+					<text>点单详情</text>
+				</text>
+			</view>
+			<view class="shop-info">
+				<view class="item" v-for="(item,index) in listinfo.details" :key="index">
+					<view class="cover">
+						<c-image width="120" height="120" radius="16" :src='item.productImg'></c-image>
+					</view>
+					<view class="info">
+						<text>{{item.productName}}</text>
+						<text class="n" v-if="item.productSkuName">{{item.productSkuName}}</text>
+						<text class="n">x{{item.num}}</text>
+					</view>
+					<view class="price">
+						<text class="i">￥</text>
+						<text class="num">{{item.price}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="total-wrap">
+				<view class="price">
+					<text>合计：</text>
+					<text class="i">￥</text>
+					<text class="num">{{listinfo.payAmount}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="card" v-else>
+			<view class="shop-info">
+				<view class="item" v-for="(item,index) in cartLists.data" :key="index">
+					<view class="cover">
+						<c-image width="120" height="120" radius="16" :src='item.coverImg'></c-image>
+					</view>
+					<view class="info">
+						<text>{{item.name}}</text>
+						<text class="n">{{item.skuName}}</text>
+						<text class="n">x{{item.number}}</text>
+					</view>
+					<view class="price">
+						<text class="i">￥</text>
+						<text class="num">{{item.salePrice}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="sixcontent">
+			<view class="sixcontentone flex-between" style="padding: 0 0;" @click="orderfoodindex">
+				<view class="sixcontent_one" style="padding: 0 0;">
+					优惠券
+				</view>
+				<text style="color: red;">{{emitorderfoodform.couponsPrice}}</text>
+			</view>
+		</view> -->
+		<!-- <view class="redMoney">
+			<view>
+				<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/hongbao.png"
+					style="width: 30rpx;height: 30.24rpx;;" mode=""></image>
+				红包/抵用券
+			</view>
+			<view @click="orderfoodindex">
+				可用优惠券{{couponAmount}}张
+			</view>
+		</view> -->
+		<!-- <u--textarea v-model="remark" placeholder="订单备注" ></u--textarea> -->
+		<!-- 支付方式 -->
+		<view class="payType">
+			<view class="">
+				支付方式
+			</view>
+			<view class="">
+				<u-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChange" :size="28"
+					placement="column">
+					<u-radio activeColor="#ffd158" name="1">
+						<view class="dfs">
+							<image style="width:44rpx;height:44rpx"
+								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/balance.png" mode="">
+							</image>
+							<text style="font-size: 28rpx;margin-left: 16rpx;">
+								微信支付
+							</text>
+						</view>
+					</u-radio>
+					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;">
+					</view>
+					<u-radio activeColor="#ffd158" name="2">
+						<view class="dfs">
+							<image style="width:44rpx;height:44rpx"
+								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png" mode="">
+							</image>
+							<text style="font-size: 28rpx;margin-left: 16rpx;">
+								会员卡支付</text>
+						</view>
+					</u-radio>
+				</u-radio-group>
+				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;">
+					会员卡余额{{ amountVIP?amountVIP.amount:0}} <text
+						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
+						@click="goRecharge">去充值</text>
+				</view>
+			</view>
+		</view>
+		<!-- 	<view class="sixcontent"  >
+			<view class="sixcontentone flex-between">
+				<view class="sixcontent_one">
+					支付方式
+				</view>
+			</view>
+			<view class="sixcontenttow">
+				<view class="sixcontenttowitem flex-between" @click="clickselect(1)">
+					<view class="sixcontenttowitemone flex-start">
+						<u-icon name="weixin-fill" color="#999999" size="32"></u-icon>
+						<text class="sixcontenttowitemonetext">微信支付</text>
+					</view>
+					<view class="flex-start">
+						<u-icon v-if="pay_type == 1" name="checkmark-circle-fill" color="#333333" size="26"></u-icon>
+						<u-icon v-else name="checkmark-circle-fill" color="#999999" size="26"></u-icon>
+	
+					</view>
+				</view>
+			 <view class="sixcontenttowitem flex-between" @click="clickselect(2)">
+					<view class="sixcontenttowitemone flex-start">
+						<u-icon name="zhifubao" color="#999999" size="26"></u-icon>
+						<text class="sixcontenttowitemonetext">余额支付</text>
+					</view>
+					<view class="flex-start">
+						<u-icon v-if="pay_type == 2" name="checkmark-circle-fill" color="#333333" size="26"></u-icon>
+						<u-icon v-else name="checkmark-circle-fill" color="#999999" size="26"></u-icon>
+					</view>
+				</view> 
+	</view>
+	</view> -->
+		<view :style="{height:height}">
+
+		</view>
+		<view class="fixedview">
+			<view class="flex-between">
+				<view class="fixedview_one flex-start">
+					<view class="fixedview_oneone">
+						实付金额：
+					</view>
+					<view class="fixedview_onetow" v-if="listinfoid && listinfo">
+						<text>¥</text>{{listinfo.payAmount}}
+					</view>
+					<view class="fixedview_onetow" v-else>
+						<text>¥</text>{{cartLists.amount}}
+					</view>
+					<!-- <view class="fixedview_onethere" v-if="emitorderfoodform.couponsPrice">
+					以优惠¥{{emitorderfoodform.couponsPrice}}
+				</view> -->
+				</view>
+
+				<view class="fixedview_tow" @tap="$u.debounce(showpopupclickdd, 500)" v-if="listinfoid && listinfo">
+					立即付款
+				</view>
+				<view class="fixedview_tow" @tap="$u.debounce(orderdetail, 500)" v-else>
+					立即付款
+				</view>
+			</view>
+		</view>
+		<!-- 支付密码 -->
+		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-if="ispws"></payPassword>
+		<!-- 弹幕 -->
+		<l-barrage ref="lBarrage" @end="onEnd" :minTop='0' :maxTop='16'></l-barrage>
+	</view>
+</template>
+
+<script>
+	// import {object} from 'prop-types';
+	import webSocketUtils from '@/common/js/websocket.js'
+	import payPassword from '@/components/payPassword.vue'
+	import lBarrage from '@/components/l-barrage/l-barrage.vue'
+	export default {
+		components: {
+			payPassword,
+			lBarrage
+		},
+		data() {
+			return {
+				userInfo: uni.cache.get('userInfo'), //个人信息
+				cartLists: {},
+				height: '',
+				pay_type: 1,
+				remark: '',
+				listinfo: {
+					detailList: [],
+					amount: '',
+					amounts: ''
+				},
+				emitorderfoodform: {
+					clickiconone: ''
+				},
+				orderInfo: '',
+				// 可用优惠券数据
+				couponAmount: 0,
+				// 输入支付密码     123
+				ispws: false,
+				listinfoid: null,
+				radiovalue: '1',
+				amountVIP: null
+			};
+		},
+
+		onUnload() {
+			this.socketTicket.Close()
+			uni.$off('getMessage')
+			this.ispws = false
+		},
+		onHide() {
+			this.socketTicket.Close()
+			uni.$off('message')
+		},
+		onShow() {
+			uni.$on('message', this.getMessage)
+			if (this.listinfoid) {
+				this.orderorderInfo()
+			} else {
+				this.handlemessage()
+			}
+			// 获取余额
+			this.getAount()
+		},
+		methods: {
+			getMessage(msg) {
+				if (msg == 1) { // 网络在连接
+					return false
+				}
+				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
+					return false
+				}
+				if (msg.status != 'success') {
+					uni.showToast({
+						title: msg.msg,
+						icon: "none",
+					})
+					return false;
+
+				} else {
+					switch (msg.type) {
+						case 'createOrder':
+							console.log(msg.data)
+							this.listinfoid = msg.data.id
+							uni.$off('getMessage')
+							this.orderorderInfo(1)
+							break;
+						case 'addCart':
+							this.cartLists = msg
+							this.productqueryProduct() //list  数据
+							break;
+						case 'order':
+							uni.navigateBack()
+							setTimeout(() => {
+								uni.showToast({
+									title: '您的小伙伴已下单了哦~~'
+								})
+							}, 1000)
+							break;
+						case 'addcart':
+							/*插入一条弹幕*/
+							this.$refs.lBarrage.add(
+								`${msg.reqData.nickName?msg.reqData.nickName:'微信用户'}${msg.reqData.num==-1?'取消了':'添加了'}${msg.reqData.name}(${msg.reqData.num})`
+							);
+							break;
+					}
+					this.$set(this, 'cartLists', msg)
+				}
+
+			},
+			handlemessage() {
+				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
+				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
+					tableId: uni.cache.get('tableCode'),
+					shopId: uni.cache.get('shopUser'),
+					userId: uni.cache.get('userInfo').id,
+					"type": "connect",
+				})
+			},
+			// 数据处理
+			socketSendMsg(data) {
+				if (this.socketTicket) {
+					this.socketTicket.send(data);
+				}
+			},
+			onEnd() { //回调弹幕
+				console.log('一波结束')
+			},
+			// 查询订单信息
+			async orderorderInfo(i) {
+				let res = await this.api.orderorderInfo({
+					orderId: this.listinfoid
+				})
+				if (res.code == 0) {
+					this.listinfo = res.data
+					if (i == 1) { //请求完了详情在去调支付
+						this.showpopupclickdd()
+					}
+				}
+			},
+			groupChange(n) {
+				this.radiovalue = n
+			},
+			async getAount() {
+				let res = await this.api.shopUserInfo({
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+				})
+				if (res.code == 0) {
+					this.amountVIP = res.data
+				}
+			},
+			orderfoodindex() { //优惠劵
+				uni.pro.navigateTo('index/coupons/index', {
+					orderfood: 0,
+					orderId: this.listinfoid,
+					amount: this.listinfo.amounts
+				})
+			},
+			copyHandle(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			async paymodfiyOrderInfo() { //支付完成后请求
+				let res = await this.api.paymodfiyOrderInfo({
+					orderId: this.listinfoid,
+				})
+			},
+			goRecharge() { // 去充值
+				uni.pro.navigateTo('/pages/member/index', {
+					shopId: uni.cache.get('shopUser')
+				})
+			},
+			orderdetail() { // 直接生成订单
+				let data = {
+					"skuId": '',
+					"num": '', //数量
+					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+					"couponsId": '', //优惠券ID,
+					"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
+					"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
+					"productId": '', //商品id
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+				}
+				uni.$u.debounce(this.socketSendMsg(data), 500)
+			},
+			showpopupclickdd() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				// radiovalue为1是微信支付
+				if (this.radiovalue == 1) {
+					this.showpopupclickdds() //微信支付
+				} else {
+					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+					// console.log(isPwd,'是否设置了支付密码')
+					if (uni.cache.get('userInfo').isPwd == 0) {
+						uni.pro.navigateTo('/pages/user/repairpassword', {
+							shopId_id: uni.cache.get('shopUser')
+						})
+					} else {
+						uni.hideLoading()
+						this.ispws = true
+						this.$nextTick(() => {
+							this.$refs.payPwd.onPayUp();
+						})
+					}
+				}
+			},
+			// 微信支付
+			async showpopupclickdds() {
+				let res = await this.api.payorderPay({
+					orderId: this.listinfoid
+				}) //判断是否支付成功
+				if (res.code == 0) {
+
+					// #ifdef MP-WEIXIN
+					// 微信支付还是余额支付
+					uni.requestPayment({
+						provider: 'wxpay', //支付类型-固定值
+						partnerid: res.data.appId, // 微信支付商户号
+						timeStamp: res.data.timeStamp, // 时间戳（单位：秒）
+						nonceStr: res.data.nonceStr, // 随机字符串
+						package: res.data.package, // 固定值
+						signType: res.data.signType, //固定值
+						paySign: res.data.paySign, //签名
+						success: (res) => {
+							let _this = this
+							uni.requestSubscribeMessage({
+								tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+								complete() {
+									uni.showToast({
+										title: "支付成功"
+									})
+									// uni.cache.set('shopUser', '') //删除shopUser
+									_this.paymodfiyOrderInfo()
+									uni.redirectTo({
+										url: '/pages/order/order_detail?orderId=' + _this
+											.listinfoid
+									});
+								},
+							})
+						},
+						fail: () => {
+							uni.hideLoading()
+						}
+					});
+					// #endif	
+					uni.hideLoading()
+				}
+			},
+			// 余额支付
+			async accountPayevent(pwd) {
+				this.ispws = false
+				let res = await this.api.accountPay({
+					orderId: this.listinfoid,
+					memberId: this.amountVIP.id,
+					// remark: this.remark,
+					pwd
+				})
+				if (res.code == 0) {
+					// data ->1 支付成功
+					// ->2 余额不足
+					// ->3 未设置支付密码，
+					// ->4 不是会员，
+					if (res.data == 1) {
+						this.showToastUppop('支付成功')
+						let _this = this
+
+						uni.requestSubscribeMessage({
+							tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'],
+							complete() {
+								uni.redirectTo({
+									url: '/pages/order/order_detail?orderId=' + _this
+										.listinfoid
+								});
+							},
+						})
+
+					} else if (res.data == 2) {
+						this.showToastUppop('余额不足')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					} else if (res.data == 3) {
+						this.showToastUppop('未设置支付密码')
+						setTimeout(() => {
+							uni.pro.navigateTo('/pages/user/repairpassword', {
+								shopId_id: uni.cache.get('shopUser')
+							})
+						}, 1500)
+
+					} else if (res.data == 4) {
+						this.showToastUppop('非会员请充值')
+						setTimeout(() => {
+							// 去充值
+							this.goRecharge()
+						}, 1500)
+					}
+
+				}
+
+			},
+			showToastUppop(title) {
+				uni.showToast({
+					icon: 'none',
+					title,
+					success: () => {
+
+					}
+				})
+			},
+
+		},
+		async mounted() {
+			let rectInfo = await this.$u.getRect('.fixedview');
+			console.log(rectInfo);
+			this.height = rectInfo.height + "px"
+
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.container {
+		padding: 0 28upx 28upx 28upx 28upx;
+		overflow: auto;
+	}
+
+	.card {
+		background-color: #fff;
+		border-radius: 20upx;
+		padding: 28upx;
+		margin-bottom: 48rpx;
+
+		.head {
+			display: flex;
+			justify-content: space-between;
+
+			&.border {
+				padding-bottom: 28upx;
+				border-bottom: 1upx solid #fafafa;
+			}
+
+			.status {
+				color: #ff0000;
+			}
+		}
+
+		.tag-wrap {
+			padding: 28upx 0;
+			display: flex;
+
+			.tag {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				padding: 0 10upx;
+				color: $color-priamry;
+				border: 1px solid $color-priamry;
+				font-size: 24upx;
+			}
+		}
+
+		.number-wrap {
+			background-color: #fafafa;
+			border-radius: 16upx;
+			padding: 28upx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.number {
+				font-size: 42upx;
+				font-weight: bold;
+			}
+		}
+
+		.price {
+			.i {
+				font-size: 20upx;
+			}
+
+			.num {
+				font-size: 38upx;
+			}
+		}
+
+		.shop-info {
+			padding: 28upx 0;
+
+			.item:nth-child(1) {
+				margin-top: 0;
+			}
+
+			.item {
+				margin-top: 16rpx;
+				display: flex;
+
+				.info {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					padding-left: 28upx;
+
+					.n {
+						font-size: 24upx;
+						color: #999;
+					}
+				}
+			}
+		}
+
+		.total-wrap {
+			display: flex;
+			justify-content: flex-end;
+			padding-top: 28upx;
+			border-top: 1upx solid #fafafa;
+		}
+
+		.order-info {
+			.row {
+				display: flex;
+				justify-content: space-between;
+				padding-top: 28upx;
+
+				.t {
+					font-size: 24upx;
+					color: #999;
+				}
+
+				.info {
+					font-size: 24upx;
+				}
+			}
+		}
+	}
+
+	.sixcontent {
+		width: 100%;
+		background: #FFFFFF;
+		padding: 32rpx;
+		margin-top: 32rpx;
+		border-radius: 12rpx;
+
+		.sixcontentone {
+			padding-bottom: 28rpx;
+			border-bottom: 1px solid #F7F7F7;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+			font-weight: 500;
+			color: #333333;
+
+			.sixcontent_one {
+				font-size: 28rpx;
+				font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+
+		.sixcontenttow {
+			.sixcontenttowitem {
+				margin-top: 16rpx;
+
+				.sixcontenttowitemone {
+					image {
+						margin-left: 24rpx;
+						width: 31.37rpx;
+						height: 27.34rpx;
+					}
+
+					.sixcontenttowitemonetext {
+						margin-left: 14rpx;
+						font-size: 28rpx;
+						font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+						font-weight: 500;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+
+	.redMoney {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		background-color: #fff;
+		padding: 18rpx 14rpx;
+
+		>view:first-child {
+			display: flex;
+			align-items: center;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+		}
+
+		>view:last-child {
+			background: #FFE9E9;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FF3333;
+			text-align: center;
+			padding: 9rpx 13rpx;
+		}
+	}
+
+	.payType {
+		padding: 32rpx 34rpx;
+		margin-top: 48rpx;
+		background-color: #fff;
+
+		>view:first-child {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+		}
+
+		>view:last-child {
+			margin-top: 32rpx;
+		}
+
+		.dfs {
+			display: flex;
+			align-items: center;
+		}
+
+	}
+
+	.fixedview {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 180rpx;
+		padding: 16rpx 34rpx;
+		background: #FFFFFF;
+
+		.flex-between {
+			width: 100%;
+			padding: 24rpx 28rpx;
+			flex-wrap: nowrap;
+
+			.fixedview_one {
+				.fixedview_oneone {
+					font-size: 28rpx;
+					font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
+					font-weight: normal;
+					color: #333333;
+				}
+
+				.fixedview_onetow {
+					font-size: 44rpx;
+					font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
+					font-weight: normal;
+					color: #F45C4C;
+					font-weight: bold;
+
+					text {
+						font-size: 28rpx;
+					}
+				}
+
+				.fixedview_onethere {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+			}
+
+			.fixedview_tow {
+				background: red;
+				border-radius: 34rpx;
+				padding: 10rpx 44rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC-Bold, PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index b049d2a..46b129c 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -3,7 +3,7 @@
 		<view class="card" v-if="listinfo.tableName">
 			<view class="head">
 				<text class="title">
-					<text>{{listinfo.tableName || '空'}}</text>
+					桌号：<text>{{listinfo.tableName || '空'}}</text>
 				</text>
 				<text class="status" v-if="listinfo.status == 'unpaid'">
 					<text>待支付</text>
@@ -36,9 +36,10 @@
 				<text class="tag" v-if="listinfo.sendType == 'takeself'">自提</text>
 				<text class="tag" v-if="listinfo.sendType == 'table'">堂食</text>
 			</view>
-			<view class="number-wrap" v-if="listinfo.status != 'unpaid'">
+			<view class="number-wrap"
+				v-if="listinfo.status != 'unpaid' && listinfo.status != 'paying'&& listinfo.status != 'cancelled'">
 				<text class="t">取餐号</text>
-				<text class="number">{{listinfo.tableName || '空'}}</text>
+				<text class="number">{{listinfo.outNumber || '空'}}</text>
 			</view>
 		</view>
 		<view class="card">
@@ -195,7 +196,7 @@
 			return {
 				height: '',
 				pay_type: 1,
-				remark:'',
+				remark: '',
 				listinfoid: '',
 				listinfo: {
 					detailList: [],
@@ -266,7 +267,7 @@
 
 				}
 			},
-			orderfoodindex() {//优惠劵
+			orderfoodindex() { //优惠劵
 				uni.pro.navigateTo('index/coupons/index', {
 					orderfood: 0,
 					orderId: this.listinfo.id,
@@ -284,12 +285,12 @@
 					}
 				});
 			},
-			async paymodfiyOrderInfo() {//支付完成后请求
+			async paymodfiyOrderInfo() { //支付完成后请求
 				let res = await this.api.paymodfiyOrderInfo({
 					orderId: this.listinfo.id,
 				})
 			},
-			goRecharge() {// 去充值
+			goRecharge() { // 去充值
 				uni.pro.navigateTo('/pages/member/index', {
 					shopId: uni.cache.get('shopUser')
 				})
diff --git a/pages/order_food/order_food - 副本.vue b/pages/order_food/order_food - 副本.vue
new file mode 100644
index 0000000..c5c78ad
--- /dev/null
+++ b/pages/order_food/order_food - 副本.vue	
@@ -0,0 +1,1211 @@
+<template>
+	<view id="wrapper">
+		<view v-if="fixedtrue"
+			style="height: 100vh; width: 100%; position: fixed; z-index: 999; top: 0; left: 0; background-color: #fff; display: flex; justify-content: center; align-items: center;">
+			<image style="width: 140rpx; height: 140rpx;" src="@/static/1.gif" mode="aspectFill"></image>
+			<text style="margin-left10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
+			<!-- <u-loadmore status="loading" fontSize="50" iconSize="30"/> -->
+		</view>
+		<view class="nav-wrap" :class="{ 'is-fixed': isFixed }"
+			:style="{ paddingTop: `${menuInfo.top}px`, paddingBottom: `${paddingBtmSize}px` }">
+			<view class="content" :style="{ height: `${menuInfo.height}px`, paddingLeft: `${paddingBtmSize}px` }">
+				<view class="left-btn">
+					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
+						@click="navClickHandle(1)">
+						<u-icon name="arrow-left" :color="isFixed ? '#333' : '#fff'" size="38"></u-icon>
+					</view>
+					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
+						@click="navClickHandle(2)">
+						<u-icon name="kefu-ermai" :color="isFixed ? '#333' : '#fff'" size="38"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="shop-cover" :style="{ height: `${menuInfo.top + menuInfo.height + paddingBtmSize * 8}px` }">
+			<image class="img" :src="shopList.storeInfo.coverImg" mode="aspectFill"></image>
+		</view>
+		<view class="list-container">
+			<view class="header-wrap">
+				<text class="title">
+					<text class="t">{{ shopList.storeInfo.shopName }}</text>
+				</text>
+				<view class="cover">
+					<image class="img" :src="shopList.storeInfo.logo" mode="aspectFill"></image>
+				</view>
+			</view>
+			<view class="tab-header"
+				:style="{ height: `${tabHeadHeight}px`, top: `${menuInfo.top + menuInfo.height + paddingBtmSize}px` }">
+				<view class="left">
+					<text class="t">选择</text>
+				</view>
+				<view class="right">
+					<text class="t">商家</text>
+					<text class="d">{{ shopList.shopTableInfo.name }}</text>
+				</view>
+			</view>
+			<view class="tab-content">
+				<view class="left-wrap">
+					<view class="left"
+						:style="{ top: `${menuInfo.top + menuInfo.height + paddingBtmSize + tabHeadHeight}px` }">
+						<view class="item" v-for="(item, index) in shopList.productInfo" :key="item.id"
+							:class="{ active: titleTopNumIndex == index }" @click="titleClickHandle(item.id)">
+							<text>{{ item.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view class="list-wrap">
+					<view class="item-wrap" v-for="(item,index) in shopList.productInfo" :key="item.id">
+						<view class="title-wrap" :id="`title${item.id}`"></view>
+						<view class="title"
+							:style="{ top: `${menuInfo.top + menuInfo.height + paddingBtmSize + tabHeadHeight}px` }">
+							<!--  -->
+							<text>{{ item.name }}</text>
+						</view>
+						<view class="" v-if="item.products.length == 0">
+							空
+						</view>
+						<view class="shop-item" v-for="(item1,index1) in item.products" :key="item1.id">
+							<view class="cover langcover" style="width:180rpx; height: 180rpx;"
+								@click.stop="clickspecifications(item1,index,index1)">
+								<c-image style="position: absolute;z-index:2;"
+									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`" width="180"
+									height="180"></c-image>
+							</view>
+							<view class="info" style="display: flex;flex-direction: column;justify-content: center;">
+								<view class="name">
+									{{ item1.name }}
+								</view>
+								<view class="price-wrap">
+									<view class="price">
+										<text class="i">￥</text>
+										<text class="num">{{ item1.lowPrice }}</text>
+										<text class="i">起</text>
+									</view>
+									<view class="sku-wrap" v-if="item1.productSkuResult != null"
+										@click.stop="clickspecifications(item1,index,index1)">
+										<text class="t">选规格</text>
+										<text class="dot num" v-if="item1.cartNumber != '0'">{{item1.cartNumber}}</text>
+									</view>
+									<view class="operation-wrap" v-else>
+										<view class="btn" v-if="item1.cartNumber != '0'"
+											@click.stop="cartadd(item1,index,index1,'-',item1.productSkuResult == null ? '单规格':'')">
+											<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+										</view>
+										<text class="num">{{ item1.cartNumber }}</text>
+										<view class="btn"
+											@click.stop="cartadd(item1,index,index1,'+',item1.productSkuResult == null ? '单规格':'')">
+											<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="cart-wrap">
+			<view class="cart-content">
+				<view class="left">
+					<image class="icon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/icon_cart.png"
+						mode="aspectFit" @click="showCart = !showCart">
+					</image>
+					<text class="i">￥</text>
+					<text class="num">{{cartLists.amount||'0.00'}}</text>
+				</view>
+				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
+					<text class="t">提交订单</text>
+				</view>
+			</view>
+		</view>
+		<u-popup :show="showCart" :round="20" :zIndex="98" :overlayStyle="{ zIndex: 98 }" @close="showCart = false">
+			<view class="cart-list-wrap">
+				<view class="cart-header">
+					<view class="clear" @click="cartclear">
+						<u-icon name="trash" color="#999"></u-icon>
+						<text class="t">清空购物车</text>
+					</view>
+				</view>
+				<scroll-view scroll-y class="scroll-view">
+					<view class="list-wrap">
+						<view class="shop-item" v-for="(item,index) in cartLists.data" :key="item.id">
+							<view class="cover">
+								<c-image :src="item.coverImg" width="120" height="120"></c-image>
+							</view>
+							<view class="info">
+								<view class="name">
+									{{ item.name }}
+								</view>
+								<view class="select-sku-wrap">
+									<text class="t">{{ item.skuName }}</text>
+								</view>
+								<view class="price-wrap" style="padding-top: 0;">
+									<view class="price">
+										<text class="i">￥</text>
+										<text class="num">{{ item.salePrice }}</text>
+										<text class="i">起</text>
+									</view>
+									<view class="operation-wrap">
+										<view class="btn" v-if="item.number" @click="cartListadd(item,index,'-')">
+											<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+										</view>
+										<text class="num" v-if="item.number">{{ item.number }}</text>
+										<view class="btn" @click="cartListadd(item,index,'+')">
+											<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</u-popup>
+		<u-popup :show="showShopInfo" :round="20" @close="showShopInfo = false">
+			<view class="shop-info-wrap">
+				<view class="info-wrap">
+					<image :src="shopList.storeInfo.coverImg" mode="aspectFill" class="img"></image>
+					<text class="t">{{ shopList.storeInfo.shopName }}</text>
+				</view>
+				<view class="row">
+					<view class="col">
+						<text class="t">{{ shopList.storeInfo.businessTime }}</text>
+					</view>
+					<view class="col">
+						<text class="t">{{ shopList.storeInfo.phone }}</text>
+					</view>
+					<view class="col">
+						<text class="t">{{ shopList.storeInfo.address }}</text>
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="close" @click="showShopInfo = false">
+					<text class="t">关闭</text>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup :show="showShopsku" :round="20" mode="center" @close="showShopsku = false"
+			:safeAreaInsetBottom='false'>
+			<view class="shop_sku">
+				<view class="positionabsolute">
+					<u-icon name="close-circle-fill" @click="showShopsku = false" color="#a3aaa3" size="60"></u-icon>
+				</view>
+				<image class="shop_skucimage" :src="specifications.coverImg" mode="widthFix"></image>
+				<view class="shop_sku_name">
+					{{specifications.name}}
+				</view>
+				<view class="shop_sku_box" v-for="(item,index) in specifications.tagSnap" :key="index"
+					v-if="specifications.tagSnap">
+					<view class="shop_sku_box_name">
+						{{item.name}}
+					</view>
+					<view class="flex-start">
+						<view class="shop_sku_box_item" v-for="(item1,index1) in item.children" :key="index1"
+							@click="morloe(item1,index,index1,item)"
+							:class=" item.start === index1 ?'shop_sku_box_item_selected':'' ">
+							{{item1}}
+						</view>
+					</view>
+				</view>
+				<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
+					已选规格：<view class="shop_skuselectname">{{skuidname.toString()}}</view>
+				</view>
+				<view class="shop_bottom flex-between">
+					<view class="price">
+						<text class="i">￥</text>
+						<text class="num">{{salePrice}}</text>
+						<text class="i">起</text>
+					</view>
+					<view class="operation-wrap">
+						<view class="btn"
+							@click="cartadd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
+							<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+						</view>
+						<text class="num">{{amountcartNumber}}</text>
+						<view class="btn"
+							@click="cartadd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+							<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- <vastwu-barrage width="750rpx" height="1300rpx" ref="vBarrage"></vastwu-barrage> -->
+	</view>
+</template>
+
+<script>
+	import _ from 'lodash';
+	import navbar from '../../uni_modules/uview-ui/libs/config/props/navbar';
+	import webSocketUtils from '@/common/js/websocket.js'
+	// import vastwuBarrage from '@/components/vastwu-barrage/vastwu-barrage.vue'
+	export default {
+		// components:{vastwuBarrage},
+		data() {
+			return {
+				// #ifndef MP-WEIXIN
+				menuInfo: uni.getSystemInfo(),
+				// #endif
+				// #ifdef MP-WEIXIN
+				menuInfo: uni.getMenuButtonBoundingClientRect(),
+				// #endif
+				paddingBtmSize: 6,
+				tabHeadHeight: 50,
+				isFixed: false,
+				shopList: {}, //数据类型
+				active: 0,
+				showShopInfo: false,
+				showShopsku: false,
+				titleTopNumIndex: 0,
+				titleTopNums: [],
+				showCart: false,
+				tableCode: '', //code，
+				specifications: {},
+				skuidname: [],
+				cartLists: {},
+				socketTicket: null,
+				amountcartNumber: 0,
+				skuidsearch: '', //
+				salePrice: '', //钱数
+				fixedtrue: true
+			};
+		},
+		onPageScroll(e) {
+			if (e.scrollTop >= (this.menuInfo.top + this.menuInfo.height + this.paddingBtmSize) / 2) {
+				this.isFixed = true;
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: '#ffffff'
+				});
+			} else {
+				this.isFixed = false;
+				uni.setNavigationBarColor({
+					frontColor: '#ffffff',
+					backgroundColor: '#000000'
+				});
+			}
+			this.countScrollTitle(e.scrollTop);
+		},
+		onLoad(e) {
+			if (e.q) {
+				this.tableCode = this.getQueryString(decodeURIComponent(e.q), 'code')
+				uni.cache.set('tableCode', this.tableCode)
+			}
+			uni.cache.set('types', 'types');
+			uni.$on('message', this.getMessage)
+			this.$nextTick(() => {
+				this.countTitleTopNum(); //导航栏
+			});
+			// this.$refs.vBarrage.init([123])
+		},
+		onUnload() {
+			this.socketTicket.Close()
+			uni.$off('message')
+		},
+		onShow() {
+			setTimeout(() => {
+				this.productqueryShopIdByTableCode() //获取shop User id
+			}, 500)
+		},
+		methods: {
+			// 单独获取他的shopUserid
+			async productqueryShopIdByTableCode() {
+				let res = await this.api.productqueryShopIdByTableCode({
+					code: uni.cache.get('tableCode')
+				})
+				if (res.code == 0) {
+					uni.cache.set('shopUser', res.data)
+					this.handlemessage()
+					this.productqueryProduct() //list  数据
+				} else {
+					setTimeout(() => {
+						uni.pro.switchTab('index/index')
+					}, 1000)
+				}
+			},
+			getMessage(msg) { //wss  回显数据
+				// console.log(this.shopList.productInfo)
+				// console.log(msg.data)
+				// const sumValuesByKey = (arr, key) => {
+				// 	return arr.reduce((accumulator, current) => {
+				// 		const existing = accumulator.find(item => item[key] === current[key]);
+				// 		if (existing) {
+				// 			existing.number += current.number;
+				// 		} else {
+				// 			accumulator.push({
+				// 				...current
+				// 			});
+				// 		}
+				// 		return accumulator;
+				// 	}, []);
+				// };
+				// const result = sumValuesByKey(msg.data, 'productId');
+				// this.shopList.productInfo.forEach((item, index) => {
+				// 	if (item.id == result.categoryId) {
+				// 		item.products.forEach((item1,index1) => {
+
+				// 		})
+				// 	}
+				// });
+				if (msg == 1) { // 网络在连接
+					this.fixedtrue = true
+					return false
+				}
+				this.fixedtrue = false
+				if (msg.status != 'success') {
+					uni.showToast({
+						title: msg.msg,
+						icon: "none",
+					})
+					if (msg.msg == '桌码不存在') { //卓码不存在直接退出
+						this.socketTicket.Close()
+						uni.$off('message')
+						uni.navigateBack()
+						return false;
+					}
+				} else {
+					switch (msg.type) {
+						case 'sku': // sku  数量 查询这个商品的价格和数量
+							this.$set(this, 'amountcartNumber', msg.amount)
+							this.productqueryProduct() //list  数据
+							break;
+						case 'clearCart':
+							this.skuidname = []
+							this.showCart = false
+							setTimeout(() => {
+								uni.showToast({
+									title: msg.msg,
+									icon: "none",
+								})
+							}, 500)
+							this.cartLists = msg
+							this.productqueryProduct() //list  数据
+							break;
+						case 'order':
+							console.log('clearCart')
+							this.skuidname = []
+							this.showCart = false
+							this.cartLists = msg
+							this.productqueryProduct() //list  数据
+							break;
+						case 'createOrder': //去结算
+							let item = JSON.stringify(msg.data)
+							uni.redirectTo({
+								url: '/pages/order_detail/order_detail?tablelist=' + item
+							});
+							break;
+						case 'queryCart': //待提交
+							uni.redirectTo({
+								url: '/pages/order_detail/order_detail?tableId=' + JSON.stringify(msg.data) +
+									'&amount=' + msg.amount
+							});
+							break;
+						case 'addcart':
+							this.cartLists = msg
+							if (msg.data.length != 0) {
+								let nums = 0
+								msg.data.forEach((item, index, arr) => { //初始化skuidname的数据  选择第一个
+									if (item.skuId == this.skuidsearch) {
+										nums = item.number
+									}
+								})
+								this.$set(this, 'amountcartNumber', nums)
+							} else {
+								this.$set(this, 'amountcartNumber', 0)
+							}
+							this.productqueryProduct() //list  数据
+							break;
+						default:
+							this.cartLists = msg
+
+					}
+				}
+			},
+			handlemessage() {
+				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
+				this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, {
+					tableId: uni.cache.get('tableCode'),
+					shopId: uni.cache.get('shopUser'),
+					userId: uni.cache.get('userInfo').id,
+					"type": "connect",
+				})
+			},
+			// 数据处理
+			socketSendMsg(data) {
+				console.log(data, 1111)
+				if (this.socketTicket) {
+					console.log(222)
+					this.socketTicket.send(data);
+				} else {
+					console.log(333)
+				}
+			},
+			getQueryString(url, name) { //解码
+				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
+				var r = url.substr(1).match(reg)
+				if (r != null) {
+					return r[2]
+				}
+				return null;
+			},
+			async cartadd(item, index, index1, a, b) { //列表添加 a传参加减号   b是判断单规格多规格
+				console.log(item, index, index1, a, b)
+				if (b == '单规格') { //没有规格为空
+					this.skuidname = []
+				}
+				this.hodgepodge(item, 1, a) //获取skuid  /1添加购物车
+			},
+			async cartListadd(item, index, a) {
+				console.log(item, index, a)
+				try {
+					const data = { //定义socket数据传参
+						"skuId": item.skuId,
+						"num": a == '-' ? -1 : 1, //skuId
+						"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
+						"productId": item.productId, //商品id
+						"shopId": uni.cache.get('shopUser'),
+						"userId": uni.cache.get('userInfo').id
+					};
+					uni.$u.debounce(this.socketSendMsg(data), 500)
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
+			async productqueryProduct() { //list  数据
+				let res = await this.api.productqueryProduct({
+					code: uni.cache.get('tableCode'),
+					productGroupId: ''
+				})
+				if (res.code == 0) {
+					this.shopList = res.data
+					this.$nextTick(() => {
+						this.countTitleTopNum();
+					});
+				}
+			},
+			clickspecifications(item1, index, index1) {
+				this.skuidname = []
+				this.specifications = item1
+				this.specifications.indexa = index
+				this.specifications.indexb = index1
+				try {
+					if (item1.productSkuResult == null) {
+						// 但但单个规格弹框的处理
+						this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量
+					} else {
+						// 多规格数据处理
+						this.specifications.tagSnap = JSON.parse(item1.productSkuResult.tagSnap).map((item) => {
+							let res = {
+								id: item1.id, //商品id
+								name: item.name,
+								start: 0,
+								children: item.value.split(",")
+							}
+							return res
+						})
+						this.specifications.tagSnap.forEach((val, index, arr) => { //初始化skuidname的数据  选择第一个
+							this.skuidname.push(val.children[0])
+						})
+						this.hodgepodge(this.specifications.tagSnap[0], 2) //获取skuid /2查找价格和数量
+					}
+
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
+			async morloe(e, index, index1, item) {
+				this.specifications.tagSnap[index]['start'] = index1
+				this.skuidname.splice(index, 1, e) //替换skuidname的数据
+				this.hodgepodge(item, 2)
+			},
+			async hodgepodge(item, a, c) { //此接口去获取商品id ！！！赋值库存  数量  价格等
+				console.log(11111)
+
+				try {
+					let res = await this.api.productqueryProductSku({
+						shopId: uni.cache.get('shopUser'),
+						productId: item.id, //商品id
+						spec_tag: this.skuidname.join(",")
+					})
+					if (res.stockNumber == 0) {
+						uni.showToast({
+							title: '暂无库存',
+							icon: "none",
+						})
+					} else {
+						this.skuidsearch = res.data.id // 储存skuid   用于筛选数量
+						this.salePrice = res.data.salePrice // 价格
+						let data = null
+						if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
+							data = { //定义socket数据传参
+								"skuId": res.data.id,
+								"num": c == '-' ? -1 : 1, //数量
+								"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+								"productId": item.id, //商品id
+								"shopId": uni.cache.get('shopUser'),
+								"userId": uni.cache.get('userInfo').id
+							};
+						} else {
+							data = { //查询这个商品的价格
+								"skuId": res.data.id,
+								"num": '', //数量
+								"type": "sku", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+								"productId": item.id, //商品id
+								"shopId": uni.cache.get('shopUser'),
+								"userId": uni.cache.get('userInfo').id
+							};
+							this.showShopsku = true //打开弹框
+						}
+						uni.$u.debounce(this.socketSendMsg(data), 500)
+					}
+				} catch (e) {}
+			},
+			orderdetail() { // 直接生成订单
+				let data = {
+					"skuId": '',
+					"num": '', //数量
+					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+					"couponsId": '', //优惠券ID,
+					"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
+					"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
+					"productId": '', //商品id
+					"shopId": uni.cache.get('shopUser'),
+					"userId": uni.cache.get('userInfo').id,
+				}
+				uni.$u.debounce(this.socketSendMsg(data), 500)
+			},
+			async cartclear() { //清空购物车
+				try {
+					const data = { //定义socket数据传参
+						"skuId": '',
+						"num": '', //skuId
+						"type": "clearCart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
+						"productId": '', //商品id
+						"shopId": uni.cache.get('shopUser'),
+						"userId": uni.cache.get('userInfo').id
+					};
+					uni.$u.debounce(this.socketSendMsg(data), 500)
+				} catch (e) {
+					//TODO handle the exception
+				}
+
+			},
+			// 导航栏点击
+			navClickHandle(t) {
+				switch (t) {
+					case 1:
+						// 返回
+						this.socketTicket.Close()
+						uni.switchTab({
+							url: '/pages/index/index'
+						})
+						break;
+					case 2:
+						// 显示商家信息
+						this.showShopInfo = true;
+						break;
+					default:
+						break;
+				}
+			},
+			// 点击菜单商品滚动到指定为止
+			titleClickHandle(id) {
+				uni.createSelectorQuery()
+					.select('#wrapper')
+					.boundingClientRect((data) => {
+						//目标节点
+						uni.createSelectorQuery()
+							.select(`#title${id}`)
+							.boundingClientRect((res) => {
+								const scrollTop = res.top - data.top;
+								const offsetNum = this.menuInfo.top + this.menuInfo.height + this
+									.paddingBtmSize +
+									this.tabHeadHeight - 1;
+								//最外层盒子节点
+								uni.pageScrollTo({
+									scrollTop: scrollTop - offsetNum
+								});
+							})
+							.exec();
+					})
+					.exec();
+			},
+			// 计算滚动到那个标题
+			countScrollTitle: _.throttle(function(top) {
+				if (this.titleTopNums.length > 1) {
+					for (let i = 0; i <= this.titleTopNums.length - 1; i++) {
+						if (top >= this.titleTopNums[i] && top < this.titleTopNums[i + 1]) {
+							this.titleTopNumIndex = i;
+						}
+					}
+					if (top >= this.titleTopNums[this.titleTopNums.length - 1]) {
+						this.titleTopNumIndex = this.titleTopNums.length - 1;
+					}
+				}
+			}, 100),
+			// 统计每个标题到顶部的距离
+			countTitleTopNum() {
+				let topNums = [];
+				for (let i of this.shopList.productInfo) {
+					uni.createSelectorQuery()
+						.select(`#title${i.id}`)
+						.boundingClientRect((res) => {
+							topNums.push(res.top + this.menuInfo.top + this.menuInfo.height + this
+								.paddingBtmSize -
+								this.tabHeadHeight - this.tabHeadHeight / 2);
+						})
+						.exec();
+				}
+				this.titleTopNums = topNums;
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	$bg: #fafafa;
+	$tabLeft: 200upx;
+	$itemH: 100upx;
+	$cartH: 90upx;
+
+	.nav-wrap {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 97;
+
+		&.is-fixed {
+			background-color: #fff;
+		}
+
+		.content {
+			.left-btn {
+				display: flex;
+
+				.btn {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-right: $paddingSize;
+				}
+			}
+		}
+	}
+
+	.shop-cover {
+		position: relative;
+
+		&::after {
+			content: '';
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+			background-color: rgba(0, 0, 0, 0.3);
+		}
+
+		.img {
+			width: 100%;
+			height: 100%;
+			position: relative;
+			z-index: 1;
+		}
+	}
+
+	.list-container {
+		background-color: #fff;
+		border-radius: 20upx;
+		position: relative;
+		z-index: 96;
+		margin-top: -40upx;
+
+		.header-wrap {
+			$h: 120upx;
+			height: $h;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 $paddingSize;
+
+			.title {
+				font-weight: bold;
+
+				.t {
+					font-size: 42upx;
+				}
+			}
+
+			.cover {
+				width: $h;
+				height: $h;
+				margin-top: -40upx;
+				background: #999;
+				position: relative;
+
+				.img {
+					width: 100%;
+					height: 100%;
+					border-radius: 12upx;
+				}
+			}
+		}
+
+		.tab-header {
+			display: flex;
+			align-items: center;
+			background-color: $bg;
+			position: sticky;
+			z-index: 999;
+
+			.t {
+				font-size: 32upx;
+			}
+
+			.left {
+				width: $tabLeft;
+				display: flex;
+				padding-left: $paddingSize;
+
+				.t {
+					font-weight: bold;
+				}
+			}
+
+			.right {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 $paddingSize;
+
+				.d {
+					padding: 12upx 16upx;
+					background-color: #faf2b6;
+					border-radius: 12upx;
+				}
+			}
+		}
+
+		.tab-content {
+			display: flex;
+			position: relative;
+
+			.left-wrap {
+				width: $tabLeft;
+				background-color: $bg;
+				padding: 0 0 $paddingSize * 3 + $cartH 0;
+
+				.left {
+					width: $tabLeft;
+					position: sticky;
+
+					.item {
+						height: $itemH;
+						display: flex;
+						align-items: center;
+						padding: 0 $paddingSize;
+						justify-content: center;
+
+						&.active {
+							background-color: #fff;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+
+			.list-wrap {
+				flex: 1;
+				padding-left: $paddingSize;
+				padding-bottom: $paddingSize * 3 + $cartH;
+
+				.item-wrap {
+					.title {
+						height: $itemH;
+						display: flex;
+						align-items: center;
+						position: sticky;
+						z-index: 10;
+						background-color: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.shop-item {
+		display: flex;
+		padding-bottom: $paddingSize;
+
+		.langcover {
+			position: relative;
+		}
+
+		.langcover::after {
+			content: '加载中..';
+			position: absolute;
+			top: 0;
+			left: 0;
+			height: 100%;
+			width: 100%;
+			background-color: #e8e8e8;
+			color: #6b6b6b;
+			border-radius: 10rpx;
+			text-align: center;
+			line-height: 180rpx;
+			z-index: 1;
+		}
+
+		.info {
+			flex: 1;
+			padding-left: 20upx;
+			padding-right: $paddingSize;
+
+			.name {
+				font-size: 28upx;
+				font-weight: bold;
+			}
+
+			.select-sku-wrap {
+				.t {
+					color: #999;
+					font-size: 24upx;
+				}
+			}
+
+			.price-wrap {
+				padding-top: $paddingSize;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.price {
+					display: flex;
+					align-items: flex-end;
+
+					.i {
+						font-size: 20upx;
+						color: $numColor;
+						position: relative;
+						bottom: 4upx;
+						font-weight: bold;
+					}
+
+					.num {
+						font-size: 42upx;
+						color: $numColor;
+						position: relative;
+						top: 6upx;
+						padding: 0 4upx;
+					}
+				}
+
+				.sku-wrap {
+					padding: 6upx 16upx;
+					background-color: $color-priamry;
+					border-radius: 12upx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+
+					.t {
+						font-size: 24upx;
+						font-weight: bold;
+					}
+
+					.dot {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 20upx;
+						position: absolute;
+						padding: 2upx 12upx;
+						border-radius: 8upx;
+						background-color: $numColor;
+						color: #fff;
+						position: absolute;
+						top: -14upx;
+						right: -8upx;
+					}
+				}
+
+				.operation-wrap {
+					display: flex;
+					align-items: center;
+
+					.num {
+						font-size: 32upx;
+						padding: 0 16upx;
+					}
+
+					.btn {
+						padding: 6upx 10upx;
+						background-color: $color-priamry;
+						border-radius: 12upx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
+			}
+		}
+	}
+
+	.cart-wrap {
+		width: 100%;
+		padding: $paddingSize;
+		position: fixed;
+		bottom: $paddingSize;
+		left: 0;
+		z-index: 99;
+
+		.cart-content {
+			display: flex;
+			height: $cartH;
+			border-radius: $cartH;
+
+			.left {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				background-color: #111;
+				padding-left: 120upx;
+				position: relative;
+				border-radius: $cartH 0 0 $cartH;
+
+				.icon {
+					width: 80upx;
+					height: 120upx;
+					position: absolute;
+					left: $paddingSize;
+					bottom: 20upx;
+				}
+
+				.i,
+				.num {
+					color: #fff;
+				}
+
+				.i {
+					font-size: 20upx;
+					position: relative;
+					top: 4upx;
+				}
+
+				.num {
+					font-size: 42upx;
+				}
+			}
+
+			.btn {
+				width: 200upx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-weight: bold;
+				background: $linear-color-priamry;
+				border-radius: 0 $cartH $cartH 0;
+			}
+		}
+	}
+
+	.cart-list-wrap {
+		.cart-header {
+			display: flex;
+			justify-content: space-between;
+			background-color: #f4eddf;
+			padding: 20upx $paddingSize;
+			border-radius: 20upx 20upx 0 0;
+
+			.clear {
+				display: flex;
+				align-items: center;
+
+				.t {
+					font-size: 24upx;
+					color: #999;
+					margin-left: 4upx;
+				}
+			}
+		}
+
+		.scroll-view {
+			max-height: 50vh;
+		}
+
+		.list-wrap {
+			padding: $paddingSize 0 $paddingSize * 2 + $cartH $paddingSize;
+		}
+	}
+
+	.shop_sku {
+		position: relative;
+		width: 700rpx;
+		border-radius: 20rpx;
+		background: #fff;
+
+		.positionabsolute {
+			position: absolute;
+			top: 10rpx;
+			left: 10rpx;
+		}
+
+		.shop_skucimage {
+			width: 100%;
+			height: 440rpx;
+			border-radius: 20rpx 20rpx 0 0;
+		}
+
+		.shop_sku_name {
+			padding: 0 $paddingSize;
+			margin-top: 20rpx;
+			font-weight: bold;
+			font-size: 32upx;
+		}
+
+		.shop_sku_box {
+			padding: 0 $paddingSize;
+
+			.shop_sku_box_name {
+				margin-top: 20rpx;
+				font-weight: 500;
+				font-size: 28upx;
+				color: #999;
+			}
+
+			.flex-start {
+				.shop_sku_box_item {
+					margin-top: 16rpx;
+					padding: 8rpx 24rpx;
+					border-radius: 24rpx;
+					font-size: 24upx;
+					margin-left: 16rpx;
+					background: #fbe3e3;
+				}
+
+				.shop_sku_box_item:nth-child(1) {
+					margin-left: 0;
+				}
+
+				.shop_sku_box_item_noselected {
+					color: #000;
+				}
+
+				.shop_sku_box_item_selected {
+					border: 1rpx solid red;
+					color: red;
+				}
+			}
+
+		}
+
+		.shop_skuselect {
+			padding: 10rpx $paddingSize;
+			margin-top: 28rpx;
+			width: 100%;
+			background: #f7f7f7;
+			color: #ada7a7;
+			font-size: 24upx;
+
+			.shop_skuselectname {
+				color: #000;
+				font-size: 26upx;
+			}
+		}
+
+		.shop_bottom {
+			box-sizing: border-box;
+			padding: 10rpx $paddingSize;
+			margin: 28rpx 0;
+
+			.price {
+				display: flex;
+				align-items: flex-end;
+
+				.i {
+					font-size: 20upx;
+					color: $numColor;
+					position: relative;
+					bottom: 4upx;
+					font-weight: bold;
+				}
+
+				.num {
+					font-size: 42upx;
+					color: $numColor;
+					position: relative;
+					top: 6upx;
+					padding: 0 4upx;
+				}
+			}
+
+			.operation-wrap {
+				display: flex;
+				align-items: center;
+
+				.num {
+					font-size: 32upx;
+					padding: 0 16upx;
+				}
+
+				.btn {
+					padding: 16upx 20upx;
+					background-color: $color-priamry;
+					border-radius: 12upx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+			}
+		}
+	}
+
+
+	.shop-info-wrap {
+		.info-wrap {
+			padding: $paddingSize * 2 0;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			border-bottom: 1upx solid #f2f2f2;
+
+			.img {
+				width: 100upx;
+				height: 100upx;
+				border-radius: 12upx;
+			}
+
+			.t {
+				font-size: 32upx;
+				padding-top: 8upx;
+			}
+		}
+
+		.row {
+			padding: 0 $paddingSize $paddingSize;
+
+			.col {
+				padding-top: $paddingSize;
+
+				.t {
+					color: #999;
+				}
+			}
+		}
+
+		.line {
+			height: 12upx;
+			background-color: #f2f2f2;
+		}
+
+		.close {
+			padding: $paddingSize 0;
+			display: flex;
+			justify-content: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index c5c78ad..ece93bb 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -12,11 +12,11 @@
 				<view class="left-btn">
 					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
 						@click="navClickHandle(1)">
-						<u-icon name="arrow-left" :color="isFixed ? '#333' : '#fff'" size="38"></u-icon>
+						<u-icon name="arrow-left" :color="isFixed ? '#333' : '#fff'" size="28"></u-icon>
 					</view>
 					<view class="btn" :style="{ width: `${menuInfo.height}px`, height: `${menuInfo.height}px` }"
 						@click="navClickHandle(2)">
-						<u-icon name="kefu-ermai" :color="isFixed ? '#333' : '#fff'" size="38"></u-icon>
+						<u-icon name="kefu-ermai" :color="isFixed ? '#333' : '#fff'" size="28"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -89,12 +89,12 @@
 									<view class="operation-wrap" v-else>
 										<view class="btn" v-if="item1.cartNumber != '0'"
 											@click.stop="cartadd(item1,index,index1,'-',item1.productSkuResult == null ? '单规格':'')">
-											<u-icon :name="require('@/static/icon_sub.png')" size="34"></u-icon>
+											<u-icon :name="require('@/static/icon_sub.png')" size="36"></u-icon>
 										</view>
 										<text class="num">{{ item1.cartNumber }}</text>
 										<view class="btn"
 											@click.stop="cartadd(item1,index,index1,'+',item1.productSkuResult == null ? '单规格':'')">
-											<u-icon :name="require('@/static/icon_add.png')" size="34"></u-icon>
+											<u-icon :name="require('@/static/icon_add.png')" size="36"></u-icon>
 										</view>
 									</view>
 								</view>
@@ -171,7 +171,7 @@
 					<view class="col">
 						<text class="t">{{ shopList.storeInfo.businessTime }}</text>
 					</view>
-					<view class="col">
+					<view class="col" @click="makePhoneCall(shopList.storeInfo.phone)">
 						<text class="t">{{ shopList.storeInfo.phone }}</text>
 					</view>
 					<view class="col">
@@ -230,19 +230,23 @@
 				</view>
 			</view>
 		</u-popup>
-		<!-- <vastwu-barrage width="750rpx" height="1300rpx" ref="vBarrage"></vastwu-barrage> -->
+		<l-barrage ref="lBarrage" @end="onEnd" :minTop='8' :maxTop='20' :avatar='barrageavatar'></l-barrage>
 	</view>
 </template>
 
 <script>
 	import _ from 'lodash';
-	import navbar from '../../uni_modules/uview-ui/libs/config/props/navbar';
-	import webSocketUtils from '@/common/js/websocket.js'
-	// import vastwuBarrage from '@/components/vastwu-barrage/vastwu-barrage.vue'
+	import webSocketUtils from '@/common/js/websocket.js';
+	import orderdetail from '@/pages/order_detail/index';
+	import lBarrage from '@/components/l-barrage/l-barrage.vue'
 	export default {
-		// components:{vastwuBarrage},
+		components: {
+			orderdetail,
+			lBarrage
+		},
 		data() {
 			return {
+				userInfo: uni.cache.get('userInfo'), //个人信息
 				// #ifndef MP-WEIXIN
 				menuInfo: uni.getSystemInfo(),
 				// #endif
@@ -262,12 +266,17 @@
 				tableCode: '', //code，
 				specifications: {},
 				skuidname: [],
-				cartLists: {},
+				cartLists: {}, //购物车
+				orderdetailcartLists: {}, //提交订单
 				socketTicket: null,
 				amountcartNumber: 0,
 				skuidsearch: '', //
 				salePrice: '', //钱数
-				fixedtrue: true
+				fixedtrue: true,
+				datasocket: {}, //储存传参数据
+				radiovalue: '1', //选择支付方式
+				amountVIP: null, //余额
+				barrageavatar: '' //弹幕头像
 			};
 		},
 		onPageScroll(e) {
@@ -292,22 +301,27 @@
 				uni.cache.set('tableCode', this.tableCode)
 			}
 			uni.cache.set('types', 'types');
-			uni.$on('message', this.getMessage)
 			this.$nextTick(() => {
 				this.countTitleTopNum(); //导航栏
 			});
-			// this.$refs.vBarrage.init([123])
 		},
 		onUnload() {
 			this.socketTicket.Close()
 			uni.$off('message')
 		},
+		onHide() {
+			this.socketTicket.Close()
+			uni.$off('message')
+			this.fixedtrue = true
+		},
 		onShow() {
-			setTimeout(() => {
-				this.productqueryShopIdByTableCode() //获取shop User id
-			}, 500)
+			uni.$on('message', this.getMessage)
+			this.productqueryShopIdByTableCode() //获取shop User id
 		},
 		methods: {
+			onEnd() { //回调弹幕
+				console.log('一波结束')
+			},
 			// 单独获取他的shopUserid
 			async productqueryShopIdByTableCode() {
 				let res = await this.api.productqueryShopIdByTableCode({
@@ -315,7 +329,7 @@
 				})
 				if (res.code == 0) {
 					uni.cache.set('shopUser', res.data)
-					this.handlemessage()
+					this.handlemessage() //监听websocket返回
 					this.productqueryProduct() //list  数据
 				} else {
 					setTimeout(() => {
@@ -324,101 +338,87 @@
 				}
 			},
 			getMessage(msg) { //wss  回显数据
-				// console.log(this.shopList.productInfo)
-				// console.log(msg.data)
-				// const sumValuesByKey = (arr, key) => {
-				// 	return arr.reduce((accumulator, current) => {
-				// 		const existing = accumulator.find(item => item[key] === current[key]);
-				// 		if (existing) {
-				// 			existing.number += current.number;
-				// 		} else {
-				// 			accumulator.push({
-				// 				...current
-				// 			});
-				// 		}
-				// 		return accumulator;
-				// 	}, []);
-				// };
-				// const result = sumValuesByKey(msg.data, 'productId');
-				// this.shopList.productInfo.forEach((item, index) => {
-				// 	if (item.id == result.categoryId) {
-				// 		item.products.forEach((item1,index1) => {
-
-				// 		})
-				// 	}
-				// });
 				if (msg == 1) { // 网络在连接
 					this.fixedtrue = true
 					return false
 				}
 				this.fixedtrue = false
-				if (msg.status != 'success') {
-					uni.showToast({
-						title: msg.msg,
-						icon: "none",
-					})
-					if (msg.msg == '桌码不存在') { //卓码不存在直接退出
-						this.socketTicket.Close()
-						uni.$off('message')
-						uni.navigateBack()
-						return false;
-					}
-				} else {
-					switch (msg.type) {
-						case 'sku': // sku  数量 查询这个商品的价格和数量
-							this.$set(this, 'amountcartNumber', msg.amount)
-							this.productqueryProduct() //list  数据
-							break;
-						case 'clearCart':
-							this.skuidname = []
-							this.showCart = false
-							setTimeout(() => {
-								uni.showToast({
-									title: msg.msg,
-									icon: "none",
-								})
-							}, 500)
-							this.cartLists = msg
-							this.productqueryProduct() //list  数据
-							break;
-						case 'order':
-							console.log('clearCart')
-							this.skuidname = []
-							this.showCart = false
-							this.cartLists = msg
-							this.productqueryProduct() //list  数据
-							break;
-						case 'createOrder': //去结算
-							let item = JSON.stringify(msg.data)
-							uni.redirectTo({
-								url: '/pages/order_detail/order_detail?tablelist=' + item
-							});
-							break;
-						case 'queryCart': //待提交
-							uni.redirectTo({
-								url: '/pages/order_detail/order_detail?tableId=' + JSON.stringify(msg.data) +
-									'&amount=' + msg.amount
-							});
-							break;
-						case 'addcart':
-							this.cartLists = msg
-							if (msg.data.length != 0) {
-								let nums = 0
-								msg.data.forEach((item, index, arr) => { //初始化skuidname的数据  选择第一个
-									if (item.skuId == this.skuidsearch) {
-										nums = item.number
+				if (msg.type == 'heartbeat') { //后台心跳  处理返回  不然控制台一直报错
+					return false
+				}
+				try {
+					if (msg.status != 'success') {
+						uni.showToast({
+							title: msg.msg,
+							icon: "none",
+						})
+						if (msg.msg == '桌码不存在') { //卓码不存在直接退出
+							this.socketTicket.Close()
+							uni.$off('message')
+							uni.navigateBack()
+							return false;
+						}
+					} else {
+						switch (msg.type) {
+							case 'sku': // sku  数量 查询这个商品的价格和数量
+								this.$set(this, 'amountcartNumber', msg.amount)
+								this.productqueryProduct() //list  数据
+								break;
+							case 'clearCart':
+								this.cartLists = msg
+								this.productqueryProduct() //list  数据
+								this.skuidname = []
+								this.showCart = false
+								setTimeout(() => {
+									uni.showToast({
+										title: msg.msg,
+										icon: "none",
+									})
+								}, 500)
+								break;
+							case 'order':
+								this.skuidname = []
+								this.showCart = false
+								this.cartLists = msg
+								this.productqueryProduct() //list  数据
+								break;
+							case 'addCart': //初始化add
+								this.cartLists = msg
+								this.productqueryProduct() //list  数据
+								break;
+							case 'addcart':
+								this.cartLists = msg
+								console.log(msg, 1111)
+								this.productqueryProduct() //list  数据
+								try {
+									if (msg.data.length != 0) {
+										let nums = 0
+										msg.data.forEach((item, index, arr) => { //初始化skuidname的数据  选择第一个
+											if (item.skuId == this.skuidsearch) {
+												nums = item.number
+											}
+										})
+										this.$set(this, 'amountcartNumber', nums)
+									} else {
+										this.$set(this, 'amountcartNumber', 0)
 									}
-								})
-								this.$set(this, 'amountcartNumber', nums)
-							} else {
-								this.$set(this, 'amountcartNumber', 0)
-							}
-							this.productqueryProduct() //list  数据
-							break;
-						default:
-							this.cartLists = msg
-
+								} catch (e) {
+									//TODO handle the exception
+								}
+								try {
+									this.barrageavatar = msg.reqData.headImg
+									/*插入一条弹幕*/
+									this.$refs.lBarrage.add(
+										`${msg.reqData.nickName?msg.reqData.nickName:'微信用户'}${msg.reqData.num==-1?'取消了':'添加了'}${msg.reqData.name}(${msg.reqData.num})`
+									);
+								} catch (e) {
+									//TODO handle the exception
+								}
+								break;
+						}
 					}
+				} catch (e) {
+					//TODO handle the exception
 				}
 			},
 			handlemessage() {
@@ -432,12 +432,8 @@
 			},
 			// 数据处理
 			socketSendMsg(data) {
-				console.log(data, 1111)
 				if (this.socketTicket) {
-					console.log(222)
 					this.socketTicket.send(data);
-				} else {
-					console.log(333)
 				}
 			},
 			getQueryString(url, name) { //解码
@@ -449,16 +445,15 @@
 				return null;
 			},
 			async cartadd(item, index, index1, a, b) { //列表添加 a传参加减号   b是判断单规格多规格
-				console.log(item, index, index1, a, b)
 				if (b == '单规格') { //没有规格为空
 					this.skuidname = []
 				}
 				this.hodgepodge(item, 1, a) //获取skuid  /1添加购物车
 			},
-			async cartListadd(item, index, a) {
-				console.log(item, index, a)
+			async cartListadd(item, index, a) { //购物车加减
 				try {
 					const data = { //定义socket数据传参
+						"name": item.name,
 						"skuId": item.skuId,
 						"num": a == '-' ? -1 : 1, //skuId
 						"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:清空购物车”，
@@ -466,6 +461,7 @@
 						"shopId": uni.cache.get('shopUser'),
 						"userId": uni.cache.get('userInfo').id
 					};
+					this.datasocket = data
 					uni.$u.debounce(this.socketSendMsg(data), 500)
 				} catch (e) {
 					//TODO handle the exception
@@ -519,8 +515,6 @@
 				this.hodgepodge(item, 2)
 			},
 			async hodgepodge(item, a, c) { //此接口去获取商品id ！！！赋值库存  数量  价格等
-				console.log(11111)
-
 				try {
 					let res = await this.api.productqueryProductSku({
 						shopId: uni.cache.get('shopUser'),
@@ -538,6 +532,9 @@
 						let data = null
 						if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
 							data = { //定义socket数据传参
+								"nickName": this.userInfo.nickName,
+								"barrageavatar": this.userInfo.headImg,
+								'name': item.name,
 								"skuId": res.data.id,
 								"num": c == '-' ? -1 : 1, //数量
 								"type": "addcart", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
@@ -547,6 +544,7 @@
 							};
 						} else {
 							data = { //查询这个商品的价格
+								"name": item.name,
 								"skuId": res.data.id,
 								"num": '', //数量
 								"type": "sku", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
@@ -556,23 +554,35 @@
 							};
 							this.showShopsku = true //打开弹框
 						}
+						this.datasocket = data
 						uni.$u.debounce(this.socketSendMsg(data), 500)
 					}
 				} catch (e) {}
 			},
 			orderdetail() { // 直接生成订单
-				let data = {
-					"skuId": '',
-					"num": '', //数量
-					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-					"couponsId": '', //优惠券ID,
-					"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
-					"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
-					"productId": '', //商品id
-					"shopId": uni.cache.get('shopUser'),
-					"userId": uni.cache.get('userInfo').id,
+				if (this.cartLists.data.length == 0) {
+					uni.showToast({
+						title: '请先添加商品',
+						icon: 'none'
+					})
+					return false
 				}
-				uni.$u.debounce(this.socketSendMsg(data), 500)
+				uni.navigateTo({
+					url: '/pages/order_detail/indexs?tableId=' + JSON.stringify(this.cartLists)
+				});
+				// let data = {
+				// 	"skuId": '',
+				// 	"num": '', //数量
+				// 	"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+				// 	"couponsId": '', //优惠券ID,
+				// 	"isYhq": 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
+				// 	"isBuyYhq": 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
+				// 	"productId": '', //商品id
+				// 	"shopId": uni.cache.get('shopUser'),
+				// 	"userId": uni.cache.get('userInfo').id,
+				// }
+				// this.datasocket = data
+				// uni.$u.debounce(this.socketSendMsg(data), 500)
 			},
 			async cartclear() { //清空购物车
 				try {
@@ -584,11 +594,11 @@
 						"shopId": uni.cache.get('shopUser'),
 						"userId": uni.cache.get('userInfo').id
 					};
+					this.datasocket = data
 					uni.$u.debounce(this.socketSendMsg(data), 500)
 				} catch (e) {
 					//TODO handle the exception
 				}
-
 			},
 			// 导航栏点击
 			navClickHandle(t) {
@@ -608,6 +618,12 @@
 						break;
 				}
 			},
+			//打电话
+			makePhoneCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone //仅为示例
+				});
+			},
 			// 点击菜单商品滚动到指定为止
 			titleClickHandle(id) {
 				uni.createSelectorQuery()
@@ -657,7 +673,7 @@
 						.exec();
 				}
 				this.titleTopNums = topNums;
-			}
+			},
 		}
 	};
 </script>
@@ -687,7 +703,7 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					margin-right: $paddingSize;
+					// margin-right: $paddingSize;
 				}
 			}
 		}
@@ -943,12 +959,23 @@
 					}
 
 					.btn {
+						position: relative;
 						padding: 6upx 10upx;
 						background-color: $color-priamry;
 						border-radius: 12upx;
 						display: flex;
 						align-items: center;
 						justify-content: center;
+
+						&::after {
+							content: "";
+							position: absolute;
+							left: -10px;
+							top: -10px;
+							right: -10px;
+							bottom: -10px;
+
+						}
 					}
 				}
 			}
@@ -1153,18 +1180,111 @@
 				}
 
 				.btn {
+					position: relative;
 					padding: 16upx 20upx;
 					background-color: $color-priamry;
 					border-radius: 12upx;
 					display: flex;
 					align-items: center;
 					justify-content: center;
+
+					&::after {
+						content: "";
+						position: absolute;
+						left: -10px;
+						top: -10px;
+						right: -10px;
+						bottom: -10px;
+
+					}
 				}
 			}
 		}
 	}
 
 
+	.classorderdetailshow {
+		position: relative;
+
+		.orderdetailuicon {
+			position: absolute;
+			top: 10rpx;
+			left: 10rpx;
+		}
+
+		.payType {
+			padding: 32rpx 34rpx;
+			margin-top: 48rpx;
+			background-color: #fff;
+
+			>view:first-child {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+			}
+
+			>view:last-child {
+				margin-top: 32rpx;
+			}
+
+			.dfs {
+				display: flex;
+				align-items: center;
+			}
+
+		}
+
+		.fixedview {
+			position: relative;
+			width: 100%;
+
+			.flex-between {
+				width: 100%;
+				padding: 24rpx 28rpx;
+				background: #FFFFFF;
+				flex-wrap: nowrap;
+
+				.fixedview_one {
+					.fixedview_oneone {
+						font-size: 28rpx;
+						font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
+						font-weight: normal;
+						color: #333333;
+					}
+
+					.fixedview_onetow {
+						font-size: 44rpx;
+						font-family: SourceHanSansCN-Bold-, SourceHanSansCN-Bold;
+						font-weight: normal;
+						color: #F45C4C;
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					.fixedview_onethere {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #999999;
+					}
+				}
+
+				.fixedview_tow {
+					background: red;
+					border-radius: 34rpx;
+					padding: 10rpx 44rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC-Bold, PingFang SC;
+					font-weight: bold;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+
 	.shop-info-wrap {
 		.info-wrap {
 			padding: $paddingSize * 2 0;
diff --git a/pages/pay_code/pay_code.vue b/pages/pay_code/pay_code.vue
index 83056cb..1a65a46 100644
--- a/pages/pay_code/pay_code.vue
+++ b/pages/pay_code/pay_code.vue
@@ -6,7 +6,7 @@
 		<view class="code-wrap">
 			<view class="num-wrap">
 				<text class="t">账户余额：</text>
-				<text class="num">{{shopInfo.amount}}</text>
+				<text class="num">{{shopInfo.amount  || '--'}}</text>
 			</view>
 			<view class="line-code">
 				<tki-barcode ref="tkiBarcode" show :opations="tkiOptions"></tki-barcode>
@@ -15,7 +15,7 @@
 				<uqrcode ref="uqrcode" canvas-id="qrcode" :value="createcardNo"></uqrcode>
 			</view>
 			<view class="name">
-				<text>使用门店：{{shopInfo.shopName}}</text>
+				<text>使用门店：{{shopInfo.shopName || '--'}}</text>
 			</view>
 			<view class="line"></view>
 		</view>
diff --git a/pages/user/information.vue b/pages/user/information.vue
index 7eb8eae..7f03b0a 100644
--- a/pages/user/information.vue
+++ b/pages/user/information.vue
@@ -10,7 +10,8 @@
 				</button> -->
 				<!-- <image class="onecontentboximage" :src="userHeadImg" mode="" @click="uploadImg"></image> -->
 				<button type="default" class="btn" open-type="chooseAvatar" @chooseavatar="uploadImg">
-					<view class="" :style="'background-image:url('+userHeadImg+');'" style="width: 180rxp;height: 180rpx; background-position: center;"></view>
+					<view class="" :style="'background-image:url('+userHeadImg+');'"
+						style="width: 180rxp;height: 180rpx; background-position: center;"></view>
 				</button>
 
 
@@ -18,7 +19,9 @@
 					<view class="onecontentboxitemtext">
 						昵称
 					</view>
-					<input class="onecontentboxiteminput" v-model="userName" type="nickname"  placeholder="请输入昵称">
+					<input class="onecontentboxiteminput" v-model="nickName" type="nickname"
+						@blur="bindblur" placeholder="请输入昵称" @input="bindinput" />
+
 				</view>
 				<view class="onecontentboxitem flex-between" style="border-top: 1rpx dotted  #333333;">
 					<view class="onecontentboxitemtext">
@@ -42,11 +45,7 @@
 		components: {
 			navseat
 		},
-		onLoad() {
-			this.userInfo = uni.cache.get('userInfo')
-			this.userName = this.userInfo.nickName
-			this.userHeadImg = this.userInfo.headImg
-		},
+
 		data() {
 			return {
 				titlename: '完善信息',
@@ -62,9 +61,14 @@
 				},
 				userInfo: uni.cache.get('userInfo'),
 				userHeadImg: "",
-				userName: ''
+				nickName: ''
 			};
 		},
+		onLoad() {
+			this.userInfo = uni.cache.get('userInfo')
+			this.nickName = this.userInfo.nickName
+			this.userHeadImg = this.userInfo.headImg
+		},
 		onPageScroll(e) {
 			if (e.scrollTop <= 44) { //搜索导航栏
 				this.opacitys = false
@@ -73,6 +77,14 @@
 			}
 		},
 		methods: {
+			bindblur(e) {
+				console.log(e,11)
+				this.nickName = e.detail.value; // 获取微信昵称
+			},
+			bindinput(e) {
+				console.log(e,22)
+				this.nickName = e.detail.value; // 获取微信昵称
+			},
 			// uploadImg() {
 			// 	let _this = this
 			// 	uni.chooseImage({
@@ -111,32 +123,32 @@
 				console.log(e)
 				console.log(e.detail)
 				// this.userHeadImg = avatarUrl
-							uni.uploadFile({
-								url: 'https://wxcashiertest.sxczgkj.cn/cashierService/common/upload',
-								// url: uni.conf.baseUrl + '/common/upload',
-								
-								filePath: avatarUrl,
-								header: {
-									environment: 'app',
-									type: 'android',
-									version: '1.7.3',
-								},
-								name: "file",
-								formData: {
-									file:avatarUrl,
-								},
-								success: (uploadFileRes) => {
-									let {
-										data
-									} = JSON.parse(uploadFileRes.data)
-									this.userHeadImg = data
-								},
-							});
+				uni.uploadFile({
+					url: 'https://wxcashiertest.sxczgkj.cn/cashierService/common/upload',
+					// url: uni.conf.baseUrl + '/common/upload',
+
+					filePath: avatarUrl,
+					header: {
+						environment: 'app',
+						type: 'android',
+						version: '1.7.3',
+					},
+					name: "file",
+					formData: {
+						file: avatarUrl,
+					},
+					success: (uploadFileRes) => {
+						let {
+							data
+						} = JSON.parse(uploadFileRes.data)
+						this.userHeadImg = data
+					},
+				});
 			},
 			async sumbit() {
 				let res = await this.api.upUserInfo({
 					headImg: this.userHeadImg,
-					nickName: this.userName
+					nickName: this.nickName
 				})
 				if (res.code == 0) {
 					uni.navigateBack()
@@ -217,12 +229,14 @@
 			}
 		}
 	}
-	.btn{
+
+	.btn {
 		width: 180rpx;
 		height: 180rpx;
 		border-radius: 100%;
 		padding: 0;
-		>view{
+
+		>view {
 			border-radius: 100%;
 		}
 	}
diff --git a/pages/user/user.vue b/pages/user/user.vue
index c8cb92b..7637bc2 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -23,7 +23,7 @@
 			<!-- #endif -->
 			<view class="boxtop_top flex-between">
 				<view class="boxtop_topleft">
-					<view class="flex-start" v-if="userInfo.nickName" @click="clickinformation">
+					<view class="flex-start" v-if="userInfo" @click="clickinformation">
 						<image style="width: 108rpx; height: 108rpx; border-radius: 50%;" v-if="userInfo.headImg"
 							:src="userInfo.headImg" mode="aspectFill">
 						</image>