update

.env

@@ -1,2 +1,3 @@
 VUE_APP_AXIOS_BASE_URL = ''
 VUE_APP_ROUTER="/zhwl"
+VUE_APP_TENANT = 'zhwl'

src/main.js

@@ -21,32 +21,6 @@ Vue.use(ElementUI, {
   size: 'small',
 });
 
-//使用钩子函数对路由进行权限跳转
-router.beforeEach((to, from, next) => {
-  document.title = `${to.meta.title} `;
-  const user = localStorage.getItem('user');
-  if (!user && to.path !== '/login') {
-    next('/login');
-  } else {
-    store.commit('setUser', JSON.parse(user), { root: true });
-    // 检查下个路由是不是有特殊设置,有的话,就把参数拼在后面
-    checkMenuList(to.path);
-    next();
-  }
-});
-
-const checkMenuList = path => {
-  let params = sessionStorage.getItem('params');
-  if (!params) return;
-  params = JSON.parse(params);
-  let menuLimit = params['menuLimit'];
-  let limit = menuLimit[path];
-  if (limit) {
-    limit = limit.map(i => i.item);
-    store.commit('setMenuParams', limit);
-  }
-};
-
 new Vue({
   router,
   store,

src/router/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import Router from 'vue-router';
+import store from '@/store';
 import test from './test';
 import system from './system';
 import order from './order';
@@ -9,7 +10,7 @@ import client from './client';
 import supplier from './supplier';
 import Home from '@l/Home.vue';
 Vue.use(Router);
-export default new Router({
+const router = new Router({
   mode: 'history',
   // base: process.env.NODE_ENV === 'development' ? '' : 'zhwl',
   base: 'zhwl',
@@ -53,3 +54,30 @@ export default new Router({
     },
   ],
 });
+
+//使用钩子函数对路由进行权限跳转
+router.beforeEach((to, from, next) => {
+  document.title = `${to.meta.title} `;
+  const user = localStorage.getItem('user');
+  if (!user && to.path !== '/login') {
+    next('/login');
+  } else {
+    store.commit('setUser', JSON.parse(user), { root: true });
+    // 检查下个路由是不是有特殊设置,有的话,就把参数拼在后面
+    checkMenuList(to.path);
+    next();
+  }
+});
+
+const checkMenuList = path => {
+  let params = sessionStorage.getItem('params');
+  if (!params) return;
+  params = JSON.parse(params);
+  let menuLimit = params['menuLimit'];
+  let limit = menuLimit[path];
+  if (limit) {
+    limit = limit.map(i => i.item);
+    store.commit('setMenuParams', limit);
+  }
+};
+export default router;

src/store/index.js

@@ -6,6 +6,7 @@ import test from './test';
 import menu from '@f/store/auth/menu';
 import role from '@f/store/auth/role';
 import userMenu from '@f/store/auth/userMenu';
+import login from '@f/store/auth/login';
 import util from '@f/store/util';
 import { menuParams, setMenuParams } from '@f/store/auth/menuParams';
 
@@ -17,6 +18,7 @@ export default new Vuex.Store({
   actions: {},
   modules: {
     test,
+    login,
     util,
     menu,
     role,

src/views/Login.vue

@@ -8,14 +8,14 @@
               <el-col :span="24" class="login">
                 <div class="ms-title">后台管理系统</div>
                 <el-form :model="form" :rules="rules" ref="login" label-width="0px" class="ms-content">
-                  <el-form-item prop="username">
-                    <el-input v-model="form.tel" placeholder="请输入手机号">
-                      <el-button slot="prepend" icon="el-icon-user"></el-button>
+                  <el-form-item prop="login_id">
+                    <el-input v-model="form.login_id" placeholder="请输入登录用户名">
+                      <span slot="prepend" class="el-icon-user"></span>
                     </el-input>
                   </el-form-item>
                   <el-form-item prop="password">
-                    <el-input type="password" placeholder="请输入密码" v-model="form.pwd">
-                      <el-button slot="prepend" icon="el-icon-lock"></el-button>
+                    <el-input type="password" placeholder="请输入密码" v-model="form.password">
+                      <span slot="prepend" class="el-icon-lock"></span>
                     </el-input>
                   </el-form-item>
                   <div class="login-btn">
@@ -32,6 +32,7 @@
 </template>
 
 <script>
+const _ = require('lodash');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: login } = createNamespacedHelpers('login');
 export default {
@@ -43,25 +44,32 @@ export default {
     return {
       form: {},
       rules: {
-        tel: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
-        pwd: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+        login_id: [{ required: true, message: '请输入登录用户名', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
       },
     };
   },
-  created() {},
+  created() {
+    document.onkeydown = () => {
+      let key = window.event.keyCode;
+      if (key == 13) {
+        this.submitForm();
+      }
+    };
+  },
   methods: {
-    ...login(['login']),
+    ...login(['login', 'token']),
     submitForm() {
       this.$refs.login.validate(async valid => {
         if (valid) {
-          // let res = await this.login({ user: this.form });
-          // if (this.$checkRes(res)) {
-          localStorage.setItem('user', JSON.stringify(this.form));
-          this.$message.success('登录成功');
-          this.$router.push('/homeIndex');
-          // }
+          const dup = _.cloneDeep(this.form);
+          let res = await this.login(dup);
+          if (this.$checkRes(res)) {
+            await this.token();
+            this.$router.push('/homeIndex');
+          }
         } else {
-          this.$message.error('请输入账号和密码');
+          this.$message.error('请输入登录用户名和密码');
           console.log('error submit!!');
           return false;
         }

vue.config.js

@@ -26,7 +26,7 @@ module.exports = {
     //api地址前缀
     proxy: {
       '/api/role/auth': {
-        target: 'http://free.liaoningdoupo.com',
+        target: 'http://127.0.0.1:7002', //http://free.liaoningdoupo.com
         changeOrigin: true,
         ws: true,
       },