Commit e90640ef by zhanghaozhe

分享页

parent 954011c4
...@@ -29,7 +29,7 @@ class Landing extends Component { ...@@ -29,7 +29,7 @@ class Landing extends Component {
activityEnd: false, activityEnd: false,
notices: [], notices: [],
rule: '', rule: '',
isCaptain: sessionStorage.getItem('status') isCaptain: getParam('origin') == 1
} }
componentDidMount() { componentDidMount() {
...@@ -37,7 +37,7 @@ class Landing extends Component { ...@@ -37,7 +37,7 @@ class Landing extends Component {
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if(prevProps.user.hasError !== this.props.user.hasError && !this.props.user.hasError){ if (prevProps.user.hasError !== this.props.user.hasError && !this.props.user.hasError) {
this.fetchPageData() this.fetchPageData()
} }
} }
...@@ -58,7 +58,6 @@ class Landing extends Component { ...@@ -58,7 +58,6 @@ class Landing extends Component {
let searchParams = new URLSearchParams(window.location.search) let searchParams = new URLSearchParams(window.location.search)
if (searchParams.get('origin') === '1' && !browser.isWeixin) { if (searchParams.get('origin') === '1' && !browser.isWeixin) {
sessionStorage.setItem('isCaptain', '1')
searchParams.set('origin', '2') searchParams.set('origin', '2')
window.history.replaceState(null, '', `landing?${searchParams.toString()}`) window.history.replaceState(null, '', `landing?${searchParams.toString()}`)
} }
...@@ -345,7 +344,6 @@ class Landing extends Component { ...@@ -345,7 +344,6 @@ class Landing extends Component {
activityEnd, activityEnd,
isCaptain isCaptain
} = this.state } = this.state
/* /*
* status * status
* 1-自己的队伍 * 1-自己的队伍
...@@ -475,7 +473,7 @@ class Landing extends Component { ...@@ -475,7 +473,7 @@ class Landing extends Component {
</button> </button>
} }
{ {
!isCaptain && prize_info && !activityEnd && <div className="certainly-prompt"> prize_info && !activityEnd && !isCaptain && <div className="certainly-prompt">
{prize_info.stage_no}次必中 {prize_info.name} {prize_info.stage_no}次必中 {prize_info.name}
</div> </div>
} }
...@@ -490,9 +488,13 @@ class Landing extends Component { ...@@ -490,9 +488,13 @@ class Landing extends Component {
} }
</div> </div>
</BoxContainer> </BoxContainer>
<WhiteSpace size={'xl'}/>
{ {
isCaptain && <YearCourse/> !isCaptain &&
<>
<WhiteSpace size={'xl'}/>
<YearCourse getSum={() => {
}}/>
</>
} }
</div> </div>
) )
......
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