Merge branch 'feature/sale' of git.dev.yoho.cn:web/yohobuywap-node into feature/sale

@@ -163,7 +163,7 @@ exports.breakCode = (req, res) => {
                 },
                 },
                 isSoonSoldOut: true
                 isSoonSoldOut: true
             }
             }
-        }
+        };
         res.render('break-code', Object.assign(renderData, result));
         res.render('break-code', Object.assign(renderData, result));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);

@@ -10,16 +10,16 @@ var $ = require('yoho-jquery'),
 
 
 var $filter;
 var $filter;
 
 
-var fCbFn, hCbFn; //筛选和关闭的回调
+var fCbFn, hCbFn; // 筛选和关闭的回调
 
 
-var missStatus; //是否忽略选中状态
+var missStatus; // 是否忽略选中状态
 
 
-//隐藏筛选界面
+// 隐藏筛选界面
 function hideFilter() {
 function hideFilter() {
     $filter.addClass('hide');
     $filter.addClass('hide');
 }
 }
 
 
-//显示筛选界面
+// 显示筛选界面
 function showFilter() {
 function showFilter() {
     $filter.removeClass('hide');
     $filter.removeClass('hide');
 }
 }
@@ -48,7 +48,7 @@ function highlightSubItem() {
     });
     });
 }
 }
 
 
-//主筛选项Tap事件句柄
+// 主筛选项Tap事件句柄
 function classifyTapEvt($this) {
 function classifyTapEvt($this) {
     if ($this.hasClass('active')) {
     if ($this.hasClass('active')) {
         return;
         return;
@@ -59,7 +59,7 @@ function classifyTapEvt($this) {
     $this.addClass('active');
     $this.addClass('active');
 }
 }
 
 
-//子筛选项选中处理
+// 子筛选项选中处理
 function setSubClassify($this) {
 function setSubClassify($this) {
     var $sub = $this.closest('.sub-classify');
     var $sub = $this.closest('.sub-classify');
 
 
@@ -79,8 +79,8 @@ function setSubClassify($this) {
     shower = $.trim($shower.html());
     shower = $.trim($shower.html());
 
 
     $shower.html(
     $shower.html(
-        shower.substring(0, shower.indexOf('</span>') + 7) + //拆分出shower的title
-        html.substring(0, html.indexOf('<i')) //拆分选中筛选值
+        shower.substring(0, shower.indexOf('</span>') + 7) + // 拆分出shower的title
+        html.substring(0, html.indexOf('<i')) // 拆分选中筛选值
     );
     );
 
 
     if ($this.index() === 0) {
     if ($this.index() === 0) {
@@ -92,7 +92,7 @@ function setSubClassify($this) {
     return $sub;
     return $sub;
 }
 }
 
 
-//子筛选项Tap句柄
+// 子筛选项Tap句柄
 function subClassifyTapEvt($this) {
 function subClassifyTapEvt($this) {
     var id = $this.data('id');
     var id = $this.data('id');
 
 
@@ -110,11 +110,11 @@ function subClassifyTapEvt($this) {
     hideFilter();
     hideFilter();
 }
 }
 
 
-//初始化筛选
+// 初始化筛选
 function initFilter(opt) {
 function initFilter(opt) {
     var filterHammer;
     var filterHammer;
 
 
-    //注册回调
+    // 注册回调
     fCbFn = opt.fCbFn;
     fCbFn = opt.fCbFn;
     hCbFn = opt.hCbFn;
     hCbFn = opt.hCbFn;
 
 
@@ -130,19 +130,19 @@ function initFilter(opt) {
         var $this = $(e.target),
         var $this = $(e.target),
             $cur;
             $cur;
 
 
-        e.preventDefault();//防止透点
+        e.preventDefault();// 防止透点
 
 
         if ($this.closest('.filter-body').length > 0) {
         if ($this.closest('.filter-body').length > 0) {
             $cur = $this.closest('.sub-item');
             $cur = $this.closest('.sub-item');
             if ($cur.length > 0) {
             if ($cur.length > 0) {
 
 
-                //tap subclassify
+                // tap subclassify
                 $cur = $this.closest('li');
                 $cur = $this.closest('li');
 
 
                 subClassifyTapEvt($cur);
                 subClassifyTapEvt($cur);
             } else {
             } else {
 
 
-                //tap classify
+                // tap classify
                 $cur = $this.closest('.classify-item');
                 $cur = $this.closest('.classify-item');
 
 
                 e.srcEvent.stopPropagation();
                 e.srcEvent.stopPropagation();
@@ -160,18 +160,18 @@ function initFilter(opt) {
 
 
 }
 }
 
 
-//重置筛选面板
+// 重置筛选面板
 function resetFilter() {
 function resetFilter() {
     if (typeof $filter === 'undefined') {
     if (typeof $filter === 'undefined') {
         return;
         return;
     }
     }
 
 
-    //重置子筛选项
+    // 重置子筛选项
     $('.sub-classify').each(function() {
     $('.sub-classify').each(function() {
         setSubClassify($(this).children(':first-child'));
         setSubClassify($(this).children(':first-child'));
     });
     });
 
 
-    //重置主筛选项
+    // 重置主筛选项
     classifyTapEvt($('.classify > :first-child'));
     classifyTapEvt($('.classify > :first-child'));
 }
 }
 
 

-require('./break-code');
+require('./break-code');

@@ -13,4 +13,4 @@ $('.query-param').each(function() {
     opt[$this.data('attr')] = $this.val();
     opt[$this.data('attr')] = $this.val();
 });
 });
 
 
-module.exports = opt;
+module.exports = opt;

@@ -7,4 +7,4 @@
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload');
     lazyLoad = require('yoho-jquery-lazyload');
 
 
-lazyLoad($('img.lazy'));
+lazyLoad($('img.lazy'));