Commit 98f910ac by wangshuo

路由 链接 悬浮框

parent cd94994b
...@@ -357,9 +357,9 @@ class MyTreasure extends Component { ...@@ -357,9 +357,9 @@ class MyTreasure extends Component {
handleToInvite = (treasure_code) => { handleToInvite = (treasure_code) => {
const {history} = this.props const {history} = this.props
if (getParam('version')) { 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 { } 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`)
} }
} }
......
...@@ -140,11 +140,11 @@ class TreasureTeam extends Component { ...@@ -140,11 +140,11 @@ class TreasureTeam extends Component {
{ {
getParam('version') getParam('version')
? is_captain ? 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/treasure-box/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=2&version=${getParam('version')}`}>帮好友完成组队</a>
: is_captain : 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/treasure-box/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=2`}>帮好友完成组队</a>
} }
</> </>
} }
......
...@@ -146,9 +146,9 @@ export default class index extends Component { ...@@ -146,9 +146,9 @@ export default class index extends Component {
<div className="banner-treasure"> <div className="banner-treasure">
<div id="banner" className="banner-treasure__header" <div id="banner" className="banner-treasure__header"
style={{backgroundImage: `url(${banner})`}}></div> 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}/> <TreasureNav id="banner" treasure_stage={treasure_stage} activeStage={activity_stage}/>
</div> </div> */}
<div className="banner-treasure__decorate"></div> <div className="banner-treasure__decorate"></div>
</div> </div>
...@@ -162,7 +162,7 @@ export default class index extends Component { ...@@ -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} />
{/*好友加入队伍提醒;获得宝箱提醒;开售提醒弹窗,需要自取,注意修改文案*/} {/*好友加入队伍提醒;获得宝箱提醒;开售提醒弹窗,需要自取,注意修改文案*/}
{ {
......
...@@ -3,8 +3,8 @@ import { withRouter } from 'react-router-dom'; ...@@ -3,8 +3,8 @@ import { withRouter } from 'react-router-dom';
import CommonContainer from './../common/commonContainer/index'; import CommonContainer from './../common/commonContainer/index';
import TreasureRank from './rank'; import TreasureRank from './rank';
import TeamInfo from './team' import TeamInfo from './team'
import Prizes from "@components/activity/newyear-2019/common/prizes" import Prizes from "@components/activity/treasure-box/common/prizes"
import UserBulletScreen from "@components/activity/newyear-2019/common/user-bullet-screen" import UserBulletScreen from "@components/activity/treasure-box/common/user-bullet-screen"
class TreasureBox extends Component { class TreasureBox extends Component {
constructor(props) { constructor(props) {
......
...@@ -102,10 +102,9 @@ class TeamInfo extends Component { ...@@ -102,10 +102,9 @@ class TeamInfo extends Component {
// 直接跳转 // 直接跳转
if (!getParam('version')) { 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/treasure-box/landing?origin=1&treasure_code=' + treasure_code);
window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
} else { } 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{ // 没自己的队伍 }else{ // 没自己的队伍
...@@ -115,10 +114,9 @@ class TeamInfo extends Component { ...@@ -115,10 +114,9 @@ class TeamInfo extends Component {
if (code === 200) { if (code === 200) {
const { treasure_code } = data; const { treasure_code } = data;
if (!getParam('version')) { 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/treasure-box/landing?origin=1&treasure_code=' + treasure_code);
window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
} else { } 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 { } else {
Toast.info(msg); Toast.info(msg);
......
...@@ -308,6 +308,6 @@ export default [ ...@@ -308,6 +308,6 @@ export default [
// 新的开宝箱活动 // 新的开宝箱活动
{ {
path: '/box/boxActive', 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'))
}, },
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment