Authored by 周少峰

Merge branch 'hotfix/CartMktCode1'

@@ -1065,7 +1065,7 @@ class CartModel @@ -1065,7 +1065,7 @@ class CartModel
1065 if (!empty($_COOKIE['mkt_code']) || !empty($_COOKIE['_QYH_UNION'])) { 1065 if (!empty($_COOKIE['mkt_code']) || !empty($_COOKIE['_QYH_UNION'])) {
1066 if (!empty($_COOKIE['_QYH_UNION'])) { 1066 if (!empty($_COOKIE['_QYH_UNION'])) {
1067 // 新平台统一来源 1067 // 新平台统一来源
1068 - $unionKey = trim(Encryption::decrypt($_COOKIE['_QYH_UNION'])); 1068 + $unionKey = trim(Encryption::decrypt(rawurldecode($_COOKIE['_QYH_UNION'])));
1069 $extraIndex = strrpos($unionKey, '}') + 1; 1069 $extraIndex = strrpos($unionKey, '}') + 1;
1070 $unionKey = $encryObject = substr($unionKey, 0, $extraIndex); 1070 $unionKey = $encryObject = substr($unionKey, 0, $extraIndex);
1071 $unionClient = json_decode($encryObject, true); 1071 $unionClient = json_decode($encryObject, true);