Merge branch 'feature/plusstarSpeck' into release/5.1

@@ -85,8 +85,7 @@ exports.resourcesGoodsList = (req, res, next) => {
     let param = {};
     let param = {};
 
 
     param = {
     param = {
-        productSkn: productSkn.split(','),
-        yh_channel: req.body.yh_channel
+        productSkn: productSkn.split(',')
     };
     };
 
 
     plusstarModel.getProductBatch(param, {
     plusstarModel.getProductBatch(param, {

@@ -49,8 +49,7 @@ const getProductBatch = (param, options) => {
     param.productSkn = _.isArray(param.productSkn) ? param.productSkn : [param.productSkn];
     param.productSkn = _.isArray(param.productSkn) ? param.productSkn : [param.productSkn];
     return api.get('', {
     return api.get('', {
         method: 'h5.product.batch',
         method: 'h5.product.batch',
-        productSkn: param.productSkn.join(','),
-        yh_channel: param.yh_channel
+        productSkn: param.productSkn.join(',')
     }).then(result => {
     }).then(result => {
         let data = {};
         let data = {};
 
 

@@ -41,6 +41,11 @@ plusstar = {
             width: 100 / $tabUlDom.find('li').length + '%'
             width: 100 / $tabUlDom.find('li').length + '%'
         });
         });
 
 
+        $tabUlDom.find('li').each(function() {
+            // 重新进入滑动位置清除
+            window.setCookie($(this).data('code'), 0);
+        });
+
         // 事情委托机制
         // 事情委托机制
         $tabUlDom.bind('click', function(event) {
         $tabUlDom.bind('click', function(event) {
             $liDom = $(event.target).closest('li');
             $liDom = $(event.target).closest('li');
@@ -80,10 +85,10 @@ plusstar = {
         }
         }
         $tabUlDom.find('li').removeClass('focus');
         $tabUlDom.find('li').removeClass('focus');
         $liDom.addClass('focus');
         $liDom.addClass('focus');
+        that.ParentLiDom = $liDom;// 保留当前tab先中的对象
         that.tabNav($liDom.data('code'));
         that.tabNav($liDom.data('code'));
 
 
         // ent -- 默认选中
         // ent -- 默认选中
-        that.ParentLiDom = $liDom;// 保留当前tab先中的对象
         setTimeout(function() {
         setTimeout(function() {
             that._yas();
             that._yas();
         }, 1000);
         }, 1000);
@@ -166,7 +171,8 @@ plusstar = {
             data: {
             data: {
                 code: code,
                 code: code,
                 uid: window.queryString.uid,
                 uid: window.queryString.uid,
-                app_version: isApp
+                app_version: isApp,
+                yh_channel: that.ParentLiDom.index() + 1
             },
             },
             dataType: 'html',
             dataType: 'html',
             success: function(data) {
             success: function(data) {
@@ -178,7 +184,8 @@ plusstar = {
                     tip.show('没有更多内容了');
                     tip.show('没有更多内容了');
                     return true;
                     return true;
                 }
                 }
-                //记录切换tab位置
+
+                // 记录切换tab位置
                 $(document).scrollTop(window.cookie(code) || 0);
                 $(document).scrollTop(window.cookie(code) || 0);
 
 
                 that.resInit();
                 that.resInit();
@@ -233,8 +240,7 @@ plusstar = {
             timeout: 5000,
             timeout: 5000,
             data: {
             data: {
                 productSkn: skn.join(','),
                 productSkn: skn.join(','),
-                app_version: isApp,
-                yh_channel: that.ParentLiDom.index() + 1
+                app_version: isApp
             },
             },
             dataType: 'html',
             dataType: 'html',
             success: function(data) {
             success: function(data) {
@@ -275,10 +281,12 @@ plusstar = {
 
 
 scrollFn = debounce(function() {
 scrollFn = debounce(function() {
     scrollTop = $(document).scrollTop();
     scrollTop = $(document).scrollTop();
-    //保留滑动位置，产品要求
+
+    // 保留滑动位置，产品要求
     window.setCookie(plusstar.common.codeDefault, $(this).scrollTop());
     window.setCookie(plusstar.common.codeDefault, $(this).scrollTop());
+
     // 当scroll到最后一列商品的高度后继续请求下一页数据
     // 当scroll到最后一列商品的高度后继续请求下一页数据
-    if (300 + scrollTop >= $(document).height() - windowHeight) {
+    if (400 + scrollTop >= $(document).height() - windowHeight) {
         plusstar.goodsList();
         plusstar.goodsList();
     }
     }