1 participants
-
Status changed to merged
-
mentioned in commit 822b2cba62a5967ca730e224c2211aef840623c6
Showing
1 changed file
pages/cart/cart2/cart2.js
| @@ -610,8 +610,11 @@ Page({ | @@ -610,8 +610,11 @@ Page({ | ||
| 610 | coupon_price=o_price; | 610 | coupon_price=o_price; |
| 611 | } | 611 | } |
| 612 | 612 | ||
| 613 | - th.data.cartlist[i].total_amount+=th.data.cartlist[i].shipping_price; //总金额 | ||
| 614 | - th.data.cartlist[i].order_amount+=th.data.cartlist[i].shipping_price; //总金额 | 613 | + th.data.cartlist[i].total_amount= parseFloat(th.data.cartlist[i].total_amount)+parseFloat(th.data.cartlist[i].shipping_price); //总金额 |
| 614 | + th.data.cartlist[i].order_amount=parseFloat(th.data.cartlist[i].order_amount)+parseFloat(th.data.cartlist[i].shipping_price); //总金额 | ||
| 615 | + | ||
| 616 | + th.data.cartlist[i].total_amount= th.data.cartlist[i].total_amount.toFixed(2); | ||
| 617 | + th.data.cartlist[i].order_amount=th.data.cartlist[i].order_amount.toFixed(2); | ||
| 615 | 618 | ||
| 616 | //--------------如果使用余额--------------------- | 619 | //--------------如果使用余额--------------------- |
| 617 | if (th.data.js_use_money == 1) { | 620 | if (th.data.js_use_money == 1) { |
| @@ -639,8 +642,6 @@ Page({ | @@ -639,8 +642,6 @@ Page({ | ||
| 639 | all_user_m += th.data.cartlist[i].user_money; | 642 | all_user_m += th.data.cartlist[i].user_money; |
| 640 | all_coupon_price_m+=th.data.cartlist[i].coupon_price; | 643 | all_coupon_price_m+=th.data.cartlist[i].coupon_price; |
| 641 | 644 | ||
| 642 | - console.log('all_coupon_price_m:'+all_coupon_price_m); | ||
| 643 | - | ||
| 644 | 645 | ||
| 645 | } | 646 | } |
| 646 | 647 | ||
| @@ -1016,7 +1017,7 @@ Page({ | @@ -1016,7 +1017,7 @@ Page({ | ||
| 1016 | if(msg.length>13){ | 1017 | if(msg.length>13){ |
| 1017 | msg=msg.slice(0, 13) + "\r\n"+ msg.slice(13); | 1018 | msg=msg.slice(0, 13) + "\r\n"+ msg.slice(13); |
| 1018 | } | 1019 | } |
| 1019 | - getApp().confirmBox(); | 1020 | + getApp().confirmBox(msg); |
| 1020 | } | 1021 | } |
| 1021 | }else{ | 1022 | }else{ |
| 1022 | console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); | 1023 | console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); |