bug

project/fengdu/app/AppHelp/AppHelp.vue

@@ -10,6 +10,7 @@
   import Detail from './components/Detail'
   import List from './components/List'
   import Add from './components/Add'
+  import GagList from './components/GagList'
 
   export default {
     name: 'AppHelp',
@@ -31,11 +32,16 @@
     components: {
       Add,
       List,
-      Detail
+      Detail,
+      GagList
     },
 
     methods: {
       onChange (data) {
+        if (data.type === 'GagList') {
+          this.component = 'GagList'
+        }
+
         if (data.type === 'Add') {
           this.component = 'Add'
           this.params = data.params

project/fengdu/app/AppHelp/components/GagList.vue

@@ -0,0 +1,111 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="禁言列表" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar>
+        <template #left>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.createUserName"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="请输入用户昵称"
+            clearable
+            @clear="search.current = 1, search.createUserName = '', 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="options" width="100px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="remove(row.id)">解除禁言</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'GagList',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          createUserName: ''
+        },
+        total: 0,
+        colConfigs: [
+          { prop: 'commentCount',  label: '用户昵称', align: 'left' },
+          { prop: 'commentCount',  label: '所属地区', align: 'center' },
+          { prop: 'commentCount',  label: '被禁言时间', align: 'center' }
+        ],
+        tableData: []
+      }
+    },
+
+    created() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appneighborhoodassistance/list`, null, {
+          params: {
+            ...this.search,
+            createUserAreaId: this.search.areaId,
+            beginDate: this.dateList[0] || '',
+            endDate: this.dateList[1] || '',
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      remove (id) {
+        this.$confirm('确定删除该帖子？').then(() => {
+          this.instance.post(`/app/appneighborhoodassistance/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List'
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>

project/fengdu/app/AppHelp/components/List.vue

@@ -2,6 +2,9 @@
   <ai-list class="notice">
     <template slot="title">
       <ai-title title="邻里互助" isShowBottomBorder isShowArea :hideLevel="hideLevel-1" v-model="search.areaId" @change="changeArea">
+        <template #rightBtn>
+          <el-button size="small" type="primary" @click="toGagList">禁言名单</el-button>
+        </template>
       </ai-title>
     </template>
     <template slot="content">
@@ -45,6 +48,7 @@
             <div class="table-options">
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
+              <el-button type="text" @click="gag(row.id)">禁言</el-button>
             </div>
           </template>
         </el-table-column>
@@ -71,7 +75,7 @@
           createUserName: '',
           areaId: ''
         },
-        total: 10,
+        total: 0,
         colConfigs: [
           { prop: 'content',  label: '内容', align: 'left', 'show-overflow-tooltip': true },
           { prop: 'commentCount',  label: '评论数', align: 'center', width: '120' },
@@ -123,6 +127,23 @@
         })
       },
 
+      toGagList () {
+        this.$emit('change', {
+          type: 'GagList'
+        })
+      },
+
+      gag (id) {
+        this.$confirm('确定禁言该用户？').then(() => {
+          this.instance.post(`/app/appneighborhoodassistance/delete?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('禁言成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
       remove (id) {
         this.$confirm('确定删除该帖子？').then(() => {
           this.instance.post(`/app/appneighborhoodassistance/delete?id=${id}`).then(res => {

project/fengdu/app/AppIntegratingPublic/components/Add.vue

@@ -8,9 +8,6 @@
       <ai-card title="基本信息">
         <template #content>
           <el-form class="ai-form" :model="form" label-width="120px" ref="form">
-            <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 label="所属网格" prop="girdId" style="width: 100%;" :rules="[{ required: true, message: '请选择所属网格', trigger: 'change' }]">
               <ai-picker :ops="{label: 'girdName'}" :instance="instance" v-model="form.girdId" @pick="e => onUserChange(e)" dialogTitle="选择所属网格" action="/app/appgirdinfo/girdList">
                 <div class="time-select">
@@ -56,8 +53,6 @@
     data () {
       return {
         form: {
-          areaName: '',
-          areaId: '',
           classOne: '',
           classThree: '',
           classTwo: '',
@@ -69,19 +64,11 @@
       }
     },
 
-    computed: {
-      ...mapState(['user'])
-    },
-
     created () {
       if (this.params && this.params.id) {
         this.id = this.params.id
         this.getInfo(this.params.id)
       }
-
-      this.form.areaId =this.user.info.areaId
-      this.form.areaName =this.user.info.areaName
-      this.disabledLevel = this.user.info.areaList.length
     },
 
     methods: {

project/fengdu/app/AppIntegratingPublic/components/List.vue

@@ -1,7 +1,7 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="积分公式" isShowBottomBorder isShowArea :hideLevel="hideLevel-1" v-model="search.areaId" @change="changeArea">
+      <ai-title title="积分公示" isShowBottomBorder>
       </ai-title>
     </template>
     <template slot="content">
@@ -70,13 +70,11 @@
           current: 1,
           size: 10,
           girdId: [],
-          girdName: '',
-          areaId: ''
+          girdName: ''
         },
         total: 0,
         colConfigs: [
-          { prop: 'areaName',  label: '所属地区', align: 'left', 'show-overflow-tooltip': true },
-          { prop: 'girdName',  label: '所属网格', align: 'center' },
+          { prop: 'girdName',  label: '所属网格', align: 'left' },
           { prop: 'classOne',  label: '一类', align: 'center' },
           { prop: 'classTwo',  label: '二类', align: 'center' },
           { prop: 'classThree',  label: '三类', align: 'center' },
@@ -86,16 +84,8 @@
         tableData: []
       }
     },
-    computed: {
-      ...mapState(['user']),
 
-      hideLevel() {
-        return this.user.info.areaList?.length || 0
-      },
-    },
-
-    created() {
-      this.search.areaId = this.user.info.areaId
+    created () {
       this.getList()
     },
 
@@ -124,14 +114,6 @@
         })
       },
 
-      changeArea () {
-        this.search.current = 1
-
-        this.$nextTick(() => {
-          this.getList()
-        })
-      },
-
       remove (id) {
         this.$confirm('确定删除该数据？').then(() => {
           this.instance.post(`/app/appintegralpublicityinfo/delete?ids=${id}`).then(res => {