From 219317edfa4cceadd84193cec70d1924f64ab234 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 8 Oct 2019 15:58:26 +0800
Subject: [PATCH] 购物车不同门店一起下单，使用余额的bug修复

---
 pages/cart/cart2/cart2.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 09194c6..a98daa6 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -625,6 +625,8 @@ Page({
               th.data.cartlist[i].user_money = umoney;
               umoney=0;
             }
+          }else{
+              th.data.cartlist[i].user_money=0;
           }
 
           th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2);
@@ -635,12 +637,12 @@ Page({
           th.data.cartlist[i].goods_price = o_price.toFixed(2);
           th.data.cartlist[i].order_amount= th.data.cartlist[i].order_amount- th.data.cartlist[i].user_money;         //会员使用余额
 
-          all_price += o_price;
-          all_total_m += th.data.cartlist[i].total_amount;
-          all_shipping_m += th.data.cartlist[i].shipping_price;
-          all_order_m += th.data.cartlist[i].order_amount;
-          all_user_m += th.data.cartlist[i].user_money;
-          all_coupon_price_m+=th.data.cartlist[i].coupon_price;
+          all_price += parseFloat(o_price);
+          all_total_m +=  parseFloat(th.data.cartlist[i].total_amount);
+          all_shipping_m +=  parseFloat(th.data.cartlist[i].shipping_price);
+          all_order_m +=  parseFloat(th.data.cartlist[i].order_amount);
+          all_user_m +=  parseFloat(th.data.cartlist[i].user_money);
+          all_coupon_price_m+= parseFloat(th.data.cartlist[i].coupon_price);
 
 
         }
--
libgit2 0.21.4