From f5c114b6579618fd4846fc7d9acba3b9cfd5dce0 Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Tue, 12 Aug 2025 15:57:28 +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 | 32 ++++++++++++---------------
 src/views/system/themeManage/hook.tsx | 10 +++++----
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/views/system/themeManage/form.vue b/src/views/system/themeManage/form.vue
index 8157e71..ba75413 100644
--- a/src/views/system/themeManage/form.vue
+++ b/src/views/system/themeManage/form.vue
@@ -13,7 +13,10 @@ const formRules = ref({
   auxiliary_color: [
     { required: true, message: "请选择辅助色值", trigger: "change" }
   ],
-
+  file_url: [{ required: true, message: "请输入文件地址", trigger: "blur" }],
+  times: [
+    { required: true, message: "请选择有效期", trigger: "change" }
+  ],
   theme_name: [{ required: true, message: "请输入主题名称", trigger: "blur" }],
 });
 const props = defineProps(["formInline"]);
@@ -25,7 +28,8 @@ const newFormInline = ref(
       theme_color: "",
       auxiliary_color: "",
       file_url: "",
-      is_active: 0
+      is_active: 0,
+      times: []
     }
 );
 function getRef() {
@@ -34,10 +38,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 +69,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-input v-model="newFormInline.file_url" placeholder="请输入文件地址"></el-input>
+    </el-form-item>
+    <el-form-item label="有效期" prop="times">
+      <el-date-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="newFormInline.times" type="daterange"
+        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+      </el-date-picker>
     </el-form-item>
     <el-form-item label="使用状态" prop="is_active">
       <el-radio-group v-model="newFormInline.is_active">
diff --git a/src/views/system/themeManage/hook.tsx b/src/views/system/themeManage/hook.tsx
index f1db9be..ffefb32 100644
--- a/src/views/system/themeManage/hook.tsx
+++ b/src/views/system/themeManage/hook.tsx
@@ -109,7 +109,8 @@ 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 ?? "",
+          times: [rowData?.begin_time ?? "", rowData?.end_time ?? ""]
         }
       },
       width: "40%",
@@ -143,14 +144,15 @@ export function useData() {
         };
         FormRef.validate(valid => {
           if (valid) {
-            console.log("curData", curData);
+            let formData = { ...curData, begin_time: curData.times.length ? curData.times[0] : '', end_time: curData.times.length ? curData.times[1] : '' }
+            delete formData.times
             // 表单规则校验通过
             if (title === "新增") {
               // 实际开发先调用新增接口，再进行下面操作
-              saveData(curData);
+              saveData(formData);
             } else {
               // 实际开发先调用修改接口，再进行下面操作
-              updateData(curData);
+              updateData(formData);
             }
           }
         });