From 696544134a3121c176d83f5b3fb5a3aa7ce577f1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 29 May 2026 10:27:25 +0800
Subject: [PATCH] 11

---
 src/views/act/act-coupon/form.vue    |  2 +-
 src/views/integrated/notice/form.vue | 50 ++++++++++++----------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/views/act/act-coupon/form.vue b/src/views/act/act-coupon/form.vue
index e5cbd8c..b91f299 100644
--- a/src/views/act/act-coupon/form.vue
+++ b/src/views/act/act-coupon/form.vue
@@ -46,7 +46,7 @@
 
         <el-col :span="24" class="mb20">
           <el-form-item label="使用说明" prop="description">
-            <el-input v-model="form.description" type="textarea" :rows="3" placeholder="请输入使用说明" />
+            <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入使用说明" />
           </el-form-item>
         </el-col>
 
diff --git a/src/views/integrated/notice/form.vue b/src/views/integrated/notice/form.vue
index 61e0799..7ca761a 100644
--- a/src/views/integrated/notice/form.vue
+++ b/src/views/integrated/notice/form.vue
@@ -1,27 +1,26 @@
 <template>
-  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-             :close-on-click-modal="false" draggable>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
     <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
       <el-row :gutter="24">
 
 
         <el-col :span="24" class="mb20">
           <el-form-item label="公告标题" prop="title">
-            <el-input v-model="form.title" placeholder="请输入公告标题"/>
+            <el-input v-model="form.title" placeholder="请输入公告标题" />
           </el-form-item>
         </el-col>
 
-<!--        <el-col :span="12" class="mb20">-->
-<!--          <el-form-item label="公告图片" prop="picUrl">-->
-<!--            <upload-file v-model:imageUrl="form.picUrl"></upload-file>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="12" class="mb20">-->
+        <!--          <el-form-item label="公告图片" prop="picUrl">-->
+        <!--            <upload-file v-model:imageUrl="form.picUrl"></upload-file>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
 
         <el-col :span="12" class="mb20">
           <el-form-item label="是否置顶" prop="isTop">
             <el-select v-model="form.isTop" placeholder="请选择是否置顶">
               <el-option :value="item.value" :label="item.label" v-for="(item, index) in is_top"
-                         :key="index"></el-option>
+                :key="index"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -29,22 +28,15 @@
           <el-form-item label="发布状态" prop="status">
             <el-select v-model="form.status" placeholder="请选择状态 0已发布，1已下架">
               <el-option :value="item.value" :label="item.label" v-for="(item, index) in push_status"
-                         :key="index"></el-option>
+                :key="index"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12" class="mb20">
           <el-form-item label="过期时间" prop="expireTime">
-            <el-date-picker 
-              v-model="form.expireTime" 
-              type="datetime" 
-              placeholder="请选择过期时间"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              :disabled-date="disabledDate"
-              :disabled-time="disabledTime"
-              clearable
-            />
+            <el-date-picker v-model="form.expireTime" type="datetime" placeholder="请选择过期时间" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" :disabled-date="disabledDate" :disabled-time="disabledTime"
+              clearable />
             <div class="form-tip">设置过期时间后，公告将在到期后自动隐藏</div>
           </el-form-item>
         </el-col>
@@ -57,19 +49,19 @@
       </el-row>
     </el-form>
     <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
     </template>
   </el-dialog>
 </template>
 
 <script setup lang="ts" name="NoticeDialog">
-import {useDict} from '/@/hooks/dict';
-import {useMessage} from "/@/hooks/message";
-import {getObj, addObj, putObj} from '/@/api/integrated/notice'
-import {rule} from '/@/utils/validate';
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/notice'
+import { rule } from '/@/utils/validate';
 
 const emit = defineEmits(['refresh']);
 
@@ -78,7 +70,7 @@ const dataFormRef = ref();
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-const {push_status, is_top} = useDict('push_status', 'is_top')
+const { push_status, is_top } = useDict('push_status', 'is_top')
 
 // 提交表单数据
 const defaultForm = {