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

@@ -802,19 +802,23 @@
             {
                 id: 1,
                 chosed: true,
-                name: '黄色'
-            },
-            ...
-        ],
-        sizes: [
-            {
-                id: 2,
-                chosed: true,
-                name: 'X'
+                name: '黄色'，
+                colorNum：10，
+                shortUrl：'',
+                sizes: [
+                {
+                        id: 2,
+                        chosed: true,
+                        name: 'X',
+                        sizeNum: 2
+                    },
+                    ...
+                ]
             },
             ...
         ],
-        num: 2
+        
+        totalNum: 20
     }
 
 ### 购物车商品
@@ -1113,7 +1117,8 @@
             'feedbacks' : {
                  'commentsNum' : 0,
                  'consultsNum' : 1,
-                 'link' : '',
+                 'commentsUrl' : '',
+                 'consultsUrl' : '',
                  'comments' : [
                      {
                         'userName' : 'Lynnic',
@@ -1243,6 +1248,20 @@
             'id' : '',
             'preferenceUrl' :''
         }
+### 评价列表页面 
+        {
+            'comments':{
+                'list' : [
+                    {
+                       'userName':'',
+                       'desc':'',
+                       'content':'',
+                       'time':''
+                    }
+                    ...
+                ]
+            }
+        }
 ### 咨询列表页面
         {
             'link' : '咨询表单跳转url',

@@ -182,8 +182,8 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
     $(this).addClass('highlight');
 }).on('touchend touchcancel', '.tap-hightlight', function() {
     $(this).removeClass('highlight');
+});
 
-});    
 $('.nav-home').on('touchstart', function() {
     $('.homebuttom').toggleClass('none');
 });

@@ -9,10 +9,7 @@ var $ = require('jquery'),
 
 var commentsNum,consultsNum;
 
-var consultFooterEle = $('.consult-content-footer')[0],
-    consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
-
-    navtabEle = document.getElementById('nav-tab'),
+var navtabEle = document.getElementById('nav-tab'),
     navtabHammer = navtabEle && new Hammer(navtabEle),
 
     gotoConsultEle = document.getElementById('goto-consult'),
@@ -66,12 +63,6 @@ if (navtabHammer) {
     });
 }
 
-if (consultFooterHammer) {
-    consultFooterHammer.on('tap', function() {
-        location.href = $(consultFooterEle).data('href');
-    });
-}
-
 if (gotoConsultHammer) {
     gotoConsultHammer.on('tap', function() {
         location.href = $(gotoConsultEle).data('href');

@@ -168,9 +168,6 @@
             &.focus {
                 color: #000;
             }
-                .comments-num {
-                    display: none;
-                }
         }
         .comment-nav {
             border-right: 1px solid #ccc;
@@ -286,17 +283,16 @@
 
         .comment-content-footer,
         .consult-content-footer {
+            display: block;
             min-height: pxToRem(88px);
             text-align: center;
             background-color: #fff;
             border-bottom: 1px solid $borderC;
             line-height: pxToRem(88px);
             font-size: pxToRem(28px);
-            a {
-                color: #b0b0b0;
-                .iconfont {
-                    font-size: inherit;
-                }
+            color: #b0b0b0;
+            .iconfont {
+                font-size: inherit;
             }
         }
 

@@ -250,8 +250,15 @@ $basicBtnC:#eb0313;
         padding-right: pxToRem(28px);
         border-bottom: 1px solid $borderC;
         background-color: $pageBgC;
-        display: flex;
-        align-items: center;
+        @include flexbox((
+             box-flex: 1.0,
+             display: box,
+             box-align: center
+         ), $version: 1);
+         @include flexbox((
+             display: flex,
+             align-items: center
+         ));
         span{
             // display: table-cell;
             display: -webkit-box;

@@ -2,7 +2,7 @@
 <div class="iHelp">
 	<ul>
 		{{# iHelp}}
-		<li><a href="/home/helpDetail?caption={{ caption}}"><span>{{ caption}}</span><i class="iconfont num">&#xe604;</i></a></li>
+		<li><a href="/home/helpDetail?code={{ code}}"><span>{{ name}}</span><i class="iconfont num">&#xe604;</i></a></li>
 		{{/ iHelp}}
 	</ul>
 </div>

@@ -8,7 +8,7 @@
         	     		{{userName}}
         	     	</span>
         	     	<span class="goods-spec">
-        	     		{{desc}}
+        	     		&nbsp;购买了&nbsp;&nbsp;{{desc}}
         	     	</span>
         	     	<p class="detail-content">
         	     		{{content}}

 <ul id="nav-tab" class="nav-tab clearfix">
-    <li class="comment-nav tap-hightlight">商品评价<span class="comments-num">{{commentsNum}}</span></li>
+    <li class="comment-nav tap-hightlight">商品评价(<span class="comments-num">{{commentsNum}}</span>)</li>
     <li class="consult-nav tap-hightlight">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
 </ul>
 <div id="feedback-content" >
@@ -21,6 +21,10 @@
             </span>
             {{/ comments}}
         </div>
+        <a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}">      
+                查看更多
+                <span class="iconfont">&#xe604;</span>
+        </a>
         {{^}}
         <div class="comment-content-main content-main no-item">
             <span class="iconfont">&#xe63d;</span>暂无评论
@@ -46,17 +50,16 @@
             </div>
             {{/ consults}}
         </div>
-        <div class="consult-content-footer tap-hightlight" data-href="{{link}}">
-            <a href="javascript:;">
-                查看更多
-                <span class="iconfont">&#xe604;</span></a>
-        </div>
+        <a class="consult-content-footer tap-hightlight" href="{{consultsUrl}}">
+            查看更多
+            <span class="iconfont">&#xe604;</span>
+        </a>
         {{else}}
         <div class="consult-content-main content-main no-item">
             <span class="iconfont">&#xe63f;</span>暂无咨询
         </div>
 
-        <div class="consult-content-footer tap-hightlight" data-href="{{link}}">
+        <div class="consult-content-footer tap-hightlight" data-href="{{commentsLink}}">
             <a href="javascript:;">
                 我要咨询
                 <span class="iconfont">&#xe604;</span></a>

@@ -874,17 +874,16 @@ class HomeController extends AbstractAction
    /**
     * 帮助列表页
     */
-   public function helpAction()
-   {
-       $this->setTitle('帮助中心');
-       $this->setNavHeader('帮助中心');
-       $data = array(
-           'iHelp' => array(
-               array('caption' => '新用户注册'),
-           )
-       );
-       $this->_view->display('i-help', $data);
-   }
+    public function helpAction()
+    {   
+        $service = Home\HelpModel::serviceInfo();
+        $this->setTitle('帮助中心');
+        $this->setNavHeader('帮助中心');
+        $data = array(
+            'iHelp' =>$service,
+        );
+        $this->_view->display('i-help', $data);
+    }
 
     /**
     * 帮助列表页