修复购物车中VIP价格缺少的bug

Code Review By Rock Zhang

@@ -58,13 +58,7 @@
 {{/if}}
 
 <div class="price-compute">
-    <p>
-        <span>总价（¥{{price}}）<i>-</i></span>
-        <span>活动价(¥{{activityPrice}})</span>
-    </p>
-    <p>
-        <span><i>=</i>商品总计金额 （¥{{sumPrice}}）</span>
-    </p>
+    <p>{{formulaPrice}}</p>
 </div>
 
 <div class="balance">

@@ -788,8 +788,9 @@ class CartModel
             }
 
             // 结算数据
-            $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
-            $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
+            $result['formulaPrice'] = $data['shopping_cart_data']['promotion_formula'];
+            /*$result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
+            $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);*/
             $result['count'] = $data['shopping_cart_data']['selected_goods_count'];
             $result['isAllSelected'] = ($data['shopping_cart_data']['goods_count'] === $data['shopping_cart_data']['selected_goods_count']) && ($data['shopping_cart_data']['selected_goods_count'] >0);
             $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']);