Merge branch 'feature/seo0326' into 'gray'

Feature/seo0326



See merge request !248

@@ -440,6 +440,7 @@ function getSaleDiscountData(params, channel) {
                 if (subResult[1].code === 200) {
                 if (subResult[1].code === 200) {
                     let sknArr = [];
                     let sknArr = [];
 
 
+                    finalResult.saleList = finalResult.saleList || {};
                     finalResult.saleList.goods = productProcess.processProductList(subResult[1].data.product_list);
                     finalResult.saleList.goods = productProcess.processProductList(subResult[1].data.product_list);
                     finalResult.saleList.totalCount = subResult[1].data.total;
                     finalResult.saleList.totalCount = subResult[1].data.total;
                     _.forEach(finalResult.saleList.goods, (value, key) => {
                     _.forEach(finalResult.saleList.goods, (value, key) => {

@@ -18,16 +18,6 @@ var _gaq = _gaq || [];
             ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
             ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
             var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
             var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
         })();
         })();
-        // 新品友代码
-        (function(w,d,s,l,a){
-        	w._CommandName_=l;w[l]=w[l]||function(){(w[l].q=w[l].q||[]).push(arguments);
-        	w[l].track = function(){(w[l].q[w[l].q.length-1].t=[]).push(arguments)};return w[l]},w[l].a=a,w[l].l=1*new Date();
-        	var c = d.createElement(s);c.async=1;
-        	c.src='//fm.ipinyou.com/j/t/a.js';
-        	var h = d.getElementsByTagName(s)[0];h.parentNode.insertBefore(c, h);
-        })(window,document,'script','py','MC..o8vMMWxEXDCiqYckD81lUX');
-        py('set','user',{'id':'0'});
-        py('event','viewPage');
     }
     }
     if (window.addEventListener) {
     if (window.addEventListener) {
         window.addEventListener('load', async_load, false);
         window.addEventListener('load', async_load, false);