From eb05a503ac18e18074f13935b483bbe45bd2b1a1 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 18 Dec 2021 10:29:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=91=E6=B0=91=E8=AE=AE=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppVillagerDiscussion.vue                 |  73 ++++++
 .../AppVillagerDiscussion/components/Add.vue  | 194 ++++++++++++++
 .../components/Detail.vue                     | 241 ++++++++++++++++++
 .../AppVillagerDiscussion/components/List.vue | 162 ++++++++++++
 4 files changed, 670 insertions(+)
 create mode 100644 packages/3.0.0/AppVillagerDiscussion/AppVillagerDiscussion.vue
 create mode 100644 packages/3.0.0/AppVillagerDiscussion/components/Add.vue
 create mode 100644 packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
 create mode 100644 packages/3.0.0/AppVillagerDiscussion/components/List.vue

diff --git a/packages/3.0.0/AppVillagerDiscussion/AppVillagerDiscussion.vue b/packages/3.0.0/AppVillagerDiscussion/AppVillagerDiscussion.vue
new file mode 100644
index 00000000..dc23c121
--- /dev/null
+++ b/packages/3.0.0/AppVillagerDiscussion/AppVillagerDiscussion.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: 'AppVillagerDiscussion',
+    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/AppVillagerDiscussion/components/Add.vue b/packages/3.0.0/AppVillagerDiscussion/components/Add.vue
new file mode 100644
index 00000000..8db93052
--- /dev/null
+++ b/packages/3.0.0/AppVillagerDiscussion/components/Add.vue
@@ -0,0 +1,194 @@
+<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="textarea" :rows="5" 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 always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+            </el-form-item>
+            <el-form-item label="议事截止时间" prop="date" :rules="[{required: true, message: '请选择议事截止时间', trigger: 'change'}]">
+              <el-date-picker
+                v-model="form.date"
+                type="datetime"
+                style="width: 100%;"
+                size="small"
+                placeholder="选择议事截止时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="公示截止时间" prop="time" :rules="[{required: true, message: '请选择公示截止时间', trigger: 'change'}]">
+              <el-date-picker
+                v-model="form.time"
+                size="small"
+                style="width: 100%;"
+                type="datetime"
+                placeholder="选择公示截止时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="议事类型" prop="type" :rules="[{required: true, message: '请选择议事类型', trigger: 'change'}]">
+              <el-radio-group v-model="form.type">
+                <el-radio label="0">意见征集</el-radio>
+                <el-radio label="1">投票表决</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item class="vite-form__item" style="width: 100%;" label="投票选项" prop="type" :rules="[{required: true, message: '请添加投票选项', trigger: 'change'}]">
+              <el-form-item label-width="80px" :label="'选项' + index" v-for="(item, index) in form.voteList" :key="index + item.name">
+                <div class="form-flex">
+                  <el-input v-model="item.name" size="small" clearable placeholder="请输入选项"></el-input>
+                  <el-button type="danger" size="small" @click="removeVote(index)">删除</el-button>
+                </div>
+              </el-form-item>
+              <el-button type="primary" size="small" @click="addVote">添加选项</el-button>
+            </el-form-item>
+            <el-form-item label="是否匿名投票" prop="anonymity" :rules="[{required: true, message: '请选择是否匿名投票', trigger: 'change'}]">
+              <el-switch
+                v-model="form.anonymity"
+                active-value="1"
+                inactive-value="0">
+            </el-switch>
+            </el-form-item>
+            <el-form-item label="投票方式" prop="type" :rules="[{required: true, message: '请选择投票方式', trigger: 'change'}]">
+              <el-radio-group v-model="form.type">
+                <el-radio label="0">单选</el-radio>
+                <el-radio label="1">多选</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="图片" style="width: 100%;" prop="thumbUrl">
+              <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.thumbUrl"
+                :limit="9">
+              </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
+    },
+
+    data () {
+      return {
+        info: {},
+        form: {
+          title: '',
+          content: '',
+          areaId: '',
+          date: '',
+          type: '',
+          voteList: [],
+          time: '',
+          anonymity: '1',
+          createUnitName: '',
+          createUserName: '',
+          status: '',
+          thumbUrl: []
+        },
+        id: ''
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      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/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+          }
+        })
+      },
+
+      addVote () {
+        this.form.voteList.push({
+          name: ''
+        })
+      },
+
+      removeVote (index) {
+        this.form.voteList.splice(index, 1)
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+              ...this.form,
+              type: 0,
+              createUserName: this.user.info.name,
+              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+                url: this.form.thumbUrl[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">
+    .vite-form__item {
+      .form-flex {
+        display: flex;
+        align-items: center;
+
+        .el-button {
+          margin-left: 20px;
+        }
+
+        ::v-deep .el-form-item__content {
+          margin-left: 0!important;
+        }
+      }
+    }
+</style>
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue b/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
new file mode 100644
index 00000000..7f1fe389
--- /dev/null
+++ b/packages/3.0.0/AppVillagerDiscussion/components/Detail.vue
@@ -0,0 +1,241 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <ai-card title="议题信息" v-show="currIndex === 0">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="主题" value="主题"></ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+      <ai-card title="意见征集" v-if="false" v-show="currIndex === 1">
+        <template #right>
+          <el-button type="primary" size="small" @click="isShowAdd = true">发表意见</el-button>
+        </template>
+        <template #content>
+          <ai-table
+            class="detail-table__table"
+            :border="true"
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            :stripe="false"
+            @getList="getList">
+          </ai-table>
+        </template>
+      </ai-card>
+      <ai-card title="投票统计" v-show="currIndex === 1">
+        <template #content>
+          <div id="chart"></div>
+          <ai-table
+            class="detail-table__table"
+            :border="true"
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            :stripe="false"
+            @getList="getList">
+          </ai-table>
+        </template>
+      </ai-card>
+      <ai-dialog
+        :visible.sync="isShowAdd"
+        width="680px"
+        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="name" style="width: 100%;" :rules="[{ required: true, message: '请发表你的观点和意见', trigger: 'blur' }]">
+            <el-input size="small" type="textarea" :rows="5" placeholder="请发表你的观点和意见" v-model="form.name"></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        id: '',
+        search: {
+          current: 1,
+          size: 10
+        },
+        isShowAdd: false,
+        form: {
+          name: ''
+        },
+        total: 0,
+        currIndex: 0,
+        tableData: [],
+        colConfigs: [
+          {slot: 'userinfo'},
+          {prop: 'addWay', label: '客户来源', align: 'center', formart: v => this.dict.getLabel('wxCustomerAddWay', v)},
+          {prop: 'createTime', label: '添加时间', align: 'center'}
+        ],
+        tabList: ['议题信息', '意见征集']
+      }
+    },
+
+    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
+          }
+        })
+      },
+
+      initChart(data) {
+        const y = data.map(v => this.$dict.getLabel('fpRiskType', v.risk_type) || '其他')
+        const v = data.map(v => v.c)
+        const option = {
+          tooltip: {},
+          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+          grid: {
+            top: '4%',
+            left: '4%',
+            right: '6%',
+            bottom: '0%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'value',
+            splitLine: {
+              show: true,
+              lineStyle: {
+                width: 1,
+                type: 'solid',
+                color: '#f5f5f5'
+              }
+            },
+            axisTick: {
+              length: 1,
+              show: true
+            },
+            axisLabel: {
+              align: 'center',
+              padding: [2, 0, 0, 0],
+              interval: 0,
+              fontSize: 14,
+              color: '#999'
+            },
+            boundaryGap: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                width: 1,
+                type: 'solid',
+                color: '#aaa'
+              }
+            },
+          },
+          yAxis: {
+            type: 'category',
+            data: y,
+            boundaryGap: true,
+            axisTick: {
+              length: 0,
+              show: false
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: ['#e9e9e9'],
+                width: 1,
+                type: 'solid'
+              }
+            },
+            nameTextStyle: {
+              color: '#999',
+              align: 'left'
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                width: 1,
+                type: 'solid',
+                color: '#aaa'
+              }
+            },
+            axisLabel: {
+              color: '#999'
+            }
+          },
+          series: [
+            {
+              name: '2011',
+              type: 'bar',
+              data: v
+            }
+          ]
+        }
+
+        this.chart.setOption(option)
+      },
+
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appminihomeconfig/addOrUpdate`, {
+              ...this.form
+            }).then(res => {
+              if (res.code === 0) {
+                this.$message.success('添加成功')
+                this.isShowAdd = false
+
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+
+      getList () {
+
+      },
+
+      onClose () {
+
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/packages/3.0.0/AppVillagerDiscussion/components/List.vue b/packages/3.0.0/AppVillagerDiscussion/components/List.vue
new file mode 100644
index 00000000..ebe39e18
--- /dev/null
+++ b/packages/3.0.0/AppVillagerDiscussion/components/List.vue
@@ -0,0 +1,162 @@
+<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="240px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" :title="row.status == 1 ? '取消发布' : '发布'" @click="changeStatus(row)">{{ row.status == 1 ? '取消发布' : '发布' }}</el-button>
+              <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
+    },
+
+    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: 'createUnitName', label: '话事人', align: 'center' },
+          { prop: 'createUserName', label: '观点数量', align: 'center' },
+          { prop: 'createUserName', label: '投票数量', align: 'center' },
+          { prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布' },
+          { prop: 'createDate', 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/appcountrysidetourism/list`, null, {
+          params: {
+            type: 0,
+            ...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?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      toAdd(id) {
+        this.$emit('change', {
+          type: 'Add',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .notice {
+  }
+</style>

From 3188da1ad37e2a65fce33f693738db83990cae0f Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Sat, 18 Dec 2021 11:27:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=AC=E6=9D=91=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppVillageActivity/components/Add.vue     | 56 +++++++++----------
 .../AppVillageActivity/components/Detail.vue  | 53 ++++++++++++------
 .../AppVillageActivity/components/Dynamic.vue | 36 ++----------
 .../AppVillageActivity/components/List.vue    | 31 ++++++----
 .../components/Statistics.vue                 |  1 +
 5 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/packages/3.0.0/AppVillageActivity/components/Add.vue b/packages/3.0.0/AppVillageActivity/components/Add.vue
index f4545e39..1e1536ac 100644
--- a/packages/3.0.0/AppVillageActivity/components/Add.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Add.vue
@@ -9,16 +9,17 @@
         <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-input type="input" size="small" v-model="form.title" clearable placeholder="请输入活动标题..." maxlength="60" 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 always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+              <ai-area-select @fullname="e => form.areaName = e" clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
             </el-form-item>
-            <el-form-item prop="startTime" label="活动开始时间" :rules="[{required: true, message: '活动开始时间', trigger: 'change'}]">
+            <el-form-item prop="beginTime" label="活动开始时间" :rules="[{required: true, message: '活动开始时间', trigger: 'change'}]">
               <el-date-picker
                 style="width: 100%"
-                v-model="form.startTime"
+                v-model="form.beginTime"
                 type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 size="small"
                 placeholder="活动开始时间">
               </el-date-picker>
@@ -29,26 +30,27 @@
                 style="width: 100%"
                 type="datetime"
                 size="small"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="活动开始时间">
               </el-date-picker>
             </el-form-item>
-            <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 label="活动地点" style="width: 100%;" prop="address" :rules="[{required: true, message: '请输入活动地点题', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.address" clearable placeholder="请输入活动地点题" maxlength="30" show-word-limit></el-input>
             </el-form-item>
-            <el-form-item label="联系人" 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 label="联系人" prop="contactPerson" :rules="[{required: true, message: '请输入联系人', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.contactPerson" clearable placeholder="请输入联系人" maxlength="30" show-word-limit></el-input>
             </el-form-item>
-            <el-form-item label="联系电话" 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 label="联系电话" prop="contactPhone" :rules="[{required: true, message: '请输入联系电话', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.contactPhone" clearable placeholder="请输入联系电话" maxlength="30" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="活动介绍" style="width: 100%;" prop="content" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
               <ai-editor v-model="form.content" :instance="instance"/>
             </el-form-item>
-            <el-form-item label="缩略图" style="width: 100%;" prop="thumbUrl">
+            <el-form-item label="缩略图" style="width: 100%;" prop="url">
               <ai-uploader
                 :instance="instance"
                 isShowTip
-                v-model="form.thumbUrl"
+                v-model="form.url"
                 :limit="1">
               </ai-uploader>
             </el-form-item>
@@ -81,16 +83,13 @@
           title: '',
           content: '',
           areaId: '',
-          startTime: '',
+          areaName: '',
+          beginTime: '',
           endTime: '',
-          createUnitName: '',
-          createUserName: '',
-          status: '',
-          thumbUrl: []
-        },
-        cropOps: {
-          width: "336px",
-          height: "210px"
+          address: '',
+          contactPerson: '',
+          contactPhone: '',
+          url: []
         },
         id: ''
       }
@@ -102,7 +101,8 @@
 
     created () {
       this.form.areaId = this.user.info.areaId
-      this.disabledLevel = this.user.info.areaList.length
+      this.form.areaName = this.user.info.areaName
+      this.disabledLevel = this.user.info.areaList.length - 1
       if (this.params && this.params.id) {
         this.id = this.params.id
         this.getInfo(this.params.id)
@@ -111,10 +111,10 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appvillageactivityinfo/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.form = res.data
-            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+            this.form.url = res.data.url ? JSON.parse(res.data.url) : []
           }
         })
       },
@@ -122,12 +122,10 @@
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+            this.instance.post(`/app/appvillageactivityinfo/addOrUpdate`, {
               ...this.form,
-              type: 0,
-              createUserName: this.user.info.name,
-              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
-                url: this.form.thumbUrl[0].url
+              url: this.form.url.length ? JSON.stringify([{
+                url: this.form.url[0].url
               }]) : ''
             }).then(res => {
               if (res.code == 0) {
diff --git a/packages/3.0.0/AppVillageActivity/components/Detail.vue b/packages/3.0.0/AppVillageActivity/components/Detail.vue
index 7f0c632e..5331e18e 100644
--- a/packages/3.0.0/AppVillageActivity/components/Detail.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Detail.vue
@@ -9,13 +9,25 @@
       <ai-card title="基本信息" v-show="currIndex === 0">
         <template #content>
           <ai-wrapper
-            label-width="80px">
-            <ai-info-item label="添加渠道" value="1231313"></ai-info-item>
-            <ai-info-item label="添加渠道" value="1231313"></ai-info-item>
-            <ai-info-item label="添加渠道" value="1231313"></ai-info-item>
-            <ai-info-item label="添加渠道" value="1231313"></ai-info-item>
-            <ai-info-item label="添加渠道" value="1231313"></ai-info-item>
-            <ai-info-item label="添加渠道" value="1231313"></ai-info-item>
+            label-width="120px">
+            <ai-info-item label="活动标题" isLine :value="info.title"></ai-info-item>
+            <ai-info-item label="发布地区" isLine :value="info.areaName"></ai-info-item>
+            <ai-info-item label="活动开始时间" :value="info.beginTime"></ai-info-item>
+            <ai-info-item label="活动结束时间" :value="info.endTime"></ai-info-item>
+            <ai-info-item label="活动地点" isLine :value="info.address"></ai-info-item>
+            <ai-info-item label="联系人" :value="info.contactPerson"></ai-info-item>
+            <ai-info-item label="联系电话" :value="info.contactPhone"></ai-info-item>
+            <ai-info-item label="活动介绍" isLine>
+              <AiArticle :value="info.content"></AiArticle>
+            </ai-info-item>
+            <ai-info-item label="活动介绍">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.url"
+                :limit="1">
+              </ai-uploader>
+            </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
@@ -60,7 +72,7 @@
 
     data () {
       return {
-        total: 11,
+        total: 0,
         info: {},
         id: '',
         search: {
@@ -70,9 +82,9 @@
         currIndex: 0,
         tableData: [],
         colConfigs: [
-          {slot: 'userinfo'},
-          {prop: 'addWay', label: '客户来源', align: 'center', formart: v => this.dict.getLabel('wxCustomerAddWay', v)},
-          {prop: 'createTime', label: '添加时间', align: 'center'}
+          {prop: 'createTime', label: '报名时间', align: 'center'},
+          {prop: 'name', label: '报名人员名称', align: 'center' },
+          {prop: 'phone', label: '联系方式', align: 'center' }
         ],
         tabList: ['基本信息', '报名情况', '活动动态']
       }
@@ -87,18 +99,25 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appvillageactivityinfo/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
-            this.form = res.data
-            this.form.codeUrl = [{
-              url: res.data.codeUrl
-            }]
+            this.info = res.data
+            this.info.url = res.data.url ? JSON.parse(res.data.url) : []
           }
         })
       },
 
       getList () {
-
+        this.instance.post(`/app/appvillageactivityuser/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
       },
 
       cancel (isRefresh) {
diff --git a/packages/3.0.0/AppVillageActivity/components/Dynamic.vue b/packages/3.0.0/AppVillageActivity/components/Dynamic.vue
index e0fbdbc6..e65a518c 100644
--- a/packages/3.0.0/AppVillageActivity/components/Dynamic.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Dynamic.vue
@@ -18,24 +18,7 @@
           <div class="bbs-item__info--content">
             <p>{{ item.content }}</p>
             <ai-uploader v-if="item.images && item.images.length" :instance="instance" :value="item.images" :limit="9" disabled></ai-uploader>
-            <div class="text-button" @click="remove(item.id)">删除动态</div>
-          </div>
-        </div>
-        <div class="bbs-replay">
-          <div class="bbs-replay__item" v-for="(replay, index) in item.replyList" :key="index">
-            <div class="bbs-replay__item--top">
-              <img :src="replay.headPortrait" />
-              <div class="right">
-                <div class="right-user">
-                  <h2>{{ replay.createUserName }}</h2>
-                  <i>回复</i>
-                  <h2>{{ replay.lastReplyName }}</h2>
-                </div>
-                <span>{{ replay.createTime }}</span>
-              </div>
-            </div>
-            <p>{{ replay.content }}</p>
-            <div class="text-button" @click="removeReplay(replay.id)">删除评论</div>
+            <!-- <div class="text-button" @click="remove(item.id)">删除动态</div> -->
           </div>
         </div>
       </div>
@@ -65,9 +48,9 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/apppostinfo/listWitReply?activityId=${id}`).then(res => {
+        this.instance.post(`/app/appvillageactivitypost/list?size=1000&activityId=${id}`).then(res => {
           if (res.code === 0) {
-            this.list = res.data.map(v => {
+            this.list = res.data.records.map(v => {
               return {
                 ...v,
                 images: v.images ? JSON.parse(v.images) : []
@@ -77,20 +60,9 @@
         })
       },
 
-      removeReplay(id) {
-        this.$confirm('确定删除该数据?').then(() => {
-          this.instance.post(`/app/apppostreply/delete?id=${id}`).then((res) => {
-            if (res.code == 0) {
-              this.getInfo(this.id)
-              this.$message.success('删除成功！')
-            }
-          })
-        })
-      },
-
       remove(id) {
         this.$confirm('确定删除该数据?').then(() => {
-          this.instance.post(`/app/apppostinfo/delete?id=${id}`).then((res) => {
+          this.instance.post(`/app/appvillageactivitypost/delete?id=${id}`).then((res) => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()
diff --git a/packages/3.0.0/AppVillageActivity/components/List.vue b/packages/3.0.0/AppVillageActivity/components/List.vue
index 6058d7d5..810e99ec 100644
--- a/packages/3.0.0/AppVillageActivity/components/List.vue
+++ b/packages/3.0.0/AppVillageActivity/components/List.vue
@@ -3,7 +3,7 @@
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template slot="left">
-          <el-button type="primary" icon="iconfont iconAdd" @click="toAdd">发布活动</el-button>
+          <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">发布活动</el-button>
           <ai-select
             v-model="search.isRealName"
             @change="search.current = 1, getList()"
@@ -73,18 +73,29 @@
         ids: [],
         total: 10,
         colConfigs: [
-          { prop: 'realName', label: '真实姓名', align: 'center' },
-          {
-            prop: 'identityNumber', label: '是否实名', align: 'center', 
+          { prop: 'title', label: '活动名称', align: 'left' },
+          { 
+            prop: 'areaName', label: '活动地区', align: 'center' , 
             render: (h, params) => {
               return h('span', {
-              }, params.row.realName ? '是' : '否')
+              }, params.row.areaName  + params.row.address)
+            }
+          },
+          {
+            prop: 'status', label: '活动状态', align: 'center', 
+            render: (h, params) => {
+              return h('span', {
+              }, params.row.status ? '是' : '否')
+            }
+          },
+          { prop: 'realNum', label: '报名人数', align: 'center' },
+          {
+            prop: 'beginTime', width: '300px', label: '活动时间', align: 'center', 
+            render: (h, params) => {
+              return h('span', {
+              }, params.row.beginTime + ' - ' + params.row.endTime)
             }
           },
-          { prop: 'wxUserNames', label: '所属员工', align: 'center' },
-          { slot: 'tags' },
-          { prop: 'createTime', label: '添加时间', align: 'left' },
-          { prop: 'addWay', label: '添加渠道', align: 'center', formart: v => this.dict.getLabel('wxCustomerAddWay', v) },
           { slot: 'options', label: '操作', align: 'center' }
         ],
         tableData: []
@@ -104,7 +115,7 @@
 
     methods: {
       getList() {
-        this.instance.post(`/app/wxcp/wxcustomer/list`, null, {
+        this.instance.post(`/app/appvillageactivityinfo/list`, null, {
           params: {
             ...this.search
           }
diff --git a/packages/3.0.0/AppVillageActivity/components/Statistics.vue b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
index 09268148..03b2f0a5 100644
--- a/packages/3.0.0/AppVillageActivity/components/Statistics.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
@@ -289,6 +289,7 @@
 }
 
   .statistics {
+    padding: 0!important;
     ::v-deep .ai-list__content--right-wrapper {
       background: transparent!important;
       box-shadow: none!important;