From a9afb095bf80c75f78713bc5fd4e0fad7de0a900 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Sat, 12 Sep 2020 10:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcOrderMainController.php | 9 ---------
 app/Admin/Extensions/MyDetailPage.php                | 9 ++++-----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index ad80e70..90dc60e 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -4,25 +4,18 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Common\Rpc;
 use App\Admin\Extensions\CheckRow;
-use App\Admin\Extensions\CouponTieEdit;
 use App\Admin\Extensions\MyDetailPage;
 use App\Admin\Extensions\OrderDetail;
 use App\Admin\Extensions\OrderPrint;
 use App\Admin\Extensions\OrderRefund;
 use App\Admin\Extensions\OrderStateHandle;
-use App\Admin\Forms\CouponTieForm;
-use App\Admin\Renderable\PostChart;
 use App\Admin\Repositories\ImsCjdcOrderMain;
-use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
 use Dcat\Admin\Widgets\Lazy;
-use Dcat\Admin\Widgets\Modal;
-
-;
 
 class ImsCjdcOrderMainController extends AdminController
 {
@@ -153,14 +146,12 @@ class ImsCjdcOrderMainController extends AdminController
 
     public function orderGoodsRefund()
     {
-        return 0;
         $uid = request()->get('user_id');
         $note = request()->get('note');
         $global_order_id = request()->get('global_order_id');
         $order_child_id = request()->get('order_child_id');
         $order_goods_id = request()->get('order_goods_id');
         $result = Rpc::onlineSingleRefund($uid, $note, $global_order_id, $order_child_id, $order_goods_id);
-        dd($result);
         return json_encode($result['result']);
     }
 
diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php
index 8c6540a..3508e61 100644
--- a/app/Admin/Extensions/MyDetailPage.php
+++ b/app/Admin/Extensions/MyDetailPage.php
@@ -67,20 +67,19 @@ class MyDetailPage extends LazyRenderable
                     order_child_id:null,
                     show_refund_2:true,
                     show_refund_3:false,
-
-
-
                 },
                 methods: {
                     refundNote(name,order_goods_id,order_child_id) {
-
                         this.dialogFormVisible = true;
                         this.order_goods_id=order_goods_id;
                         this.order_child_id=order_child_id;
                         this.refund_goods_name ="退款备注商品 ["+name+"]" ;
-
                     },
                     refundConfirm() {
+                        if (this.total_refund_note==''){
+                             this.\$message({message: '请备注退款原因！',type: 'warning'})
+                             return false;
+                        }
                          this.\$confirm('是否同意该商品退款?', '提示', {
                             confirmButtonText: '同意',
                             cancelButtonText: '取消',