Authored by 郭成尧

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

some
@@ -94,3 +94,7 @@ $('.coupon-message-op-rel').on('click', function() { @@ -94,3 +94,7 @@ $('.coupon-message-op-rel').on('click', function() {
94 location.reload(); 94 location.reload();
95 }); 95 });
96 96
  97 +if ($('#noData').length >= 0) {
  98 + tip.show('网络异常!');
  99 +}
  100 +
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <input id="shareTitle" type="hidden" value="{{shareTitle}}"> 53 <input id="shareTitle" type="hidden" value="{{shareTitle}}">
54 {{/ share}} 54 {{/ share}}
55 {{#if noData}} 55 {{#if noData}}
56 - 56 + <input id="noData" type="hidden">
57 {{/if}} 57 {{/if}}
58 {{/ content}} 58 {{/ content}}
59 </div> 59 </div>
@@ -37,15 +37,8 @@ class CouponController extends AbstractAction @@ -37,15 +37,8 @@ class CouponController extends AbstractAction
37 $uid = $this->getUid(); 37 $uid = $this->getUid();
38 } 38 }
39 $resource = CouponData::getCouponRousource($receiveData['code'], $uid); 39 $resource = CouponData::getCouponRousource($receiveData['code'], $uid);
40 - if (isset($resource['code']) && $resource['code'] === 200) { 40 + if (isset($resource['code']) && $resource['code'] == 200) {
41 $result = CouponFloorProcess::getContent($resource['data']); 41 $result = CouponFloorProcess::getContent($resource['data']);
42 - }else{  
43 - $this->_view->display('index', array(  
44 - 'content' => array(  
45 - 'noData' => true,  
46 - ),  
47 - 'floorPage' => true  
48 - ));  
49 } 42 }
50 // 分享 43 // 分享
51 $shareData = CouponFloorProcess::getShare($receiveData['code'], '领券中心'); 44 $shareData = CouponFloorProcess::getShare($receiveData['code'], '领券中心');