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
d6a179dc
Commit
d6a179dc
authored
Dec 18, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '00'
parents
763a9790
c0ba710e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/components/activity/newyear-2019/landing/index.js
+4
-4
No files found.
src/components/activity/newyear-2019/landing/index.js
View file @
d6a179dc
...
@@ -147,9 +147,9 @@ class Landing extends Component {
...
@@ -147,9 +147,9 @@ class Landing extends Component {
const
{
history
}
=
this
.
props
const
{
history
}
=
this
.
props
this
.
joinSuccessPopup
&&
this
.
joinSuccessPopup
.
remove
()
this
.
joinSuccessPopup
&&
this
.
joinSuccessPopup
.
remove
()
if
(
getParam
(
'version'
))
{
if
(
getParam
(
'version'
))
{
window
.
location
.
assign
(
`https://
h5
.julyedu.com/year/yearTreasure?id=
${
id
}
&version=
${
getParam
(
'version'
)}
`
)
window
.
location
.
assign
(
`https://
m
.julyedu.com/year/yearTreasure?id=
${
id
}
&version=
${
getParam
(
'version'
)}
`
)
}
else
{
}
else
{
window
.
location
.
assign
(
`https://
h5
.julyedu.com/year/yearTreasure?id=
${
id
}
`
)
window
.
location
.
assign
(
`https://
m
.julyedu.com/year/yearTreasure?id=
${
id
}
`
)
}
}
}
}
...
@@ -380,9 +380,9 @@ class Landing extends Component {
...
@@ -380,9 +380,9 @@ class Landing extends Component {
toSquare
=
()
=>
{
toSquare
=
()
=>
{
const
{
history
}
=
this
.
props
const
{
history
}
=
this
.
props
if
(
!
getParam
(
'version'
))
{
if
(
!
getParam
(
'version'
))
{
window
.
location
.
assign
(
'https://
h5
.julyedu.com/year/yearindex'
)
window
.
location
.
assign
(
'https://
m
.julyedu.com/year/yearindex'
)
}
else
{
}
else
{
window
.
location
.
assign
(
'https://
h5
.julyedu.com/year/yearindex?version='
+
getParam
(
'version'
))
window
.
location
.
assign
(
'https://
m
.julyedu.com/year/yearindex?version='
+
getParam
(
'version'
))
}
}
}
}
...
...
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