活动资源位样式修改

@@ -96,14 +96,27 @@ const getActivityDetail = (id) => {
 const convertActicityData = (data) => {
     const formatData = [];
 
+    let discountArr = [],
+        discountNum = 0,
+        discountText = 0;
     data = data || [];
     _.forEach(data, (item) => {
+        discountArr = item.promotionName.split('~');
+        if (discountArr.length === 1) {
+            discountNum = discountArr[0].replace(/[^0-9]/g,"");
+            discountText = discountArr[0].replace(/[0-9]/g,"");
+        }else {
+            discountNum = discountArr[0] + '~' +discountArr[1].replace(/[^0-9]/g,"");
+            discountText = discountArr[1].replace(/[0-9]/g,"");
+        }
+
         formatData.push({
             activityUrl: '/product/outlet/activity?id=' + item.id,
             coverUrl: item.coverUrl,
             logoUrl: item.logoUrl,
             title: item.title,
-            promotionName: item.promotionName,
+            discountNum: discountNum,
+            discountText: discountText,
             leftTime: item.startLeftTime > 0 ? item.startLeftTime : item.endLeftTime,
             hide: false
         });

@@ -2,9 +2,8 @@
     <a class="back-ground-white {{#if hide}} hidden {{/if}}" href="{{activityUrl}}" >
         <img class="back-image" src="{{image coverUrl 640 300}}">
         <div class="center-square">
-            <img class="logo" src="{{image logoUrl 85 55}}"></img>
             <div class="title">{{title}}</div>
-            <div class="num">{{promotionName}} </div>
+            <div class="num"><span class="discountNum">{{discountNum}}</span> {{discountText}}</div>
             {{>product/outlet/countdown}}
         </div>
     </a>

@@ -53,15 +53,14 @@
             height: 212px;
         }
 
-        .logo {
-            margin-bottom: 10px;
-            margin-top: 20px;
-        }
-
         .num {
             text-align: center;
-            font-size: 28px;
-            color: #ff0705;;
+            font-size: 25px;
+            color: #ff0705;
+
+            .discountNum {
+                font-size: 40px;
+            }
         }
 
         .title {
@@ -73,6 +72,7 @@
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
+            margin-top: 75px;
         }
 
         .time {
@@ -134,7 +134,7 @@
         .num {
             top: 10px;
             width: 100px;
-            font-size: 30px;
+            font-size: 20px;
             color: #ff0705;
             margin-left: 30px;
         }
@@ -143,7 +143,7 @@
             top: 10px;
             margin-left: 30px;
             width: 200px;
-            font-size: 28px;
+            font-size: 30px;
             font-weight: bold;
             overflow: hidden;
             text-overflow: ellipsis;