合并master 解决冲突

@@ -163,7 +163,7 @@ let shopRecom = (req, res, next) => {
     }).then(result => {
     }).then(result => {
         res.send(result);
         res.send(result);
     }).catch(next);
     }).catch(next);
-}
+};
 
 
 /**
 /**
  * 获取用户vip信息
  * 获取用户vip信息
@@ -187,12 +187,12 @@ let userVip = (req, res, next) => {
                 res.json({
                 res.json({
                     code: 500,
                     code: 500,
                     msg: '出错了',
                     msg: '出错了',
-                })
+                });
             }
             }
         });
         });
     }
     }
 
 
-}
+};
 
 
 module.exports = {
 module.exports = {
     switchChannel,
     switchChannel,
@@ -204,4 +204,4 @@ module.exports = {
     bottomBanner,
     bottomBanner,
     shopRecom,
     shopRecom,
     userVip,
     userVip,
-};
+};

@@ -31,5 +31,5 @@ router.get('/brands/delBrandHistory', brandController.delBrandHistory); // 删
 
 
 // 5.2新楼层功能
 // 5.2新楼层功能
 router.post('/channel/shopRecom', channel.shopRecom); // 店铺推荐收藏状态
 router.post('/channel/shopRecom', channel.shopRecom); // 店铺推荐收藏状态
-router.post('/channel/userVip', channel.userVip)
+router.post('/channel/userVip', channel.userVip);
 module.exports = router;
 module.exports = router;

@@ -30,10 +30,10 @@ const index = (req, res, next) => {
             link: 'http://yohobuy.com',
             link: 'http://yohobuy.com',
             copyright: '2015 yoho.inc',
             copyright: '2015 yoho.inc',
             generator: 'http://m.yohobuy.com',
             generator: 'http://m.yohobuy.com',
-            updated: new Date(), 
-        })
+            updated: new Date(),
+        });
         _.forEach(result, item => {
         _.forEach(result, item => {
-            item.url = item.url.indexOf('http') >= 0 ? item.url : 'http://'+item.url
+            item.url = item.url.indexOf('http') >= 0 ? item.url : 'http://' + item.url;
             feed.addItem({
             feed.addItem({
                 title: item.title,
                 title: item.title,
                 link: `${item.url}&ref=rss`,
                 link: `${item.url}&ref=rss`,
@@ -41,13 +41,13 @@ const index = (req, res, next) => {
                 author: [{
                 author: [{
                     name: (item.author && item.author.name) || ' '
                     name: (item.author && item.author.name) || ' '
                 }],
                 }],
-                date: new Date(item.publishTimeLong && parseFloat(item.publishTimeLong) || moment(item.publishTime, "MM月DD日 HH:mm"))
+                date: new Date(item.publishTimeLong && parseFloat(item.publishTimeLong) || moment(item.publishTime, 'MM月DD日 HH:mm'))
             });
             });
         });
         });
         if (req.params[0] && req.params[0] === '/atom') {
         if (req.params[0] && req.params[0] === '/atom') {
             return res.send(feed.render('atom-1.0'));
             return res.send(feed.render('atom-1.0'));
         }
         }
-        return res.send(feed.render('rss-2.0'))
+        return res.send(feed.render('rss-2.0'));
     });
     });
 };
 };
 const rss = (req, res, next, gmt) => {
 const rss = (req, res, next, gmt) => {
@@ -59,8 +59,8 @@ const rss = (req, res, next, gmt) => {
             return next();
             return next();
         }
         }
         _.forEach(result, item => {
         _.forEach(result, item => {
-            item.url = item.url.indexOf('http') >= 0 ? item.url : 'http://'+item.url;
-            let time = new Date(item.publishTimeLong && parseFloat(item.publishTimeLong) || moment(item.publishTime, "MM月DD日 HH:mm"));
+            item.url = item.url.indexOf('http') >= 0 ? item.url : 'http://' + item.url;
+            let time = new Date(item.publishTimeLong && parseFloat(item.publishTimeLong) || moment(item.publishTime, 'MM月DD日 HH:mm'));
             let format = gmt ? 'ddd, MM MMM YYYY hh:mm:ss +0800' : 'YYYY-MM-DD hh:mm:ss +0800';
             let format = gmt ? 'ddd, MM MMM YYYY hh:mm:ss +0800' : 'YYYY-MM-DD hh:mm:ss +0800';
 
 
             item.publishTime = moment(time).format(format);
             item.publishTime = moment(time).format(format);
@@ -75,4 +75,4 @@ const rss = (req, res, next, gmt) => {
 module.exports = {
 module.exports = {
     index,
     index,
     rss
     rss
-};
+};

@@ -45,7 +45,7 @@ const getRssArticle = (gender) => {
                     if (typeof value.id !== 'undefined') {
                     if (typeof value.id !== 'undefined') {
                         build = guangProcess.formatArticle(value, false, false, true);
                         build = guangProcess.formatArticle(value, false, false, true);
                         build.author = build.author || {};
                         build.author = build.author || {};
-                        build.author.name = (build.author && build.author.name) || ''
+                        build.author.name = (build.author && build.author.name) || '';
                         return _genIntro(value.id).then((intro) => {
                         return _genIntro(value.id).then((intro) => {
                             build.intro = intro;
                             build.intro = intro;
                             result.push(build);
                             result.push(build);
@@ -96,4 +96,4 @@ const _genIntro = (id) => {
 
 
 module.exports = {
 module.exports = {
     getRssArticle
     getRssArticle
-};
+};

@@ -311,10 +311,10 @@ const account = (req, res) => {
     if (req.cookies.appVersion) {
     if (req.cookies.appVersion) {
         var versions = req.cookies.appVersion.split('.');
         var versions = req.cookies.appVersion.split('.');
         if (versions.length >= 2) {
         if (versions.length >= 2) {
-            if (versions[0] < 5 || (parseInt(versions[0], 10)===5 && versions[1] <= 1)) {
+            if (versions[0] < 5 || (parseInt(versions[0], 10) === 5 && versions[1] <= 1)) {
 
 
             } else {
             } else {
-                url = helpers.appUrlFormat(url, 'go.instalmentMyCard')
+                url = helpers.appUrlFormat(url, 'go.instalmentMyCard');
             }
             }
         }
         }
     }
     }

@@ -9,7 +9,7 @@ exports.getQr = (params) => {
 
 
     try {
     try {
         uid = crypto.decrypt(PASSWORD, decodeURIComponent(params.token));
         uid = crypto.decrypt(PASSWORD, decodeURIComponent(params.token));
-        uid = parseInt(uid, 10)
+        uid = parseInt(uid, 10);
     } catch (e) {
     } catch (e) {
         uid = params.token;
         uid = params.token;
     }
     }

@@ -1595,7 +1595,7 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
 
 
     if (origin.is_secKill) {
     if (origin.is_secKill) {
         dest.isDepositAdvance = origin.isDeposit_advance;// A定金预售字段 = origin.is_deposit_advance === 'Y';  // 是否定金预售
         dest.isDepositAdvance = origin.isDeposit_advance;// A定金预售字段 = origin.is_deposit_advance === 'Y';  // 是否定金预售
-        dest.isPresale = Boolean(origin.expect_arrival_time)
+        dest.isPresale = Boolean(origin.expect_arrival_time);
     }
     }
 
 
     // 商品返回 YOHO 币
     // 商品返回 YOHO 币

@@ -16,8 +16,8 @@ var $nav = $('.category-nav'),
 require('../common');
 require('../common');
 
 
 function resetHeight() {
 function resetHeight() {
-   var h = document.body.scrollHeight - $search.outerHeight() - $nav.outerHeight();
-   $contents.height(h);
+    var h = document.body.scrollHeight - $search.outerHeight() - $nav.outerHeight();
+    $contents.height(h);
 }
 }
 resetHeight();
 resetHeight();
 
 

@@ -349,9 +349,9 @@ var saleTime = function(elem, offsetTime) {
     var hour = parseInt(offsetTime / (60 * 60), 10),
     var hour = parseInt(offsetTime / (60 * 60), 10),
         minute = parseInt(offsetTime % (60 * 60) / 60, 10),
         minute = parseInt(offsetTime % (60 * 60) / 60, 10),
         second = offsetTime % 60;
         second = offsetTime % 60;
-        if (offsetTime <= -1) { // 结束倒计时刷新状态
-            $(elem).find('.limit').hide();
-        } 
+    if (offsetTime <= -1) { // 结束倒计时刷新状态
+        $(elem).find('.limit').hide();
+    }
 
 
     if (offsetTime >= -1) {
     if (offsetTime >= -1) {
         $(elem).find('.hour').text(hour < 0 ? '00' : (hour < 10 ? ('0' + hour) : hour));
         $(elem).find('.hour').text(hour < 0 ? '00' : (hour < 10 ? ('0' + hour) : hour));

@@ -339,7 +339,7 @@ $reaMask.on('touchend', function(event) {
     event.stopPropagation();
     event.stopPropagation();
 });
 });
 
 
-$('.nav-tap').on('click', function(e){
+$('.nav-tap').on('click', function(e) {
     var $cur = $(e.target);
     var $cur = $(e.target);
     location.replace($cur.data('url'));
     location.replace($cur.data('url'));
-})
+});

@@ -35,7 +35,7 @@ $pwd.bind('input', function() {
     });
     });
 
 
     $btnSure.toggleClass('disable', !bool);
     $btnSure.toggleClass('disable', !bool);
-})
+});
 
 
 
 
 qs = window.queryString;
 qs = window.queryString;
@@ -137,4 +137,4 @@ $('.agreement-detail').on('click', function() {
 // 如果有值, 立刻校验
 // 如果有值, 立刻校验
 if ($pwd.val()) {
 if ($pwd.val()) {
     $pwd.triggerHandler('input');
     $pwd.triggerHandler('input');
-}
+}

@@ -32,11 +32,11 @@ $content.on('focus', function() {
         $content.val('请输入咨询内容');
         $content.val('请输入咨询内容');
     }
     }
 });
 });
-var getUrlParam = function (paramName) {
-    var reg = "[\\?|\\&]+" + paramName + "=([^&]*)[^&]?";
-    var exp = (window.location.href + "").match(reg);
-    return exp ? exp[1] : "";
-}
+var getUrlParam = function(paramName) {
+    var reg = '[\\?|\\&]+' + paramName + '=([^&]*)[^&]?';
+    var exp = (window.location.href + '').match(reg);
+    return exp ? exp[1] : '';
+};
 
 
 // 提交表单请求
 // 提交表单请求
 $consultForm.on('submit', function() {
 $consultForm.on('submit', function() {

@@ -43,6 +43,7 @@ var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
 
 
 require('../common');
 require('../common');
+
 // 默认筛选条件
 // 默认筛选条件
 var defaultOpt = require('../common/query-param');
 var defaultOpt = require('../common/query-param');
 
 
@@ -51,7 +52,7 @@ var defaultOpt = require('../common/query-param');
     var param = location.search;
     var param = location.search;
     var isApp = param.indexOf('app_version') > -1 || param.indexOf('appVersion') > -1;
     var isApp = param.indexOf('app_version') > -1 || param.indexOf('appVersion') > -1;
 
 
-    //不阻塞字体文件加载
+    // 不阻塞字体文件加载
     setTimeout(function() {
     setTimeout(function() {
         if (isApp) {
         if (isApp) {
             $.ajax({
             $.ajax({
@@ -95,7 +96,7 @@ var defaultOpt = require('../common/query-param');
                     skns: $('.popularity-title').data('skns'),
                     skns: $('.popularity-title').data('skns'),
                 },
                 },
                 success: function(data) {
                 success: function(data) {
-                    $('.product-warp>.goods-container').html(data)
+                    $('.product-warp>.goods-container').html(data);
                 },
                 },
                 error: function() {
                 error: function() {
                     tip.show('网络断开连接了~');
                     tip.show('网络断开连接了~');
@@ -126,8 +127,8 @@ var defaultOpt = require('../common/query-param');
                 });
                 });
             }
             }
         });
         });
-    }, 0)
-    
+    }, 0);
+
 }());
 }());
 
 
 
 
@@ -229,6 +230,7 @@ function getPageGoods(info) {
 
 
     navType = info.data.type;
     navType = info.data.type;
     nav = navInfo[navType];
     nav = navInfo[navType];
+
     // 不需要重新加载并且数据请求结束
     // 不需要重新加载并且数据请求结束
     if (nav.end && toTop) {
     if (nav.end && toTop) {
         toTop = false;
         toTop = false;
@@ -332,8 +334,8 @@ function tabChange(dom, index) {
 // 首页导航
 // 首页导航
 (function(nav, posNav, main) {
 (function(nav, posNav, main) {
     var scrollToNav1 = function() {
     var scrollToNav1 = function() {
-        window.scrollTo(0, $('#nav').offset().top + 5)
-    }
+        window.scrollTo(0, $('#nav').offset().top + 5);
+    };
     $(nav + ' li, ' + posNav + ' li').not('li.all-goods').on('touchstart', function() {
     $(nav + ' li, ' + posNav + ' li').not('li.all-goods').on('touchstart', function() {
         var index = $(this).index(),
         var index = $(this).index(),
             activeTab = $(this).attr('tab');
             activeTab = $(this).attr('tab');
@@ -376,7 +378,8 @@ function scrollHandler() {
         nav2OffsetTop = $('#list-nav').length ? $('#list-nav').offset().top : 0;
         nav2OffsetTop = $('#list-nav').length ? $('#list-nav').offset().top : 0;
 
 
     var tra;
     var tra;
-    //分页加载店铺商品列表
+
+    // 分页加载店铺商品列表
     if (sTop + winH > scH - 0.25 * $goodsContainer.height() - 50) {
     if (sTop + winH > scH - 0.25 * $goodsContainer.height() - 50) {
         if ($pre !== undefined) {
         if ($pre !== undefined) {
             search({
             search({
@@ -389,7 +392,7 @@ function scrollHandler() {
         }
         }
     }
     }
 
 
-    //分页加载“上新”和“人气”商品数据
+    // 分页加载“上新”和“人气”商品数据
     if (sTop + winH * 2 > scH) {
     if (sTop + winH * 2 > scH) {
         switch (viewType) {
         switch (viewType) {
             case 2:
             case 2:
@@ -419,7 +422,7 @@ function scrollHandler() {
 document.addEventListener('touchmove', function(e) {
 document.addEventListener('touchmove', function(e) {
     // sub classify不阻止默认事件
     // sub classify不阻止默认事件
     if ($(e.target).closest('.sub-classify').length === 0) {
     if ($(e.target).closest('.sub-classify').length === 0) {
-        //e.preventDefault();
+        // e.preventDefault();
     }
     }
     if ($('.filter-mask').length && !$('.filter-mask').hasClass('hide')) {
     if ($('.filter-mask').length && !$('.filter-mask').hasClass('hide')) {
         e.preventDefault();
         e.preventDefault();
@@ -445,7 +448,7 @@ $(window).ready(function() {
         scH = $('#scroller').outerHeight();
         scH = $('#scroller').outerHeight();
     }, 500);
     }, 500);
 
 
-    $(document).scroll(scrollHandler)
+    $(document).scroll(scrollHandler);
     lazyLoad($('img.lazy'));
     lazyLoad($('img.lazy'));
 });
 });
 
 
@@ -682,7 +685,7 @@ $subNav.on('touchend touchcancel', function(e) {
             }
             }
 
 
         }
         }
-        window.scrollTo(0, $('#list-nav').offset().top + 5)
+        window.scrollTo(0, $('#list-nav').offset().top + 5);
     } else {
     } else {
 
 
         filter.hideFilter();// 隐藏面板
         filter.hideFilter();// 隐藏面板
@@ -776,7 +779,7 @@ $subNav.on('touchend touchcancel', function(e) {
                 url: '/product/search/search',
                 url: '/product/search/search',
                 nextPage: false
                 nextPage: false
             }, function() {
             }, function() {
-                window.scrollTo(0, $('#list-nav').offset().top + 5)
+                window.scrollTo(0, $('#list-nav').offset().top + 5);
             });
             });
         }
         }
     }
     }
@@ -799,7 +802,7 @@ $nav2.on('touchstart', 'li', function(e) {
 
 
 $('.shop-foot-wrapper .buriedpoint').click(function() {
 $('.shop-foot-wrapper .buriedpoint').click(function() {
     var subGroup = $(this).find('.sub-group');
     var subGroup = $(this).find('.sub-group');
-    
+
     if (subGroup.hasClass('hide')) {
     if (subGroup.hasClass('hide')) {
         subGroup.removeClass('hide');
         subGroup.removeClass('hide');
     } else {
     } else {

@@ -90,7 +90,7 @@ module.exports = (list) => {
         if (floor.sale1T1L4R && floor.data && floor.data.big_image) {
         if (floor.sale1T1L4R && floor.data && floor.data.big_image) {
             floor.data.banner_image = floor.data.big_image;
             floor.data.banner_image = floor.data.big_image;
         }
         }
-        
+
         formatData.push(floor);
         formatData.push(floor);
     });
     });