fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 69e3e8ee5ba619d8fea202cbbb964718bb943196 2 parents 34a298ba 34da53a9

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

Inline Side-by-side
Showing 1 changed file with 5 additions and 4 deletions
@@ -65,6 +65,7 @@ class CouponController extends AbstractAction @@ -65,6 +65,7 @@ class CouponController extends AbstractAction
65 $receiveData = filter_input_array(INPUT_GET, array( 65 $receiveData = filter_input_array(INPUT_GET, array(
66 'couponID' => FILTER_DEFAULT, 66 'couponID' => FILTER_DEFAULT,
67 'code' => FILTER_DEFAULT, 67 'code' => FILTER_DEFAULT,
  68 + 'app_version' => FILTER_DEFAULT
68 )); 69 ));
69 // 跳转 URl 70 // 跳转 URl
70 $playUrl = Helpers::url('/coupon/floor'); 71 $playUrl = Helpers::url('/coupon/floor');
@@ -86,10 +87,10 @@ class CouponController extends AbstractAction @@ -86,10 +87,10 @@ class CouponController extends AbstractAction
86 $returnData['url'] = Helpers::url('/signin.html', array('refer' => $playUrl), 'default'); 87 $returnData['url'] = Helpers::url('/signin.html', array('refer' => $playUrl), 'default');
87 } else { 88 } else {
88 $returnData['isApp'] = true; 89 $returnData['isApp'] = true;
89 - $playUrlEncode = strtr($playUrl . '?code=' . $receiveData['code'], array('/' => '\\/'));  
90 - $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';  
91 -// $playUrlEncode = strtr($playUrl, array('/' => '\\/'));  
92 -// $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app","code":"' . $receiveData['code'] . '"}},"requesturl":{"url":"","param":{}},"priority":"N"}}'; 90 + // $playUrlEncode = strtr($playUrl . '?code=' . $receiveData['code'] .'&app_version=' . $receiveData['app_version'], array('/' => '\\/'));
  91 + // $returnData['url'] = $playUrl . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}';
  92 + $playUrlEncode = strtr($playUrl, array('/' => '\\/'));
  93 + $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"}}';
93 } 94 }
94 } else { 95 } else {
95 // 登录后调用领券接口 96 // 登录后调用领券接口