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
98f910ac
Commit
98f910ac
authored
Mar 24, 2020
by
wangshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
路由 链接 悬浮框
parent
cd94994b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
18 deletions
+16
-18
src/components/activity/treasure-box/myTreasure/index.js
+2
-2
src/components/activity/treasure-box/myTreasure/team.js
+4
-4
src/components/activity/treasure-box/preheat/YearCourse/index.js
+0
-0
src/components/activity/treasure-box/preheat/index.js
+3
-3
src/components/activity/treasure-box/treasure-box/index.js
+2
-2
src/components/activity/treasure-box/treasure-box/team.js
+4
-6
src/router/router-config.js
+1
-1
No files found.
src/components/activity/treasure-box/myTreasure/index.js
View file @
98f910ac
...
...
@@ -357,9 +357,9 @@ class MyTreasure extends Component {
handleToInvite
=
(
treasure_code
)
=>
{
const
{
history
}
=
this
.
props
if
(
getParam
(
'version'
))
{
window
.
location
.
assign
(
`https://h5.julyedu.com/activity/
newyear-2019
/landing?treasure_code=
${
treasure_code
}
&origin=1&version=
${
getParam
(
'version'
)}
`
)
window
.
location
.
assign
(
`https://h5.julyedu.com/activity/
treasure-box
/landing?treasure_code=
${
treasure_code
}
&origin=1&version=
${
getParam
(
'version'
)}
`
)
}
else
{
window
.
location
.
assign
(
`https://h5.julyedu.com/activity/
newyear-2019
/landing?treasure_code=
${
treasure_code
}
&origin=1`
)
window
.
location
.
assign
(
`https://h5.julyedu.com/activity/
treasure-box
/landing?treasure_code=
${
treasure_code
}
&origin=1`
)
}
}
...
...
src/components/activity/treasure-box/myTreasure/team.js
View file @
98f910ac
...
...
@@ -140,11 +140,11 @@ class TreasureTeam extends Component {
{
getParam
(
'version'
)
?
is_captain
?
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
newyear-2019
/landing?treasure_code=
${
treasure_code
}
&origin=1&version=
${
getParam
(
'version'
)}
`
}
>
继续邀请队友
<
/a
>
:
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
newyear-2019
/landing?treasure_code=
${
treasure_code
}
&origin=2&version=
${
getParam
(
'version'
)}
`
}
>
帮好友完成组队
<
/a
>
?
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
treasure-box
/landing?treasure_code=
${
treasure_code
}
&origin=1&version=
${
getParam
(
'version'
)}
`
}
>
继续邀请队友
<
/a
>
:
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
treasure-box
/landing?treasure_code=
${
treasure_code
}
&origin=2&version=
${
getParam
(
'version'
)}
`
}
>
帮好友完成组队
<
/a
>
:
is_captain
?
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
newyear-2019
/landing?treasure_code=
${
treasure_code
}
&origin=1`
}
>
继续邀请队友
<
/a
>
:
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
newyear-2019
/landing?treasure_code=
${
treasure_code
}
&origin=2`
}
>
帮好友完成组队
<
/a
>
?
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
treasure-box
/landing?treasure_code=
${
treasure_code
}
&origin=1`
}
>
继续邀请队友
<
/a
>
:
<
a
className
=
"team-button"
href
=
{
`https://h5.julyedu.com/activity/
treasure-box
/landing?treasure_code=
${
treasure_code
}
&origin=2`
}
>
帮好友完成组队
<
/a
>
}
<
/
>
}
...
...
src/components/activity/treasure-box/preheat/YearCourse/index.js
View file @
98f910ac
This diff is collapsed.
Click to expand it.
src/components/activity/treasure-box/preheat/index.js
View file @
98f910ac
...
...
@@ -146,9 +146,9 @@ export default class index extends Component {
<
div
className
=
"banner-treasure"
>
<
div
id
=
"banner"
className
=
"banner-treasure__header"
style
=
{{
backgroundImage
:
`url(
${
banner
}
)`
}}
><
/div
>
<
div
className
=
"banner-treasure__nav"
>
{
/*
<div className="banner-treasure__nav">
<TreasureNav id="banner" treasure_stage={treasure_stage} activeStage={activity_stage}/>
<
/div
>
</div>
*/
}
<
div
className
=
"banner-treasure__decorate"
><
/div
>
<
/div
>
...
...
@@ -162,7 +162,7 @@ export default class index extends Component {
}
{
/* 课程 */
}
{
/* <YearCourse stage={activity_stage} treasureStage={treasure_stage} isAppUpdate={this.state.isAppUpdate} /> */
}
<
YearCourse
stage
=
{
activity_stage
}
treasureStage
=
{
treasure_stage
}
isAppUpdate
=
{
this
.
state
.
isAppUpdate
}
/
>
{
/*好友加入队伍提醒;获得宝箱提醒;开售提醒弹窗,需要自取,注意修改文案*/
}
{
...
...
src/components/activity/treasure-box/treasure-box/index.js
View file @
98f910ac
...
...
@@ -3,8 +3,8 @@ import { withRouter } from 'react-router-dom';
import
CommonContainer
from
'./../common/commonContainer/index'
;
import
TreasureRank
from
'./rank'
;
import
TeamInfo
from
'./team'
import
Prizes
from
"@components/activity/
newyear-2019
/common/prizes"
import
UserBulletScreen
from
"@components/activity/
newyear-2019
/common/user-bullet-screen"
import
Prizes
from
"@components/activity/
treasure-box
/common/prizes"
import
UserBulletScreen
from
"@components/activity/
treasure-box
/common/user-bullet-screen"
class
TreasureBox
extends
Component
{
constructor
(
props
)
{
...
...
src/components/activity/treasure-box/treasure-box/team.js
View file @
98f910ac
...
...
@@ -102,10 +102,9 @@ class TeamInfo extends Component {
// 直接跳转
if
(
!
getParam
(
'version'
))
{
// this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code='
+
treasure_code
);
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/treasure-box/landing?origin=1&treasure_code='
+
treasure_code
);
}
else
{
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/
newyear-2019
/landing?origin=1&treasure_code='
+
treasure_code
+
'&version='
+
getParam
(
'version'
));
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/
treasure-box
/landing?origin=1&treasure_code='
+
treasure_code
+
'&version='
+
getParam
(
'version'
));
}
}
else
{
// 没自己的队伍
...
...
@@ -115,10 +114,9 @@ class TeamInfo extends Component {
if
(
code
===
200
)
{
const
{
treasure_code
}
=
data
;
if
(
!
getParam
(
'version'
))
{
// this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code='
+
treasure_code
);
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/treasure-box/landing?origin=1&treasure_code='
+
treasure_code
);
}
else
{
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/
newyear-2019
/landing?origin=1&treasure_code='
+
treasure_code
+
'&version='
+
getParam
(
'version'
));
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/
treasure-box
/landing?origin=1&treasure_code='
+
treasure_code
+
'&version='
+
getParam
(
'version'
));
}
}
else
{
Toast
.
info
(
msg
);
...
...
src/router/router-config.js
View file @
98f910ac
...
...
@@ -308,6 +308,6 @@ export default [
// 新的开宝箱活动
{
path
:
'/box/boxActive'
,
component
:
loadable
(()
=>
import
(
/* webpackChunkName: '
newyear-yearIndex' */
'@components/activity/
box/preheat/index'
))
component
:
loadable
(()
=>
import
(
/* webpackChunkName: '
treasure-box' */
'@components/activity/treasure-
box/preheat/index'
))
},
]
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