Merge branch 'develop' into 'develop'

Develop

1:购物车商品为零时不显示
2:帮助中心详情优化
3:赠品显示原价

See merge request !61

@@ -19,6 +19,9 @@ $.ajax({
             if (count > 99) {
             if (count > 99) {
                 count = '99+';
                 count = '99+';
             }
             }
+            if (count === 0) {
+                $('.cart-count').remove();
+            }
             $cart.find('.cart-count').html(count).removeClass('hide');
             $cart.find('.cart-count').html(count).removeClass('hide');
         }
         }
     }
     }

@@ -33,3 +33,9 @@
 		}
 		}
 	}
 	}
 }
 }
+.deal_main{
+	margin: .5rem 3%;
+	font-size:1.2em;
+	widows: 94%;
+	overflow: hidden;
+}

@@ -46,6 +46,9 @@
                         {{#if isAdvanceBuy}}
                         {{#if isAdvanceBuy}}
                         <span class="sale-price">¥{{salesPrice}}</span>
                         <span class="sale-price">¥{{salesPrice}}</span>
                         {{/if}}
                         {{/if}}
+                        {{#if isGift}}
+                        <span class="sale-price">¥{{salesPrice}}</span>
+                        {{/if}}
                     </p>
                     </p>
                 {{#if isVipPrice}}
                 {{#if isVipPrice}}
                     <span class="vip">
                     <span class="vip">