Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

@@ -107,17 +107,16 @@ exports.getOutletsGoodsList = (params) => {
         breakSort: _.isEmpty(params.breakSort) ? null : params.breakSort,
         breakSort: _.isEmpty(params.breakSort) ? null : params.breakSort,
         productPool: _.isEmpty(params.productPool) ? null : params.productPool,
         productPool: _.isEmpty(params.productPool) ? null : params.productPool,
         price: _.isEmpty(params.price) ? null : params.price,
         price: _.isEmpty(params.price) ? null : params.price,
-        outlets: _.isEmpty(params.outlets) ? 1 : params.outlets,
+        outlets: params.outlets || 1,
         yh_channel: yhChannel[tempChannel].channel
         yh_channel: yhChannel[tempChannel].channel
     };
     };
 
 
     let finalParams = {};
     let finalParams = {};
 
 
     _.forEach(tempParams, function(value, key) {
     _.forEach(tempParams, function(value, key) {
-        if (!_.isEmpty(value)) {
+        if (value) {
             finalParams[key] = value;
             finalParams[key] = value;
         }
         }
     });
     });
-
     return api.get('', sign.apiSign(finalParams));
     return api.get('', sign.apiSign(finalParams));
 };
 };

-<div class="outlets-channel-page outlets-page center-content yoho-page" data-page="channel">
-    <div class="slide-container clearfix">
-        <div class="center-col col">
-            <ul class="slide-wrapper">
-                {{# left}}
-                <li>
-                    <a href="{{href}}" target="_blank">
-                        <img class="lazy" data-original="{{image img 865 450}}">
-                    </a>
-                </li>
-                {{/ left}}
-            </ul>
+<div class="outlets-channel-page outlets-page center-content yoho-page" data-page="girls">
+    {{# topBanner}}
+        <div class="slide-container clearfix">
+            <div class="center-col col">
+                <ul class="slide-wrapper">
+                    {{# left}}
+                    <li>
+                        <a href="{{url}}" target="_blank">
+                            <img src="{{image src 865 450}}">
+                        </a>
+                    </li>
+                    {{/ left}}
+                </ul>
+            </div>
+            <div class="right-col col">
+                {{# right}}
+                <a href="{{url}}" target="_blank">
+                    <img src="{{image src 290 180}}">
+                </a>
+                {{/ right}}
+            </div>
         </div>
         </div>
-        <div class="right-col col">
-            {{# right}}
-            <a href="{{href}}" target="_blank">
-                <img class="lazy" data-original="{{image img 290 180}}">
-            </a>
-            {{/ right}}
-        </div>
-    </div>
+    {{/ topBanner}}
 
 
     {{! 热门品类}}
     {{! 热门品类}}
     {{# hotCategory}}
     {{# hotCategory}}
@@ -30,4 +32,4 @@
 
 
     {{! 最新折扣}}
     {{! 最新折扣}}
     {{> outlets/main-product}}
     {{> outlets/main-product}}
-</div>
+</div>

@@ -47,11 +47,19 @@ function setPageTime() {
     var i, text, showTime;
     var i, text, showTime;
 
 
     for (i = 0; i < limitTime.length; i++) {
     for (i = 0; i < limitTime.length; i++) {
+        if (limitTime[i].time < 0) {
+            return;
+        }
+
         limitTime[i].time -= 1000;
         limitTime[i].time -= 1000;
         showTime = convertTime(limitTime[i].time);
         showTime = convertTime(limitTime[i].time);
-        text = showTime;
-        if (limitTime[i].pre) {
-            text = limitTime[i].pre + ' ' + text;
+        if (showTime) {
+            text = showTime;
+            if (limitTime[i].pre) {
+                text = limitTime[i].pre + ' ' + text;
+            }
+        } else {
+            text = '活动已结束';
         }
         }
         limitTime[i].dom.text(text);
         limitTime[i].dom.text(text);
     }
     }

@@ -42,11 +42,12 @@ exports.processProductList = (list, options) => {
             return;
             return;
         }
         }
 
 
+        //折扣
+        product.discount = (product.salesPrice / product.marketPrice * 10).toFixed(1);
+
         // 市场价和售价一样，则不显示市场价
         // 市场价和售价一样，则不显示市场价
         if (product.marketPrice === product.salesPrice) {
         if (product.marketPrice === product.salesPrice) {
             product.marketPrice = false;
             product.marketPrice = false;
-        } else if (product.marketPrice && product.salesPrice) {
-            product.discount = (product.salesPrice / product.marketPrice * 10).toFixed(1);
         }
         }
 
 
         // 判别默认的商品是否将默认的图片URL赋值到skn
         // 判别默认的商品是否将默认的图片URL赋值到skn