diff --git a/pages/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js index 49b0e8e..9cfa00f 100644 --- a/pages/order/refund_order/refund_order.js +++ b/pages/order/refund_order/refund_order.js @@ -33,6 +33,7 @@ Page({ orderId: t.order_id, user: e, }), + wx.showLoading(); rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{ success:function(ed){ var bm = ed.data.data.order_amount + ed.data.data.user_money @@ -41,6 +42,7 @@ Page({ order_sn: ed.data.data.order_sn, back_money: bm }) + wx.hideLoading(); } }) }); @@ -49,6 +51,10 @@ Page({ //------提交退款申请------- refundOrder: function(e) { + + if(!this.data.back_money){ + return false; + } if(this.data.isloading) return false; this.data.isloading=1; var th = this; @@ -59,10 +65,16 @@ Page({ console.log('ordergoods'); console.log(od); var glist=""; - var olist=od.data.data.pageData; - olist.forEach(function(ie,ind){ + var olist=od.data.data.pageData; + /*-- + olist.forEach(function(ie,ind){ glist+=ie.goods_id+"," - }) + })--*/ + for(var i in olist){ + var ie=olist[i]; + glist+=ie.goods_id+"," + } + glist = glist.substring(0, glist.length-1); console.log(glist); rq.post("/api/weshop/order/returngoods/saveReturnGoods", { diff --git a/pages/user/return_goods/return_goods.js b/pages/user/return_goods/return_goods.js index a941c79..38435c7 100644 --- a/pages/user/return_goods/return_goods.js +++ b/pages/user/return_goods/return_goods.js @@ -44,6 +44,7 @@ Page({ }, requestReturnGoods: function(t) { var e = this; + wx.showLoading(); a.get("/api/weshop/ordergoods/list", { failRollback: !0, data: { @@ -57,6 +58,7 @@ Page({ order: t.data.data.pageData[0], applyNum: t.data.data.pageData[0].goods_num }); + wx.hideLoading(); } }); }, @@ -128,10 +130,15 @@ Page({ /*-------------提交退款申请--------------*/ submiApply: function() { - if(this.data.isloading) return false; - this.data.isloading=1; + + if(!this.data.order) return false; + var t = this,th=t; this.checkSubmit(function() { + + if(th.data.isloading) return false; + th.data.isloading=1; + t.uploadPhotos(function() { a.post("/api/weshop/order/returngoods/saveReturnGoods", { /*--- @@ -159,7 +166,9 @@ Page({ addtime: ut.gettimestamp(), type:2, refund_type: th.data.refund_type, + remark:th.data.description }, + success: function(t) { wx.showToast({ title: "提交成功",