Merge remote-tracking branch 'origin/master'

@@ -124,27 +124,29 @@ const _convertActicityData = (data) => {
 
 
     data = data || [];
     data = data || [];
     _.forEach(data, (item) => {
     _.forEach(data, (item) => {
-        discountArr = item.promotionName.split('~');
-        if (discountArr.length === 1) {
-            discountNum = _transDiscountToArr(discountArr[0])[0];
-            discountText = _transDiscountToArr(discountArr[0])[1];
-        } else {
-            discountNum = discountArr[0] + '~' + _transDiscountToArr(discountArr[1])[0];
-            discountText = _transDiscountToArr(discountArr[1])[1];
+        if (item.promotionName) {
+            discountArr = item.promotionName.split('~');
+            if (discountArr.length === 1) {
+                discountNum = _transDiscountToArr(discountArr[0])[0];
+                discountText = _transDiscountToArr(discountArr[0])[1];
+            } else {
+                discountNum = discountArr[0] + '~' + _transDiscountToArr(discountArr[1])[0];
+                discountText = _transDiscountToArr(discountArr[1])[1];
+            }
+
+
+            formatData.push({
+                activityUrl: '/product/outlet/activity?id=' + item.id,
+                coverUrl: item.coverUrl,
+                logoUrl: item.logoUrl,
+                title: item.title,
+                discountNum: discountNum,
+                discountText: discountText,
+                productPoolId: item.productPoolId || '',
+                leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime,
+                hide: false
+            });
         }
         }
-
-
-        formatData.push({
-            activityUrl: '/product/outlet/activity?id=' + item.id,
-            coverUrl: item.coverUrl,
-            logoUrl: item.logoUrl,
-            title: item.title,
-            discountNum: discountNum,
-            discountText: discountText,
-            productPoolId: item.productPoolId || '',
-            leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime,
-            hide: false
-        });
     });
     });
 
 
     return formatData;
     return formatData;

@@ -4,8 +4,14 @@
         <div class="center-square">
         <div class="center-square">
             <div class="title">{{title}}</div>
             <div class="title">{{title}}</div>
             <div class="num"><span class="discount-num">{{discountNum}}</span> {{discountText}}</div>
             <div class="num"><span class="discount-num">{{discountNum}}</span> {{discountText}}</div>
-            {{>product/outlet/countdown}}
+            <div id="demo1">
+                <!--默认，服务端输出leftTime，把客户端时间干扰降到最低。单位秒-->
+                <div class="cd cd-lite time hide" data-config="{'leftTime': {{leftTime}} }">— 仅剩<span class="left-day">${d}天</span>${h}时${m}分${s}秒 —</div>
+                <div class="cd cd-medium time hide">{{leftTime}}</div>
+            </div>
         </div>
         </div>
     </a>
     </a>
 </div>
 </div>
+{{#if @last}}
 <div class="more-activity hide"><p>更多精彩活动</p><span class="iconfont count-down-icon">&#xe609;</span></div>
 <div class="more-activity hide"><p>更多精彩活动</p><span class="iconfont count-down-icon">&#xe609;</span></div>
+{{/if}}

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "4.8.8",
+  "version": "4.8.9",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -14,8 +14,9 @@
             display:inline-block;
             display:inline-block;
             width: 20px;
             width: 20px;
             height: 20px;
             height: 20px;
-            background: url('/channel/tip.png') no-repeat;
-            background-size: 20px 20px;
+            background: url('/channel/tip.png');
+            background-repeat: no-repeat;
+            background-size: contain;
             vertical-align: -2px;
             vertical-align: -2px;
             margin-right: 8px;
             margin-right: 8px;
         }
         }
@@ -32,7 +33,8 @@
 
 
         .chan {
         .chan {
             background-image: url('/channel/up-icon.png');
             background-image: url('/channel/up-icon.png');
-            background-size: 31px 31px;
+            background-repeat: no-repeat;
+            background-size: contain;
             position: absolute;
             position: absolute;
             top: 50%;
             top: 50%;
             margin-top: -15px;
             margin-top: -15px;