Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
front-end-dev
techbook
Commits
deeda232
Commit
deeda232
authored
Mar 29, 2021
by
zhangyanni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消拦截
parent
f38ded23
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
public.js
src/assets/js/public.js
+6
-4
No files found.
src/assets/js/public.js
View file @
deeda232
...
...
@@ -1066,7 +1066,9 @@ export default {
// }
}
else
{
if
((
/Android|webOS|iPhone|iPad|iPod|BlackBerry/i
.
test
(
navigator
.
userAgent
)
&&
navigator
.
userAgent
.
toLowerCase
().
match
(
/MicroMessenger/i
)
==
'micromessenger'
)
||
/Android|webOS|iPhone|iPad|iPod|BlackBerry/i
.
test
(
navigator
.
userAgent
)
||
/miniProgram/i
.
test
(
navigator
.
userAgent
))
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
push
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
if
(
i18n
.
locale
==
"zh-CN"
)
{
router
.
push
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
}
else
router
.
push
({
path
:
'/loginByEmail'
,
query
:
to
.
query
})
}
else
{
...
...
@@ -1166,9 +1168,9 @@ export default {
}
if
(
to
.
name
==
"mineIndex"
&&
!
this
.
getUserInfoCookieType
()
&&
this
.
judgeBrandIsWechatOrHtml
()
==
1
)
router
.
replace
({
path
:
'/circleList'
})
next
();
if
(
to
.
path
!=
from
.
path
){
cancelRequest
.
cancelRequest
()
}
//
if(to.path!=from.path){
//
cancelRequest.cancelRequest()
//
}
}
else
{
console
.
log
(
res
.
msg
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment