Merge branch 'feature/freeMailAct' into 'release/6.0'

样式调整



See merge request !753

@@ -21,8 +21,8 @@ module.exports = class extends global.yoho.BaseModel {
                 if (result && result.code === 200) {
                 if (result && result.code === 200) {
 
 
                     _.forEach(result.data.freePostCoupons, function(data) {
                     _.forEach(result.data.freePostCoupons, function(data) {
-                        data.startTime = moment.unix(data.startTime).format('YYYY.M.D');
-                        data.endTime = moment.unix(data.endTime).format('YYYY.M.D');
+                        data.startTime = moment.unix(data.startTime).format('YYYY.MM.DD');
+                        data.endTime = moment.unix(data.endTime).format('YYYY.MM.DD');
                     });
                     });
 
 
                     return result.data;
                     return result.data;

 .free-mail-index-page {
 .free-mail-index-page {
     .top-banner {
     .top-banner {
         width: 100%;
         width: 100%;
-        height: 375px;
+        height: 373px;
         background-image: resolve("activity/free-mail/banner.png");
         background-image: resolve("activity/free-mail/banner.png");
         background-size: 100%;
         background-size: 100%;
         background-repeat: no-repeat;
         background-repeat: no-repeat;

@@ -9,9 +9,8 @@
 
 
         .coupon-name {
         .coupon-name {
             display: inline-block;
             display: inline-block;
-            font-size: 45px;
+            font-size: 47px;
             color: #fff;
             color: #fff;
-            font-family: "SourceHanSansCN";
             transform: rotate(-9.5deg);
             transform: rotate(-9.5deg);
             margin: 40px 0 0 186px;
             margin: 40px 0 0 186px;
             font-weight: 700;
             font-weight: 700;
@@ -20,7 +19,7 @@
     }
     }
 
 
     .coupon-list {
     .coupon-list {
-        padding: 0 25px 150px;
+        padding: 0 23px 150px;
         color: #fff;
         color: #fff;
 
 
         .coupon-item {
         .coupon-item {
@@ -34,35 +33,39 @@
 
 
         .item-left {
         .item-left {
             padding-left: 110px;
             padding-left: 110px;
-            font-family: "SourceHanSansCN";
             width: 340px;
             width: 340px;
             height: 100%;
             height: 100%;
-            display: inline-block;
+            float: left;
         }
         }
 
 
         .name {
         .name {
-            font-size: 42px;
+            font-size: 41px;
             font-weight: 700;
             font-weight: 700;
             display: inline-block;
             display: inline-block;
-            max-width: 205px;
+            max-width: 100%;
             overflow: hidden;
             overflow: hidden;
             white-space: nowrap;
             white-space: nowrap;
             text-overflow: ellipsis;
             text-overflow: ellipsis;
-            padding-top: 10px;
+            padding-top: 20px;
             width: 100%;
             width: 100%;
         }
         }
 
 
         .time {
         .time {
             font-size: 12px;
             font-size: 12px;
+            width: 310px;
+            transform: scale(0.85, 0.85);
+            display: inline-block;
+            margin-left: -24px;
         }
         }
 
 
         .item-right {
         .item-right {
             height: 100%;
             height: 100%;
-            display: inline-block;
+            display: block;
             font-size: 101px;
             font-size: 101px;
-            font-family: "IKEASans";
-            padding-left: 74px;
+            padding-left: 90px;
             font-weight: 800;
             font-weight: 800;
+            width: 170px;
+            float: left;
         }
         }
     }
     }