Merge branch 'master' into dev.fault

src/api/login.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password,firmId, code, uuid) {
   return request({
     url: '/auth/login',
     headers: {
@@ -10,7 +10,7 @@ export function login(username, password, code, uuid) {
       repeatSubmit: false
     },
     method: 'post',
-    data: {username, password, code, uuid}
+    data: {username, password,firmId, code, uuid}
   })
 }
 

src/api/system/firm.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+
+// 查询用户列表
+export function firmList() {
+  return request({
+    url: '/system/sysFirm/firmList',
+    method: 'get'
+  })
+}

src/store/modules/user.js

@@ -40,10 +40,11 @@ const user = {
     Login({commit}, userInfo) {
       const username = userInfo.username.trim()
       const password = userInfo.password
+      const firmId = userInfo.firmId;
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(username, password,firmId, code, uuid).then(res => {
           let data = res.data
           setToken(data.access_token)
           commit('SET_TOKEN', data.access_token)

src/views/login.vue

@@ -2,6 +2,17 @@
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">若依后台管理系统</h3>
+      <el-form-item prop="firmId">
+        <el-select v-model="loginForm.firmId" placeholder="请选择公司" style="width: 350px">
+          <el-option
+            v-for="item in firmList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+          <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
+        </el-select>
+      </el-form-item>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -65,11 +76,13 @@
 import {getCodeImg} from "@/api/login";
 import Cookies from "js-cookie";
 import {decrypt, encrypt} from '@/utils/jsencrypt'
+import { firmList } from '@/api/system/firm'
 
 export default {
   name: "Login",
   data() {
     return {
+      firmList: [],
       codeUrl: "",
       loginForm: {
         username: "admin",
@@ -91,7 +104,7 @@ export default {
       // 验证码开关
       captchaEnabled: false,
       // 注册开关
-      register: false,
+      register: true,
       redirect: undefined
     };
   },
@@ -106,8 +119,15 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
+    this.getFirmList();
   },
   methods: {
+    getFirmList(){
+      firmList().then(response => {
+        this.firmList = response.data;
+        console.log(this.firmList)
+      })
+    },
     getCode() {
       getCodeImg().then(res => {
         this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:18080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''