Merge branch 'test' into 'qa'

Test See merge request !31

Merge branch 'test' into 'qa'
Test See merge request !31
后端研发-苏明海
2 parents aa56208e ae653f2f
Showing 9 changed files with 82 additions and 22 deletions
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.wxss
pages/order/refund_order/refund_order.js
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.json
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
pages/user/return_goods/return_goods.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;
@@ -2229,5 +2229,5 @@ right:17rpx; top:55rpx;
 .no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
 .join-cart>view.no_store {
-  width: 58%;
+  width: 58%; background-color: #adadad;
 }
@@ -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,
@@ -108,6 +108,8 @@ Page({
                                       //2.退款被拒绝就要显示可以退款
                                       //3.退款已经完成
                                       r['is_all_return'] = 0;
+                                      var rt_ok_num=0;
+
                                       if(r['order_status'] == 1 && r['pay_status'] == 1) {
                                           goodslist.forEach(function (eeb, iii) {
                                               goodslist[iii]['return_btn'] = 1;
@@ -120,7 +122,7 @@ Page({
                                                           case 1://退款处理中
                                                               goodslist[iii]['return_btn'] = 2; break;
                                                           case 2://退款完成
-                                                              goodslist[iii]['return_btn'] = 4; break;
+                                                              goodslist[iii]['return_btn'] = 4;rt_ok_num++; break;
                                                           case 3://已拒绝，重新退款
                                                               goodslist[iii]['return_btn'] = 3; break;
                                                           default:
@@ -134,6 +136,10 @@ Page({
                                   }
                               }
+                              //--如果是全部退款，也就可以删除--
+                              if(rt_ok_num==goodslist.length){
+                                  r['is_all_return_status']=2;
+                              }
                               r['order_goods'] = goodslist;
                               var g_num = 0;
                               goodslist.forEach(function (ee, ii) {
@@ -320,6 +326,28 @@ 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", {
+                    data: {
+                      order_id: order_id, order_status: 5
+                    },
+                    success: function (t) {
+                        getApp().my_warnning("删除成功",1,th);
+                        setTimeout(function () {
+                             getApp().goto("/pages/user/order_list/order_list");
+                        },1000);
+                    }
+                })
+            }
+        });
+    },
+
 });
 \ No newline at end of file
 {
     "navigationBarTitleText": "订单详情",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "warn": "/components/long_warn/long_warn"
+    }
 }
 \ No newline at end of file
@@ -140,9 +140,12 @@
                           <navigator class="tips-btn" hidden="{{!(order.order_status==1&&order.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
          </block> 
          <block wx:else>
+                          <view class="tips-btn" wx:if="{{order.is_all_return_status==2}}"  bindtap="deleteOrderData" order_id="{{order.order_id}}" >删除订单</view>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
         </block>
     </view>
 </view>
+
+<warn id="warn"></warn>
@@ -31,11 +31,12 @@ Page({
     },
     onLoad: function(t) {
         var e = void 0 === t.type ? this.data.activeCategoryId : t.type;
-        s.init(this, "", "orderList"), this.requestOrderList(e), wx.removeStorageSync("order:order_list:update");
+        s.init(this, "", "orderList");
+        //this.requestOrderList(e), wx.removeStorageSync("order:order_list:update");
     },
     onShow: function() {
-        wx.getStorageSync("order:order_list:update") && (wx.setStorageSync("order:order_list:update", !1), 
-        this.resetData(), this.requestOrderList(this.data.activeCategoryId));
+        //wx.getStorageSync("order:order_list:update") && (wx.setStorageSync("order:order_list:update", !1),
+        this.resetData(), this.requestOrderList(this.data.activeCategoryId);
     },
     changeTab: function(t) {
         this.resetData(), this.requestOrderList(t.currentTarget.id);
@@ -46,7 +47,8 @@ Page({
     /*---------获取订单列表--------*/
     requestOrderList: function(t) {
-        var e = this,th=e, r = e.data.url + "/api/weshop/order/page?1=1", a = "";
+        var rd=Math.random()*100;
+        var e = this,th=e, r = e.data.url + "/api/weshop/order/page?rd="+rd, a = "";
         switch(t){
            case "1":
               r += "&wait_status=0"; break;    
@@ -116,6 +118,8 @@ Page({
                                        //2.退款被拒绝就要显示可以退款
                                        //3.退款已经完成
                                        data[ind]['is_all_return'] = 0;
+                                       var rt_ok_num=0;
+
                                        if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
                                                goodslist.forEach(function (eeb, iii) {
                                                    goodslist[iii]['return_btn'] = 1;
@@ -128,7 +132,7 @@ Page({
                                                                case 1://退款处理中
                                                                    goodslist[iii]['return_btn'] = 2; break;
                                                                case 2://退款完成
-                                                                   goodslist[iii]['return_btn'] = 4; break;
+                                                                   goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
                                                                case 3://已拒绝，重新退款
                                                                    goodslist[iii]['return_btn'] = 3; break;
                                                                default:
@@ -141,6 +145,11 @@ Page({
                                        }
                                    }
                                }
+
+                               //--如果是全部退款，也就可以删除--
+                               if(rt_ok_num==goodslist.length){
+                                   data[ind]['is_all_return_status']=2;
+                               }
                                data[ind]['order_goods'] = goodslist;
                                var g_num = 0;
@@ -240,12 +249,26 @@ Page({
     //-----删除订单-----
     deleteOrderData: 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({
-                orderList: this.data.orderList
-            });
-            break;
-        }
+        var th=this;
+        var order_id=t.currentTarget.dataset.order_id;
+        wx.showModal({
+            title: "是否取消订单？",
+            success: function(tt) {
+                tt.confirm && rq.put("/api/weshop/order/updatebyId", {
+                    data: {
+                      order_id: order_id, order_status: 5
+                    },
+                    success: function (t) {
+                      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;
+                        }
+                    }
+                })
+            }
+        });
     },
     //---判断是不是有退款-----
@@ -83,6 +83,7 @@
                           <navigator class="order-btn" hidden="{{!(item.order_status==1&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
                       </block> 
                       <block wx:else>
+                          <view class="order-btn" wx:if="{{item.is_all_return_status==2}}"  bindtap="deleteOrderData" data-order_id="{{item.order_id}}" >删除订单</view>
                           <navigator class="order-btn" wx:if="{{item.is_all_return_status==3}}"  url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>                          
                           <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
@@ -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,