1. 优化

src/views/tourism/marketingActivities/eventManagement.vue

@@ -148,17 +148,10 @@
         dateRange: [],
         // 控制列表是否显示
         columns: [
-          { key: 0, label: `优惠券名称`, visible: true },
-          { key: 1, label: `券种类型`, visible: true },
-          { key: 2, label: `券种说明`, visible: true },
-          { key: 2.5, label: `发放数量`, visible: true },
-          { key: 3, label: `适用对象`, visible: true },
-          { key: 4, label: `领取限制`, visible: true },
-          { key: 5, label: `使用有效期`, visible: true },
-          { key: 6, label: `适用产品`, visible: true },
-          { key: 7, label: `已领取统计`, visible: true },
-          { key: 8, label: `创建时间`, visible: true },
-          { key: 9, label: `禁用/启用`, visible: true },
+          { key: 0, label: `活动名称`, visible: true },
+          { key: 1, label: `活动起止时间`, visible: true },
+          { key: 2, label: `状态`, visible: true },
+          { key: 2.5, label: `创建时间`, visible: true },
         ],
       };
     },

src/views/tourism/marketingActivities/formBox/couponManagementForm.vue

@@ -374,7 +374,9 @@ export default {
           }
           if(obj.useType == 1) {
             obj['useDate'] = [res.data.useStartDate,res.data.useEndDate] // 使用指定时间
+            obj['useDay'] =  undefined
           }else if(obj.useType == 2){
+            obj['useDate'] = []
             obj['useDay'] = obj.useDay
           }
           if(obj.useUserType == 2) {

src/views/tourism/marketingActivities/formBox/eventManagementForm.vue

@@ -145,12 +145,10 @@ import {
   addTableApi,
   listTableApi,
  } from '@/api/CURD'
-import selectCouponManagement from '../model/selectCouponManagement.vue'
-import selectTicketOrders from "../model/selectTicketOrders.vue"
 import selectMoreBox from '@/myComponents/selectMoreBox.vue';
 export default {
   name: "addAndEdit",
-  components: {selectCouponManagement,selectTicketOrders,selectMoreBox},
+  components: {selectMoreBox},
   dicts: ['tourism_couponManagement_type','tourism_couponManagement_useUserType','tourism_couponManagement_receiveType','tourism_couponManagement_useConfig','goods_type'],
   data() {
     return {

src/views/tourism/marketingActivities/formBox/templateManagementForm.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="title"
     :visible.sync="open"
-    width="70%"
+    width="95%"
     append-to-body
     :close-on-click-modal="false"
     @close="cancel"
@@ -21,10 +21,12 @@
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="模板配置：" name="first"></el-tab-pane>
         </el-tabs>
-        <div style="display: flex;">
-          <div></div>
-          <div>
-            <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <div style="display: flex;width: 100%;">
+          <div style="width: calc( 100% - 600px );padding-right: 10px;box-sizing: border-box;">
+            <asEditor />
+          </div>
+          <div style="width: 600px;flex-shrink: 0;border-left: 1px solid #ccc;padding-left: 10px;box-sizing: border-box;">
+            <el-form :model="form" ref="form" :rules="rules" label-width="150px">
               <div>
                   <el-form-item label="模板名称：" prop="activityName">
                     <el-input style="width: 350px;" v-model="form.activityName" placeholder="请输入模板名称" maxlength="50" show-word-limit />
@@ -32,7 +34,7 @@
                   <el-form-item label="页面路径：" prop="activityName">
                     <el-input style="width: 350px;" v-model="form.activityName" placeholder="请输入页面路径" maxlength="50" show-word-limit />
                   </el-form-item>
-                  <el-form-item label="背景图1" prop="image">
+                  <el-form-item label="背景图1：" prop="image">
                     <div style="display: flex;">
                       <div 
                       v-for="(item,index) in form.image" 
@@ -75,7 +77,7 @@
                     </div>
                     <span>建议尺寸375px X 392px,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
                   </el-form-item>
-                  <el-form-item label="背景图1" prop="image">
+                  <el-form-item label="背景图2：" prop="image">
                     <div style="display: flex;">
                       <div 
                       v-for="(item,index) in form.image" 
@@ -152,11 +154,11 @@ import {
   addTableApi,
   listTableApi,
  } from '@/api/CURD'
-import selectCouponManagement from '../model/selectCouponManagement.vue'
 import selectTicketOrders from "../model/selectTicketOrders.vue"
+import asEditor from "@/myComponents/asEditor"
 export default {
   name: "addAndEdit",
-  components: {selectCouponManagement,selectTicketOrders},
+  components: {selectTicketOrders,asEditor},
   dicts: ['tourism_couponManagement_type','tourism_couponManagement_useUserType','tourism_couponManagement_receiveType','tourism_couponManagement_useConfig','goods_type'],
   data() {
     return {
@@ -224,8 +226,6 @@ export default {
         await this.getTableDeatilsFun(row)
       }
       this.loading = false
-      this.radioInputs(this.form.useType)
-      this.radioInput(this.form.receiveType)
       this.$nextTick(()=>{
         if(this.$refs["form"]) {
           this.$refs["form"].clearValidate();

src/views/tourism/marketingActivities/templateManagement.vue

@@ -3,11 +3,11 @@
       <el-row :gutter="20">
         <!--用户数据-->
         <el-col :span="24" :xs="24">
-          <el-form v-if="false" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="活动名称" prop="activityName">
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="模板名称" prop="name">
               <el-input
-                v-model="queryParams.activityName"
-                placeholder="请输入活动名称"
+                v-model="queryParams.name"
+                placeholder="请输入模板名称"
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
@@ -92,7 +92,7 @@
     components: {detailsBox,addAndEdit},
     data() {
       return {
-        title: "优惠券管理",// 通用标题
+        title: "模板管理",// 通用标题
         configPermi: {
           add: [''], // 新增权限
           details: ['electronicMembership:memberInformation:details'], // 详情权限