Merge remote-tracking branch 'origin/master' into feature/shareBuy3

@@ -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.4.1/yas.js', '_yas'));
+    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.4.2/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.4.1', 'yohobuy_m', uid, '', '');
+            window._yas(1 * new Date(), '2.4.2', 'yohobuy_m', uid, '', '');
         }
         }
 
 
         setTimeout(function() {
         setTimeout(function() {

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.9.10",
+  "version": "5.9.11",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -256,28 +256,30 @@ $.extend({
     5. yas的cookies 种在 .yohobuy.com 根域下
     5. yas的cookies 种在 .yohobuy.com 根域下
 
 
     周奇琪
     周奇琪
-    */
-
-    let isWechat = /micromessenger/i.test(navigator.userAgent || '');
-    let mktc = queryString().mkt_code || queryString().union_type || '';
 
 
-    function saveMktCode() {
-        if (mktc) {
-            setCookie('mkt_code', mktc, {
-                path: '/',
-                domain: 'yohobuy.com',
-                expires: 7 // 7天
-            });
-        }
-    }
+    mkt_code 控制移动到 YAS 2017.07.13
+    */
 
 
-    if (isWechat) {
-        saveMktCode();
-    } else {
-        if (!cookie('mkt_code') || mktc === '100000000000349') {
-            saveMktCode();
-        }
-    }
+    // let isWechat = /micromessenger/i.test(navigator.userAgent || '');
+    // let mktc = queryString().mkt_code || queryString().union_type || '';
+
+    // function saveMktCode() {
+    //     if (mktc) {
+    //         setCookie('mkt_code', mktc, {
+    //             path: '/',
+    //             domain: 'yohobuy.com',
+    //             expires: 7 // 7天
+    //         });
+    //     }
+    // }
+
+    // if (isWechat) {
+    //     saveMktCode();
+    // } else {
+    //     if (!cookie('mkt_code') || mktc === '100000000000349') {
+    //         saveMktCode();
+    //     }
+    // }
 
 
     // 尝试打开 APP
     // 尝试打开 APP
     require('./common/open-app');
     require('./common/open-app');