From 0ec73c14ec1cd653cb58ed8e7223c0001882f45b Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 24 Jun 2021 16:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/me-tabs/me-tabs.vue |  4 +++-
 pages/order/index.vue          | 31 +++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/components/me-tabs/me-tabs.vue b/components/me-tabs/me-tabs.vue
index 527e2b0..14c344e 100644
--- a/components/me-tabs/me-tabs.vue
+++ b/components/me-tabs/me-tabs.vue
@@ -54,7 +54,7 @@
 				return uni.upx2px(this.height)
 			},
 			tabHeightPx1() {
-				return uni.upx2px(54)
+				return uni.upx2px(60)
 			},
 			tabHeightVal() {
 				return this.tabHeightPx + 'px'
@@ -176,6 +176,8 @@
 					background-color: white;
 					border-radius: 10px;
 					margin: 2px 0;
+					height: 27px!important;
+					line-height: 27px!important;
 				}
 			}
 		}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index e6ef8cb..d69d1d6 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -148,20 +148,23 @@
 				}).then(res => {
 					if (res.code == 0) {
 						console.log(res)
-
-						let isPage = res.data.has_more_page;
-						tab_item.isPage = isPage;
-						if (isPage) {
-							tab_item.loadingClass = true;
-							tab_item.loadingText = '正在加载中';
-						} else {
-							tab_item.loadingClass = false;
-							tab_item.loadingText = '没有更多数据啦~';
-						}
-						if (tab_item.page == 1) {
-							tab_item.list = res.data.items;
-						} else {
-							tab_item.list.push(...res.data.items);
+						if( Object.keys(res.metal_data).length != 0 ) {
+							this.$routerGo('/pages/login/index?type=userinfo')
+						}else {
+							let isPage = res.data.has_more_page;
+							tab_item.isPage = isPage;
+							if (isPage) {
+								tab_item.loadingClass = true;
+								tab_item.loadingText = '正在加载中';
+							} else {
+								tab_item.loadingClass = false;
+								tab_item.loadingText = '没有更多数据啦~';
+							}
+							if (tab_item.page == 1) {
+								tab_item.list = res.data.items;
+							} else {
+								tab_item.list.push(...res.data.items);
+							}
 						}
 					}