修改登陆

src/App.vue

@@ -4,27 +4,9 @@
   </div>
 </template>
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-import _ from 'lodash';
-const { mapActions } = createNamespacedHelpers('login');
 export default {
   name: 'App',
   components: {},
-  created() {
-    this.toLogin();
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  methods: {
-    ...mapActions(['login']),
-    async toLogin() {
-      let object = { mobile: '13333333333', passwd: '12345678' };
-      let res = await this.login(object);
-      if (_.isBoolean(res)) console.log('登陆成功');
-      else this.$message.warning(res.errmsg);
-    },
-  },
 };
 </script>
 

src/router/index.js

@@ -1,6 +1,7 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import store from '@/store/index';
+import { Notification } from 'element-ui';
 
 Vue.use(VueRouter);
 
@@ -267,18 +268,27 @@ const router = new VueRouter({
 });
 router.beforeEach((to, form, next) => {
   store.commit('setUser');
+  if (to.name === 'login') {
+    next();
+    return;
+  }
   let user = store.state.user;
   if (user) {
     if (user.type == process.env.VUE_APP_USER_TYPE) {
-      console.log('缓存登陆');
+      console.log('已登录');
       next();
     } else {
-      console.error('非当前端用户,需要重新登陆');
-      // next('/login'); //TODO 跳转至登陆页
+      Notification({
+        title: '请重新登陆',
+        message: `原因:非当前端用户,需要重新登陆`,
+        type: 'warning',
+      });
+      console.warn('非当前端用户,需要重新登陆');
+      next({ name: 'login' });
     }
   }
   //下面是没登录的情况,需要跳转页面到用户未登录页
-  else next();
+  else next({ name: 'login' });
 });
 
 export default router;

src/views/register/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="login">
-    <login-detail :form="form" @onSubmit="onSubmit"></login-detail>
+    <login-detail></login-detail>
   </div>
 </template>
 
@@ -17,11 +17,7 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {
-    onSubmit(form) {
-      console.log('登錄');
-    },
-  },
+  methods: {},
 };
 </script>