From fbf2ac5d12f9c83266699f08dec6119ce4cfaf06 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 19 May 2023 09:07:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=82=BB=E9=87=8C=E4=BA=92=E5=8A=A9?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E4=B8=BA=E6=A0=87=E5=87=86=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppHelp/AppHelp.vue            |  76 +++++
 packages/conv/AppHelp/components/Add.vue     | 177 +++++++++++
 packages/conv/AppHelp/components/Detail.vue  | 294 +++++++++++++++++++
 packages/conv/AppHelp/components/GagList.vue | 109 +++++++
 packages/conv/AppHelp/components/List.vue    | 181 ++++++++++++
 5 files changed, 837 insertions(+)
 create mode 100644 packages/conv/AppHelp/AppHelp.vue
 create mode 100644 packages/conv/AppHelp/components/Add.vue
 create mode 100644 packages/conv/AppHelp/components/Detail.vue
 create mode 100644 packages/conv/AppHelp/components/GagList.vue
 create mode 100644 packages/conv/AppHelp/components/List.vue

diff --git a/packages/conv/AppHelp/AppHelp.vue b/packages/conv/AppHelp/AppHelp.vue
new file mode 100644
index 00000000..7a70e60c
--- /dev/null
+++ b/packages/conv/AppHelp/AppHelp.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="AppHelp">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import Detail from './components/Detail'
+  import List from './components/List'
+  import Add from './components/Add'
+  import GagList from './components/GagList'
+
+  export default {
+    name: 'AppHelp',
+    label: '邻里互助',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        include: []
+      }
+    },
+
+    components: {
+      Add,
+      List,
+      Detail,
+      GagList
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'GagList') {
+          this.component = 'GagList'
+        }
+
+        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">
+  .AppHelp {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/packages/conv/AppHelp/components/Add.vue b/packages/conv/AppHelp/components/Add.vue
new file mode 100644
index 00000000..fb6f39f1
--- /dev/null
+++ b/packages/conv/AppHelp/components/Add.vue
@@ -0,0 +1,177 @@
+<template>
+  <ai-detail class="content-add">
+    <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="发布单位" prop="publishDepartName" style="width: 100%;" :rules="[{ required: true, message: '请选择单位', trigger: 'change' }]">
+              <ai-picker :instance="instance" multiple @pick="e => onUserChange(e)" dialogTitle="选择部门" action="/app/wxcp/wxdepartment/departList">
+                <div class="time-select">
+                  <span class="dept-name" style="color:#999;" v-if="!form.publishDepartName">选择部门</span>
+                  <span class="dept-name" v-else>{{form.publishDepartName}}</span>
+                  <i class="el-icon-arrow-down"></i>
+                </div>
+              </ai-picker>
+            </el-form-item>
+            <el-form-item prop="visibleAreaId" style="width: 100%;" label="发布地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select clearable @fullname="v => form.visibleAreaName = v" always-show :instance="instance" v-model="form.visibleAreaId" :disabled-level="disabledLevel"></ai-area-select>
+            </el-form-item>
+            <el-form-item label="发布内容" prop="content" style="width: 100%;" :rules="[{required: true, message: '请输入发布内容', trigger: 'change'}]">
+              <!-- <ai-editor v-model="form.content" :instance="instance"/> -->
+              <el-input type="textarea" placeholder="请输入内容" v-model="form.content" rows="8" maxlength="500" :show-word-limit="true"></el-input>
+            </el-form-item>
+            <el-form-item label="图片" prop="files" style="width: 100%;">
+              <ai-uploader
+                :instance="instance"
+                v-model="form.files"
+                isShowTip
+                :limit="9">
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item prop="themeId" style="width: 100%;" label="关联话题">
+              <ai-select v-model="form.themeId" :selectList="talkList" placeholder="请选择关联话题" />
+            </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: {
+          themeId: '',
+          content: '',
+          areaId: '',
+          visibleAreaName: '',
+          files: [],
+          areaName: '',
+          publishDepartName: '',
+          publishDepartIdList: [],
+        },
+        id: '',
+        department: [],
+        talkList: [],
+        isFlag: false
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+      this.form.visibleAreaId =this.user.info.areaId
+      this.form.visibleAreaName =this.user.info.areaName
+      this.disabledLevel = this.user.info.areaList.length
+      this.getTalkList()
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.publishDepartIdList = this.form.publishDepartId.split(',')
+          }
+        })
+      },
+
+      confirm () {
+        if(this.isFlag) return
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.isFlag = true
+            this.instance.post(`/app/appneighborhoodassistance/addOrUpdate`, {
+              ...this.form,
+              publishDepartId: this.form.publishDepartIdList.join(',')
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              }
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: !!isRefresh
+        })
+      },
+
+      onChange (e) {
+        if (e.length) {
+          this.form.publishDepartIdList = e.map(v => v.id)
+          this.form.publishDepartName = e.map(v => v.name).join(',')
+        } else {
+          this.form.publishDepartIdList = ''
+          this.form.publishDepartName = ''
+        }
+      },
+
+      onUserChange (e) {
+        this.deptList = e
+        this.onChange(e)
+      },
+
+      getTalkList() {
+        this.instance.post(`/app/appneighborhoodassistancetheme/list?size=100`).then(res => {
+          if (res.code == 0) {
+            this.talkList = []
+            res.data.records.map((item) => {
+              this.talkList.push({
+                dictName: item.title,
+                dictValue: item.id
+              })
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .time-select {
+    padding: 0 16px;
+    height: 36px;
+    line-height: 36px;
+    border: 1px solid #d0d4dc;
+    border-radius: 4px;
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+    .el-icon-arrow-down {
+      line-height: 36px;
+    }
+  }
+</style>
diff --git a/packages/conv/AppHelp/components/Detail.vue b/packages/conv/AppHelp/components/Detail.vue
new file mode 100644
index 00000000..dc485f13
--- /dev/null
+++ b/packages/conv/AppHelp/components/Detail.vue
@@ -0,0 +1,294 @@
+<template>
+  <ai-detail class="detail">
+    <template slot="title">
+      <ai-title title="帖子详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="帖子信息">
+        <template #content>
+          <div class="talk-info">
+            <div class="user">
+              <img :src="info.createUserAvatar" alt="">
+              <div class="info">
+                <h2>{{info.createUserName}}</h2>
+                <div class="time-flex">
+                  <span class="area-name">{{info.publishDepartName}}</span>
+                  <span>{{info.createTime}}</span>
+                </div>
+              </div>
+            </div>
+            <div class="content">
+              <span v-if="info.themeId">#【{{info.themeInfo.title}}】</span>{{info.content}}
+            </div>
+            <ai-uploader :instance="instance" disabled v-model="info.files">
+            </ai-uploader>
+          </div>
+        </template>
+      </ai-card>
+      <ai-card title="评论信息">
+        <template #content>
+          <div class="comment-list" v-if="commontList.length">
+            <div class="title">评论</div>
+            <div class="item" v-for="(item, index) in commontList" :key="index">
+              <div class="user">
+                <img :src="item.createUserAvatar" alt="">
+                <div class="info-flex">
+                  <h2>{{item.createUserName}}</h2>
+                  <span>{{item.createTime}}</span>
+                </div>
+              </div>
+              <div class="content-flex">
+                <p>{{item.content}}</p>
+                <div @click="delCommontOrReply('评论', item.id)">删除</div>
+              </div>
+              <div class="reply-list" v-if="item.replyList && item.replyList.length && item.isShowReply">
+                <div class="reply-item" v-for="(reply, indexs) in item.replyList" :key="indexs">
+                  <div class="reply-user">
+                    <img :src="item.createUserAvatar" alt="">
+                    <div  class="reply-name">
+                      <span>{{reply.createUserName}}</span>回复<span>{{item.createUserName}}</span>
+                    </div>
+                    <span class="reply-time">{{reply.createTime}}</span>
+                  </div>
+                  <div class="content-flex">
+                    <p>{{reply.content}}</p>
+                    <div @click="delCommontOrReply('回复', reply.id)">删除</div>
+                  </div>
+                </div>
+              </div>
+              <div class="reply-more" @click="item.isShowReply = !item.isShowReply" :class="[item.isShowReply ? 'active' : '']">
+                <span class="line"></span>{{item.isShowReply ? '收起' : `展开${item.replyList.length}条回复`}}
+                <i class="el-icon-arrow-down"></i>
+              </div>
+            </div>
+          </div>
+          <ai-empty v-else>暂无评论</ai-empty>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        commontList: [],
+        info: {},
+      }
+    },
+
+    computed: {
+      getAvatar(row){
+        return row.avatar||row.photo||'https://cdn.cunwuyun.cn/dvcp/h5/defaultAvatar.png'
+      }
+    },
+
+    created () {
+      this.getInfo()
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appneighborhoodassistance/commontList?id=${this.params.id}&size=100`).then(res => {
+          if (res.code == 0) {
+            res.data.records.map((item) => {
+              item.isShowReply = false
+            })
+            this.commontList = res.data.records
+          }
+        })
+      },
+
+      getInfo () {
+        this.instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${this.params.id}`).then(res => {
+          if (res.code == 0) {
+            if (res.data) {
+              this.info = res.data
+            }
+          }
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      },
+
+      delCommontOrReply(text, id) {
+        this.$confirm(`确定删除该${text}？`).then(() => {
+          this.instance.post(`/app/appneighborhoodassistance/delComment?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+.detail {
+  .talk-info {
+    .user {
+      display: flex;
+      margin-bottom: 8px;
+      img {
+        width: 60px;
+        height: 60px;
+        margin-right: 16px;
+        border-radius: 50%;
+      }
+      .info {
+        width: calc(100% - 76px);
+        h2 {
+          font-size: 20px;
+          line-height: 30px;
+          font-weight: 400;
+        }
+        .time-flex {
+          display: flex;
+          justify-content: space-between;
+          color: #999;
+          font-size: 14px;
+          line-height: 30px;
+          .area-name {
+            color: #666;
+          }
+        }
+      }
+    }
+    .content {
+      font-size: 16px;
+      line-height: 32px;
+      word-break: break-all;
+      span {
+        color: #26f;
+      }
+    }
+  }
+  .comment-list {
+    .title {
+      color: #333;
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 40px;
+      margin-bottom: 8px;
+    }
+    .item {
+      border-bottom: 1px solid #ddd;
+      padding-bottom: 16px;
+      .user {
+        display: flex;
+        margin-bottom: 8px;
+        img {
+          width: 60px;
+          height: 60px;
+          margin-right: 16px;
+          border-radius: 50%;
+        }
+        .info-flex {
+          width: calc(100% - 76px);
+          display: flex;
+          justify-content: space-between;
+          line-height: 60px;
+          h2 {
+            font-size: 20px;
+            font-weight: 400;
+          }
+          span {
+            color: #999;
+            font-size: 14px;
+          }
+        }
+      }
+      .content-flex {
+        display: flex;
+        font-size: 16px;
+        line-height: 30px;
+        margin-bottom: 8px;
+        padding-left: 76px;
+        p {
+          width: calc(100% - 50px);
+          word-break: break-all;
+        }
+        div {
+          color: #26f;
+          width: 50px;
+          text-align: right;
+          cursor: pointer;
+        }
+      }
+      .reply-list {
+        padding-left: 100px;
+        .reply-item {
+          margin-bottom: 8px;
+          .reply-user {
+            font-size: 14px;
+            img {
+              width: 50px;
+              height: 50px;
+              border-radius: 50%;
+              vertical-align: middle;
+            }
+            .reply-name {
+              display: inline-block;
+              color: #333;
+              width: 300px;
+              span {
+                display: inline-block;
+                color: #666;
+                margin: 0 8px;
+              }
+            }
+            .reply-time {
+              color: #999;
+            }
+          }
+          .content-flex {
+            font-size: 14px;
+            line-height: 24px;
+            padding-left: 58px;
+          }
+        }
+      }
+      .reply-more {
+        font-size: 14px;
+        line-height: 28px;
+        color: #333;
+        .line {
+          display: inline-block;
+          width: 120px;
+          border-top: 1px solid #eee;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+
+        .el-icon-arrow-down {
+          transition: all ease 0.5s;
+          transform: rotate(0);
+          margin-left: 8px;
+        }
+
+        &.active .el-icon-arrow-down {
+          transform: rotate(180deg);
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/packages/conv/AppHelp/components/GagList.vue b/packages/conv/AppHelp/components/GagList.vue
new file mode 100644
index 00000000..5f8d8859
--- /dev/null
+++ b/packages/conv/AppHelp/components/GagList.vue
@@ -0,0 +1,109 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="禁言列表" isShowBack isShowBottomBorder @onBackClick="cancel"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar>
+        <template #left>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.userName"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="请输入用户昵称"
+            clearable
+            @clear="search.current = 1, search.userName = '', 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.userId)">解除禁言</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,
+          userName: ''
+        },
+        total: 0,
+        colConfigs: [
+          { prop: 'userName',  label: '用户昵称', align: 'left' },
+          { prop: 'areaName',  label: '所属地区', align: 'center' },
+          { prop: 'createTime',  label: '被禁言时间', align: 'center' }
+        ],
+        tableData: []
+      }
+    },
+
+    created() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appneighborhoodassistance/blacklist`, null, {
+          params: {
+            ...this.search
+          }
+        }).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/addBlacklist?userId=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('解除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      cancel () {
+        this.$emit('change', {
+          type: 'List',
+          isRefresh: true
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/packages/conv/AppHelp/components/List.vue b/packages/conv/AppHelp/components/List.vue
new file mode 100644
index 00000000..4e1cbdd1
--- /dev/null
+++ b/packages/conv/AppHelp/components/List.vue
@@ -0,0 +1,181 @@
+<template>
+  <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">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">我要发帖</el-button>
+          <el-date-picker
+            v-model="dateList"
+            @change="search.current = 1,getList()"
+            type="daterange"
+            size="small"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </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="180px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <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.createUserId, row.blacklist)">{{ row.blacklist ? '解除禁言' : '禁言' }}</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,
+          createUserName: '',
+          areaId: ''
+        },
+        total: 0,
+        colConfigs: [
+          { prop: 'content',  label: '内容', align: 'left' },
+          { prop: 'createUserName',  label: '发帖人', align: 'center', width: '120' },
+          { prop: 'createUserAreaName',  label: '所属地区', align: 'center' },
+          { prop: 'createTime',  label: '创建时间', align: 'center' },
+          { prop: 'commentCount',  label: '评论数', align: 'center', width: '120' },
+          { prop: 'appreciateCount',  label: '点赞数', align: 'center', width: '120' },
+          { prop: 'sharedCount',  label: '分享数', align: 'center', width: '120' },
+          { prop: 'blacklist',  label: '状态', align: 'center', format: v => v ? '禁言' : '正常' },
+          { slot: 'options'},
+        ],
+        tableData: [],
+        dateList: [],
+      }
+    },
+    computed: {
+      ...mapState(['user']),
+      hideLevel() {
+        return this.user.info.areaList?.length || 0
+      },
+    },
+
+    created() {
+      this.search.areaId = this.user.info.areaId
+      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
+          }
+        })
+      },
+
+      changeArea () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+        })
+      },
+
+      toGagList () {
+        this.$emit('change', {
+          type: 'GagList'
+        })
+      },
+
+      gag (id, status) {
+        this.$confirm(`确定${status ? '解除禁言' : '禁言'}该用户？`).then(() => {
+          this.instance.post(`/app/appneighborhoodassistance/addBlacklist?userId=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success(`${status ? '解除禁言' : '禁言'}成功！`)
+              this.getList()
+            }
+          })
+        })
+      },
+
+      remove (id) {
+        this.$confirm('确定删除该帖子？').then(() => {
+          this.instance.post(`/app/appneighborhoodassistance/delete?id=${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>
+</style>

From e6f2d1e5998220bed34db5c53c840e48271c5867 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 19 May 2023 09:46:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=82=BB=E9=87=8C?=
 =?UTF-8?q?=E4=BA=92=E5=8A=A9=E9=9B=86=E5=90=88,=E5=B9=B6=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=9D=E9=A2=98=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHelp/AppHelp.vue                       |   8 +-
 .../AppHelp/components/Add.vue                |   0
 .../AppHelp/components/Detail.vue             |   0
 .../AppHelp/components/GagList.vue            |   0
 .../AppHelp/components/List.vue               |   0
 .../AppSubjectSet/AppSubjectSet.vue           |  70 +++++++++
 .../AppSubjectSet/components/Add.vue          | 128 ++++++++++++++++
 .../AppSubjectSet/components/List.vue         | 144 ++++++++++++++++++
 8 files changed, 346 insertions(+), 4 deletions(-)
 rename packages/conv/{ => neighbor2neighbor}/AppHelp/AppHelp.vue (77%)
 rename packages/conv/{ => neighbor2neighbor}/AppHelp/components/Add.vue (100%)
 rename packages/conv/{ => neighbor2neighbor}/AppHelp/components/Detail.vue (100%)
 rename packages/conv/{ => neighbor2neighbor}/AppHelp/components/GagList.vue (100%)
 rename packages/conv/{ => neighbor2neighbor}/AppHelp/components/List.vue (100%)
 create mode 100644 packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue
 create mode 100644 packages/conv/neighbor2neighbor/AppSubjectSet/components/Add.vue
 create mode 100644 packages/conv/neighbor2neighbor/AppSubjectSet/components/List.vue

diff --git a/packages/conv/AppHelp/AppHelp.vue b/packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue
similarity index 77%
rename from packages/conv/AppHelp/AppHelp.vue
rename to packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue
index 7a70e60c..8b7d8a3c 100644
--- a/packages/conv/AppHelp/AppHelp.vue
+++ b/packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue
@@ -7,10 +7,10 @@
 </template>
 
 <script>
-  import Detail from './components/Detail'
-  import List from './components/List'
-  import Add from './components/Add'
-  import GagList from './components/GagList'
+  import Detail from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/Detail'
+  import List from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/List'
+  import Add from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/Add'
+  import GagList from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/GagList'
 
   export default {
     name: 'AppHelp',
diff --git a/packages/conv/AppHelp/components/Add.vue b/packages/conv/neighbor2neighbor/AppHelp/components/Add.vue
similarity index 100%
rename from packages/conv/AppHelp/components/Add.vue
rename to packages/conv/neighbor2neighbor/AppHelp/components/Add.vue
diff --git a/packages/conv/AppHelp/components/Detail.vue b/packages/conv/neighbor2neighbor/AppHelp/components/Detail.vue
similarity index 100%
rename from packages/conv/AppHelp/components/Detail.vue
rename to packages/conv/neighbor2neighbor/AppHelp/components/Detail.vue
diff --git a/packages/conv/AppHelp/components/GagList.vue b/packages/conv/neighbor2neighbor/AppHelp/components/GagList.vue
similarity index 100%
rename from packages/conv/AppHelp/components/GagList.vue
rename to packages/conv/neighbor2neighbor/AppHelp/components/GagList.vue
diff --git a/packages/conv/AppHelp/components/List.vue b/packages/conv/neighbor2neighbor/AppHelp/components/List.vue
similarity index 100%
rename from packages/conv/AppHelp/components/List.vue
rename to packages/conv/neighbor2neighbor/AppHelp/components/List.vue
diff --git a/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue b/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue
new file mode 100644
index 00000000..3dea93a4
--- /dev/null
+++ b/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="AppSubjectSet">
+    <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 "dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppSubjectSet/components/List";
+import Add from "dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppSubjectSet/components/Add";
+
+export default {
+  name: "AppSubjectSet",
+  label: "话题设置",
+
+  props: {
+    instance: Function,
+    dict: Object,
+  },
+
+  data() {
+    return {
+      component: "List",
+      params: {},
+      include: [],
+    };
+  },
+
+  components: {
+    Add,
+    List,
+  },
+
+  methods: {
+    onChange(data) {
+      if (data.type === "Add") {
+        this.component = "Add";
+        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">
+.AppSubjectSet {
+  height: 100%;
+  background: #f3f6f9;
+  overflow: auto;
+}
+</style>
diff --git a/packages/conv/neighbor2neighbor/AppSubjectSet/components/Add.vue b/packages/conv/neighbor2neighbor/AppSubjectSet/components/Add.vue
new file mode 100644
index 00000000..40766486
--- /dev/null
+++ b/packages/conv/neighbor2neighbor/AppSubjectSet/components/Add.vue
@@ -0,0 +1,128 @@
+<template>
+  <ai-detail class="content-add">
+    <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 prop="title" style="width: 100%;" label="话题名称" :rules="[{required: true, message: '请输入话题名称', trigger: 'change'}]">
+              <el-input size="small" placeholder='如“社会保障”仅限4个字' v-model="form.title" maxlength="4" :show-word-limit="true"></el-input>
+            </el-form-item>
+            <el-form-item prop="showIndex" style="width: 100%;" label="排序" :rules="[{required: true, message: '请输入排序', trigger: 'change'}]">
+              <el-input-number v-model="form.showIndex" :min="1" :max="100" size="small"></el-input-number>
+              <span class="tips">请输入数字，数字越小排序越前</span>
+            </el-form-item>
+            <el-form-item label="话题描述" prop="description" style="width: 100%;" :rules="[{required: true, message: '请输入发布内容', trigger: 'change'}]">
+              <el-input type="textarea" placeholder="限500字" v-model="form.description" rows="8" maxlength="500" :show-word-limit="true"></el-input>
+            </el-form-item>
+            <el-form-item label="话题图标" prop="files" style="width: 100%;" :rules="[{required: true, message: '请上传话题图标', trigger: 'change'}]">
+              <ai-uploader
+                :instance="instance"
+                v-model="form.files"
+                isShowTip
+                :limit="1">
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item prop="status" style="width: 100%;" label="是否启用" :rules="[{required: true}]">
+              <el-radio-group v-model="form.status">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </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 {
+        form: {
+          title: '',
+          showIndex: '',
+          description: '',
+          files: [],
+          picUrl: '',
+          status: '1',
+        },
+        isFlag: false
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appneighborhoodassistancetheme/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.files = [{url: res.data.picUrl}]
+          }
+        })
+      },
+
+      confirm () {
+        if(this.isFlag) return
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.isFlag = true
+            this.instance.post(`/app/appneighborhoodassistancetheme/addOrUpdate`, {
+              ...this.form,
+              picUrl: this.form.files[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">
+  .tips {
+    display: inline-block;
+    margin-left: 8px;
+    color: #999;
+    font-size: 12px;
+  }
+</style>
diff --git a/packages/conv/neighbor2neighbor/AppSubjectSet/components/List.vue b/packages/conv/neighbor2neighbor/AppSubjectSet/components/List.vue
new file mode 100644
index 00000000..44a15ebc
--- /dev/null
+++ b/packages/conv/neighbor2neighbor/AppSubjectSet/components/List.vue
@@ -0,0 +1,144 @@
+<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>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, 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="status" width="120px" label="是否启用" align="center">
+          <template slot-scope="{ row }">
+            <el-switch v-model="row.status" @change="changeStatus(row)" active-value="1" inactive-value="0"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="180px" 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>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          title: '',
+          status: ''
+        },
+        total: 10,
+        colConfigs: [
+          { prop: 'title',  label: '话题名称', align: 'left', width: '200' },
+          { prop: 'description',  label: '话题描述', align: 'left', 'show-overflow-tooltip': true},
+          { prop: 'partakeCount',  label: '参与话题数', align: 'center', width: '120' },
+          { prop: 'showIndex',  label: '排序', align: 'center', width: '120' },
+          { prop: 'createUserName',  label: '创建人', align: 'center', width: '120' },
+          { prop: 'createTime',  label: '创建时间', align: 'center', width: '180' },
+          { slot: 'status'},
+          { slot: 'options'},
+        ],
+        tableData: [],
+      }
+    },
+
+    created() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appneighborhoodassistancetheme/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).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/appneighborhoodassistancetheme/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toAdd(id) {
+        this.$emit('change', {
+          type: 'Add',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      changeStatus(row) {
+        this.$confirm(`确定${row.status == 1 ? '启用' : '关闭'}该话题？`).then(() => {
+          this.instance.post(`/app/appneighborhoodassistancetheme/enable?id=${row.id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('操作成功！')
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.getList()
+        })
+        // this.instance.post(`/app/appneighborhoodassistancetheme/enable?id=${row.id}`).then(res => {
+        //   if (res.code == 0) {
+        //     this.$message.success('操作成功！')
+        //     this.getList()
+        //   }
+        // })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>

From 8b320ece349a8bc9d0696d44cb94894888f97fb6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 19 May 2023 09:53:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=A0ws=E8=80=8C?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=9A=84=E5=BC=95=E7=94=A8=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue       | 8 ++++----
 .../neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue b/packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue
index 8b7d8a3c..7a70e60c 100644
--- a/packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue
+++ b/packages/conv/neighbor2neighbor/AppHelp/AppHelp.vue
@@ -7,10 +7,10 @@
 </template>
 
 <script>
-  import Detail from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/Detail'
-  import List from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/List'
-  import Add from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/Add'
-  import GagList from 'dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppHelp/components/GagList'
+  import Detail from './components/Detail'
+  import List from './components/List'
+  import Add from './components/Add'
+  import GagList from './components/GagList'
 
   export default {
     name: 'AppHelp',
diff --git a/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue b/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue
index 3dea93a4..5124d1ac 100644
--- a/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue
+++ b/packages/conv/neighbor2neighbor/AppSubjectSet/AppSubjectSet.vue
@@ -14,8 +14,8 @@
 </template>
 
 <script>
-import List from "dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppSubjectSet/components/List";
-import Add from "dvcp_v2_webapp/packages/conv/neighbor2neighbor/AppSubjectSet/components/Add";
+import List from "./components/List";
+import Add from "./components/Add";
 
 export default {
   name: "AppSubjectSet",