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

@@ -40,7 +40,6 @@ class CouponFloorProcess
             // tar note 处理楼层标题
             // tar note 处理楼层标题
             if ($fun === 'getCoupon' && $data[$k - 1]['template_name'] === 'text') {
             if ($fun === 'getCoupon' && $data[$k - 1]['template_name'] === 'text') {
                 $v['data']['floorTitle'] = $data[$k - 1]['data'];
                 $v['data']['floorTitle'] = $data[$k - 1]['data'];
-                echo '11,';
             }
             }
             $build = self::$fun($v['data']);
             $build = self::$fun($v['data']);
             if (empty($build)) {
             if (empty($build)) {
@@ -109,7 +108,7 @@ class CouponFloorProcess
         }
         }
         if ($floorTitle !== '') {
         if ($floorTitle !== '') {
             $data[0]['floorTitle'] = $floorTitle;
             $data[0]['floorTitle'] = $floorTitle;
-            $data[0]['showTitle'] = true;
+            $data[0]['showFloorTitle'] = true;
         }
         }
         $result = $data[0];
         $result = $data[0];
         $result['isCoupon'] = true;
         $result['isCoupon'] = true;

@@ -35,6 +35,7 @@ class CouponController extends AbstractAction
         if (isset($resource['code']) && $resource['code'] == 200) {
         if (isset($resource['code']) && $resource['code'] == 200) {
             $result = CouponFloorProcess::getContent($resource['data']);
             $result = CouponFloorProcess::getContent($resource['data']);
         }
         }
+
         $this->_view->display('index', array(
         $this->_view->display('index', array(
             'content' => $result,
             'content' => $result,
             'floorPage' => true
             'floorPage' => true