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
cd6ca9ec
Commit
cd6ca9ec
authored
Mar 30, 2021
by
zhangyanni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
再试一下
parent
bfb16447
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
public.js
src/assets/js/public.js
+10
-10
mobileTop.vue
src/components/mobile/mobileTop.vue
+1
-1
No files found.
src/assets/js/public.js
View file @
cd6ca9ec
...
...
@@ -1069,13 +1069,13 @@ 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"
)
{
if
(
en
==
"zh-CN"
)
{
router
.
push
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
}
else
router
.
push
({
path
:
'/loginByEmail'
,
query
:
to
.
query
})
}
else
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileLoginCmpt'
,
query
:
to
.
query
});
if
(
en
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileLoginCmpt'
,
query
:
to
.
query
});
else
router
.
push
({
path
:
'/emailLoginCmpt'
,
query
:
to
.
query
})
}
...
...
@@ -1125,22 +1125,22 @@ export default {
this
.
setUserInfoCookie
(
"selected"
,
"mine"
);
}
if
(
to
.
name
==
"mobileLoginCmpt"
)
{
if
(
i18n
.
locale
==
"en"
)
router
.
push
({
path
:
'/emailLoginCmpt'
,
query
:
to
.
query
});
if
(
en
==
"en"
)
router
.
push
({
path
:
'/emailLoginCmpt'
,
query
:
to
.
query
});
cancelRequest
.
cancelRequest
()
}
if
(
to
.
name
==
"emailLoginCmpt"
)
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileLoginCmpt'
,
query
:
to
.
query
});
if
(
en
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileLoginCmpt'
,
query
:
to
.
query
});
cancelRequest
.
cancelRequest
()
}
if
(
to
.
name
==
"login"
)
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileLoginCmpt'
,
query
:
to
.
query
});
if
(
en
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileLoginCmpt'
,
query
:
to
.
query
});
else
router
.
push
({
path
:
'/emailLoginCmpt'
,
query
:
to
.
query
})
}
if
(
to
.
name
==
"mobileRegisterCmpt"
)
{
if
(
i18n
.
locale
==
"en"
)
router
.
push
({
path
:
'/emailRegisterCmpt'
,
query
:
to
.
query
});
if
(
en
==
"en"
)
router
.
push
({
path
:
'/emailRegisterCmpt'
,
query
:
to
.
query
});
}
if
(
to
.
name
==
"emailRegisterCmpt"
)
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileRegisterCmpt'
,
query
:
to
.
query
});
if
(
en
==
"zh-CN"
)
router
.
push
({
path
:
'/mobileRegisterCmpt'
,
query
:
to
.
query
});
}
if
(
to
.
name
==
"dashboard"
)
{
// if(window.innerWidth<=950) router.replace('/index');
...
...
@@ -1159,14 +1159,14 @@ export default {
}
}
if
(
to
.
name
==
"mobileLogin"
)
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
push
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
if
(
en
==
"zh-CN"
)
router
.
push
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
else
router
.
push
({
path
:
'/loginByEmail'
,
query
:
to
.
query
})
}
if
(
to
.
name
==
"loginByPhone"
)
{
if
(
i18n
.
locale
==
"en"
)
router
.
replace
({
path
:
'/loginByEmail'
,
query
:
to
.
query
});
if
(
en
==
"en"
)
router
.
replace
({
path
:
'/loginByEmail'
,
query
:
to
.
query
});
}
if
(
to
.
name
==
"loginByEmail"
)
{
if
(
i18n
.
locale
==
"zh-CN"
)
router
.
replace
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
if
(
en
==
"zh-CN"
)
router
.
replace
({
path
:
'/loginByPhone'
,
query
:
to
.
query
});
}
}
if
(
to
.
name
==
"mineIndex"
&&
!
this
.
getUserInfoCookieType
()
&&
this
.
judgeBrandIsWechatOrHtml
()
==
1
)
router
.
replace
({
path
:
'/circleList'
})
...
...
src/components/mobile/mobileTop.vue
View file @
cd6ca9ec
...
...
@@ -26,7 +26,7 @@
name
:
"mobileTop"
,
data
()
{
return
{
lang
:
this
.
$i18n
.
locale
,
lang
:
!
(
/miniProgram/i
.
test
(
navigator
.
userAgent
))?
this
.
$i18n
.
locale
:
this
.
publicFun
.
getCookie
(
"language"
)
,
userInfo
:
this
.
publicFun
.
getUserInfoCookieType
()
?
JSON
.
parse
(
this
.
Base64
.
decode
(
this
.
publicFun
.
getUserInfoCookieType
()))
:
null
,
drawer
:
false
,
direction
:
'ltr'
,
...
...
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