购物车批量删除的接口联通，我的订单界面的完成

yvan.ni
1 parent 7f73d341
Showing 7 changed files with 931 additions and 535 deletions
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart/cart.wxss
pages/user/order_list/order_list.js
pages/user/order_list/order_list.json
pages/user/order_list/order_list.wxml
pages/user/order_list/order_list.wxss
@@ -20,6 +20,7 @@ Page({
     is_has_flash:0,   //是否又秒杀活动
     is_edit:0,        //是否编辑
     is_load:0,        //是否已加载
+    up_dating:0       //更新中
   },
   onLoad: function() {
     wx.setNavigationBarTitle({title: "购物车",  })
@@ -172,6 +173,10 @@ Page({
   //-------------加数量---------------------
   addNum: function(t) {
+
+    if(this.data.up_dating==1) return false;
+    this.data.up_dating=1;
+
     var a = t.currentTarget.dataset.item;
     var b = t.currentTarget.dataset.pitems;
     a = this.data.requestData[b].goods[a];
@@ -185,6 +190,11 @@ Page({
       };
       isShowLoading: 0;
       this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
+    }else{
+      wx.showModal({
+        title: '提示',
+        content: '购买的数量不能超出库存数量',
+      });
     }
   },
   //-------------减数量---------------------
@@ -390,6 +400,7 @@ Page({
         var goodsinfo = e.data.requestData[pitem].goods[item];
         var promgoodsbuynum = 0;
         var goodsbuynum = 0;
+
         //--要获得商品，该用户买了多少件,同步应用--
         await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
           data: {
@@ -492,8 +503,10 @@ Page({
     var e = this;
     getApp().request.put("/api/weshop/cart/update", {
       data: t,
+      isShowLoading:0,
       success: function(ee) {
         var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+        e.data.up_dating=0
         e.setData({
           [txt]: t.goods_num,
         });
@@ -725,25 +738,19 @@ Page({
       var i_arr = this.data.requestData[i].goods;
       for (var j = 0; j < i_arr.length; j++) {
         if (i_arr[j].selected) {
-          glist += i_arr[j].i_arr[j].id + ",";
+          glist += i_arr[j].id + ",";
           ab = 1;
         }
       }
     }
-    if (ab == 0) {
-      t.my_warnning("未选择商品", 0, th);return false;
-    }
-
+    if (ab == 0) { t.my_warnning("未选择商品", 0, th);return false; }
     glist = glist.substring(0, glist.length - 1);
     //要删除购物车中的商品
-    var url = '/api/weshop/cart/del/' + oo.stoid + '/' + glist;
+    var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' +user_id+"/"+ glist;
     getApp().request.delete(url, {
-      success: function(t) {
-        th.getCardList();
-      }
+      success: function(t) { th.getCardList();}
     });
-
   }
 });
 \ No newline at end of file
@@ -24,7 +24,7 @@
                  checked="{{checkAllToggle||item.selected}}" data-pitems="{{pidx}}"></radio>
           <view class="flex-center">
             <image src="{{iurl}}miniapp/images/stores/store.png"></image>
-            <view class="shmd fs28" >{{item.pname}}</view>
+            <view class="shmd fs30" >{{item.pname}}</view>
           </view>
         </view>
         <view class="order-item padding" data-item="{{idx}}" wx:for="{{item.goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{index}}">
@@ -39,11 +39,11 @@
           </navigator>
           <view class="goods-cont">
             <view class="goods-name">
-              <navigator class="ellipsis-2 fs24" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
+              <navigator class="ellipsis-2 fs30"  url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
-              <view class="Specifications flex-center" wx:if="{{items.goods_color || items.goods_spec}}">
+              <view class="Specifications flex-center ellipsis-1" wx:if="{{items.goods_color || items.goods_spec}}">
                 {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
-              <view class="Specifications flex-center" wx:else>规格1</view>
+              <view class="Specifications flex-center ellipsis-1" wx:else>规格1</view>
             </view>
             <view class="flex alend jc_sb">
@@ -202,13 +202,9 @@ radio {
   margin-top: 26rpx;
 }
-.shmd {
-  margin-left: 5rpx;
-}
+.shmd { margin-left: 5rpx;}
-.store {
-  border-top: 7rpx solid rgb(245, 245, 245);
-}
+.store{ border-top: 7rpx solid rgb(245, 245, 245);}
 .login-in .Storenum {
   height: 80rpx;
@@ -231,7 +227,7 @@ radio {
 .Specifications {
   padding: 3rpx 5rpx;
   margin-top: 8rpx;
-  font-size: 20rpx;
+  font-size: 22rpx;
   max-width: 105rpx;
   height: 30rpx;
   line-height: 29rpx;
 var t = function(t) {
     return t && t.__esModule ? t : {
-        default: t
+      default: t
     };
-}(require("../../../utils/LoadMore.js")), e = getApp(),os=e.globalData.setting,oo=e.globalData,
- r = e.request,rq=r, a = require("../../../utils/common.js"), s = new t.default();
+  }(require("../../../utils/LoadMore.js")),
+  e = getApp(),
+  os = e.globalData.setting,
+  oo = e.globalData,
+  r = e.request,
+  rq = r,
+  a = require("../../../utils/common.js"),
+  s = new t.default();
 var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
-    data: {
-        url: e.globalData.setting.url,
-        resourceUrl: e.globalData.setting.imghost,
-        iurl: e.globalData.setting.imghost,
-        categories: [ {
-            name: "全部订单",id: 0
-        }, {
-            name: "待付款",id: 1
-        }, {
-            name: "待发货",id: 2
-        }, {
-            name: "待收货",id: 3
-        }, {
-            name: "待评价",id: 4
-        } ],
-        activeCategoryId: 0,
-        orderList: null,
-        currentPage: 1,
+  data: {
+    url: e.globalData.setting.url,
+    resourceUrl: e.globalData.setting.imghost,
+    iurl: e.globalData.setting.imghost,
+    categories: [{
+      name: "全部订单",
+      id: 0
+    }, {
+      name: "待付款",
+      id: 1
+    }, {
+      name: "待发货",
+      id: 2
+    }, {
+      name: "待收货",
+      id: 3
+    }, {
+      name: "待评价",
+      id: 4
+    }],
+    activeCategoryId: 0,
+    orderList: null,
+    currentPage: 1,
-        //已经读取过接口
-        is_get:0,
-    },
-    onLoad: function(t) {
-        //var e = void 0 === t.type ? this.data.activeCategoryId : t.type;
-        if(t.type!=undefined)  this.setData({activeCategoryId:t.type})
-        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);
-    },
-    changeTab: function(t) {
-        this.resetData(), this.requestOrderList(t.currentTarget.id);
-    },
-    resetData: function() {
-        s.resetConfig(), this.data.orderList = null, this.data.currentPage = 1;
-    },
-    
-    /*---------获取订单列表--------*/
-    requestOrderList: function(t) {
-        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;    
-           case "2":
-              r += "&wait_status=1"; break;    
-           case "3":
-              r += "&wait_status=2";break;       
-           case "4":
-              r +="&order_status=2"; break;        
-        }
-        this.setData({ activeCategoryId: t }); r = r + "&page=" + e.data.currentPage;        
-        s.request(r, function(t) {
+    //已经读取过接口
+    is_get: 0,
+    conf: null,
+    iscodeall: null
+  },
+  onLoad: function(t) {
+    var th = this;
+    if (t.type != undefined) this.setData({
+      activeCategoryId: t.type
+    })
+    s.init(this, "", "orderList");
+    getApp().getConfig2(function(e) {
+      th.setData({
+        conf: e
+      });
+    })
+  },
+  onShow: function() {
+    this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+  },
+  changeTab: function(t) {
+    if (this.data.activeCategoryId == t.currentTarget.id) return false;
+    this.resetData(), this.requestOrderList(t.currentTarget.id);
+  },
+  resetData: function() {
+    s.resetConfig(), this.data.orderList = null, this.data.currentPage = 1;
+  },
-            th.setData({is_get:1});
-            var data=e.data.orderList;
-            data.forEach(async function (item,ind){
-                       var tt =null;
-                       await getApp().request.promiseGet('/api/weshop/ordergoods/list',{
-                          data: {order_id: item.order_id, store_id:os.stoid,pageSize:600},
-                       }).then(res=>{
-                           tt=res;
-                       })
+  /*---------获取订单列表--------*/
+  requestOrderList: function (t) {
+    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;
+      case "2":
+        r += "&wait_status=1"; break;
+      case "3":
+        r += "&wait_status=2"; break;
+      case "4":
+        r += "&order_status=2"; break;
+    }
-                       //------------对比一下有没有退款记录------------
-                       await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
-                           data: { order_id: item.order_id, store_id: os.stoid,
-                           user_id:oo.user_id, pageSize: 20 }
-                       }).then(rs=>{
-                               var ttd=rs;
-                               //--看一下订单的总数量--
-                               var gtype_num = tt.data.data.total;
-                               if(ttd.data.data.pageData == undefined) return false;
-                               var goodslist = tt.data.data.pageData;
-                               //----没有相关的退款记录----
-                               if (ttd.data.data.total==0){
-                                   data[ind]['is_all_return'] = 0;
-                                   goodslist.forEach(function (ee, ii) {
-                                       if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1 && gtype_num>1)
-                                           goodslist[ii]['return_btn']=1;
-                                   });
-                               }else{
-                                   //--------整单退--------
-                                   if (ttd.data.data.pageData[0]['goods_id_list'] != null
-                                       && ttd.data.data.pageData[0]['goods_id_list'] != ''){
-                                       var eea = ttd.data.data.pageData[0];
-                                       //1.退款正在进行中，
-                                       //2.退款被拒绝就要显示可以退款
-                                       //3.退款已经完成
-                                       data[ind]['is_all_return']=1;
-                                       data[ind]['is_all_return_status'] = ttd.data.data.pageData[0].status;
+    this.setData({ activeCategoryId: t }); r = r + "&page=" + e.data.currentPage;
+    s.request(r, function (t) {
-                                       if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
-                                           switch (eea.status) {
-                                               case 0:
-                                               case 1:
-                                                   data[ind]['return_btn'] = 2; break;
-                                               case 2:
-                                                   data[ind]['return_btn'] = 4; break;
-                                               case 3:
-                                                   data[ind]['return_btn'] = 3; break;
-                                               default:
-                                                   data[ind]['return_btn'] = 0;
-                                           }
-                                       }
-                                   }else{
-                                       //1.退款正在进行中，
-                                       //2.退款被拒绝就要显示可以退款
-                                       //3.退款已经完成
-                                       data[ind]['is_all_return'] = 0;
-                                       var rt_ok_num=0;
+      th.setData({ is_get: 1 });
+      var data = e.data.orderList;
+      data.forEach(async function (item, ind) {
+        var tt = null;
+        await getApp().request.promiseGet('/api/weshop/ordergoods/list', {
+          data: { order_id: item.order_id, store_id: os.stoid, pageSize: 600 },
+        }).then(res => {
+          tt = res;
+        })
-                                       if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
-                                               goodslist.forEach(function (eeb, iii) {
-                                                   goodslist[iii]['return_btn'] = 1;
-                                                   ttd.data.data.pageData.forEach(function (eea, ii) {
-                                                       var st = eea.status;
-                                                       if (eea.goods_id == eeb.goods_id){
-                                                           data[ind]['has_rt'] = 1; //有部分退
-                                                           switch (eea.status){
-                                                               case 0:
-                                                               case 1://退款处理中
-                                                                   goodslist[iii]['return_btn'] = 2; break;
-                                                               case 2://退款完成
-                                                                   goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
-                                                               case 3://已拒绝，重新退款
-                                                                   goodslist[iii]['return_btn'] = 3; break;
-                                                               default:
-                                                                   goodslist[iii]['return_btn'] = 1; //申请退款
-                                                           }
-                                                           return;
-                                                       }
-                                                  });
-                                              });
-                                       }
-                                   }
-                               }
+        //------------对比一下有没有退款记录------------
+        await getApp().request.promiseGet("/api/weshop/order/returngoods/page", {
+          data: {
+            order_id: item.order_id, store_id: os.stoid,
+            user_id: oo.user_id, pageSize: 20
+          }
+        }).then(rs => {
+          var ttd = rs;
+          //--看一下订单的总数量--
+          var gtype_num = tt.data.data.total;
+          if (ttd.data.data.pageData == undefined) return false;
+          var goodslist = tt.data.data.pageData;
-                               //--如果是全部退款，也就可以删除--
-                               if(rt_ok_num==goodslist.length){
-                                   data[ind]['is_all_return_status']=2;
-                               }
-                               
-                               data[ind]['order_goods'] = goodslist;
-                               var g_num = 0;
-                               goodslist.forEach(function (ee, ii) {
-                                   if(ee.return_btn!=4)
-                                      g_num += ee.goods_num;
-                               });
-                               data[ind]['g_num'] = g_num;
-                      })
-                      th.setData({ orderList: data, });
+          //----没有相关的退款记录----
+          if (ttd.data.data.total == 0) {
+            data[ind]['is_all_return'] = 0;
+            goodslist.forEach(function (ee, ii) {
+              if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1 && gtype_num > 1) {
+                item.goodslist = goodslist;
+                if (th.check_for_return_btn(item)) {
+                  goodslist[ii]['return_btn'] = 1;
+                }
+              }
             });
-            e.data.currentPage++, 
-            /*---
-            t.data.result.forEach(function(t, e, r) {
-                t.goods_sum = t.order_goods.reduce(function(t, e) {
-                    return t + e.goods_num;
-                }, 0);               
-            }),---*/
-            wx.stopPullDownRefresh();
-        },null,{store_id:os.stoid,user_id:oo.user_id});
-    },
-    onReachBottom: function() {
-        s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
-    },
-    onPullDownRefresh: function(t) {
-        this.resetData(), this.requestOrderList(this.data.activeCategoryId);
-    },
+          } else {
+            //--------整单退--------
+            if (ttd.data.data.pageData[0]['goods_id_list'] != null
+              && ttd.data.data.pageData[0]['goods_id_list'] != '') {
+              var eea = ttd.data.data.pageData[0];
+              //1.退款正在进行中，
+              //2.退款被拒绝就要显示可以退款
+              //3.退款已经完成
+              data[ind]['is_all_return'] = 1;
+              data[ind]['is_all_return_status'] = ttd.data.data.pageData[0].status;
-     /*-----------取消订单-----------*/
-    cancelOrder: function(t) {
-       var e = this, a = t.currentTarget.dataset.id,th=this;
-       var is_zsorder= parseFloat(t.currentTarget.dataset.zsorder);
-       var index=t.currentTarget.dataset.orderindex;
-       var order=th.data.orderList[index];
-       var is_skill=0;
-      var order_goods=order.order_goods;
-      //--判断是不是秒杀--
-      order_goods.forEach(function (val,ind) {
-        if(val.prom_type==1){
-          is_skill=1; return false;
-        }
-      })
+              if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
+                switch (eea.status) {
+                  case 0:
+                  case 1:
+                    data[ind]['return_btn'] = 2; break;
+                  case 2:
+                    data[ind]['return_btn'] = 4; break;
+                  case 3:
+                    data[ind]['return_btn'] = 3; break;
+                  default:
+                    data[ind]['return_btn'] = 0;
+                }
+              }
+            } else {
+              //1.退款正在进行中，
+              //2.退款被拒绝就要显示可以退款
+              //3.退款已经完成
+              data[ind]['is_all_return'] = 0;
+              var rt_ok_num = 0;
-       wx.showModal({
-            title: "是否取消订单？",
-            success: function(t) {
-             //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
-             if(t.confirm){
-                   //if(is_skill==1 || is_zsorder>=2){
-                   getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+a,{
-                     data:{},
-                     success: function(t) {                      
-                       if(t.data.code==0)
-                       {
-                          0 == e.data.activeCategoryId ?
-                            (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData(a);
-                       }
-                       else
-                       {
-                         getApp().confirmBox(e.data.msg);
-                       }
-                     },
-                   })        
-             }
+              //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
+              goodslist.forEach(function (eeb, iii) {
+                if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
+                  goodslist[iii]['return_btn'] = 1; //申请退款
+                ttd.data.data.pageData.forEach(function (eea, ii) {
+                  var st = eea.status;
+                  if (eea.goods_id == eeb.goods_id) {
+                    switch (eea.status) {
+                      case 0:
+                      case 1://退款处理中
+                        data[ind]['has_rt'] = 1; //有部分退
+                        goodslist[iii]['return_btn'] = 2; break;
+                      case 2://退款完成
+                        goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
+                      case 3://已拒绝，重新退款
+                        goodslist[iii]['return_btn'] = 3; break;
+                      default:
+                        if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
+                          goodslist[iii]['return_btn'] = 1; //申请退款
+                    }
+                    return;
+                  }
+                });
+              });
+              //}
             }
-        });
-    },
-    
-    /*-----------确认收货-----------*/
-    confirmOrder: function(t) {
-        var e = this, a = t.currentTarget.dataset.id;
-        var is_zsorder=t.currentTarget.dataset.zsorder;
+          }
-        console.log("confirmOrder");
-        console.log(is_zsorder);
+          //--如果是全部退款，也就可以删除--
+          if (rt_ok_num == goodslist.length) {
+            data[ind]['is_all_return_status'] = 2;
+          }
-        wx.showModal({
-            title: "是否确认收货?",
+          data[ind]['order_goods'] = goodslist;
+          var g_num = 0;
+          goodslist.forEach(function (ee, ii) {
+            if (ee.return_btn != 4)
+              g_num += ee.goods_num;
+          });
+          data[ind]['g_num'] = g_num;
+        })
+        th.setData({ orderList: data, });
+
+      });
+      e.data.currentPage++ ,
+        wx.stopPullDownRefresh();
+    }, null, { store_id: os.stoid, user_id: oo.user_id });
+  },
+  //滑倒底部
+  onReachBottom: function() {
+    if (s.data.goodsLoadFinishFlag) {
+      this.setData({
+        iscodeall: 1
+      })
+    }
+    s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
+  },
+  onPullDownRefresh: function(t) {
+    this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+  },
+
+  /*-----------取消订单-----------*/
+  cancelOrder: function(t) {
+    var e = this,
+      a = t.currentTarget.dataset.id,
+      th = this;
+    var is_zsorder = parseFloat(t.currentTarget.dataset.zsorder);
+    var index = t.currentTarget.dataset.orderindex;
+    var order = th.data.orderList[index];
+    var is_skill = 0;
+    var order_goods = order.order_goods;
+    //--判断是不是秒杀--
+    order_goods.forEach(function(val, ind) {
+      if (val.prom_type == 1) {
+        is_skill = 1;
+        return false;
+      }
+    })
+
+    wx.showModal({
+      title: "是否取消订单？",
+      success: function(t) {
+        //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
+        if (t.confirm) {
+          //if(is_skill==1 || is_zsorder>=2){
+          getApp().request.delete("/api/weshop/order/cancelTeamOrder/" + os.stoid + "/" + a, {
+            data: {},
             success: function(t) {
-              t.confirm && rq.put("/api/weshop/order/updatebyId", {
-                    data: {
-                        order_id: a,order_status:2
-                    },
-                    success: function(t) {
-                        e.deleteOrderData(a);
-                        //如果是会员团订单
-                        if(is_zsorder==3){
-                          getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{
-                            data:{}, success:function () {  }})
-                        }
-                    }
-                });
-            }
-        });
-    },
+              if (t.data.code == 0) {
+                0 == e.data.activeCategoryId ?
+                  (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a);
+              } else {
+                getApp().confirmBox(e.data.msg);
+              }
+            },
+          })
+        }
+      }
+    });
+  },
-    //-----删除订单-----
-    deleteOrderData: function(t) {
-        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;
-                        }
-                    }
-                })
+  /*-----------确认收货-----------*/
+  confirmOrder: function(t) {
+    var e = this,
+      a = t.currentTarget.dataset.id;
+    var is_zsorder = t.currentTarget.dataset.zsorder;
+    var th = this;
+
+    wx.showModal({
+      title: "是否确认收货?",
+      success: function(t) {
+        t.confirm && rq.put("/api/weshop/order/updatebyId", {
+          data: {
+            order_id: a,
+            order_status: 2
+          },
+          success: function(t) {
+            e.deleteOrderData2(a);
+            //如果是会员团订单
+            if (is_zsorder == 3) {
+              getApp().request.post("/api/weshop/order/vipTuanTebate/" + os.stoid + "/" + a, {
+                data: {},
+                success: function() {}
+              })
             }
+          }
         });
-    },
+      }
+    });
+  },
-    //---判断是不是有退款-----
-    checkReturnGoodsStatus: function(t) {
-        var e = t.currentTarget.dataset.recid;
-        var oid = t.currentTarget.dataset.oid;
-        r.get("/api/weshop/order/returngoods/page", {
-            data: {
-                goods_id: e,
-                order_id:oid,
-                store_id:os.stoid
-            },
-            success: function(t) {
-                if(t.data.code==0){
-                    var r = t.data.data.total;
-                    if (0 == r) return wx.navigateTo({
-                      url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
-                    });
-                    //--如果拒绝，就重新申请退款--
-                    if (t.data.data.pageData[0].status==3){
-                       return wx.navigateTo({
-                          url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
-                       });
-                    }
+  //-----删除订单-----
+  deleteOrderData: function(t) {
+    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: th.data.orderList
+                });
+                break;
+              }
+          }
+        })
+      }
+    });
+  },
-                    wx.navigateTo({
-                      url: "/pages/user/return_goods_info/return_goods_info?id=" + r
-                    });
-                }               
-            }
+  deleteOrderData2: function(order_id) {
+    var th = this;
+    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;
+      }
+  },
-    /*----------跳转支付-----------*/
-    jumpToCart4: function(t) {
-        var o_index=t.currentTarget.dataset.idx;
-        var e = this.data.orderList[t.currentTarget.dataset.idx];
-        var th=this;
+  //---判断是不是有退款-----
+  checkReturnGoodsStatus: function(t) {
+    var e = t.currentTarget.dataset.recid;
+    var oid = t.currentTarget.dataset.oid;
+    r.get("/api/weshop/order/returngoods/page", {
+      data: {
+        goods_id: e,
+        order_id: oid,
+        store_id: os.stoid
+      },
+      success: function(t) {
+        if (t.data.code == 0) {
+          var r = t.data.data.total;
+          if (0 == r) return wx.navigateTo({
+            url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
+          });
+          //--如果拒绝，就重新申请退款--
+          if (t.data.data.pageData[0].status == 3) {
+            return wx.navigateTo({
+              url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
+            });
+          }
-        console.log("jumpToCart4");
-        console.log(e);
+          wx.navigateTo({
+            url: "/pages/user/return_goods_info/return_goods_info?id=" + r
+          });
+        }
+      }
+    });
+  },
-        if(e.order_amount==0){
-            var dd = {
-                parent_sn: e.order_sn,
-                store_id: e.store_id,
-                type: 1,
-            };
-            getApp().request.post("/api/weshop/order/pay/createOrder", {
-                data: dd,
-                success: function (t) {
-                     if(t.data.code==0){
-                        th.onload();
-                     }else{
-                         getApp().confirmBox(t.data.msg+"请您取消该订单");
-                     }
-                }
-            })
-            return false;
+  /*----------跳转支付-----------*/
+  jumpToCart4: function(t) {
+    var o_index = t.currentTarget.dataset.idx;
+    var e = this.data.orderList[t.currentTarget.dataset.idx];
+    var th = this;
+
+    console.log("jumpToCart4");
+    console.log(e);
+
+    if (e.order_amount == 0) {
+      var dd = {
+        parent_sn: e.order_sn,
+        store_id: e.store_id,
+        type: 1,
+      };
+      getApp().request.post("/api/weshop/order/pay/createOrder", {
+        data: dd,
+        success: function(t) {
+          if (t.data.code == 0) {
+            th.onload();
+          } else {
+            getApp().confirmBox(t.data.msg + "请您取消该订单");
+          }
         }
+      })
+      return false;
+    }
-        a.jumpToCart4({
-            order_sn: e.order_sn,
-            order_amount: e.order_amount,
-            type:1//正常单
-        });
-    },
+    a.jumpToCart4({
+      order_sn: e.order_sn,
+      order_amount: e.order_amount,
+      type: 1 //正常单
+    });
+  },
-    //------图片失败，默认图片---------
-    bind_bnerr: function (e) {
-        var _errImg = e.target.dataset.errorimg;
-        var _errObj = {};
-        _errObj[_errImg] = "public/images/default_goods_image_240.gif";
-        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
-   },
+  //------图片失败，默认图片---------
+  bind_bnerr: function(e) {
+    var _errImg = e.currentTarget.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = "public/images/default_goods_image_240.gif";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
+  },
-   //--------跳转到退款详情-----------
-   gotoreturn:function(t){
-      var e = t.currentTarget.dataset.recid;
-      var oid = t.currentTarget.dataset.oid;
-      var wh="";
-      if(e!=undefined && e!=null && e!=""){
-        wh="&goods_id="+e;
-      }   
-      wx.navigateTo({
-        url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid+wh,
-     });
-   },
+  //--------跳转到退款详情-----------
+  gotoreturn: function(t) {
+    var e = t.currentTarget.dataset.recid;
+    var oid = t.currentTarget.dataset.oid;
+    var wh = "";
+    if (e != undefined && e != null && e != "") {
+      wh = "&goods_id=" + e;
+    }
+    wx.navigateTo({
+      url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
+    });
+  },
-   //-----支付尾款------
-   pay_wk:function (ee) {
-       console.log("pay_wk");
-       var order_id=ee.currentTarget.dataset.order_id;
-       wx.navigateTo({
-         url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id,
-      });
+  //-----支付尾款------
+  pay_wk: function(ee) {
+    console.log("pay_wk");
+    var order_id = ee.currentTarget.dataset.order_id;
+    wx.navigateTo({
+      url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id,
+    });
+
+  },
-   }
+  //--判断是不是可以单个商品退--
+  check_for_return_btn: function(item) {
+    if (item.coupon_no) return false; //有用优惠券
+    if (item.order_prom_id) return false; //有订单优惠
+    if (item.order_status >= 2) return false; //订单状态>2
+    var istrue = true;
+    //----判断是不是有优惠活动和赠送商品----
+    for (var g in item.goodslist) {
+      var g_item = item.goodslist[g];
+      if ((g_item.prom_type == 3 && g_item.discount_amount > 0) ||
+        (g_item.prom_type == 3 && g_item.goods_price <= 0)
+      ) {
+        istrue = false;
+        break
+      }
+      if (g_item.prom_type == 5) {
+        istrue = false;
+        break
+      }
+    }
+    if (!istrue) return false;
+    var conf = this.data.conf;
+    //判断是不是原路退回
+    if (conf.refund_type == 1) return true;
+    else {
+      if (item.order_amount == 0 || item.user_money == 0) return true;
+    }
+    return false;
+  },
+  //跳到首页
+  goto: function(e) {
+    wx.switchTab({
+      url: '/pages/index/index/index',
+    })
+  },
+
+  //显示核销码
+  code_show: function(e) {
+    var th = this;
+    //--获取成功的时候--
+    var no = e.currentTarget.dataset.order_sn;
+    var qc_com = th.selectComponent("#qc_com"); //组件的id
+    var obj = {
+      val: no,
+      content: "请将二维码展示给核销员，收货更快捷"
+    };
+    qc_com.open(obj)
+  }
 });
 \ No newline at end of file
 {
-    "navigationBarTitleText": "我的订单"
+    "navigationBarTitleText": "我的订单",
+    "usingComponents": {
+      "qr_code": "/components/qr_code/qr_code"
+    }
 }
 \ No newline at end of file
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
-    <view class="type-navbar">
-        <view class="type-box" wx:for="{{categories}}" wx:key="{{index}}">
-            <view bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
-                {{item.name}}
-            </view>
-        </view>
+  <view class="type-navbar padding fs30">
+    <view class="type-box flex-center" wx:for="{{categories}}" wx:key="{{index}}">
+      <view id="{{item.id}}" bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}">
+        {{item.name}}
+      </view>
     </view>
-    <view class="goods-container">
-        <view class="goods-box" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
-            <navigator  url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
-              <view class="goods-title">
-                  <view class="order-number">订单编号：{{item.order_sn}}</view>
-                  <view class="pay-status">{{item.order_status_detail}}</view>
-              </view>
-            </navigator>
+  </view>
+</view>
+<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
-            <view class="goods-cont" wx:for="{{item.order_goods}}" wx:for-item="goods" 
-                wx:if="{{goods.return_btn!=4}}"  
-                wx:for-index="pinx"
-                wx:key="{{index}}">
-                <navigator class="img-box" url="/pages/user/order_detail/order_detail?order_id={{goods.order_id}}">
-                    <image class="wh100" src="{{resourceUrl+goods.original_img}}"  binderror="bind_bnerr" lazy-load="true"
-                        data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
-                </navigator>
-                <navigator class="goods-mes" url="/pages/user/order_detail/order_detail?order_id={{goods.order_id}}">
-                    <view class="goods-name" >{{goods.goods_name}}</view>
-                    <view class="goods-name" style="color:#999">{{goods.goods_color}} {{goods.goods_spec}}</view>
-                    <view class="goods-price">¥ {{goods.member_goods_price}}</view>
-                    <view class="goods-num">数量 {{goods.goods_num}}</view>
-                </navigator>
+  <!-- 商品编号和状态 -->
+  <view class="Commodity_number flex-vertical-between fs30 padding border_bottom">
+    <!--商品编号 -->
+    <text selectable='true'>订单编号：{{item.order_sn}}</text>
+    <!-- 商品评价状态 -->
+    <view class="flex-center xc-wc">
+      <!-- 订单状态 -->
+      <view wx:if="{{item.pt_status==1}}">组团中</view>
+      <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
+      <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
+        <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
+        <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
+        <view wx:if="{{(item.order_status==2)}}">待评价</view>
+        <view wx:if="{{item.order_status==4}}">已评价</view>
+        <view wx:if="{{item.order_status==3}}">已取消</view>
+        <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
+        <view wx:if="{{item.order_status==6}}">退款成功</view>
+        <view wx:if="{{item.pt_status==6}}">支付尾款失败</view>
+      </block>
+      <block wx:else>退款中</block>
+      <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
+        <view class="lin"></view>
+        <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-order_id="{{item.order_id}}"></image>
+      </view>
+    </view>
+  </view>
+
+  <!-- 商品详情集合 -->
+  <view class="detail_commoditys">
+    <!-- 单个商品 -->
+    <view>
+      <navigator class="detail_commodity flex-vertical padding border_bottom" wx:for="{{item.order_goods}}" wx:for-item="goods" wx:if="{{goods.return_btn!=4}}" wx:for-index="pinx" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
+        <!-- 商品图片 -->
+        <navigator class="rel">
+          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
+          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
+          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
+        </navigator>
+        <!-- 商品内容 -->
+        <view class="Commodity_content">
+          <view class="Commodity_goods">
+            <!-- 商品名称 -->
+            <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
+            <view class="flex-space-between">
+              <!-- 商品规格 -->
+              <view class="Commodity_spec fs28 flex-center">
+                <text class="ellipsis-1">{{goods.goods_color.length>1 && goods.goods_spec.length>1?goods.goods_color+"/"+goods.goods_spec:goods.goods_color.length>1 || goods.goods_spec.length>1?goods.goods_color+goods.goods_spec:'规格1'}}</text>
+              </view>
+              <view class="flex-level-right fs26 refund">
                 <!-- 不是整单退的时候 -->
                 <block wx:if="{{item.is_all_return!=1}}">
-                  <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}"
-                       data-recid="{{goods.goods_id}}"  wx:if="{{goods.return_btn==1}}">申请退款</view>
-                  <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
-                       data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
-                  <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}"
-                       data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
-                  <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
-                          data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
-               </block>
-
-                <block wx:if="{{item.pt_status==1}}">
-                     <view class="return-btn co-red">组团中</view>
-                </block>
-                <block wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">
-                    <view  class="return-btn co-red">待支付尾款</view>
+                  <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1}}">申请退款</view>
+                  <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
+                  <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
+                  <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
                 </block>
+              </view>
+            </view>
+          </view>
+          <!-- 商品价格数量 -->
+          <view class="Commodity_money flex-vertical-between baseline">
+            <!-- 商品价格 -->
+            <view class="flex-vertical xc-wc baseline">
+              <view class="fs24">￥</view>
+              <view class="fs30">{{filters.toFix(goods.member_goods_price,2)}}</view>
+            </view>
+            <view class="fs30">x{{goods.goods_num}}</view>
+          </view>
+        </view>
+      </navigator>
+      <!-- 去评价 -->
+      <view class="commodity_evaluate jc_sb padding baseline fs26">
+        <!-- 商品数量 -->
+        <view class="commodity_smy flex fs30">
+          <view class="order-total">
+            <view>
+              共{{item.g_num}}件商品
             </view>
+            <view class="goods-total flex">
+              <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
+                <view class="commodity_money flex baseline">
+                  <view>合计:</view>
+                  <view class="fs24 xc-wc">￥</view>
+                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
+                  </view>
-            <view class="goods-tips">
-                <view class="order-total">
-                    共{{item.g_num}}件,<view class="goods-total">
-                      <block wx:if="{{item.pt_status==4 || item.pt_status==5 }}">
-                             <view>金额:￥{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}</view>
-                      </block>    
-                      <block wx:else>
-                        <view wx:if="{{item.is_zsorder==4}}">定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>          
-                        <view wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
-                        <view wx:if="{{item.pt_tail_money>0}}">尾款:￥{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}</view>
-                      </block>    
-                     
-                    </view>
                 </view>
-              
+              </block>
+              <block wx:else>
+                <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
+                  <view>定金:</view>
+                  <view class="fs24 xc-wc">￥</view>
+                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+                  </view>
+                </view>
+                <view class="commodity_money flex baseline" wx:else>
+                  <view>合计:</view>
+                  <view class="fs24 xc-wc">￥</view>
+                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+                  </view>
+                </view>
+                <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
+                  <view>待支付尾款:</view>
+                  <view class="fs24 xc-wc">￥</view>
+                  <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
+                  </view>
+                </view>
+              </block>
             </view>
+          </view>
+        </view>
+        <view class="links flex-right-vertical fs30">
+          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
-  <view class="check-btn">
-                    <navigator url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}"
-                               class="order-btn order-btn-pay" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
-                    <navigator bindtap="jumpToCart4" class="order-btn order-btn-pay " data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
-                    <view  class="order-btn" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3 }}">已取消</view>
-                    <view bindtap="cancelOrder" class="order-btn" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}"
-                          hidden="{{!(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
-                    <view class="order-btn"  wx:if="{{item.pt_status==3}}">拼团失败</view>
+          <view class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3}}">已取消</view>
+          <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
+          <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
-                      <!---has_rt部分退---->
-                      <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
-                          <navigator class="order-btn" hidden="{{!(item.order_status==0&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
-                          <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>
-                      </block>
-                 
+          <!---has_rt部分退---->
+          <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
+            <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.order_status==0&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
+            <navigator class="commodity_To_evaluate flex-level View_evaluation" 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="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}">删除订单</view>
+            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
+            <navigator class="commodity_To_evaluate flex-level View_evaluation" 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>
+          </block>
+          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
+          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
+          <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
-                    <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
-                     <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
-                    <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
-                    <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
-                    <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
-                    <navigator class="order-btn"  url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
-                </view>
+          <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
+            <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
+            <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
+          </block>
+
+
+          <navigator class="commodity_To_evaluate flex-level comment_go" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">去评价</navigator>
+          <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
+          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
         </view>
-        <view class="no-data" wx:if="{{ (!orderList||orderList.length==0) && is_get}}">
-            <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-            <view class="no-data-title">暂无订单列表</view>
-            <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
-        </view>
+      </view>
     </view>
+  </view>
+</view>
+
+<!-- 没有数据 -->
+<view class="After_all flex-center" wx:if="{{iscodeall==1 && orderList.length>1}}">
+  <view class="Line"></view>
+  <view class="end fs26 xc-black">到底了</view>
+  <view class="Line"></view>
+</view>
+
+<!-- 无订单 -->
+<view class="empty_order" wx:if="{{(!orderList||orderList.length==0) && is_get}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">当前暂无订单</view>
+  <view class="flex-level">
+    <navigator url="/pages/index/index/index" bindtap="goto">
+      <view class="flex-center fs28 white">去首页逛逛</view>
+    </navigator>
+  </view>
 </view>
+<!-- 弹出框扫描 -->
+<qr_code id="qc_com"></qr_code>
 \ No newline at end of file
+page {
+  font-family: microsoft yahei;
+}
+
 .type-navbar {
-    white-space: nowrap;
-    display: flex;
-    width: 100%;
-    height: 80rpx;
-    background-color: #fff;
+  white-space: nowrap;
+  display: flex;
+  height: 88rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  border-top: 1rpx solid rgb(211, 211, 211);
 }
 .type-box {
-    width: 25%;
-    box-sizing: border-box;
-    font-size: 32rpx;
-    line-height: 76rpx;
-    padding: 0 20rpx;
-    text-align: center;
-    display: inline-block;
-    overflow: hidden;
+  box-sizing: border-box;
+  line-height: 84rpx;
+  text-align: center;
+  display: inline-block;
+  overflow: hidden;
 }
 .type-navbar-item {
-    border-bottom: 4rpx solid #fff;
+  border-bottom: 4rpx solid #fff;
 }
 .type-item-on {
-    border-bottom: 4rpx solid #e64340;
+  border-bottom: 4rpx solid #e64340;
 }
+/* 原 */
+
 .goods-container {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    box-sizing: content-box;
-    padding: 20rpx 0;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  box-sizing: content-box;
+  padding: 20rpx 0;
 }
 .goods-box {
-    width: 100%;
-    background-color: #fff;
-    padding: 0 25rpx;
-    margin-bottom: 20rpx;
-    font-size: 28rpx;
-    border-bottom: 1rpx solid #eee;
-    padding-bottom: 25rpx;
-
+  width: 100%;
+  background-color: #fff;
+  padding: 0 25rpx;
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+  border-bottom: 1rpx solid #eee;
+  padding-bottom: 25rpx;
 }
 .goods-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    height: 100rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 100rpx;
 }
 .order-number {
-    font-size: 32rpx;
-    color: #666;
+  font-size: 32rpx;
+  color: #666;
 }
 .pay-status {
-    color: #f23030;
+  color: #f23030;
 }
 .goods-cont {
-    padding: 20rpx 0;
-    display: flex;
-    justify-content: space-between;
-    position: relative;
+  padding: 20rpx 0;
+  display: flex;
+  justify-content: space-between;
+  position: relative;
 }
 .img-box {
-    width: 180rpx;
-    height: 180rpx;
+  width: 180rpx;
+  height: 180rpx;
 }
 .goods-mes {
-    width: 490rpx;
+  width: 490rpx;
 }
 .goods-name {
-    height: 30rpx;
-    margin-bottom: 16rpx;
-    overflow: hidden;
-    line-height: 30rpx;
-    color: #333;
-    word-break: keep-all;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    font-size: 30rpx;
+  height: 30rpx;
+  margin-bottom: 16rpx;
+  overflow: hidden;
+  line-height: 30rpx;
+  color: #333;
+  word-break: keep-all;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 30rpx;
 }
 .goods-price {
-    color: #f23030;
-    padding-bottom: 20rpx;
-    font-size: 30rpx;
+  color: #f23030;
+  padding-bottom: 20rpx;
+  font-size: 30rpx;
 }
 .goods-num {
-    color: #999999;
-    font-size: 30rpx;
-}
-
-.return-btn {
-    color: #999999;
-    position: absolute;
-    right: 0;
-    bottom: 0rpx;
-    height: 80rpx;
-    line-height: 80rpx;
+  color: #999;
+  font-size: 30rpx;
 }
 .goods-tips {
-    height: 60rpx;
-    padding: 10rpx 0;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+  height: 60rpx;
+  padding: 10rpx 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 .order-total {
-    display: flex;
-    justify-content: flex-start;
-    font-size: 31rpx;
-    color: #333;
+  display: flex;
+  justify-content: flex-start;
 }
 .goods-total {
-    margin-right: 20rpx;
-    color: #f23030;
+  margin-right: 20rpx;
 }
 .order-btn {
-    width: 150rpx;
-    height: 50rpx;
-    line-height: 50rpx;
-    text-align: center;
-    border: 1px solid #eee;
-    margin-left: 10rpx;
-    float: right;
-    border-radius: 15rpx;
+  width: 150rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  border: 1px solid #eee;
+  margin-left: 10rpx;
+  float: right;
+  border-radius: 15rpx;
 }
 .order-btn-pay {
-    color: #fff;
-    background-color: #f23030;
-    border-color: #f23030;
+  color: #fff;
+  background-color: #f23030;
+  border-color: #f23030;
+}
+
+.return-btn.co-red {
+  color: #e02e24;
 }
-.return-btn.co-red{color: #e02e24}
-.check-btn{
+
+.check-btn {
   margin-bottom: 20rpx;
+}
+
+/* 新 */
+
+.Commodity_number {
+  height: 80rpx;
+  border-top: 13rpx solid rgb(245, 245, 245);
+}
+
+.Commodity_number .lin {
+  border-left: 2rpx solid rgb(129, 65, 81);
+  margin: 0rpx 15rpx;
+  height: 31rpx;
+}
+
+.Commodity_number image {
+  width: 30rpx;
+  height: 32rpx;
+}
+
+.padding {
+  padding: 0rpx 27rpx;
+}
+
+/* 文字基线对齐 */
+
+.baseline {
+  align-items: baseline;
+}
+
+.border_bottom {
+  border-bottom: 4rpx solid rgb(245, 245, 245);
+}
+
+/* 单个商品框架 */
+
+.detail_commodity {
+  height: 231rpx;
+}
+
+.detail_commodity image {
+  width: 185rpx;
+  height: 185rpx;
+}
+
+.detail_commodity .goods_name {
+  width: 485rpx;
+  /* height: 75rpx; */
+  line-height: 37rpx;
+}
+
+.Commodity_content {
+  height: 185rpx;
+  margin-left: 21rpx;
+}
+
+.Commodity_content .Commodity_goods {
+  height: 150rpx;
+}
+
+.Commodity_content .Commodity_money {
+  font-size: 16rpx;
+  letter-spacing: 1rpx;
+}
+
+/* 商品评价按钮框架 */
+
+.commodity_evaluate {
+  padding-top: 15rpx;
+  padding-bottom: 15rpx;
+  border-bottom: 4rpx solid rgb(245, 245, 245);
+}
+
+.commodity_evaluate .commodity_smy .commodity_money {
+  margin-left: 29rpx;
+  letter-spacing: 1rpx;
+}
+
+.commodity_evaluate .links {
+  height: 92rpx;
+}
+
+.commodity_evaluate .commodity_To_evaluate {
+  width: 155rpx;
+  height: 48rpx;
+  border-radius: 10rpx;
+  line-height: 48rpx;
+}
+
+.commodity_evaluate .commodity_To_evaluate view {
+  height: 39rpx;
+  line-height: 39rpx;
+}
+
+.commodity_evaluate .comment_go {
+  background-color: rgb(211, 28, 52);
+  color: rgb(255, 255, 255);
+  margin-left: 18rpx;
+  width: 155rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.Commodity_spec {
+  height: 37rpx;
+  line-height: 37rpx;
+  max-width: 160rpx;
+  background-color: rgb(236, 236, 236);
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  margin-top: 10rpx;
+  padding:0rpx 10rpx;
+}
+
+.Commodity_evaluation .Comment_content {
+  color: rgb(153, 153, 153);
+  letter-spacing: 1rpx;
+}
+
+.Commodity_evaluation .starss {
+  height: 58rpx;
+  /* //  line-height: 58rpx; */
+  align-items: center;
+}
+
+.Commodity_evaluation .commen {
+  height: 58rpx;
+  line-height: 58rpx;
+}
+
+.Commodity_evaluation .starss .stars {
+  line-height: 58rpx;
+}
+
+.Commodity_evaluation .starss .stars image {
+  width: 29rpx;
+  height: 26rpx;
+  margin-right: 5rpx;
+}
+
+.Commodity_evaluation .Comment_images image {
+  width: 100rpx;
+  height: 100rpx;
+  margin-right: 8rpx;
+  margin-top: 18rpx;
+  border-radius: 6rpx;
+  border: 3rpx solid rgb(245, 245, 245);
+}
+
+.commodity_evaluate .View_evaluation {
+  border: 1px solid #ddd;
+  color: rgb(0, 0, 0);
+  background-color: rgb(255, 255, 255);
+  margin-left: 18rpx;
+}
+
+.comment_addtime {
+  height: 50rpx;
+}
+
+.title_width {
+  width: 146rpx;
+  text-align: center;
+}
+
+.After_all {
+  height: 80rpx;
+  background-color: rgb(245, 245, 245);
+}
+
+.After_all .Line {
+  border-top: 1rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
+
+/* 无订单 */
+
+.empty_order image {
+  width: 329rpx;
+  height: 229rpx;
+  margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 60rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 56rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+
+.rel {
+  width: 185rpx;
+  height: 185rpx;
+  overflow: hidden;
+  border: 2rpx solid rgb(236, 236, 236);
+}
+
+.abs {
+  top: 15rpx;
+  left: -39rpx;
+  width: 154rpx;
+  height: 40rpx;
+  background-color: rgb(214, 1, 33);
+  transform: rotate(320deg);
+  color: rgb(255, 255, 255);
+  line-height: 40rpx;
+}
+.code{
+  width: 55rpx;
+  height: 55rpx;
+}
+.refund{
+  margin-top: 20rpx;
 }
 \ No newline at end of file