Merge branch 'feature/coupon' into beta/wap

@@ -95,6 +95,10 @@ $('.coupon-message-op-rel').on('click', function() {
 });
 });
 
 
 if ($('#noData').length > 0) {
 if ($('#noData').length > 0) {
+    if (location.href.indexOf('?openby:yohobuy=') <= 0){
         tip.show('网络异常!');
         tip.show('网络异常!');
+    }else{
+        console.log(location.href.indexOf('?openby:yohobuy='))
+    }
 }
 }
 
 

@@ -10,7 +10,7 @@
 .just-img{
 .just-img{
     width: 100%;
     width: 100%;
     float: left;
     float: left;
-    margin: 20px 0;
+    margin:0;
 }
 }
 .coupon-floor {
 .coupon-floor {
     float: left;
     float: left;

@@ -22,12 +22,9 @@ class CouponController extends AbstractAction
      */
      */
     public function floorAction()
     public function floorAction()
     {
     {
-
-        if (!$this->isApp()) {
-            $this->setNavHeader('领券中心', true, SITE_MAIN);
-        }
         $receiveData = filter_input_array(INPUT_GET, array(
         $receiveData = filter_input_array(INPUT_GET, array(
-            'code' => FILTER_DEFAULT
+            'code' => FILTER_DEFAULT,
+            'title' => FILTER_DEFAULT,
         ));
         ));
         $result = array();
         $result = array();
         $uid = '';
         $uid = '';
@@ -39,17 +36,17 @@ class CouponController extends AbstractAction
         $resource = CouponData::getCouponRousource($receiveData['code'], $uid);
         $resource = CouponData::getCouponRousource($receiveData['code'], $uid);
         if (isset($resource['code']) && $resource['code'] === 200) {
         if (isset($resource['code']) && $resource['code'] === 200) {
             $result = CouponFloorProcess::getContent($resource['data']);
             $result = CouponFloorProcess::getContent($resource['data']);
-        }else{
-            $this->_view->display('index', array(
-                'content' => array(
-                    'noData' => true,
-                ),
-                'floorPage' => true
-            ));
+        } else {
+            $result['noData'] = true;
         }
         }
         // 分享
         // 分享
         $shareData = CouponFloorProcess::getShare($receiveData['code'], '领券中心');
         $shareData = CouponFloorProcess::getShare($receiveData['code'], '领券中心');
         $result[count($result)] = $shareData;
         $result[count($result)] = $shareData;
+        if (!$this->isApp()) {
+            $this->setNavHeader($receiveData['title'], true, SITE_MAIN);
+        } else {
+            $this->setTitle($receiveData['title']);
+        }
         $this->_view->display('index', array(
         $this->_view->display('index', array(
             'content' => $result,
             'content' => $result,
             'floorPage' => true
             'floorPage' => true