Authored by 梁志锋

Merge remote-tracking branch 'origin/master' into master_hotfix

... ... @@ -65,6 +65,7 @@ class CouponController extends AbstractAction
$receiveData = filter_input_array(INPUT_GET, array(
'couponID' => FILTER_DEFAULT,
'code' => FILTER_DEFAULT,
'app_version' => FILTER_DEFAULT
));
// 跳转 URl
$playUrl = Helpers::url('/coupon/floor');
... ... @@ -86,10 +87,10 @@ class CouponController extends AbstractAction
$returnData['url'] = Helpers::url('/signin.html', array('refer' => $playUrl), 'default');
} else {
$returnData['isApp'] = true;
$playUrlEncode = strtr($playUrl . '?code=' . $receiveData['code'], array('/' => '\\/'));
$returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
// $playUrlEncode = strtr($playUrl, array('/' => '\\/'));
// $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app","code":"' . $receiveData['code'] . '"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
// $playUrlEncode = strtr($playUrl . '?code=' . $receiveData['code'] .'&app_version=' . $receiveData['app_version'], array('/' => '\\/'));
// $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
$playUrlEncode = strtr($playUrl, array('/' => '\\/'));
$returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app","code":"' . $receiveData['code'] . '","app_version":"' . $receiveData['app_version'] .'"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
}
} else {
// 登录后调用领券接口
... ...