From 3b497df7f07a40f243589354f0f2ecb3793c516f Mon Sep 17 00:00:00 2001
From: "525833532@qq.com" <QQ525833532>
Date: Wed, 17 Aug 2022 11:07:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Queue.php  | 2 +-
 app/admin/view/queue/exec.html  | 8 ++++----
 app/admin/view/queue/index.html | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 0880271b2..b0c90b29e 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -137,7 +137,7 @@ class Queue extends Controller
                 $info = SystemQueue::mk()->where($map)->find();
                 if (empty($info)) $this->error('任务不存在');
 
-                // 订单状态检查
+                // 任务状态检查
                 if ($info['status'] <> 1) $this->error('任务当前状态不可重置下次执行时间');
 
                 // 更新任务下次执行时间
diff --git a/app/admin/view/queue/exec.html b/app/admin/view/queue/exec.html
index 3c30f0e9d..1c92181d1 100644
--- a/app/admin/view/queue/exec.html
+++ b/app/admin/view/queue/exec.html
@@ -1,12 +1,12 @@
-<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card" data-table-id="MenuTable">
+<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card" data-table-id="QueueTable">
 
     <div class="layui-card-body">
 
         <div class="layui-form-item">
             <label class="layui-form-label">下次执行时间</label>
             <div class="layui-input-block">
-                <input name="exec_time" value='' data-date-input="datetime" required placeholder="请选择下次执行时间，请勿早于当前时间" class="layui-input">
-                <p class="help-block"><b>仅重复任务可设置下次执行时间</b></p>
+                <input name="exec_time" value='' data-date-input="datetime" required placeholder="请选择下次执行时间" class="layui-input">
+                <p class="help-block"><b>仅重复任务可设置，请勿早于当前时间</b></p>
 				<p class="help-block">启动重复任务时可设置延时时间</p>
                 <p class="help-block">再手动修改下次(第一次的)时间即可</p>
             </div>
@@ -18,7 +18,7 @@
     {notempty name='vo.code'}<input type='hidden' value='{$vo.code}' name='code'>{/notempty}
 
     <div class="layui-form-item text-center">
-        <button class="layui-btn" type='submit' data-confirm="确定要重置该任务的下次执行时间吗？">保存数据</button>
+        <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
 </form>
\ No newline at end of file
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index ec5d4c03a..5459a2997 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -104,7 +104,7 @@
     {{# if(d.status===4||d.status===3){ }}
     <a class="layui-btn layui-btn-sm" data-confirm="确定要重置该任务吗？" data-queue="{:url('redo')}?code={{d.code}}">重 置</a>
     {{# }else{ }}
-    <a class="layui-btn layui-btn-sm" data-width="400px" data-modal='{:url("exec")}?code={{d.code}}'">重 置</a>
+    <a class="layui-btn layui-btn-sm" data-width="450px" data-modal='{:url("exec")}?code={{d.code}}'">重 置</a>
     {{# } }}
     <!--{/if}-->