Merge branch 'dev_7.1.0' into fixbug-ZYW

src/pages/order/order.js

@@ -9,6 +9,7 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
+    showApplyRefundModal: false,
     // 订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货)
     swiperItem: [
       {
@@ -94,13 +95,16 @@ wxService.page({
             icon: 'none'
           })
           setTimeout(() => {
-            this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.status)
+            this.onShow()
           }, 200)
         } else {
           wx.showToast({
             title: `确认收货失败!`,
             icon: 'none'
           })
+          setTimeout(() => {
+            this.onShow()
+          }, 200)
         }
       }
     })
@@ -121,12 +125,20 @@ wxService.page({
             title: `删除成功!`,
             icon: 'none'
           })
+          setTimeout(() => {
+            this.onShow()
+          }, 200)
+        }
+
       } else {
         wx.showToast({
           title: `删除失败!`,
           icon: 'none'
         })
-        }
+
+        setTimeout(() => {
+          this.onShow()
+        }, 200)
       }
     })
   },
@@ -184,12 +196,6 @@ wxService.page({
     const { id } = e.currentTarget.dataset
     wxService.router(`/pages/refundDetail/refundDetail?id=${id}`)
   },
-  // 退货寄回
-  handelCheckRfSend(e) {
-    const { id } = e.currentTarget.dataset
-    console.log('handelCheckRfSend物流弹框', id)
-    // 物流弹框
-  },
   // 取消退款
   handelCancelRefund(e) {
     const { id } = e.currentTarget.dataset
@@ -339,6 +345,13 @@ wxService.page({
 
 
   // },
+  //填写物流信息
+  tapWriteLogis() {
+    console.log('222')
+    this.setData({
+      showApplyRefundModal: true
+    })
+  },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */

src/pages/order/order.json

@@ -3,6 +3,7 @@
   "navigationBarTitleText": "我的订单",
   "usingComponents": {
     "no-more": "/component/noMore/noMore",
-    "go-home": "/component/goHome/goHome"
+    "go-home": "/component/goHome/goHome",
+    "apply-refund": "/component/applyRefund/applyRefund"
   }
 }
\ No newline at end of file

src/pages/order/order.wxml

@@ -117,7 +117,7 @@
 						</view>
 						<view class="order-status-rf" wx-if="{{item.status == 'A'}}">
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDetailRf">查看详情</button>
-							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfSend">退货寄回</button>
+							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="tapWriteLogis">退货寄回</button>
 							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelCancelRefund">取消退款</button>
 						</view>
 						<view class="order-status-rf" wx-if="{{item.status == 'R'}}">
@@ -172,7 +172,7 @@
 		当前无数据
 	</view>
 </view>
-
+<apply-refund show="{{showApplyRefundModal}}" />
 <!--goHome-->
 <go-home/>