From 49dbd6f0d13d2b1e01425cd664314ba1316a65e4 Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Tue, 30 Dec 2025 09:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/themeManage/form.vue | 39 +++++++++++++++------------
 src/views/system/themeManage/hook.tsx |  6 +++--
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/views/system/themeManage/form.vue b/src/views/system/themeManage/form.vue
index 8157e71..318f8a1 100644
--- a/src/views/system/themeManage/form.vue
+++ b/src/views/system/themeManage/form.vue
@@ -13,7 +13,12 @@ const formRules = ref({
   auxiliary_color: [
     { required: true, message: "请选择辅助色值", trigger: "change" }
   ],
-
+  begin_time: [
+    { required: true, message: "请选择开始时间", trigger: "change" }
+  ],
+  end_time: [
+    { required: true, message: "请选择结束时间", trigger: "change" }
+  ],
   theme_name: [{ required: true, message: "请输入主题名称", trigger: "blur" }],
 });
 const props = defineProps(["formInline"]);
@@ -34,10 +39,10 @@ function getRef() {
 function chanageEditorValue(val) {
   newFormInline.value.content = val
 }
-function onExceed () {
+function onExceed() {
   message("最多上传1个文件，请先删除在上传");
 };
-function handleFileSuccess  ({ data, code }, file, fileList) {
+function handleFileSuccess({ data, code }, file, fileList) {
   // console.log(file)
   // console.log(fileList)
   // debugger
@@ -65,20 +70,12 @@ defineExpose({ getRef });
       <el-color-picker v-model="newFormInline.auxiliary_color"></el-color-picker>
     </el-form-item>
     <el-form-item label="文件地址" prop="file_url">
-      <el-upload
-  class="upload-demo"
-  drag
-  :limit="1"
-   name="files"
-   accept=".zip"
-   :headers="{ Authorization: getToken().accessToken }"
-  action="/adminapi/UploadFile/file_upload"
-   :on-exceed="onExceed"
-    :on-success="handleFileSuccess"
-  >
-  <i class="el-icon-upload"></i>
-  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-</el-upload>
+      <el-upload class="upload-demo" drag :limit="1" name="files" accept=".zip"
+        :headers="{ Authorization: getToken().accessToken }" action="/adminapi/UploadFile/file_upload"
+        :on-exceed="onExceed" :on-success="handleFileSuccess">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
     </el-form-item>
     <el-form-item label="使用状态" prop="is_active">
       <el-radio-group v-model="newFormInline.is_active">
@@ -86,5 +83,13 @@ defineExpose({ getRef });
         <el-radio label="使用" :value="1" />
       </el-radio-group>
     </el-form-item>
+    <el-form-item label="开始时间" prop="begin_time">
+      <el-date-picker clearable v-model="newFormInline.begin_time" type="datetime" :placeholder="`请选择开始时间`"
+        format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+    </el-form-item>
+    <el-form-item label="结束时间" prop="end_time">
+      <el-date-picker clearable v-model="newFormInline.end_time" type="datetime" :placeholder="`请选择结束时间`"
+        format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+    </el-form-item>
   </el-form>
 </template>
diff --git a/src/views/system/themeManage/hook.tsx b/src/views/system/themeManage/hook.tsx
index 34c8b76..9c4dd88 100644
--- a/src/views/system/themeManage/hook.tsx
+++ b/src/views/system/themeManage/hook.tsx
@@ -1,7 +1,7 @@
 import { ref, h } from "vue";
 import editForm from "./form.vue";
 import { message } from "@/utils/message";
-import { ElMessageBox } from "element-plus";
+// import { ElMessageBox } from "element-plus";
 import {
   getThemeList,
   addThemeData,
@@ -110,7 +110,9 @@ export function useData() {
           theme_color: rowData?.theme_color ?? "",
           auxiliary_color: rowData?.auxiliary_color ?? "",
           file_url: rowData?.file_url ?? "",
-          is_active: rowData?.is_active ?? ""
+          is_active: rowData?.is_active ?? "",
+          begin_time: rowData?.begin_time ?? "",
+          end_time: rowData?.end_time ?? ""
         }
       },
       width: "40%",