Merge branch 'fix_foton_20231213' into 'master'

Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!148
This commit is contained in:
高嵩
2024-01-22 10:04:42 +00:00
2 changed files with 513 additions and 416 deletions
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -34,6 +34,7 @@ function loginAgain () {
if (webLoginType === 'idm') { if (webLoginType === 'idm') {
if (isMobile()) { if (isMobile()) {
loginInPhone().then(() => { loginInPhone().then(() => {
Message.success('登录成功')
router.go(0) router.go(0)
}) })
} else { } else {
@@ -91,7 +92,6 @@ function loginInIdm (code) {
// welink登录 // welink登录
function loginInPhone () { function loginInPhone () {
return new Promise( (resolve, reject) => { return new Promise( (resolve, reject) => {
Message.success('重新登录中...')
const loading = Loading.service({ const loading = Loading.service({
lock: true, lock: true,
text: '登录中...', text: '登录中...',
@@ -99,7 +99,7 @@ function loginInPhone () {
}) })
hwh5.getAuthCode().then(data => { hwh5.getAuthCode().then(data => {
console.log('获取到了welinkCode', data) console.log('获取到了welinkCode', data)
Message.success('获取到了welinkCode' + data.code) Message.success('获取到了welinkCode')
if (data) { if (data) {
const code = data.code const code = data.code
getTokenToWeLink({ getTokenToWeLink({