Authored by 梁志锋

Merge branch 'feature/onlineService' into 'develop'

Feature/online service 在线客服详情页增加了底部

在线客服详情页增加了底部

See merge request !3
framework @ 75bbc3b0
1 -Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec 1 +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="online-service-detail-page yoho-page"> 2 <div class="online-service-detail-page yoho-page">
3 <div class="qa-list"> 3 <div class="qa-list">
  4 + {{# service}}
4 {{# list}} 5 {{# list}}
5 <div class="question-item"> 6 <div class="question-item">
6 <div class="question">Q:{{q}}</div> 7 <div class="question">Q:{{q}}</div>
7 <div class="answer">{{a}}</div> 8 <div class="answer">{{a}}</div>
8 </div> 9 </div>
9 - {{/ list}} 10 + {{/ list}}
  11 + {{/ service}}
10 </div> 12 </div>
11 </div> 13 </div>
12 -{{> layout/footer}}  
  14 +{{> layout/footer}}
@@ -249,7 +249,12 @@ @@ -249,7 +249,12 @@
249 {{#if onlineServicePage}} 249 {{#if onlineServicePage}}
250 <script> 250 <script>
251 seajs.use('js/me/online-service'); 251 seajs.use('js/me/online-service');
252 -</script> 252 +</script>onlineServiceDetailPage
  253 +{{/if}}
  254 +{{#if onlineServiceDetailPage}}
  255 +<script>
  256 + seajs.use('js/index/footer');
  257 +</script>onlineServiceDetailPage
253 {{/if}} 258 {{/if}}
254 {{#if addressPage}} 259 {{#if addressPage}}
255 <script> 260 <script>
@@ -275,4 +280,4 @@ @@ -275,4 +280,4 @@
275 <script> 280 <script>
276 seajs.use('js/me/browse-record'); 281 seajs.use('js/me/browse-record');
277 </script> 282 </script>
278 -{{/if}}  
  283 +{{/if}}
@@ -445,7 +445,11 @@ class HomeController extends AbstractAction @@ -445,7 +445,11 @@ class HomeController extends AbstractAction
445 } 445 }
446 $this->setTitle('在线客服'); 446 $this->setTitle('在线客服');
447 $this->setNavHeader($cateName, true, ''); 447 $this->setNavHeader($cateName, true, '');
448 - $this->_view->display('online-service-detail', $service); 448 + $this->_view->display('online-service-detail', array(
  449 + 'onlineServiceDetailPage' => true,
  450 + 'pageFooter' => true,
  451 + 'service' => $service
  452 + ));
449 } 453 }
450 454
451 /** 455 /**
@@ -791,4 +795,4 @@ class HomeController extends AbstractAction @@ -791,4 +795,4 @@ class HomeController extends AbstractAction
791 ); 795 );
792 $this->_view->display('i-help', $data); 796 $this->_view->display('i-help', $data);
793 } 797 }
794 -}  
  798 +}