From 81e56063c7bfbe524ec119e3d7e8b280bf8f00a9 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 17:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88=E8=A1=A5?=
 =?UTF-8?q?=E9=93=BE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MendController.class.php |  4 ++--
 Application/Admin/View/Mend/shiftInfo.html    | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index 16625e9d8..b4a22e062 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -132,9 +132,9 @@ class MendController extends ThinkController {
         $id  = I('id');
         $status = M('ShiftTask')->where(['id' => $id,'status' => 0])->save(['status' => 2]);
         if ($status) {
-            $this->success('取消补链成功', U('lists'), 2);
+            $this->ajaxReturn(array("status"=>1,"url"=> U('lists')));
         } else {
-            $this->error("取消失败，或补链已生效",U('lists'));
+            $this->ajaxReturn(array("status"=>0,"url"=> U('lists')));
         }
     }
 }
diff --git a/Application/Admin/View/Mend/shiftInfo.html b/Application/Admin/View/Mend/shiftInfo.html
index 768d1bd5c..050614e98 100644
--- a/Application/Admin/View/Mend/shiftInfo.html
+++ b/Application/Admin/View/Mend/shiftInfo.html
@@ -130,6 +130,7 @@
 <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
 <script type="text/javascript">
 
     var start = $("#bind_time").val();
@@ -151,8 +152,25 @@ Think.setValue("prmoote_id_to", {$data.promote_id|default = "''"});
 $('#submit').click(function(){
     //获取id
     var taskid = $(this).data("id");
-   
-    window.location.href = "{:U('Mend/cancelShift')}"+"&id="+taskid;
+    $.ajax({
+        type:"get",
+        dataType:"json",
+        url:"{:U('Mend/cancelShift')}"+"&id="+taskid,
+        success:function(data){
+            if(data.status == 1){
+                layer.msg('取消补链成功',function(){
+                    window.location.href = data.url;
+                });
+            }else{
+                layer.msg('取消补链失败，或补链已经生效无法取消') 
+            }
+        },
+        error:function(){
+            layer.msg('网络错误');
+        }
+    })
+    
+    // window.location.href = "{:U('Mend/cancelShift')}"+"&id="+taskid;
 });
 $(function(){
 	$('.time').datetimepicker({