diff --git a/components/navseat.vue b/components/navseat.vue
index 2bcc098..d218c4b 100644
--- a/components/navseat.vue
+++ b/components/navseat.vue
@@ -58,22 +58,26 @@
 				type: Boolean,
 				default: false
 			},
-			titleshow: {//标题是否显示
+			titleshow: { //标题是否显示
 				type: Boolean,
 				default: false
 			},
-			heightshow: {//是否要占位高度
+			heightshow: { //是否要占位高度
 				type: Boolean,
 				default: false
 			},
-			iconshow: {//返回键是否显示
+			iconshow: { //返回键是否显示
 				type: Boolean,
 				default: true
 			},
-			iconcolor:{//返回键颜色
+			iconcolor: { //返回键颜色
 				type: String,
 				default: '#000'
 			},
+			navigateBacknavtitle: {
+				type: Boolean,
+				default: false
+			}
 		},
 		computed: {
 			HeighT() { //手机类型的尺寸
@@ -95,7 +99,11 @@
 				})
 			},
 			clicknavigateBack() {
-				uni.navigateBack()
+				if (this.navigateBacknavtitle) {
+					this.$emit('navigateBacknav')
+				} else {
+					uni.navigateBack()
+				}
 			}
 		}
 
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 9df05f2..240b9d1 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -8,9 +8,11 @@
 		</view>
 		<!-- 顶部面板 -->
 		<view class="top--panel">
-			<navseat :opacity='opacity' :titleshow='true'></navseat>
+			<navseat :opacity='opacity' :titleshow='true' @navigateBacknav='navigateBacknav' :navigateBacknavtitle='true'></navseat>
 			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
-			<image class="panelimgbackground" :src="shopInfo.storeInfo.coverImg||'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'" mode="aspectFill">
+			<image class="panelimgbackground"
+				:src="shopInfo.storeInfo.coverImg||'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'"
+				mode="aspectFill">
 			</image>
 			<view class="panelone">
 				{{ shopInfo.storeInfo.shopName }}
@@ -393,6 +395,10 @@
 			this.fixedtrue = true
 		},
 		onShow() {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+			});
 			console.log(!uni.cache.get('token'))
 			if (!uni.cache.get('token')) {
 				uni.login({
@@ -427,6 +433,9 @@
 			}
 		},
 		methods: {
+			navigateBacknav() {
+				uni.pro.switchTab('index/index')
+			},
 			getQueryString(url, name) { //解码
 				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
 				var r = url.substr(1).match(reg)
@@ -837,6 +846,7 @@
 				new Promise((resolve, reject) => {
 					let view = uni.createSelectorQuery().selectAll('.main-item');
 					view.boundingClientRect(async data => {
+						console.log(data, 840)
 						resolve(data);
 					}).exec();
 					this.$u.getRect('.scroll-panel').then(res => {
@@ -955,6 +965,7 @@
 				font-size: 24rpx;
 				color: #999999;
 				padding: 0 20rpx;
+
 				.paneltheretext {
 					font-family: Source Han Sans CN, Source Han Sans CN;
 					font-weight: 400;
@@ -983,6 +994,7 @@
 			.panelfive {
 				width: 100%;
 				padding: 0 20rpx;
+
 				.panelfive_list {
 					display: flex;
 				}