From 238f9e5538106d3aac4e06b750982d0915cdfae9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 18 Dec 2021 17:16:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3.0.0/AppContentInfo/AppContentInfo.vue   |  75 +++++++
 .../3.0.0/AppContentInfo/components/Add.vue   | 201 +++++++++++++++++
 .../AppContentInfo/components/Detail.vue      |  64 ++++++
 .../3.0.0/AppContentInfo/components/List.vue  | 149 ++++++++++++
 .../AppContentManage/AppContentManage.vue     |  73 ++++++
 .../3.0.0/AppContentManage/components/Add.vue | 117 ++++++++++
 .../AppContentManage/components/Detail.vue    |  63 ++++++
 .../AppContentManage/components/List.vue      | 212 ++++++++++++++++++
 8 files changed, 954 insertions(+)
 create mode 100644 packages/3.0.0/AppContentInfo/AppContentInfo.vue
 create mode 100644 packages/3.0.0/AppContentInfo/components/Add.vue
 create mode 100644 packages/3.0.0/AppContentInfo/components/Detail.vue
 create mode 100644 packages/3.0.0/AppContentInfo/components/List.vue
 create mode 100644 packages/3.0.0/AppContentManage/AppContentManage.vue
 create mode 100644 packages/3.0.0/AppContentManage/components/Add.vue
 create mode 100644 packages/3.0.0/AppContentManage/components/Detail.vue
 create mode 100644 packages/3.0.0/AppContentManage/components/List.vue

diff --git a/packages/3.0.0/AppContentInfo/AppContentInfo.vue b/packages/3.0.0/AppContentInfo/AppContentInfo.vue
new file mode 100644
index 00000000..4515580e
--- /dev/null
+++ b/packages/3.0.0/AppContentInfo/AppContentInfo.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :moduleId="moduleId" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Add from './components/Add'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppContentInfo',
+    label: '内容发布',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        moduleId: '',
+        include: []
+      }
+    },
+
+    components: {
+      Add,
+      List,
+      Detail
+    },
+
+    mounted () {
+      this.moduleId = this.$route.query.moduleId
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Add') {
+          this.component = 'Add'
+          this.params = data.params
+        }
+
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'list') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/packages/3.0.0/AppContentInfo/components/Add.vue b/packages/3.0.0/AppContentInfo/components/Add.vue
new file mode 100644
index 00000000..1edfc93d
--- /dev/null
+++ b/packages/3.0.0/AppContentInfo/components/Add.vue
@@ -0,0 +1,201 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title :title="params.id ? '编辑内容发布' : '添加内容发布'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
+            <el-form-item label="标题" style="width: 100%;" prop="title" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.title" clearable placeholder="请输入..." maxlength="30" show-word-limit></el-input>
+            </el-form-item>
+            <el-form-item prop="areaId" style="width: 100%;" label="发布地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select clearable @fullname="v => form.areaName = v" always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+            </el-form-item>
+            <el-form-item prop="contentType" label="文章类型" :rules="[{required: true, message: '请选择文章类型', trigger: 'change'}]">
+              <el-select style="width: 100%;" v-model="form.contentType" size="small" placeholder="请选择文章类型">
+                <el-option
+                  v-for="item in contentTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="categoryId" label="分类" :rules="[{required: true, message: '请选择分类', trigger: 'change'}]">
+              <el-select style="width: 100%;" v-model="form.categoryId" size="small" placeholder="请选择分类">
+                <el-option
+                  v-for="item in cateList"
+                  :key="item.id"
+                  :label="item.categoryName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="form.contentType === '0'" label="正文" prop="content" style="width: 100%;" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
+              <ai-editor v-model="form.content" :instance="instance"/>
+            </el-form-item>
+            <el-form-item v-if="form.contentType === '0'" label="图片" prop="files" style="width: 100%;">
+              <ai-uploader
+                :instance="instance"
+                v-model="form.files"
+                fileType="img"
+                acceptType=".jpg,.png,.jpeg"
+                :limit="9">
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item v-if="form.contentType === '1'" label="视频" prop="files" style="width: 100%;">
+              <ai-uploader
+                :instance="instance"
+                v-model="form.files"
+                acceptType=".mp4"
+                fileType="video"
+                :limit="1">
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item label="缩略图" prop="pictureUrl" style="width: 100%;">
+              <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.pictureUrl"
+                :limit="1"
+                :cropOps="cropOps"
+                is-crop>
+                <template slot="tips">
+                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
+                  <p>图片比例：1.6：1</p>
+                </template>
+              </ai-uploader>
+            </el-form-item>
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Add',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object,
+      moduleId: String
+    },
+
+    data () {
+      return {
+        info: {},
+        form: {
+          title: '',
+          content: '',
+          areaId: '',
+          files: [],
+          categoryId: '',
+          contentType: '0',
+          pictureUrl: [],
+          areaName: '',
+          thumbUrl: []
+        },
+        cropOps: {
+          width: "336px",
+          height: "210px"
+        },
+        id: '',
+        contentTypeList: [
+          {
+            name: '文章',
+            value: '0'
+          },
+          {
+            name: '视频',
+            value: '1'
+          }
+        ],
+        cateList: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      this.getCateList()
+      this.form.areaId = this.user.info.areaId
+      this.disabledLevel = this.user.info.areaList.length
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.pictureUrl = res.data.pictureUrl ? [{
+              url: res.data.pictureUrl
+            }] : []
+          }
+        })
+      },
+
+      getCateList () {
+        this.instance.post(`/app/appcontentmodulecategory/list`, null, {
+          params: {
+            ...this.cateSearch,
+            moduleId: this.moduleId,
+            size: 100
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.cateList = res.data.records
+          }
+        })
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appcontentinfo/addOrUpdate`, {
+              ...this.form,
+              moduleId: this.moduleId,
+              createUserName: this.user.info.name,
+              createUserId: this.user.info.id,
+              categoryName: this.cateList.filter(v => v.id === this.form.categoryId)[0].categoryName,
+              pictureUrl: this.form.pictureUrl.length ? this.form.pictureUrl[0].url : ''
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              }
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/3.0.0/AppContentInfo/components/Detail.vue b/packages/3.0.0/AppContentInfo/components/Detail.vue
new file mode 100644
index 00000000..7f32cd7b
--- /dev/null
+++ b/packages/3.0.0/AppContentInfo/components/Detail.vue
@@ -0,0 +1,64 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object,
+      moduleId: String
+    },
+
+    data () {
+      return {
+        info: {},
+        id: ''
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.codeUrl = [{
+              url: res.data.codeUrl
+            }]
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/3.0.0/AppContentInfo/components/List.vue b/packages/3.0.0/AppContentInfo/components/List.vue
new file mode 100644
index 00000000..372ecb12
--- /dev/null
+++ b/packages/3.0.0/AppContentInfo/components/List.vue
@@ -0,0 +1,149 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="内容发布" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            class="search-input"
+            size="small"
+            @keyup.enter.native="search.current = 1, search.title, getList()"
+            placeholder="请输入标题"
+            clearable
+            @clear="search.current = 1, search.title = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="tags" label="标签">
+          <template slot-scope="{ row }">
+            <div class="table-tags">
+              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      moduleId: String
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: ''
+        },
+        currIndex: -1,
+        areaList: [],
+        total: 10,
+        colConfigs: [
+          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
+          { prop: 'areaName', label: '地区', align: 'center' },
+          { prop: 'createUserName', label: '发布人', align: 'center' },
+          { prop: 'createTime', label: '发布时间', align: 'center' },
+          { slot: 'options', label: '操作', align: 'center' }
+        ],
+        areaName: '',
+        unitName: '',
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    mounted() {
+      this.search.areaId = this.user.info.areaId
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appcontentinfo/list`, null, {
+          params: {
+            moduleId: this.moduleId,
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      changeStatus (item) {
+        let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
+        this.$confirm(title, {type: 'warning'}).then(() => {
+          item.status = item.status == '1' ? '0' : '1'
+          this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
+            if (res && res.code == 0) {
+              title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appcountrysidetourism/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toAdd(id) {
+        this.$emit('change', {
+          type: 'Add',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .notice {
+  }
+</style>
diff --git a/packages/3.0.0/AppContentManage/AppContentManage.vue b/packages/3.0.0/AppContentManage/AppContentManage.vue
new file mode 100644
index 00000000..7b4924d5
--- /dev/null
+++ b/packages/3.0.0/AppContentManage/AppContentManage.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Add from './components/Add'
+  import Detail from './components/Detail'
+
+  export default {
+    name: 'AppContentManage',
+    label: '内容管理',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      Add,
+      List,
+      Detail
+    },
+
+    mounted () {
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Add') {
+          this.component = 'Add'
+          this.params = data.params
+        }
+
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.params = data.params
+        }
+
+        if (data.type === 'list') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/packages/3.0.0/AppContentManage/components/Add.vue b/packages/3.0.0/AppContentManage/components/Add.vue
new file mode 100644
index 00000000..73bcddaa
--- /dev/null
+++ b/packages/3.0.0/AppContentManage/components/Add.vue
@@ -0,0 +1,117 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title :title="params.id ? '编辑模块' : '添加模块'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
+            <el-form-item label="模块名称" style="width: 100%;" prop="moduleName" :rules="[{required: true, message: '请输入模块名称', trigger: 'blur'}]">
+              <el-input type="input" style="width: 300px" size="small" v-model="form.moduleName" clearable placeholder="请输入模块名称" maxlength="30" show-word-limit></el-input>
+            </el-form-item>
+            <el-form-item prop="menuId" label="菜单名称" :rules="[{required: true, message: '请选择菜单', trigger: 'change'}]">
+               <el-select size="small" style="width: 300px" v-model="form.menuId" placeholder="请选择菜单">
+                  <el-option
+                    v-for="item in memuList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+            </el-form-item>
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Add',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        form: {
+          moduleName: '',
+          menuId: ''
+        },
+        id: '',
+        memuList: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      this.getMenuList()
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcontentmoduleinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+          }
+        })
+      },
+
+      getMenuList () {
+        this.instance.post(`/admin/menu/menuTree?containPermission=0`).then(res => {
+          if (res.code === 0) {
+            this.memuList = res.data
+          }
+        })
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appcontentmoduleinfo/addOrUpdate`, {
+              ...this.form,
+              menuName: this.memuList.filter(v => v.id === this.form.menuId)[0].name,
+              id: this.params.id || ''
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              }
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/3.0.0/AppContentManage/components/Detail.vue b/packages/3.0.0/AppContentManage/components/Detail.vue
new file mode 100644
index 00000000..c410229d
--- /dev/null
+++ b/packages/3.0.0/AppContentManage/components/Detail.vue
@@ -0,0 +1,63 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        id: ''
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.codeUrl = [{
+              url: res.data.codeUrl
+            }]
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/3.0.0/AppContentManage/components/List.vue b/packages/3.0.0/AppContentManage/components/List.vue
new file mode 100644
index 00000000..20ba8549
--- /dev/null
+++ b/packages/3.0.0/AppContentManage/components/List.vue
@@ -0,0 +1,212 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="内容管理" isShowBottomBorder></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加模块</el-button>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="moduleId = row.menuId, form.moduleId = row.menuId, getCateList(),  isShowAdd = true">分类</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+      <ai-dialog
+        :visible.sync="isShowAdd"
+        width="880px"
+        height="580px"
+        title="文章类型"
+        @close="onClose"
+        @onConfirm="onConfirm">
+        <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
+          <el-form-item label="分类名称" prop="categoryName" style="width: 100%;" :rules="[{ required: true, message: '请输入分类名称', trigger: 'blur' }]">
+            <el-input size="small" placeholder="请输入分类名称" v-model="form.categoryName"></el-input>
+          </el-form-item>
+        </el-form>
+        <ai-table
+          v-if="!id"
+          class="detail-table__table"
+          :border="true"
+          tableSize="small"
+          :total="cateTotal"
+          :tableData="cateList"
+          :col-configs="cateColConfigs"
+          :current.sync="cateSearch.current"
+          :size.sync="cateSearch.size"
+          :stripe="false"
+          @getList="getCateList">
+          <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="id = row.id, form.categoryName = row.categoryName">编辑</el-button>
+                <el-button type="text" @click="removeCate(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </ai-dialog>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: ''
+        },
+        moduleId: '',
+        cateSearch: {
+          current: 1,
+          size: 10
+        },
+        total: 10,
+        cateList: [],
+        colConfigs: [
+          { prop: 'moduleName',  label: '模块名称', align: 'left', width: '200px' },
+          { prop: 'menuName', label: '关联菜单', align: 'center' },
+          { prop: 'createUnitName', label: '文章分类', align: 'center' }
+        ],
+        cateColConfigs: [
+          {prop: 'categoryName', label: '分类名称', align: 'center'}
+        ],
+        form: {
+          categoryName: '',
+          moduleId: '',
+          showIndex: 1
+        },
+        cateTotal: {},
+        isShowAdd: false,
+        id: '',
+        tableData: []
+      }
+    },
+
+    mounted() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appcontentmoduleinfo/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      getCateList () {
+        this.instance.post(`/app/appcontentmodulecategory/list`, null, {
+          params: {
+            ...this.cateSearch,
+            moduleId: this.moduleId
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.cateList = res.data.records
+            this.cateTotal = res.data.total
+          }
+        })
+      },
+
+      removeCate(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appcontentmodulecategory/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getCateList()
+            }
+          })
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appcontentmoduleinfo/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appcontentmodulecategory/addOrUpdate`, {
+              ...this.form,
+              id: this.id || ''
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                if (this.id) {
+                  this.id = ''
+                  this.form.categoryName = ''
+                  this.form.moduleId = ''
+                  this.getCateList()
+
+                  return false
+                }
+                this.getList()
+                this.isShowAdd = false
+              }
+            })
+          }
+        })
+      },
+
+      onClose () {
+        this.id = ''
+        this.moduleId = ''
+        this.form.categoryName = ''
+        this.form.moduleId = ''
+      },
+
+      toAdd(id) {
+        this.$emit('change', {
+          type: 'Add',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .notice {
+  }
+</style>

From a2e9a4831af7ec8f9454b5f45764a17828e0cd31 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 18 Dec 2021 17:41:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=99=92=E5=86=9C=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3.0.0/AppShowProduce/components/List.vue  | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/3.0.0/AppShowProduce/components/List.vue b/packages/3.0.0/AppShowProduce/components/List.vue
index 88e5d3bf..5b6b963b 100644
--- a/packages/3.0.0/AppShowProduce/components/List.vue
+++ b/packages/3.0.0/AppShowProduce/components/List.vue
@@ -4,13 +4,13 @@
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
-          <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button>
+          <ai-select v-model="search.type" clearable @change="search.current = 1, getList()" :selectList="dict.getDict('agriculturalType')"></ai-select>
         </template>
         <template #right>
           <el-input
             v-model="search.title"
             size="small"
-            placeholder="请输入名称或电话"
+            placeholder="请输入名称"
             clearable
             @keyup.enter.native="search.current = 1, getList()"
             @clear="search.current = 1, search.title = '', getList()"
@@ -26,7 +26,6 @@
         style="margin-top: 16px;"
         :current.sync="search.current"
         :size.sync="search.size"
-        @selection-change="v => (ids = v.map((e) => e.id))"
         @getList="getList">
         <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
@@ -55,16 +54,9 @@
           current: 1,
           status: '',
           size: 10,
+          type: '',
           title: ''
         },
-        colConfigs: [
-          { type: 'selection' },
-          { prop: 'name', label: '标题' },
-          { prop: 'status', align: 'center', label: '状态', formart: v => v === '1' ? '已开启' : '未开启' },
-          { prop: 'description', align: 'center', label: '联系电话' },
-          { prop: 'description', align: 'center', label: '发布人' },
-          { prop: 'createTime', align: 'center', label: '创建时间' }
-        ],
         ids: [],
         tableData: [],
         total: 0,
@@ -72,8 +64,22 @@
       }
     },
 
+    computed: {
+      colConfigs () {
+        return [
+          { prop: 'title', label: '标题' },
+          { prop: 'type', align: 'center', label: '类型', formart: v => this.dict.getLabel('agriculturalType', v) },
+          { prop: 'phone', align: 'center', label: '联系电话' },
+          { prop: 'contactPerson', align: 'center', label: '发布人' },
+          { prop: 'createTime', align: 'center', label: '发布时间' }
+        ]
+      }
+    },
+
     created () {
-      this.getList()
+      this.dict.load('agriculturalType').then(() => {
+        this.getList()
+      })
     },
 
     mounted () {
@@ -101,7 +107,7 @@
 
       remove (id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appapplicationinfo/delete?ids=${id}`).then(res => {
+          this.instance.post(`/app/appshowagriculturalproduce/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()

From 91c49e48d7850b3c74fac983619ec89f19db48ab Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 18 Dec 2021 17:42:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=99=92=E5=86=9C=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/3.0.0/AppShowProduce/components/List.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/3.0.0/AppShowProduce/components/List.vue b/packages/3.0.0/AppShowProduce/components/List.vue
index 5b6b963b..3a491ea0 100644
--- a/packages/3.0.0/AppShowProduce/components/List.vue
+++ b/packages/3.0.0/AppShowProduce/components/List.vue
@@ -5,6 +5,7 @@
       <ai-search-bar bottomBorder>
         <template #left>
           <ai-select v-model="search.type" clearable @change="search.current = 1, getList()" :selectList="dict.getDict('agriculturalType')"></ai-select>
+          <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button>
         </template>
         <template #right>
           <el-input
@@ -26,6 +27,7 @@
         style="margin-top: 16px;"
         :current.sync="search.current"
         :size.sync="search.size"
+        @selection-change="v => (ids = v.map((e) => e.id))"
         @getList="getList">
         <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
@@ -67,6 +69,7 @@
     computed: {
       colConfigs () {
         return [
+          { type: 'selection' },
           { prop: 'title', label: '标题' },
           { prop: 'type', align: 'center', label: '类型', formart: v => this.dict.getLabel('agriculturalType', v) },
           { prop: 'phone', align: 'center', label: '联系电话' },

From 63b12899f097b0531b9d8b6922f300df3aade0cd Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 18 Dec 2021 17:50:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A9=9A=E4=B8=A7=E5=AB=81=E5=A8=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppWeddingsFunerals/components/List.vue   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/3.0.0/AppWeddingsFunerals/components/List.vue b/packages/3.0.0/AppWeddingsFunerals/components/List.vue
index be1ac1b9..779e65bf 100644
--- a/packages/3.0.0/AppWeddingsFunerals/components/List.vue
+++ b/packages/3.0.0/AppWeddingsFunerals/components/List.vue
@@ -27,12 +27,12 @@
           </template>
           <template #right>
             <el-input
-              v-model="search.title"
+              v-model="search.name"
               size="small"
-              placeholder="请输入名称或电话"
+              placeholder="请输入姓名"
               clearable
               @keyup.enter.native="search.current = 1, getList()"
-              @clear="search.current = 1, search.title = '', getList()"
+              @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
@@ -73,18 +73,16 @@
       return {
         search: {
           current: 1,
-          status: '',
           size: 10,
-          title: ''
+          name: ''
         },
         info: {},
         colConfigs: [
           { type: 'selection' },
           { prop: 'name', label: '事主姓名' },
-          { prop: 'createUserName', align: 'center', label: '联系电话' },
-          { prop: 'description', align: 'center', label: '类型' },
-          { prop: 'status', align: 'center', label: '状态', formart: v => v === '1' ? '已开启' : '未开启' },
-          { prop: 'description', align: 'center', label: '人员性质' },
+          { prop: 'phone', align: 'center', label: '联系电话' },
+          { prop: 'type', align: 'center', label: '类型', formart: v => this.dict.getLabel('marriageType', v) },
+          { prop: 'personType', align: 'center', label: '人员性质', formart: v => this.dict.getLabel('marriagePersonType', v) },
           { prop: 'createTime', align: 'center', label: '发布时间' }
         ],
         ids: [],
@@ -95,8 +93,9 @@
     },
 
     created () {
-      this.getList()
-      this.getTotalInfo()
+      this.dict.load(['marriageType', 'marriagePersonType']).then(() => {
+        this.getList()
+      })
     },
 
     mounted () {
@@ -120,6 +119,8 @@
         }).catch(() => {
           this.loading = false
         })
+        
+        this.getTotalInfo()
       },
 
       getTotalInfo () {