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
$unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
}
} else {
$unionKey = '{"client_id":' . $_COOKIE['mkt_code'] . '}';
$unionKey = '{"client_id":' . $_COOKIE['mkt_code'] .
(empty($_COOKIE['union_data']) ? '' : ',:"union_data":' . $_COOKIE['union_data']) . '}';
}
/* 检查联盟参数是否有效 */
... ... @@ -711,9 +712,6 @@ class IndexController extends AbstractAction
/* 模拟APP的User-Agent */
$userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null;
if (empty($unionKey) && !empty($_COOKIE['union_data'])) {
$unionKey = $_COOKIE['union_data'];
}
}
/* tar modified 161206 套餐 */
... ...