FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
宋伟佳
2022-04-14 15:08:51 +08:00
parent e8a6bdbf9e 7914948c51
commit 859e8d2406
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+2 -2
View File
@@ -189,7 +189,7 @@ router.beforeEach(function (to, from, next) {
if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
extractedVerify(token)
}else {
if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1){
if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || path.indexOf("/standardSearch/All?userName") !== -1)){
extractedLocalStorage("standardSearch/All",userName)
localStorage.setItem('external', "external")
next('/LoginVerifyNoEncryption')
@@ -388,7 +388,7 @@ router.beforeEach(function (to, from, next) {
next()
}
}else {
if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1) {
if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || path.indexOf("/standardSearch/All?userName") !== -1)) {
extractedLocalStorage("standardSearch/All",userName)
localStorage.setItem('external', "external")
next('/LoginVerifyNoEncryption')
src/pages/details/otherLawsStandDetails/index.vue
+2
View File
@@ -1679,6 +1679,8 @@ export default {
}
})
window.open(routeUrl.href, '_blank')
}else {
this.$message.error('政策号已不存在!')
}
}, e => {
})