wxd / MShopWeApp

Commit 0f5046acc272b759ff12e3ea34de19d1acf55592

Authored by yvan.ni
1 parent f484bf6c

1.退款订单，在退款前要判断退款的金额，并添加加载的效果 

1.退款商品是，在退款前要判断订单，并添加加载的效果
Inline Side-by-side
Showing 2 changed files with 26 additions and 5 deletions
pages/order/refund_order/refund_order.js
  View file @0f5046a
... ... @@ -33,6 +33,7 @@ Page({
33 33 orderId: t.order_id,
34 34 user: e,
35 35 }),
  36 + wx.showLoading();
36 37 rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{
37 38 success:function(ed){
38 39 var bm = ed.data.data.order_amount + ed.data.data.user_money
... ... @@ -41,6 +42,7 @@ Page({
41 42 order_sn: ed.data.data.order_sn,
42 43 back_money: bm
43 44 })
  45 + wx.hideLoading();
44 46 }
45 47 })
46 48 });
... ... @@ -49,6 +51,10 @@ Page({
49 51  
50 52 //------提交退款申请-------
51 53 refundOrder: function(e) {
  54 +
  55 + if(!this.data.back_money){
  56 + return false;
  57 + }
52 58 if(this.data.isloading) return false;
53 59 this.data.isloading=1;
54 60 var th = this;
... ... @@ -59,10 +65,16 @@ Page({
59 65 console.log('ordergoods');
60 66 console.log(od);
61 67 var glist="";
62   - var olist=od.data.data.pageData;
63   - olist.forEach(function(ie,ind){
  68 + var olist=od.data.data.pageData;
  69 + /*--
  70 + olist.forEach(function(ie,ind){
64 71 glist+=ie.goods_id+","
65   - })
  72 + })--*/
  73 + for(var i in olist){
  74 + var ie=olist[i];
  75 + glist+=ie.goods_id+","
  76 + }
  77 +
66 78 glist = glist.substring(0, glist.length-1);
67 79 console.log(glist);
68 80 rq.post("/api/weshop/order/returngoods/saveReturnGoods", {
... ...
pages/user/return_goods/return_goods.js
  View file @0f5046a
... ... @@ -44,6 +44,7 @@ Page({
44 44 },
45 45 requestReturnGoods: function(t) {
46 46 var e = this;
  47 + wx.showLoading();
47 48 a.get("/api/weshop/ordergoods/list", {
48 49 failRollback: !0,
49 50 data: {
... ... @@ -57,6 +58,7 @@ Page({
57 58 order: t.data.data.pageData[0],
58 59 applyNum: t.data.data.pageData[0].goods_num
59 60 });
  61 + wx.hideLoading();
60 62 }
61 63 });
62 64 },
... ... @@ -128,10 +130,15 @@ Page({
128 130  
129 131 /*-------------提交退款申请--------------*/
130 132 submiApply: function() {
131   - if(this.data.isloading) return false;
132   - this.data.isloading=1;
  133 +
  134 + if(!this.data.order) return false;
  135 +
133 136 var t = this,th=t;
134 137 this.checkSubmit(function() {
  138 +
  139 + if(th.data.isloading) return false;
  140 + th.data.isloading=1;
  141 +
135 142 t.uploadPhotos(function() {
136 143 a.post("/api/weshop/order/returngoods/saveReturnGoods", {
137 144 /*---
... ... @@ -159,7 +166,9 @@ Page({
159 166 addtime: ut.gettimestamp(),
160 167 type:2,
161 168 refund_type: th.data.refund_type,
  169 + remark:th.data.description
162 170 },
  171 +
163 172 success: function(t) {
164 173 wx.showToast({
165 174 title: "提交成功",
... ...