From d9ccbf8cedd930373508000e31c9df46812a39ee Mon Sep 17 00:00:00 2001
From: Dai <risin9@foxmail.com>
Date: Tue, 6 Aug 2024 15:42:39 +0800
Subject: [PATCH] fix some bug

---
 .../TeacherScheduleTimeController.php         |  2 +-
 .../app/view/teacher-free-time/index.html     |  4 +--
 .../app/view/teacher-schedule-time/index.html |  5 ++--
 .../schedule_time_setting.html                | 29 ++++++++++++-------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/plugin/admin/app/controller/TeacherScheduleTimeController.php b/plugin/admin/app/controller/TeacherScheduleTimeController.php
index fd1838f..a91b50a 100644
--- a/plugin/admin/app/controller/TeacherScheduleTimeController.php
+++ b/plugin/admin/app/controller/TeacherScheduleTimeController.php
@@ -53,7 +53,7 @@ class TeacherScheduleTimeController extends Crud
     {
         try {
             $data = $request->get();
-            $teacherSchedule = \app\common\model\TeacherScheduleTime::order('id asc');
+            $teacherSchedule = \app\common\model\TeacherScheduleTime::order('id desc');
             if (isset($data['teacher_id']) && $data['teacher_id']) {
                 $teacherSchedule->where(['teacher_id' => $data['teacher_id']]);
             }
diff --git a/plugin/admin/app/view/teacher-free-time/index.html b/plugin/admin/app/view/teacher-free-time/index.html
index 42a3b1d..b3506b9 100644
--- a/plugin/admin/app/view/teacher-free-time/index.html
+++ b/plugin/admin/app/view/teacher-free-time/index.html
@@ -84,8 +84,8 @@
 
         <!-- 表格行工具栏 -->
         <script type="text/html" id="table-bar">
-            <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.teacherfreetime.update">编辑</button>
-            <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.teacherfreetime.delete">删除</button>
+            <button type="button" class="layui-btn layui-btn-xs" lay-event="edit" permission="app.admin.teacherfreetime.update">编辑</button>
+            <button type="button" class="layui-btn layui-btn-xs layui-bg-red" lay-event="remove" permission="app.admin.teacherfreetime.delete">删除</button>
         </script>
 
         <script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
diff --git a/plugin/admin/app/view/teacher-schedule-time/index.html b/plugin/admin/app/view/teacher-schedule-time/index.html
index 128ac42..c3a6021 100644
--- a/plugin/admin/app/view/teacher-schedule-time/index.html
+++ b/plugin/admin/app/view/teacher-schedule-time/index.html
@@ -116,10 +116,10 @@
 
 <!-- 表格行工具栏 -->
 <script type="text/html" id="table-bar">
-    <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.teacherscheduletime.update">
+    <button  type="button" class="layui-btn layui-btn-xs" lay-event="edit" permission="app.admin.teacherscheduletime.update">
         编辑
     </button>
-    <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.teacherscheduletime.delete">
+    <button  type="button" class="layui-btn layui-btn-xs layui-bg-red" lay-event="remove" permission="app.admin.teacherscheduletime.delete">
         删除
     </button>
 </script>
@@ -235,6 +235,7 @@
             }, {
                 title: "创建时间", align: "center",
                 field: "created_at",
+                width: 250
             }, {
                 title: "更新时间", align: "center",
                 field: "updated_at",
diff --git a/plugin/admin/app/view/teacher-schedule-time/schedule_time_setting.html b/plugin/admin/app/view/teacher-schedule-time/schedule_time_setting.html
index ee5ecbd..e8416e3 100644
--- a/plugin/admin/app/view/teacher-schedule-time/schedule_time_setting.html
+++ b/plugin/admin/app/view/teacher-schedule-time/schedule_time_setting.html
@@ -38,7 +38,14 @@
             </div>
 
             <div class="layui-form-item">
-                <label class="layui-form-label">时间</label>
+                <label class="layui-form-label">本地时间</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time" value="{$schedule_time['en_time']}" disabled class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">中国时间</label>
                 <div class="layui-input-block">
                     <input type="text" name="time" value="{$schedule_time['time']}" disabled class="layui-input">
                 </div>
@@ -88,16 +95,16 @@
         </div>
     </div>
 
-    <div class="bottom">
-        <div class="button-container">
-            <button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="save">
-                提交
-            </button>
-            <button type="reset" class="pear-btn pear-btn-md">
-                重置
-            </button>
-        </div>
-    </div>
+<!--    <div class="bottom">-->
+<!--        <div class="button-container">-->
+<!--            <button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="save">-->
+<!--                提交-->
+<!--            </button>-->
+<!--            <button type="reset" class="pear-btn pear-btn-md">-->
+<!--                重置-->
+<!--            </button>-->
+<!--        </div>-->
+<!--    </div>-->
 
 </form>