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

@@ -388,4 +388,5 @@ $basicBtnC:#eb0313;
     }
 }
 @import "comments-consults";
-@import "product-description";
\ No newline at end of file
+@import "product-description";
+

 .good-detail-page{
         .goods-desc {
         .service {
-            width: pxToRem(489px);
+            width: pxToRem(494px);
             height: pxToRem(28px);
             margin-top: pxToRem(22px);
+            margin-left: pxToRem(40px);
+            background: image-url('product/service.png') no-repeat;
+            background-size: cover;
         }
         .detail{
             background-color: $tableCellC;

 {{#goodsDescription}}
 <div class="goods-desc  page-block">
-    <img class="service lazy" data-original="http://static.dev.yohobuy.com/img/product/service.png" alt="">
+    <div class="service"></div>
     <h1 class="title">
         {{title}}
         <span class="en-title">{{enTitle}}</span>

@@ -323,7 +323,7 @@ class HomeController extends AbstractAction
 
         $this->_view->display('online-service', array(
             'onlineServicePage' => true,
-            // 'pageFooter' => true,
+             'pageFooter' => true,
             'service' => $service
         ));
     }

-<?php
-
-namespace Home;
-
-use LibModels\Wap\Home\OnlineData;
-use Plugin\Helpers;
-
-/**
- * 在线客服相关数据处理
- */
-class OnlineModel
-{
-
-    /*
-     * 获取在线帮助分类
-     * $clientType客户端类型
-     */
-    public static function getOnlineServiceInfo($clientType = 'iphone')
-    {
-        //调用接口获取数据
-        $res = OnlineData::getOnlineServiceInfo($clientType);
-        $cateInfo = $res['data'];
-        $question = array();
-        $tab = array();
-        if ($cateInfo)
-        {
-            foreach ($cateInfo as $key => $value)
-            {
-                //强制截成3个tab
-                if ($key > 2)
-                {
-                    break;
-                }
-                $tab[$key]['tabid'] = 'tab' . $value['id'];
-                $tab[$key]['tabname'] = $value['category_name'];
-                $tab[$key]['iscut'] = true;
-                $tab[$key]['current'] = (!$key) ? TRUE : FALSE;
-                $question[$key]['name'] = 'tab' . $value['id'];
-                $question[$key]['current'] = (!$key) ? TRUE : FALSE;
-                $sub = $value['sub'];
-                $qTmp = array();
-                if ($sub)
-                {
-                    foreach ($sub as $sk => $sv)
-                    {
-                        $qTmp[$sk]['title'] = $sv['category_name'];
-                        $qTmp[$sk]['link'] =  Helpers::url('/home/onlineservicedetail',array('cateId'=>$sv['id'],'cateName'=>$sv['category_name']));
-                    }
-                }
-                $question[$key]['list'] = $qTmp;
-            }
-            $question[0]['current'] = true;
-            $tab[count($tab) - 1]['iscut'] = false;
-        }
-        //处理返回信息
-        $result = array(
-            'header' => array('title' => '在线客服'),
-            'tab' => $tab,
-            'question' => $question
-        );
-
-        return $result;
-    }
-
-    /*
-     * 加载分类下的问题和解决方法
-     * cateId问题分类ID
-     * clientType客户端
-     */
-    public static function getOnlineServiceDetail($cateId, $clinetType = 'iphone')
-    {
-        $result = array();
-        if (!$cateId)
-        {
-            return $result;
-        }
-        $res = OnlineData::getOnlineServiceDetail($cateId, $clinetType);
-        $questionInfo = $res['data'];
-        if ($questionInfo)
-        {
-            $list = array();
-            if ($questionInfo)
-            {
-                foreach ($questionInfo as $qk => $qv)
-                {
-                    $list[$qk]['q'] = $qv['title'];
-                    $list[$qk]['a'] = $qv['content'];
-                }
-            }
-            //处理返回信息
-            $result = array(
-                'header' => array('title' => '在线客服'),
-                'list' => $list
-            );
-        }
-        return $result;
-    }
-
-}
+<?php
+
+namespace Home;
+
+use LibModels\Wap\Home\OnlineData;
+use Plugin\Helpers;
+
+/**
+ * 在线客服相关数据处理
+ */
+class OnlineModel
+{
+
+    /*
+     * 获取在线帮助分类
+     * $clientType客户端类型
+     */
+    public static function getOnlineServiceInfo($clientType = 'iphone')
+    {
+        //调用接口获取数据
+        $res = OnlineData::getOnlineServiceInfo($clientType);
+        $cateInfo = $res['data'];
+        $question = array();
+        $tab = array();
+        if ($cateInfo)
+        {
+            foreach ($cateInfo as $key => $value)
+            {
+                //强制截成3个tab
+                if ($key > 2)
+                {
+                    break;
+                }
+                $tab[$key]['tabid'] = 'tab' . $value['id'];
+                $tab[$key]['tabname'] = $value['category_name'];
+                $tab[$key]['iscut'] = true;
+                $tab[$key]['current'] = (!$key) ? TRUE : FALSE;
+                $question[$key]['name'] = 'tab' . $value['id'];
+                $question[$key]['current'] = (!$key) ? TRUE : FALSE;
+                $sub = $value['sub'];
+                $qTmp = array();
+                if ($sub)
+                {
+                    foreach ($sub as $sk => $sv)
+                    {
+                        $qTmp[$sk]['title'] = $sv['category_name'];
+                        $qTmp[$sk]['link'] =  Helpers::url('/home/onlineservicedetail',array('cateId'=>$sv['id'],'cateName'=>$sv['category_name']));
+                    }
+                }
+                $question[$key]['list'] = $qTmp;
+            }
+            $question[0]['current'] = true;
+            $tab[count($tab) - 1]['iscut'] = false;
+        }
+        //处理返回信息
+        $result = array(
+            'header' => array('title' => '在线客服'),
+            'tab' => $tab,
+            'question' => $question
+        );
+
+        return $result;
+    }
+
+    /*
+     * 加载分类下的问题和解决方法
+     * cateId问题分类ID
+     * clientType客户端
+     */
+    public static function getOnlineServiceDetail($cateId, $clinetType = 'iphone')
+    {
+        $result = array();
+        if (!$cateId)
+        {
+            return $result;
+        }
+        $res = OnlineData::getOnlineServiceDetail($cateId, $clinetType);
+        $questionInfo = $res['data'];
+        if ($questionInfo)
+        {
+            $list = array();
+            if ($questionInfo)
+            {
+                foreach ($questionInfo as $qk => $qv)
+                {
+                    $list[$qk]['q'] = $qv['title'];
+                    $list[$qk]['a'] = $qv['content'];
+                }
+            }
+            //处理返回信息
+            $result = array(
+                'header' => array('title' => '在线客服'),
+                'list' => $list
+            );
+        }
+        return $result;
+    }
+
+}