fe / YOHOBUYWAP · Commits

Go to a project

Authored by liangxs
Commit d33138d787fb3c4e79f89ce33d05aeba61ef5ea0 2 parents c1568d09 22417ee0

Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon

Inline Side-by-side
Showing 1 changed file with 9 additions and 12 deletions
@@ -22,12 +22,9 @@ class CouponController extends AbstractAction @@ -22,12 +22,9 @@ class CouponController extends AbstractAction
22 */ 22 */
23 public function floorAction() 23 public function floorAction()
24 { 24 {
25 -  
26 - if (!$this->isApp()) {  
27 - $this->setNavHeader('领券中心', true, SITE_MAIN);  
28 - }  
29 $receiveData = filter_input_array(INPUT_GET, array( 25 $receiveData = filter_input_array(INPUT_GET, array(
30 - 'code' => FILTER_DEFAULT 26 + 'code' => FILTER_DEFAULT,
  27 + 'title' => FILTER_DEFAULT,
31 )); 28 ));
32 $result = array(); 29 $result = array();
33 $uid = ''; 30 $uid = '';
@@ -39,17 +36,17 @@ class CouponController extends AbstractAction @@ -39,17 +36,17 @@ class CouponController extends AbstractAction
39 $resource = CouponData::getCouponRousource($receiveData['code'], $uid); 36 $resource = CouponData::getCouponRousource($receiveData['code'], $uid);
40 if (isset($resource['code']) && $resource['code'] === 200) { 37 if (isset($resource['code']) && $resource['code'] === 200) {
41 $result = CouponFloorProcess::getContent($resource['data']); 38 $result = CouponFloorProcess::getContent($resource['data']);
42 - }else{  
43 - $this->_view->display('index', array(  
44 - 'content' => array(  
45 - 'noData' => true,  
46 - ),  
47 - 'floorPage' => true  
48 - )); 39 + } else {
  40 + $result['noData'] = true;
49 } 41 }
50 // 分享 42 // 分享
51 $shareData = CouponFloorProcess::getShare($receiveData['code'], '领券中心'); 43 $shareData = CouponFloorProcess::getShare($receiveData['code'], '领券中心');
52 $result[count($result)] = $shareData; 44 $result[count($result)] = $shareData;
  45 + if (!$this->isApp()) {
  46 + $this->setNavHeader($receiveData['title'], true, SITE_MAIN);
  47 + } else {
  48 + $this->setTitle($receiveData['title']);
  49 + }
53 $this->_view->display('index', array( 50 $this->_view->display('index', array(
54 'content' => $result, 51 'content' => $result,
55 'floorPage' => true 52 'floorPage' => true