Merge branch 'feature/detailFix' into develop

@@ -82,6 +82,7 @@ $('#hotRank').on('touchend touchcancel', function(e) {
     var target = ev.target || ev.srcElement;
 
     if (target.nodeName.toLowerCase() === 'span') {
+        $('.s-goods-nav .nav-item').removeClass('active');
         target.parentNode.className = 'active ' + target.parentNode.className;
         id = target.getAttribute('data-id') ? target.getAttribute('data-id') : '';
         sort = target.getAttribute('data-sort') ? target.getAttribute('data-sort') : '';
@@ -98,9 +99,9 @@ $('#hotRank').on('touchstart', function(e) {
     var target = ev.target || ev.srcElement;
 
     if (target.nodeName.toLowerCase() === 'span') {
-        target.parentNode.className = 'active ' + target.parentNode.className;
+        target.parentNode.className = 'bgActive ' + target.parentNode.className;
     }
 }).on('touchend touchcancel', function() {
-    $('.s-goods-nav .nav-item').removeClass('active');
+    $('.s-goods-nav .nav-item').removeClass('bgActive');
 });
 

@@ -138,6 +138,9 @@
         color: #999;
         &.active{
             color: #000;
+        }
+        &.bgActive{
+            color: #000;
             background-color:#e0e0e0;
         }
         a {

@@ -3,7 +3,7 @@
         <div class="goto-consult">
                 <i class="iconfont consult-logo">&#xe639;</i>
                 <span>我要咨询</span>
-                <a href="{{consultUrl}}" class="iconfont enter-consult-page">&#xe604;</a>
+                <a href="{{link}}" class="iconfont enter-consult-page">&#xe604;</a>
         </div>
          {{# consults}}
          <div class="goods-consults" id="goods-consults">

@@ -121,7 +121,7 @@
         <span class="num-tag hide"></span>
         <a href="{{cartUrl}}" class="num-incart iconfont">&#xe62c;</a>
         
-        {{#if addToCart}}
+        {{#if addToCartUrl}}
             <a  id="addtoCart" href="{{addToCartUrl}}"  class="addto-cart">加入购物车</a>
         {{/if}}
 

@@ -3,7 +3,7 @@
     <ul class="swiper-wrapper clearfix">
     {{# tabs}}
         {{# title}}
-            <li class="swiper-slide nav-item">
+            <li class="swiper-slide nav-item {{#if @first}} active{{/if}}">
                 <span data-sort="{{ params}}" data-id="{{ id}}" >{{ name}}</span>
             </li>
             {{/ title}}