食谱展示界面开发

stdiet-ui/src/permission.js

@@ -1,43 +1,52 @@
-import router from './router'
-import store from './store'
-import {Message} from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import {getToken} from '@/utils/auth'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
 
-NProgress.configure({showSpinner: false})
+NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/question', '/subhealthyInvestigation']
+const whiteList = [
+  "/login",
+  "/auth-redirect",
+  "/bind",
+  "/register",
+  "/question",
+  "/subhealthyInvestigation"
+];
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
     /* has token*/
-    if (to.path === '/login') {
-      next({path: '/'})
-      NProgress.done()
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done();
     } else {
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => {
-          // 拉取user_info
-          const roles = res.roles
-          store.dispatch('GenerateRoutes', {roles}).then(accessRoutes => {
-            // 测试 默认静态页面
-            // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({...to, replace: true}) // hack方法 确保addRoutes已完成
+        store
+          .dispatch("GetInfo")
+          .then(res => {
+            // 拉取user_info
+            const roles = res.roles;
+            store.dispatch("GenerateRoutes", { roles }).then(accessRoutes => {
+              // 测试 默认静态页面
+              // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes); // 动态添加可访问路由表
+              next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+            });
           })
-        })
           .catch(err => {
-            store.dispatch('FedLogOut').then(() => {
-              Message.error(err)
-              next({path: '/'})
-            })
-          })
+            store.dispatch("FedLogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
       } else {
-        next()
+        next();
         // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
         // if (hasPermission(store.getters.roles, to.meta.roles)) {
         //   next()
@@ -49,17 +58,22 @@ router.beforeEach((to, from, next) => {
     }
   } else {
     // 没有token
-    if (whiteList.indexOf(to.path) !== -1 || to.path.startsWith('/f/contract/') || to.path.startsWith('/subhealthyInvestigation/')
-        || to.path.startsWith('/foodHeatCalculator/')) {
+    if (
+      whiteList.indexOf(to.path) !== -1 ||
+      to.path.startsWith("/f/contract/") ||
+      to.path.startsWith("/recipes/detail/") ||
+      to.path.startsWith("/subhealthyInvestigation/") ||
+      to.path.startsWith("/foodHeatCalculator/")
+    ) {
       // 在免登录白名单，直接进入
-      next()
+      next();
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
+      next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});