提交

src/permission.js

@@ -21,6 +21,7 @@ const whiteList = [
 ];
 
 router.beforeEach((to, from, next) => {
+  let { isFromVolunteer, tel } = to.query;
   NProgress.start();
   if (getToken()) {
     to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
@@ -29,8 +30,7 @@ router.beforeEach((to, from, next) => {
       next({ path: "/" });
       NProgress.done();
     } else {
-      let isTrue = whiteList.some((item) => item == to.path);
-      store.commit("SET_IS_MENU_HEADER", !isTrue);
+      store.commit("SET_IS_MENU_HEADER", isFromVolunteer ? false : true);
       if (store.getters.roles.length === 0) {
         isRelogin.show = true;
         // 判断当前用户是否已拉取完user_info信息
@@ -55,7 +55,6 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    let { isFromVolunteer, tel } = to.query;
     if (tel) {
       // store
       //   .dispatch("Login", {
@@ -67,9 +66,9 @@ router.beforeEach((to, from, next) => {
       //   });
     } else {
       if (whiteList.indexOf(to.path) !== -1) {
-        store.commit("SET_IS_MENU_HEADER", false); //不显示左侧菜单，头部标题
         // 没有token
         // 在免登录白名单，直接进入
+        store.commit("SET_IS_MENU_HEADER", false); //不显示左侧菜单，头部标题
         next();
       } else {
         next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页

src/store/modules/permission.js

@@ -81,6 +81,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       } else if (route.component === "InnerLink") {
         route.component = InnerLink;
       } else {
+        console.log("组件", route.component);
         route.component = loadView(route.component);
       }
     }

src/views/login.vue

@@ -36,7 +36,7 @@
           />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
+      <!-- <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -53,7 +53,7 @@
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-checkbox
         v-model="loginForm.rememberMe"
         style="margin: 0px 0px 25px 0px"
@@ -108,11 +108,11 @@ export default {
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+        // code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
       loading: false,
       // 验证码开关
-      captchaEnabled: true,
+      captchaEnabled: false,
       // 注册开关
       register: false,
       redirect: undefined,