Merge branch '00' into dev

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

@@ -28,7 +28,8 @@ class Landing extends Component {
     treasure_code: getParam('treasure_code'),
     activityEnd: false,
     notices: [],
-    rule: ''
+    rule: '',
+    isCaptain: sessionStorage.getItem('status')
   }
 
   componentDidMount() {
@@ -51,6 +52,7 @@ 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()}`)
           }
@@ -157,7 +159,7 @@ class Landing extends Component {
       wxShare({
         title: `@${user.data.username} 邀您一起组队拿豪礼！`,
         desc: `加我我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
-        link: encodeURIComponent(`${window.location.origin}/${location.pathname}?treasure_code=${treasure_code}&origin=2`),
+        link: `${window.location.origin}/${location.pathname}?treasure_code=${treasure_code}&origin=2`,
         imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newIndex/community/tou5_bj.png'
       })
     }
@@ -334,7 +336,8 @@ class Landing extends Component {
         prize_info,
         my_team
       },
-      activityEnd
+      activityEnd,
+      isCaptain
     } = this.state
 
     /*
@@ -355,9 +358,10 @@ class Landing extends Component {
           <img className='main-avatar'
                src={head_img} alt=""/>
           {
-            status === 1 && <div className="des">邀请好友加入队伍，开宝箱领取丰厚奖品~</div>
+            status === 1
+              ? <div className="des">邀请好友加入队伍，开宝箱领取丰厚奖品~</div>
+              : <div className="des">加入我的<span>{team_num}</span>号队伍，一起开宝箱领取丰厚奖品~</div>
           }
-          <div className="des">加入我的<span>{team_num}</span>号队伍，一起开宝箱领取丰厚奖品~</div>
           <Prizes showSystemNotices={false}/>
           <BulletScreen/>
           <div className="group">
@@ -465,7 +469,7 @@ class Landing extends Component {
               </button>
             }
             {
-              prize_info && !activityEnd && <div className="certainly-prompt">
+              !isCaptain && prize_info && !activityEnd && <div className="certainly-prompt">
                 第{prize_info.stage_no}次必中 {prize_info.name}
               </div>
             }
@@ -481,7 +485,9 @@ class Landing extends Component {
           </div>
         </BoxContainer>
         <WhiteSpace size={'xl'}/>
-        <YearCourse></YearCourse>
+        {
+          isCaptain && <YearCourse/>
+        }
       </div>
     )
   }