|
@@ -99,47 +99,46 @@ const actions = {
|
|
|
const { username, password } = userInfo
|
|
|
return new Promise((resolve, reject) => {
|
|
|
login({ username: username.trim(), password: password }).then(response => {
|
|
|
-
|
|
|
- const fullURL = window.location.href;
|
|
|
-
|
|
|
- const codeMatch = fullURL.match(/[\?&]access=([^&]+)/);
|
|
|
- console.log('codeMatch===>',codeMatch)
|
|
|
- if (codeMatch) {
|
|
|
-
|
|
|
- var code = codeMatch[1];
|
|
|
-
|
|
|
-
|
|
|
- if ( code && code.includes("#/login")) {
|
|
|
- code = code.replace("#/login", "");
|
|
|
- }
|
|
|
- console.log('token',code)
|
|
|
-
|
|
|
- console.log('解密token',atob(code))
|
|
|
- let token = atob(code)
|
|
|
- commit('SET_TOKEN', token)
|
|
|
- setToken(token)
|
|
|
- resolve()
|
|
|
- let url = window.location.href;
|
|
|
-
|
|
|
- let jmpurl = url.split('?')[0]+'#/dashboard'
|
|
|
- window.open(jmpurl, "_self");
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ const { data, msg } = response
|
|
|
+ if (msg !== 'ok') {
|
|
|
+ Message({
|
|
|
+ message: data,
|
|
|
+ type: 'error',
|
|
|
+ duration: 5 * 1000
|
|
|
+ })
|
|
|
+ reject(data)
|
|
|
+ }
|
|
|
+ commit('SET_TOKEN', data.token)
|
|
|
+ if (Cookies == null) {
|
|
|
+ console.log(1)
|
|
|
+ }
|
|
|
+ setToken(data.token)
|
|
|
+ resolve()
|
|
|
}).catch(error => {
|
|
|
reject(error)
|
|
|
})
|
|
@@ -173,19 +172,17 @@ const actions = {
|
|
|
removeToken()
|
|
|
resetRouter()
|
|
|
resolve()
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- var url = process.env.VUE_APP_BASE_API
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- if(url.indexOf('/')==0 && url.length==1){
|
|
|
- url= window.location.protocol + "//"+window.location.host+url
|
|
|
- }
|
|
|
- const externalURL = "https://id.xiandaimuye.com/api/v1/logout?redirect_url="+url+ '&client_id=fTBm64I4k3kqHYtoFTUpvirCDxxCfx7I';
|
|
|
-
|
|
|
-
|
|
|
- window.open(externalURL, "_self");
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
},2000)
|
|
|
}
|
|
|
|
|
@@ -274,19 +271,18 @@ const actions = {
|
|
|
removeToken()
|
|
|
resetRouter()
|
|
|
resolve()
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- var url = process.env.VUE_APP_BASE_API
|
|
|
-
|
|
|
-
|
|
|
- if(url.indexOf('/')==0 && url.length==1){
|
|
|
- url= window.location.protocol + "//"+window.location.host+url
|
|
|
- }
|
|
|
- const externalURL = "https://id.xiandaimuye.com/api/v1/logout?redirect_url=" + url + '&client_id=fTBm64I4k3kqHYtoFTUpvirCDxxCfx7I';
|
|
|
-
|
|
|
-
|
|
|
- window.open(externalURL, "_self");
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}).catch(error => {
|
|
|
reject(error)
|