Merge remote-tracking branch 'origin/1.0' into 1.0

src/api/login.js

@@ -3,12 +3,13 @@ import { encrypt } from '@/utils/jsencrypt'
 import Qs from 'qs'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid,type) {
   const data = {
     username,
     password,
     code,
-    uuid
+    uuid,
+    type
   }
   console.log('加密前数据', data)
   return request({

src/store/modules/user.js

@@ -38,12 +38,14 @@ const user = {
   actions: {
     // 登录
     Login({ commit }, userInfo) {
+      console.log('userInfo', userInfo)
       const username = userInfo.username.trim()
       const password = userInfo.password
       const code = userInfo.code
       const uuid = userInfo.uuid
+      const type = userInfo.type
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(username, password, code, uuid, type).then(res => {
           setToken(res.data)
           commit('SET_TOKEN', res.data)
           resolve()

src/views/login/login.vue

@@ -128,6 +128,7 @@ export default {
       codeUrl: '',
       cookiePassword: '',
       loginForm: {
+        type: '1',
         username: '',
         password: '',
         rememberMe: false,
@@ -197,9 +198,11 @@ export default {
     getCookie() {
       const username = Cookies.get('username')
       const password = Cookies.get('password')
+      const type = Cookies.get('type')
       const rememberMe = Cookies.get('rememberMe')
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
+        type: type === undefined ? this.loginForm.type : type,
         password: password === undefined ? this.loginForm.password : passwordDecrypt(password),
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       }
@@ -231,10 +234,12 @@ export default {
     rememberMe() {
       if (this.loginForm.rememberMe) {
         Cookies.set('username', this.loginForm.username, { expires: 30 })
+        Cookies.set('type', this.loginForm.type, { expires: 30 })
         Cookies.set('password', passwordEncrypt(this.loginForm.password), { expires: 30 })
         Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
       } else {
         Cookies.remove('username')
+        Cookies.remove('type')
         Cookies.remove('password')
         Cookies.remove('rememberMe')
       }