Merge branch 'fix_20240123_UAT' into 'master'

fix:

See merge request laws-foton-slrs/foton-laws-system-front!152
This commit is contained in:
高嵩
2024-01-26 09:58:19 +00:00
+15 -2
View File
@@ -112,6 +112,8 @@ function loginInPhone () {
loginNew(res) loginNew(res)
.then(() => { .then(() => {
resolve() resolve()
}).catch(e => {
Message.error('loginNew--warning')
}) })
.finally(() => { .finally(() => {
loading.close() loading.close()
@@ -120,13 +122,23 @@ function loginInPhone () {
if (res.respCode && res.respCode === 'r0011') { if (res.respCode && res.respCode === 'r0011') {
quit() quit()
loading.close() loading.close()
} else {
Message.warning('getTokenToWeLink--warning')
loading.close()
} }
} }
}).catch(e => {
Message.error('getTokenToWeLink--error')
loading.close()
}) })
}else {
Message.warning('hwh5.getAuthCode--warning')
loading.close()
} }
}).catch(e => {
Message.error('hwh5.getAuthCode--error', e)
loading.close()
}) })
}).catch(e => {
Message.warning(e)
}) })
} }
@@ -165,6 +177,7 @@ function loginNew (res) {
} }
}) })
.catch(e => { .catch(e => {
Message.error('getMenu--error')
reject(e) reject(e)
}) })
}) })