From 7e545b7b997f870e46a291e71bfba96b04e2b135 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 4 Apr 2023 10:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=B2=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/fengdu/app/AppDynamic/AppDynamic.vue  |  12 +-
 .../fengdu/app/AppDynamic/components/Add.vue  | 421 ------------------
 .../app/AppDynamic/components/Detail.vue      | 299 ++-----------
 .../fengdu/app/AppDynamic/components/List.vue | 194 ++++----
 .../AppIntegratingAudit/components/Detail.vue |   4 +-
 .../AppIntegratingAudit/components/List.vue   |  27 +-
 6 files changed, 171 insertions(+), 786 deletions(-)
 delete mode 100644 project/fengdu/app/AppDynamic/components/Add.vue

diff --git a/project/fengdu/app/AppDynamic/AppDynamic.vue b/project/fengdu/app/AppDynamic/AppDynamic.vue
index 98925f8a..69e2fb43 100644
--- a/project/fengdu/app/AppDynamic/AppDynamic.vue
+++ b/project/fengdu/app/AppDynamic/AppDynamic.vue
@@ -1,14 +1,13 @@
 <template>
   <div class="AppActivitiesManagement">
     <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" :permissions="permissions " @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 {
@@ -17,7 +16,8 @@
 
     props: {
       instance: Function,
-      dict: Object
+      dict: Object,
+      permissions: Function
     },
 
     data () {
@@ -30,17 +30,11 @@
 
     components: {
       List,
-      Add,
       Detail
     },
 
     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
diff --git a/project/fengdu/app/AppDynamic/components/Add.vue b/project/fengdu/app/AppDynamic/components/Add.vue
deleted file mode 100644
index 4b898b1f..00000000
--- a/project/fengdu/app/AppDynamic/components/Add.vue
+++ /dev/null
@@ -1,421 +0,0 @@
-<template>
-  <section class="activitiesAdd">
-    <ai-detail v-show="id && !isEdit">
-      <template slot="title">
-        <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
-      </template>
-      <template slot="content">
-        <ai-card :title="info.title">
-          <template #right>
-            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false && info.status==0" @click="update">修改</span>
-          </template>
-          <template #content v-if="isEdit == false">
-            <ai-wrapper>
-              <ai-info-item label="活动名称" :value="info.title"></ai-info-item>
-              <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
-              <ai-info-item label="活动说明" isLine :value="info.detail"></ai-info-item>
-              <ai-info-item label="活动地点" :value="info.address"></ai-info-item>
-              <ai-info-item label="标绘地址" isLine><div id="mapDetail"></div></ai-info-item>
-              <ai-info-item label="活动状态">
-                {{ dict.getLabel('tfx_activityStatus',info.status) }}
-              </ai-info-item>
-              <ai-info-item label="打卡范围">{{ info.clockRange }}米</ai-info-item>
-              <ai-info-item label="进场打卡时间">{{ info.intoBegintime }}至{{ info.intoEndtime}}</ai-info-item>
-              <ai-info-item label="进场得积分">{{ info.intoIntegral }}分</ai-info-item>
-              <ai-info-item label="离场打卡时间">{{ info.exitBegintime }}至{{ info.exitEndtime}}</ai-info-item>
-              <ai-info-item label="离场得积分">{{ info.exitIntegral }}分</ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-      </template>
-    </ai-detail>
-    <ai-detail v-show="!id || isEdit==true">
-      <ai-title slot="title" :title="id? '编辑活动':'创建活动'" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
-      <template slot="content">
-        <ai-card title="基本信息">
-          <template #content>
-            <div class="add-form">
-              <el-form ref="form" :model="form" :rules="formRules" size="small"  label-width="150px">
-
-                <el-form-item label="活动名称" prop="title">
-                  <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="64"></el-input>
-                </el-form-item>
-
-                <el-form-item label="活动说明">
-                  <el-input type="textarea" :rows="5" v-model="form.detail" placeholder="请输入" show-word-limit maxlength="500"></el-input>
-                </el-form-item>
-
-                <el-form-item style="width: 100%" label="地理位置" prop="location">
-                  <el-button @click="showMap = true">地图标绘</el-button>
-                </el-form-item>
-
-                <el-form-item label="标绘地址">
-                  <el-input v-model="form.address" disabled ></el-input>
-                </el-form-item>
-
-                <el-form-item label="打卡范围" prop="clockRange" style="width: 550px">
-                  <el-input type="number" v-model="form.clockRange" placeholder="请输入" >
-                    <template slot="append">米</template>
-                  </el-input>
-                </el-form-item>
-
-                <el-form-item label="进场打卡时间" prop="intoTime">
-                  <el-date-picker v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
-                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" ></el-date-picker>
-                </el-form-item>
-
-                <el-form-item label="进场得积分" prop="intoIntegral" style="width: 550px">
-                  <el-input v-model="form.intoIntegral" type="number" placeholder="请输入" >
-                    <template slot="append">积分</template>
-                  </el-input>
-                </el-form-item>
-
-                <el-form-item label="离场打卡时间" prop="exitTime">
-                  <el-date-picker v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
-                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-                </el-form-item>
-
-                <el-form-item label="离场得积分" prop="exitIntegral" style="width: 550px">
-                  <el-input v-model="form.exitIntegral" type="number" placeholder="请输入" >
-                    <template slot="append">积分</template>
-                  </el-input>
-                </el-form-item>
-
-              </el-form>
-            </div>
-          </template>
-        </ai-card>
-      </template>
-      <template #footer>
-        <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
-        <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
-      </template>
-    </ai-detail>
-    <ai-dialog title="地图" :visible.sync="showMap" @opened="initMap" width="800px" class="mapDialog" @onConfirm="selectMap">
-      <div id="map"></div>
-      <el-form label-width="80px" style="padding: 10px 20px 0 20px;">
-        <el-row type="flex" justify="space-between">
-          <el-form-item label="经度">
-            <el-input disabled size="small" v-model="placeDetail.lng"></el-input>
-          </el-form-item>
-          <el-form-item label="纬度">
-            <el-input disabled size="small" v-model="placeDetail.lat"></el-input>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-input id="searchPlaceInput" size="medium" class="searchPlaceInput" clearable v-model="searchPlace" autocomplete="on" @change="placeSearch.search(searchPlace)" placeholder="请输入关键字">
-        <el-button type="primary" slot="append" @click="placeSearch.search(searchPlace)">搜索</el-button>
-      </el-input>
-      <div id="searchPlaceOutput" />
-    </ai-dialog>
-  </section>
-</template>
-
-<script>
-import AMapLoader from '@amap/amap-jsapi-loader'
-export default {
-  props: {
-    instance: Function,
-    dict: Object,
-    params: Object,
-  },
-
-  data() {
-    var validLocation =  (rule, value, callback) => {
-      if(!this.form.lat || !this.form.lng) {
-        return callback(new Error('请标绘地理位置'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      form: {
-        title: '',
-        detail: '',
-        lng: '',
-        lat: '',
-        address: '',
-        clockRange: '',
-        intoTime: [],
-        intoBegintime: '',
-        intoEndtime: '',
-        intoIntegral: '',
-        exitTime: [],
-        exitBegintime: '',
-        exitEndtime: '',
-        exitIntegral: '',
-      },
-      formRules: {
-        title: [{required: true, message: "请输入活动名称", trigger: "blur"}],
-        location: [{required: true, validator: validLocation, trigger: "blur"}],
-        clockRange: [{required: true, message: "请输入打卡范围", trigger: "blur"}],
-        intoTime: [{required: true, message: "请选择进场打卡时间", trigger: "blur"}],
-        intoIntegral: [{required: true, message: "请输入进场得积分", trigger: "blur"}],
-        exitTime: [{required: true, message: "请选择离场打卡时间", trigger: "blur"}],
-        exitIntegral:  [{required: true, message: "请输入离场得积分", trigger: "blur"}],
-      },
-      id: '',
-      isEdit: false,
-      info: {},
-      mapDetail: null,
-      map: null,
-      placeSearch: null,
-      placeDetail: {
-        lng: '',
-        lat: '',
-        address: ''
-      },
-      showMap: false,
-      searchPlace: '',
-      timeOption: {
-        disabledDate(date) {
-          return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
-        }
-      },
-    }
-  },
-  created() {
-    this.$dict.load('tfx_activityStatus')
-    if(this.params && this.params.id) {
-      this.id = this.params.id
-      this.getDetail()
-      setTimeout(() => {
-      },500)
-    }
-  },
-  watch: {
-    'form.intoTime': {
-      handler(val) {
-        if(val) {
-          this.form.intoBegintime = val[0]
-          this.form.intoEndtime = val[1]
-        }
-      }
-    },
-    'form.exitTime': {
-      handler(val) {
-        if(val) {
-          this.form.exitBegintime = val[0]
-          this.form.exitEndtime = val[1]
-        }
-      }
-    }
-  },
-  methods: {
-    selectMap() {
-      this.form.lng = this.placeDetail.lng
-      this.form.lat = this.placeDetail.lat
-      this.form.address = this.placeDetail.address
-      this.showMap = false
-    },
-    initMap() {
-      AMapLoader.load({
-        key: '54a02a43d9828a8f9cd4f26fe281e74e',
-        version: '2.0',
-        plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'],
-      }).then((AMap) => {
-        this.map = new AMap.Map('map', {
-          resizeEnable: true,
-          zooms: [6, 20],
-          center:[104.067923463,30.6799428454],
-          zoom: 11,
-        })
-        this.placeSearch = new AMap.PlaceSearch({ map: this.map })
-        new AMap.AutoComplete({
-          input: 'searchPlaceInput',
-          output: 'searchPlaceOutput',
-        }).on('select', (e) => {
-          if (e?.poi) {
-            this.placeSearch.setCity(e.poi.adcode)
-            this.movePosition(e.poi.location)
-          }
-        })
-        this.map.on('click', (e) => {
-          new AMap.Geocoder().getAddress(e.lnglat, (sta, res) => {
-            if (res?.regeocode) {
-              this.placeDetail = {
-                lng: e.lnglat?.lng,
-                lat: e.lnglat?.lat,
-                address: res.regeocode.formattedAddress,
-              }
-            }
-          })
-          this.movePosition(e.lnglat)
-        })
-      })
-    },
-
-    movePosition(center) {
-      if (this.map) {
-        this.map.clearMap()
-        this.map.panTo(center)
-        this.map.add([
-          new AMap.Marker({
-            position: center,
-            clickable: true,
-          }),
-        ])
-        this.map.setFitView()
-      }
-    },
-    cancel (isRefresh) {
-      this.$emit('change', {
-        type: 'activitiesList',
-        isRefresh: !!isRefresh
-      })
-    },
-
-    getMap(lng,lat,address) {
-      AMapLoader.load({
-        key: '54a02a43d9828a8f9cd4f26fe281e74e',
-        version: '2.0',
-        plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'],
-      }).then((AMap) => {
-        this.mapDetail = new AMap.Map(document.getElementById("mapDetail"), {
-          resizeEnable: true,
-          zooms: [6, 20],
-          center:[104.067923463,30.6799428454],
-          zoom: 11,
-        })
-        let marker = new AMap.Marker({
-          position: new AMap.LngLat(lng,lat),
-          title: address
-        })
-        this.mapDetail.add(marker);
-      })
-    },
-
-    update() {
-      this.isEdit = true
-      this.getDetail()
-    },
-
-    getDetail() {
-      this.instance.post(`api/appactivityinfo/queryDetailById`,null, {
-        params: {id:this.id}
-      }).then((res) => {
-        if(res?.data) {
-          this.form = res.data
-          this.form.intoTime = [res.data.intoBegintime,res.data.intoEndtime]
-          this.form.exitTime = [res.data.exitBegintime,res.data.exitEndtime]
-          this.info = res.data
-          this.placeDetail.lng = res.data.lng
-          this.placeDetail.lat = res.data.lat
-          this.getMap(this.info.lng,this.info.lat,this.info.address)
-        }
-      })
-    },
-    selectCandidate(v) {
-      this.form.candidateUsers = v
-    },
-    selectVote(e) {
-      this.form.voteUsers = e
-    },
-
-    handleAreaSelect(v) {
-      this.form.areaName = v?.[0]?.label
-    },
-
-    confirm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          if(new Date(this.form.intoBegintime).getTime() <= Date.now()){
-            return this.$message.error('进场打卡开始时间不能小于当前时间')
-          }
-          let intoEnd = new Date(this.form.intoEndtime).getTime()
-          let exitBegin = new Date(this.form.exitBegintime).getTime()
-          if(exitBegin <= intoEnd) {
-            return this.$message.error('离场的开始时间不能小于且等于进场的结束时间')
-          }
-          this.instance.post(`api/appactivityinfo/addOrUpdate`,{
-            ...this.form
-          }).then(res => {
-            if(res.code == 0) {
-              this.$message.success(this.id ? '编辑成功' : '新增成功')
-              this.cancel(true)
-            }
-          }).catch(err => {
-            console.log(err);
-          })
-        }
-      })
-    },
-  },
-}
-</script>
-
-<style lang="scss" scope>
-.activitiesAdd {
-  height: 100%;
-
-  :deep( .amap-logo ){
-    display: none!important;
-  }
-  :deep( .amap-copyright ){
-    display: none!important;
-  }
-
-  :deep( .el-date-editor .el-input ){
-    width: 100%;
-  }
-
-  .tips {
-    width: 100%;
-    border: 1px solid #f82;
-    background-color: #fff3e9;
-    color: #f82;
-    padding: 8px 16px;
-    box-sizing: border-box;
-    border-radius: 4px;
-    margin-bottom: 32px;
-    font-size: 13px;
-  }
-
-  .amap-container {
-    height: 380px;
-  }
-}
-
-.mapDialog {
-  .el-dialog__body {
-    padding: 0;
-    .ai-dialog__content {
-      padding: 0;
-    }
-    .ai-dialog__content--wrapper {
-      padding: 0 !important;
-      position: relative;
-    }
-  }
-    #map {
-      width: 100%;
-      height: 420px;
-    }
-
-    .searchPlaceInput {
-      position: absolute;
-      width: 250px;
-      top: 30px;
-      left: 25px;
-    }
-
-    #searchPlaceOutput {
-      position: absolute;
-      width: 250px;
-      left: 25px;
-      height: initial;
-      top: 80px;
-      background: white;
-      z-index: 250;
-      max-height: 300px;
-      overflow-y: auto;
-
-      .auto-item {
-        text-align: left;
-        font-size: 14px;
-        padding: 8px;
-        box-sizing: border-box;
-      }
-    }
-  }
-</style>
diff --git a/project/fengdu/app/AppDynamic/components/Detail.vue b/project/fengdu/app/AppDynamic/components/Detail.vue
index dc485f13..eb948f59 100644
--- a/project/fengdu/app/AppDynamic/components/Detail.vue
+++ b/project/fengdu/app/AppDynamic/components/Detail.vue
@@ -1,69 +1,41 @@
 <template>
-  <ai-detail class="detail">
+  <ai-detail>
     <template slot="title">
-      <ai-title title="帖子详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
     </template>
     <template slot="content">
-      <ai-card title="帖子信息">
+      <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>
+          <ai-wrapper
+            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="文章类型" isLine :value="info.contentType === '0' ? '文章' : '视频'"></ai-info-item>
+            <ai-info-item label="分类" v-if="info.categoryName" isLine :value="info.categoryName"></ai-info-item>
+            <ai-info-item label="正文" v-if="info.contentType === '0'" isLine>
+              <AiArticle :value="info.content"></AiArticle>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '0'" isLine label="封面图片">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.files"
+                :limit="9">
+              </ai-uploader>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '1'" isLine label="封面图片">
+              <video style="width:100%; height:100%; object-fit: fill;" :src="info.files[0].url" controls></video>
+            </ai-info-item>
+            <ai-info-item v-if="info.contentType === '1'" isLine label="视频封面">
+              <ai-uploader
+                :instance="instance"
+                disabled
+                v-model="info.pictureUrl"
+                :limit="1">
+              </ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
         </template>
       </ai-card>
     </template>
@@ -77,218 +49,45 @@
     props: {
       instance: Function,
       dict: Object,
-      params: Object
+      params: Object,
+      moduleId: String
     },
 
     data () {
       return {
-        commontList: [],
         info: {},
-      }
-    },
-
-    computed: {
-      getAvatar(row){
-        return row.avatar||row.photo||'https://cdn.cunwuyun.cn/dvcp/h5/defaultAvatar.png'
+        id: ''
       }
     },
 
     created () {
-      this.getInfo()
-      this.getList()
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
     },
 
     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 (id) {
+        this.instance.post(`/app/appcontentinfo/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.pictureUrl = res.data.pictureUrl ? [{
+              url: res.data.pictureUrl
+            }] : []
           }
         })
       },
 
-      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 () {
+      cancel (isRefresh) {
         this.$emit('change', {
           type: 'List',
-          isRefresh: true
+          isRefresh: !!isRefresh
         })
-      },
-
-      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/project/fengdu/app/AppDynamic/components/List.vue b/project/fengdu/app/AppDynamic/components/List.vue
index c826b5ad..c63d2885 100644
--- a/project/fengdu/app/AppDynamic/components/List.vue
+++ b/project/fengdu/app/AppDynamic/components/List.vue
@@ -1,140 +1,144 @@
 <template>
-  <ai-list class="activitiesList">
-    <ai-title slot="title" title="精选动态" isShowBottomBorder />
-    <template #content>
-      <ai-search-bar>
+  <ai-list class="notice">
+    <ai-title slot="title" title="精选动态" v-model="search.areaId" isShowBottomBorder isShowArea :hideLevel="hideLevel - 1" @change="search.current = 1, getList()"></ai-title>
+    <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" :total="page.total" :current.sync="page.current"
-      :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">
-        <el-table-column slot="qrcode" width="200px" label="二维码" align="center">
+      <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="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
-            <div class="qrcode">
-              <el-button type="text" @click="qrcode(row.qrCode, row.id)">{{ row.qrCode ? '预览' : '生成' }}</el-button>
+            <div class="table-options">
+              <el-button type="text" @click="remove(row.id)">下架</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
             </div>
           </template>
         </el-table-column>
-        <el-table-column slot="options" label="操作" fixed="right" align="center">
-          <template slot-scope="{ row }">
-            <el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
-            <el-button type="text" :disabled="row.status ==2" @click.native="stopBtn(row.id)">结束</el-button>
-            <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
-          </template>
-        </el-table-column>
       </ai-table>
-      <div class="qrCode" v-viewer="{movable: true}" v-show="false">
-        <img :src="img">
-      </div>
     </template>
   </ai-list>
 </template>
 
 <script>
+  import { mapState } from 'vuex'
   export default {
+    name: 'List',
+
     props: {
       instance: Function,
       dict: Object
     },
-    data () {
+
+    data() {
       return {
-        page: {
+        search: {
           current: 1,
           size: 10,
-          total: 0,
+          title: '',
+          areaId: ''
         },
+        total: 0,
+        colConfigs: [
+          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
+          { prop: 'createUserName',  label: '姓名', align: 'center' },
+          { prop: 'areaName', label: '所属地区', align: 'center' },
+          { prop: 'createUserName', label: '推送人', align: 'center' },
+          { prop: 'createTime', label: '推送时间', align: 'center' }
+        ],
         tableData: [],
-        img: '',
-        isLoading: false,
+        moduleId: ''
       }
     },
-    created () {
-      this.$dict.load('tfx_activityStatus').then(()=> {
-        this.getList()
-      })
-    },
+
     computed: {
-      colConfigs() {
-        return [
-          {prop: "title", label: "活动名称", align: "left", showOverflowTooltip: true},
-          {prop: "createUserName", label: "创建人", align: "center"},
-          {prop: "intoBegintime", label: "开始结束时间", align: "center", width: "400px", render: (h, {row}) => h('p',{textAlign:'center'},
-          `${row.intoBegintime}至${row.exitEndtime}`)},
-          {prop: "status", label: "活动状态", align: "center", dict:"tfx_activityStatus"},
-          { slot: "qrcode"},
-          { slot: "options", },
-        ]
+      ...mapState(['user']),
+
+      hideLevel () {
+        return this.user.info.areaList.length || 0
+      },
+
+      params () {
+        return {
+          ...this.search
+        }
       }
     },
+
+    created() {
+      this.search.areaId = this.user.info.areaId
+      this.getInfo()
+    },
+
     methods: {
-      getList() {
-        this.instance.post(`api/appactivityinfo/list`,null, {
-          params: {
-            ...this.page,
-          }
-        }).then(res=> {
-          if(res?.data) {
-            this.tableData = res.data.records
-            this.page.total = res.data.total
-          }
-        })
-      },
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'activitiesAdd',
-          params: {
-            id: id || '',
-          }
-        })
-      },
-      qrcode (qrcode, id) {
-        if (!qrcode) {
-          this.isLoading = true
-          this.instance.post(`api/appactivityinfo/generateQrCode?id=${id}&width=400&height=400`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('二维码生成成功！')
+      getInfo () {
+        this.instance.post(`/app/appintegraluserapply/queryModuleByName`).then(res => {
+          if (res.code == 0) {
+            this.moduleId = res.data
+
+            this.$nextTick(() => {
               this.getList()
-            }
-            this.isLoading = false
-          })
-        } else {
-          this.img = qrcode
-          this.$nextTick(() => {
-            setTimeout(() => {
-              const viewer = this.$el.querySelector('.qrCode').$viewer
-              viewer.view()
-            }, 600)
-          })
-        }
+            })
+          }
+        })
       },
-      handleDelete(id) {
-        this.$confirm('确定删除该活动？').then(() => {
-          this.instance.post(`api/appactivityinfo/delete?ids=${id}`).then(res=>{
-            if(res.code == 0) {
+
+      getList () {
+        this.instance.post(`/app/appcontentinfo/list-web`, null, {
+          params: {
+            moduleId: this.moduleId,
+            ...this.search,
+            areaId: this.search.areaId
+          }
+        }).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/appcontentinfo/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()
             }
           })
         })
       },
-      // 结束
-      stopBtn(id) {
-        this.$confirm('确定要结束该活动吗？').then(() => {
-          this.instance.post(`api/appactivityinfo/stop?id=${id}`).then(res=>{
-            if(res.code == 0) {
-              this.$message.success('结束成功！')
-              this.getList()
-            }
-          })
+
+      toDetail(id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
         })
-      },
+      }
     }
   }
 </script>
 
 <style lang="scss" scoped>
-  .activitiesList {
-    height: 100%;
-  }
 </style>
diff --git a/project/fengdu/app/AppIntegratingAudit/components/Detail.vue b/project/fengdu/app/AppIntegratingAudit/components/Detail.vue
index ee56d387..dd78efd0 100644
--- a/project/fengdu/app/AppIntegratingAudit/components/Detail.vue
+++ b/project/fengdu/app/AppIntegratingAudit/components/Detail.vue
@@ -16,7 +16,7 @@
             <ai-info-item label="手机号" :value="info.detail"></ai-info-item>
             <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
             <ai-info-item label="所属网格" :value="info.girdName"></ai-info-item>
-            <ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
+            <ai-info-item label="审核时间" v-if="info.auditTime" :value="info.auditTime"></ai-info-item>
             <ai-info-item label="状态" :value="dict.getLabel('appIntegralApplyEventStatus', info.status)"></ai-info-item>
             <ai-info-item label="事件描述" isLine :value="info.content"></ai-info-item>
             <ai-info-item label="活动图片" isLine>
@@ -121,6 +121,4 @@
 </script>
 
 <style scoped lang="scss">
-.detail {
-}
 </style>
diff --git a/project/fengdu/app/AppIntegratingAudit/components/List.vue b/project/fengdu/app/AppIntegratingAudit/components/List.vue
index 99c2cfcc..68562345 100644
--- a/project/fengdu/app/AppIntegratingAudit/components/List.vue
+++ b/project/fengdu/app/AppIntegratingAudit/components/List.vue
@@ -40,18 +40,18 @@
             :ops="{ label: 'girdName' }"
             pageTitle="网格"
             action="/app/appgirdinfo/girdList"
-            v-model="search.filterCriteria"
-            @change="search.current = 1, getList()">
+            v-model="userList"
+            @pick="onGridChange">
             <div class="userSelcet">
-              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
-              <span v-else>创建人</span>
-              <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
+              <span style="color: #606266;" v-if="search.girdId">{{ search.girdName }}</span>
+              <span v-else>请选择网格</span>
+              <i class="el-icon-arrow-up"  v-if="!search.girdId"></i>
+              <i class="el-icon-circle-close" v-if="search.girdId" @click.stop="userList = [], search.girdId = '', search.girdName = '', search.current = 1, getList()"></i>
             </div>
           </ai-picker>
           <ai-select
             v-model="search.status"
-            @change="(page.current = 1), getList()"
+            @change="(search.current = 1), getList()"
             placeholder="请选择状态"
             :selectList="$dict.getDict('appIntegralApplyEventStatus')">
           </ai-select>
@@ -109,8 +109,10 @@
           size: 10,
           areaId: '',
           ids: '',
-          gridId: ''
+          girdId: '',
+          girdName: ''
         },
+        userList: [],
         rulesProps: {
           label: 'ruleName',
           value: 'id',
@@ -160,6 +162,15 @@
         })
       },
 
+      onGridChange (e) {
+        if (e.length) {
+          this.search.girdId = e[0].id
+          this.search.girdName = e[0].girdName
+          this.search.current = 1
+          this.getList()
+        }
+      },
+
       toTree (data) {
         let result = []
         if (!Array.isArray(data)) {