feat: 添加单机登录

public/domain.js

@@ -8,5 +8,5 @@ window.Domain = {
     "api_url": "http://localhost:8082",
     "static_url": null,
     "theme": "default",
-    "auth_mode": 1
+    "auth_mode": 2
 }

src/api/modules/index.js

@@ -26,6 +26,8 @@ module.exports.sysOrg = require('./sys_org')
 module.exports.sysPermission = require('./sys_permission')
 // sysRole 角色
 module.exports.sysRole = require('./sys_role')
+// sysScheduling 调度
+module.exports.sysScheduling = require('./sys_scheduling')
 // sysTag 标签
 module.exports.sysTag = require('./sys_tag')
 // sysTagGroup 标签组

src/api/modules/sys_app_fun.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/app/fun/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.tree = (data) => {
   let url = '/api/sys/app/fun/tree?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -60,7 +60,7 @@ module.exports.tree = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/app/fun/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_area.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/area/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/area/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_attachment.js

@@ -46,7 +46,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/attachment/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -58,7 +58,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/attachment/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_cas.js

@@ -2,7 +2,7 @@
 // source: auto.go
 const axios = require('@/utils/request').default
 
-// login 登录信息
+// login 用户认证
 module.exports.login = (data) => {
   const url = '/api/sys/cas/login'
   return axios({
@@ -16,7 +16,7 @@ module.exports.login = (data) => {
 module.exports.logout = (data) => {
   let url = '/api/sys/cas/logout?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -38,7 +38,7 @@ module.exports.affirm = (data) => {
 module.exports.authorize = (data) => {
   let url = '/api/sys/cas/authorize?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -60,7 +60,7 @@ module.exports.token = (data) => {
 module.exports.uRL = (data) => {
   let url = '/api/sys/cas/url?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -72,7 +72,7 @@ module.exports.uRL = (data) => {
 module.exports.oauth2 = (data) => {
   let url = '/api/sys/cas/oauth2?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -84,7 +84,7 @@ module.exports.oauth2 = (data) => {
 module.exports.refresh = (data) => {
   let url = '/api/sys/cas/refresh?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -96,7 +96,7 @@ module.exports.refresh = (data) => {
 module.exports.check = (data) => {
   let url = '/api/sys/cas/check?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -108,7 +108,7 @@ module.exports.check = (data) => {
 module.exports.profile = (data) => {
   let url = '/api/sys/cas/profile?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -120,7 +120,7 @@ module.exports.profile = (data) => {
 module.exports.qrcode = (data) => {
   let url = '/api/sys/cas/qrcode?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_client.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/client/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/client/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_data_permission.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/data/permission/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/data/permission/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_dingtalk.js

@@ -6,7 +6,7 @@ const axios = require('@/utils/request').default
 module.exports.oauth2 = (data) => {
   let url = '/api/sys/dingtalk/oauth2?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_domain.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/domain/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/domain/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_menu.js

@@ -46,7 +46,7 @@ module.exports.update = (data) => {
 module.exports.sidebar = (data) => {
   let url = '/api/sys/menu/sidebar?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -58,7 +58,7 @@ module.exports.sidebar = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/menu/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -70,7 +70,7 @@ module.exports.page = (data) => {
 module.exports.tree = (data) => {
   let url = '/api/sys/menu/tree?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -82,7 +82,7 @@ module.exports.tree = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/menu/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_optionset.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/optionset/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/optionset/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_org.js

@@ -46,7 +46,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/org/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -58,7 +58,7 @@ module.exports.page = (data) => {
 module.exports.tree = (data) => {
   let url = '/api/sys/org/tree?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -70,7 +70,7 @@ module.exports.tree = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/org/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_permission.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/permission/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/permission/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_role.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/role/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.roleMenuTree = (data) => {
   let url = '/api/sys/role/role_menu_tree?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -60,7 +60,7 @@ module.exports.roleMenuTree = (data) => {
 module.exports.roleAppFunTree = (data) => {
   let url = '/api/sys/role/role_app_fun_tree?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -72,7 +72,7 @@ module.exports.roleAppFunTree = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/role/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_scheduling.js

@@ -0,0 +1,58 @@
+// Code generated by dol build. DO NOT EDIT.
+// source: auto.go
+const axios = require('@/utils/request').default
+
+// add 添加调度
+module.exports.add = (data) => {
+  const url = '/api/sys/scheduling/add'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// del 删除调度
+module.exports.del = (data) => {
+  const url = '/api/sys/scheduling/del'
+  return axios({
+    url: url,
+    method: 'delete',
+    data
+  })
+}
+
+// update 更新调度
+module.exports.update = (data) => {
+  const url = '/api/sys/scheduling/update'
+  return axios({
+    url: url,
+    method: 'put',
+    data
+  })
+}
+
+// page 调度分页查询
+module.exports.page = (data) => {
+  let url = '/api/sys/scheduling/page?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+
+// get 获取调度信息
+module.exports.get = (data) => {
+  let url = '/api/sys/scheduling/get?'
+  for (var key in data) {
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
+  }
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
+

src/api/modules/sys_tag.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/tag/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/tag/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_tag_group.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/tag/group/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/tag/group/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_tracker.js

@@ -6,7 +6,7 @@ const axios = require('@/utils/request').default
 module.exports.page = (data) => {
   let url = '/api/sys/tracker/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -18,7 +18,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/tracker/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_user.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/user/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/user/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -56,11 +56,21 @@ module.exports.get = (data) => {
   })
 }
 
+// login 用户认证
+module.exports.login = (data) => {
+  const url = '/api/sys/user/login'
+  return axios({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
 // logout 用户退出登录
 module.exports.logout = (data) => {
   let url = '/api/sys/user/logout?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_user_template.js

@@ -36,7 +36,7 @@ module.exports.update = (data) => {
 module.exports.page = (data) => {
   let url = '/api/sys/user/template/page?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,
@@ -48,7 +48,7 @@ module.exports.page = (data) => {
 module.exports.get = (data) => {
   let url = '/api/sys/user/template/get?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/api/modules/sys_wechat.js

@@ -6,7 +6,7 @@ const axios = require('@/utils/request').default
 module.exports.oauth2 = (data) => {
   let url = '/api/sys/wechat/oauth2?'
   for (var key in data) {
-    url += key + '=' + data[key] + '&'
+    url += key + '=' + encodeURIComponent(data[key]) + '&'
   }
   return axios({
     url: url,

src/icons/svg/domain.svg

@@ -0,0 +1 @@
+<svg t="1589359395888" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4533" width="128" height="128"><path d="M191.146667 109.226667C27.306667 197.973333 0 252.586667 0 512c0 266.24 27.306667 314.026667 204.8 409.6 252.586667 129.706667 361.813333 129.706667 614.4 0 177.493333-95.573333 204.8-143.36 204.8-409.6s-27.306667-314.026667-204.8-409.6C573.44-27.306667 430.08-20.48 191.146667 109.226667z m525.653333 88.746666c129.706667 54.613333 129.706667 54.613333-20.48 136.533334C539.306667 416.426667 273.066667 382.293333 273.066667 273.066667c0-116.053333 232.106667-157.013333 443.733333-75.093334z m-273.066667 512c0 143.36-20.48 150.186667-150.186666 88.746667C197.973333 757.76 136.533333 669.013333 136.533333 573.44c0-143.36 20.48-150.186667 157.013334-88.746667 88.746667 40.96 150.186667 129.706667 150.186666 225.28zM887.466667 566.613333c0 102.4-61.44 191.146667-163.84 238.933334-150.186667 68.266667-157.013333 61.44-129.706667-75.093334 34.133333-122.88 197.973333-320.853333 273.066667-320.853333 13.653333 0 20.48 75.093333 20.48 157.013333z" p-id="4534"></path></svg>

src/store/modules/optionset.js

@@ -1,4 +1,4 @@
-import { get } from '@/api/modules/sys_optionset'
+import { sysOptionset } from '@/api/modules'
 
 const state = {
 }
@@ -21,7 +21,7 @@ const actions = {
   },
   async getOptionsets({ commit }, code) {
     if (state[code] === undefined) {
-      const { data: { value } = {}} = await get({ code: code })
+      const { data: { value } = {}} = await sysOptionset.get({ code: code })
       if (value) {
         state[code] = JSON.parse(value)
       }

src/store/modules/user.js

@@ -1,4 +1,6 @@
-import { login, logout, getInfo } from '@/api/user'
+import { logout, getInfo } from '@/api/user'
+import { sysUser } from '@/api/modules'
+
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
 
@@ -29,14 +31,13 @@ const mutations = {
 }
 
 const actions = {
-  // user login
   login({ commit }, userInfo) {
-    const { username, password } = userInfo
+    const { domain, username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ username: username.trim(), password: password }).then(response => {
-        const { data } = response
-        commit('SET_TOKEN', data.token)
-        setToken(data.token)
+      sysUser.login({ domain, username, password }).then(response => {
+        const { data: { access_token }} = response
+        commit('SET_TOKEN', access_token)
+        setToken(access_token)
         resolve()
       }).catch(error => {
         reject(error)
@@ -44,7 +45,6 @@ const actions = {
     })
   },
 
-  // get user info
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
       getInfo(state.token).then(response => {

src/views/login/index.vue

@@ -6,19 +6,18 @@
         <h3 class="title">Login Form</h3>
       </div>
 
+      <el-form-item prop="domain">
+        <span class="svg-container">
+          <svg-icon icon-class="domain" />
+        </span>
+        <el-input ref="domain" v-model="loginForm.domain" placeholder="Domain" name="domain" type="text" tabindex="1" autocomplete="on" />
+      </el-form-item>
+
       <el-form-item prop="username">
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
-        <el-input
-          ref="username"
-          v-model="loginForm.username"
-          placeholder="Username"
-          name="username"
-          type="text"
-          tabindex="1"
-          autocomplete="on"
-        />
+        <el-input ref="username" v-model="loginForm.username" placeholder="Username" name="username" type="text" tabindex="1" autocomplete="on" />
       </el-form-item>
 
       <el-tooltip v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
@@ -50,13 +49,12 @@
       <div style="position:relative">
         <div class="tips">
           <span>Username : admin</span>
-          <span>Password : any</span>
+          <span>Password : admin</span>
         </div>
         <div class="tips">
           <span style="margin-right:18px;">Username : editor</span>
-          <span>Password : any</span>
+          <span>Password : editor</span>
         </div>
-
         <el-button class="thirdparty-button" type="primary" @click="showDialog=true">
           Or connect with
         </el-button>
@@ -65,9 +63,7 @@
 
     <el-dialog title="Or connect with" :visible.sync="showDialog">
       Can not be simulated on local, so please combine you own business simulation! ! !
-      <br>
-      <br>
-      <br>
+      <br><br><br>
       <social-sign />
     </el-dialog>
   </div>
@@ -89,16 +85,17 @@ export default {
       }
     }
     const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('The password can not be less than 6 digits'))
+      if (value.length < 5) {
+        callback(new Error('The password can not be less than 5 digits'))
       } else {
         callback()
       }
     }
     return {
       loginForm: {
+        domain: 'localhost',
         username: 'admin',
-        password: '111111'
+        password: 'admin'
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -156,14 +153,12 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
-          this.$store.dispatch('user/login', this.loginForm)
-            .then(() => {
-              this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
-              this.loading = false
-            })
-            .catch(() => {
-              this.loading = false
-            })
+          this.$store.dispatch('user/login', this.loginForm).then(() => {
+            this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
+            this.loading = false
+          }).catch(() => {
+            this.loading = false
+          })
         } else {
           console.log('error submit!!')
           return false