Commit 98ea725f by zhanghaozhe

Merge branch '00'

parents 863968cb e10f88bc
...@@ -2,6 +2,7 @@ import React, { Component } from 'react'; ...@@ -2,6 +2,7 @@ import React, { Component } from 'react';
import classnames from 'classnames'; import classnames from 'classnames';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import './team.scss'; import './team.scss';
import { getParam } from "@/utils"
class TreasureTeam extends Component { class TreasureTeam extends Component {
constructor(props) { constructor(props) {
...@@ -69,7 +70,7 @@ class TreasureTeam extends Component { ...@@ -69,7 +70,7 @@ class TreasureTeam extends Component {
} }
render() { render() {
const { const {
team: { team: {
is_captain, is_captain,
status, status,
...@@ -81,7 +82,7 @@ class TreasureTeam extends Component { ...@@ -81,7 +82,7 @@ class TreasureTeam extends Component {
}, },
currentMember currentMember
} = this.state; } = this.state;
const { const {
toSplitTreasure, toSplitTreasure,
userInfo, userInfo,
children children
...@@ -92,7 +93,7 @@ class TreasureTeam extends Component { ...@@ -92,7 +93,7 @@ class TreasureTeam extends Component {
!is_captain && !is_captain &&
<i className="team-friend"></i> <i className="team-friend"></i>
} }
{/* 组队状态 */} {/* 组队状态 */}
{ {
status === 1 status === 1
...@@ -106,7 +107,7 @@ class TreasureTeam extends Component { ...@@ -106,7 +107,7 @@ class TreasureTeam extends Component {
? <h2 className="team-title">{team_num}号队伍</h2> ? <h2 className="team-title">{team_num}号队伍</h2>
: <h2 className="team-title">好友队伍</h2> : <h2 className="team-title">好友队伍</h2>
} }
{/* 队员情况 */} {/* 队员情况 */}
{ {
...@@ -117,7 +118,7 @@ class TreasureTeam extends Component { ...@@ -117,7 +118,7 @@ class TreasureTeam extends Component {
<div className="team-member"> <div className="team-member">
{ {
member.map((item, index) => ( member.map((item, index) => (
<div <div
className={this.computedClass(item.uid)} className={this.computedClass(item.uid)}
onClick={() => this.toCheckPrize(item.uid)} onClick={() => this.toCheckPrize(item.uid)}
key={index} key={index}
...@@ -134,12 +135,16 @@ class TreasureTeam extends Component { ...@@ -134,12 +135,16 @@ class TreasureTeam extends Component {
<div className="team-footer" data-layout={is_open? 'column': 'row'}> <div className="team-footer" data-layout={is_open? 'column': 'row'}>
{/* 队伍未满 */} {/* 队伍未满 */}
{ {
status === 1 && status === 1 &&
<> <>
{ {
is_captain getParam('version')
? <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</a> ? is_captain
: <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/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>
: 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>
} }
</> </>
} }
......
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