Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -203,8 +203,8 @@ $.extend({
     $footer.removeClass('hide');
     $footer.removeClass('hide');
 
 
     // 接受微信商城或者第三方来源的数据埋点信息
     // 接受微信商城或者第三方来源的数据埋点信息
-    if (queryString().union_type) {
-        setCookie('union_type', queryString().union_type);
+    if (queryString().mkt_code) {
+        setCookie('mkt_code', queryString().mkt_code);
     }
     }
 
 
 }());
 }());
@@ -232,7 +232,7 @@ $.extend({
     window._ozuid = uid;// 暴露ozuid
     window._ozuid = uid;// 暴露ozuid
 
 
     if (window._yas) {
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.17', 'yohobuy_m', uid, '', '');
+        window._yas(1 * new Date(), '1.0.18', 'yohobuy_m', uid, '', '');
     }
     }
 }());
 }());
 
 

@@ -19,7 +19,7 @@ function downLoadApp() {
     var clickedAt = new Date();
     var clickedAt = new Date();
 
 
     setTimeout(function() {
     setTimeout(function() {
-        var mkt = window.queryString.union_type || window.cookie('union_type') || false;
+        var mkt = window.queryString.mkt_code || window.cookie('mkt_code') || false;
 
 
         if ((new Date()) - clickedAt < 2000) {
         if ((new Date()) - clickedAt < 2000) {
             if (mkt) {
             if (mkt) {