From cd4c1420cdab28425ba5980e16003017568a448c Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 21 Dec 2019 14:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=89=E6=8B=A9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9tabindex=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/order-list.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/view/order-list.vue b/src/view/order-list.vue
index 0d6d37b..f38d752 100644
--- a/src/view/order-list.vue
+++ b/src/view/order-list.vue
@@ -20,7 +20,7 @@ import orderApi from "../models/order-model.js";
 export default {
     data() {
         return {
-            active: "",
+            active: this.$route.query.active ? parseInt(this.$route.query.active) : '',
             list: []
         };
     },
@@ -49,10 +49,10 @@ export default {
                             this.wechat(this.list[0].merchantNo);
                         }
                     } else if (res.code == 666) {
-                        this.$vux.toast.text("您还没登录，请先登录!", "middle");
-                        setTimeout(function() {
-                            window.location.href = "/mall/web/user/login";
-                        }, 2000);
+                        // this.$vux.toast.text("您还没登录，请先登录!", "middle");
+                        // setTimeout(function() {
+                        //     window.location.href = "/mall/web/user/login";
+                        // }, 2000);
                     } else {
                         if (
                             res.msg == "" ||
@@ -83,8 +83,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.order-list-whole {
-}
 .state-bar {
     width: 100%;
     height: 0.8rem;