Skip to content

M
mr-julyedu
Commit 7a540213 by zhanghaozhe
Options

Merge branch 'box' into box-zhz 

# Conflicts:
#	src/components/activity/treasure-box/treasure-box/team.js
#	src/router/router-config.js
parents 1a117cc8 144c7b62
Showing with 25 additions and 37 deletions
src/components/activity/treasure-box/myTreasure/index.js
...@@ -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`)
} }
} }
......
src/components/activity/treasure-box/myTreasure/prize.js
...@@ -86,7 +86,7 @@ export default (props) => { ...@@ -86,7 +86,7 @@ export default (props) => {
{/* 第三：奖品，任意线上课程兑换券 */} {/* 第三：奖品，任意线上课程兑换券 */}
{ {
(!bind_phone && !bind_address && prize_type === 5) && (!bind_phone && !bind_address && prize_type === 5) &&
<a className="team-result">关注公众号“七月在线实验室” 回复“领课” <a className="team-result">请按上图提示领取奖品
</a> </a>
} }
</> </>
......
src/components/activity/treasure-box/myTreasure/team.js
...@@ -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>
} }
</> </>
} }
......
src/components/activity/treasure-box/preheat/index.js
...@@ -146,14 +146,14 @@ export default class index extends Component { ...@@ -146,14 +146,14 @@ 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>
{/* 大咖直播 */} {/* 大咖直播 */}
<LiveRoom isAppUpdate={this.state.isAppUpdate}/> {/* <LiveRoom isAppUpdate={this.state.isAppUpdate}/> */}
{/* 组队开宝箱 */} {/* 组队开宝箱 */}
{ {
...@@ -185,7 +185,7 @@ export default class index extends Component { ...@@ -185,7 +185,7 @@ export default class index extends Component {
<div className='sub__code_container'> <div className='sub__code_container'>
<p className='sub__title'>组队开宝箱活动规则</p> <p className='sub__title'>组队开宝箱活动规则</p>
<p className='sub__rule'> <p className='sub__rule'>
1. 活动期间（12月18日-12月31日）可随时参与开宝箱；<br/> 1. 活动期间（3月26日-3月31日）可随时参与开宝箱；<br/>
2. 当前队伍满员后可继续创建新队伍；<br/> 2. 当前队伍满员后可继续创建新队伍；<br/>
3. 每人有一次机会加入好友的队伍；<br/> 3. 每人有一次机会加入好友的队伍；<br/>
4. 队伍满员后所有成员均可随机获得宝箱内奖品，队长奖励更丰厚哦~<br/> 4. 队伍满员后所有成员均可随机获得宝箱内奖品，队长奖励更丰厚哦~<br/>
......
src/components/activity/treasure-box/treasure-box/index.js
...@@ -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) {
......
src/components/activity/treasure-box/treasure-box/team.js
...@@ -105,7 +105,7 @@ class TeamInfo extends Component { ...@@ -105,7 +105,7 @@ class TeamInfo extends Component {
this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code); 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/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 +115,9 @@ class TeamInfo extends Component { ...@@ -115,10 +115,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);
......
src/router/router-config.js
...@@ -305,30 +305,19 @@ export default [ ...@@ -305,30 +305,19 @@ export default [
exact: true, exact: true,
component: loadable(() => import(/*limit-free*/'@/components/limit-free')) component: loadable(() => import(/*limit-free*/'@/components/limit-free'))
}, },
// 新的开宝箱活动-活动页
//拆宝箱
{ {
path: '/activity/treasure/landing', path: '/box/boxActive',
component: loadable(() => import(/* webpackChunkName: 'newyear-2019-landing'*/ '@components/activity/treasure-box/landing/index')) component: loadable(() => import(/* webpackChunkName: 'treasure-box' */ '@components/activity/treasure-box/preheat/index'))
}, },
// 新的开宝箱活动-我的宝箱
// 双旦活动预热页面
{
path: '/treasureIndex',
component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/treasure-box/preheat/index'))
},
// 我的宝箱
{ {
path: '/year/yearTreasure', path: '/box/yearTreasure',
component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/treasure-box/myTreasure/index')) component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/treasure-box/myTreasure/index'))
} },
, // 新的开宝箱活动-扫码、分享页
// 双旦心愿单
{ {
path: '/year/yearWish', path: '/box/landing',
component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/treasure-box/year-wish/index')) component: loadable(() => import(/* webpackChunkName: 'newyear-2019-landing'*/ '@components/activity/treasure-box/landing/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