Merge branch 'hotfix/orderDetailUrl'

@@ -45,7 +45,7 @@ module.exports = () => {
                 res.set({
                 res.set({
                     'Cache-Control': 'no-cache',
                     'Cache-Control': 'no-cache',
                     Pragma: 'no-cache',
                     Pragma: 'no-cache',
-                    Expires: new Date(1900, 0, 1, 0, 0, 0, 0)
+                    Expires: (new Date(1900, 0, 1, 0, 0, 0, 0)).toUTCString()
                 });
                 });
             }
             }
 
 

@@ -202,9 +202,9 @@ $.extend({
 
 
     $footer.removeClass('hide');
     $footer.removeClass('hide');
 
 
-    // 接受微信商城或者第三方来源的数据埋点信息
+    // 单击下载按钮 - 接受微信商城或者第三方来源的数据埋点信息
     if (queryString().mkt_code) {
     if (queryString().mkt_code) {
-        setCookie('mkt_code', queryString().mkt_code);
+        setCookie('unionType', queryString().mkt_code);
     }
     }
 
 
 }());
 }());

@@ -25,16 +25,24 @@ function getQueryString(name) {
 }
 }
 
 
 function downLoadApp() {
 function downLoadApp() {
-    var appUrl = 'http://www.yohoshow.com/about/index/yohobuyqr/';
+    var appUrl = 'http://union.yoho.cn/union/downapp.html';
     var clickedAt = new Date();
     var clickedAt = new Date();
 
 
     setTimeout(function() {
     setTimeout(function() {
-        var mkt = getQueryString('mkt_code');
+        var mkt = window.queryString.mkt_code || window.cookie('unionType') || false;
 
 
         if ((new Date()) - clickedAt < 2000) {
         if ((new Date()) - clickedAt < 2000) {
             if (mkt) {
             if (mkt) {
                 appUrl += '?union_type=' + mkt;
                 appUrl += '?union_type=' + mkt;
             }
             }
+
+            if (window._yas && window._yas.sendCustomInfo) {
+                window._yas.sendCustomInfo({
+                    op: 'YB_DOWNLOAD_C',
+                    param: JSON.stringify({C_ID: window._ChannelVary[window.cookie('_Channel')] || 1, TO_URL: appUrl})
+                }, true);
+            }
+
             window.location = appUrl;
             window.location = appUrl;
         }
         }
     }, 500);
     }, 500);

@@ -127,7 +127,7 @@ plusstar = {
                         TAB_ID: that.ParentLiDom.index() + 1,
                         TAB_ID: that.ParentLiDom.index() + 1,
                         F_ID: $dom.closest('ul').data('id'),
                         F_ID: $dom.closest('ul').data('id'),
                         F_NAME: '焦点图',
                         F_NAME: '焦点图',
-                        F_URL: $dom.find('a').attr('href'),
+                        F_URL: encodeURIComponent($dom.find('a').attr('href').replace(/\"/g, '\\"')),
                         F_INDEX: 1,
                         F_INDEX: 1,
                         I_INDEX: index % 2 + 1// banner，li是双倍的
                         I_INDEX: index % 2 + 1// banner，li是双倍的
                     }, speckParamApp))
                     }, speckParamApp))
@@ -143,7 +143,7 @@ plusstar = {
                         TAB_ID: that.ParentLiDom.index() + 1,
                         TAB_ID: that.ParentLiDom.index() + 1,
                         F_ID: $dom.data('fid'),
                         F_ID: $dom.data('fid'),
                         F_NAME: $dom.data('name'),
                         F_NAME: $dom.data('name'),
-                        F_URL: $domA.attr('href'),
+                        F_URL: encodeURIComponent($domA.attr('href').replace(/\"/g, '\\"')),
                         F_INDEX: $dom.index() + 1,
                         F_INDEX: $dom.index() + 1,
                         I_INDEX: $domA.hasClass('more') ? 0 : ($domA.index() + 1)
                         I_INDEX: $domA.hasClass('more') ? 0 : ($domA.index() + 1)
                     }, speckParamApp))
                     }, speckParamApp))
@@ -164,7 +164,7 @@ plusstar = {
 
 
         this.common.codeDefault = code;// 记住最后一次的tab code
         this.common.codeDefault = code;// 记住最后一次的tab code
         this.common.page = 1;// 商品列表从第一页开始
         this.common.page = 1;// 商品列表从第一页开始
-        searching = false;//初始化翻页
+        searching = false;// 初始化翻页
 
 
         $.ajax({
         $.ajax({
             type: 'GET',
             type: 'GET',