Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

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;

pages/order/index.vue

@@ -42,7 +42,8 @@
 				}
 				],
 				tabIndex: 0, // 当前tab的下标
-				assetsType: '' //账户类型
+				assetsType: '', //账户类型
+				orderType: []
 			}
 		},
 		onLoad(e) {
@@ -57,8 +58,10 @@
 		methods: {
 			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);
+					console.log(res)
+				}).catch(err => {
+					
+				});
 			},
 			// 轮播菜单
 			swiperChange(e) {