fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 1c71d66d91dde477e0711db05620c3b88eec24d2 1 parent 2f56279f

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

Code Review By Rock Zhang
Inline Side-by-side
Showing 2 changed files with 4 additions and 9 deletions
@@ -58,13 +58,7 @@ @@ -58,13 +58,7 @@
58 {{/if}} 58 {{/if}}
59 59
60 <div class="price-compute"> 60 <div class="price-compute">
61 - <p>  
62 - <span>总价（¥{{price}}）<i>-</i></span>  
63 - <span>活动价(¥{{activityPrice}})</span>  
64 - </p>  
65 - <p>  
66 - <span><i>=</i>商品总计金额 （¥{{sumPrice}}）</span>  
67 - </p> 61 + <p>{{formulaPrice}}</p>
68 </div> 62 </div>
69 63
70 <div class="balance"> 64 <div class="balance">
@@ -788,8 +788,9 @@ class CartModel @@ -788,8 +788,9 @@ class CartModel
788 } 788 }
789 789
790 // 结算数据 790 // 结算数据
791 - $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);  
792 - $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']); 791 + $result['formulaPrice'] = $data['shopping_cart_data']['promotion_formula'];
  792 + /*$result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
  793 + $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);*/
793 $result['count'] = $data['shopping_cart_data']['selected_goods_count']; 794 $result['count'] = $data['shopping_cart_data']['selected_goods_count'];
794 $result['isAllSelected'] = ($data['shopping_cart_data']['goods_count'] === $data['shopping_cart_data']['selected_goods_count']) && ($data['shopping_cart_data']['selected_goods_count'] >0); 795 $result['isAllSelected'] = ($data['shopping_cart_data']['goods_count'] === $data['shopping_cart_data']['selected_goods_count']) && ($data['shopping_cart_data']['selected_goods_count'] >0);
795 $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']); 796 $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']);