From 504bb75803be7e0651b8f81758ba5b0631e06748 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 23 Jun 2021 09:38:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 198f9de..6af1d63 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -42,7 +42,8 @@
 				}
 				],
 				tabIndex: 0, // 当前tab的下标
-				assetsType: '' //账户类型
+				assetsType: '', //账户类型
+				orderType: []
 			}
 		},
 		onLoad(e) {
@@ -58,7 +59,9 @@
 			getUserOrder() {
 				this.$http(this.API.API_USERORDER, {state: this.tabs[this.tabIndex].type,page: 1,per_page: 20}).then(res => {
 					console.log(res);
-				}).catch(err => err);
+				}).catch(err => {
+					console.log(err)
+				});
 			},
 			// 轮播菜单
 			swiperChange(e) {

From 6fcb9124786a95cce80cd9021bf073197e71fa13 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 23 Jun 2021 09:40:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=B7=E6=B1=82api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js | 2 +-
 pages/order/index.vue      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 649688d..16cbeb6 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -22,7 +22,7 @@ const install = (Vue, vm) => {
 	// 响应拦截
 	Vue.prototype.$u.http.interceptor.response = res => {
 		if(res.code == 0) {
-			return res.result;
+			return res;
 		} else if(res.code == 201) {
 			console.log("其他状态：", res.code)
 			return false;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 6af1d63..2663f38 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -58,9 +58,9 @@
 		methods: {
 			getUserOrder() {
 				this.$http(this.API.API_USERORDER, {state: this.tabs[this.tabIndex].type,page: 1,per_page: 20}).then(res => {
-					console.log(res);
+					console.log(res)
 				}).catch(err => {
-					console.log(err)
+					
 				});
 			},
 			// 轮播菜单