信息发布

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 景区一码游管理系统(测试)
+VUE_APP_TITLE = 景区一码游管理系统(开发)
 
 # 开发环境配置
 ENV = 'development'
@@ -9,3 +9,6 @@ VUE_APP_BASE_API = '/tourismadmin-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 开发环境文件上传
+VUE_APP_UPLOAD_FILE_API = 'https://fileupload.hw.hongweisoft.com'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 景区一码游管理系统
+VUE_APP_TITLE = 景区一码游管理系统(测试)
 
 NODE_ENV = production
 
@@ -8,3 +8,6 @@ ENV = 'staging'
 
 # 景区营销管理系统/测试环境
 VUE_APP_BASE_API = '/tourismadmin-api'
+
+# 开发环境文件上传
+VUE_APP_UPLOAD_FILE_API = 'https://fileupload.hw.hongweisoft.com'

src/api/information.js

@@ -0,0 +1,56 @@
+/**
+ * @Description: 
+ * @Author: gcz
+ * @Date: 2024-03-20 09:27:41
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-20 14:11:34
+ * @FilePath: \tourism_admin_ui\src\api\information.js
+ * @Copyright: Copyright (c) 2016~2024 by gcz, All Rights Reserved. 
+ */
+import request from '@/utils/request'
+
+// 表单列表
+export const pageList = (query) => {
+  return request({
+    url: '/system/sysInformation/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增/修改
+export const insertOrUpdate = (data) => {
+    return request({
+      url: '/system/sysInformation/insertOrUpdate',
+      method: 'post',
+      data: data
+    })
+  }
+
+
+// 删除
+export const deleteById = (id) => {
+  return request({
+    url: '/system/sysInformation/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}
+
+// 启用禁用
+export const ionline = (data) => {
+    return request({
+      url: '/system/sysInformation/online',
+      method: 'post',
+      data: data
+    })
+  }
+
+  // 重置密码
+export const gotoTop = (data) => {
+    return request({
+      url: '/system/sysInformation/gotoTop',
+      method: 'post',
+      data: data
+    })
+  }

src/components/Editor/index.vue

@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken()
       },

src/components/FileUpload/index.vue

@@ -73,7 +73,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio", // 上传文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/components/ImageUpload/index.vue

@@ -77,7 +77,7 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/information/informationMr/dialog/addAndEdit.vue

@@ -0,0 +1,307 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-20 14:47:26
+ * @FilePath: \tourism_admin_ui\src\views\information\informationMr\dialog\addAndEdit.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="标题" prop="title">
+          <el-input
+            v-model="form.title"
+            placeholder="标题"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="有效时间" required >
+          <el-date-picker
+            style="width: 350px;"
+            v-model="validTtime"
+            @change="validTtimeChange"
+            type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input
+            type="number"
+            v-model="form.sort"
+            placeholder="排序"
+            @change="changePriceAmount('peopleNum')"
+            clearable
+            style="width: 240px;margin-right: 10px"
+          />
+        </el-form-item>
+        <el-form-item label="封面图" prop="mainImg">
+          <el-upload
+            ref="upload"
+            class="avatar-uploader"
+            :action="uploadObj.url"
+            :headers="uploadObj.headers"
+            :show-file-list="false"
+            accept=".jpg,.png"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <div class="avatar" v-if="form.mainImg">
+              <el-image
+                style="width: 100px; height: 100px"
+                :src="form.mainImg"
+                fit="cover"
+              />
+            </div>
+            <div class="upload-btn" v-else>
+              <i class="el-icon-plus"></i>
+              <div class="upload-btn-text">上传照片</div>
+            </div>
+            <div class="el-upload__tip" slot="tip">只能上传.jpg或.png格式</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="内容简介" prop="infoSnapshot">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.infoSnapshot"
+            placeholder="内容简介"
+            clearable
+            show-word-limit
+            maxlength="34"
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="文章内容：" prop="centent">
+          <editor ref="editor" v-model="form.centent" :fileSize="20" :min-height="200" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+// import { updateNoticeMgr } from "@/api/system/noticeMgr";
+import { insertOrUpdate } from "@/api/information";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      activeName: '01',
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+        type: "",
+        content: "",
+      },
+      rules: {
+        title: [{ required: true, message: "请输入标题", trigger: ["change","blur"] }],
+        mainImg: [{ required: true, message: "请上传封面", trigger: ["change","blur"] }],
+        infoSnapshot: [{ required: true, message: "请输入内容简介", trigger: ["change","blur"] }],
+        centent: [
+          { required: true, message: "请输入内容详情", trigger: ["change","blur"] },
+        ],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+      validTtime:[],
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.reset();
+      if (obj){
+        this.title = "编辑信息";
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'title', obj.title);
+          this.$set(this.form, 'sort', obj.sort);
+          this.$set(this.form, 'mainImg', obj.mainImg);
+          this.$set(this.form, 'infoSnapshot', obj.infoSnapshot);
+          this.$set(this.form, 'centent', obj.centent);
+          this.$set(this, 'validTtime', [obj.validityTimeStart,obj.validityTimeEnd]);
+          
+        });
+      }else{
+        this.title = "添加信息";
+        this.$nextTick(() => {
+          this.$set(this, 'validTtime', []);
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    changePriceAmount(key) {
+      if(this.form[key] * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.form, key, '');
+        return false
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      if(!this.validTtime[0] || !this.validTtime[1]){
+        this.$message.error("请选择有效时间!");
+        return
+      }
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            const { code } = await insertOrUpdate({ ...this.form });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'title', '');
+      this.$set(this.form, 'sort', '');
+      this.$set(this.form, 'mainImg', '');
+      this.$set(this.form, 'centent', '');
+      this.$set(this.form, 'infoSnapshot', '');
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**
+     * 上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handleAvatarSuccess(res) {
+      if (res.code === 200) {
+        // this.form.mainImg = res?.data?.url;
+        this.$set(this.form, 'mainImg', res?.data?.url)
+      }
+    },
+    /**
+     * 上传文件之前之前
+     * @date 2023-11-22
+     * @param {any} file
+     * @returns {any}
+     */
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg" || "image/png";
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是jpg或png格式!");
+      }
+      return isJPG;
+    },
+    setvalidTtime(){
+      if(this.validTtime&&this.validTtime.length==2){
+        this.$set(this.form, 'validityTimeStart',this.validTtime[0]);
+        this.$set(this.form, 'validityTimeEnd',this.validTtime[1]);
+      }else{
+        this.$message.error("请选择有效时间!");
+      }
+      console.log('form',this.form);
+    },
+    validTtimeChange(value) {
+      this.validTtime = value
+      this.setvalidTtime();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .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;
+  }
+}
+</style>

src/views/information/informationMr/index.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" label-width="40px">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          style="width: 140px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建人">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入创建人"
+          clearable
+          style="width: 140px;"
+          @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="['informationMr:informationMr:add']"
+            >添加信息</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="封面图" align="center" prop="type">
+        <template slot-scope="scope">
+          <el-button type="text" @click="seeCenter(scope.row, 'img')">查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="内容" align="center" prop="type">
+        <template slot-scope="scope">
+          <el-button type="text" @click="seeCenter(scope.row, 'html')">查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.status == '1'">发布</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.status == '2'">下架</el-tag>
+          <el-tag type="info" v-else>待发布</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="上线时间" align="center" prop="onlineTime" width="160" />
+      <el-table-column label="有效开始时间" align="center" prop="validityTimeStart" width="160" />
+      <el-table-column label="有效结束时间" align="center" prop="validityTimeEnd" width="160" />
+      <el-table-column label="浏览量" align="center" prop="browseNum" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="ionlineApi(scope.row)"
+            v-hasPermi="['informationMr:informationMr:release']"
+          >{{scope.row.status == '1' ? '取消发布' : '发布'}}</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="toppingApi(scope.row)"-->
+<!--            v-hasPermi="['informationMr:informationMr:release']"-->
+<!--          >{{scope.row.status == '1' ? '取消置顶' : '置顶'}}</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status != '1'"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['informationMr:informationMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status != '1'"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['informationMr:informationMr:delete']"
+          >删除</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"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, ionline } from '@/api/information'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'title', '');
+      this.$set(this.queryParams, 'status', '');
+      this.$set(this.queryParams, 'createBy', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /** 发布或者取消发布按钮操作 */
+    ionlineApi(row) {
+      this.$confirm("是否对标题为" + row.title + "的数据进行" + (row.status == 1 ? '下架？' : '发布？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        ionline({ id: row.id, status: row.status == 1 ? 2 : 1 }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+    /** 置顶或者取消置顶按钮操作 */
+    toppingApi(row) {
+      this.$confirm("是否对标题为" + row.title + "的数据进行" + (row.status == 1 ? '取消置顶？' : '置顶？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // ionline({ id: row.id, status: row.status == 1 ? 2 : 1 }).then((res) => {
+        //   if (res.code == 200) {
+        //     this.$message({
+        //       type: 'success',
+        //       message: '操作成功!'
+        //     });
+        //     this.getList();
+        //   }
+        // });
+      }).catch(() => {});
+    },
+
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除数据标题为"' + row.title + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

src/views/merchant/merchantMr.vue

@@ -3,7 +3,7 @@
  * @Author: gcz
  * @Date: 2024-03-20 09:10:27
  * @LastEditors: gcz
- * @LastEditTime: 2024-03-20 10:58:17
+ * @LastEditTime: 2024-03-20 17:18:36
  * @FilePath: \tourism_admin_ui\src\views\merchant\merchantMr.vue
  * @Copyright: Copyright (c) 2016~2024 by gcz, All Rights Reserved. 
 -->
@@ -133,7 +133,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-loading.fullscreen.lock="loading" element-loading-text="提交中..."
+        <el-button type="primary" @click="submitForm" v-loading.fullscreen.lock="loading" element-loading-text="请稍等..."
           element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
           <span v-if="loading">提交中...</span>
           <span v-else>保存</span>
@@ -265,12 +265,15 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       const id = row.id || this.ids
       getSelectById(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改商家";
+      }).finally(()=>{
+        this.loading = false
       });
     },
     /** 提交按钮 */