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

@@ -12,17 +12,7 @@
                 <ul class="clearfix swiper-wrapper">
                     {{# starAvatar}}
                         <li class="swiper-slide">
-                            <a class="rank-avatar" href='{{url}}' data-avatar="{{image cover 180 180}}"></a>
-                        </li>
-                    {{/ starAvatar}}
-                    {{# starAvatar}}
-                        <li class="swiper-slide">
-                            <a class="rank-avatar" href='{{url}}' data-avatar="{{image cover 180 180}}"></a>
-                        </li>
-                    {{/ starAvatar}}
-                    {{# starAvatar}}
-                        <li class="swiper-slide">
-                            <a class="rank-avatar" href='{{url}}' data-avatar="{{image cover 180 180}}"></a>
+                            <span class="rank-avatar" data-url='{{url}}' data-avatar="{{image cover 180 180}}"></span>
                         </li>
                     {{/ starAvatar}}
                 </ul>

@@ -56,8 +56,8 @@ exports.activityList = (req, res) => {
     });
     let categoryId = req.query.category_id;
     let type = req.query.type || 2;
-    let template = type === 2 ? 'outlet/will-end' : 'outlet/will-start';
-    let page = type === 2 ? 'outlet-will-end' : 'outlet-will-start';
+    let template = parseInt(type, 10) === 2 ? 'outlet/will-end' : 'outlet/will-start';
+    let page = parseInt(type, 10) === 2 ? 'outlet-will-end' : 'outlet-will-start';
 
     if (!categoryId) {
         throw new Error('No parent_id for OUTLET channel page!');

@@ -11,4 +11,9 @@
             </div>
         </a>
     {{/ activity}}
+
+    <div class="empty hide">
+         <div class="bag"></div>
+         <p>活动正在火热中进行,左滑切换频道,更多潮品,就在YOHO!BUY有货</p>
+    </div>
 </div>

@@ -3,5 +3,10 @@
     {{# activity}}
         {{> resources/acivity-outlets}}
     {{/ activity}}
+
+    <div class="empty hide">
+        <div class="bag"></div>
+        <p>活动正在火热中进行,左滑切换频道,更多潮品,就在YOHO!BUY有货</p>
+    </div>
 </div>
 

@@ -3,7 +3,7 @@
         <img class="back-image" src="{{image coverUrl 640 300}}">
         <div class="center-square">
             <div class="title">{{title}}</div>
-            <div class="num"><span class="discountNum">{{discountNum}}</span> {{discountText}}</div>
+            <div class="num"><span class="discount-num">{{discountNum}}</span> {{discountText}}</div>
             {{>product/outlet/countdown}}
         </div>
     </a>

-!function(t){function e(i){if(n[i])return n[i].exports;var r=n[i]={exports:{},id:i,loaded:!1};return t[i].call(r.exports,r,r.exports,e),r.loaded=!0,r.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}({0:function(t,e,n){var i=n(2),r=n(32),o=n(11),s=n(33),a=i(".cd-medium");n(8),a.length>0&&a.each(function(){r.Countdown({el:i(this)})}),i("#index_nav").length>0&&s({el:"#index_nav"})["goto"](i("#index_nav").find(".active").index()),i("#list-nav").length>0&&s({el:"#list-nav"})["goto"](0),i(".will-end-back").on("click",function(){return o.show("活动即将结束"),!1})},2:function(t,e,n){var i,r;/*!
+!function(t){function e(i){if(n[i])return n[i].exports;var r=n[i]={exports:{},id:i,loaded:!1};return t[i].call(r.exports,r,r.exports,e),r.loaded=!0,r.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}({0:function(t,e,n){var i=n(2),r=n(32),o=n(11),s=n(33),a=i(".cd-medium");n(8),a.length>0&&a.each(function(){new r.Countdown({el:i(this)})}),i("#index_nav").length>0&&s({el:"#index_nav"})["goto"](i("#index_nav").find(".active").index()),i(".will-end-back").length<1&&i(".empty").show(),i(".will-end-back").on("click",function(){return o.show("活动即将结束"),!1})},2:function(t,e,n){var i,r;/*!
 	 * jQuery JavaScript Library v2.2.4
 	 * http://jquery.com/
 	 *

-!function(t){function e(i){if(n[i])return n[i].exports;var r=n[i]={exports:{},id:i,loaded:!1};return t[i].call(r.exports,r,r.exports,e),r.loaded=!0,r.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}({0:function(t,e,n){var i=n(2),r=n(32),o=n(11),s=n(33),a=i(".cd-lite");n(8),a.length>0&&a.each(function(){r.Countdown({el:i(this)})}),i("#index_nav").length>0&&s({el:"#index_nav"})["goto"](i("#index_nav").find(".active").index()),i("#list-nav").length>0&&s({el:"#list-nav"})["goto"](0),i(".back-ground-white").on("click",function(){return o.show("活动即将开始"),!1})},2:function(t,e,n){var i,r;/*!
+!function(t){function e(i){if(n[i])return n[i].exports;var r=n[i]={exports:{},id:i,loaded:!1};return t[i].call(r.exports,r,r.exports,e),r.loaded=!0,r.exports}var n={};return e.m=t,e.c=n,e.p="",e(0)}({0:function(t,e,n){var i=n(2),r=n(32),o=n(11),s=n(33),a=i(".cd-lite");n(8),a.length>0&&a.each(function(){new r.Countdown({el:i(this)})}),i("#index_nav").length>0&&s({el:"#index_nav"})["goto"](i("#index_nav").find(".active").index()),i(".back-ground-white").length<1&&i(".empty").show(),i(".back-ground-white").on("click",function(){return o.show("活动即将开始"),!1})},2:function(t,e,n){var i,r;/*!
 	 * jQuery JavaScript Library v2.2.4
 	 * http://jquery.com/
 	 *

@@ -31,7 +31,7 @@ var $window = $(window),
 var mySwiper;
 */
 
-var avatarKey, bannerLen;
+var avatarKey, bannerLen, res;
 
 require('../common');
 
@@ -66,6 +66,31 @@ function setAvatar($userAvatar) {
     };
 }
 
+
+// 明星头像点击居中显示或跳转
+function bindAvatar(dom) {
+    avatarKey = dom.index();
+
+    if (!dom.hasClass('swiper-slide-active')) {
+        if (avatarKey >= (2 * bannerLen + 1)) {
+            avatarSwiperClone && avatarSwiperClone.slideTo(bannerLen + 1, 200);
+            avatarSwiper.slideTo(bannerLen + 1, 200);
+        } else if (avatarKey <= (bannerLen - 1)) {
+            avatarSwiperClone && avatarSwiperClone.slideTo(2 * bannerLen - 1, 200);
+            avatarSwiper.slideTo(2 * bannerLen - 1, 200);
+        } else {
+            avatarSwiperClone && avatarSwiperClone.slideTo(avatarKey, 200);
+            avatarSwiper.slideTo(avatarKey, 200);
+        }
+
+        return false;
+    } else if (window.queryString.app_version) {
+        return false;
+    }
+
+    return false;
+}
+
 function setIndexAction() {
     var starIScroll;
 
@@ -106,14 +131,20 @@ function setIndexAction() {
             if (!avatarSwiperClone) {
                 avatarSwiperClone = new Swiper('.avatar-0', {
                     loop: true,
-                    initialSlide: $('.avatar-1').find('.swiper-slide-active').index(),
+                    initialSlide: $('.avatar-1').find('.swiper-slide-active').index() % bannerLen,
                     centeredSlides: true,
                     slidesPerView: 'auto',
                     loopedSlides: bannerLen,
                     spaceBetween: 10,
                     slidesOffsetBefore: -($('.swiper-num').width()),
                     watchSlidesProgress: true,
-                    watchSlidesVisibility: true
+                    watchSlidesVisibility: true,
+                    onInit: function() {
+                        $('.avatar-0 li').on('click', function() {
+                            res = bindAvatar($(this));
+                            return res;
+                        });
+                    }
                 });
 
                 avatarSwiperClone.params.control = avatarSwiper;
@@ -206,7 +237,13 @@ function setIndexAction() {
             spaceBetween: 10,
             slidesOffsetBefore: -($('.swiper-num').width()),
             watchSlidesProgress: true,
-            watchSlidesVisibility: true
+            watchSlidesVisibility: true,
+            onInit: function() {
+                $('.avatar-1 li').on('click', function() {
+                    res = bindAvatar($(this));
+                    return res;
+                });
+            }
         });
     }
 
@@ -243,28 +280,6 @@ function setIndexAction() {
         });
     }
 
-    // 明星头像点击居中显示或跳转
-    $('.avatar-swiper li').on('click', function() {
-        if (!$(this).hasClass('swiper-slide-active')) {
-            avatarKey = $(this).index();
-
-            if (avatarKey >= (2 * bannerLen + 1)) {
-                avatarSwiperClone && avatarSwiperClone.slideTo(bannerLen + 1, 200);
-                avatarSwiper.slideTo(bannerLen + 1, 200);
-            } else if (avatarKey <= (bannerLen - 1)) {
-                avatarSwiperClone && avatarSwiperClone.slideTo(2 * bannerLen - 1, 200);
-                avatarSwiper.slideTo(2 * bannerLen - 1, 200);
-            } else {
-                avatarSwiperClone && avatarSwiperClone.slideTo(avatarKey, 200);
-                avatarSwiper.slideTo(avatarKey, 200);
-            }
-
-            return false;
-        } else if (window.queryString.app_version) {
-            return false;
-        }
-    });
-
     $('.rank-avatar').each(function(key, item) {
         if ($(item).attr('data-avatar') !== '') {
             setAvatar($(item));
@@ -276,6 +291,8 @@ function setIndexAction() {
     });
 }
 
+
+// 首页数据请求
 getIndexHtml = function() {
     var $starMain = $('.star-main');
 

@@ -11,11 +11,11 @@ var $el = $('.cd-medium');
 require('../common');
 
 if ($el.length > 0) {
-    $el.each(function(){
-        Countdown.Countdown({
+    $el.each(function() {
+        new Countdown.Countdown({
             el: $(this)
-        })
-    })
+        });
+    });
 }
 
 // 导航滚动
@@ -25,10 +25,8 @@ if ($('#index_nav').length > 0) {
     }).goto($('#index_nav').find('.active').index());
 }
 
-if ($('#list-nav').length > 0) {
-    iscroll({
-        el: '#list-nav'
-    }).goto(0);
+if ($('.will-end-back').length < 1) {
+    $('.empty').show();
 }
 
 $('.will-end-back').on('click', function() {

@@ -11,11 +11,11 @@ var $el = $('.cd-lite');
 require('../common');
 
 if ($el.length > 0) {
-    $el.each(function(){
-        Countdown.Countdown({
+    $el.each(function() {
+        new Countdown.Countdown({
             el: $(this)
-        })
-    })
+        });
+    });
 }
 
 // 导航滚动
@@ -25,10 +25,8 @@ if ($('#index_nav').length > 0) {
     }).goto($('#index_nav').find('.active').index());
 }
 
-if ($('#list-nav').length > 0) {
-    iscroll({
-        el: '#list-nav'
-    }).goto(0);
+if ($('.back-ground-white').length < 1) {
+    $('.empty').show();
 }
 
 $('.back-ground-white').on('click', function() {

@@ -123,6 +123,7 @@
         &.avatar-clone {
             margin-top: 0;
             position: fixed;
+            width: 640px;
             padding: 5px 0;
             z-index: 9;
             background: #000;

@@ -58,7 +58,7 @@
             font-size: 25px;
             color: #ff0705;
 
-            .discountNum {
+            .discount-num {
                 font-size: 40px;
             }
         }
@@ -153,7 +153,6 @@
         .time {
             font-size: 22px;
         }
-
     }
 
     .outlet-discount {
@@ -184,4 +183,26 @@
     .hidden {
         display: none;
     }
+
+    .empty {
+        position: absolute;
+        width: 330px;
+        left: 50%;
+        top: 300px;
+        margin-left: -150px;
+        font-size: 24px;
+        color: #444;
+        font-family: STHeitiSC Mdedi;
+
+        .bag {
+            display: block;
+            width: 200px;
+            height: 200px;
+            margin-left: 65px;
+            margin-bottom: 30px;
+            background-image: resolve("product/bag_moren.png");
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+        }
+    }
 }