合并分支 'zwh' 到 'master'

src/axios/services.js

 import axios from './axios';
-import url from './index';
+// import url from './index';
 const server = {
-    login(data) {  //科协组织数据分布
-        return axios('/auth/login', {
-            method: 'post',
-            data
-        })
-    },
-    acRandom() {  //科协组织数据分布
-        return axios('/sacs/ac/random?companyId=1&mac=1&sysName=1', {
-            method: 'get'
-        })
-    },
+  login(data) { // 登录
+    return axios('/auth/login', {
+      method: 'post',
+      data
+    })
+  },
+  acRandom(data) { // 激活码
+    return axios(`/ac/random?companyId=${data.companyId}&mac=${data.mac}&sysName=${data.sysName}`, {
+      method: 'get'
+    })
+  },
+  companyInfo(data) { // 获取单位信息
+    return axios(`/company?id=${data}`, {
+      data,
+      method: 'get'
+    })
+  },
+  getNum(data) {
+    return axios(`/ac/nums?companyId=${data}`, {
+      data,
+      method: 'get'
+    })
+  },
+  getList(data) {
+    return axios(`/ac/acCode?companyId=${data.companyId}&page=${data.page}&size=${data.size}&mac=${data.mac}`, {
+      data,
+      method: 'get'
+    })
+  }
 }
 
 export default server;

src/views/layout.vue

@@ -50,7 +50,7 @@ export default {
   watch:{
     "$route.path": {
       handler(newName, oldName) {
-      　 　　console.log(newName);
+      // 　 　　console.log(newName);
             this.nowRouter = newName
       },
     　immediate: true
@@ -60,6 +60,7 @@ export default {
   methods: {
     logout(){
       this.$router.push('/login')
+      localStorage.clear();
     },
     jumRouter(router){
       this.$router.push(router)

src/views/login.vue

@@ -45,13 +45,27 @@ export default {
     },
     methods: {
         login(){
+          if(!this.userNameLogin){
+            this.$message.error('请输入用户名')
+            return
+          }
+          if(!this.passwordLogin){
+            this.$message.error('请输入密码')
+            return
+          }
             let data = {
                     "password": this.passwordLogin,
                     "rememberMe": true,
                     "username": this.userNameLogin
             }
+
             this.$server.login(data).then(res=>{
                 console.log(res);
+                if(res.status===200){
+                  localStorage.setItem('token',res.data.authorization)
+                  localStorage.setItem('id',res.data.companyId)
+                  this.$router.push('/home')
+                }
             })
         }
     },
@@ -157,7 +171,7 @@ export default {
         width: 540px;
         height: 560px;
         background-color: #ffffff;
-        box-shadow: 0px 2px 20px 0px 
+        box-shadow: 0px 2px 20px 0px
             rgba(6, 25, 72, 0.3);
         border-radius: 0px 10px 10px 0px;
         box-sizing: border-box;