一件代发

@@ -8,12 +8,14 @@
         买家已申请退货，待商家处理
         <Row>
           <i-col span="4">退货ID：{{ id }}</i-col>
-          <i-col span="4">退款申请时间：2020-3-4 13:23:34</i-col>
-          <i-col span="4">退货状态：待商家审核售后申请</i-col>
+          <i-col span="4">退款申请时间：{{ returnedInfo.createTime | timeFormat }}</i-col>
+          <i-col span="4">退货状态：{{ returnedInfo.status }}</i-col>
         </Row>
         <Row>
-          <i-col span="4">退款总金额：¥199.87</i-col>
-          <i-col span="4">退款成功时间：2020-3-4 13:23:34</i-col>
+          <i-col span="4">退款总金额：{{ returnedInfo.realReturnedAmount }}</i-col>
+          <i-col span="4">
+            退款成功时间：<span v-if="returnedInfo.refundTime">{{ returnedInfo.refundTime | timeFormat }}</span>
+          </i-col>
         </Row>
       </div>
     </div>
@@ -25,10 +27,10 @@
       </div>
       <div class="ivu-card-body">
         <Row>
-          <i-col span="24">物流公司：</i-col>
+          <i-col span="24">物流公司：{{ returnedInfo.expressName }}</i-col>
         </Row>
         <Row>
-          <i-col span="24">运单号：</i-col>
+          <i-col span="24">运单号：{{ returnedInfo.expressNumber }}</i-col>
         </Row>
       </div>
     </div>
@@ -70,6 +72,7 @@ export default {
       returnGoods: [],
       refuseReasonList: [],
       returnedReasonArr: OrderConfig.returnedReasonArr,
+      returnedInfo: [],
     };
   },
   created() {
@@ -79,8 +82,15 @@ export default {
     this.getOrderInfo();
     this.getReturnedGoods();
     this.getRefuseReason();
+    this.getReturnedInfo();
   },
   methods: {
+    //获取申请单详情
+    getReturnedInfo() {
+      this.returnedService.getReturnedInfo({ id: +this.id }).then(ret => {
+        this.returnedInfo = _.get(ret, 'data', []);
+      });
+    },
     //获取订单详情
     getOrderInfo() {
       this.orderService.orderDetail({ orderCode: +this.orderCode }).then(ret => {
@@ -110,6 +120,8 @@ export default {
     },
     //审核通过
     pass() {
+      //首先获取退货数据
+
       this.returnedService.returnedGoodsAudit({ id: this.id }).then(ret => {
         if (ret.code === 200) {
           this.$Message.info(ret.message);
@@ -126,13 +138,20 @@ export default {
     },
     //同意退款
     submitRefund() {
-      this.logisticsService.proxyReturnedGoodsInstorage({ returnRequestId: this.id }).then(ret => {
-        if (ret.code === 200) {
-          this.$Message.info(ret.message);
-          this.$router.go(0);
-        } else {
-          this.$Message.error(ret.message);
-        }
+      const _this = this;
+      this.$Modal.confirm({
+        title: '退款',
+        content: `你确定 同意退款吗？`,
+        onOk() {
+          _this.logisticsService.proxyReturnedGoodsInstorage({ requestId: +_this.id }).then(ret => {
+            if (ret.code === 200) {
+              this.$Message.info(ret.message);
+              this.$router.go(0);
+            } else {
+              this.$Message.error(ret.message);
+            }
+          });
+        },
       });
     },
   },