diff --git a/components/diy_service/diy_service.wxml b/components/diy_service/diy_service.wxml index d287119..73fe0dc 100644 --- a/components/diy_service/diy_service.wxml +++ b/components/diy_service/diy_service.wxml @@ -10,7 +10,7 @@ diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index a204b54..2d87afd 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -2144,7 +2144,7 @@ Page({ var quan_item=this.data.selected_quan_list[ind]; var pickid=this.data.selected_quan_pick; //现在选择的是哪一个门店 //--如果券是单品使用的时候-- - if(quan_item.UseObjectType=="20"){ + if( quan_item && quan_item.UseObjectType && quan_item.UseObjectType=="20"){ //---只有多件购买的时候才要计算,//购物车购买和搭配勾的时候--- var gg=getApp().get_b_now(); if(this.data.is_b_now==0 || gg.prom_type==5){ diff --git a/pages/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js index 9cfa00f..252c545 100644 --- a/pages/order/refund_order/refund_order.js +++ b/pages/order/refund_order/refund_order.js @@ -11,6 +11,7 @@ Page({ orderId: 0, order_sn:"", back_money: 0, + back_integral: 0, reasonSelect: 0, reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ], refund_type:0, @@ -42,6 +43,11 @@ Page({ order_sn: ed.data.data.order_sn, back_money: bm }) + //如果有积分的话 + if( ed.data.data.integral>0){ + th.setData({back_integral:ed.data.data.integral}); + } + wx.hideLoading(); } }) @@ -77,19 +83,24 @@ Page({ glist = glist.substring(0, glist.length-1); console.log(glist); + var r_data={ + order_id: th.data.orderId, + order_sn: th.data.order_sn, + store_id:os.stoid, + user_id: th.data.user.user_id, + back_money: th.data.back_money, + reason: th.data.reasonList[th.data.reasonSelect], + goods_id_list: glist, + addtime: ut.gettimestamp(), + type:2, + refund_type: th.data.refund_type, + }; + + if(th.data.back_integral){ + r_data.back_integral=th.data.back_integral; + } rq.post("/api/weshop/order/returngoods/saveReturnGoods", { - data: { - order_id: th.data.orderId, - order_sn: th.data.order_sn, - store_id:os.stoid, - user_id: th.data.user.user_id, - back_money: th.data.back_money, - reason: th.data.reasonList[th.data.reasonSelect], - goods_id_list: glist, - addtime: ut.gettimestamp(), - type:2, - refund_type: th.data.refund_type, - }, + data: r_data, success: function (e) { wx.showToast({ title: "已提交申请", diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index eb16b95..03caf6d 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -117,6 +117,7 @@ {{filters.toFix(item.order_amount+item.user_money,2)}} +{{item.coupon_price}}元优惠券 + +{{item.integral}}积分 diff --git a/pages/user/return_goods_info/return_goods_info.wxml b/pages/user/return_goods_info/return_goods_info.wxml index 898b382..ccbaf5a 100644 --- a/pages/user/return_goods_info/return_goods_info.wxml +++ b/pages/user/return_goods_info/return_goods_info.wxml @@ -19,6 +19,10 @@ 退款金额 : ¥{{return_goods.back_money}} + + 退款积分 : {{return_goods.back_integral}}积分 + + 售后信息