fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 2ca4f5f34054fb983b896238c7362943f4751a7c 2 parents 51ab2bf2 46fdad1a

Merge branch 'hotfix/mktCodeLen'

Inline Side-by-side
Showing 8 changed files with 21 additions and 16 deletions
@@ -111,7 +111,8 @@ function getShoppingKey() { @@ -111,7 +111,8 @@ function getShoppingKey() {
111 a.async = 1; 111 a.async = 1;
112 a.src = j; 112 a.src = j;
113 m.parentNode.insertBefore(a, m); 113 m.parentNode.insertBefore(a, m);
114 -})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas'); 114 +})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' +
  115 + 'cdn.yoho.cn/yas-jssdk/2.1.0/yas.js', '_yas');
115 116
116 (function() { 117 (function() {
117 var uid = getUid(); 118 var uid = getUid();
@@ -121,7 +122,7 @@ function getShoppingKey() { @@ -121,7 +122,7 @@ function getShoppingKey() {
121 window._ozuid = uid; //暴露ozuid 122 window._ozuid = uid; //暴露ozuid
122 123
123 if (window._yas) { 124 if (window._yas) {
124 - window._yas(1 * new Date(), '1.0.18', 'yohobuy_web', uid, '', ''); 125 + window._yas(1 * new Date(), '2.1.0', 'yohobuy_web', uid, '', '');
125 } 126 }
126 }()); 127 }());
127 128
1 { 1 {
2 "name": "web-yohobuy", 2 "name": "web-yohobuy",
3 - "version": "5.3.2", 3 + "version": "5.3.3",
4 "description": "web yohobuy static", 4 "description": "web yohobuy static",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -1062,15 +1062,19 @@ class CartModel @@ -1062,15 +1062,19 @@ class CartModel
1062 /* 判断是否是友盟过来的用户 */ 1062 /* 判断是否是友盟过来的用户 */
1063 $userAgent = null; 1063 $userAgent = null;
1064 $unionKey = ''; 1064 $unionKey = '';
1065 - if (!empty($_COOKIE['_QYH_UNION'])) {  
1066 - // 新平台统一来源  
1067 - $unionKey = trim(Encryption::decrypt(urldecode($_COOKIE['_QYH_UNION'])));  
1068 - $extraIndex = strrpos($unionKey, '}') + 1;  
1069 - $unionKey = $encryObject = substr($unionKey, 0, $extraIndex);  
1070 - $unionClient = json_decode($encryObject, true);  
1071 - if (!isset($unionClient['client_id']) || empty($unionClient['client_id'])) {  
1072 - /* 解密客户端联盟信息(老逻辑) */  
1073 - $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy'); 1065 + if (!empty($_COOKIE['mkt_code']) || !empty($_COOKIE['_QYH_UNION'])) {
  1066 + if (!empty($_COOKIE['mkt_code'])) {
  1067 + $unionKey = '{"client_id":' . (strlen($_COOKIE['mkt_code']) >= 15 ? '' : '800') . $_COOKIE['mkt_code'] . '}';
  1068 + } else {
  1069 + // 新平台统一来源
  1070 + $unionKey = trim(Encryption::decrypt(urldecode($_COOKIE['_QYH_UNION'])));
  1071 + $extraIndex = strrpos($unionKey, '}') + 1;
  1072 + $unionKey = $encryObject = substr($unionKey, 0, $extraIndex);
  1073 + $unionClient = json_decode($encryObject, true);
  1074 + if (!isset($unionClient['client_id']) || empty($unionClient['client_id'])) {
  1075 + /* 解密客户端联盟信息(老逻辑) */
  1076 + $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
  1077 + }
1074 } 1078 }
1075 /* 检查联盟参数是否有效 */ 1079 /* 检查联盟参数是否有效 */
1076 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true); 1080 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.2" 53 +application.version = "5.3.3"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.2" 53 +application.version = "5.3.3"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.2" 53 +application.version = "5.3.3"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.2" 53 +application.version = "5.3.3"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"