From e44d50bb55a5b44e82194679789e1848d4e31430 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 20 Sep 2019 10:35:01 +0800
Subject: [PATCH] 购物车金额显示， 订单列表。订单详情

---
 pages/cart/cart2/cart2.js                | 14 ++++++++------
 pages/order/refund_order/refund_order.js |  2 +-
 pages/user/order_detail/order_detail.js  |  2 +-
 pages/user/order_list/order_list.js      |  9 +++++----
 pages/user/return_goods/return_goods.js  |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index f5c9ba7..585a1fc 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -540,7 +540,7 @@ Page({
           //--------循环计算总价-----------
           for(var j=0;j<item.length;j++){
             o_price += item[j].goods_price * item[j].goods_num;
-            th.data.cartlist[i].goods_price = o_price;      //商品总费用
+            th.data.cartlist[i].goods_price = o_price.toFixed(2);      //商品总费用
             //计算物流费用
             th.data.cartlist[i].shipping_price = 0;
             //----------------如果是选择了物流---------------------
@@ -574,6 +574,8 @@ Page({
             th.data.cartlist[i].shipping_price=0;
           }
 
+         th.data.cartlist[i].shipping_price.toFixed(2);
+
           //---如果有选择优惠券的情况下---
          var quan_price=0;
          var  coupon_price=0,bn_pick=th.data.bn_pick,pickid=cart_item.pickup_id;
@@ -599,8 +601,8 @@ Page({
           }
 
           //总价计算,总价不包含运费
-          th.data.cartlist[i].order_amount= o_price -quan_price;
-          th.data.cartlist[i].total_amount= o_price;
+          th.data.cartlist[i].order_amount= (o_price -quan_price).toFixed(2);
+          th.data.cartlist[i].total_amount= o_price.toFixed(2);
 
           coupon_price=quan_price;
           if( th.data.cartlist[i].order_amount<0){
@@ -622,9 +624,9 @@ Page({
             }
           }
 
-
-          th.data.cartlist[i].coupon_price=coupon_price;
-          th.data.cartlist[i].goods_price = o_price;
+          th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2);
+          th.data.cartlist[i].coupon_price=coupon_price.toFixed(2);
+          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;
diff --git a/pages/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js
index 6965149..4533643 100644
--- a/pages/order/refund_order/refund_order.js
+++ b/pages/order/refund_order/refund_order.js
@@ -62,7 +62,7 @@ Page({
                })
                glist = glist.substring(0, glist.length-1);  
                console.log(glist);
-               rq.post("/api/weshop/order/returngoods/save", {
+               rq.post("/api/weshop/order/returngoods/saveReturnGoods", {
                  data: {
                     order_id: th.data.orderId,
                     order_sn: th.data.order_sn,
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 9028872..2bacd30 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -335,7 +335,7 @@ Page({
             success: function(tt) {
                 t.confirm && rq.put("/api/weshop/order/updatebyId", {
                     data: {
-                        order_id: a, order_status: 5
+                      order_id: order_id, order_status: 5
                     },
                     success: function (t) {
                         getApp().my_warnning("删除成功",1,th);
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index e794b4e..8a0cec5 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -249,17 +249,18 @@ Page({
 
     //-----删除订单-----
     deleteOrderData: function(t) {
+        var th=this;
         var order_id=t.currentTarget.dataset.order_id;
         wx.showModal({
             title: "是否取消订单？",
             success: function(tt) {
-                t.confirm && rq.put("/api/weshop/order/updatebyId", {
+                tt.confirm && rq.put("/api/weshop/order/updatebyId", {
                     data: {
-                        order_id: a, order_status: 5
+                      order_id: order_id, order_status: 5
                     },
                     success: function (t) {
-                        for (var e = 0; e < this.data.orderList.length; e++) if (this.data.orderList[e].order_id == t) {
-                            this.data.orderList.splice(e, 1), this.setData({
+                      for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id == order_id) {
+                            th.data.orderList.splice(e, 1), th.setData({
                                 orderList: this.data.orderList
                             });
                             break;
diff --git a/pages/user/return_goods/return_goods.js b/pages/user/return_goods/return_goods.js
index 2d696a1..2397960 100644
--- a/pages/user/return_goods/return_goods.js
+++ b/pages/user/return_goods/return_goods.js
@@ -129,7 +129,7 @@ Page({
         var t = this,th=t;
         this.checkSubmit(function() {
             t.uploadPhotos(function() {
-              a.post("/api/weshop/order/returngoods/save", {
+              a.post("/api/weshop/order/returngoods/saveReturnGoods", {
                    /*---
                     data: {
                         rec_id: t.data.recId,
--
libgit2 0.21.4