Merge branch 'feature/download_individate' into 'master'

Feature/download individate



See merge request !149

 'use strict';
 'use strict';
 const model = require('../models/individuation');
 const model = require('../models/individuation');
+const channels = {
+    boys: 1,
+    girl: 2,
+    kids: 3,
+    lifestyle: 4
+};
 
 
 exports.productLst = function(req, res, next) {
 exports.productLst = function(req, res, next) {
     let keys = ['sort', 'misort', 'msort', 'gender', 'brand'],
     let keys = ['sort', 'misort', 'msort', 'gender', 'brand'],
@@ -8,7 +14,9 @@ exports.productLst = function(req, res, next) {
             uid: req.query.uid,
             uid: req.query.uid,
             udid: req.query.udid,
             udid: req.query.udid,
             promotion: req.query.pid,
             promotion: req.query.pid,
+            yh_channel: req.query.yh_channel || (req.cookies._Channel && channels[req.cookies._Channel]) || 1,
             specified_sort: req.query.enum,
             specified_sort: req.query.enum,
+            stocknumber: req.query.sn,
             p_d: req.query.pd,
             p_d: req.query.pd,
             limit: req.query.limit || 10
             limit: req.query.limit || 10
         };
         };

@@ -11,6 +11,8 @@ let _getProduct = function(o) {
         middle_sort_id: o.middle_sort_id,
         middle_sort_id: o.middle_sort_id,
         max_sort_id: o.max_sort_id,
         max_sort_id: o.max_sort_id,
         brand_id: o.brand_id,
         brand_id: o.brand_id,
+        shop_id: o.shop_id,
+        shop_template_type: o.shop_template_type,
         brand_domain: o.brand_domain,
         brand_domain: o.brand_domain,
         brand_name: o.brand_name,
         brand_name: o.brand_name,
         product_id: o.product_id,
         product_id: o.product_id,
@@ -20,7 +22,7 @@ let _getProduct = function(o) {
         sales_price: o.sales_price,
         sales_price: o.sales_price,
         cn_alphabet: o.cn_alphabet,
         cn_alphabet: o.cn_alphabet,
         default_images: o.default_images,
         default_images: o.default_images,
-        goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : ''
+        goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : undefined
     };
     };
 };
 };
 
 

@@ -63,5 +63,6 @@
                 <img src="https://feature.yoho.cn/0113/images/0157ad8f797d97f10cc21bd30333c5a7c5.jpg?imageView2/2/q/75/">
                 <img src="https://feature.yoho.cn/0113/images/0157ad8f797d97f10cc21bd30333c5a7c5.jpg?imageView2/2/q/75/">
             </li>
             </li>
         </ul>
         </ul>
+        <input type="hidden" id="no-download" name="">
     </div>
     </div>
 </div>
 </div>

@@ -12,7 +12,7 @@
         a.async = 1;
         a.async = 1;
         a.src = j;
         a.src = j;
         m.parentNode.insertBefore(a, m);
         m.parentNode.insertBefore(a, m);
-    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.1.2/yas.js', '_yas'));
+    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.1.3/yas.js', '_yas'));
 
 
     var _hmt = _hmt || [];
     var _hmt = _hmt || [];
 
 
@@ -56,7 +56,7 @@
         uid = uid === 0 ? '' : uid;
         uid = uid === 0 ? '' : uid;
         window._ozuid = uid; // 暴露ozuid
         window._ozuid = uid; // 暴露ozuid
         if (window._yas) {
         if (window._yas) {
-            window._yas(1 * new Date(), '2.1.2', 'yohobuy_m', uid, '', '');
+            window._yas(1 * new Date(), '2.1.3', 'yohobuy_m', uid, '', '');
         }
         }
 
 
         // 非登录状态，加载百度统计
         // 非登录状态，加载百度统计

@@ -6,9 +6,6 @@
     overflow: hidden;
     overflow: hidden;
     
     
     &.iswechat {
     &.iswechat {
-        position: fixed;
-        top: 0;
-        left: 0;
         width: 100%;
         width: 100%;
         height: 90px;
         height: 90px;
         line-height: 90px;
         line-height: 90px;