diff --git a/src/api/index.js b/src/api/index.js
index 35367e2..dc35d94 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,5 +1,5 @@
const api = {
- Login: '/sys/login',
+ Login: '/company/login',
Logout: '/sys/logout',
ForgePassword: '/auth/forge-password',
Register: '/auth/register',
diff --git a/src/api/login.js b/src/api/login.js
index 1d565f5..ede10fb 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -14,7 +14,7 @@ import { axios } from '@/utils/request'
*/
export function login(parameter) {
return axios({
- url: '/sys/login',
+ url: '/company/login',
method: 'post',
data: parameter
})
@@ -22,7 +22,7 @@ export function login(parameter) {
export function phoneLogin(parameter) {
return axios({
- url: '/sys/phoneLogin',
+ url: '/company/smsLogin',
method: 'post',
data: parameter
})
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 9107369..bc539f1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,16 +1,25 @@
import Vue from 'vue'
import { login, logout, phoneLogin, thirdLogin } from '@/api/login'
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
+import {
+ ACCESS_TOKEN,
+ USER_NAME,
+ USER_INFO,
+ USER_AUTH,
+ SYS_BUTTON_AUTH,
+ UI_CACHE_DB_DICT_DATA,
+ TENANT_ID,
+ CACHE_INCLUDED_ROUTES
+} from '@/store/mutation-types'
import { welcome } from '@/utils/util'
import { getAction } from '@/api/manage'
-import { routerData } from "@/config/router.config";
+import { routerData } from '@/config/router.config'
const user = {
state: {
token: '',
username: '',
realname: '',
- tenantid:'',
+ tenantid: '',
welcome: '',
avatar: '',
permissionList: [],
@@ -37,16 +46,16 @@ const user = {
},
SET_TENANT: (state, id) => {
state.tenantid = id
- },
+ }
},
actions: {
// CAS验证登录
ValidateLogin({ commit }, userInfo) {
return new Promise((resolve, reject) => {
- getAction('/sys/cas/client/validateLogin',userInfo).then(response => {
- console.log('----cas 登录--------',response)
- if(response.success){
+ getAction('/sys/cas/client/validateLogin', userInfo).then(response => {
+ console.log('----cas 登录--------', response)
+ if (response.success) {
const result = response.result
const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
@@ -54,10 +63,10 @@ const user = {
Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+ commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
commit('SET_AVATAR', userInfo.avatar)
resolve(response)
- }else{
+ } else {
resolve(response)
}
}).catch(error => {
@@ -69,7 +78,7 @@ const user = {
Login({ commit }, userInfo) {
return new Promise((resolve, reject) => {
login(userInfo).then(response => {
- if(response.code =='200'){
+ if (response.code == '200') {
const result = response.result
const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
@@ -78,10 +87,10 @@ const user = {
Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+ commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
commit('SET_AVATAR', userInfo.avatar)
resolve(response)
- }else{
+ } else {
reject(response)
}
}).catch(error => {
@@ -92,26 +101,26 @@ const user = {
//手机号登录
PhoneLogin({ commit }, userInfo) {
return new Promise((resolve, reject) => {
- phoneLogin(userInfo).then(response => {
- if(response.code =='200'){
- const result = response.result
- const userInfo = result.userInfo
- Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
- Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
- Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
- Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
- commit('SET_TOKEN', result.token)
- commit('SET_INFO', userInfo)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
- commit('SET_AVATAR', userInfo.avatar)
- resolve(response)
- }else{
- reject(response)
- }
- }).catch(error => {
- reject(error)
+ phoneLogin(userInfo).then(response => {
+ if (response.code == '200') {
+ const result = response.result
+ const userInfo = result.userInfo
+ Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+ Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+ Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+ Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
+ commit('SET_TOKEN', result.token)
+ commit('SET_INFO', userInfo)
+ commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
+ commit('SET_AVATAR', userInfo.avatar)
+ resolve(response)
+ } else {
+ reject(response)
+ }
+ }).catch(error => {
+ reject(error)
+ })
})
- })
},
// 获取用户信息
GetPermissionList({ commit }) {
@@ -119,8 +128,8 @@ const user = {
const menuData = routerData
const authData = []
const allAuthData = []
- sessionStorage.setItem(USER_AUTH,JSON.stringify(authData))
- sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData))
+ sessionStorage.setItem(USER_AUTH, JSON.stringify(authData))
+ sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData))
if (menuData && menuData.length > 0) {
menuData.forEach((item) => {
if (item['children']) {
@@ -133,7 +142,7 @@ const user = {
}
})
commit('SET_PERMISSIONLIST', menuData)
- resolve({result: {menu:menuData}})
+ resolve({ result: { menu: menuData } })
} else {
reject('getPermissionList: permissions must be a non-null array !')
}
@@ -169,8 +178,8 @@ const user = {
// 第三方登录
ThirdLogin({ commit }, param) {
return new Promise((resolve, reject) => {
- thirdLogin(param.token,param.thirdType).then(response => {
- if(response.code =='200'){
+ thirdLogin(param.token, param.thirdType).then(response => {
+ if (response.code == '200') {
const result = response.result
const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
@@ -178,10 +187,10 @@ const user = {
Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo)
- commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+ commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
commit('SET_AVATAR', userInfo.avatar)
resolve(response)
- }else{
+ } else {
reject(response)
}
}).catch(error => {
@@ -189,7 +198,7 @@ const user = {
})
})
},
- saveTenant({ commit }, id){
+ saveTenant({ commit }, id) {
Vue.ls.set(TENANT_ID, id, 7 * 24 * 60 * 60 * 1000)
commit('SET_TENANT', id)
}
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 6782e8b..e35ebb5 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -5,59 +5,104 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
- 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -70,16 +115,24 @@
:loading="loginBtn"
@click.stop.prevent="handleSubmit"
:disabled="loginBtn">
- {{ loginBtn ? "登录中" : "登录" }}
+ {{ loginBtn ? '登录中' : '登录' }}
-
-
+
+
+
+
+ {{ isVerificationCodeLogin ? '账号密码登录' : '手机验证码登录' }}
+
+
+
+
+
@@ -93,17 +146,18 @@
diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue
index ee6ca2d..1f29b6c 100644
--- a/src/views/user/alteration/Alteration.vue
+++ b/src/views/user/alteration/Alteration.vue
@@ -97,9 +97,12 @@