Merge branch 'hotfix/mktCodeLen'

@@ -111,7 +111,8 @@ function getShoppingKey() {
     a.async = 1;
     a.src = j;
     m.parentNode.insertBefore(a, m);
-})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas');
+})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' +
+    'cdn.yoho.cn/yas-jssdk/2.1.0/yas.js', '_yas');
 
 (function() {
     var uid = getUid();
@@ -121,7 +122,7 @@ function getShoppingKey() {
     window._ozuid = uid; //暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.18', 'yohobuy_web', uid, '', '');
+        window._yas(1 * new Date(), '2.1.0', 'yohobuy_web', uid, '', '');
     }
 }());
 

 {
   "name": "web-yohobuy",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "web yohobuy static",
   "keywords": [],
   "homepage": "",

@@ -1062,7 +1062,10 @@ class CartModel
             /* 判断是否是友盟过来的用户 */
             $userAgent = null;
             $unionKey = '';
-            if (!empty($_COOKIE['_QYH_UNION'])) {
+            if (!empty($_COOKIE['mkt_code']) || !empty($_COOKIE['_QYH_UNION'])) {
+                if (!empty($_COOKIE['mkt_code'])) {
+                    $unionKey = '{"client_id":' . (strlen($_COOKIE['mkt_code']) >= 15 ? '' : '800') . $_COOKIE['mkt_code'] . '}';
+                } else {
                     // 新平台统一来源
                     $unionKey = trim(Encryption::decrypt(urldecode($_COOKIE['_QYH_UNION'])));
                     $extraIndex  = strrpos($unionKey, '}') + 1;
@@ -1072,6 +1075,7 @@ class CartModel
                         /* 解密客户端联盟信息(老逻辑) */
                         $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
                     }
+                }
                 /* 检查联盟参数是否有效 */
                 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
                 /* 模拟APP的User-Agent */

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.3.2"
+application.version = "5.3.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.3.2"
+application.version = "5.3.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.3.2"
+application.version = "5.3.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.3.2"
+application.version = "5.3.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"