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 1/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E4=BF=AE=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 {
};
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 0e7ec97..34942d1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -69,7 +69,7 @@ let router = new Router({
},
{
path: "/",
- redirect: "/home/:uniqueId"
+ redirect: "/home"
},
{
path: "/order-check",
From 99121425b07a3c28e778cc6d7d6e4c49596450e4 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 8 Jan 2020 17:23:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/nav-bottom.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/nav-bottom.vue b/src/components/nav-bottom.vue
index 7b90870..def23f3 100644
--- a/src/components/nav-bottom.vue
+++ b/src/components/nav-bottom.vue
@@ -24,8 +24,8 @@
