Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
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
baiguangyao
mr-julyedu
Commits
99176958
Commit
99176958
authored
Sep 17, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'utm' of gitlab.julyedu.com:baiguangyao/mr-julyedu into pre
parents
bd49ef3d
1774675f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/App.js
+2
-2
No files found.
src/App.js
View file @
99176958
...
@@ -55,10 +55,11 @@ class App extends Component {
...
@@ -55,10 +55,11 @@ class App extends Component {
}
}
this
.
getUser
()
this
.
getUser
()
this
.
utm
()
const
routeMatchRule
=
/binding-tel|forgot|set-password/
const
routeMatchRule
=
/binding-tel|forgot|set-password/
const
{
history
}
=
this
.
props
const
{
history
}
=
this
.
props
history
.
listen
((
location
)
=>
{
history
.
listen
((
location
)
=>
{
this
.
utm
()
this
.
setNavigationRecord
(
location
)
this
.
setNavigationRecord
(
location
)
if
(
cookie
.
get
(
'uid'
)
&&
this
.
props
.
user
.
hasError
)
{
if
(
cookie
.
get
(
'uid'
)
&&
this
.
props
.
user
.
hasError
)
{
this
.
getUser
()
this
.
getUser
()
...
@@ -150,7 +151,6 @@ class App extends Component {
...
@@ -150,7 +151,6 @@ class App extends Component {
}
}
componentDidUpdate
()
{
componentDidUpdate
()
{
this
.
utm
()
const
{
location
}
=
this
.
props
const
{
location
}
=
this
.
props
this
.
previousLocation
=
location
.
pathname
.
startsWith
(
'/passport'
)
?
this
.
previousLocation
=
location
.
pathname
.
startsWith
(
'/passport'
)
?
this
.
previousLocation
.
pathname
===
'/'
?
location
:
this
.
previousLocation
:
location
this
.
previousLocation
.
pathname
===
'/'
?
location
:
this
.
previousLocation
:
location
...
...
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