Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_merchant_ui

.env.development

@@ -9,3 +9,13 @@ VUE_APP_BASE_API = '/tourism-merchant-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 图片访问网站地址
+VUE_APP_BASE_IMAGE = '/thirdapi/upload/single/minio'
+
+# 图片上传网站地址
+VUE_APP_UPLOAD_IMAGE = '/thirdapi/upload/single/minio'
+
+# 部署的URL
+# 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 为 /admin。
+VUE_APP_ASSETS_PUBLIC_PATH = '/'

.env.production

@@ -9,9 +9,12 @@ ENV = 'production'
 # 景区营销管理系统/生产环境
 VUE_APP_BASE_API = '/tourism-merchant-api'
 
-# 图片网站地址
+# 图片访问地址网站地址
 VUE_APP_BASE_IMAGE = /stage-api/file/statics
 
+# 图片上传网站地址
+VUE_APP_UPLOAD_IMAGE = '/thirdapi/upload/single/minio'
+
 # 部署的URL
 # 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 为 /admin。
 VUE_APP_ASSETS_PUBLIC_PATH = '/'

.env.staging

@@ -9,9 +9,12 @@ ENV = 'staging'
 # 景区营销管理系统/测试环境
 VUE_APP_BASE_API = '/tourism-merchant-api'
 
-# 图片网站地址
+# 图片访问地址网站地址
 VUE_APP_BASE_IMAGE = /stage-api/file/statics
 
+# 图片上传网站地址
+VUE_APP_UPLOAD_IMAGE = '/thirdapi/upload/single/minio'
+
 # 部署的URL
 # 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 为 /admin。
 VUE_APP_ASSETS_PUBLIC_PATH = '/'

package.json

@@ -60,6 +60,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"

src/api/CURD.js

@@ -18,6 +18,14 @@ export function getTableDeatilsApi(url,userId) {
     })
   }
   
+// 查询table详细,更具ID
+export function getTableDeatilsByIdApi(url,params) {
+  return request({
+    url: url,
+    method: 'get',
+    params
+  })
+}
   // 新增table
   export function addTableApi(url,data) {
     return request({
@@ -27,7 +35,7 @@ export function getTableDeatilsApi(url,userId) {
     })
   }
   
-  // 修改table
+  // 修改table PUT
   export function updateTableApi(url,data) {
     return request({
       url: url,
@@ -42,4 +50,13 @@ export function getTableDeatilsApi(url,userId) {
       url: url + userId,
       method: 'delete'
     })
+  }
+
+  // 删除table
+  export function delTableParamsApi(url,params) {
+    return request({
+      url: url,
+      method: 'delete',
+      params
+    })
   }

src/myComponents/uploadImg.vue

@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            :outputType="options.outputType"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <img :src="previews.url" :style="previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :sm="3" :xs="3">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 2}" :sm="2" :xs="2">
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 2, offset: 6}" :sm="2" :xs="2">
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { VueCropper } from "vue-cropper";
+import { uploadAvatar } from "@/api/system/user";
+import { debounce } from '@/utils'
+
+export default {
+  components: { VueCropper },
+  props: {
+    // 用来接收父组件v-model传递的数据
+    value: {
+      type: [String,Array],
+      default: ''
+    }
+  },
+  data() {
+    return {
+      // 是否显示弹出层
+      open: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "修改头像",
+      options: {
+        img: '',  //裁剪图片的地址
+        autoCrop: true,             // 是否默认生成截图框
+        autoCropWidth: 200,         // 默认生成截图框宽度
+        autoCropHeight: 200,        // 默认生成截图框高度
+        fixedBox: true,             // 固定截图框大小 不允许改变
+        outputType:"png",           // 默认生成截图为PNG格式
+        filename: 'avatar'          // 文件名称
+      },
+      previews: {},
+      resizeHandler: null
+    };
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.open = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+      if (!this.resizeHandler) {
+        this.resizeHandler = debounce(() => {
+          this.refresh()
+        }, 100)
+      }
+      window.addEventListener("resize", this.resizeHandler)
+    },
+    // 刷新组件
+    refresh() {
+      this.$refs.cropper.refresh();
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {
+    },
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      if (file.type.indexOf("image/") == -1) {
+        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      } else {
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          this.options.img = reader.result;
+          this.options.filename = file.name;
+        };
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.$refs.cropper.getCropBlob(data => {
+        let formData = new FormData();
+        formData.append("avatarfile", data, this.options.filename);
+        uploadAvatar(formData).then(response => {
+          this.open = false;
+          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.$modal.msgSuccess("修改成功");
+          this.visible = false;
+        });
+      });
+    },
+    // 实时预览
+    realTime(data) {
+      this.previews = data;
+    },
+    // 关闭窗口
+    closeDialog() {
+      this.options.img = store.getters.avatar
+      this.visible = false;
+      window.removeEventListener("resize", this.resizeHandler)
+    }
+  },
+  watch: {
+    value: {
+      immediate:true,
+      handler(newValue) {
+        console.log("afgasdfasdfasdf===",newValue,typeof newValue)
+        if(!newValue) {
+          this.options.img = null
+        }else if(typeof newValue == "string") {
+          console.log("范德萨发顺丰afgasdfasdfasdf===",newValue)
+          this.options.img = newValue
+        } 
+      }
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  width: 120px;
+  height: 120px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  //border-radius: 50%;
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfo.vue

@@ -292,8 +292,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-        return delTableApi(configUrl.delect,ids);
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
+        return delTableApi(this.configUrl.delect,ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfoManagement.vue

@@ -4,50 +4,15 @@
         <!--用户数据-->
         <el-col :span="24" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="用户名称" prop="name">
+            <el-form-item label="景点名称" prop="name">
               <el-input
                 v-model="queryParams.name"
-                placeholder="请输入用户名称"
+                placeholder="请输入景点名称"
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,7 +30,7 @@
                 v-hasPermi="configPermi.add"
               >新增</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <el-col :span="1.5" v-if="false">
               <el-button
                 type="danger"
                 plain
@@ -76,7 +41,7 @@
                 v-hasPermi="configPermi.delect"
               >删除</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <el-col :span="1.5" v-if="false">
               <el-button
                 type="info"
                 plain
@@ -86,7 +51,7 @@
                 v-hasPermi="configPermi.upload"
               >导入</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <el-col :span="1.5" v-if="false">
               <el-button
                 type="warning"
                 plain
@@ -100,27 +65,22 @@
           </el-row>
   
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <!-- <el-table-column type="selection" width="50" align="center" /> -->
+            <el-table-column label="景点名称" align="center" key="name" prop="name" v-if="columns[0].visible" />
+            <!-- <el-table-column label="归属景区" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" /> -->
+            <el-table-column label="开/闭园时间" align="center" key="openDate" prop="openDate" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="开放状态" align="center" key="status" v-if="columns[2].visible">
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
+                  active-color="#13ce66"
+                  inactive-color="#ccc"
+                  :active-value="2"
+                  :inactive-value="1"
                 ></el-switch>
               </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column label="景点产品" align="center" key="goodId" prop="goodId" v-if="columns[3].visible" width="120" />
             <el-table-column
               label="操作"
               align="center"
@@ -129,6 +89,7 @@
             >
               <template slot-scope="scope" v-if="scope.row.id !== 1">
                 <el-button
+                  v-if="false"
                   size="mini"
                   type="text"
                   icon="el-icon-document"
@@ -164,7 +125,7 @@
       </el-row>
   
       <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
+      <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
       <!--  新增或修改  -->
       <addAndEdit ref="addAndEdit" @refresh="getList" />
       <!--  详情  -->
@@ -175,13 +136,13 @@
   <script>
   import { 
     listTableApi, 
-    delTableApi, 
+    delTableParamsApi, 
     } from "@/api/CURD";
   import addAndEdit from "./formBox/navigationManagementForm.vue"
   import detailsBox from "./detailsBox/navigationManagementDetails.vue"
   export default {
     name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
+    dicts: [],
     components: {addAndEdit,detailsBox},
     data() {
       return {
@@ -195,11 +156,11 @@
           export: ['system:user:export'],// 导出权限
         },
         configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
+          list: '/merchant/merchantPoints/pageList', // 列表地址
+          delect: '/merchant/merchantPoints/deleteById', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
         },
         // 遮罩层
         loading: true,
@@ -223,13 +184,11 @@
         dateRange: [],
         // 控制列表是否显示
         columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
+          { key: 0, label: `景点名称`, visible: true },
+          // { key: 1, label: `归属景区`, visible: true },
+          { key: 2, label: `开/闭园时间`, visible: true },
+          { key: 3, label: `开放状态`, visible: true },
+          { key: 4, label: `景点产品`, visible: true },
         ],
       };
     },
@@ -264,6 +223,10 @@
       /** 重置按钮操作 */
       resetQuery() {
         this.dateRange = [];
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+        }
         this.handleQuery();
       },
       // 多选框选中数据
@@ -275,7 +238,7 @@
       /** 新增按钮操作 */
       handleAdd() {
         if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
+          this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
         }
       },
       /** 修改按钮操作 */
@@ -292,12 +255,16 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
+        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            id: ids
+          });
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
       },
       /** 导出按钮操作 */
       handleExport() {

src/views/tourism/scenicAreaManagement/contentManagement/carouselAdvertis.vue

@@ -1,325 +1,310 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <el-col :span="24" :xs="24">
-          <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.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <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.name"
+              placeholder="请输入标题名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="onlineStatus">
+            <el-select v-model="queryParams.onlineStatus" clearable placeholder="请选择状态">
+              <el-option
+                v-for="dict in dict.type.tourism_online_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="configPermi.add"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="configPermi.delect"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="configPermi.upload"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="configPermi.export"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+          <el-table-column type="index" label="序号" align="center"  />
+          <el-table-column label="标题名称" align="center" key="name" prop="name" v-if="columns[0].visible" />
+          <el-table-column label="banner图片" align="center" key="sliderImg" v-if="columns[1].visible">
+            <template slot-scope="scope">
+              <el-image 
+              v-if="scope.row.sliderImg"
+                style="width: 100px; height: 100px"
+                :src="scope.row.sliderImg" 
+                :preview-src-list="[scope.row.sliderImg]">
+              </el-image>
+              <span v-else>暂无图片</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="类型" align="center" key="type" v-if="columns[2].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tourism_online_type" :value="scope.row.type"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" key="onlineStatus" v-if="columns[3].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tourism_online_status" :value="scope.row.onlineStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[4].visible" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
+                v-if="false"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-document"
+                @click="handleDetails(scope.row)"
+                v-hasPermi="configPermi.details"
+              >详情</el-button>
               <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="configPermi.delect"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="info"
-                plain
-                icon="el-icon-upload2"
                 size="mini"
-                @click="handleImport"
-                v-hasPermi="configPermi.upload"
-              >导入</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
                 size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-          </el-row>
-  
-          <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "导览管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="configPermi.delect"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!--  导入  -->
+    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+    <!--  详情  -->
+    <detailsBox ref="detailsBox" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi, 
+  } from "@/api/CURD";
+import addAndEdit from "./formBox/carouselAdvertisForm.vue"
+import detailsBox from "./detailsBox/navigationManagementDetails.vue"
+export default {
+  name: "User",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {addAndEdit,detailsBox},
+  data() {
+    return {
+      title: "轮播广告",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/advList/pageList', // 列表地址
+        delect: '/merchant/advList/deleteById', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `标题名称`, visible: true },
+        // { key: 1, label: `归属景区`, visible: true },
+        { key: 2, label: `banner图片`, visible: true },
+        { key: 3, label: `类型`, visible: true },
+        { key: 4, label: `状态`, visible: true },
+        { key: 4, label: `创建时间`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          this.queryParams, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

src/views/tourism/scenicAreaManagement/contentManagement/detailsBox/attractionInfoDetails copy 2.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/contentManagement/detailsBox/attractionInfoDetails copy 3.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/contentManagement/eventNotifications.vue

@@ -1,325 +1,308 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <el-col :span="24" :xs="24">
-          <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.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="公告标题" prop="noticeTitle">
+            <el-input
+              v-model="queryParams.noticeTitle"
+              placeholder="请输入公告标题"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="操作人员" prop="createBy">
+            <el-input
+              v-model="queryParams.createBy"
+              placeholder="请输入操作人员"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="公告类型" prop="noticeType">
+            <el-select v-model="queryParams.noticeType" placeholder="请选择公告类型">
+              <el-option
+                v-for="dict in dict.type.tourism_notice_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="configPermi.add"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="configPermi.delect"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="configPermi.upload"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="configPermi.export"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column type="index" label="序号" align="center"  />
+          <el-table-column label="公告标题" align="center" key="noticeTitle" prop="noticeTitle" v-if="columns[0].visible" />
+          <el-table-column label="公告类型" align="center" key="noticeType" prop="noticeType" v-if="columns[1].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tourism_notice_type" :value="scope.row.noticeType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" key="status" v-if="columns[2].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tourism_notice_status" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建者" align="center" key="createBy" prop="createBy" v-if="columns[3].visible" width="120" />
+          <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" v-if="columns[4].visible" width="120" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
+                v-if="false"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-document"
+                @click="handleDetails(scope.row)"
+                v-hasPermi="configPermi.details"
+              >详情</el-button>
               <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="configPermi.delect"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="info"
-                plain
-                icon="el-icon-upload2"
                 size="mini"
-                @click="handleImport"
-                v-hasPermi="configPermi.upload"
-              >导入</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
                 size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-          </el-row>
-  
-          <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "导览管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="configPermi.delect"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!--  导入  -->
+    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+    <!--  详情  -->
+    <detailsBox ref="detailsBox" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableApi, 
+  } from "@/api/CURD";
+import addAndEdit from "./formBox/eventNotificationsForm.vue"
+import detailsBox from "./detailsBox/navigationManagementDetails.vue"
+export default {
+  name: "User",
+  dicts: ['tourism_notice_type','tourism_notice_status'],
+  components: {addAndEdit,detailsBox},
+  data() {
+    return {
+      title: "活动通知",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/notice/pageList', // 列表地址
+        delect: '/merchant/notice/', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `公告标题`, visible: true },
+        // { key: 1, label: `归属景区`, visible: true },
+        { key: 2, label: `公告类型`, visible: true },
+        { key: 3, label: `状态`, visible: true },
+        { key: 4, label: `创建者`, visible: true },
+        { key: 5, label: `创建时间`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          this.queryParams, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+        return delTableApi(this.configUrl.delect,ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

src/views/tourism/scenicAreaManagement/contentManagement/formBox/carouselAdvertisForm.vue

@@ -0,0 +1,453 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    element-loading-text="拼命加载数据中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+        <el-form-item label="标题名称" prop="name">
+          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入标题名称" maxlength="200" show-word-limit />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-radio-group v-model="form.type">
+            <el-radio 
+              v-for="dict in dict.type.tourism_online_type"
+              :label="Number(dict.value)"
+              >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="banner图片" prop="sliderImg">
+
+          <div
+          style="width: 120px;"
+          v-loading="actionUrlLoading"
+          element-loading-text="上传中..."
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+          >
+            <el-upload
+              class="avatar-uploader"
+              :action="actionUrl"
+              :data="{
+                bucket: 'tourism'
+              }"
+              :show-file-list="false"
+              accept=".jpg, .png, jpeg"
+              :on-success="handleAvatarSuccess"
+              :on-progress="handleAvatarProgress"
+              :before-upload="beforeAvatarUpload"
+              :disabled="actionUrlLoading"
+              :on-error="handleAvatarError"
+              >
+              <img v-if="form.sliderImg" style="width: 100px;height: 100px;" :src="form.sliderImg" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+          <span>只能上传.jpg,.png图片</span>
+        </el-form-item>
+        <el-form-item label="banner背景色值" prop="backgroundColor">
+          <el-color-picker v-model="form.backgroundColor"></el-color-picker>
+        </el-form-item>
+        <el-form-item label="内容" prop="detail">
+          <quill-editor
+              v-model="form.detail"
+              ref="myQuillEditor"
+              :options="editorOption"
+              @blur="onEditorBlur($event)"
+              @focus="onEditorFocus($event)"
+              @change="onEditorChange($event)"
+              @ready="onEditorReady($event)">
+          </quill-editor>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import { quillEditor } from 'vue-quill-editor'
+ 
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {quillEditor},
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/advList/insertOrUpdate', // 新增地址
+        details: '/merchant/advList/selectById', // 详情地址
+        edit: '/merchant/advList/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        name: [{ required: true, message: "请输入标题名称", trigger: ["change","blur"] }],
+        type: [{ required: true, message: "请选择类型", trigger: ["change","blur"] }],
+        backgroundColor: [{ required: true, message: "请选择banner背景色值", trigger: ["change","blur"] }],
+        detail: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
+        sliderImg: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          toolbar: [
+            ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+            ['blockquote', 'code-block'], // 引用  代码块
+            [{ header: 1 }, { header: 2 }], // 1、2 级标题
+            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+            [{ indent: '-1' }, { indent: '+1' }], // 缩进
+            [{ direction: 'rtl' }], // 文本方向
+            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            // [{ font: ['songti'] }], // 字体种类
+            [{ align: [] }], // 对齐方式
+            ['clean'], // 清除文本格式
+            ['image', 'video'] // 链接、图片、视频
+          ]
+        },
+        placeholder: '请输入正文'
+      },
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        if(res.code == 200) {
+          let obj = {
+          ...row
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      console.log('editor ready!', quill)
+    },
+    // 内容改变事件
+    onEditorChange({ quill, html, text }) {
+      console.log('editor change!', quill, html, text)
+      this.form.noticeContent = html
+    },
+
+
+    /**  上传图片  */
+    handleAvatarSuccess(res, file) {
+      console.log("res, file",res, file)
+      this.actionUrlLoading = false
+      if(res.code != 200) {
+        this.$set(this.form,'sliderImg',null) 
+      }else {
+        this.$set(this.form,'sliderImg',res.data.url) 
+      }
+      
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/formBox/eventNotificationsForm.vue

@@ -0,0 +1,373 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    element-loading-text="拼命加载数据中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <div class="form-title"><span>基本信息</span></div>
+        <el-form-item label="公告标题" prop="noticeTitle">
+          <el-input style="width: 350px;" v-model="form.noticeTitle" placeholder="请输入公告标题" maxlength="200" show-word-limit />
+        </el-form-item>
+        <el-form-item label="公告类型" prop="noticeType">
+          <el-select style="width: 350px;" v-model="form.noticeType" placeholder="请选择公告类型">
+            <el-option
+              v-for="dict in dict.type.tourism_notice_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio 
+              v-for="dict in dict.type.tourism_notice_status"
+              :label="dict.value"
+              >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="内容" prop="noticeContent">
+          <quill-editor
+              v-model="form.noticeContent"
+              ref="myQuillEditor"
+              :options="editorOption"
+              @blur="onEditorBlur($event)"
+              @focus="onEditorFocus($event)"
+              @change="onEditorChange($event)"
+              @ready="onEditorReady($event)">
+          </quill-editor>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import { quillEditor } from 'vue-quill-editor'
+ 
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+ 
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_notice_type','tourism_notice_status'],
+  components: {
+    quillEditor
+  },
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/notice/insertOrUpdate', // 新增地址
+        details: '/merchant/notice/selectById', // 详情地址
+        edit: '/merchant/notice/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        noticeTitle: [{ required: true, message: "请输入公告标题", trigger: ["change","blur"] }],
+        noticeType: [{ required: true, message: "请选择公告类型", trigger: ["change","blur"] }],
+        status: [{ required: false, message: "请选择状态", trigger: ["change","blur"] }],
+        noticeContent: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          toolbar: [
+            ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+            ['blockquote', 'code-block'], // 引用  代码块
+            [{ header: 1 }, { header: 2 }], // 1、2 级标题
+            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+            [{ indent: '-1' }, { indent: '+1' }], // 缩进
+            [{ direction: 'rtl' }], // 文本方向
+            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            // [{ font: ['songti'] }], // 字体种类
+            [{ align: [] }], // 对齐方式
+            ['clean'], // 清除文本格式
+            ['image', 'video'] // 链接、图片、视频
+          ]
+        },
+        placeholder: '请输入正文'
+      },
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loading = true
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        if(res.code == 200) {
+          let obj = {
+          ...row
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      console.log('editor ready!', quill)
+    },
+    // 内容改变事件
+    onEditorChange({ quill, html, text }) {
+      console.log('editor change!', quill, html, text)
+      this.form.noticeContent = html
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/formBox/navigationManagementForm.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="title"
     :visible.sync="open"
-    width="800px"
+    width="70%"
     append-to-body
     :close-on-click-modal="false"
     @close="cancel"
@@ -13,7 +13,58 @@
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
+        <div class="form-title"><span>基本信息</span></div>
+        <el-form-item label="景区名称" prop="name">
+          <el-input style="width: 350px;" v-model="form.name" placeholder="请输入景区名称" maxlength="20" show-word-limit />
+        </el-form-item>
+        <el-form-item label="开/闭园时间" prop="openDate">
+          <el-time-picker
+            is-range
+            v-model="form.openDate"
+            value-format="HH:mm"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择开/闭园时间范围">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="景点产品" prop="goodId">
+          <el-select v-model="form.goodId" placeholder="请选择景点产品">
+            <el-option
+              v-for="item in scenicAreaProducts"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开放状态" prop="openDate">
+          <el-switch
+            style="display: block"
+            v-model="form.status"
+            active-color="#13ce66"
+            inactive-color="#ccc"
+            active-text="开"
+            inactive-text="关"
+            :active-value="2"
+            :inactive-value="1"
+            >
+          </el-switch>
+        </el-form-item>
+        <div class="form-title"><span>宣推资料</span></div>
+        <el-form-item label="内容详情" prop="content">
+        </el-form-item>
+        <div style="padding-left: 30px;">
+          <quill-editor
+              v-model="form.content"
+              ref="myQuillEditor"
+              :options="editorOption"
+              @blur="onEditorBlur($event)"
+              @focus="onEditorFocus($event)"
+              @change="onEditorChange($event)"
+              @ready="onEditorReady($event)">
+          </quill-editor>
+        </div>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer" v-if="formStatus==1">
@@ -35,13 +86,23 @@
 
 <script>
 import { 
-  getTableDeatilsApi,
+  getTableDeatilsByIdApi,
   updateTableApi,
   addTableApi
  } from '@/api/CURD'
+import { quillEditor } from 'vue-quill-editor'
+ 
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+ 
+
 export default {
   name: "addAndEdit",
   dicts: [],
+  components: {
+    quillEditor
+  },
   data() {
     return {
       title: "",
@@ -50,16 +111,43 @@ export default {
       loading: false,
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/merchantSysuser', // 新增地址
-        details: '/merchant/merchantSysuser/', // 详情地址
-        edit: '/merchant/merchantSysuser', // 编辑地址
+        add: '/merchant/merchantPoints/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantPoints/selectById', // 详情地址
+        edit: '/merchant/merchantPoints/insertOrUpdate', // 编辑地址
       },
       form: {
         id: undefined,
       },
       rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
+        name: [{ required: true, message: "请输入景区名称", trigger: ["change","blur"] }],
+        openDate: [{ required: true, message: "请输入景区名称", trigger: ["change","blur"] }],
+        goodId: [{ required: false, message: "请输入景点产品", trigger: ["change","blur"] }],
+        status: [{ required: true, message: "请输入开放状态", trigger: ["change","blur"] }],
+        content: [{ required: true, message: "请输入开放状态", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          toolbar: [
+            ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+            ['blockquote', 'code-block'], // 引用  代码块
+            [{ header: 1 }, { header: 2 }], // 1、2 级标题
+            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+            [{ indent: '-1' }, { indent: '+1' }], // 缩进
+            [{ direction: 'rtl' }], // 文本方向
+            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            // [{ font: ['songti'] }], // 字体种类
+            [{ align: [] }], // 对齐方式
+            ['clean'], // 清除文本格式
+            ['image', 'video'] // 链接、图片、视频
+          ]
+        },
+        placeholder: '请输入正文'
+      },
     };
   },
   methods: {
@@ -73,7 +161,11 @@ export default {
         this.$set(this,'form',row)
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
-        this.$set(this,'form',row)
+        let obj = {
+          ...row,
+          openDate: row.openDate?row.openDate.join('~') : null
+        }
+        this.$set(this,'form',obj)
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增
         await this.getTableDeatilsFun(row)
@@ -90,9 +182,13 @@ export default {
       const id = row.id
       this.loading = true
       try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
+          let obj = {
+          ...row,
+          openDate: res.data.openDate?res.data.openDate.split('~') : null
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         }else {
           this.$message.error('获取详情失败!!!');
@@ -118,8 +214,11 @@ export default {
         if (valid) {
           this.loading = true
           if (this.model != 'ADD') {
-            updateTableApi(
-              this.configUrl.edit,this.form).then(response => {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form,
+                openDate: this.form.openDate.join('~')
+              }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
               this.open = false;
@@ -129,7 +228,10 @@ export default {
               this.loading = false
             })
           } else {
-            addTableApi(this.configUrl.edit,this.form).then(response => {
+            addTableApi(this.configUrl.edit,{
+                ...this.form,
+                openDate: this.form.openDate.join('~')
+              }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
               this.open = false;
@@ -161,6 +263,23 @@ export default {
       this.reset();
       this.open = false;
     },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      console.log('editor ready!', quill)
+    },
+    // 内容改变事件
+    onEditorChange({ quill, html, text }) {
+      console.log('editor change!', quill, html, text)
+      this.form.content = html
+    },
   },
 };
 </script>
@@ -172,6 +291,23 @@ export default {
   min-height: 50vh;
   max-height: 65vh;
   overflow-y: auto;
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
   .upload-btn {
     width: 100px;
     height: 100px;

src/views/tourism/scenicAreaManagement/contentManagement/formBox/tourismStrategyForm.vue

@@ -0,0 +1,444 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="70%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    element-loading-text="拼命加载数据中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-form :model="form" ref="form" :rules="rules" label-width="130px">
+        <div class="form-title"><span>基本信息</span></div>
+        <el-form-item label="标题名称：" prop="title">
+          <el-input style="width: 350px;" v-model="form.title" placeholder="请输入标题名称" maxlength="50" show-word-limit />
+        </el-form-item>
+        <el-form-item label="封面上传：" prop="imgUrl">
+
+          <div
+          style="width: 120px;"
+          v-loading="actionUrlLoading"
+          element-loading-text="上传中..."
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+          >
+            <el-upload
+              class="avatar-uploader"
+              :action="actionUrl"
+              :data="{
+                bucket: 'tourism'
+              }"
+              :show-file-list="false"
+              accept=".jpg, .png, jpeg"
+              :on-success="handleAvatarSuccess"
+              :on-progress="handleAvatarProgress"
+              :before-upload="beforeAvatarUpload"
+              :disabled="actionUrlLoading"
+              :on-error="handleAvatarError"
+              >
+              <img v-if="form.imgUrl" style="width: 100px;height: 100px;" :src="form.imgUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+          <span>建议上传xxx*xxx,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
+        </el-form-item>
+        <div class="form-title"><span>基本信息</span></div>
+        <el-form-item label-width="70px" label="内容：" prop="detail">
+        </el-form-item>
+        <div>
+          <quill-editor
+              v-model="form.detail"
+              ref="myQuillEditor"
+              :options="editorOption"
+              @blur="onEditorBlur($event)"
+              @focus="onEditorFocus($event)"
+              @change="onEditorChange($event)"
+              @ready="onEditorReady($event)">
+          </quill-editor>
+        </div>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+ } from '@/api/CURD'
+import { quillEditor } from 'vue-quill-editor'
+ 
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['tourism_online_status','tourism_online_type'],
+  components: {quillEditor},
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantIntroduction/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantIntroduction/selectById', // 详情地址
+        edit: '/merchant/merchantIntroduction/insertOrUpdate', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        title: [{ required: true, message: "请输入标题名称", trigger: ["change","blur"] }],
+        detail: [{ required: true, message: "请输入内容", trigger: ["change","blur"] }],
+        imgUrl: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          toolbar: [
+            ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+            ['blockquote', 'code-block'], // 引用  代码块
+            [{ header: 1 }, { header: 2 }], // 1、2 级标题
+            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+            [{ indent: '-1' }, { indent: '+1' }], // 缩进
+            [{ direction: 'rtl' }], // 文本方向
+            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            // [{ font: ['songti'] }], // 字体种类
+            [{ align: [] }], // 对齐方式
+            ['clean'], // 清除文本格式
+            ['image', 'video'] // 链接、图片、视频
+          ]
+        },
+        placeholder: '请输入正文'
+      },
+
+      //  上传文件
+      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
+      actionUrlLoading: false,
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      if(model=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        if(res.code == 200) {
+          let obj = {
+          ...row
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.model != 'ADD') {
+            addTableApi(
+              this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            })
+          } else {
+            addTableApi(this.configUrl.edit,{
+                ...this.form
+              }).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }).catch(()=>{
+              this.$message.error("新增失败!!!");
+              this.loading = false
+            })
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      console.log('editor ready!', quill)
+    },
+    // 内容改变事件
+    onEditorChange({ quill, html, text }) {
+      console.log('editor change!', quill, html, text)
+      this.form.noticeContent = html
+    },
+
+
+    /**  上传图片  */
+    handleAvatarSuccess(res, file) {
+      console.log("res, file",res, file)
+      this.actionUrlLoading = false
+      if(res.code != 200) {
+        this.$set(this.form,'imgUrl',null) 
+      }else {
+        this.$set(this.form,'imgUrl',res.data.url) 
+      }
+      
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/noticeManagement.vue

@@ -292,8 +292,8 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
+        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
+          return delTableApi(this.configUrl.delect,ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");

src/views/tourism/scenicAreaManagement/contentManagement/questions.vue

@@ -292,8 +292,8 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
+        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
+          return delTableApi(this.configUrl.delect,ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");

src/views/tourism/scenicAreaManagement/contentManagement/suggestions.vue

@@ -1,325 +1,214 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <el-col :span="24" :xs="24">
-          <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.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="configPermi.delect"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="info"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleImport"
-                v-hasPermi="configPermi.upload"
-              >导入</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-          </el-row>
-  
-          <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "导览管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户昵称" prop="memberNickName">
+            <el-input
+              v-model="queryParams.memberNickName"
+              placeholder="请输入用户昵称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="类型" prop="type">
+            <el-select v-model="queryParams.type" clearable placeholder="请选择状态">
+              <el-option
+                v-for="dict in dict.type.tourism_online_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+          <el-table-column type="index" label="编号" align="center"  />
+          <el-table-column label="用户昵称" align="center" key="memberNickName" prop="memberNickName" v-if="columns[0].visible" />
+          <el-table-column label="类型" align="center" key="type" prop="type" v-if="columns[1].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tourism_online_status" :value="scope.row.onlineStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="留言内容" align="center" key="content" v-if="columns[2].visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span style="width: 200px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{ scope.row.content }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="留言时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" width="120" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi, 
+  } from "@/api/CURD";
+export default {
+  name: "User",
+  dicts: [],
+  components: {},
+  data() {
+    return {
+      title: "投诉建议",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/memberSuggestion/pageList', // 列表地址
+        delect: '', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `用户昵称`, visible: true },
+        { key: 2, label: `类型`, visible: true },
+        { key: 3, label: `留言内容`, visible: true },
+        { key: 4, label: `留言时间`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          this.queryParams, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

src/views/tourism/scenicAreaManagement/contentManagement/tourismStrategy.vue

@@ -1,325 +1,289 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--用户数据-->
-        <el-col :span="24" :xs="24">
-          <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.name"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="手机号码" prop="mobile">
-              <el-input
-                v-model="queryParams.mobile"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="dateRange"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="标题名称" prop="title">
+            <el-input
+              v-model="queryParams.title"
+              placeholder="请输入标题名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="configPermi.add"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="configPermi.delect"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="configPermi.upload"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5" v-if="false">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="configPermi.export"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+          <el-table-column type="index" label="序号" align="center"  />
+          <el-table-column label="标题名称" align="center" key="title" prop="title" v-if="columns[0].visible" />
+          <el-table-column label="发布时间" align="center" key="releaseTime" prop="releaseTime" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="上/下架状态" align="center" key="status" v-if="columns[2].visible">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-color="#13ce66"
+                inactive-color="#ccc"
+                :active-value="2"
+                :inactive-value="1"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="发布人" align="center" key="releaseBy" prop="releaseBy" v-if="columns[3].visible" width="120" />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.id !== 1">
               <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
+                v-if="false"
                 size="mini"
-                @click="handleAdd"
-                v-hasPermi="configPermi.add"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-document"
+                @click="handleDetails(scope.row)"
+                v-hasPermi="configPermi.details"
+              >详情</el-button>
               <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="configPermi.delect"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="info"
-                plain
-                icon="el-icon-upload2"
                 size="mini"
-                @click="handleImport"
-                v-hasPermi="configPermi.upload"
-              >导入</el-button>
-            </el-col>
-            <el-col :span="1.5">
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="configPermi.edit"
+              >修改</el-button>
               <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
                 size="mini"
-                @click="handleExport"
-                v-hasPermi="configPermi.export"
-              >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-          </el-row>
-  
-          <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-            <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-                ></el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="操作"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope" v-if="scope.row.id !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-document"
-                  @click="handleDetails(scope.row)"
-                  v-hasPermi="configPermi.details"
-                >详情</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="configPermi.delect"
-                >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!--  导入  -->
-      <uploadBox ref="upload" @refresh="handleQuery" />
-      <!--  新增或修改  -->
-      <addAndEdit ref="addAndEdit" @refresh="getList" />
-      <!--  详情  -->
-      <detailsBox ref="detailsBox" @refresh="getList" />
-    </div>
-  </template>
-  
-  <script>
-  import { 
-    listTableApi, 
-    delTableApi, 
-    } from "@/api/CURD";
-  import addAndEdit from "./formBox/navigationManagementForm.vue"
-  import detailsBox from "./detailsBox/navigationManagementDetails.vue"
-  export default {
-    name: "User",
-    dicts: ['sys_normal_disable', 'sys_user_sex'],
-    components: {addAndEdit,detailsBox},
-    data() {
-      return {
-        title: "导览管理",// 通用标题
-        configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-        },
-        configUrl: {
-          list: '/merchant/merchantSysuser/pageList', // 列表地址
-          delect: '/merchant/merchantSysuser/', // 删除地址
-          upload: 'system/user/importTemplate',// 导入地址
-          download:'system/user/importTemplate', // 下载模板地址
-          export: '/system/user/importData',// 导出地址
-        },
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 用户表格数据
-        tableList: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        dateRange: [],
-        // 控制列表是否显示
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询用户列表 */
-      getList() {
-        this.loading = true;
-        listTableApi(
-          this.configUrl.list,
-          this.addDateRange(
-            this.queryParams, 
-            this.dateRange)).then(response => {
-              this.tableList = response.data.rows;
-              this.total = response.data.total;
-              this.loading = false;
-          }
-        ).catch (error=>{
-          console.error('获取列表失败!!!!',error)
-          this.tableList = [];
-          this.total = 0;
-          this.loading = false
-        }) 
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '新增', "EDIT",{})
-        }
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        if(this.$refs.addAndEdit) {
-          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
-        }
-      },
-      handleDetails(row){
-        if(this.$refs.detailsBox) {
-          this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
-        }
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="configPermi.delect"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!--  导入  -->
+    <!-- <uploadBox ref="upload" @refresh="handleQuery" /> -->
+    <!--  新增或修改  -->
+    <addAndEdit ref="addAndEdit" @refresh="getList" />
+    <!--  详情  -->
+    <detailsBox ref="detailsBox" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import { 
+  listTableApi, 
+  delTableParamsApi, 
+  } from "@/api/CURD";
+import addAndEdit from "./formBox/tourismStrategyForm.vue"
+import detailsBox from "./detailsBox/navigationManagementDetails.vue"
+export default {
+  name: "User",
+  dicts: [],
+  components: {addAndEdit,detailsBox},
+  data() {
+    return {
+      title: "景区管理",// 通用标题
+      configPermi: {
+        add: ['system:user:edit'], // 新增权限
+        details: ['system:user:details'], // 详情权限
+        delect: ['system:user:remove'], // 删除权限
+        edit: ['system:user:edit'], // 编辑权限
+        upload: ['system:user:upload'],// 导入权限
+        export: ['system:user:export'],// 导出权限
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      configUrl: {
+        list: '/merchant/merchantIntroduction/pageList', // 列表地址
+        delect: '/merchant/merchantIntroduction/deleteById', // 删除地址
+        upload: '',// 导入地址
+        download:'', // 下载模板地址
+        export: '',// 导出地址
       },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download(this.configUrl.export, {
-          ...this.queryParams
-        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      tableList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      /** 导入按钮操作 */
-      handleImport() {
-        if(this.$refs.upload) {
-          this.$refs.upload.initData({
-            width: '400px',
-            // 弹出层标题（用户导入）
-            title: this.title + "导入",
-            // 下载模板地址
-            importTemplate: this.configUrl.download,
-            // 上传的地址
-            url: this.configUrl.upload
-          })
+      dateRange: [],
+      // 控制列表是否显示
+      columns: [
+        { key: 0, label: `标题名称`, visible: true },
+        { key: 2, label: `发布时间`, visible: true },
+        { key: 3, label: `上/下架状态`, visible: true },
+        { key: 4, label: `发布人`, visible: true },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange(
+          this.queryParams, 
+          this.dateRange)).then(response => {
+            this.tableList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
         }
-      },
-    }
-  };
-  </script>
-  
+      ).catch (error=>{
+        console.error('获取列表失败!!!!',error)
+        this.tableList = [];
+        this.total = 0;
+        this.loading = false
+      }) 
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+      }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      if(this.$refs.addAndEdit) {
+        this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+      }
+    },
+    handleDetails(row){
+      if(this.$refs.detailsBox) {
+        this.$refs.detailsBox.initData(this.title + '详情',"DEATILSInit", row)
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( () => {
+        return delTableParamsApi(this.configUrl.delect,{
+          id: ids
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch((e) => {
+        console.error("删除失败====",e)
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(this.configUrl.export, {
+        ...this.queryParams
+      }, `${this.title }_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      if(this.$refs.upload) {
+        this.$refs.upload.initData({
+          width: '400px',
+          // 弹出层标题（用户导入）
+          title: this.title + "导入",
+          // 下载模板地址
+          importTemplate: this.configUrl.download,
+          // 上传的地址
+          url: this.configUrl.upload
+        })
+      }
+    },
+  }
+};
+</script>

src/views/tourism/scenicAreaManagement/navigationManagement/pointType.vue

@@ -292,8 +292,8 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
+        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
+          return delTableApi(this.configUrl.delect,ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");

src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -292,8 +292,8 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then(function() {
-          return delTableApi(configUrl.delect,ids);
+        this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项？').then( ()=> {
+          return delTableApi(this.configUrl.delect,ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");