Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00

src/components/activity/newyear-2019/landing/index.js

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