|
@@ -49,7 +49,7 @@ function verifyLoginEnvironment() {
|
|
isWX.value = currentEnvironment.indexOf("micromessenger") > 0 ? true : false
|
|
isWX.value = currentEnvironment.indexOf("micromessenger") > 0 ? true : false
|
|
const href = window.location.href;
|
|
const href = window.location.href;
|
|
if (href.indexOf("userId") > 0) {
|
|
if (href.indexOf("userId") > 0) {
|
|
- const loginUserId = href.substring(href.indexOf("userId=") + "userId=".length);
|
|
|
|
|
|
+ let loginUserId = href.substring(href.indexOf("userId=") + "userId=".length);
|
|
if (loginUserId.includes('#/')) {
|
|
if (loginUserId.includes('#/')) {
|
|
loginUserId = loginUserId.substring(0, loginUserId.indexOf('#/'));
|
|
loginUserId = loginUserId.substring(0, loginUserId.indexOf('#/'));
|
|
}
|
|
}
|
|
@@ -65,7 +65,7 @@ function verifyLoginEnvironment() {
|
|
tryAutoLogin()
|
|
tryAutoLogin()
|
|
} else {
|
|
} else {
|
|
//后台经过验证后,重定向过来带上了userId
|
|
//后台经过验证后,重定向过来带上了userId
|
|
- const loginUserId = href.substring(href.indexOf("userId=") + "userId=".length);
|
|
|
|
|
|
+ let loginUserId = href.substring(href.indexOf("userId=") + "userId=".length);
|
|
if (loginUserId.includes('#/')) {
|
|
if (loginUserId.includes('#/')) {
|
|
loginUserId = loginUserId.substring(0, loginUserId.indexOf('#/'));
|
|
loginUserId = loginUserId.substring(0, loginUserId.indexOf('#/'));
|
|
}
|
|
}
|
|
@@ -87,7 +87,8 @@ function onSubmit(fromVal) {
|
|
// userId登录
|
|
// userId登录
|
|
function loginByUserId(userId) {
|
|
function loginByUserId(userId) {
|
|
toastLoading('登陆中...', 0)
|
|
toastLoading('登陆中...', 0)
|
|
- requests.post(USER_ID_LOGIN, { params: { userId } }).then(({ data }) => {
|
|
|
|
|
|
+ // requests.post(USER_ID_LOGIN, { params: { userId } }).then(({ data }) => {
|
|
|
|
+ requests.post(USER_ID_LOGIN, { userId }).then(({ data }) => {
|
|
loginProcessing(data)
|
|
loginProcessing(data)
|
|
})
|
|
})
|
|
}
|
|
}
|