活动结束状态

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

@@ -276,14 +276,15 @@ class Landing extends Component {
   }
 
 
-  remind = (type = 'create', treasure_code, origin = 1) => {
+  remind = (type = 'create', trearemindsure_code, origin = 1) => {
     const {user} = this.props
     http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
       .then(res => {
         const {data} = res.data
         return data.url
       }).then(text => {
-      QRCode.toDataURL(text)
+      //todo text
+      QRCode.toDataURL('m.julyedu.com')
         .then(url => {
           Popup({
             title: '提醒服务',
@@ -397,7 +398,8 @@ class Landing extends Component {
         lack_member,
         team_num,
         prize_info,
-        my_team
+        my_team,
+        standby_plan
       },
       activityEnd,
       isCaptain
@@ -409,14 +411,23 @@ class Landing extends Component {
     * 3-已加入当前队伍
     * 4-已加入别的队伍
     * */
-
     return (
       <div id={'landing'}>
-        <div id="to-square">
-          <a href='javascript:' onClick={this.toSquare}>前往活动会场，享更多福利！ >></a>
-        </div>
+        {
+          !standby_plan &&
+          <div id="to-square">
+            <a href='javascript:' onClick={this.toSquare}>前往活动会场，享更多福利！ >></a>
+          </div>
+        }
         <BoxContainer>
           <i className="snow-deco"/>
+          {
+            standby_plan &&
+            <>
+              <WhiteSpace className={'standby-space'}/>
+              <div className={'standby-tip'}>点击右上角，选择“在浏览器打开”</div>
+            </>
+          }
           <img className='main-avatar'
                src={head_img} alt=""/>
           {
@@ -474,9 +485,12 @@ class Landing extends Component {
                 <div className="group-des">
                   还差 {lack_member} 名队员即可获得当前宝箱哦~
                 </div>
-                <button type='button' className={'invite-btn'} onClick={this.showShareTip}>
-                  邀请好友加入队伍
-                </button>
+                {
+                  !standby_plan &&
+                  <button type='button' className={'invite-btn'} onClick={this.showShareTip}>
+                    邀请好友加入队伍
+                  </button>
+                }
               </>
             }
             {
@@ -491,14 +505,14 @@ class Landing extends Component {
                   }
                 </div>
                 {
-                  my_team['is_team'] ?
+                  !standby_plan && (my_team['is_team'] ?
                     <button type='button' className={'invite-btn'}
                             onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}>
                       继续组队
                     </button>
                     : <button type='button' className={'invite-btn'} onClick={this.createMyTeam}>
                       创建我的队伍
-                    </button>
+                    </button>)
                 }
               </>
             }
@@ -514,14 +528,14 @@ class Landing extends Component {
                   }
                 </div>
                 {
-                  my_team['is_team'] ?
+                  !standby_plan && (my_team['is_team'] ?
                     <button type='button' className={'invite-btn'}
                             onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}>
                       继续组队
                     </button>
                     : <button type='button' className={'invite-btn'} onClick={this.createMyTeam}>
                       创建我的队伍
-                    </button>
+                    </button>)
                 }
               </>
             }

src/components/activity/newyear-2019/landing/landing.scss

@@ -69,6 +69,34 @@
         }
     }
 
+    .standby-space{
+        height: 55px;
+    }
+
+    .standby-tip {
+        position: relative;
+        width: 270px;
+        height: 32px;
+        background: #FFDE00;
+        border-radius: 5px;
+        margin: 0 auto;
+        line-height: 32px;
+        text-align: center;
+        color: #202426;
+        font-size: 15px;
+        &::after{
+            content: '';
+            display: block;
+            position: absolute;
+            top: -120%;
+            right: -6%;
+            width: 50px;
+            height: 38px;
+            background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/standby-share-tip-icon.png");
+            background-size: contain;
+        }
+    }
+
 
     .group {
         ul.member {

src/components/activity/newyear-2019/treasure-box/team.js

@@ -102,7 +102,9 @@ class TeamInfo extends Component {
         // 直接跳转
 
         if (!getParam('version')) {
-          window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+          //todo 域名
+          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);
         } else {
           window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
         }