diff --git a/src/project/pingchang/AppVillageActivity/ActivityDetail.vue b/src/project/pingchang/AppVillageActivity/ActivityDetail.vue
new file mode 100644
index 0000000..01491b6
--- /dev/null
+++ b/src/project/pingchang/AppVillageActivity/ActivityDetail.vue
@@ -0,0 +1,474 @@
+<template>
+  <div class="detail" v-if="pageShow" :style="{ paddingBottom: info.status === '0' ? '130px' : '40px' }">
+    <div class="detail-wrapper">
+      <image class="banner" mode="aspectFill" :src="info.url" />
+      <h2>{{ info.title }}</h2>
+      <div class="detail-status">
+        <span :class="'status' + info.status">{{ $dict.getLabel('villageActivityStatus', info.status) }}</span>
+        <div class="detail-status__right">
+          <span>已有</span>
+          <i>{{ info.realNum }}</i>
+          <span>人报名</span>
+        </div>
+      </div>
+      <div class="detail-info">
+        <div class="detail-info__item">
+          <label>联系人</label>
+          <div class="right">
+            <span>{{ info.contactPerson }}</span>
+          </div>
+        </div>
+        <div class="detail-info__item">
+          <label>联系方式</label>
+          <div class="right detail-info__item--phone" hover-class="text-hover" @click="call(info.contactPhone)">
+            <span>{{ info.contactPhone }}</span>
+          </div>
+        </div>
+        <div class="detail-info__item">
+          <label>开始时间</label>
+          <div class="right">
+            <span>{{ info.beginTime }}</span>
+          </div>
+        </div>
+        <div class="detail-info__item">
+          <label>结束时间</label>
+          <div class="right">
+            <span>{{ info.endTime }}</span>
+          </div>
+        </div>
+        <div class="detail-info__item">
+          <label>活动地点</label>
+          <div class="right">
+            <span>{{ info.areaName }}{{ info.address }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="detail-tips">
+        <u-tabs :list="tabs" font-size="32" bg-color="transparent" inactive-color="#999999" :active-item-style="tabActive" :is-scroll="true" :current="currIndex" @change="(i) => (currIndex = i)"> </u-tabs>
+        <div class="tab-content">
+          <div class="rich-content" v-show="currIndex === 0">
+            <u-parse :html="info.content"></u-parse>
+          </div>
+          <div class="dynamic-list" v-show="currIndex === 1">
+            <div class="dynamic-item" v-for="(item, index) in list" :key="index">
+              <div class="dynamic-item__top">
+                <h2>{{ item.name }}</h2>
+                <span>{{ item.createTime }}</span>
+              </div>
+              <p>{{ item.content }}</p>
+              <div class="images" v-if="item.images.length">
+                <image v-for="(img, i) in item.images" @click="preview(img.url, item.images)" :key="i" class="banner" :src="img.url" v-if="i < 3" />
+              </div>
+            </div>
+            <AiEmpty v-if="!list.length"></AiEmpty>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="add" v-if="isShowAdd" hover-class="text-hover" @click="toAdd(`./AddDynamic?activityId=${id}`)">
+      <image src="/static/img/add-big.png" />
+    </div>
+    <div class="btn-wrapper" v-if="info.status === '0'">
+      <div class="btn" :class="[info.hasReport === '1' ? 'disabled' : '']" @click="signUp" hover-class="text-hover">{{ info.hasReport === '1' ? '已报名' : '立即报名' }}</div>
+    </div>
+    <AiLogin ref="login" />
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  appName: '活动详情',
+  data() {
+    return {
+      currIndex: 0,
+      tabActive: {
+        color: '#333333',
+        fontSize: '16px',
+      },
+      pageShow: false,
+      id: '',
+      current: 1,
+      list: [],
+      isMore: false,
+      info: '',
+    }
+  },
+
+  computed: {
+    tabs() {
+      return [
+        {
+          name: '活动须知',
+        },
+        {
+          name: '活动动态',
+        },
+      ]
+    },
+    ...mapState(['user', 'token']),
+
+    isShowAdd() {
+      const time = (new Date().getTime() - new Date(this.info.endTime).getTime()) / 60 / 60 / 1000
+      if (!this.info.endTime) {
+        return false
+      }
+
+      if (this.info.status === '0') {
+        return false
+      }
+
+      return !(this.info.status === '2' && time > 24)
+    },
+  },
+
+  onLoad(query) {
+    this.$loading()
+    this.id = query.id
+    this.getList(query.id)
+    this.$dict.load(['villageActivityStatus']).then(() => {
+      this.getInfo(query.id)
+    })
+    uni.$on('update', () => {
+      this.isMore = false
+      this.current = 1
+      this.getList(query.id)
+    })
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$instance
+        .post(`/app/appvillageactivityinfo/queryDetailById?id=${id}`)
+        .then((res) => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.url = res.data.url ? JSON.parse(res.data.url)[0].url : ''
+
+            this.$nextTick(() => {
+              this.pageShow = true
+            })
+          }
+
+          this.$hideLoading()
+        })
+        .catch(() => {
+          this.$hideLoading()
+        })
+    },
+
+    toAdd(url) {
+      if (!this.token) {
+        this.$refs.login.show()
+
+        return false
+      }
+
+      if (!this.user.residentId) {
+        this.$linkTo('/mods/AppAuth/AppAuth')
+
+        return false
+      }
+
+      if (this.info.hasReport === '0') {
+        return this.$toast('您还未报名，无法发布活动动态！')
+      }
+
+      this.$linkTo(url)
+    },
+
+    signUp() {
+      if (this.info.status === '1') {
+        return this.$toast('报名已截止')
+      }
+
+      if (this.info.status === '2') {
+        return this.$toast('活动已结束')
+      }
+
+      if (!this.token) {
+        this.$refs.login.show()
+
+        return false
+      }
+
+      // if (!this.user.residentId) {
+      //   this.$linkTo('/mods/AppAuth/AppAuth')
+
+      //   return false
+      // }
+
+      this.$loading()
+      this.$instance
+        .post('/app/appvillageactivityuser/report', {
+          activityId: this.id,
+          userId: this.$store.state.user.id,
+          name: this.$store.state.user.nickName,
+          phone: this.$store.state.user.phone,
+        })
+        .then((res) => {
+          if (res.code === 0) {
+            this.$toast('报名成功')
+            this.getInfo(this.id)
+          }
+
+          this.$hideLoading()
+        })
+    },
+
+    preview(url, imgs) {
+      uni.previewImage({
+        urls: imgs.map((v) => v.url),
+        current: url,
+      })
+    },
+
+    getList(id) {
+      if (this.isMore) return
+
+      this.$instance
+        .post(`/app/appvillageactivitypost/list?activityId=${id}`, null, {
+          params: {
+            current: this.current,
+            size: 10,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records].map((v) => {
+                return {
+                  ...v,
+                  images: v.images ? JSON.parse(v.images) : [],
+                }
+              })
+            } else {
+              this.list = res.data.records.map((v) => {
+                return {
+                  ...v,
+                  images: v.images ? JSON.parse(v.images) : [],
+                }
+              })
+            }
+            this.pageShow = true
+            if (res.data.records.length < 10) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
+          }
+        })
+    },
+
+    call(phone) {
+      uni.makePhoneCall({
+        phoneNumber: phone,
+      })
+    },
+  },
+
+  onReachBottom() {
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  min-height: 100vh;
+  padding: 0 0 250px 0;
+  background: #fff;
+
+  .add {
+    position: fixed;
+    bottom: 140px;
+    right: 20px;
+    z-index: 111;
+    width: 128px;
+    height: 128px;
+
+    image {
+      width: 128px;
+      height: 128px;
+    }
+  }
+
+  ::v-deep .u-tab-item {
+    font-size: 32px !important;
+
+    &:first-child {
+      padding: 0 !important;
+    }
+  }
+
+  .detail-wrapper {
+    padding-bottom: 48px;
+    background: #fff;
+
+    & > image {
+      width: 100%;
+      height: 480px;
+    }
+
+    & > h2 {
+      line-height: 1.4;
+      padding: 32px;
+      font-size: 40px;
+      font-weight: 600;
+      color: #333;
+      text-align: justify;
+    }
+
+    & > div {
+      padding: 0 32px;
+    }
+  }
+
+  .detail-info {
+    .detail-info__item {
+      display: flex;
+      justify-content: space-between;
+      padding: 34px 0;
+      border-bottom: 1px solid #dddddd;
+
+      label {
+        color: #999999;
+        font-size: 32px;
+      }
+
+      .right {
+        display: flex;
+        align-items: center;
+        max-width: 480px;
+        text-align: right;
+
+        span {
+          color: #333333;
+          font-size: 32px;
+        }
+
+        &.detail-info__item--phone {
+          span {
+            color: #4181ff;
+          }
+        }
+      }
+    }
+  }
+
+  .detail-status {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-bottom: 12px;
+
+    & > span {
+      width: 96px;
+      height: 44px;
+      line-height: 44px;
+      text-align: center;
+      color: #fff;
+      background: #42d784;
+      border-radius: 8px;
+      font-size: 26px;
+
+      &.status1 {
+        background: #1aaaff;
+      }
+
+      &.status2 {
+        background: #e4e4e4;
+      }
+    }
+
+    .detail-status__right {
+      display: flex;
+      align-items: center;
+
+      span {
+        color: #999999;
+        font-size: 28px;
+      }
+
+      i {
+        font-style: normal;
+        color: #4181ff;
+        font-size: 28px;
+      }
+    }
+  }
+
+  .tab-active {
+    color: #333333;
+    font-size: 32px;
+  }
+
+  .detail-tips {
+    padding: 10px 32px 0 !important;
+
+    & > h2 {
+      height: 116px;
+      line-height: 116px;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    p {
+      line-height: 1.4;
+      margin-top: 24px;
+      color: #333333;
+      font-size: 32px;
+      text-align: justify;
+    }
+  }
+
+  .dynamic-list {
+    .dynamic-item {
+      padding: 24px 0;
+
+      .images {
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 16px;
+
+        image {
+          width: 226px;
+          height: 226px;
+          margin: 0 4px 4px 0;
+          border-radius: 16px;
+        }
+        image:nth-child(3n + 0) {
+          margin: 0;
+        }
+      }
+
+      .dynamic-item__top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        span {
+          color: #999999;
+          font-size: 26px;
+        }
+
+        h2 {
+          color: #333333;
+          font-size: 34px;
+          font-weight: 600;
+        }
+      }
+
+      p {
+        line-height: 1.4;
+        text-align: justify;
+        color: #333333;
+        font-size: 28px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppVillageActivity/AddDynamic.vue b/src/project/pingchang/AppVillageActivity/AddDynamic.vue
new file mode 100644
index 0000000..5def594
--- /dev/null
+++ b/src/project/pingchang/AppVillageActivity/AddDynamic.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="dynamic">
+    <div class="form-item">
+      <div class="form-item__wrapper">
+        <div class="form-item__title">
+          <i></i>
+          <h2>内容</h2>
+        </div>
+        <div class="form-item__textarea">
+          <textarea v-model="content" :maxlength="500" placeholder="请输入详细描述信息"></textarea>
+        </div>
+      </div>
+    </div>
+    <div class="form-item">
+      <div class="form-item__wrapper">
+        <div class="form-item__title">
+          <i style="opacity: 0;"></i>
+          <h2>图片上传</h2>
+          <span>(最多9张)</span>
+        </div>
+        <div class="form-item__img">
+          <AiUploader v-model="images" :limit="9"></AiUploader>
+        </div>
+      </div>
+    </div>
+    <div class="btn-wrapper">
+      <div class="btn disabled" hover-class="text-hover" @click="submit">提交</div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  appName: "添加活动动态",
+  data() {
+    return {
+      content: '',
+      images: [],
+      id: '',
+      flag: false
+    }
+  },
+  onLoad(e) {
+    this.id = e.activityId
+  },
+
+  methods: {
+    submit() {
+      if (this.flag) return
+
+      if (!this.content && !this.images.length) {
+        return this.$u.toast('内容或图片不能为空')
+      }
+      this.flag = true
+
+
+      this.$loading()
+      this.$instance.post('/app/appvillageactivitypost/addOrUpdate', {
+        content: this.content,
+        activityId: this.id,
+        avatar: this.$store.state.user.avatarUrl,
+        name: this.$store.state.user.nickName,
+        images: JSON.stringify(this.images)
+      }).then(res => {
+        if (res.code === 0) {
+          this.$toast('提交成功')
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.navigateBack({
+              delta: 1
+            })
+          }, 800)
+        }
+
+        this.$hideLoading()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.dynamic {
+  .form-item {
+    margin-bottom: 24px;
+    padding-left: 32px;
+    padding-bottom: 20px;
+    background: #fff;
+
+    .form-item__wrapper {
+      padding-right: 32px;
+    }
+
+    .form-item__textarea, .form-item__img {
+      padding-left: 18px;
+
+      textarea {
+        width: 100%;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+      padding: 32px 0;
+
+      i {
+        font-size: 32px;
+        color: #FF4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue b/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue
new file mode 100644
index 0000000..05c0115
--- /dev/null
+++ b/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="activity" v-if="pageShow">
+    <div class="activity-title">
+      <h2>活动列表</h2>
+      <div class="right">
+        <span>共</span>
+        <i>{{ total }}</i>
+        <span>个活动</span>
+      </div>
+    </div>
+    <div class="activity-list">
+      <div class="item" hover-class="bg-hover" @click="$linkTo(`./ActivityDetail?id=${item.id}`)" v-for="(item, index) in list" :key="index">
+        <div class="left">
+          <h2>{{ item.title }}</h2>
+          <div class="left-info">
+            <span>由</span>
+            <i>{{ item.createUserName }}</i>
+            <span>发起</span>
+          </div>
+          <div class="date">{{ item.beginTime }} 至 {{ item.endTime }}</div>
+          <div class="address">{{ item.areaName }}{{ item.address }}</div>
+        </div>
+        <div class="right">
+          <span :class="'status' + item.status">{{ item.statusName }}</span>
+          <image :src="item.url" mode="aspectFill" />
+        </div>
+      </div>
+      <AiEmpty v-if="!list.length"></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'AppVillageActivity',
+  appName: '居民活动',
+  data() {
+    return {
+      list: [],
+      pageShow: false,
+      current: 1,
+      total: 0,
+      isMore: false,
+    }
+  },
+  onLoad() {
+    this.$loading()
+    this.$dict.load(['villageActivityStatus']).then(() => {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  methods: {
+    getList() {
+      if (this.isMore) return
+
+      this.$instance
+        .post(`/app/appvillageactivityinfo/listUp`, null, {
+          params: {
+            current: this.current,
+            size: 15,
+            // areaId: uni.getStorageSync('areaId'),
+            areaId: this.user.areaId,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.total = res.data.total
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records].map((v) => {
+                return {
+                  ...v,
+                  statusName: this.$dict.getLabel('villageActivityStatus', v.status),
+                  url: v.url ? JSON.parse(v.url)[0].url : '',
+                }
+              })
+            } else {
+              this.list = res.data.records.map((v) => {
+                return {
+                  ...v,
+                  statusName: this.$dict.getLabel('villageActivityStatus', v.status),
+                  url: v.url ? JSON.parse(v.url)[0].url : '',
+                }
+              })
+            }
+            uni.hideLoading()
+            this.pageShow = true
+            if (res.data.records.length < 15) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
+          } else {
+            uni.hideLoading()
+          }
+        })
+        .catch(() => {
+          uni.hideLoading()
+        })
+    },
+  },
+  onReachBottom() {
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" socped>
+.activity {
+  padding-bottom: 40px;
+
+  .activity-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 32px;
+    padding: 48px 32px 0 32px;
+
+    & > h2 {
+      font-size: 38px;
+      color: #333;
+      font-weight: 600;
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      span {
+        color: #666666;
+        font-size: 28px;
+      }
+
+      i {
+        color: #4181ff;
+        font-style: normal;
+        font-size: 28px;
+      }
+    }
+  }
+
+  .item {
+    display: flex;
+    justify-content: space-between;
+    margin: 0 32px 24px;
+    padding: 32px;
+    border-radius: 16px;
+    background: #fff;
+
+    .left {
+      flex: 1;
+      color: #666666;
+      font-size: 26px;
+
+      h2 {
+        margin-bottom: 16px;
+        color: #333;
+        font-size: 32px;
+        font-weight: 600;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+      }
+
+      .date {
+        margin: 8px 0;
+      }
+
+      .left-info {
+        display: flex;
+        align-items: center;
+
+        i {
+          color: #4181ff;
+          font-style: normal;
+          font-size: 26px;
+        }
+      }
+    }
+
+    .right {
+      position: relative;
+      width: 200px;
+      height: 200px;
+      border-radius: 10px;
+      overflow: hidden;
+
+      image {
+        width: 200px;
+        height: 200px;
+        border-radius: 10px;
+      }
+
+      span {
+        position: absolute;
+        right: 0;
+        top: 0;
+        z-index: 1;
+        width: 96px;
+        height: 44px;
+        line-height: 44px;
+        font-size: 26px;
+        text-align: center;
+        color: #fff;
+      }
+
+      .status0 {
+        background: #42d784;
+      }
+
+      .status1 {
+        background: #1aaaff;
+      }
+
+      .status2 {
+        background: #e4e4e4;
+      }
+    }
+  }
+}
+</style>