修复购物车列表页底部活动参与不显示的问题

@@ -33,14 +33,16 @@
         {{/if}}
         {{/if}}
     </ul>
     </ul>
 {{/if}}
 {{/if}}
+
+{{# promotionInfo}}
 <div class="activity">
 <div class="activity">
-    <h1>以参与活动</h1>
+    <h1>已参与活动</h1>
     <ul>
     <ul>
-        {{# promotionInfo}}
-            <li>{{name}}</li>
-        {{/ promotionInfo}}
+        <li>{{name}}</li>
     </ul>
     </ul>
 </div>
 </div>
+{{/ promotionInfo}}
+
 <div class="price-compute">
 <div class="price-compute">
     <p>
     <p>
         <span>总价（¥{{price}}）<i>-</i></span>
         <span>总价（¥{{price}}）<i>-</i></span>

@@ -789,8 +789,6 @@ class CartModel
 
 
                     $result['promotionInfo'][] = $info;
                     $result['promotionInfo'][] = $info;
                 }
                 }
-
-                $result['promotionFormula'] = $data['shopping_cart_data']['promotion_formula'];
             }
             }
 
 
             // 结算数据
             // 结算数据