From ff4a7679175a55b0567aec6a592d07c54ea40ecb Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Tue, 17 May 2022 11:34:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AA=E7=99=BB=E5=BD=95=E8=B7=B3?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=BE=E5=85=A5=E4=B8=AD=E9=97=B4=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/module/header/index.vue | 10 ++++++++++
 middleware/redirect.js          | 10 ++++++++++
 nuxt.config.js                  |  3 ++-
 pages/index/index.vue           |  2 --
 plugins/router.js               |  9 +++------
 5 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 middleware/redirect.js

diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index 8fddce2..faded79 100644
--- a/layouts/module/header/index.vue
+++ b/layouts/module/header/index.vue
@@ -116,6 +116,7 @@
 <script>
 import { mapState } from "vuex";
 import { CATEGROY_LEVEL } from "@/constants";
+import { ApiGetHomeSeckill } from "@/plugins/api/seckill";
 import HeaderInfoBar from "./HeaderInfoBar.vue";
 import HeaderCategory from "./HeaderCategory.vue";
 import HeaderCart from "./HeaderCart.vue";
@@ -173,7 +174,16 @@ export default {
       }
     },
   },
+  created() {
+    this.getSeckillData();
+  },
   methods: {
+    async getSeckillData() {
+      const { result } = await ApiGetHomeSeckill();
+      if (result && result.activityTimeVO) {
+        this.$store.commit("setSeckillTabVisible", true);
+      }
+    },
     onLoginClick() {
       this.$isLoginValidate();
     },
diff --git a/middleware/redirect.js b/middleware/redirect.js
new file mode 100644
index 0000000..f31f846
--- /dev/null
+++ b/middleware/redirect.js
@@ -0,0 +1,10 @@
+export default function ({ app, route, redirect }) {
+  if (!app.store.state.token) {
+    // 未登录直接打开需要登录的页面，跳转首页
+    const needLoginPage = [/\/account/, /\/cart/];
+    const result = needLoginPage.some((item) => item.test(route.path));
+    if (result) {
+      redirect("/");
+    }
+  }
+}
diff --git a/nuxt.config.js b/nuxt.config.js
index c5ba8b5..82cd4c5 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -29,7 +29,8 @@ export default {
 				path: '/',
 				component: resolve(__dirname, 'pages/index/index.vue')
 			})
-		}
+		},
+		middleware: ['redirect']
 	},
 
 	// Global CSS: https://go.nuxtjs.dev/config-css
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3a773ca..c0ab0af 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -74,8 +74,6 @@ export default {
       seckillData = seckillDataResult;
     }
     if (seckillData.activityTimeVO) {
-      store.commit("setSeckillTabVisible", true);
-
       // 获取秒杀商品列表
       const { result } = await ApiGetSeckillGoods({
         pageIndex: 1,
diff --git a/plugins/router.js b/plugins/router.js
index 5bde2fa..c27fedc 100644
--- a/plugins/router.js
+++ b/plugins/router.js
@@ -1,12 +1,9 @@
 export default ({ app }) => {
   app.router.beforeEach((to, from, next) => {
+    // 获取用户信息
     const { token, userInfo } = app.store.state;
-    if (token) {
-      if (Object.keys(userInfo).length === 0) {
-        app.store.dispatch("getUserInfo");
-      }
-      next();
-      return;
+    if (token && Object.keys(userInfo).length === 0) {
+      app.store.dispatch("getUserInfo");
     }
     next();
   });