From 4f47a26e6cd0323fd8d58dc3a87510d341d58e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 2 Jul 2021 17:47:35 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=BB=9A=E5=8A=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                | 9 ++++++---
 pages/order/index.vue     | 3 ++-
 pages/shopOrder/index.vue | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages.json b/pages.json
index 95bbaee..4a25ff8 100644
--- a/pages.json
+++ b/pages.json
@@ -7,21 +7,24 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
 			"path": "pages/order/index",
 			"style": {
 				"navigationBarTitleText": "我的订单",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
 			"path": "pages/shopOrder/index",
 			"style": {
 				"navigationBarTitleText": "商户订单",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
diff --git a/pages/order/index.vue b/pages/order/index.vue
index eea3276..6fb512a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -248,7 +248,7 @@
 	.title {
 		font-size: 28rpx;
 		color: $u-content-color;
-		height: 98rpx;
+		height: 80rpx;
 	}
 
 	// tab
@@ -261,6 +261,7 @@
 	// 商品列表
 	.com {
 		width: 100%;
+		height: 100%;
 		overflow: hidden;
 
 		.list {
diff --git a/pages/shopOrder/index.vue b/pages/shopOrder/index.vue
index 4e1a3b0..2b1031c 100644
--- a/pages/shopOrder/index.vue
+++ b/pages/shopOrder/index.vue
@@ -206,6 +206,7 @@
 	// 商品列表
 	.com {
 		width: 100%;
+		height: 100%;
 		overflow: hidden;
 
 		.list {