From 28b8fb07ee5d61056001776e6b6891b522f5264b Mon Sep 17 00:00:00 2001 From: F5VT98DI7XY4X12\Administrator <765199919@qq.com> Date: Wed, 18 Sep 2019 15:04:21 +0800 Subject: [PATCH] 订单列表，订单详情 --- pages/user/order_detail/order_detail.wxss | 3 ++- pages/user/order_list/order_list.js | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------- pages/user/order_list/order_list.wxml | 10 +++++++--- 3 files changed, 95 insertions(+), 97 deletions(-) diff --git a/pages/user/order_detail/order_detail.wxss b/pages/user/order_detail/order_detail.wxss index e82786b..9fe97d5 100644 --- a/pages/user/order_detail/order_detail.wxss +++ b/pages/user/order_detail/order_detail.wxss @@ -167,5 +167,6 @@ font-size: 30rpx; color: #fff; background-color: #f23030; - margin-left: 2rpx; + /* margin-left: 2rpx; */ + margin-right: 8rpx } \ No newline at end of file diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index efbc818..d286c11 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -4,6 +4,7 @@ var t = function(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(); +var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ data: { @@ -60,102 +61,94 @@ Page({ s.request(r, function(t) { th.setData({is_get:1}); - var data=e.data.orderList; - data.forEach(function (item,ind){ - console.log(item) - if (item.order_goods==undefined){ - rq.get('/api/weshop/ordergoods/list',{ - isShowLoading:0, + 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}, - success: function (tt) { - //------------对比一下有没有退款记录------------ - rq.get("/api/weshop/order/returngoods/page",{ - isShowLoading: 0, - data: { order_id: item.order_id, store_id: os.stoid, - user_id:oo.user_id, pageSize: 20 }, - success: function (ttd) { - console.log('returngoods'); - 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; + }).then(res=>{ + tt=res; + }) + //------------对比一下有没有退款记录------------ + 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; + + 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; + 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; break; + case 3://已拒绝，重新退款 + goodslist[iii]['return_btn'] = 3; break; + default: + goodslist[iii]['return_btn'] = 1; //申请退款 + } + return; + } + }); + }); + } + } + } + data[ind]['order_goods'] = goodslist; + var g_num = 0; + goodslist.forEach(function (ee, ii) { + g_num += ee.goods_num; + }); + data[ind]['g_num'] = g_num; + }) + th.setData({ orderList: data, }); - 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'] = 2; 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; - if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) { - ttd.data.data.pageData.forEach(function (eea, ii) { - goodslist.forEach(function (eeb, iii) { - 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'] = 2; break; - case 3://已拒绝 - goodslist[iii]['return_btn'] = 3; break; - default: - goodslist[iii]['return_btn'] = 1; - } - }else{ - goodslist[iii]['return_btn'] =0; - } - }); - }); - } - } - } - data[ind]['order_goods'] = goodslist; - var g_num = 0; - goodslist.forEach(function (ee, ii) { - g_num += ee.goods_num; - }); - data[ind]['g_num'] = g_num; - th.setData({ orderList: data, }); - } - }) - } - }) - } }); e.data.currentPage++, /*--- diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 53f5ac7..3ec80a6 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -29,13 +29,17 @@ ¥ {{goods.member_goods_price}} 数量 {{goods.goods_num}} + + - + data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1}}">申请退款 退款中 + + 退款完成 -- libgit2 0.21.4