fe / YOHOBUYWAP · Commits

Go to a project

Authored by 郝肖肖
Commit bed2ec580bede10bad3966f2b78ff3d662af21c7 2 parents b2bbde65 84fdb95c

Merge branch 'hotfix/unionData' into gray

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
@@ -703,7 +703,8 @@ class IndexController extends AbstractAction @@ -703,7 +703,8 @@ class IndexController extends AbstractAction
703 $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy'); 703 $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
704 } 704 }
705 } else { 705 } else {
706 - $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] . '}'; 706 + $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] .
  707 + (empty($_COOKIE['union_data']) ? '' : ',:"union_data":' . $_COOKIE['union_data']) . '}';
707 } 708 }
708 709
709 /* 检查联盟参数是否有效 */ 710 /* 检查联盟参数是否有效 */
@@ -711,9 +712,6 @@ class IndexController extends AbstractAction @@ -711,9 +712,6 @@ class IndexController extends AbstractAction
711 /* 模拟APP的User-Agent */ 712 /* 模拟APP的User-Agent */
712 $userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null; 713 $userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null;
713 714
714 - if (empty($unionKey) && !empty($_COOKIE['union_data'])) {  
715 - $unionKey = $_COOKIE['union_data'];  
716 - }  
717 } 715 }
718 716
719 /* tar modified 161206 套餐 */ 717 /* tar modified 161206 套餐 */