Merge branch '00-formal' into dev

src/components/activity/newyear-2019/common/commonContainer/index.scss

@@ -55,6 +55,7 @@
     background-size: contain;
     width: 100%;
     min-height: 25px;
-    padding: 5px 15px;
+    margin: -1px 0;
+    padding: 6px 15px;
   }
 }

src/components/activity/newyear-2019/common/prizes/prizes.scss

@@ -191,7 +191,7 @@
 .common_container {
     .container_content {
         .prizes-box {
-            margin: 0 -20px;
+            margin: 0 -15px;
         }
     }
 }

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

@@ -446,6 +446,7 @@ class MyTreasure extends Component {
     return (
       <div data-skip="treasure">
         {(!browser.isAndroidApp && !browser.isIOSApp) && <HeaderBar title="我的宝箱" arrow={true}/>}
+        <div className="team-empty">
           {
             isEnd &&
             <p className="activity-end__desc">
@@ -462,6 +463,7 @@ class MyTreasure extends Component {
               <button className="team-empty__button" onClick={this.toOrganizeTeam}>组队开宝箱</button>
             </>
           }
+        </div>
         {
           (!isEnd && !isEmpty && userInfo.uid) &&
           <div className="treasure-content">

src/components/activity/newyear-2019/myTreasure/index.scss

@@ -15,18 +15,21 @@
   }
 
   .activity-end__desc {
-    margin: 118px 0 0;
     font-size: 30px;
     color: #fff;
     text-align: center;
     line-height: 42px;
   }
 
+  .team-empty {
+    padding-top: 118px;
+  }
+
   .team-empty__icon {
     display: block;
     width: 56px;
     height: 49px;
-    margin: 118px auto 18px;
+    margin: 0 auto 18px;
     background-size: cover;
     background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/icon-empty.png');
   }

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -905,7 +905,7 @@ class YearCourse extends Component {
                                                                                 </p>
                                                                             }
 
-                                                                            <div className="status">
+                                                                            <div className="status" data-layout={val.type ===4? 'row': '' }>
                                                                                 {
                                                                                     val.type === 0 &&
                                                                                     <a

src/components/activity/newyear-2019/preheat/YearCourse/index.scss

@@ -192,6 +192,21 @@
       padding: 0 5px;
       text-align: left;
 
+      &[data-layout="row"] {
+        display: flex;
+
+        .to-group {
+
+          &:nth-child(1) {
+            margin-right: 2px;
+          }
+
+          &:nth-child(2) {
+            margin-left: 2px;
+          }
+        }
+      }
+
       .status-btn {
         display: inline-block;
         height: 22px;

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

@@ -163,10 +163,11 @@ export default class index extends Component {
 
                 {/* 组队开宝箱 */}
                 {
-                    treasure_stage === 1 && <TreasureBox isAppUpdate={this.state.isAppUpdate} getRemovable={this.getRemovable}/>
+                    treasure_stage === 1 && 
+                    <TreasureBox isAppUpdate={this.state.isAppUpdate} getRemovable={this.getRemovable}/>
                 }
 
-                {/*课程*/}
+                {/* 课程 */}
                 <YearCourse stage={activity_stage} isAppUpdate={this.state.isAppUpdate} />
 
                 {/*好友加入队伍提醒；获得宝箱提醒；开售提醒弹窗，需要自取，注意修改文案*/}

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

@@ -13,7 +13,12 @@ class TreasureBox extends Component {
   render() {
     return (
       <CommonContainer id="year-treasure" title={'组队开宝箱'}>
-        <div style={{textAlign: 'center', fontSize: '12px', color: '#FFDC1E', marginTop: '10px'}}>邀请好友组队一起开宝箱，满5人后将随机获得以下奖品~</div>
+        <div style={{
+          textAlign: 'center', 
+          fontSize: '12px', 
+          color: '#FFDC1E', 
+          marginTop: '10px'
+        }}>邀请好友组队一起开宝箱，满5人后将随机获得以下奖品~</div>
         <Prizes showSystemNotices={true}/>
         <UserBulletScreen/>
         <TeamInfo isAppUpdate={this.props.isAppUpdate} getRemovable={this.props.getRemovable} />

src/components/activity/newyear-2019/year-wish/index.js

@@ -238,7 +238,7 @@ class YarnWish extends Component {
                                                             </p>
                                                         }
 
-                                                        <div className="status">
+                                                        <div className="status" data-layout={item.type === 4? 'row' : ''}>
                                                             {
                                                                 item.type === 0 &&
                                                                 <a

src/components/activity/newyear-2019/year-wish/index.scss

@@ -39,6 +39,20 @@ html, body, #root {
       text-align: center;
     }
 
+    .bargain-price {
+      position: absolute;
+      left: 4px;
+      top: 10px;
+      margin: 0;
+      height: 18px;
+      padding: 0 8px;
+      border-radius: 0 9px 9px 0;
+      font-size: 12px;
+      color: #fff;
+      line-height: 18px;
+      background-color: #F01D0E;
+    }
+
     .coupon-course__footer {
       .course-title {
         padding-left: 10px;
@@ -189,6 +203,21 @@ html, body, #root {
       padding: 0 5px;
       text-align: left;
 
+      &[data-layout="row"] {
+        display: flex;
+
+        .to-group {
+
+          &:nth-child(1) {
+            margin-right: 2px;
+          }
+
+          &:nth-child(2) {
+            margin-left: 2px;
+          }
+        }
+      }
+
       .status-btn {
         display: inline-block;
         height: 22px;