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 });
-
-
- 将文件拖到此处,或点击上传
-
+
+
+
+
+
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);
}
}
});