formal activity basic complete

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

@@ -49,11 +49,12 @@
     width: 100%;
     height: 22px;
   }
+
   .container_content {
     background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_middle_bj.png");
     background-size: contain;
     width: 100%;
     min-height: 25px;
-    padding: 5px 20px;
+    padding: 5px 15px;
   }
 }

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

@@ -6,7 +6,7 @@
     flex-wrap: wrap;
 
     .course-container {
-      width: 158px;
+      width: 168px;
       margin: 15px 0 0 0;
       text-align: center;
       position: relative;
@@ -27,6 +27,20 @@
       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;
@@ -144,58 +158,29 @@
     }
 
     .price {
-      text-align: left;
-      padding-left: 5px;
       margin-top: 3px;
-      color: #FF0002;
+      padding-left: 4px;
       font-size: 12px;
+      color: #FF0002;
+      text-align: left;
 
       &.price-group {
+        font-size: 0;
         height: 30px;
       }
 
-      .new-price {
-        font-size: 18px;
-      }
-
-      .old-price {
-        font-size: 12px;
-        color: #666;
-        margin-left: 8px;
-      }
-    }
-
-    
-
       .price-label {
-      position: relative;
-      width: 49px;
-      height: 14px;
-      margin: 5px 0 0 19px;
-      line-height: 14px;
-      background-color: #357345;
-
-      span {
         font-size: 12px;
-        color: #fff;
       }
 
-      &::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: -14px;
-        border: 7px solid;
-        border-color: transparent #357345 #357345 transparent;
+      .new-price {
+        font-size: 16px;
       }
 
-      &::after {
-        content: '';
-        position: absolute;
-        top: 0;
-        right: -14px;
-        border: 7px solid;
-        border-color: #357345 transparent transparent #357345;
+      .old-price {
+        margin-left: 2px;
+        font-size: 12px;
+        color: #666;
       }
     }
 

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

@@ -18,7 +18,7 @@ html, body, #root {
     flex-wrap: wrap;
 
     .course-container {
-      width: 158px;
+      width: 168px;
       margin: 15px 0 0 0;
       text-align: center;
       position: relative;
@@ -148,31 +148,46 @@ html, body, #root {
         transform: skewX(-20deg);
         z-index: -1;
       }
+
+      .tag[data-color="green"]:before {
+        background-color: #357345;
+      }
     }
 
     .price {
-      text-align: left;
-      padding-left: 5px;
       margin-top: 3px;
+      padding-left: 4px;
+      font-size: 12;
       color: #FF0002;
+      text-align: left;
+
+      &.price-group {
+        font-size: 0;
+        height: 30px;
+      }
+
+      .price-label {
         font-size: 12px;
+      }
 
       .new-price {
-        font-size: 18px;
+        font-size: 16px;
       }
 
       .old-price {
+        margin-left: 2px;
         font-size: 12px;
         color: #666;
-        margin-left: 8px;
       }
     }
 
     .status {
-      text-align: left;
-      padding-left: 5px;
       position: absolute;
+      left: 0;
       bottom: 10px;
+      right: 0;
+      padding: 0 5px;
+      text-align: left;
 
       .status-btn {
         display: inline-block;
@@ -189,6 +204,30 @@ html, body, #root {
         background-color: #FF8080;
       }
 
+      .to-group {
+        display: block;
+        width: 100%;
+        height: 22px;
+        border-radius: 11px;
+        box-sizing: border-box;
+        font-size: 14px;
+        color: #fff;
+        text-align: center;
+        line-height: 22px;
+        background: linear-gradient(-90deg,rgba(235,22,18,1) 0%,rgba(255,0,2,1) 100%);
+
+        &[data-status="study"] {
+          background: #0099FF;
+        }
+
+        &[data-status="done"] {
+          border: 1px solid #090F08;
+          font-size: 12px;
+          color: #090F08;
+          background: #FEE41D;
+        }
+      }
+
     }
   }
 

src/components/detail/index.js

@@ -447,7 +447,6 @@ class Detail extends Component {
                     this.fetchCourseInfo();
                 } else {
                     history.replace('/shopcart');
-                    ß
                 }
             } else if (res.data.code === 15001) {
                 history.replace('/shopcart');