修复我的订单跳转bug

pages/order/index.vue

@@ -284,6 +284,13 @@ export default {
 	},
 	computed: mapGetters(['isLogin']),
 	onShow () {
+    let allPages = getCurrentPages(); //获取当前页面栈的实例；
+    console.log("allPages->", allPages);
+    let lastPages = allPages.length - 1; // 获得倒数第二个元素的索引；
+    console.log("lastPages->", lastPages);
+    let option = allPages[lastPages].options; // 获得上个页面传递的参数；
+    console.log("option->", option);
+
 		console.log("onShow事件,全局变量1--------", getApp().globalData.switchId, this.$route)
 		let ContentIndex = getApp().globalData.switchId//获取到传参
 		if(ContentIndex == '待付款') {
@@ -295,7 +302,11 @@ export default {
 		} else if (ContentIndex == '已完成') {
 			this.current = 3;
 			this.orderStatus = 4;
-		}
+		} else if (ContentIndex == '全部') {
+      this.current = 0;
+      this.orderStatus = 0;
+    }
+
 
 		if (this.isLogin) {
 			this.page = 1;
@@ -526,7 +537,6 @@ export default {
 		 * 获取订单列表
 		 */
 		getOrderList: function () {
-			console.log("wojinlail");
 			let that = this;
 			if (that.loadend) return;
 			if (that.loading) return;

pages/user/index.vue

@@ -582,10 +582,26 @@ export default {
 
 
 		goOrderIndex(){
-			uni.switchTab({
-				url:'/pages/order/index'
-			})
-
+			// uni.switchTab({
+			// 	url:'/pages/order/index'
+			// })
+      let item = {
+        img: 'http://www.gzzzyd.com/groupon/order/待付款@2x.png',
+        title: '全部',
+        url: '/pages/order/index?status=0'
+      };
+      var pages = getCurrentPages();
+      var page = (pages[pages.length - 1]).$page.fullPath;
+      if (item.url == page) return
+      getApp().globalData.switchId = item.title
+      uni.switchTab({
+        url: item.url,
+        fail (err) {
+          uni.redirectTo({
+            url: item.url
+          })
+        }
+      })
 		},
 
 		goMyMessage(){