From 8676ca210757b128c0c4154a6ea2237a3debbc72 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 27 Jul 2020 16:45:14 +0800
Subject: [PATCH] 1.  订单列表显示积分值 2.  再退款的时候，要把积分值带入

---
 pages/order/refund_order/refund_order.js | 35 +++++++++++++++++++++++------------
 pages/user/order_list/order_list.wxml    |  1 +
 2 files changed, 24 insertions(+), 12 deletions(-)

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 @@
                   <view class="fs24 xc-wc">￥</view>
                      <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
                      <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
+                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
                   </view>
                 </view>
                 <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
--
libgit2 0.21.4