Merge branch 'fix/issue' into 'develop'

解决问题

1. 详情页页面，当购物车内商品为0时，购物车图标上不显示数字0.
2.购物车页面，已参加活动标题重复问题修复

See merge request !48

@@ -82,6 +82,9 @@ $.ajax({
 
 
         if (data.code === 200) {
         if (data.code === 200) {
             count = data.data.cart_goods_count || 0;
             count = data.data.cart_goods_count || 0;
+            if (count === 0) {
+                return false;
+            }
             if (count > 99) {
             if (count > 99) {
                 count = '99+';
                 count = '99+';
             }
             }

@@ -150,12 +150,15 @@
             float: right;
             float: right;
         }
         }
     }
     }
+
+    .activity-title{
+        font-size: 32rem / $pxConvertRem;
+        padding: 20rem / $pxConvertRem 20rem / $pxConvertRem 0;
+    }
+
     .activity{
     .activity{
-        padding: 20rem / $pxConvertRem;
+        padding: 8rem / $pxConvertRem 20rem / $pxConvertRem 20rem / $pxConvertRem 32rem / $pxConvertRem;
         font-size: 26rem / $pxConvertRem;
         font-size: 26rem / $pxConvertRem;
-        h1{
-            font-size: 32rem / $pxConvertRem;
-        }
         li:before {
         li:before {
             content: "";
             content: "";
             display: inline-block;
             display: inline-block;

@@ -35,13 +35,20 @@
 {{/if}}
 {{/if}}
 
 
 {{# promotionInfo}}
 {{# promotionInfo}}
-<div class="activity">
+{{#if @first}}
+<div class="activity-title">
     <h1>已参与活动</h1>
     <h1>已参与活动</h1>
+</div>
+{{/if}}
+{{/ promotionInfo}}
+
+<div class="activity">
     <ul>
     <ul>
+        {{# promotionInfo}}
         <li>{{name}}</li>
         <li>{{name}}</li>
+        {{/ promotionInfo}}
     </ul>
     </ul>
 </div>
 </div>
-{{/ promotionInfo}}
 
 
 <div class="price-compute">
 <div class="price-compute">
     <p>
     <p>