Merge branch 'develop' into feature/address

@@ -16,6 +16,7 @@
 
         .user-name {
             font-size: 25rem / $pxConvertRem;
+            margin-right: 0.5rem;
         }
 
         .vip-icon {

@@ -41,7 +41,7 @@
     .price {
         position: relative;
         margin-top: pxToRem(20px);
-        font-size: pxToRem(12px);
+        font-size: pxToRem(24px);
         line-height: 1;
 
         .sale-price {
@@ -58,4 +58,4 @@
             color: #444;
         }
     }
-}
\ No newline at end of file
+}

 {{> layout/header}}
 <div class="online-service-detail-page yoho-page">
     <div class="qa-list">
+        {{# service}}
         {{# list}}
         <div class="question-item">
             <div class="question">Q：{{q}}</div>
             <div class="answer">{{a}}</div>
         </div>
-        {{/ list}}    
+        {{/ list}}
+        {{/ service}}
     </div>
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}

@@ -249,7 +249,12 @@
 {{#if onlineServicePage}}
 <script>
     seajs.use('js/me/online-service');
-</script>
+</script>onlineServiceDetailPage
+{{/if}}
+{{#if onlineServiceDetailPage}}
+<script>
+    seajs.use('js/index/footer');
+</script>onlineServiceDetailPage
 {{/if}}
 {{#if addressPage}}
 <script>
@@ -275,4 +280,4 @@
 <script>
     seajs.use('js/me/browse-record');
 </script>
-{{/if}}
\ No newline at end of file
+{{/if}}

@@ -67,6 +67,7 @@
 {{#if vip0}}
     <p>
         <span class="user-name">{{name}}</span>
+        <span>普通会员</span>
     </p>
     <p class="grade-desc">
         还差<span class="cost-gap">¥{{costGap}}</span>就可以升级为银卡会员!

+{{#if list}}
 <div class="banner-top">
     <div class="banner-swiper swiper-container">
         <ul class="swiper-wrapper">
@@ -17,4 +18,11 @@
 
     <div class="my-swiper-button-prev prev-grey"></div>
     <div class="my-swiper-button-next next-grey"></div>
-</div>
\ No newline at end of file
+</div>
+        {{^}}
+<div class="banner-top-single">
+<a href={{url}}>
+<img class="img" src="{{img}}">
+</a>
+</div>
+        {{/if}}
\ No newline at end of file

@@ -445,7 +445,11 @@ class HomeController extends AbstractAction
 		}
 		$this->setTitle('在线客服');
 		$this->setNavHeader($cateName, true, '');
-		$this->_view->display('online-service-detail', $service);
+		$this->_view->display('online-service-detail', array(
+            'onlineServiceDetailPage' => true,
+            'pageFooter' => true,
+            'service' => $service
+        ));
 	}
 
 	/**
@@ -791,4 +795,4 @@ class HomeController extends AbstractAction
 		);
 		$this->_view->display('i-help', $data);
 	}
-}
\ No newline at end of file
+}