From f1d1859d9905017d0618e6c18e1bdebb123c158f Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 18 Jul 2024 16:23:47 +0800
Subject: [PATCH] cv

---
 src/project/weiyang/AppCircle/Add.vue         | 266 ++++++
 src/project/weiyang/AppCircle/AppCircle.vue   | 559 +++++++++++++
 src/project/weiyang/AppCircle/Detail.vue      | 791 ++++++++++++++++++
 src/project/weiyang/AppCircle/MyPostList.vue  | 748 +++++++++++++++++
 src/project/weiyang/AppCircle/Topic.vue       |  89 ++
 src/project/weiyang/AppCircle/TopicDetail.vue | 336 ++++++++
 .../weiyang/AppCircle/circle-selected.png     | Bin 0 -> 2246 bytes
 src/project/weiyang/AppCircle/circle.png      | Bin 0 -> 2288 bytes
 .../AppGeneralElection/AppGeneralElection.vue | 219 +++++
 .../generalElectionDetail.vue                 | 377 +++++++++
 src/project/weiyang/AppModules/AppModules.vue | 176 ++++
 src/project/weiyang/AppModules/service.png    | Bin 0 -> 1513 bytes
 .../weiyang/AppModules/service_selected.png   | Bin 0 -> 1466 bytes
 .../AppNewFarmerBank/AppNewFarmerBank.vue     | 345 ++++++++
 .../AppNewFarmerBank/AppNewFarmerBankOld.vue  | 396 +++++++++
 .../weiyang/AppNewFarmerBank/handpick.vue     | 199 +++++
 .../weiyang/AppNewFarmerBank/img/xz.png       | Bin 0 -> 1489 bytes
 .../weiyang/AppNewFarmerBank/img/xzh.png      | Bin 0 -> 1730 bytes
 .../weiyang/AppNewFarmerBank/integral.png     | Bin 0 -> 2101 bytes
 .../weiyang/AppNewFarmerBank/integralAdd.vue  | 254 ++++++
 .../AppNewFarmerBank/integralApply.vue        | 125 +++
 .../AppNewFarmerBank/integralDetail.vue       | 158 ++++
 .../weiyang/AppNewFarmerBank/integralRank.vue | 480 +++++++++++
 .../weiyang/AppNewFarmerBank/integralTask.vue | 206 +++++
 .../AppNewFarmerBank/integral_select.png      | Bin 0 -> 2238 bytes
 .../AppNewFarmerBank/libs/qqmap-wx-jssdk.js   |   1 +
 .../weiyang/AppNewFarmerBank/pickDetail.vue   | 125 +++
 .../weiyang/AppNewFarmerBank/selectType.vue   | 155 ++++
 .../weiyang/AppNewFarmerBank/signIn.vue       |  96 +++
 .../weiyang/AppNewFarmerBank/taskDetail.vue   | 534 ++++++++++++
 .../AppOrganizational/AppOrganizational.vue   | 210 +++++
 .../weiyang/AppOrganizational/detail.vue      |  65 ++
 .../AppCommunityInfo.vue                      | 102 +++
 .../AppPartyEnteringCommunity.vue             | 666 +++++++++++++++
 .../AppPartyEnteringCommunity/custom.png      | Bin 0 -> 2019 bytes
 .../custom_selected.png                       | Bin 0 -> 2043 bytes
 .../AppPatrolReport/AppPatrolReport.vue       |   2 +-
 .../weiyang/AppPatrolReport/Statistics.vue    |  23 +-
 .../AppRedemptionPoints.vue                   | 377 +++++++++
 .../AppRedemptionPoints/img/success.png       | Bin 0 -> 19019 bytes
 .../weiyang/AppRedemptionPoints/jdH5.vue      |  20 +
 .../AppRedemptionPoints/myOrderList.vue       | 315 +++++++
 .../AppRedemptionPoints/placeOrder.vue        | 291 +++++++
 .../AppRedemptionPoints/pointsPublicity.vue   | 165 ++++
 .../AppRedemptionPoints/productDetails.vue    | 185 ++++
 .../AppRedemptionPoints/successOrder.vue      | 145 ++++
 .../AppVillageActivity/ActivityDetail.vue     | 472 +++++++++++
 .../weiyang/AppVillageActivity/AddDynamic.vue | 127 +++
 .../AppVillageActivity/AppVillageActivity.vue | 228 +++++
 49 files changed, 10017 insertions(+), 11 deletions(-)
 create mode 100644 src/project/weiyang/AppCircle/Add.vue
 create mode 100644 src/project/weiyang/AppCircle/AppCircle.vue
 create mode 100644 src/project/weiyang/AppCircle/Detail.vue
 create mode 100644 src/project/weiyang/AppCircle/MyPostList.vue
 create mode 100644 src/project/weiyang/AppCircle/Topic.vue
 create mode 100644 src/project/weiyang/AppCircle/TopicDetail.vue
 create mode 100644 src/project/weiyang/AppCircle/circle-selected.png
 create mode 100644 src/project/weiyang/AppCircle/circle.png
 create mode 100644 src/project/weiyang/AppGeneralElection/AppGeneralElection.vue
 create mode 100644 src/project/weiyang/AppGeneralElection/generalElectionDetail.vue
 create mode 100644 src/project/weiyang/AppModules/AppModules.vue
 create mode 100644 src/project/weiyang/AppModules/service.png
 create mode 100644 src/project/weiyang/AppModules/service_selected.png
 create mode 100644 src/project/weiyang/AppNewFarmerBank/AppNewFarmerBank.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/AppNewFarmerBankOld.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/handpick.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/img/xz.png
 create mode 100644 src/project/weiyang/AppNewFarmerBank/img/xzh.png
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integral.png
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integralAdd.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integralApply.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integralDetail.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integralRank.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integralTask.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/integral_select.png
 create mode 100644 src/project/weiyang/AppNewFarmerBank/libs/qqmap-wx-jssdk.js
 create mode 100644 src/project/weiyang/AppNewFarmerBank/pickDetail.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/selectType.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/signIn.vue
 create mode 100644 src/project/weiyang/AppNewFarmerBank/taskDetail.vue
 create mode 100644 src/project/weiyang/AppOrganizational/AppOrganizational.vue
 create mode 100644 src/project/weiyang/AppOrganizational/detail.vue
 create mode 100644 src/project/weiyang/AppPartyEnteringCommunity/AppCommunityInfo.vue
 create mode 100644 src/project/weiyang/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue
 create mode 100644 src/project/weiyang/AppPartyEnteringCommunity/custom.png
 create mode 100644 src/project/weiyang/AppPartyEnteringCommunity/custom_selected.png
 create mode 100644 src/project/weiyang/AppRedemptionPoints/AppRedemptionPoints.vue
 create mode 100644 src/project/weiyang/AppRedemptionPoints/img/success.png
 create mode 100644 src/project/weiyang/AppRedemptionPoints/jdH5.vue
 create mode 100644 src/project/weiyang/AppRedemptionPoints/myOrderList.vue
 create mode 100644 src/project/weiyang/AppRedemptionPoints/placeOrder.vue
 create mode 100644 src/project/weiyang/AppRedemptionPoints/pointsPublicity.vue
 create mode 100644 src/project/weiyang/AppRedemptionPoints/productDetails.vue
 create mode 100644 src/project/weiyang/AppRedemptionPoints/successOrder.vue
 create mode 100644 src/project/weiyang/AppVillageActivity/ActivityDetail.vue
 create mode 100644 src/project/weiyang/AppVillageActivity/AddDynamic.vue
 create mode 100644 src/project/weiyang/AppVillageActivity/AppVillageActivity.vue

diff --git a/src/project/weiyang/AppCircle/Add.vue b/src/project/weiyang/AppCircle/Add.vue
new file mode 100644
index 0000000..c603d99
--- /dev/null
+++ b/src/project/weiyang/AppCircle/Add.vue
@@ -0,0 +1,266 @@
+<template>
+  <div class="Add">
+    <div class="add-content">
+      <div class="top">
+        <!-- <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-edit.png" /> -->
+        <textarea placeholder="发布内容" v-model="form.content" :maxlength="500"></textarea>
+        <div class="bottom">
+          <div></div>
+          <div>
+            <i>{{ form.content.length }}</i>
+            <span>/500</span>
+          </div>
+        </div>
+      </div>
+      <div class="bottom">
+        <h2>最多上传9张</h2>
+        <div class="img">
+          <AiUploader v-model="form.files" :limit="9" multiple/>
+        </div>
+        <div class="topic">
+          <h3 v-if="!form.themeId" @click="isShow = true">#绑定话题</h3>
+          <div class="choosed" v-else @click="isShow = true">
+            <span>#{{ form.themeTitle }}</span>
+          </div>
+          <p>绑定一个与您发布内容相关很高的话题，会被更多人看到哦。</p>
+        </div>
+      </div>
+    </div>
+    <!-- <div class="bottom">
+      <h2>仅本社区可见</h2>
+      <switch color="#2D7DFF" @change="onSwitchChange"></switch>
+    </div> -->
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" :class="[!form.content ? 'active' : '']" @click="submit">发布服务</div>
+    </div>
+    <!-- <u-popup v-model="isShow" mode="bottom" hidden height="700rpx" border-radius="30">
+			<div class="popup">
+        <h2>请选择</h2>
+        <scroll-view class="popup-list" scroll-y>
+          <div
+            v-for="(item, index) in topicList"
+            :class="[form.themeId === item.id ? 'active' : '']"
+            :key="index"
+            @click="form.themeId = item.id, form.themeTitle = item.title, isShow = false">
+            #{{ item.title }}
+          </div>
+        </scroll-view>
+      </div>
+		</u-popup> -->
+    <u-select v-model="isShow" :list="topicList" value-name="id"
+              label-name="title" @confirm="confirm"></u-select>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'Add',
+    appName: '发新贴',
+
+    data () {
+      return {
+        form: {
+          files: [],
+          themeId: '',
+          themeTitle: '',
+          source: 0,
+          content: '',
+          visibleRange: 1
+        },
+        topicList: [],
+        isShow: false
+      }
+    },
+
+    onLoad () {
+      this.getTopicList()
+    },
+
+    methods: {
+      confirm(val) {
+        this.form.themeId = val[0].value;
+        this.form.themeTitle = val[0].label;
+      },
+      submit () {
+        if (!this.form.content) {
+          return this.$toast(`内容不能为空`)
+        }
+        if (!this.form.themeId) {
+          return this.$toast(`请绑定话题`)
+        }
+
+        this.$loading()
+        this.$instance.post(`/app/appneighborhoodassistance/addOrUpdate`, {
+          ...this.form
+        }).then(res => {
+          uni.hideLoading()
+          if (res.code === 0) {
+            this.$dialog.alert({
+              title: '温馨提示',
+              content: '提交成功'
+            }).then(() => {
+              uni.navigateBack()
+              uni.$emit('updateList')
+            }).catch(() => {})
+          }
+        })
+      },
+
+      onSwitchChange (e) {
+        this.form.visibleRange = e.detail.value ? 0 : 1
+      },
+
+      getTopicList () {
+        this.$instance.post(`/app/appneighborhoodassistancetheme/list`, null, {
+          withoutToken: true,
+          params: {
+            current: 1,
+            size: 100,
+            status: 1
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.topicList = res.data.records
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .Add {
+    padding: 24px 0 130px;
+
+    & > div {
+      background: #fff;
+    }
+
+    .btn-wrapper .active {
+      background: rgba(45, 125, 255, 0.6);
+    }
+
+    .popup {
+      height: 700px;
+      border-radius: 20px 20px 0 0;
+
+      h2 {
+        height: 98px;
+        line-height: 98px;
+        text-align: center;
+        color: #333333;
+        font-size: 34px;
+        font-weight: 600;
+      }
+
+      .popup-list {
+        height: calc(100% - 98px);
+
+        div {
+          padding: 20px 48px;
+          color: #333333;
+          font-size: 30px;
+
+          &.active {
+            color: #2D7DFF;
+          }
+        }
+      }
+    }
+
+    div {
+      box-sizing: border-box;
+    }
+
+    .add-content {
+      margin-bottom: 24px;
+
+      & > .top {
+        padding: 32px;
+        border-bottom: 1px solid #eee;
+
+        textarea {
+          width: 100%;
+          height: 300px;
+        }
+
+        .bottom {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-top: 14px;
+
+          div {
+            display: flex;
+            align-items: center;
+          }
+
+          i {
+            font-size: 24px;
+            color: #666666;
+          }
+
+          span {
+            font-size: 24px;
+            color: #999999;
+          }
+        }
+      }
+
+      & > .bottom {
+        padding: 32px 32px;
+
+        h2 {
+          margin-bottom: 16px;
+          font-size: 24px;
+          color: #999;
+        }
+
+        .topic {
+          h3 {
+            width: 134px;
+            height: 52px;
+            line-height: 52px;
+            margin-bottom: 12px;
+            text-align: center;
+            border: 1px solid #999;
+            border-radius: 26px;
+            color: #666;
+            font-size: 22px;
+          }
+
+          p {
+            font-size: 20px;
+            color: #999999;
+          }
+
+          .choosed {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 52px;
+            padding: 0 16px;
+            width: fit-content;
+            margin-bottom: 12px;
+            border: 1px solid #2D7DFF;
+            border-radius: 26px;
+            font-size: 22px;
+            color: #2D7DFF;
+          }
+        }
+      }
+    }
+
+    & > .bottom {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 98px;
+      padding: 0 32px;
+
+      h2 {
+        font-size: 28px;
+        color: #333333;
+      }
+    }
+  }
+</style>
diff --git a/src/project/weiyang/AppCircle/AppCircle.vue b/src/project/weiyang/AppCircle/AppCircle.vue
new file mode 100644
index 0000000..05af5ff
--- /dev/null
+++ b/src/project/weiyang/AppCircle/AppCircle.vue
@@ -0,0 +1,559 @@
+<template>
+  <div class="AppCircle">
+    <u-navbar :is-back="true" title="邻里互助" title-color="#000" title-width="300" title-size="32" :title-bold="true" :background="backgroundNavbar"></u-navbar>
+    <div class="header-bg">
+      <div class="header">
+        <div class="top">
+          <div class="left">
+            <span @click="changeTab(0)" :class="{active:currIndex === 0}">广场</span>
+            <!-- <span @click="changeTab(1)" :class="{active:currIndex === 1}">社区</span> -->
+          </div>
+          <div class="right" @click="$linkTo('./MyPostList')" hover-class="text-hover">
+            <span>我的贴子<img src="https://cdn.cunwuyun.cn/wechat/wuxi/circle-top-icon.png" alt=""></span>
+            <i></i>
+          </div>
+        </div>
+      </div>
+      <div class="nav-content" v-if="topic.length">
+        <div class="nav">
+          <div
+            class="nav-item"
+            hover-class="text-hover"
+            v-for="(item, index) in topic" :key="index" @click="$linkTo('./TopicDetail?themeId=' + item.id + '&name=' + item.title)">
+            <image :src="item.picUrl" mode="aspectFill"/>
+            <h2>{{ item.title }}</h2>
+          </div>
+          <div class="nav-item" hover-class="text-hover" @click="$linkTo('./Topic')" v-if="topicList.length > 6">
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-more.png"/>
+            <h2>更多</h2>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="AppCircle-list">
+      <div class="item"
+        v-for="(item, index) in list"
+        :key="index"
+        @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
+        <div class="item-top">
+          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+          <div class="right">
+            <h3>{{ item.createUserName }}</h3>
+            <!-- <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span> -->
+            <span>{{ item.createTime }}</span>
+          </div>
+        </div>
+        <div class="item-content">
+          <span hover-stop-propagation v-if="item.topicName"
+                @click.stop="$linkTo('./TopicDetail?themeId=' + item.themeId + '&name=' + item.topicName)">#{{ item.topicName }}</span>
+          <text>{{ item.content }}</text>
+        </div>
+        <div class="item-imgs" v-if="item.files.length">
+          <image mode="aspectFill" @click.stop="previewImage(e.url, item.files)" v-for="(e, i) in item.files" :key="i" :src="e.url"/>
+        </div>
+        <p v-if="item.publishDepartName">{{ item.publishDepartName }}</p>
+        <div class="item-bottom">
+          <button hover-stop-propagation @click.stop="onBtnClick" open-type="share" :data-content="item.content" :data-themeid="item.themeId" :data-id="item.id"
+                  :data-name="item.topicName">
+            <image src="https://cdn.cunwuyun.cn/wechat/wuxi/circle-zf-icon.png"/>
+            <i>{{ item.sharedCount }}</i>
+          </button>
+          <div hover-stop-propagation @click.stop="reciate(item.id, item.appreciateStatus)">
+            <image :src="item.appreciateStatus ? 'https://cdn.cunwuyun.cn/wechat/wuxi/circle-dz-select-icon.png' : 'https://cdn.cunwuyun.cn/wechat/wuxi/circle-dz-icon.png'"/>
+            <i>{{ item.appreciateCount }}</i>
+          </div>
+          <div>
+            <image src="https://cdn.cunwuyun.cn/wechat/wuxi/circle-pl-icon.png"/>
+            <i>{{ item.commentCount }}</i>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!list.length"/>
+    </div>
+    <div class="add" hover-class="text-hover" @click="toAdd">
+      <image src="https://cdn.cunwuyun.cn/wechat/wuxi/circle-add.png" mode="aspectFill" />
+    </div>
+    <AiLogin ref="login"/>
+  </div>
+</template>
+<script>
+  import {mapActions, mapState} from 'vuex'
+
+  export default {
+    customNavigation: true,
+    name: 'AppCircle',
+    appName: '邻里互助',
+    data() {
+      return {
+        currIndex: 0,
+        topicList: [],
+        list: [],
+        isMore: false,
+        current: 1,
+        isFixed: false,
+        statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+        total: 0,
+        backgroundNavbar: {
+          background: 'url(https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-nav-bg.png) no-repeat',
+          backgroundSize: 'cover',
+        }
+      }
+    },
+
+    computed: {
+      ...mapState(['user', 'token']),
+
+      topic() {
+        return this.topicList.filter((v, index) => index < 7)
+      }
+    },
+
+    onLoad(option) {
+      if(option.id) { //有id直接跳入话题详情页
+        this.$linkTo('./TopicDetail?themeId=' + option.id + '&name=' + option.name)
+      }
+      uni.setNavigationBarTitle({
+        title: '邻里互助'
+      });
+
+      this.getTopicList()
+
+      uni.$on('updateList', () => {
+        this.getMyPublishCount()
+        this.changeTab(this.currIndex)
+      })
+
+      if (!this.token) {
+        this.autoLogin({ loginWay: 'qujing' }).then(() => {
+          this.getMyPublishCount()
+        })
+      } else {
+        this.getMyPublishCount()
+      }
+    },
+
+    onPageScroll (params) {
+      this.isFixed = params.scrollTop > 60
+    },
+
+    onUnload() {
+      uni.$off('updateList')
+    },
+
+    methods: {
+      ...mapActions(['autoLogin']),
+
+      previewImage(url, files) {
+        uni.previewImage({
+          current: url,
+          urls: files.map(v => v.url)
+        })
+      },
+
+      onBtnClick(e) {
+      },
+
+      reciate(id, appreciateStatus) {
+        this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.$toast(appreciateStatus ? '取消点赞' : '点赞成功')
+
+            this.changeTab(this.currIndex)
+          }
+        })
+      },
+
+      getMyPublishCount() {
+        this.$instance.post(`/app/appneighborhoodassistance/list`, null, {
+          params: {
+            current: 1,
+            size: 10,
+            listType: 0,
+            createUserId: this.user.id
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.total = res.data.total
+          }
+        })
+      },
+
+      toAdd() {
+        if (this.user.areaId) {
+          this.$linkTo('./Add')
+        } else {
+          this.$dialog.confirm({
+            content: '您只有完成信息认证后，才可进行相关操作。',
+            confirmText: '去认证'
+          }).then(() => {
+            this.$linkTo('/pages/AppMine/userInfo?isFromTabbar=1&path=/pages/AppCircle/AppCircle')
+          }).catch(() => {
+          })
+        }
+      },
+
+      getTopicList() {
+        this.$instance.post(`/app/appneighborhoodassistancetheme/list`, null, {
+          withoutToken: true,
+          params: {
+            current: 1,
+            size: 100,
+            status: 1
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.topicList = res.data.records
+            this.getList()
+          }
+        })
+      },
+
+      changeTab(index) {
+        this.currIndex = index
+        this.isMore = false
+        this.current = 1
+        this.$nextTick(() => {
+          this.getList()
+        })
+      },
+
+      getList() {
+        if (this.isMore) return
+        this.$loading()
+        this.$instance.post(`/app/appneighborhoodassistance/list`, null, {
+          withoutToken: !this.token,
+          params: {
+            current: this.current,
+            size: 10,
+            visibleRange: this.currIndex === 0 ? 1 : 0
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records.map(e => {
+                return {
+                  ...e,
+                  files: e.files.filter((v, index) => index < 3),
+                  topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+                }
+              })]
+            } else {
+              this.list = res.data.records.map(e => {
+                return {
+                  ...e,
+                  files: e.files.filter((v, index) => index < 3),
+                  topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+                }
+              })
+            }
+
+            if (res.data.records.length < 10) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
+          } else {
+            this.isMore = true
+          }
+        }).finally(() => this.$hideLoading())
+      }
+    },
+
+    onReachBottom() {
+      this.getList()
+    },
+
+    onShareAppMessage(e) {
+      this.$instance.post(`/app/appneighborhoodassistance/share?id=${e.target.dataset.id}`).then(res => {
+        if (res.code === 0) {
+          this.changeTab(this.currIndex)
+        }
+      })
+
+      return {
+        title: e.target.dataset.content.substr(0, 20),
+        path: `/mods/AppCircle/Detail?id=${e.target.dataset.id}&themeId=${e.target.dataset.themeid}&name=${e.target.dataset.name}`
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .AppCircle {
+    // padding-top: 100px;
+    padding-bottom: 40px;
+    .header-bg {
+      background: url('https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-header-bg.png') center;
+      background-size: 100% 100%;
+    }
+    .header {
+      width: 100%;
+      opacity: 1;
+      transition: all 0.2s ease;
+    }
+
+    div {
+      box-sizing: border-box;
+    }
+
+    .add {
+      position: fixed;
+      right: 32px;
+      bottom: 32px;
+      z-index: 111;
+
+      image {
+        width: 124px;
+        height: 124px;
+      }
+    }
+
+    .nav-content {
+      padding-top: 16px;
+      width: 100%;
+      height: 192px;
+      margin-bottom: 230px;
+    }
+    .nav {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      margin: 0 32px 24px;
+      padding-top: 30px;
+      background: #ffffff;
+      border-radius: 16px;
+      // box-shadow: inset 0 -1px 0 0 #eeeeee;
+
+      .nav-item {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        width: 25%;
+        padding-bottom: 32px;
+
+        image {
+          width: 108px;
+          height: 108px;
+        }
+
+        h2 {
+          line-height: 32px;
+          margin-top: 8px;
+          font-size: 26px;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .AppCircle-list {
+      .item {
+        margin: 0 32px 24px;
+        padding: 24px 24px 0;
+        background: #ffffff;
+        border-radius: 16px;
+        box-shadow: inset 0 -1px 0 0 #eeeeee;
+
+        .item-top {
+          display: flex;
+          align-items: center;
+
+          image {
+            width: 96px;
+            height: 96px;
+            margin-right: 16px;
+            border-radius: 50%;
+          }
+
+          h3 {
+            color: #333333;
+            text-align: left;
+            font-size: 34px;
+            font-weight: 500;
+          }
+
+          span {
+            margin-top: 12px;
+            color: #999999;
+            font-size: 28px;
+          }
+        }
+
+        .item-imgs {
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+
+          image {
+            height: 208px;
+            width: 33.33%;
+            padding-right: 12px;
+            margin-bottom: 12px;
+            box-sizing: border-box;
+
+            &:nth-of-type(3n) {
+              padding-right: 0;
+            }
+          }
+        }
+
+        & > p {
+          margin: 12px 0;
+          font-family: PingFangSC-Regular;
+          font-size: 26px;
+          color: #999;
+          line-height: 36px;
+        }
+
+        .item-bottom {
+          display: flex;
+          align-items: center;
+          height: 88px;
+          border-top: 1px solid #eeeeee;
+
+          div, button {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex: 1;
+
+            image {
+              width: 40px;
+              height: 40px;
+              margin: 16px;
+            }
+
+            i {
+              color: #687DA6;
+              font-size: 28px;
+            }
+          }
+        }
+
+
+        .item-content {
+          margin: 16px 0;
+          line-height: 1.3;
+          text-align: justify;
+          word-break: break-all;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+
+          span {
+            font-size: 28px;
+            color: #4181FF;
+          }
+
+          text {
+            font-size: 28px;
+            color: #333333;
+          }
+        }
+      }
+    }
+
+    .top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      top: 0;
+      left: 0;
+      z-index: 11;
+      width: 100%;
+      height: 100px;
+      padding: 0 32px;
+
+      .left {
+        display: flex;
+        align-items: center;
+        height: 100px;
+
+        span {
+          position: relative;
+          height: 100px;
+          line-height: 100px;
+          color: #222;
+          font-size: 30px;
+
+          &:first-child {
+            margin-right: 64px;
+          }
+
+          &.active {
+            font-weight: 600;
+            font-size: 32px;
+
+            &::after {
+              position: absolute;
+              bottom: 12px;
+              left: 50%;
+              width: 40px;
+              height: 8px;
+              background: #026AF2;
+              border-radius: 4px;
+              transform: translateX(-50%);
+              content: ' ';
+            }
+          }
+        }
+      }
+
+      .right {
+        position: relative;
+
+        i {
+          position: absolute;
+          top: -6px;
+          right: 0;
+          z-index: 11;
+          width: 16px;
+          height: 16px;
+          border-radius: 50%;
+          background: #FF4747;
+          // height: 24px;
+          // line-height: 24px;
+          // padding: 0 10px;
+          // font-size: 16px;
+          // color: #4181FF;
+          // border-radius: 50%;
+          // border: 2px solid #4181FF;
+          // background: #fff;
+          // box-sizing: border-box;
+          // transform: translateX(50%);
+        }
+
+        span {
+          display: block;
+          font-family: PingFangSC-Regular;
+          font-size: 24px;
+          color: #333;
+          line-height: 54px;
+          text-align: center;
+          width: 164px;
+          height: 56px;
+          border: 1px solid #8A929F;
+          border-radius: 28px;
+          img {
+            display: inline-block;
+            width: 24px;
+            height: 24px;
+            vertical-align: middle;
+          }
+        }
+      }
+    }
+
+    .row2 {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+    }
+  }
+</style>
diff --git a/src/project/weiyang/AppCircle/Detail.vue b/src/project/weiyang/AppCircle/Detail.vue
new file mode 100644
index 0000000..74f8aa4
--- /dev/null
+++ b/src/project/weiyang/AppCircle/Detail.vue
@@ -0,0 +1,791 @@
+<template>
+  <div class="Detail" v-if="pageShow">
+    <div class="top">
+      <div class="item-top">
+        <image :src="info.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+        <div class="right">
+          <h3>{{ info.createUserName }}</h3>
+          <span v-if="info.publishDepartName">{{ info.publishDepartName }}</span>
+        </div>
+        <div class="top-btn" v-if="info.integralTaskId && info.integralTaskInfo.status != 2 && info.showSignBtn"
+             @click="toTask">去参与
+        </div>
+      </div>
+      <div class="item-content">
+        <span v-if="name" @click="toTopic('./TopicDetail?themeId=' + themeId + '&name=' + name)">#【{{ name }}】</span>
+        <text v-if="info.integralTaskId">{{ info.integralTaskInfo.detail }}</text>
+        <text v-else>{{ info.content }}</text>
+      </div>
+      <div v-if="info.integralTaskId">
+        <div class="info-flex">
+          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/address-icon.png" alt="">活动地点：</div>
+          <div class="value">{{ info.integralTaskInfo.address }}</div>
+        </div>
+        <div class="info-flex">
+          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/come-icon.png" alt="">任务类型：</div>
+          <div class="value">{{ info.integralTaskInfo.type == 1 ? '报名得积分' : '打卡得积分' }}</div>
+        </div>
+        <div class="info-flex">
+          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/time-icon.png"
+                                  alt="">{{ info.integralTaskInfo.type == 1 ? '报名时间：' : '进场时间：' }}
+          </div>
+          <div class="value">{{ info.integralTaskInfo.intoBegintime }}至{{ info.integralTaskInfo.intoEndtime }}</div>
+        </div>
+        <div class="info-flex" v-if="info.integralTaskInfo.type != 1">
+          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/leave-icon.png" alt="">离场时间：</div>
+          <div class="value">{{ info.integralTaskInfo.exitBegintime }}至{{ info.integralTaskInfo.exitEndtime }}</div>
+        </div>
+
+      </div>
+      <div class="item-imgs" v-if="info.files && info.files.length">
+        <image mode="aspectFill" @click="previewImage(item.url, info.files)" v-for="(item, index) in info.files"
+               :key="index" :src="item.url"/>
+      </div>
+      <p>{{ info.createTime }}</p>
+      <div class="item-bottom">
+        <button open-type="share">
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png"/>
+          <i>{{ info.sharedCount }}</i>
+        </button>
+        <div>
+          <image
+              :src="info.appreciateStatus ? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png' : 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png'"
+              @click="reciate"/>
+          <i>{{ info.appreciateCount }}</i>
+        </div>
+        <div>
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png"/>
+          <i>{{ info.commentCount }}</i>
+        </div>
+      </div>
+    </div>
+    <div class="comment">
+      <h2>评论</h2>
+      <div class="comment-wrapper">
+        <div class="comment-item" v-for="(item, index) in list" :key="index">
+          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+          <div class="right">
+            <h3>{{ item.createUserName }}</h3>
+            <p>{{ item.content }}</p>
+            <div class="bottom">
+              <span>{{ item.createTime }}</span>
+              <div hover-class="text-hover" @click="replay(item)">回复</div>
+            </div>
+            <div class="replay-list" v-if="item.replyList.length">
+              <div class="replay-item" v-for="replay in item.replyList" :key="replay.id">
+                <image :src="replay.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+                <div class="replay-item__right">
+                  <div class="top">
+                    <div class="replay-left">
+                      <h3>{{ replay.createUserName }}</h3>
+                      <span>回复</span>
+                      <h3>{{ item.createUserName }}</h3>
+                    </div>
+                    <p>{{ replay.createTime }}</p>
+                  </div>
+                  <p>{{ replay.content }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <AiEmpty v-if="!list.length"></AiEmpty>
+      </div>
+    </div>
+    <div class="footer" @click="showComment">
+      <span>请输入评论内容</span>
+      <!-- <div hover-class="hover-class">发送</div> -->
+    </div>
+    <u-popup v-model="isShow" mode="bottom" hidden height="350rpx" border-radius="30">
+      <div class="popup">
+        <div class="popup-title">
+          <h2>请选择</h2>
+          <image @click="isShow = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png"/>
+        </div>
+        <div class="popup-list">
+          <button open-type="share">
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-wechat.png"/>
+            <span>微信</span>
+          </button>
+          <!-- <button open-type="share">
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pyq.png" />
+            <span>朋友圈</span>
+          </button>
+          <button>
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-link.png" />
+            <span>复制链接</span>
+          </button> -->
+        </div>
+      </div>
+    </u-popup>
+    <u-popup v-model="isShowComment" mode="bottom" hidden height="400rpx" border-radius="30" @close="focus = false">
+      <div class="popup">
+        <div class="popup-title">
+          <h2>评论</h2>
+          <image @click="isShowComment = false, focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png"/>
+        </div>
+        <div class="form">
+          <textarea :maxlength="100" :cursor-spacing="10"
+                    :placeholder="commentId ? '回复' + replyName : '请输入评论内容'" :focus="focus"
+                    v-model="content"></textarea>
+          <div>
+            <div class="send-btn" hover-class="hover-class" @click="send">发送</div>
+          </div>
+        </div>
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+import {mapActions, mapState} from 'vuex'
+
+export default {
+  name: 'Detail',
+  appName: '详情',
+
+  data() {
+    return {
+      id: '',
+      isShow: false,
+      info: {},
+      name: '',
+      themeId: '',
+      isFrom: '',
+      list: [],
+      isMore: false,
+      isShowComment: false,
+      current: 1,
+      content: '',
+      focus: false,
+      pageShow: false,
+      commentId: '',
+      replyName: ''
+    }
+  },
+
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+
+  onLoad(query) {
+    this.isFrom = query.isFrom
+    this.id = query.id
+    this.themeId = query.themeId
+    this.name = query.name || ''
+    this.$loading()
+    Promise.resolve(this.token || this.autoLogin()).then(() =>
+        Promise.all([
+          this.getInfo(query.id),
+          this.getCommontList(query.id)
+        ])
+    ).finally(() => this.$hideLoading())
+  },
+  methods: {
+    ...mapActions(['autoLogin']),
+
+    toTask() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        })
+        return false
+      }
+      this.$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${this.info.integralTaskId}`)
+    },
+
+    previewImage(url, files) {
+      uni.previewImage({
+        current: url,
+        urls: files.map(v => v.url)
+      })
+    },
+
+    showComment() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        }).catch(() => {
+        })
+
+        return false
+      }
+
+      this.commentId = ''
+      this.replyName = ''
+      this.isShowComment = true
+
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.focus = true
+        }, 500)
+      })
+    },
+
+    replay(item) {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        }).catch(() => {
+        })
+
+        return false
+      }
+
+      this.commentId = item.id
+      this.replyName = item.createUserName
+
+      this.isShowComment = true
+
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.focus = true
+        }, 500)
+      })
+    },
+
+    getInfo(id) {
+      this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
+        withoutToken: !this.token,
+      }).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.pageShow = true
+        }
+
+        uni.hideLoading()
+      })
+    },
+
+    reciate() {
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
+        if (res.code === 0) {
+          this.$toast(this.info.appreciateStatus ? '取消点赞' : '点赞成功')
+          uni.$emit('updateList')
+          this.getInfo(this.id)
+        }
+        uni.hideLoading()
+      })
+    },
+
+    send() {
+      if (!this.content) {
+        return this.$toast('内容不能为空')
+      }
+
+      this.$loading()
+      this.$instance.post(!this.commentId ? `/app/appneighborhoodassistance/addComment` : `/app/appneighborhoodassistance/addReply`, {
+        content: this.content,
+        naId: this.id,
+        type: this.commentId ? 1 : 0,
+        commentId: this.commentId || ''
+      }).then(res => {
+        uni.hideLoading()
+        if (res.code === 0) {
+          this.isShowComment = false
+          this.$toast('提交成功')
+          this.content = ''
+          this.replyName = ''
+          this.commentId = ''
+          this.focus = false
+
+          this.isMore = false
+          this.current = 1
+
+          this.$nextTick(() => {
+            this.getCommontList(this.id)
+          })
+        }
+      })
+    },
+
+    toTopic(url) {
+      if (this.isFrom === 'topic') {
+        uni.navigateBack({
+          delta: 1
+        })
+      } else {
+        this.$linkTo(url)
+      }
+    },
+
+    getCommontList(id) {
+      if (this.isMore) return
+
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
+        withoutToken: !this.token,
+        params: {
+          id,
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.$hideLoading()
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+          this.current++
+        } else {
+          this.isMore = true
+        }
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    }
+  },
+
+  onReachBottom() {
+    this.getCommontList()
+  },
+
+  // onShareTimeline() {
+  //   return {
+  //     title: this.info.content,
+  //     // path: `/mods/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+  //   }
+  // },
+  onShareAppMessage() {
+    this.$instance.post(`/app/appneighborhoodassistance/share?id=${this.id}`).then(res => {
+      if (res.code === 0) {
+        uni.$emit('updateList')
+        this.getInfo(this.id)
+      }
+    })
+    return {
+      title: this.info.content,
+      path: `/mods/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    }
+  },
+
+}
+</script>
+
+<style scoped lang="scss">
+.Detail {
+  padding-top: 24px;
+  padding-bottom: 130px;
+
+  div {
+    box-sizing: border-box;
+  }
+
+  .popup {
+    height: 400px;
+    border-radius: 20px 20px 0 0;
+
+    .popup-title {
+      position: relative;
+      height: 98px;
+      line-height: 98px;
+      text-align: center;
+
+      image {
+        position: absolute;
+        right: 40px;
+        top: 50%;
+        z-index: 1;
+        width: 32px;
+        height: 32px;
+        transform: translateY(-50%);
+      }
+
+      h2 {
+        color: #333333;
+        font-size: 34px;
+        font-weight: 600;
+      }
+    }
+
+    .popup-list {
+      display: flex;
+      align-items: center;
+      margin-top: 30px;
+
+      button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex: 1;
+        flex-direction: column;
+
+        image {
+          width: 94px;
+          height: 94px;
+          margin-bottom: 8px;
+        }
+
+        span {
+          font-size: 26px;
+          color: #1D2229;
+        }
+      }
+    }
+
+    .form {
+      padding: 0 32px;
+
+      textarea {
+        width: 100%;
+        margin-bottom: 20px;
+        height: 200px;
+        line-height: 1.3;
+        padding: 20px;
+        font-size: 28px;
+        color: #333;
+        box-sizing: border-box;
+        background: #eeeeee;
+      }
+
+      & > div {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+
+      .send-btn {
+        display: inline-block;
+        width: 100px;
+        height: 60px;
+        line-height: 60px;
+        text-align: right;
+        text-align: center;
+        font-size: 26px;
+        color: #fff;
+        border-radius: 30px;
+        background: #2d7dffff;
+      }
+    }
+  }
+
+  .footer {
+    display: flex;
+    align-items: center;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 111;
+    width: 100%;
+    padding: 18px 32px;
+    background: #fff;
+
+    span {
+      flex: 1;
+      height: 70px;
+      line-height: 70px;
+      // margin-right: 16px;
+      padding: 0 24px;
+      border-radius: 36px;
+      font-size: 26px;
+      box-sizing: border-box;
+      background: #eeeeee;
+      color: #999;
+    }
+
+    div {
+      width: 100px;
+      height: 60px;
+      line-height: 60px;
+      text-align: center;
+      font-size: 26px;
+      color: #fff;
+      border-radius: 30px;
+      background: #2d7dffff;
+    }
+  }
+
+  .comment {
+    margin-top: 24px;
+    padding: 32px 32px 26px;
+    background: #fff;
+
+    .comment-wrapper {
+      .comment-item {
+        display: flex;
+        padding: 26px 0;
+
+        &:first-child {
+          padding-top: 0;
+        }
+
+        &:last-child {
+          padding-bottom: 0;
+        }
+
+        & > image {
+          width: 72px;
+          height: 72px;
+          margin-right: 16px;
+          border-radius: 50%;
+        }
+
+        .replay-list {
+          margin-top: 32px;
+
+          .replay-item {
+            display: flex;
+            margin-bottom: 32px;
+
+            &:last-child {
+              margin-bottom: 0;
+            }
+
+            image {
+              width: 48px;
+              height: 48px;
+              margin-right: 16px;
+              border-radius: 50%;
+            }
+
+            .replay-item__right {
+              flex: 1;
+
+              .top {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-bottom: 6px;
+
+                .replay-left {
+                  display: flex;
+                  align-items: center;
+                }
+
+                h3 {
+                  color: #666666;
+                  font-size: 24px;
+                }
+
+                span {
+                  margin: 0 8px;
+                  font-size: 24px;
+                  color: #687DA6;
+                }
+
+                p {
+                  color: #999999;
+                  font-size: 24px;
+                }
+              }
+
+              & > p {
+                line-height: 1.3;
+                color: #333333;
+                font-size: 24px;
+              }
+            }
+          }
+        }
+
+        & > .right {
+          flex: 1;
+          padding-bottom: 32px;
+          border-bottom: 1px solid #EEEEEE;
+
+          & > h3 {
+            line-height: 40px;
+            margin-bottom: 8px;
+            color: #666666;
+            font-size: 28px;
+          }
+
+          & > p {
+            line-height: 42px;
+            margin-bottom: 24px;
+            color: #333;
+            font-size: 28px;
+          }
+
+          .bottom {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            span {
+              color: #999999;
+              font-size: 24px;
+            }
+
+            div {
+              color: #687DA6;
+              font-size: 24px;
+            }
+          }
+        }
+
+        &:last-child {
+          padding-bottom: 0;
+
+          .right {
+            padding-bottom: 0;
+            border-bottom: none;
+          }
+        }
+      }
+    }
+
+    & > h2 {
+      margin-bottom: 32px;
+      color: #3d3d3d;
+      font-size: 38px;
+      font-weight: 600;
+    }
+  }
+
+  & > .top {
+    padding: 32px 32px 0;
+    background: #ffffff;
+    position: relative;
+
+    .item-top {
+      display: flex;
+      align-items: center;
+
+      image {
+        width: 96px;
+        height: 96px;
+        margin-right: 16px;
+        border-radius: 50%;
+      }
+
+      h3 {
+        color: #333333;
+        text-align: left;
+        font-size: 34px;
+        font-weight: 500;
+      }
+
+      span {
+        margin-top: 12px;
+        color: #999999;
+        font-size: 28px;
+      }
+    }
+
+
+    .item-imgs {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      image {
+        height: 208px;
+        width: 33.33%;
+        padding-right: 12px;
+        margin-bottom: 12px;
+        box-sizing: border-box;
+
+        &:nth-of-type(3n) {
+          padding-right: 0;
+        }
+      }
+    }
+
+    & > p {
+      margin: 12px 0;
+      font-size: 28px;
+      color: #333333;
+    }
+
+    .item-bottom {
+      display: flex;
+      align-items: center;
+      height: 88px;
+      border-top: 1px solid #eeeeee;
+
+      div, button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex: 1;
+
+        image {
+          width: 40px;
+          height: 40px;
+          margin: 16px;
+        }
+
+        i {
+          color: #687DA6;
+          font-size: 28px;
+        }
+      }
+    }
+
+    .item-content {
+      margin: 16px 0;
+      line-height: 1.3;
+      text-align: justify;
+
+      span {
+        font-size: 28px;
+        color: #4181FF;
+      }
+
+      text {
+        font-size: 28px;
+        color: #333333;
+      }
+    }
+
+    .info-flex {
+      display: flex;
+      color: #666;
+      font-size: 24px;
+      font-family: "PingFang SC";
+      line-height: 30px;
+      margin-bottom: 16px;
+
+      .label {
+        width: 160px;
+
+        img {
+          width: 30px;
+          height: 30px;
+          margin-right: 8px;
+          vertical-align: bottom;
+        }
+      }
+
+      .value {
+        width: calc(100% - 160px);
+        color: #333;
+        vertical-align: text-top;
+      }
+    }
+
+    .top-btn {
+      width: 154px;
+      height: 56px;
+      line-height: 56px;
+      text-align: center;
+      background-color: #2E7DFF;
+      border-radius: 28px;
+      color: #fff;
+      font-size: 30px;
+      font-family: "PingFang SC";
+      position: absolute;
+      top: 52px;
+      right: 32px;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppCircle/MyPostList.vue b/src/project/weiyang/AppCircle/MyPostList.vue
new file mode 100644
index 0000000..4cc8cd6
--- /dev/null
+++ b/src/project/weiyang/AppCircle/MyPostList.vue
@@ -0,0 +1,748 @@
+<template>
+  <div class="MyPostList">
+    <div class="userinfo">
+      <div class="top">
+        <div class="left">
+          <image :src="user.avatarUrl || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+          <h2>{{ user.nickName }}</h2>
+        </div>
+        <div class="add-btn" hover-class="text-hover" @click="handleAdd">发贴</div>
+      </div>
+      <div class="bottom">
+        <div class="bottom-item" @click="changeTab(0)" :class="[currIndex === 0 ? 'active' : '']">
+          <span>发贴</span>
+          <h2>{{ totalInfo['发帖'] }}</h2>
+        </div>
+        <div class="bottom-item" @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">
+          <span>点赞</span>
+          <h2>{{ totalInfo['点赞'] }}</h2>
+        </div>
+        <div class="bottom-item" @click="changeTab(2)" :class="[currIndex === 2 ? 'active' : '']">
+          <span>评论</span>
+          <h2>{{ totalInfo['评论'] }}</h2>
+        </div>
+      </div>
+    </div>
+    <div class="body">
+      <div class="body-list" v-if="currIndex === 0">
+        <div class="item"
+             v-for="(item, index) in list"
+             :key="index"
+             @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
+          <div class="item-top">
+            <image class="avatar" :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+            <div class="right">
+              <h3>{{ item.createUserName }}</h3>
+              <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span>
+            </div>
+            <image hover-stop-propagation @click.stop="remove(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png"/>
+          </div>
+          <div class="item-content">
+            <span v-if="item.topicName" @click.stop="$linkTo('./TopicDetail?themeId=' + item.themeId + '&name=' + item.topicName)">#【{{ item.topicName }}】</span>
+            <text>{{ item.content }}</text>
+          </div>
+          <div class="item-imgs" v-if="item.files.length">
+            <image mode="aspectFill" hover-stop-propagation @click.stop="previewImage(e.url, item.files)" v-for="(e, i) in item.files" :key="i" :src="e.url"/>
+          </div>
+          <p>{{ item.createTime }}</p>
+          <div class="item-bottom">
+            <div>
+              <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png"/>
+              <i>{{ item.sharedCount }}</i>
+            </div>
+            <div>
+              <image :src="item.appreciateStatus ? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png' : 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png'"/>
+              <i>{{ item.appreciateCount }}</i>
+            </div>
+            <div>
+              <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png"/>
+              <i>{{ item.commentCount }}</i>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="body-list" v-if="currIndex === 1">
+        <div class="item"
+             v-for="(item, index) in list"
+             :key="index"
+             @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
+          <div class="item-top">
+            <image class="avatar" :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+            <div class="right">
+              <h3>{{ item.createUserName }}</h3>
+              <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span>
+            </div>
+            <image hover-stop-propagation @click.stop="removeLike(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png"/>
+          </div>
+          <div class="item-content">
+            <span v-if="item.topicName" @click.stop="$linkTo('./TopicDetail?themeId=' + item.themeId + '&name=' + item.topicName)">#【{{ item.topicName }}】</span>
+            <text>{{ item.content }}</text>
+          </div>
+          <div class="item-imgs" v-if="item.files.length">
+            <image mode="aspectFill" hover-stop-propagation @click.stop="previewImage(e.url, item.files)" v-for="(e, i) in item.files" :key="i" :src="e.url"/>
+          </div>
+          <p>{{ item.createTime }}</p>
+          <div class="item-bottom">
+            <div>
+              <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png"/>
+              <i>{{ item.sharedCount }}</i>
+            </div>
+            <div>
+              <image :src="item.appreciateStatus ? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png' : 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png'"/>
+              <i>{{ item.appreciateCount }}</i>
+            </div>
+            <div>
+              <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png"/>
+              <i>{{ item.commentCount }}</i>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="comment" v-if="currIndex === 2">
+        <div class="comment-item" v-for="(item, index) in list" :key="index">
+          <div class="comment-top">
+            <span>{{ item.myComment.createTime }}</span>
+            <image hover-stop-propagation @click.stop="removeComment(item.myComment.id)" class="remove"
+                   src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png"/>
+          </div>
+          <p>{{ item.myComment.content }}</p>
+          <div
+              class="bottom"
+              @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
+            <div class="item-top">
+              <image class="avatar" :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+              <div class="right">
+                <h3>{{ item.createUserName }}</h3>
+                <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span>
+              </div>
+            </div>
+            <div class="item-content">
+              <span v-if="item.topicName">#【{{ item.topicName }}】</span>
+              <text>{{ item.content }}</text>
+            </div>
+            <div class="item-imgs" v-if="item.files.length">
+              <image mode="aspectFill" hover-stop-propagation @click.stop="previewImage(e.url, item.files)" v-for="(e, i) in item.files" :key="i" :src="e.url"/>
+            </div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!list.length && isMore"></AiEmpty>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'MyPostList',
+  appName: '我的帖子',
+  data() {
+    return {
+      currIndex: 0,
+      totalInfo: {},
+      list: [],
+      isMore: false,
+      current: 1
+    }
+  },
+
+  computed: {
+    ...mapState(['user', 'token']),
+    isAuth: v => !!v.user.areaId
+  },
+
+  onLoad() {
+    this.getTopicList()
+    this.getInfo()
+  },
+
+  methods: {
+    getTopicList() {
+      this.$instance.post(`/app/appneighborhoodassistancetheme/list`, null, {
+        withoutToken: true,
+        params: {
+          current: 1,
+          size: 1000,
+          status: 1
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.topicList = res.data.records
+          this.getMyPublish()
+        }
+      })
+    },
+
+    getInfo() {
+      this.$instance.post(`/app/appneighborhoodassistance/wechatInfo`).then(res => {
+        if (res.code === 0) {
+          this.totalInfo = res.data
+        }
+      })
+    },
+
+    previewImage(url, files) {
+      uni.previewImage({
+        current: url,
+        urls: files.map(v => v.url)
+      })
+    },
+
+    remove(id) {
+      this.$dialog.confirm({
+        title: '温馨提示',
+        content: '您确定删除该帖子吗？'
+      }).then(() => {
+        this.$instance.post(`/app/appneighborhoodassistance/delete?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.$toast('删除成功！')
+            this.getInfo()
+            uni.$emit('updateList')
+            this.changeTab(this.currIndex)
+          }
+        })
+      }).catch(() => {
+      })
+    },
+    removeLike(id) {
+      this.$dialog.confirm({
+        title: '温馨提示',
+        content: '您确定取消点赞吗？'
+      }).then(() => {
+        this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.$toast('删除成功！')
+            this.getInfo()
+            uni.$emit('updateList')
+            this.changeTab(this.currIndex)
+          }
+        })
+      }).catch(() => 0)
+    },
+    removeComment(id) {
+      this.$dialog.confirm({
+        title: '温馨提示',
+        content: '您确定删除吗？'
+      }).then(() => {
+        this.$instance.post(`/app/appneighborhoodassistance/delComment?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.$toast('删除成功！')
+            this.getInfo()
+            uni.$emit('updateList')
+            this.changeTab(this.currIndex)
+          }
+        })
+      }).catch(() => {
+      })
+    },
+    changeTab(index) {
+      this.currIndex = index
+      this.isMore = false
+      this.current = 1
+
+      this.$nextTick(() => {
+        if (this.currIndex === 0) {
+          this.getMyPublish()
+        } else if (this.currIndex === 1) {
+          this.myPraiseList()
+        } else {
+          this.getMyCommentList()
+        }
+      })
+    },
+
+    getMyPublish() {
+      if (this.isMore) return
+
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/list`, null, {
+        params: {
+          current: this.current,
+          size: 10,
+          listType: 0,
+          createUserId: this.user.id
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.$hideLoading()
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records.map(e => {
+              return {
+                ...e,
+                files: e.files.filter((v, index) => index < 3),
+                topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+              }
+            })]
+          } else {
+            this.list = res.data.records.map(e => {
+              return {
+                ...e,
+                files: e.files.filter((v, index) => index < 3),
+                topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+              }
+            })
+          }
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+          this.current = this.current + 1
+        } else {
+          this.isMore = true
+        }
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    },
+
+    getMyCommentList() {
+      if (this.isMore) return
+
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/list`, null, {
+        params: {
+          current: this.current,
+          size: 10,
+          listType: 2
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.$hideLoading()
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records.map(e => {
+              return {
+                ...e,
+                files: e.files.filter((v, index) => index < 3),
+                topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+              }
+            })]
+          } else {
+            this.list = res.data.records.map(e => {
+              return {
+                ...e,
+                files: e.files.filter((v, index) => index < 3),
+                topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+              }
+            })
+          }
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          this.isMore = true
+        }
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    },
+
+    myPraiseList() {
+      if (this.isMore) return
+
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/list`, null, {
+        params: {
+          current: this.current,
+          size: 10,
+          listType: 1
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.$hideLoading()
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records.map(e => {
+              return {
+                ...e,
+                files: e.files.filter((v, index) => index < 3),
+                topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+              }
+            })]
+          } else {
+            this.list = res.data.records.map(e => {
+              return {
+                ...e,
+                files: e.files.filter((v, index) => index < 3),
+                topicName: this.topicList.filter(v => v.id === e.themeId).length ? this.topicList.filter(v => v.id === e.themeId)[0].title : ''
+              }
+            })
+          }
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          this.isMore = true
+        }
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    },
+    handleAdd() {
+      if (this.isAuth) {
+        this.$linkTo('./Add')
+      } else {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        }).catch(() => 0)
+      }
+    }
+  },
+
+  onReachBottom() {
+    if (this.currIndex === 0) {
+      this.getMyPublish()
+    } else if (this.currIndex === 1) {
+      this.myPraiseList()
+    } else {
+      this.getMyCommentList()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.MyPostList {
+  padding-bottom: 40px;
+  box-sizing: border-box;
+
+  * {
+    box-sizing: border-box;
+  }
+
+  .userinfo {
+    position: sticky;
+    top: 0px;
+    margin: 0 0 24px;
+    border-top: 24px solid #eee;
+    background: #fff;
+    z-index: 202303211143;
+
+    .top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32px 56px;
+      border-bottom: 1px solid #eee;
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        image {
+          width: 96px;
+          height: 96px;
+          margin-right: 16px;
+          border-radius: 50%;
+        }
+
+        h2 {
+          color: #333333;
+          font-size: 34px;
+          font-weight: 600;
+        }
+      }
+
+      .add-btn {
+        width: 132px;
+        height: 56px;
+        line-height: 56px;
+        text-align: center;
+        font-size: 30px;
+        color: #fff;
+        border-radius: 26px;
+        background: #2D7DFF;
+      }
+    }
+
+    .bottom {
+      display: flex;
+      height: 120px;
+      align-items: center;
+      box-sizing: border-box;
+
+      .bottom-item {
+        display: flex;
+        position: relative;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        flex: 1;
+        text-align: center;
+        height: 100%;
+
+        &.active:after {
+          position: absolute;
+          bottom: 0;
+          left: 50%;
+          z-index: 1;
+          width: 40px;
+          height: 6px;
+          border-radius: 3px;
+          background: #2D7DFF;
+          transform: translateX(-50%);
+          content: ' ';
+        }
+
+        span {
+          font-size: 24px;
+          color: #999;
+        }
+
+        h2 {
+          line-height: 48px;
+          font-size: 34px;
+          color: #333;
+        }
+      }
+    }
+  }
+
+  .comment {
+    padding: 0 32px;
+
+    .comment-item {
+      margin-bottom: 24px;
+      padding: 28px 24px;
+      border-radius: 18px;
+      background: #fff;
+
+      .comment-top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        span {
+          font-size: 28px;
+          color: #333;
+        }
+
+        image {
+          width: 40px;
+          height: 40px;
+        }
+      }
+
+      & > p {
+        line-height: 1.3;
+        margin: 26px 0 20px;
+        font-size: 28px;
+        color: #666666;
+      }
+
+      .bottom {
+        padding: 24px;
+        background: #f6f6f6;
+      }
+
+      .item-top {
+        display: flex;
+        align-items: center;
+
+        .avatar {
+          width: 96px;
+          height: 96px;
+          margin-right: 16px;
+          border-radius: 50%;
+        }
+
+        .right {
+          flex: 1;
+        }
+
+        .remove {
+          width: 40px;
+          height: 40px;
+        }
+
+        h3 {
+          color: #333333;
+          text-align: left;
+          font-size: 34px;
+          font-weight: 500;
+        }
+
+        span {
+          margin-top: 12px;
+          color: #999999;
+          font-size: 28px;
+        }
+      }
+
+      .item-imgs {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+
+        image {
+          height: 208px;
+          width: 33.33%;
+          padding-right: 12px;
+          margin-bottom: 12px;
+          box-sizing: border-box;
+
+          &:nth-of-type(3n) {
+            padding-right: 0;
+          }
+        }
+      }
+
+      .item-content {
+        margin: 16px 0;
+        line-height: 1.3;
+        text-align: justify;
+        word-break: break-all;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+
+        span {
+          font-size: 28px;
+          color: #4181FF;
+        }
+
+        text {
+          font-size: 28px;
+          color: #333333;
+        }
+      }
+    }
+  }
+
+  .body-list {
+    .item {
+      margin: 0 32px 24px;
+      padding: 24px 24px 0;
+      background: #ffffff;
+      border-radius: 16px;
+      box-shadow: inset 0 -1px 0 0 #eeeeee;
+
+      .item-top {
+        display: flex;
+        align-items: center;
+
+        .avatar {
+          width: 96px;
+          height: 96px;
+          margin-right: 16px;
+          border-radius: 50%;
+        }
+
+        .right {
+          flex: 1;
+        }
+
+        .remove {
+          width: 40px;
+          height: 40px;
+        }
+
+        h3 {
+          color: #333333;
+          text-align: left;
+          font-size: 34px;
+          font-weight: 500;
+        }
+
+        span {
+          margin-top: 12px;
+          color: #999999;
+          font-size: 28px;
+        }
+      }
+
+      .item-imgs {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+
+        image {
+          height: 208px;
+          width: 33.33%;
+          padding-right: 12px;
+          margin-bottom: 12px;
+          box-sizing: border-box;
+
+          &:nth-of-type(3n) {
+            padding-right: 0;
+          }
+        }
+      }
+
+      & > p {
+        margin: 12px 0;
+        font-size: 28px;
+        color: #333333;
+      }
+
+      .item-bottom {
+        display: flex;
+        align-items: center;
+        height: 88px;
+        border-top: 1px solid #eeeeee;
+
+        div {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex: 1;
+
+          image {
+            width: 40px;
+            height: 40px;
+            margin: 16px;
+          }
+
+          i {
+            color: #687DA6;
+            font-size: 28px;
+          }
+        }
+      }
+
+      .item-content {
+        margin: 16px 0;
+        line-height: 1.3;
+        text-align: justify;
+        word-break: break-all;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+
+        span {
+          font-size: 28px;
+          color: #4181FF;
+        }
+
+        text {
+          font-size: 28px;
+          color: #333333;
+        }
+      }
+    }
+  }
+  .row2 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppCircle/Topic.vue b/src/project/weiyang/AppCircle/Topic.vue
new file mode 100644
index 0000000..be0126f
--- /dev/null
+++ b/src/project/weiyang/AppCircle/Topic.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="Topic">
+    <div
+      class="Topic-item"
+      v-for="(item, index) in list"
+      :key="index"
+      hover-class="text-hover"
+      @click="$linkTo('./TopicDetail?themeId=' + item.id + '&name=' + item.title)">
+      <h2>#{{item.title}}</h2>
+      <span>去看看</span>
+    </div>
+    <AiLogin ref="login"/>
+  </div>
+</template>
+<script>
+
+  export default {
+    name: 'Topic',
+    appName: '更多话题',
+
+    data () {
+      return {
+        current: 1,
+        pages: 2,
+        list: []
+      }
+    },
+    onLoad() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        if (this.current > this.pages) return
+        this.$instance.post(`/app/appneighborhoodassistancetheme/list?current=${this.current}&size=20&status=1`).then(res => {
+          if (res.code === 0 && res.data) {
+            const list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+            this.pages = Math.ceil(res.data.total / 10)
+            this.list = list
+          }
+        })
+      },
+      toTopicDetail(id) {
+        uni.navigateTo({url: `./TopicDetail?id=${id}`})
+      }
+    },
+    onReachBottom() {
+      this.current ++
+      this.getList()
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .Topic {
+    min-height: 100vh;
+    background: #fff;
+    padding-bottom: 40px;
+    border-top: 24px solid #f4f6fa;
+    box-sizing: border-box;
+
+    div {
+      box-sizing: border-box;
+    }
+
+    .Topic-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 20px 32px;
+
+      h2 {
+        font-size: 30px;
+        color: #333333;
+      }
+
+      span {
+        width: 126px;
+        height: 52px;
+        line-height: 52px;
+        text-align: center;
+        border-radius: 26px;
+        border: 2px solid #2d7dffff;
+        font-size: 24px;
+        color: #2D7DFF;
+      }
+    }
+  }
+</style>
diff --git a/src/project/weiyang/AppCircle/TopicDetail.vue b/src/project/weiyang/AppCircle/TopicDetail.vue
new file mode 100644
index 0000000..c14add3
--- /dev/null
+++ b/src/project/weiyang/AppCircle/TopicDetail.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="TopicDetail">
+    <h2>#{{ name }}</h2>
+    <p>贴子：{{ total }}</p>
+    <div class="tab">
+      <span @click="changeTab(0)" :class="[currIndex === 0 ? 'active' : '']">广场</span>
+      <!-- <span @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">社区</span> -->
+    </div>
+    <div class="AppCircle-list">
+      <div
+        class="item"
+        v-for="(item, index) in list"
+        :key="index"
+        @click="$linkTo('./Detail?isFrom=topic&id=' + item.id + '&name=' + name + '&themeId=' + themeId)">
+        <div class="item-top">
+          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
+          <div class="right">
+            <h3>{{ item.createUserName }}</h3>
+            <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span>
+          </div>
+        </div>
+        <div class="item-content">
+          <text v-if="item.integralTaskId">{{ item.integralTaskInfo.detail }}</text>
+          <text v-else>{{ item.content }}</text>
+        </div>
+        <div class="item-imgs" v-if="item.files.length">
+          <image mode="aspectFill" hover-stop-propagation @click.stop="previewImage(e.url, item.files)" v-for="(e, i) in item.files" :key="i" :src="e.url" />
+        </div>
+        <p>{{ item.createTime }}</p>
+        <div class="item-bottom">
+          <button
+            hover-stop-propagation
+            @click.stop=""
+            open-type="share"
+            :data-content="item.content"
+            :data-themeid="item.themeId"
+            :data-id="item.id"
+            :data-name="item.topicName">
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png" />
+            <i>{{ item.sharedCount }}</i>
+          </button>
+          <div hover-stop-propagation @click.stop="reciate(item.id, item.appreciateStatus)">
+            <image :src="item.appreciateStatus ? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png' : 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png'" />
+            <i>{{ item.appreciateCount }}</i>
+          </div>
+          <div>
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png" />
+            <i>{{ item.commentCount }}</i>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!list.length"></AiEmpty>
+    </div>
+    <AiLogin ref="login"/>
+  </div>
+</template>
+<script>
+  import { mapActions, mapState } from 'vuex'
+
+  export default {
+    name: 'TopicDetail',
+    appName: '话题详情',
+
+    data () {
+      return {
+        currIndex: 0,
+        name: '',
+        themeId: '',
+        list: [],
+        isMore: false,
+        current: 1,
+        total: 0
+      }
+    },
+
+    computed: {
+      ...mapState(['user', 'token'])
+    },
+
+    onLoad (query) {
+      this.themeId = query.themeId
+      this.name = query.name
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      ...mapActions(['autoLogin', 'authCheck']),
+
+      changeTab (index) {
+        this.currIndex = index
+        this.isMore = false
+        this.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+        })
+      },
+
+      reciate (id, appreciateStatus) {
+        this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.$toast(appreciateStatus ? '取消点赞' : '点赞成功')
+
+            this.changeTab(this.currIndex)
+          }
+        })
+      },
+
+      previewImage (url, files) {
+        uni.previewImage({
+          current: url,
+          urls: files.map(v => v.url)
+        })
+      },
+
+      getList () {
+        if (this.isMore) return
+
+        this.$loading()
+        this.$instance.post(`/app/appneighborhoodassistance/list`, null, {
+          params: {
+            current: this.current,
+            size: 10,
+            themeId: this.themeId,
+            visibleRange: this.currIndex === 0 ? 1 : 0
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.$hideLoading()
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records]
+            } else {
+              this.list = res.data.records
+            }
+
+            this.total = res.data.total
+
+            if (res.data.records.length < 10) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
+          } else {
+            this.isMore = true
+          }
+        }).catch(() => {
+          this.$hideLoading()
+        })
+      }
+    },
+
+    onReachBottom () {
+      this.getList()
+    },
+
+    onShareAppMessage (e) {
+      this.$instance.post(`/app/appneighborhoodassistance/share?id=${e.target.dataset.id}`).then(res => {
+        if (res.code === 0) {
+          this.changeTab(this.currIndex)
+        }
+      })
+
+      return {
+        title: e.target.dataset.content,
+        path: `/mods/AppCircle/Detail?id=${e.target.dataset.id}&themeId=${e.target.dataset.themeid}&name=${e.target.dataset.name}`
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .TopicDetail {
+    padding-top: 32px;
+    padding-bottom: 40px;
+
+    div {
+      box-sizing: border-box;
+    }
+
+    & > h2 {
+      margin: 0 32px 24px;
+      font-size: 46px;
+      color: #3d3d3d;
+    }
+
+    .tab {
+      margin: 0 32px 24px;
+    }
+
+    & > p {
+      margin: 0 32px 12px;
+      color: #999999;
+      font-size: 28px;
+    }
+
+    .AppCircle-list {
+      .item {
+        margin: 0 24px 24px;
+        padding: 24px 24px 0;
+        background: #ffffff;
+        border-radius: 16px;
+        box-shadow: inset 0 -1px 0 0 #eeeeee;
+
+        .item-top {
+          display: flex;
+          align-items: center;
+
+          image {
+            width: 96px;
+            height: 96px;
+            margin-right: 16px;
+            border-radius: 50%;
+          }
+
+          h3 {
+            color: #333333;
+            text-align: left;
+            font-size: 34px;
+            font-weight: 500;
+          }
+
+          span {
+            margin-top: 12px;
+            color: #999999;
+            font-size: 28px;
+          }
+        }
+
+        .item-imgs {
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+
+          image {
+            height: 208px;
+            width: 33.33%;
+            padding-right: 12px;
+            margin-bottom: 12px;
+            box-sizing: border-box;
+
+            &:nth-of-type(3n) {
+              padding-right: 0;
+            }
+          }
+        }
+
+        & > p {
+          margin: 12px 0;
+          font-size: 28px;
+          color: #333333;
+        }
+
+        .item-bottom {
+          display: flex;
+          align-items: center;
+          height: 88px;
+          border-top: 1px solid #eeeeee;
+
+          div, button {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex: 1;
+
+            image {
+              width: 40px;
+              height: 40px;
+              margin: 16px;
+            }
+
+            i {
+              color: #687DA6;
+              font-size: 28px;
+            }
+          }
+        }
+
+        .item-content {
+          margin: 16px 0;
+          line-height: 1.3;
+          text-align: justify;
+
+          span {
+            font-size: 28px;
+            color: #4181FF;
+          }
+
+          text {
+            font-size: 28px;
+            color: #333333;
+          }
+        }
+      }
+    }
+
+    .tab {
+      display: flex;
+      align-items: center;
+      height: 100px;
+
+      span {
+        position: relative;
+        height: 100px;
+        line-height: 100px;
+        color: #222;
+        font-size: 30px;
+
+        &:first-child {
+          margin-right: 64px;
+        }
+
+        &.active {
+          font-weight: 600;
+          font-size: 32px;
+
+          &::after {
+            position: absolute;
+            bottom: 12px;
+            left: 50%;
+            width: 40px;
+            height: 6px;
+            border-radius: 3px;
+            background: #2d7dffff;
+            transform: translateX(-50%);
+            content: ' ';
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/project/weiyang/AppCircle/circle-selected.png b/src/project/weiyang/AppCircle/circle-selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..706bb49b03b17648146332c857e2ae351d01e149
GIT binary patch
literal 2246
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
U`iXzZp#T5?07*qoM6N<$g11On9smFU

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppCircle/circle.png b/src/project/weiyang/AppCircle/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe9d537370a7d71ad93806e877633720178884bf
GIT binary patch
literal 2288
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
KMNUMnLSTZ;s!|OA

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppGeneralElection/AppGeneralElection.vue b/src/project/weiyang/AppGeneralElection/AppGeneralElection.vue
new file mode 100644
index 0000000..837e00f
--- /dev/null
+++ b/src/project/weiyang/AppGeneralElection/AppGeneralElection.vue
@@ -0,0 +1,219 @@
+<template>
+  <view class="page">
+    <view v-if="isShow" style="height:100%;">
+      <view class="session-list">
+        <view class="session-item" v-for="(item, index) in list" :key="index">
+          <view class="item-top">
+            <view class="item-title mar-b9">{{item.title}}</view>
+            <view class="item-info">
+              <text class="info-label">选举状态：</text>
+              <text class="info-value" :class="'item-status'+item.status">
+                {{$dict.getLabel('electionStatus',item.status)||'-'}}
+              </text>
+            </view>
+            <view class="item-info mar-b9">
+              <text class="info-label">应选人数：</text>
+              <text class="info-value" style="display:inline-block;width: 100rpx;">{{item.chooseNumber || '0'}}</text>
+              <text class="info-label">候选人数：</text>
+              <text class="info-value">{{item.candidatesNumber || '0'}}</text>
+            </view>
+          </view>
+          <view class="item-bottom">
+            <text class="item-btn" v-if="item.status == 1 && item.partyVoteStatus === null" @click="toDetail(item.id)">去投票</text>
+            <text class="item-btn border-999" v-if="item.status == 2 && item.partyVoteStatus != null" @click="showTips(item.status)">已投票</text>
+            <text class="item-btn border-999" v-if="item.status == 1 && item.partyVoteStatus != null" @click="showTips(item.status)">已投票</text>
+            <text class="item-btn border-999" v-if="item.status == 0" @click="showTips(item.status)">未开始</text>
+            <text class="item-btn border-999" v-if="item.status == 2 && item.partyVoteStatus === null" @click="showTips(item.status)">未投票</text>
+          </view>
+          <view class="item-status" :class="'item-status'+item.status">
+            {{$dict.getLabel('electionStatus',item.status)||'-'}}
+          </view>
+        </view>
+      </view>
+      <AiEmpty v-if="list.length == 0"/>
+    </view>
+  </view>
+</template>
+<script>
+  import {mapState} from 'vuex'
+  export default {
+    name: 'AppGeneralElection',
+    appName: "换届选举",
+    computed: {
+      ...mapState(['user', 'token']),
+    },
+    data() {
+      return {
+        isShow: true,
+        list: [],
+        pageNum: 1,
+        pageSize: 10,
+        pages: 2,
+        partyId: ''
+      };
+    },
+    onLoad() {
+      this.$dict.load('electionStatus').then(() => {
+        this.partyId =this.user.partyId
+        this.getList()
+      })
+    },
+    onShow() {
+      this.$dict.load('electionStatus').then(() => {
+        this.partyId = this.user.partyId
+        this.getList()
+      })
+    },
+    methods: {
+      getList() {
+        if (this.pageNum > this.pages) return
+        this.$instance.post(`/app/appgeneralelectioninfo/list-xcx?partyId=${this.partyId}&current=${this.pageNum}&size=${this.pageSize}`, null, {}).then(res => {
+          if (res.code == 0) {
+            const list = this.pageNum > 1 ? [...this.list, ...res.data.records] : res.data.records
+            this.pages = Math.ceil(res.data.total / 10)
+            this.list = list
+          }
+        })
+      },
+      toSessionDetail(id) {
+        // uni.navigateTo({
+        //   url: '../threeSessions/threeSessionsDetail?id=' + id
+        // })
+      },
+      toDetail(id) {
+        uni.navigateTo({
+          url: `./generalElectionDetail?id=${id}`
+        })
+      },
+      showTips(status) {
+        var title = '投票未开始'
+        if (status == 1) {
+          title = '已投票'
+        }
+        if (status == 2) {
+          title = '已结束'
+        }
+        uni.showToast({
+          title: title,
+          icon: "none"
+        })
+      }
+    },
+    onReachBottom() {
+      this.pageNum = this.pageNum + 1
+      this.getList()
+    }
+  };
+</script>
+<style lang="scss" scope>
+
+  .page {
+    background-color: #F3F6F9;
+
+    .session-list {
+      .session-item {
+        width: 686px;
+        margin: 32px auto 0 auto;
+        background-color: #fff;
+        // min-height: 308px;
+        position: relative;
+        overflow: hidden;
+        border-radius: 8px;
+
+        .item-top {
+          padding: 32px 32px 0 32px;
+        }
+
+        .item-title {
+          font-size: 32px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 44px;
+          word-break: break-all;
+        }
+
+        .item-info {
+          line-height: 42px;
+          font-size: 28px;
+          margin-bottom: 8px;
+
+          .info-label {
+            color: #999;
+          }
+
+        }
+
+        .item-bottom {
+          border-top: 2px solid #EEE;
+          text-align: right;
+          padding-right: 34px;
+          box-sizing: border-box;
+          line-height: 96px;
+
+          .item-btn {
+            display: inline-block;
+            width: 152px;
+            height: 52px;
+            line-height: 52px;
+            border-radius: 28px;
+            text-align: center;
+            font-size: 28px;
+            margin-left: 32px;
+            border: 2px solid #E1E1E1;
+            color: #1365DD;
+            border: 2px solid #1365DD;
+          }
+        }
+
+        .info-value {
+          color: #343D65;
+          background-color: #fff !important;
+        }
+
+        .item-status {
+          position: absolute;
+          top: 14px;
+          right: -30rpx;
+          width: 140px;
+          text-align: center;
+          line-height: 44px;
+          font-size: 24px;
+          transform: rotate(45deg);
+        }
+
+        .item-status0 {
+          color: #FF9B2B;
+          background-color: #FFF3E8;
+        }
+
+        .item-status1 {
+          color: #5A98F2;
+          background-color: #F1F6FF;
+        }
+
+        .item-status2 {
+          color: #f46;
+          background-color: #FFECF0;
+        }
+
+        .border-999 {
+          color: #999 !important;
+          border-color: #999 !important;
+        }
+
+        .mar-b9 {
+          margin-bottom: 18px !important;
+        }
+      }
+    }
+
+    .no-affairs {
+      width: 100%;
+      height: calc(100% - 210rpx);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+</style>
diff --git a/src/project/weiyang/AppGeneralElection/generalElectionDetail.vue b/src/project/weiyang/AppGeneralElection/generalElectionDetail.vue
new file mode 100644
index 0000000..144a3ac
--- /dev/null
+++ b/src/project/weiyang/AppGeneralElection/generalElectionDetail.vue
@@ -0,0 +1,377 @@
+<template>
+  <view class="page">
+    <div class="line-bg"></div>
+    <div class="banner-top">
+      <image
+        src="https://cdn.cunwuyun.cn/img/election-banner.png"
+        class="banner-img"
+      ></image>
+      <span class="tips" @click="viewMask()"
+        ><image
+          src="https://cdn.cunwuyun.cn/img/explain-icon.png"
+          class="tips-icon"
+        ></image
+        >投票说明</span
+      >
+      <image
+        src="https://cdn.cunwuyun.cn/img/party-icon.png"
+        class="party-icon"
+      ></image>
+      <div class="banner-info">
+        <div class="title">{{ title }}</div>
+        <div class="num-info">应选人{{ chooseNumber || "0" }}人</div>
+        <div class="user-list">
+          <div class="user-item user-item-title">
+            <span>候选人</span>
+            <span>赞成</span>
+            <span>反对</span>
+            <span>弃权</span>
+          </div>
+          <div class="user-item" v-for="(item, index) in userList" :key="index">
+            <span>{{ item.candidateUserName }}</span>
+            <span>
+              <image
+                :src="
+                  item.voteStatus == '0'
+                    ? 'https://cdn.cunwuyun.cn/img/circle-check.png'
+                    : 'https://cdn.cunwuyun.cn/img/circle-icon.png'
+                "
+                class="check-icon"
+                @click="checkClick(index, '0')"
+              ></image>
+            </span>
+            <span>
+              <image
+                :src="
+                  item.voteStatus == '1'
+                    ? 'https://cdn.cunwuyun.cn/img/circle-check.png'
+                    : 'https://cdn.cunwuyun.cn/img/circle-icon.png'
+                "
+                class="check-icon"
+                @click="checkClick(index, '1')"
+              ></image>
+            </span>
+            <span>
+              <image
+                :src="
+                  item.voteStatus == '2'
+                    ? 'https://cdn.cunwuyun.cn/img/circle-check.png'
+                    : 'https://cdn.cunwuyun.cn/img/circle-icon.png'
+                "
+                class="check-icon"
+                @click="checkClick(index, '2')"
+              ></image>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-bottom">
+      <div class="btn" @click="submitVote()">提交投票</div>
+    </div>
+    <view class="mask" v-if="showMask">
+      <view class="mask-content">
+        <view class="mask-title">投票说明</view>
+        <!-- <view class="mask-text">1、本次选举采用无记名投票方式，差额选举的办法</view>
+        <view class="mask-text">2、选举工作由选举委员会主持，未尽事宜由选举委员会研究决定。</view> -->
+        <view class="mask-text">{{ votingInstructions }}</view>
+        <view class="mask-btn" @click="closeMask()">关闭</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  computed: {
+    ...mapState(["user"]),
+  },
+  data() {
+    return {
+      detailId: "",
+      userList: [],
+      showMask: false,
+      title: "",
+      chooseNumber: "",
+      partyId: "",
+      votingInstructions: "",
+    };
+  },
+  onLoad(options) {
+    this.detailId = options.id;
+    this.partyId = this.user.partyId;
+    this.getDetailInfo();
+  },
+  methods: {
+    submitVote() {
+      var flags = true;
+      var checkNum = 0;
+      var checkList = [];
+      this.userList.map((item) => {
+        if (item.voteStatus) {
+          checkNum++;
+          checkList.push(item);
+        }
+      });
+
+      if (checkNum > this.chooseNumber) {
+        uni.showToast({ title: `投票人数大于应选人数，请重试`, icon: "none" });
+        flags = false;
+      }
+      if (checkNum < this.chooseNumber) {
+        uni.showToast({ title: `请给候选人投票`, icon: "none" });
+        flags = false;
+      }
+      // if (checkNum < this.userList.length) {
+      //   uni.showToast({title: `请给候选人投票`, icon: 'none'})
+      //   flags = false
+      // }
+
+      if (!flags) return;
+      this.$instance
+        .post("/app/appgeneralelectioninfo/vote", checkList)
+        .then((res) => {
+          if (res.code == 0) {
+            uni.showToast({ title: "投票成功！" });
+            setTimeout(function () {
+              uni.navigateBack({
+                delta: 1,
+              });
+            }, 1000);
+          }
+        });
+    },
+    checkClick(index, status) {
+      if (this.userList[index].voteStatus == status) {
+        this.userList[index].voteStatus = "";
+      } else {
+        this.userList[index].voteStatus = status;
+      }
+    },
+    closeMask() {
+      this.showMask = false;
+    },
+    viewMask() {
+      this.showMask = true;
+    },
+    getDetailInfo() {
+      this.$instance
+        .post(
+          `/app/appgeneralelectioninfo/queryDetailById?id=${this.detailId}`,
+          null
+        )
+        .then((res) => {
+          if (res.data) {
+            this.votingInstructions = res.data.votingInstructions;
+            this.chooseNumber = res.data.chooseNumber;
+            this.title = res.data.title;
+            res.data.candidateUsers.map((item) => {
+              var info = {
+                candidateUserId: item.id,
+                candidateUserName: item.name,
+                electionId: this.detailId,
+                voteStatus: "",
+                voterUserId: this.partyId,
+              };
+              this.userList.push(info);
+            });
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scope>
+.page {
+  .line-bg {
+    width: 100%;
+    height: 12px;
+    background-color: #e60012;
+  }
+
+  .banner-top {
+    width: 100%;
+    height: 340px;
+    position: relative;
+
+    .banner-img {
+      position: absolute;
+      width: 100%;
+      height: 340px;
+      top: 0;
+      left: 0;
+      z-index: 1;
+    }
+
+    .tips {
+      position: absolute;
+      right: 42px;
+      color: #fff;
+      font-size: 30px;
+      z-index: 88;
+      top: 137px;
+
+      .tips-icon {
+        width: 40px;
+        height: 40px;
+        vertical-align: text-top;
+        margin-right: 8px;
+      }
+    }
+
+    .party-icon {
+      position: absolute;
+      z-index: 3;
+      width: 140px;
+      height: 140px;
+      left: 50%;
+      margin-left: -70rpx;
+      top: 180px;
+    }
+
+    .banner-info {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 2;
+      width: 100%;
+      color: #fff;
+      padding-bottom: 136px;
+      
+
+      .title {
+        width: 100%;
+        font-size: 44px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        text-align: center;
+        padding: 12px 0 10px 0;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+      }
+
+      .num-info {
+        width: 100%;
+        font-size: 36px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        line-height: 50px;
+        text-align: center;
+        margin-bottom: 80px;
+      }
+
+      .user-list {
+        width: 710px;
+        background: #fff;
+        border-radius: 24px 24px 0 0;
+        margin: 0 auto;
+
+        .user-item {
+          width: 688px;
+          height: 112px;
+          line-height: 112px;
+          margin: 0 auto;
+          border-bottom: 2px solid #eee;
+          display: flex;
+          font-size: 32px;
+          color: #666;
+
+          span {
+            flex: 1;
+            text-align: center;
+
+            .check-icon {
+              width: 40px;
+              height: 40px;
+            }
+          }
+        }
+
+        .user-item:nth-last-of-type(1) {
+          border-bottom: 0;
+        }
+
+        .user-item-title {
+          color: #333;
+          font-size: 34px;
+          padding-top: 88px;
+        }
+      }
+    }
+  }
+
+  .btn-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 9;
+    width: 100%;
+
+    .btn {
+      width: 100%;
+      line-height: 112px;
+      background: #e60012;
+      color: #fff;
+      font-size: 32px;
+      text-align: center;
+    }
+  }
+
+  .mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.3);
+    z-index: 99;
+
+    .mask-content {
+      width: 560px;
+      height: 680px;
+      background: #fff;
+      border-radius: 8px;
+      border: 2px solid rgba(151, 151, 151, 1);
+      margin: 200px auto 0;
+      padding: 48px 48px 0;
+      box-sizing: border-box;
+      
+
+      .mask-title {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        line-height: 44px;
+        margin-bottom: 36px;
+      }
+
+      .mask-text {
+        width: 100%;
+        line-height: 44px;
+        font-size: 28px;
+        height: 460px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        color: #333;
+        word-break: break-all;
+        overflow-y: scroll;
+      }
+
+      .mask-btn {
+        width: 128px;
+        height: 40px;
+        font-size: 28px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #1365dd;
+        line-height: 40px;
+        margin: 30px 0 20px 332px;
+        text-align: center;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppModules/AppModules.vue b/src/project/weiyang/AppModules/AppModules.vue
new file mode 100644
index 0000000..e0278d0
--- /dev/null
+++ b/src/project/weiyang/AppModules/AppModules.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="wrapper">
+    <!-- <div class="header" :class="[isFixed ? 'header-active' : '']">
+      <div class="status-bar" :style="{height: statusBarHeight + 'px'}"></div>
+      <div class="nav-bar">
+        <h2>服务</h2>
+      </div>
+    </div> -->
+    <u-navbar :is-back="false" title="服务" title-color="#000" title-width="300" title-size="32" :title-bold="true" :background="backgroundNavbar"></u-navbar>
+    <div class="header-bg"></div>
+    <div class="body" v-if="list">
+      <div class="card" v-for="(obj,key) in list" :key="key">
+        <div class="title">{{ $dict.getLabel('homeConfigMenuType', key) }}</div>
+        <u-grid :col="4" hover-class="text-hover">
+          <u-grid-item
+              v-for="(item, index) in obj" :key="index" class="grid-item" :custom-style="{padding:'9px 0'}"
+              @click="handleClick(item)">
+            <img :src="item.pictureUrl" alt=""/>
+            <div class="grid-text">{{ item.name }}</div>
+          </u-grid-item>
+        </u-grid>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapActions, mapState} from "vuex";
+
+export default {
+  name: "AppModules",
+  appName: "服务",
+  customNavigation: true,
+  computed: {
+    ...mapState(['user', 'token']),
+  },
+  data() {
+    return {
+      list: null,
+      isFixed: false,
+      statusBarHeight: 20,
+      backgroundNavbar: {
+        background: 'url(https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-nav-bg.png) no-repeat',
+        backgroundSize: 'cover',
+      }
+    }
+  },
+  onLoad() {
+    this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+    this.$dict.load("homeConfigMenuType").then(() => {
+      this.getList()
+    });
+  },
+  methods: {
+    ...mapActions(['authCheck']),
+    handleClick({type, appId, modulePath, url, checkType, corpId}) {
+      if (checkType == 3 && this.user.partyStatusForWX != 2) { //张硕让改的
+        return this.$u.toast('您还不是党员，暂时无法使用该功能')
+      }
+      //先判读是不是系统应用
+      if (type != "0") {
+        if (type == "1") {
+          uni.navigateToMiniProgram({appId});
+        } else if (type == "2") {
+          uni.navigateTo({url: "/subPages/h5/webview?link=" + url});
+        } else if (type == "3") {
+          this.$linkTo(url);
+        } else if (type == "4") {
+          uni.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: corpId,
+            fail: () => {
+              this.$u.toast('请使用普通微信打开小程序进行咨询');
+            }
+          });
+        }
+      } else if (type && type == "0") {
+        uni.showLoading({title: '正在进入应用...'})
+        this.authCheck({checkType, modulePath}).finally(() => uni.hideLoading())
+      }
+    },
+    getList() {
+      this.$instance.post("/app/appminihomeconfig/listAll", null, {withoutToken: true}).then(res => {
+        if (res?.data) {
+          this.list = res.data.all;
+        }
+      })
+    },
+
+  },
+  onPageScroll(params) {
+    this.isFixed = params.scrollTop > 60;
+  },
+  onShareAppMessage() {
+    return {
+      title: '欢迎使用数字乡村治理服务一体化平台~',
+      path: `/pages/AppModules/AppModules`
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: 0;
+  width: 100%;
+  opacity: 0;
+  transition: all 0.2s ease;
+
+  &.header-active {
+    z-index: 1111;
+    opacity: 1;
+    background: #4181FF;
+  }
+
+  .nav-bar {
+    position: relative;
+    height: 88px;
+    line-height: 88px;
+    color: #fff;
+    font-size: 32px;
+    text-align: center;
+  }
+}
+
+.header-bg {
+  height: 592px;
+  background: url('https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-header-bg.png') center;
+  background-size: 100% 100%;
+}
+
+.liner {
+  height: 192px;
+  background: linear-gradient(360deg, #F3F6F9 0%, #4181FF 100%);
+}
+
+.body {
+  margin-top: -568px;
+
+  .card {
+    width: 686px;
+    min-height: 304px;
+    background: #FFFFFF;
+    box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
+    border-radius: 16px;
+    margin: 0 auto 24px;
+    box-sizing: border-box;
+    padding: 32px;
+
+    .title {
+      font-size: 34px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 48px;
+      margin-bottom: 36px;
+    }
+
+    .grid-item {
+      img {
+        width: 108px;
+        height: 108px;
+        object-fit: fill;
+      }
+
+      .grid-text {
+        font-size: 26px;
+        font-weight: 400;
+        color: #333333;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppModules/service.png b/src/project/weiyang/AppModules/service.png
new file mode 100644
index 0000000000000000000000000000000000000000..17557cc11873fb982d883e88fe7c1aef7174cfbe
GIT binary patch
literal 1513
zcmV<F1s3{=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)qe(<TRA@uhTF+}7RUH3*-|S|SO#>~ML`_i=NGT*~ENt7YN$4&@HC6DG+(b_v
z6nZGwtMwn~LC}LI#gn-S+G<gDLmJ(*3pPy_iaAuJQIix}NOtpc-dDbpne^@K%<jzW
z43aq|yKmn6e!joIpSK8y{J}#mKX?L=%jII3OhzK2Q~?u_$mjDSo6YV8Q3Ssa0ECES
z+n41+`*}`h)CIr?d;$R1Ou?t7rnKY7&$sYKj~@NHGdVe_^WWEq#K-$5RsnPaMMTEA
zmf-w<KA+e4vrHzVtDmdud;wtLS)dzBONpaTcCvd2Z=;lHLhLa%C0ZsS3NeCjpB`(;
zUFz@Ow%(~{4HlLKWUGp{qrD`=NkO6q1auhhNm!RCmr=?Ga`Wj!wyyP#X8^2e*6!^)
zr2$EF9e`c~07F9#j}Cx83&bm<X9r5wyG{!&L1t&?yY#rYNCYPVFa{)d354NB2oeEB
z9Dw!^;eoa*Z;gx$ueyP#aUn~9d~q?WNthy{=Kz3xoY%6?st>yi9~?u($GU*YOlmOa
z1i}(vdTzcK04D*&F#y^m^9yr--kU!%%mjdK0P=~H`ZwA0r~hyQQ3b$qfnSREhjb}!
z5z+Ie@T`5ecwqn>3k>34O~{L{rcN!W?qnTYC@geuBfSTJ9f-6|gl<+fl!Qn+5heg=
zJwf<oIz6;v2XP>j8dx)Pi#G}A4O94-#|*<(iXq?+W9J6P?SaaB%oG;hk%$9CvVw?q
zYdRi7L=sUX1yN}%J@mDG(E)%1zrTBbTuQuQYPGJ0oZ|sBA?VWRnNv4;&xwf%b_Y3K
z_^lr>_AUVI*0H8*;sSs;(B4-U(x;bH>sDESv%_>@@iRpFpcw!}`1ytO;D@Rea&rrB
z3BXZ5+PBbHR**oqv*(7sQ{AY_uQ|2FlAU)6=oK?KJrz1dZ5$7XfcN$)YiFzi#~Pct
zv-my{^#G!k5IlOOv5bI-V{Ccs?BEw_y)guQmYW~8YVGB}fT*(>0D!ovm)l>?W_!1I
ze^v}8JFfu25k&G-?Cj`>PyoUPRo1Snl|LE)0F|V+-I+?IDlAB`Sd5qT#8u8HkpQsJ
zhUG#KK7jfzq`Fa)L2Sf8*Z@2QaY$)25&&jAHcq4a)ek9PA=}RuAzQ$6Av4{`=s<n8
z5^BP*0F;y3c9$B&8+zg+AZ+y$#J*YyOA4ROoKr667$|SH%I?>Phs(U6R4TPRF4I*6
zh;yUXpa2AK=IkImw$rs1K>R%^wgywF6t@jrXT;20=`sOyqktVL-6z4O+i9hIyA3oi
z0?`o%EwW|>ApWBXx;&B^`d%Fwf10~@B2L;k2<%`)j;3R9BsX~AYigiTK{$<+EiEhc
zT8v#w^L8QGJ^T9lT)WWq^>qquq*M=g8|qzKM{^vl@-1_e^wI#CO<?mwy;`B2ScwP$
zcxF2Su@XUDh<hTVuXlNNcDl(g+u;hJ4lCg|hz+`Bwz%-7F7Z<!dcoixoJLf{4J7*8
z58L4gz$YuwFpaY2E3$PFh)(!u(><{r&9V}n3fYhI^X+Y0Vg&%&O#qEz*)!V_1}ovE
zl}J|f#Hs?o%cR$k?J#;bCFdW|eGxQs3}6ial0IC>60I)V5jHE~){Qm;fPpaYRK<2!
zylmL4M5F*zw!<QTBVi>RCbDKN;K+6y#6ak*MD0u*3IIS{)64BIG23Cu91SZ`L#r5c
z&7VNj6(ES8O?qws)Sf2_Vk<1R!%mphq|qp;#U|MfBMa3H;*eO0nsmonGA>I(CXF4_
zs9}=etb}91vD`E4eI3(igclq^*baZKgngh7`-;gY+Yzjp3&=`%YI}KapKZFQeS-`%
z&0e#HdVL#cq-1US9sO(rerOlyUixz5f+C8a8icX0CjgDcr~mW&Ll59T#G>eYY!jQ*
P00000NkvXXu0mjfx(%@I

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppModules/service_selected.png b/src/project/weiyang/AppModules/service_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..104c62b04784aa74ad371274575359806296b799
GIT binary patch
literal 1466
zcmV;r1x5OaP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)bV)=(RA@uhTF+}-RTTcteQ#!BGLsOnNt4)07nVX4+z2k*6rmUuT(!GkXqpI$
zT@>tk{(>$PMN?BES!q^+S}903E(AA%7K$#^v}xKz)XB`G&CI-e<i2|+GxL7Tyf^O+
z(z~48cklVm@AKUd9`i+yx%`L*pvX1=i6Y4kz(p1S1d7z?OA+e(A{Zd<{GJI#kng^L
zOS%Kl0^;zXvuxohWZmEHqJ|A}^xr-EdZJ--Z&PqrU`w9`rv=En&wp?@09QLC@h<1=
z{px8+&KqFyB7hll%oa%gAlUk{F+6e;AJBmd#A_wrok}QT6xq&g@11BgoKwtV1`q|k
zRhEh5mTg<N52i+c*VZ-PM7Ds^^aeTErShyJafO**28@RMhd4y^oh5LocC~N|=G$N+
z7(wRC6IM>1Va6#i*<h}Nlq&&X5Qs7$ZV=(Nb0BVDy|5Do!fyd1fPKDvS^{4H{3HP7
z<7%&Vsn$|4p)R%o`bz-k8rKRpgF$HFhc5hkqQ*D}7UKXv1Z$Da`5MCEZ}bF6{*%q{
z=Z`)f|04)QCjjFD*@en;4Z$}6K5B$l{u$<O3V@0Q1>(Lf=}c`c|8u818O>j)ObTu+
z08{|upo>+TDsn)`0bG`3ui?}D122d+p;`fBE$&@s#w$j6m4TuxWhI*k-#V+KbNV8+
zS{cS#EX_01ESUE}K5K?}9VCc`iTIYYI=1fJ)B<2!$2wn~V>sU!t?JAWeJM*=1nX7j
z+Q@a+m1e;zuyb#fo~bwRCK&ZD)(pEzxmhM-<FkWL#(rzJuEzqzVzKlgnBGnT0K^~3
z)v<Tltza$v{W?4LOR==ygu})P7QT0`j(*kdM&1~(#huEJV1C{NXS71s(wmA0l|_D%
z$MP>67Puk{u~}LM(+ub^Aw;*U4s095Tk`nWN_(m{0-7LO;2~jEHo<%(5dhGRl=-Kz
zMvq)6i)@QK<x61ByA{2^B|ub>#|l^4EB~MX>`S|R1S`|~uB^+P5%tn#5ak90z^KI4
zR0=KxN*h2g7jo-|TWAsnv5tYX0YnPobkgWx0O$rIN*dLLr_VyB+kmt!(A0j<LZ-8Y
z+fBx7CE9a}0f4HsD-#_-+$g;V&```Ej?+pQIpQ^QK?zZ1wyLb}Ph$OO)!lHGvto4b
zGJuSm(Yvn%&0O=~c<r>`0z|(`EB`E3NVN^FWyR*+MSvzjTys6TThoxJoo*f+HqbDp
z0jPrHS*$dxip@4bTy$1PzSb_ON5<UJ?#a5$&H*Sux_kYLL=8e#h~?d615G;!SA%92
zZjO{yrNQkG9ZuB`HSgV_z8~+>g-)x+FRhWX{qnG(KFkdQN6YZBFu<BA4fQQc1hW!@
z0uY1k=#Q1?*M*ij18ir4aZdpw;J9o@d{!cE5StjX7OSr@<ojTr(zSqs?yi7vFAm!g
z3?S_^s=869@(Y+x#%R+cu^mZSiD-pv{{D!_3_pN!65Vd}T9Mg~G*}6LAybvOqm{Tf
zEE@TpHULp3y$Eba2UU`ol~6!JnmGlaunX{T3>RuDrYqZ#HY+g*01Ako?J&G-+N{Jt
z0d%q*nr|8mE8&~S61h;zHN9*{3qb0ugl8sB4ZyB+^2asXp=BNvE73`-D7r>e{sefU
zk05ThKo|fM@M*CUeqt*fwj<nyT##w75^lB#q81af9RcThgE$>l!k_MxZZ^nCoiq+k
zqi$mAmz4-9IL&&L_PN1nv>#TYcggRM?dW}OAWt8Um5AJQHJ_c*e!5DdosQJ@x{egD
zO^<YL{DCIvGi%DvxBZQjN}EX@x>I~WkJ6XB4-^CXSA)doMg!1me)=E({@4Tf4@j}7
UZC;pWMF0Q*07*qoM6N<$f^~PRPXGV_

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/weiyang/AppNewFarmerBank/AppNewFarmerBank.vue
new file mode 100644
index 0000000..259df5d
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -0,0 +1,345 @@
+<template>
+  <div class="page">
+    <div class="header-content">
+      <u-navbar :is-back="false" title="积分" title-color="#000" title-width="300" title-size="32" :title-bold="true" :background="backgroundNavbar"></u-navbar>
+      <div class="header-bg">
+        <div class="swiper-content">
+          <u-swiper :list="swiperList" mode="none" height="364" bg-color="none" @click="handleBannerClick"/>
+        </div>
+        <div class="user-info">
+          <p>{{ user.realName || user.nickName }}，欢迎进入{{user.areaName}}！</p>
+          <div @click="toPages('./signIn',status)">{{ status==1? '已签到':'签到' }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="banner-list">
+      <div class="item" v-for="(item, index) in bannerList" :key="index" @click="toPages(item.path)">
+        <img :src="item.imgUrl" alt="">
+      </div>
+    </div>
+    <tempalte>
+      <div class="title-wrap">
+        <span class="title">精选动态</span>
+        <div class="right" hover-class="text-hover" @click="$linkTo('./handpick')">
+          <span class="title-more">更多</span>
+          <u-icon name="arrow-right" size="28" color="#687DA6"></u-icon>
+        </div>
+      </div>
+      <div class="list-news" v-if="list.length">
+        <div class="item" v-for="(item,index) in list" :key="index" @click="$linkTo(`./pickDetail?id=${item.id}`)">
+          <p class="title" v-if="item.girdName">{{item.girdName}}</p>
+          <div class="user-flex">
+            <span>{{item.createUserName}}</span>
+            <p>{{item.title}}</p>
+            <div @click.stop="upCount(item.id,index)">
+              <img :src="item.upStatus==0? 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/dianzan.png':'https://cdn.cunwuyun.cn/wechat/biaopin/integral/dianzan-select.png'"  alt="">{{ item.upCount || 0 }}<span v-if="item.upCount > 99">+</span>
+            </div>
+          </div>
+          <p class="item-content">{{item.content}}</p>
+          <div class="img-list" v-if="item.images.length">
+            <img v-for="(img, i) in item.images" :key="i" :src="img.url">
+          </div>
+          <div class="img-list" v-if="!item.images.length && item.videos.length">
+            <img v-for="(video, ins) in item.videos" :key="ins" :src="video.facePicture.toString()">
+          </div>
+        </div>
+      </div>
+    </tempalte>
+    <AiLogin ref="login"/>
+  </div>
+</template>
+<script>
+import {mapActions, mapState} from 'vuex'
+
+export default {
+  customNavigation: true,
+  name: 'AppIntegral',
+  appName: "积分",
+  data() {
+    return {
+      cdn: "https://cdn.cunwuyun.cn/wxmp",
+      swiperList: ['https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-swiper1.png'],
+      backgroundNavbar: {
+        background: 'url(https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-nav-bg.png) no-repeat',
+        backgroundSize: 'cover',
+      }, 
+      bannerList: [
+        {
+          imgUrl: 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-banner-jfsq.png',
+          path: './integralApply'
+        },
+        {
+          imgUrl: 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-banner-jfrw.png',
+          path: './integralTask'
+        },
+        {
+          imgUrl: 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-banner-jfph.png',
+          path: './integralRank'
+        },
+        {
+          imgUrl: 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-banner-jfsc.png',
+          path: '/mods/AppRedemptionPoints/AppRedemptionPoints'
+        },
+        {
+          imgUrl: 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-banner-jfgs.png',
+          path: '/mods/AppRedemptionPoints/pointsPublicity'
+        },
+        {
+          imgUrl: 'https://cdn.cunwuyun.cn/wechat/biaopin/integral/integral-banner-wdjf.png',
+          path: '/pages/AppMine/myIntegral'
+        }
+      ],
+      status: null,
+      current: 1,
+      list: [],
+      allList: [],
+      flag: false,
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    getList(moduleId) {
+      this.$instance.post(`/app/appcontentinfo/list-web`,null,{
+        params: {
+          moduleId: moduleId,
+          current: this.current,
+          girdId: this.user.girdId,
+          containContent: true,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.allList = res.data.records
+          let newList = res.data.records.length > 3 ? res.data.records.slice(0,3) : res.data.records
+          let mapList = newList.map(e=> {
+
+            return {
+              ...e,
+              images: e?.files.filter(i => (i.postfix == '.jpg' || i.postfix == '.jpeg' || i.postfix == '.png')),
+              videos: e?.files.filter(i => (i.postfix == '.mp4' || i.postfix == '.MP4')),
+            }
+          })
+          this.list = mapList.map(v=> {
+            return {
+              ...v,
+              images: v.images.length > 3? v.images.slice(0, 3) : v.images,
+              videos: v.videos.length > 3? v.videos.slice(0, 3) : v.videos,
+              upStatus: 0
+            }
+          })
+        }
+      })
+    },
+    handleBannerClick() {
+
+    },
+    // 点赞
+    upCount(id,index) {
+      if (this.flag) return
+
+      this.flag = true
+      this.$instance.post(`/app/appcontentinfo/supportById?id=${id}`).then(res=> {
+        if(res?.code==0) {
+          this.flag = false
+          this.list[index].upStatus = 1
+          this.$u.toast(`点赞成功`)
+        }
+      }).finally(() => this.flag = false)
+    },
+    toPages(url,status) {
+      if(!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        }).catch(() => {
+        })
+      } else {
+        if(!status) {
+          this.$linkTo(url)
+        } else {
+          // 停留
+        }
+
+      }
+    },
+    getStatus() {
+      this.$instance.post(`/app/appwechatsigninfo/checkSign`).then(res=> {
+        if(res?.data !== null) {
+          this.status = 1
+        }
+      })
+    },
+    getModule() {
+      this.$instance.post(`/app/appintegraluserapply/queryModuleByName`).then(res=> {
+        if(res?.data) {
+          this.getList(res.data)
+        }
+      })
+    }
+
+  },
+  onShow() {
+    this.getStatus()
+    this.getModule()
+  },
+
+  onShareAppMessage() {
+    return {
+      title: '欢迎使用基层治理~',
+      path: `/pages/AppHome/AppHome`
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100%;
+  min-height: 100%;
+  position: relative;
+
+  .header-content {
+    .header-bg {
+      background: url('https://cdn.cunwuyun.cn/wechat/wuxi/wuxi-header-bg.png') center;
+      background-size: 100% 100%;
+    }
+    .swiper-content {
+      width: 686px;
+      height: 364px;
+      margin: 0 auto 24px;
+    }
+    .user-info {
+      display: flex;
+      justify-content: space-between;
+      padding: 14px 32px 18px;
+      p {
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        color: #222;
+        line-height: 56px;
+      }
+      div {
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        color: #0262F2;
+        line-height: 52px;
+        padding: 0 24px;
+        border: 1px solid #0262f280;
+        border-radius: 28px;
+      }
+    }
+  }
+  .banner-list {
+    padding: 32px 0 0 32px;
+    background-color: #fff;
+    .item {
+      display: inline-block;
+      width: 330px;
+      height: 160px;
+      margin: 0 26px 32px 0;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+
+  .title-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 32px 32px 24px;
+
+    .title {
+      font-family: PingFangSC-Medium;
+      font-weight: 700;
+      font-size: 44px;
+      color: #222;
+      line-height: 44px;
+    }
+
+    .right {
+
+      .title-more {
+        font-size: 28px;
+        font-weight: 400;
+        line-height: 44px;
+        color: #687DA6;
+      }
+    }
+  }
+
+  .list-news {
+    width: 686px;
+    margin: 0 0 0 32px;
+    .item {
+      padding: 32px 24px 16px 24px;
+      background-color: #fff;
+      border-radius: 16px;
+      margin-bottom: 32px;
+      .title {
+        font-family: PingFangSC-SNaNpxibold;
+        font-weight: 600;
+        font-size: 34px;
+        color: #333;
+        line-height: 40px;
+        word-break: break-all;
+        margin-bottom: 16px;
+      }
+      .user-flex {
+        line-height: 40px;
+        font-family: PingFangSC-Regular;
+        span {
+          display: inline-block;
+          font-size: 34px;
+          color: #2D7DFF;
+          margin-right: 20px;
+        }
+        p {
+          display: inline-block;
+          font-size: 26px;
+          color: #666;
+        }
+        div {
+          float: right;
+          font-size: 28px;
+          color: #687DA6;
+          line-height: 40px;
+          img {
+            width: 40px;
+            height: 40px;
+            margin-right: 4px;
+            vertical-align: sub;
+          }
+        }
+      }
+      .item-content {
+        margin-top: 30px;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        color: #333;
+        line-height: 42px;
+        word-break: break-all;
+      }
+      .img-list {
+        margin-top: 24px;
+        img {
+          width: 200px;
+          height: 200px;
+          margin: 0 16px 16px 0;
+        }
+        img:nth-of-type(3n) {
+          margin-right: 0;
+        }
+      }
+    }
+  }
+
+}
+</style>
diff --git a/src/project/weiyang/AppNewFarmerBank/AppNewFarmerBankOld.vue b/src/project/weiyang/AppNewFarmerBank/AppNewFarmerBankOld.vue
new file mode 100644
index 0000000..b005a3e
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/AppNewFarmerBankOld.vue
@@ -0,0 +1,396 @@
+<template>
+  <div class="AppNewFarmerBank">
+    <div class="swiper-content">
+      <img src="https://cdn.cunwuyun.cn/fengdu/img-gongdeyinhang.png" alt="">
+    </div>
+    <div class="welcome">
+      <div class="welcome-user">
+        <span class="name">{{ user.realName || user.nickName }}</span>，
+        <span v-if="!user.idNumber">欢迎来到功德银行！</span>
+        <span v-else>欢迎进入{{ user.areaName }}！</span>
+
+      </div>
+      <div class="signin" @click="toPages('./signIn',status)">{{ status==1? '已签到':'签到' }}</div>
+    </div>
+    <div class="card-list">
+      <div class="jfsq" @click="toPages('./integralApply')">
+        <p>积分申请</p>
+        <h4>好事自荐得积分</h4>
+      </div>
+      <div class="jsrw" @click="toPages('./integralTask')">
+        <p>积分任务</p>
+        <h4>完成任务得积分</h4>
+      </div>
+      <div class="jfph" @click="toPages('./integralRank')">
+        <p>积分排行</p>
+        <h4>社区荣誉榜</h4>
+      </div>
+      <div class="jfsc" @click="toPages('/mods/AppRedemptionPoints/AppRedemptionPoints')">
+        <p>积分商城</p>
+        <h4>兑换得好物</h4>
+      </div>
+      <div class="jfgs" @click="toPages('/mods/AppRedemptionPoints/pointsPublicity')">
+        <p>积分公示</p>
+        <h4>积分获取规则</h4>
+      </div>
+      <div class="wdjf" @click="toPages('/pages/AppMine/myIntegral')">
+        <p>我的积分</p>
+        <h4>积分获取一目了然</h4>
+      </div>
+    </div>
+    <div class="handpick" v-if="list.length">
+      <div class="title">
+        <h1>精选动态</h1>
+        <div class="more" v-if="allList.length > 3" @click="$linkTo('./handpick')">
+          <span>更多</span>
+          <u-icon name="arrow-right" color="#687DA6" size="28"></u-icon>
+        </div>
+      </div>
+      <div class="list" v-if="list.length">
+        <div class="card" v-for="(item,index) in list" :key="index" @click="$linkTo(`./pickDetail?id=${item.id}`)">
+          <div class="title-info" v-if="item.girdName">
+            {{item.girdName}}
+          </div>
+          <div class="top">
+            <div class="left" >
+              <div class="type-info">{{item.createUserName}}<span>{{item.title}}</span></div>
+            </div>
+            <div class="right" @click.stop="upCount(item.id,index)">
+              <img :src="item.upStatus==0? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png':'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png'" alt="">
+              <span>{{ item.upCount || 0 }}</span><span v-if="item.upCount > 99">+</span>
+            </div>
+          </div>
+          <p class="content-info">{{item.content}}</p>
+          <div class="imgs" v-if="item.images.length">
+            <image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/>
+          </div>
+          <div class="imgs" v-if="!item.images.length && item.videos.length">
+            <image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="video.facePicture.toString()"/>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "AppNewFarmerBank",
+  appName: "功德银行",
+  data() {
+    return {
+      status: null,
+      current: 1,
+      list: [],
+      allList: [],
+      flag: false,
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    getList(moduleId) {
+      this.$instance.post(`/app/appcontentinfo/list-web`,null,{
+        params: {
+          moduleId: moduleId,
+          current: this.current,
+          girdId: this.user.girdId,
+          containContent: true,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.allList = res.data.records
+          let newList = res.data.records.length > 3 ? res.data.records.slice(0,3) : res.data.records
+          let mapList = newList.map(e=> {
+
+            return {
+              ...e,
+              images: e?.files.filter(i => (i.postfix == '.jpg' || i.postfix == '.jpeg' || i.postfix == '.png')),
+              videos: e?.files.filter(i => (i.postfix == '.mp4' || i.postfix == '.MP4')),
+            }
+          })
+          this.list = mapList.map(v=> {
+            return {
+              ...v,
+              images: v.images.length > 3? v.images.slice(0, 3) : v.images,
+              videos: v.videos.length > 3? v.videos.slice(0, 3) : v.videos,
+              upStatus: 0
+            }
+          })
+        }
+      })
+    },
+    handleBannerClick() {
+
+    },
+    // 点赞
+    upCount(id,index) {
+      if (this.flag) return
+
+      this.flag = true
+      this.$instance.post(`/app/appcontentinfo/supportById?id=${id}`).then(res=> {
+        if(res?.code==0) {
+          this.flag = false
+          this.list[index].upStatus = 1
+          this.$u.toast(`点赞成功`)
+        }
+      }).finally(() => this.flag = false)
+    },
+    toPages(url,status) {
+      if(!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        }).catch(() => {
+        })
+      } else {
+        if(!status) {
+          this.$linkTo(url)
+        } else {
+          // 停留
+        }
+
+      }
+    },
+    getStatus() {
+      this.$instance.post(`/app/appwechatsigninfo/checkSign`).then(res=> {
+        if(res?.data !== null) {
+          this.status = 1
+        }
+      })
+    },
+    getModule() {
+      this.$instance.post(`/app/appintegraluserapply/queryModuleByName`).then(res=> {
+        if(res?.data) {
+          this.getList(res.data)
+        }
+      })
+    }
+
+  },
+  onShow() {
+    this.getStatus()
+    this.getModule()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppNewFarmerBank {
+  padding-bottom: 20px;
+  box-sizing: border-box;
+  .swiper-content {
+    width: 100%;
+    height: 332px;
+    padding: 32px 32px 0;
+    box-sizing: border-box;
+    background: #FFF;
+    img {
+      width: 100%;
+      height: 100%;
+      border-radius: 16px;
+    }
+  }
+
+  .welcome {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 120px;
+    padding: 0 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    .signin {
+      width: 104px;
+      height: 52px;
+      line-height: 52px;
+      border: 2px solid #2D7DFF;
+      border-radius: 40px;
+      color: #2D7DFF;
+      text-align: center;
+      font-size: 22px;
+      font-weight: 400;
+    }
+    .welcome-user {
+      width: calc(100% - 60px);
+      font-size: 30px;
+      font-weight: 400;
+      font-family: "PingFang SC";
+      .name {
+        color: #2D7DFF;
+        font-weight: 500;
+      }
+    }
+  }
+
+  .card-list {
+    background: #FFF;
+    padding: 0 32px;
+    display: flex;
+    flex-wrap: wrap;
+    .jfsq {
+      background: url('https://cdn.cunwuyun.cn/fengdu/img-jifenshenqing.png') no-repeat ;
+      color: #DF863E;
+    }
+    .jsrw {
+      background: url('https://cdn.cunwuyun.cn/fengdu/img-jifenrenwu.png') no-repeat;
+      color: #2D7DFF;
+    }
+    .jfph {
+      background: url('https://cdn.cunwuyun.cn/fengdu/img-jifenpaihang.png') no-repeat;
+      color: #338A77;
+    }
+    .jfsc {
+      background: url('https://cdn.cunwuyun.cn/fengdu/img-jifenshangcheng.png') no-repeat;
+      color: #D9606E;
+    }
+    .jfgs {
+      background: url('https://cdn.cunwuyun.cn/fengdu/img-jifengongshi.png') no-repeat;
+      color: #484899;
+    }
+    .wdjf {
+      background: url('https://cdn.cunwuyun.cn/fengdu/img-wodejifen.png') no-repeat;
+      color: #DA9A07;
+    }
+    & > div:nth-child(2n+1) {
+      margin-right: 30px;
+    }
+
+    div {
+      background-size: 100% 100%;
+      width: 328px;
+      height: 144px;
+      margin-bottom: 32px;
+      padding: 28px 32px;
+      box-sizing: border-box;
+      p {
+        font-size: 30px;
+        font-weight: 600;
+      }
+      h4 {
+        font-size: 20px;
+        font-weight: 400;
+        margin-top: 8px;
+      }
+    }
+  }
+
+  .handpick {
+    padding: 0 32px;
+    box-sizing: border-box;
+    .title {
+      margin: 32px 0;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h1 {
+        font-size: 34px;
+        font-weight: 500;
+      }
+      .more {
+        width: 200px;
+        color: #687DA6;
+        font-size: 28px;
+        font-weight: 400;
+        text-align: right;
+      }
+    }
+
+    .list {
+      .card {
+        margin-bottom: 24px;
+        padding: 32px 24px;
+        box-sizing: border-box;
+        background: #FFF;
+        border-radius: 12px;
+        .title-info {
+          font-family: PingFangSC-SNaNpxibold;
+          font-weight: 600;
+          font-size: 34px;
+          color: #333;
+          letter-spacing: 0;
+          line-height: 40px;
+          margin-bottom: 16px;
+        }
+        .type-info {
+          font-family: PingFangSC-Regular;
+          font-size: 34px;
+          color: #687DA6;
+          line-height: 40px;
+          span {
+            display: inline-block;
+            font-family: PingFangSC-Regular;
+            font-size: 26px;
+            color: #666;
+            line-height: 40px;
+            margin-left: 20px;
+          }
+        }
+        .top {
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 28px;
+          .left {
+            width: calc(100% - 100px);
+            p {
+              overflow:hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+            }
+          }
+          .right {
+            width: 100px;
+            text-align: right;
+            img {
+              width: 40px;
+              height: 40px;
+              vertical-align: bottom;
+            }
+            span {
+              font-size: 28px;
+              font-weight: 400;
+              color: #687DA6;
+            }
+          }
+        }
+        .content-info {
+          word-break: break-all;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+          font-family: PingFangSC-Regular;
+          font-size: 28px;
+          color: #333;
+          line-height: 42px;
+          margin-bottom: 24px;
+        }
+        .imgs {
+          display: flex;
+          flex-wrap: wrap;
+          background: #FFF;
+
+          image,
+          video {
+            width: 200px;
+            height: 200px;
+            margin: 0 12px 0 0;
+          }
+          image:nth-child(3n + 0),
+          video:nth-child(3n + 0) {
+            margin: 0;
+          }
+        }
+      }
+    }
+  }
+}
+
+</style>
diff --git a/src/project/weiyang/AppNewFarmerBank/handpick.vue b/src/project/weiyang/AppNewFarmerBank/handpick.vue
new file mode 100644
index 0000000..2ad774b
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/handpick.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="handpick">
+    <div class="list" v-for="(item,index) in list" :key="index" @click="$linkTo(`./pickDetail?id=${item.id}`)">
+      <div class="title-info" v-if="item.girdName">
+        {{item.girdName}}
+      </div>
+      <div class="top">
+        <div class="left" >
+          <div class="type-info">{{item.createUserName}}<span>{{item.title}}</span></div>
+        </div>
+        <div class="right" @click.stop="upCount(item.id, index)">
+          <img :src="item.upStatus == 0 ? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png' : 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png'" alt="">
+          <span>{{ item.upCount || 0 }}</span><span v-if="item.upCount > 99">+</span>
+        </div>
+      </div>
+      <p class="content-info">{{item.content}}</p>
+      <div class="imgs" v-if="item.images.length">
+        <image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/>
+      </div>
+      <div class="imgs" v-if="!item.images.length && item.videos.length">
+        <image v-for="(video, i) in item.videos" :key="i" class="banner" :src="video.facePicture.toString()"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "handpick",
+  appName: "精选动态",
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      list: [],
+      flag: false,
+      current: 1,
+      moduleId: ''
+    }
+  },
+  methods: {
+    getModule() {
+      this.$instance.post(`/app/appintegraluserapply/queryModuleByName`).then(res => {
+        if (res?.data) {
+          this.moduleId = res.data
+          this.getList()
+        }
+      })
+    },
+    getList() {
+      this.$instance.post(`/app/appcontentinfo/list-web`, null, {
+        params: {
+          moduleId: this.moduleId,
+          current: this.current,
+          girdId: this.user.girdId,
+          containContent: true,
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.allList = res.data.records
+          let newList = this.current==1? res.data.records : [...this.list, ...res.data.records]
+          let mapList = newList.map(e => {
+            return {
+              ...e,
+              images: e?.files.filter(i => (i.postfix == '.jpg' || i.postfix == '.jpeg' || i.postfix == '.png')),
+              videos: e?.files.filter(i => (i.postfix == '.mp4' || i.postfix == '.MP4')),
+            }
+          })
+          this.list = mapList.map(v => {
+            return {
+              ...v,
+              images: v.images.length > 3 ? v.images.slice(0, 3) : v.images,
+              videos: v.videos.length > 3 ? v.videos.slice(0, 3) : v.videos,
+              upStatus: 0
+            }
+          })
+        }
+      })
+    },
+    // 点赞
+    upCount(id,index) {
+      if (this.flag) return
+
+      this.flag = true
+      this.$instance.post(`/app/appcontentinfo/supportById?id=${id}`).then(res => {
+        if (res?.code == 0) {
+          this.flag = false
+          this.list[index].upStatus = 1
+          this.$u.toast(`点赞成功`)
+        }
+      }).finally(() => this.flag = false)
+    },
+  },
+  onShow() {
+    this.getModule()
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.handpick {
+  padding: 24px 32px;
+  box-sizing: border-box;
+  .list {
+    padding: 32px 24px;
+    box-sizing: border-box;
+    background: #FFF;
+    border-radius: 12px;
+    margin-bottom: 24px;
+    .title-info {
+      font-family: PingFangSC-SNaNpxibold;
+      font-weight: 600;
+      font-size: 34px;
+      color: #333;
+      letter-spacing: 0;
+      line-height: 40px;
+      margin-bottom: 16px;
+    }
+    .type-info {
+      font-family: PingFangSC-Regular;
+      font-size: 34px;
+      color: #687DA6;
+      line-height: 40px;
+      span {
+        display: inline-block;
+        font-family: PingFangSC-Regular;
+        font-size: 26px;
+        color: #666;
+        line-height: 40px;
+        margin-left: 20px;
+      }
+    }
+    .top {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 28px;
+      .left {
+        width: calc(100% - 100px);
+        p {
+          overflow:hidden; 
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+        }
+      }
+      .right {
+        width: 100px;
+        text-align: right;
+        img {
+          width: 40px;
+          height: 40px;
+          vertical-align: bottom;
+        }
+        span {
+          font-size: 28px;
+          font-weight: 400;
+          color: #687DA6;
+        }
+      }
+    }
+    .content-info {
+      word-break: break-all;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      overflow: hidden;
+      font-family: PingFangSC-Regular;
+      font-size: 28px;
+      color: #333;
+      line-height: 42px;
+      margin-bottom: 24px;
+    }
+    .imgs {
+      display: flex;
+      flex-wrap: wrap;
+      background: #FFF;
+
+      image,
+      video {
+        width: 200px;
+        height: 200px;
+        margin: 0 12px 0 0;
+      }
+      image:nth-child(3n + 0),
+      video:nth-child(3n + 0) {
+        margin: 0;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/img/xz.png b/src/project/weiyang/AppNewFarmerBank/img/xz.png
new file mode 100644
index 0000000000000000000000000000000000000000..98f78cdab2ae85e91b206b3aa327d3557742f637
GIT binary patch
literal 1489
zcmV;?1upuDP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHJ4r-ARA>d&noVdMM;L}@cBNJ^
z<PfNvSjC3~9|8u)v9_d#78*!%DQ)UPa%xY-$Mg@9v(HILe{w86B_{{krX?4*kV1Qi
z>B?~o1|NbirdCoHaxgS%CGGZo=f_^#iltpyyV8Qav%53jJnzmovoqgFihVd%S62_L
zudlxqhT&-;<Z+lBLHdxC@*vG4y@B*oBp=~w8R>h2gM&X04-Y@%^G*(#wD98M;-Olt
zaV`vlbFgt1e*-aX{e%3oQaX3?dH2rP*cb)IK4J^-{j~wddHi`0gqKm9dc%05A>Qm9
z&Ub@AuDGsPLwc=HC{##PtyYK73dKf46dfl#hV<KLsZ%)H`ZpX$UI~ID*FCRDVQnAQ
zK+6KC%$=W~|0oQ_G%^pd03d$>_-%mxI66A|nD^Q}mX?-|K-jymavrwNm~s^<#q`9)
z#J8~BXvbDt0u~k)UTHLfA5f7;qp0M*5V^~x(uv>Nsiak&a{1vKLe#I|<-DftOW$>!
z_r}M^|7=yZr2yZ5cnZe9hatZ86~JFAl}g{WGMwajxm<o9UUdzvdKBg1ez{4{J2AJH
ztvv<6;0Jgs-@rhD?vl^vE+p-2dqG5>>A|5sW8A8W7dC|#b}O1EntrYT1AkLzmN!bJ
zlb^Ngm(dE6q}kuf<p*D&B`&f&M11%>5lsacxA_%i3qm-bdfv&eXejN&_aA&BMDQi*
zt-_t&Z01h81hB)_>y1B92tF@wc;3XvX@f`W^Zog+O-odAIrr6_9ova!X47%BAv}Ga
zZWDc;McTM7hHEioMnX5ru}y#;=haZT!Va63&qslFrpZ7S++X1^PR3}SO#%GEnvWDa
z&82RSHc^OHX|j-s`N&9CTV_)Lrw6zR*Ae%-HO|{glbp#!HZmGkWkw0$*lXrCQ0OY9
zNh;}f8OugiGP6D<fU`=Z53=KW-uUm`21#n4Y-A*>Vb%i7lo<ErOj6_Nl?!jPF3aq2
zF@o!}P!<*nFZ`4qNV1wZ^Cc^p$?k9^g$wlRa4znYI2l4`r8Hy63ElwN9gMA~X%edL
zc4j)g(w3F%=)`IbE4Y$M523S~wpitHjzS|e$7Nt=X45MjVI83hsqqxe(l-JuE7=`f
zsD*hxpYIz1mX+-4L#AEG-8HpN&ne>7<hom|bfFCvXXqoIne1{~R<hHDo)QHY#q5yc
z)ofYGP8UMBPY4E`;+e@VcZBs31cb{(VZ<yuq<A%Nv4+cZp?fTjW<j{GKMu=EcF76R
zlP7=ujf(??!i&XTpAYGf<iBeW@$B&7mtS&Bh<g?{q>fegb}NvPte~7FyZR0=#I3RA
z`QFASoo2MmN&w^Yc(MUyXLO*oH)W8GjAS*;dPT-nKjZTnyKc_CC_=N5)kaNJ3lNo?
z3piC6;%1b%*YI`ZT7};$hE*YM3gFHN!WPrK3lUfCs$b>G_#atx*qsY6F&*8-*%UxV
zvoqo&d8}4bA?|HqyexFU=UuYkwI0P#?~^ggu}uInG`KT@3~(iOXok46J;-1>ZiQ@Q
zj1p}Vzy~_|o0~)uA?@&@4sl0|q?gupt33jS*C%&Irb)6(0B<r54_}*Nn(=vtxY?BY
zy8HiGmkz6|y#f0DRI|MSlI*#N>FX^f`=0xHlh2B1w#~{w>wd*ieShI~^v$dM1}V3|
zXtQtItX2g5viU~0oMA{Z?krZ%D*t;21H}b1%CM^LY;;=@JjeN|fsG#2YPBLDv;C<-
rR0PxfI`-v{J$4G=H5Wx${oLk%)9=4SDWBtd00000NkvXXu0mjfj7GBY

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppNewFarmerBank/img/xzh.png b/src/project/weiyang/AppNewFarmerBank/img/xzh.png
new file mode 100644
index 0000000000000000000000000000000000000000..967fa399ea01a0d7fced8adb1f7a3129aabdeb2c
GIT binary patch
literal 1730
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
YAB0b%2txdb<NyEw07*qoM6N<$f+k!g^8f$<

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppNewFarmerBank/integral.png b/src/project/weiyang/AppNewFarmerBank/integral.png
new file mode 100644
index 0000000000000000000000000000000000000000..53a13013cc952767aadeb522507be47c57599f0c
GIT binary patch
literal 2101
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

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppNewFarmerBank/integralAdd.vue b/src/project/weiyang/AppNewFarmerBank/integralAdd.vue
new file mode 100644
index 0000000..997fb1d
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/integralAdd.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="integralAdd">
+    <div class="item">
+      <div class="left">事件类型</div>
+      <!-- <AiSelect class="right" :list="dictList" v-model="form.applyItemId"></AiSelect> -->
+      <div class="right" @click="toSelectType">
+        <span v-if="form.applyItemId">{{ form.applyItemName }}</span>
+        <i v-else>请选择</i>
+        <u-icon name="arrow-right" color="#ddd"/>
+      </div>
+    </div>
+    <div class="items">
+      <p>详情描述</p>
+      <textarea v-model="form.content" :maxlength="300" placeholder="请输入详细描述..."></textarea>
+      <div class="tips">{{ form.content.length }}/300</div>
+    </div>
+    <div class="items">
+      <p>上传图片</p>
+      <div class="upload">
+        <AiUploader :def.sync="form.images" placeholder="上传图片" type="image" :limit="9" multiple></AiUploader>
+      </div>
+      <div class="tips left">可上传图片，最多上传9张。</div>
+    </div>
+    <div class="items">
+      <p>上传视频</p>
+      <div class="upload">
+        <AiUploader :def.sync="form.videos" placeholder="上传视频" type="video" :limit="9" multiple :size="30 * 1024 * 1024"></AiUploader>
+      </div>
+      <div class="tips left">可上传视频，最大30M。</div>
+    </div>
+
+    <div class="item">
+      <div class="left">所属网格</div>
+      <AiPagePicker type="gird" v-model="form.girdId" :params="{ formType: 2 }" @select="handleSelectGrid" nodeKey="id">
+        <AiMore v-model="form.girdName"/>
+      </AiPagePicker>
+    </div>
+
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="submit">提交申请</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapActions, mapState} from "vuex";
+export default {
+  name: "integralAdd",
+  appName: '积分申请',
+  data() {
+    return {
+      form: {
+        applyItemId: '',
+        applyIntegral: '',
+        applyItemName: '',
+        content: '',
+        files: [],
+        images: [],
+        videos: [],
+        girdId: '',
+        girdName: '',
+      },
+      list: [],
+      dictList: [],
+      flag: false,
+      id: '',
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(o) {
+    if(o.id) {
+      this.id = o.id
+      this.getDetail()
+    }
+    this.$dict.load(['clapEventStatus'])
+    this.getAuth()
+    this.form.girdId = this.user.girdId
+    this.form.girdName = this.user.girdName
+    uni.$on('applyTypeSelect', (res) => {
+      this.form.applyItemId = res[0].id
+      this.form.applyItemName = res[0].ruleName
+      this.form.applyIntegral = res[0].integral
+    })
+  },
+  watch: {
+    'form.applyItemId'(v) {
+      if(v) {
+        this.form.applyItemName = this.list.filter(e=> (e.id==v))[0].ruleName
+        this.form.applyIntegral = this.list.filter(e => (e.id == v))[0].integral
+      }
+    }
+  },
+  methods: {
+    ...mapActions(['getUserInfo']),
+    submit() {
+      if(this.flag) return
+
+      if (!this.form.applyItemId) {
+        return this.$u.toast('请选择事件类型')
+      }
+
+      if (!this.form.content) {
+        return this.$u.toast('请输入详细描述')
+      }
+
+      if ((this.form.images.length + this.form.videos.length) > 9) {
+        return this.$u.toast('图片和视频不得超过9个')
+      } else {
+        this.form.files = [...this.form.images,...this.form.videos]
+      }
+
+      if (!this.form.girdId) {
+        return this.$u.toast('请选择所属网格')
+      }
+
+      this.flag = true
+      this.$instance.post(`/app/appintegraluserapply/addOrUpdate`,{
+        ...this.form
+      }).then(res=> {
+        if(res?.data) {
+          this.$u.toast('提交成功')
+          uni.$emit('edit')
+          setTimeout(()=> {
+            uni.navigateBack()
+          },500)
+        }
+      })
+    },
+    // 事件类型
+    getType() {
+      this.$instance.post(`/app/appintegralrule/listByFdAndGirdInfo`).then(res=> {
+        if(res?.data) {
+          this.list = res.data
+          this.dictList = res.data.map(v => {
+            return {
+              value: v.id,
+              label: v.ruleName
+            }
+          })
+        }
+      })
+    },
+    handleSelectGrid(v) {
+      this.form.girdName = v.girdName
+      this.form.girdId = v.girdId
+    },
+    getDetail() {
+      this.$instance.post(`/app/appintegraluserapply/queryDetailById?id=${this.id}`).then(res => {
+        if (res?.data) {
+          this.form = res.data
+          this.form.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png'].includes(e.postfix.split('.')[1])))
+          this.form.videos = res.data.files.filter(e => (['mp4', 'MOV'].includes(e.postfix.split('.')[1])))
+          this.form.files = []
+        }
+      })
+    },
+    getAuth() {
+      this.$nextTick(() => {
+        this.getUserInfo('qujing')
+        this.getType()
+      })
+    },
+    toSelectType() {
+      uni.navigateTo({url: `./selectType?applyItemId=${this.form.applyItemId}`})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.integralAdd {
+  padding: 24px 0 120px 0;
+  box-sizing: border-box;
+  .item {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    background: #FFF;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    margin-bottom: 24px;
+    .left {
+      width: 250px;;
+    }
+    .right {
+      width: calc(100% - 200px);
+      text-align: right;
+      font-size: 32px;
+      span {
+        display: inline-block;
+        max-width: 400px;
+        margin-right: 8px;
+        color: #333333;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      i {
+        display: inline-block;
+        margin-right: 8px;
+        color: #999999;
+      }
+    }
+    ::v-deep .AiSelect {
+      float: right;
+    }
+  }
+  .items {
+    width: 100%;
+    background: #FFF;
+    margin-bottom: 24px;
+    p {
+      padding: 24px 32px;
+      box-sizing: border-box;
+      border: 1px solid #EEEEEE;
+    }
+    textarea {
+      padding: 24px 32px;
+      box-sizing: border-box;
+      width: 100%;
+    }
+
+    .tips {
+      padding: 12px 32px;
+      box-sizing: border-box;
+      text-align: right;
+      color: #999999;
+      font-size: 24px;
+      font-weight: 400;
+    }
+    .left {
+      text-align: left;
+    }
+    .upload {
+      padding: 24px 32px 0 32px;
+      box-sizing: border-box;
+    }
+  }
+
+  ::v-deep .btn-wrapper {
+    background: #FFF;
+  }
+
+  ::v-deep .btn-wrapper .btn {
+    height: 80px;
+    line-height: 80px;
+    border-radius: 40px;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/integralApply.vue b/src/project/weiyang/AppNewFarmerBank/integralApply.vue
new file mode 100644
index 0000000..e32f1a1
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/integralApply.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="integralApply">
+    <div class="card-list" v-if="list.length">
+      <div class="card" v-for="(item,index) in list" :key="index" @click="$linkTo(`./integralDetail?id=${item.id}`)">
+        <div class="left">
+          <div class="title">{{ item.applyItemName }}</div>
+          <div class="time">{{ item.createTime.slice(0,16) }}</div>
+        </div>
+        <div class="right">
+          <div class="integral">+{{ item.applyIntegral }}</div>
+          <div class="status" :class="item.status==0? 'status0':item.status==1? 'status1':'status2'">{{ $dict.getLabel('appIntegralApplyEventStatus',item.status) }}</div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty :description="`暂无数据`" class="emptyWrap" v-else/>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="toAdd">积分申请</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "integralApply",
+  appName: "积分申请",
+  data() {
+    return {
+      current: 1,
+      list: [],
+    }
+  },
+  methods: {
+    toAdd() {
+      this.$linkTo('./integralAdd')
+    },
+    getList() {
+      this.$instance.post(`/app/appintegraluserapply/listByAppletUser`,null,{
+        params: {
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.list = this.current==1 ? res.data.records: [...this.list, ...res.data.records]
+        }
+      })
+    }
+  },
+  onShow() {
+    this.$dict.load('appIntegralApplyEventStatus').then(()=> {
+      this.getList()
+    })
+  },
+  onReachBottom() {
+    this.current++ 
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.integralApply {
+  padding: 24px 0 130px 0;
+  box-sizing: border-box;
+
+  .card-list {
+    background: #FFF;
+    .card {
+      padding: 32px 40px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #EEEEEE;
+      display: flex;
+      align-items: center;
+      .left {
+        width: calc(100% - 200px);
+        .title {
+          font-size: 32px;
+          font-weight: 600;
+        }
+        .time {
+          font-size: 28px;
+          font-weight: 400;
+          color: #666666;
+          margin-top: 8px;
+        }
+      }
+      .right {
+        width: 200px;
+        text-align: right;
+        .integral {
+          font-size: 38px;
+          font-weight: 600;
+        }
+        .status {
+          font-size: 28px;
+          font-weight: 400;
+          margin-top: 8px;
+        }
+
+        .status0 {
+          color: #FF9A40;
+        }
+        .status1 {
+          color: #5AAD6A;
+        }
+        .status2 {
+          color: #CD413A;
+        }
+      }
+    }
+  }
+
+  ::v-deep .btn-wrapper {
+    background: #FFF;
+  }
+
+  ::v-deep .btn-wrapper .btn {
+    height: 80px;
+    line-height: 80px;
+    border-radius: 40px;
+  }
+
+
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/integralDetail.vue b/src/project/weiyang/AppNewFarmerBank/integralDetail.vue
new file mode 100644
index 0000000..038583f
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/integralDetail.vue
@@ -0,0 +1,158 @@
+<template>
+  <div class="integralDetail">
+    <div class="detail">
+      <div class="title">
+        <h1>{{ info.applyItemName }}</h1>
+        <p :class="info.status==0?'status0':info.status==1?'status1':'status2'">{{ $dict.getLabel('appIntegralApplyEventStatus', info.status) }}</p>
+      </div>
+      <div class="content">{{ info.content }}</div>
+      <div class="imgs" v-if="images.length">
+        <image v-for="(img, i) in images" @click="preview(img.url,images)" :key="i" class="banner" :src="img.url"/>
+      </div>
+      <div class="imgs" v-if="videos.length">
+        <video v-for="(video, ins) in videos" :key="ins" class="file-img" :src="video.url"/>
+      </div>
+
+      <div class="refuse" v-if="info.status == 2">
+        <p><span></span>未通过理由</p>
+        <div class="desc">{{ info.auditDesc }}</div>
+      </div>
+    </div>
+
+    <div class="btn-wrapper" v-if="info.status==2">
+      <div class="btn" hover-class="text-hover" @click="$linkTo(`./integralAdd?id=${info.id}`)">修改</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "integralDetail",
+  appName: "积分申请详情",
+  data() {
+    return {
+      id: '',
+      info: {},
+      images: [],
+      videos: [],
+    }
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/appintegraluserapply/queryDetailById?id=${this.id}`).then(res=> {
+        if(res?.data) {
+          this.info = res.data
+          this.images = res.data.files.filter(e=> (['jpeg','jpg','png', 'JPG'].includes(e.postfix.split('.')[1])))
+          this.videos = res.data.files.filter(e => (['mp4', 'MP4', 'MOV'].includes(e.postfix.split('.')[1])))
+        }
+      })
+    },
+    preview(url, imgs) {
+      uni.previewImage({
+        urls: imgs.map((v) => v.url),
+        current: url,
+      })
+    },
+  },
+  onLoad(o) {
+    this.id = o.id
+    this.getDetail()
+    uni.$on('edit',()=> {
+      this.getDetail()
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.integralDetail {
+  padding: 24px 0 120px 0;
+
+  .detail {
+    .title {
+      padding: 32px 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      background: #FFF;
+      h1 {
+        font-size: 34px;
+        font-weight: 600;
+      }
+      p {
+        font-size: 28px;
+        font-weight: 400;
+      }
+      .status0 {
+        color: #FF9A40;
+      }
+      .status1 {
+        color: #5AAD6A;
+      }
+      .status2 {
+        color: #CD413A;
+      }
+    }
+    .content {
+      font-size: 28px;
+      font-weight: 400;
+      background: #FFF;
+      padding: 0 32px;
+      box-sizing: border-box;
+    }
+    .imgs {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 20px 32px;
+      box-sizing: border-box;
+      background: #FFF;
+
+      image,
+      video {
+        width: 226px;
+        height: 226px;
+        margin: 0 4px 4px 0;
+      }
+      image:nth-child(3n + 0),
+      video:nth-child(3n + 0) {
+        margin: 0;
+      }
+    }
+    .refuse {
+      background: #FFF;
+      padding: 32px 32px;
+      box-sizing: border-box;
+      margin-top: 24px;
+      p {
+        margin-bottom: 32px;
+        font-size: 30px;
+        font-weight: 400;
+        color: #333333;
+        span {
+          display: inline-block;
+          width: 12px;
+          height: 12px;
+          background: #CD413A;
+          border-radius: 50%;
+          margin-right: 8px;
+        }
+      }
+      .desc {
+        font-size: 28px;
+        font-weight: 400;
+        color: #666666;
+      }
+    }
+  }
+
+  ::v-deep .btn-wrapper {
+    background: #FFF;
+  }
+
+  ::v-deep .btn-wrapper .btn {
+    height: 80px;
+    line-height: 80px;
+    border-radius: 40px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/integralRank.vue b/src/project/weiyang/AppNewFarmerBank/integralRank.vue
new file mode 100644
index 0000000..e529ca5
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/integralRank.vue
@@ -0,0 +1,480 @@
+<template>
+  <div class="integralRank" v-if="pageShow">
+    <div class="credit-points">
+      <div class="fixed-top">
+        <div class="header-tab">
+          <div class="tab-item" :class="{ active: tabIndex == index }" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}
+            <span class="active-line" v-if="tabIndex == index"></span>
+          </div>
+        </div>
+      </div>
+      <div class="rank">
+        <!-- <u-subsection :list="typeList" :current="typeCurrent" active-color="#4181FF" inactive-color="#666666" :bold="false" @change="typeChange"></u-subsection> -->
+        <div class="content-subsection">
+          <div class="type-subsection">
+            <div class="item" :class="index == typeCurrent ? 'item-active' : ''" v-for="(item, index) in typeList" :key="index" @click="typeChange(index)">{{ item }}</div>
+          </div>
+        </div>
+        <div class="faultage"></div>
+        <div class="header-content" v-if="userInfo.length">
+          <div class="item">
+            <span class="item-num">{{ inx + 1 }}</span>
+            <div class="user-img-content" v-if="userInfo[0].avatar_url">
+              <image :src="userInfo[0].avatar_url" alt="" class="user-img mar-b4" />
+            </div>
+            <div class="user-name-bg mar-b4 mar-r24" v-else>{{ formatName(userInfo[0].name) }}</div>
+            <span class="item-name">{{ userInfo[0].name }}</span>
+            <span class="item-point">{{ userInfo[0].integral }}</span>
+          </div>
+        </div>
+        <div class="faultage"></div>
+        <div v-if="list && list.length">
+          <div class="ranking-content">
+            <div class="item" v-if="list.length > 1">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+              <img :src="list[1].avatar_url" alt="" class="user-img mar-b4" v-if="list[1].avatar_url">
+              <div class="user-name-bg mar-b4" v-else>{{ formatName(list[1].name) }}</div>
+              <p class="user-name mar-b8">{{ list[1].name }}</p>
+              <p class="item-num">{{ list[1].integral }}</p>
+            </div>
+            <div class="item-top item" v-if="list.length > 0">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+              <img :src="list[0].avatar_url" alt="" class="user-img mar-b4" v-if="list[0].avatar_url">
+              <div class="user-name-bg mar-b4" v-else>{{ formatName(list[0].name) }}</div>
+              <p class="user-name mar-b8">{{ list[0].name }}</p>
+              <p class="item-num">{{ list[0].integral }}</p>
+            </div>
+            <div class="item" v-if="list.length > 2">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+              <img :src="list[2].avatar_url" alt="" class="user-img mar-b4" v-if="list[2].avatar_url">
+              <div class="user-name-bg mar-b4" v-else>{{ formatName(list[2].name) }}</div>
+              <p class="user-name mar-b8">{{ list[2].name }}</p>
+              <p class="item-num">{{ list[2].integral }}</p>
+            </div>
+          </div>
+          <div class="ranking-list">
+            <div class="item" v-for="(item, index) in list" :key="index" v-if="index > 2">
+              <span class="item-num">{{ index+1 }}</span>
+              <img :src="item.avatar_url" alt="" class="user-img mar-b4" v-if="item.avatar_url">
+              <div class="user-name-bg mar-b4 mar-r24" v-else>{{ formatName(item.name) }}</div>
+              <span class="item-name">{{ item.name }}</span>
+              <span class="item-point">{{ item.integral }}</span>
+            </div>
+          </div>
+        </div>
+        <AiEmpty v-if="!list.length"/>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "integralRank",
+  appName: "积分排行",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      // tabList: ['总榜','月榜','周榜'],
+      tabList: ['个人排行', '家庭排行'],
+      tabIndex: 0,
+      current: 1,
+      userInfo: {},
+      inx: 0,
+      pageShow: false,
+      list: [],
+      typeList: ['总榜', '月榜', '周榜'],
+      typeCurrent: 0
+    }
+  },
+  onLoad() {
+    this.getList()
+  },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+      this.typeCurrent = 0
+      this.getList()
+    },
+    getList() {// 积分排行
+      this.list = {}
+      var url = this.tabIndex == 1 ? `/app/appintegraluser/integralSortFDHouse` : `/app/appintegraluser/integralSortFD`  //tabIndex： 1家庭 0个人
+      this.$instance.post(url+`?type=${this.typeCurrent}&size=50&areaId=${this.user.areaId}`).then(res => {
+        if (res.code === 0) {
+          this.list = res.data.map(e=> ({...e, index: e.index}))
+          this.userInfo = res.data.filter(e => e.open_id === this.user.openId)
+          this.inx = res.data.findIndex(e=> e.open_id == this.user.openId)
+          this.pageShow = true
+        }
+      })
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
+    },
+    typeChange(index) {
+      this.typeCurrent = index
+      this.getList()
+    }
+  },
+  onReachBottom() {
+    // if (this.list.length < 50) {
+    //   this.current++;
+    //   this.getList()
+    // }
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.integralRank {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+
+  ::v-deep .header-tab {
+    background: #FFF;
+    height: 116px;
+    padding: 34px 0 42px 0;
+    border-bottom: 1px solid #eee;
+    .tab-item {
+      color: #222222;
+      font-size: 30px;
+      font-weight: 400;
+    }
+    .active {
+      font-size: 34px;
+      font-weight: 500;
+    }
+    .active-line {
+      background: #2D7DFF;
+      top: 82px;
+    }
+  }
+
+  .fixed-top {
+    z-index: 999;
+  }
+
+  .rank {
+    width: 100vw;
+    overflow-x: hidden;
+    height: calc(100% - 156px);
+    margin-top: 116px;
+    
+    .content-subsection {
+      width: 100%;
+      height: 116px;
+      padding: 22px 28px;
+      box-sizing: border-box;
+      background: #FFFF;
+      
+      .type-subsection {
+        width: 100%;
+        height: 100%;
+        padding: 4px;
+        box-sizing: border-box;
+        border-radius: 36px;
+        background-color: #f6f7f9;
+        display: flex;
+        .item {
+          flex: 1;
+          line-height: 64px;
+          text-align: center;
+          font-family: PingFangSC-Regular;
+          font-weight: 400;
+          font-size: 28px;
+          color: #666;
+        }
+        .item-active {
+          background: #FFF;
+          border-radius: 32px;
+          color: #4181FF;
+        }
+      }
+    }
+    
+
+    .header-content {
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+        // border: 4px solid #2d7dffff;
+        display: flex;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          height: 112px;
+          line-height: 112px;
+          color: #858594;
+          font-size: 28px;
+          vertical-align: top;
+        }
+
+        .user-img-content {
+          display: inline-block;
+          width: 92px;
+          height: 92px;
+          padding: 4px;
+          box-sizing: border-box;
+          border-radius: 50%;
+          border: 1px solid #2D7DFF;
+          margin: 14px 24px 0 0;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: calc(100% - 430px);
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+    .faultage {
+      width: 100%;
+      height: 32px;
+      background: #f3f5f7;
+    }
+
+    .ranking-content {
+      padding: 94px 30px 0;
+      background: #fff;
+
+      .item {
+        display: inline-block;
+        width: 216px;
+        box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+        border-radius: 12px;
+        padding: 40px 0 76px 0;
+        text-align: center;
+        box-sizing: border-box;
+        position: relative;
+
+        .user-name {
+          font-size: 30px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 42px;
+        }
+
+        .item-num {
+          font-size: 46px;
+          font-weight: 6000;
+          color: #2C51CE;
+          line-height: 54px;
+        }
+
+        .top-img {
+          width: 100%;
+          height: 34px;
+          position: absolute;
+          top: -11px;
+          left: 0;
+        }
+      }
+
+      .item-top {
+        margin: -46px 20px 0;
+        vertical-align: top;
+        height: 370px;
+
+        .user-img {
+          width: 104px;
+          height: 104px;
+        }
+
+        .user-name-bg {
+          width: 104px;
+          height: 104px;
+          border-radius: 50%;
+          background-color: #4E8EEE;
+          font-size: 28px;
+          line-height: 104px;
+          text-align: center;
+          color: #fff;
+        }
+
+        .top-img-one {
+          width: 100%;
+          position: absolute;
+          top: -22px;
+          left: 0;
+          height: 46px;
+        }
+      }
+    }
+
+    .ranking-list {
+      background-color: #fff;
+
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          color: #858594;
+          font-size: 28px;
+          vertical-align: top;
+        }
+
+        .user-img {
+          margin-right: 24px;
+          vertical-align: middle;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: 210px;
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+
+    .user-img {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+
+    .user-name-bg {
+      display: inline-block;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      background-color: #4E8EEE;
+      font-size: 28px;
+      line-height: 80px;
+      text-align: center;
+      color: #fff;
+    }
+
+    .mar-b4 {
+      margin-bottom: 8px;
+    }
+
+    .mar-b8 {
+      margin-bottom: 16px;
+    }
+
+    .detail-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: 0 0 0 32px;
+      padding: 30px 30px 94px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 30px;
+      }
+
+      .item {
+        padding: 34px 0 32px 0;
+        border-bottom: 2px solid #ddd;
+        display: flex;
+
+        .item-info {
+          width: 500px;
+
+          p {
+            word-break: break-all;
+            font-size: 32px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #333;
+            line-height: 44px;
+          }
+
+          span {
+            display: inline-block;
+            margin-top: 8px;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            line-height: 34px;
+          }
+        }
+
+        .item-num {
+          width: calc(100% - 500px);
+          text-align: right;
+          font-size: 36px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          line-height: 50px;
+        }
+      }
+    }
+
+    .color-0 {
+      color: #2C51CE !important;
+    }
+
+    .color-1 {
+      color: #E6736E !important;
+    }
+
+    .fixed-top {
+      z-index: 999;
+    }
+}
+
+}
+</style>
diff --git a/src/project/weiyang/AppNewFarmerBank/integralTask.vue b/src/project/weiyang/AppNewFarmerBank/integralTask.vue
new file mode 100644
index 0000000..11efc9a
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/integralTask.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="integralTask">
+    <div class="fix-top">
+      <div class="img-bg">
+        <img src="https://cdn.cunwuyun.cn/fengdu/img-jifenlist.png" alt="">
+      </div>
+      <div class="title">任务大厅</div>
+    </div>
+    <div class="card-list" v-if="list.length">
+      <div class="card" v-for="(item,index) in list" :key="index" @click="$linkTo('./taskDetail?id='+item.id)">
+        <h4>{{ item.title }}</h4>
+        <p>
+          <span>{{ item.detail }}</span>
+        </p>
+        <div class="imgs" v-if="item.files">
+          <image mode="aspectFill" v-for="(e, i) in item.files" :key="i" :src="e.url"/>
+        </div>
+        <div class="time">
+          <div class="goin" v-if="item.intoBegintime && item.intoEndtime">
+            <img src="https://cdn.cunwuyun.cn/fengdu/ic-jinchangshijian.png" alt="">
+            <div class="label">{{ item.type == 0 ? '进场时间：' : '报名时间：' }}</div>
+            <div class="value">{{ item.intoBegintime.substring(0, 16)}} 至 {{ item.intoEndtime.substring(0, 16) }}</div>
+          </div>
+          <div class="exit" v-if="item.exitBegintime && item.exitEndtime && item.type == 0">
+            <img src="https://cdn.cunwuyun.cn/fengdu/ic-lichangshijian.png" alt="">
+            <div class="label">离场时间：</div>
+            <div class="value">{{ item.exitBegintime.substring(0, 16) }} 至 {{ item.exitEndtime.substring(0, 16) }}</div>
+          </div>
+          <div class="type">
+            <img src="https://cdn.cunwuyun.cn/fengdu/ic-renwuleixing.png" alt="">
+            <div class="label">任务类型：</div>
+            <div class="value">{{ $dict.getLabel('fdIntegralTaskType', item.type) }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty :description="`暂无任务`" class="emptyWrap" v-else/>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: 'integralTask',
+  appName: '积分任务',
+  data() {
+    return {
+      list: [],
+      current: 1,
+      files: [],
+    }
+  },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  methods: {
+    getList() {
+      this.$instance.post('/app/appintegraltask/list',null,{
+        params: {
+          current: this.current,
+          status: 1,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          const arr = res.data.records.map(e => {
+            return {
+              ...e,
+              files: e.files.length > 3 ? e.files.slice(0, 3) : e.files
+            }
+          })
+          this.$nextTick(()=> {
+            this.list = this.current > 1 ? [...this.list, ...arr] : arr
+          })
+          
+        }
+      })
+    }
+  },
+  onShow() {
+    uni.setNavigationBarTitle({
+      title: '积分任务'
+    });
+    this.$dict.load(['fdIntegralTaskType']).then(() => {
+      this.getList()
+    })
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.integralTask {
+  padding-top: 292px;
+  .fix-top {
+    width: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    .img-bg {
+      width: 100%;
+      height: 216px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .title {
+      font-size: 34px;
+      font-weight: 500;
+      color: #222222;
+      padding: 32px 32px 0;
+      background: #f3f5f7;
+      z-index: 999;
+      opacity: 1;
+    }
+  }
+  
+  .card-list {
+    padding: 24px 32px;
+    box-sizing: border-box;
+    .card {
+      background: #FFF;
+      color: #333333;
+      border-radius: 16px;
+      margin-bottom: 24px;
+      h4 {
+        padding: 24px 24px 0;
+        box-sizing: border-box;
+        font-size: 34px;
+        font-weight: 500;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      p {
+        padding: 16px 24px;
+        box-sizing: border-box;
+        font-size: 28px;
+        font-weight: 400;
+        span {
+          overflow: hidden; 
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-box-orient: vertical; 
+          -webkit-line-clamp: 2;
+        }
+      }
+      .imgs {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        padding: 16px 24px;
+        box-sizing: border-box;
+
+        image {
+          height: 208px;
+          width: 33.33%;
+          padding-right: 12px;
+          margin-bottom: 12px;
+          box-sizing: border-box;
+
+          &:nth-of-type(3n) {
+            padding-right: 0;
+          }
+        }
+      }
+
+      .time {
+        padding: 0 24px 24px;
+        box-sizing: border-box;
+        border-top: 2px solid #EEEEEE;
+        & > div {
+          margin-top: 16px;
+        }
+        .goin,
+        .exit,
+        .type {
+          display: flex;
+          img {
+            width: 30px;
+            height: 30px;
+            align-self: center;
+          }
+          .label {
+            font-size: 24px;
+            font-weight: 400;
+            color: #666666;
+            align-self: center;
+            width: 130px;
+          }
+          .value {
+            color: #333333;
+            font-size: 24px;
+            font-weight: 400;
+            width: calc(100% - 160px);
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/integral_select.png b/src/project/weiyang/AppNewFarmerBank/integral_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..c613222f700ecbbe5f136cc6bb9c0e51943ecfb3
GIT binary patch
literal 2238
zcmV;v2toIWP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px-cu7P-RA@uxS!;|{R~7!&KIh(f+_^J6q%b2LtuRAL(FC--jKpHo;t!Bk`DFq!
zGuFh!2*JOt*#4D(F)^{u3_{{Bv_<$KZIl{}ysD7sG!zD`PH_f`FwER}-h0koX6<th
zbMKvV?zwj!CXM^oWX^u9Z?A8CYps0=AM-&UbNliC3V`PcIB}(nsLYUqtZ<NYrH52B
zzrr&r03f$6H^hW*p$f?XRobvdU|_(T(%1;V|2t|?wo&7kn0$1GIV*mY2jC#vI7m)n
z@7M-S&JP*19zadh_C$c|04+`4jNX30vH>n_(l~)HE4F`>J6d}Q{+V$Q;sNYp3n$36
zzdiE2cJ*%nqyUI1p=$%<mo8LTztWp>`6lD;ppF9(>^Z6|^>ybLb#K8xyA+7h0DL|s
z+DF&A?4AMe7yuVQD1D6aF0h~$*tkj|X?xpe9md7$8V|<+%PQ#!i7yMlM;2Mza$Tvb
zh>3}40RF;M$H>xgt$z<-jc>dhFm1?2E(29Iu&GsHL5koAQ~<UGJRD_QxS=uW02X;J
zj2N;?&giL8>e<oGy1S)7L;&z*au*cUkG@H)x0f<L-;k$QC^Ri3<Xk{JB15>Juz>zS
z#=E!55-|gUNuB25)C)KPf6?^74hP_KPjzGtL-W2k;{)n^_EQQi%LrL#%J=}BfJoXv
z?;Xb9|E1%oB+EQcC_17$)BB_1VLE`o__mRKfIeK7@i|~cBS8QNZGxLGrig$LIthSV
z0}Lw>t4uzf)PCJvcO(o%ApqZat9^JoGv3S#)@a3Xfn^H_LLC#@aq2BQX&5TqdB|~|
z2zJv%c){(eKV1xB$}m4@lkJ%`4zmR9QtznJiqnuHY-&-clG}_EZU4I*I++75^lA)^
z#)1fJxN8$Vo9#;X<Og*SW+uxn-_JDz!<lo;_(DnJ<)h&=Ve=|wWOKrSp^p`lpIz<I
zsM>~+)$`Z2ky%w*nG6Ub{H3uzz2){{8aEXIC{P<OS*ebZ1JL@%al98Ui=9ueBs48j
z7|#KzB(Uu%8%+($$Z0X>#5*FN{X-gO-g7XT1!@vN{{xM8Z?bW9RP6YU^MhLbKzG(1
z3aI3r<8z<(4xb`|NTwt59mNQ_{m(TktXN8LG%%54d~-trdp0GZHJ~EA5PUm!A&XyK
z%Aq<zuoZCYF5_=~+IXSFFg7vcG#{<sF)ILaQ(s(VVPT!8BIDVa0jNomx%I&j;Lq3H
zxLPS5fNCH4K3E?qnQ{F>?TMv?wNEIMu!J(TiOMK6mh&hj3GV6#8Xw%{xLV1h5UG8-
ztL`U-9`FMKyEtj3N8VxZ=BOYxC4&aiHH6Kr3ROwZ3qp@<nL(ViJetYvPiBGhH#9Qi
zYy==e$-E#2op&>J&)@`Q3ximQ7Zgq3nP^eD>{$TIBSH9H`1}e&^Ad%eV|I_IPeWKO
zfTg^!fxdehf4x=m_5&HctrN+u_<412h>ZG&_#o_#%vP;&8sOTn(m5y{B!O*cQO1~=
z3;}(qw`4-|OKcib3frB|^x5LVF0zzJbPVrxHM;T)E0`O|;+ECQ(5X@oV!Y7i+%+94
zyZJfYQfSY0)*p>8B?4>xZb-FdUIzHpu%HfNp|y#yrrAO^$8kFT=q^lQmmu`?xwz3E
z$$h^LqE~cx`n9MIExMfE1!a<3+wd^}yNh$fqvj>$Wn<Cva+xHDO8$^6EPX;qlN02j
z<GQ<kk9YHu>&h*s^MktWUYbyKl7Owno(R0Ku~nf_dVr8JI;<j<;2jubT)d&fl*j7@
zfU}Iro#<YYnL$HS7}Pc29eX@C>Aa;GtMip9=zp7+5Y~Q187VDih=gAKheqGMY3gGX
zM-i?is_f^-e^&e9%v;L962HtyyfnJbb=<cBEY1hvbz6)tKV_rZ&k3bK2<V9{@W=NY
z<XkTk`y-Ic`<87zmwP>RW%f;dQBYg$qdS@P8+mLu$IH#HX;x@$4DZH*ZGx`s#sH&7
zYM-f^$qyd^q+WEpQYYu`S*6Gms<2a&5|`u+=o1ZOn)z~uH241*dPE;F-hYjV?!2P*
zjei%K5<h~kOm<u5u*URWSxSo~4dKCTsAdEAhS-!2dBX&)0v&O>gWfk>al$}U06>=e
z{R0D5N9GM?>=Z>Lf-PQH*(f<dnOZ4qNUbB(xhegy_flu%k_ac=&h(2@O+<OmigHGU
z0P<?4-NTEOO>YCd&O8Y*tm*_zFehxDRvJsN<{UD?JCQSmT#%@)XosJ}@%sC5iZcfu
zD3sS^M`pF-;tYtJO)P6DDX~BOSRsu9`uy`FHl?#tey`2cXIt2o?Mz>riSaY@Kv7WJ
zZJB2@__stzyAJfSg`_00Nu~|lD^V($S`yctLDrTH#f*#sea-1kzf+D}&Os1|Y~j~T
zR@=yKhCap&ov@%btx{N6^t3oAPm9;JG(hr1q6lh_+g*3OT)CVd0J7_&hp^16MEtUw
zV`p`<vY%}7x-}Wnb-mxOajj1~R)TD1dQEqyUzyF#2Y@OM;%Qeg^>dT8ceK-mZcEpY
zyJfYqf+k%`?Q_?(n;B=zg6ejUraGp!DPM8sE{H=x5aT7TC1>~)Gks-ai*lDOAoG%a
z=OMcnd$mQxe_*?Q2VSSKpd~CP@s*l02OcO?rbXWyTmB&9oc-itYFWQh84_K-sjYwC
z=iWtWd+URr*500};>@E53PE7^(E93X`rVhFv=+&iKfUihn3&+N;&{X5xio%uG8*OA
z;Af#-!#mckQNNaHS9<g}aH9UyTm)_Lv2#bE{GEMyef+@40r~fbhw2W^RxamHMk6CE
z_*qsa<o`X}uq|9aKOP9qU|(Wsc2fDjQK7lL*s^z<Uk{XR#>^-F7wEh+Z3?`DJOBUy
M07*qoM6N<$f+(*&UH||9

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppNewFarmerBank/libs/qqmap-wx-jssdk.js b/src/project/weiyang/AppNewFarmerBank/libs/qqmap-wx-jssdk.js
new file mode 100644
index 0000000..8fa1477
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/libs/qqmap-wx-jssdk.js
@@ -0,0 +1 @@
+var ERROR_CONF = { KEY_ERR: 311, KEY_ERR_MSG: 'key格式错误', PARAM_ERR: 310, PARAM_ERR_MSG: '请求参数信息有误', SYSTEM_ERR: 600, SYSTEM_ERR_MSG: '系统错误', WX_ERR_CODE: 1000, WX_OK_CODE: 200 }; var BASE_URL = 'https://apis.map.qq.com/ws/'; var URL_SEARCH = BASE_URL + 'place/v1/search'; var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; var URL_CITY_LIST = BASE_URL + 'district/v1/list'; var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; var URL_DISTANCE = BASE_URL + 'distance/v1/'; var URL_DIRECTION = BASE_URL + 'direction/v1/'; var MODE = { driving: 'driving', transit: 'transit' }; var EARTH_RADIUS = 6378136.49; var Utils = { safeAdd(x, y) { var lsw = (x & 0xffff) + (y & 0xffff); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xffff) }, bitRotateLeft(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) }, md5cmn(q, a, b, x, s, t) { return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b) }, md5ff(a, b, c, d, x, s, t) { return this.md5cmn((b & c) | (~b & d), a, b, x, s, t) }, md5gg(a, b, c, d, x, s, t) { return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t) }, md5hh(a, b, c, d, x, s, t) { return this.md5cmn(b ^ c ^ d, a, b, x, s, t) }, md5ii(a, b, c, d, x, s, t) { return this.md5cmn(c ^ (b | ~d), a, b, x, s, t) }, binlMD5(x, len) { x[len >> 5] |= 0x80 << (len % 32); x[((len + 64) >>> 9 << 4) + 14] = len; var i; var olda; var oldb; var oldc; var oldd; var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for (i = 0; i < x.length; i += 16) { olda = a; oldb = b; oldc = c; oldd = d; a = this.md5ff(a, b, c, d, x[i], 7, -680876936); d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586); c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819); b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330); a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897); d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426); c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341); b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983); a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416); d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417); c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063); b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162); a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682); d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101); c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290); b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329); a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510); d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632); c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713); b = this.md5gg(b, c, d, a, x[i], 20, -373897302); a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691); d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083); c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335); b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848); a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438); d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690); c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961); b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501); a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467); d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784); c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473); b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734); a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558); d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463); c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562); b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556); a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060); d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353); c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632); b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640); a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174); d = this.md5hh(d, a, b, c, x[i], 11, -358537222); c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979); b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189); a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487); d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835); c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520); b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651); a = this.md5ii(a, b, c, d, x[i], 6, -198630844); d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415); c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905); b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055); a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571); d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606); c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523); b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799); a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359); d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744); c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380); b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649); a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070); d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379); c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259); b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551); a = this.safeAdd(a, olda); b = this.safeAdd(b, oldb); c = this.safeAdd(c, oldc); d = this.safeAdd(d, oldd) } return [a, b, c, d] }, binl2rstr(input) { var i; var output = ''; var length32 = input.length * 32; for (i = 0; i < length32; i += 8) { output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff) } return output }, rstr2binl(input) { var i; var output = []; output[(input.length >> 2) - 1] = undefined; for (i = 0; i < output.length; i += 1) { output[i] = 0 } var length8 = input.length * 8; for (i = 0; i < length8; i += 8) { output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32) } return output }, rstrMD5(s) { return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8)) }, rstrHMACMD5(key, data) { var i; var bkey = this.rstr2binl(key); var ipad = []; var opad = []; var hash; ipad[15] = opad[15] = undefined; if (bkey.length > 16) { bkey = this.binlMD5(bkey, key.length * 8) } for (i = 0; i < 16; i += 1) { ipad[i] = bkey[i] ^ 0x36363636; opad[i] = bkey[i] ^ 0x5c5c5c5c } hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8); return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128)) }, rstr2hex(input) { var hexTab = '0123456789abcdef'; var output = ''; var x; var i; for (i = 0; i < input.length; i += 1) { x = input.charCodeAt(i); output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f) } return output }, str2rstrUTF8(input) { return unescape(encodeURIComponent(input)) }, rawMD5(s) { return this.rstrMD5(this.str2rstrUTF8(s)) }, hexMD5(s) { return this.rstr2hex(this.rawMD5(s)) }, rawHMACMD5(k, d) { return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d)) }, hexHMACMD5(k, d) { return this.rstr2hex(this.rawHMACMD5(k, d)) }, md5(string, key, raw) { if (!key) { if (!raw) { return this.hexMD5(string) } return this.rawMD5(string) } if (!raw) { return this.hexHMACMD5(key, string) } return this.rawHMACMD5(key, string) }, getSig(requestParam, sk, feature, mode) { var sig = null; var requestArr = []; Object.keys(requestParam).sort().forEach(function (key) { requestArr.push(key + '=' + requestParam[key]) }); if (feature == 'search') { sig = '/ws/place/v1/search?' + requestArr.join('&') + sk } if (feature == 'suggest') { sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk } if (feature == 'reverseGeocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'geocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'getCityList') { sig = '/ws/district/v1/list?' + requestArr.join('&') + sk } if (feature == 'getDistrictByCityId') { sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk } if (feature == 'calculateDistance') { sig = '/ws/distance/v1/?' + requestArr.join('&') + sk } if (feature == 'direction') { sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk } sig = this.md5(sig); return sig }, location2query(data) { if (typeof data == 'string') { return data } var query = ''; for (var i = 0; i < data.length; i++) { var d = data[i]; if (!!query) { query += ';' } if (d.location) { query = query + d.location.lat + ',' + d.location.lng } if (d.latitude && d.longitude) { query = query + d.latitude + ',' + d.longitude } } return query }, rad(d) { return d * Math.PI / 180.0 }, getEndLocation(location) { var to = location.split(';'); var endLocation = []; for (var i = 0; i < to.length; i++) { endLocation.push({ lat: parseFloat(to[i].split(',')[0]), lng: parseFloat(to[i].split(',')[1]) }) } return endLocation }, getDistance(latFrom, lngFrom, latTo, lngTo) { var radLatFrom = this.rad(latFrom); var radLatTo = this.rad(latTo); var a = radLatFrom - radLatTo; var b = this.rad(lngFrom) - this.rad(lngTo); var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); distance = distance * EARTH_RADIUS; distance = Math.round(distance * 10000) / 10000; return parseFloat(distance.toFixed(0)) }, getWXLocation(success, fail, complete) { wx.getLocation({ type: 'gcj02', success: success, fail: fail, complete: complete }) }, getLocationParam(location) { if (typeof location == 'string') { var locationArr = location.split(','); if (locationArr.length === 2) { location = { latitude: location.split(',')[0], longitude: location.split(',')[1] } } else { location = {} } } return location }, polyfillParam(param) { param.success = param.success || function () { }; param.fail = param.fail || function () { }; param.complete = param.complete || function () { } }, checkParamKeyEmpty(param, key) { if (!param[key]) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key + '参数格式有误'); param.fail(errconf); param.complete(errconf); return true } return false }, checkKeyword(param) { return !this.checkParamKeyEmpty(param, 'keyword') }, checkLocation(param) { var location = this.getLocationParam(param.location); if (!location || !location.latitude || !location.longitude) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误'); param.fail(errconf); param.complete(errconf); return false } return true }, buildErrorConfig(errCode, errMsg) { return { status: errCode, message: errMsg } }, handleData(param, data, feature) { if (feature == 'search') { var searchResult = data.data; var searchSimplify = []; for (var i = 0; i < searchResult.length; i++) { searchSimplify.push({ id: searchResult[i].id || null, title: searchResult[i].title || null, latitude: searchResult[i].location && searchResult[i].location.lat || null, longitude: searchResult[i].location && searchResult[i].location.lng || null, address: searchResult[i].address || null, category: searchResult[i].category || null, tel: searchResult[i].tel || null, adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, province: searchResult[i].ad_info && searchResult[i].ad_info.province || null }) } param.success(data, { searchResult: searchResult, searchSimplify: searchSimplify }) } else if (feature == 'suggest') { var suggestResult = data.data; var suggestSimplify = []; for (var i = 0; i < suggestResult.length; i++) { suggestSimplify.push({ adcode: suggestResult[i].adcode || null, address: suggestResult[i].address || null, category: suggestResult[i].category || null, city: suggestResult[i].city || null, district: suggestResult[i].district || null, id: suggestResult[i].id || null, latitude: suggestResult[i].location && suggestResult[i].location.lat || null, longitude: suggestResult[i].location && suggestResult[i].location.lng || null, province: suggestResult[i].province || null, title: suggestResult[i].title || null, type: suggestResult[i].type || null }) } param.success(data, { suggestResult: suggestResult, suggestSimplify: suggestSimplify }) } else if (feature == 'reverseGeocoder') { var reverseGeocoderResult = data.result; var reverseGeocoderSimplify = { address: reverseGeocoderResult.address || null, latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null }; if (reverseGeocoderResult.pois) { var pois = reverseGeocoderResult.pois; var poisSimplify = []; for (var i = 0; i < pois.length; i++) { poisSimplify.push({ id: pois[i].id || null, title: pois[i].title || null, latitude: pois[i].location && pois[i].location.lat || null, longitude: pois[i].location && pois[i].location.lng || null, address: pois[i].address || null, category: pois[i].category || null, adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, city: pois[i].ad_info && pois[i].ad_info.city || null, district: pois[i].ad_info && pois[i].ad_info.district || null, province: pois[i].ad_info && pois[i].ad_info.province || null }) } param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify, pois: pois, poisSimplify: poisSimplify }) } else { param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify }) } } else if (feature == 'geocoder') { var geocoderResult = data.result; var geocoderSimplify = { title: geocoderResult.title || null, latitude: geocoderResult.location && geocoderResult.location.lat || null, longitude: geocoderResult.location && geocoderResult.location.lng || null, adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, province: geocoderResult.address_components && geocoderResult.address_components.province || null, city: geocoderResult.address_components && geocoderResult.address_components.city || null, district: geocoderResult.address_components && geocoderResult.address_components.district || null, street: geocoderResult.address_components && geocoderResult.address_components.street || null, street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, level: geocoderResult.level || null }; param.success(data, { geocoderResult: geocoderResult, geocoderSimplify: geocoderSimplify }) } else if (feature == 'getCityList') { var provinceResult = data.result[0]; var cityResult = data.result[1]; var districtResult = data.result[2]; param.success(data, { provinceResult: provinceResult, cityResult: cityResult, districtResult: districtResult }) } else if (feature == 'getDistrictByCityId') { var districtByCity = data.result[0]; param.success(data, districtByCity) } else if (feature == 'calculateDistance') { var calculateDistanceResult = data.result.elements; var distance = []; for (var i = 0; i < calculateDistanceResult.length; i++) { distance.push(calculateDistanceResult[i].distance) } param.success(data, { calculateDistanceResult: calculateDistanceResult, distance: distance }) } else if (feature == 'direction') { var direction = data.result.routes; param.success(data, direction) } else { param.success(data) } }, buildWxRequestConfig(param, options, feature) { var that = this; options.header = { "content-type": "application/json" }; options.method = 'GET'; options.success = function (res) { var data = res.data; if (data.status === 0) { that.handleData(param, data, feature) } else { param.fail(data) } }; options.fail = function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; options.complete = function (res) { var statusCode = +res.statusCode; switch (statusCode) { case ERROR_CONF.WX_ERR_CODE: { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); break } case ERROR_CONF.WX_OK_CODE: { var data = res.data; if (data.status === 0) { param.complete(data) } else { param.complete(that.buildErrorConfig(data.status, data.message)) } break } default: { param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)) } } }; return options }, locationProcess(param, locationsuccess, locationfail, locationcomplete) { var that = this; locationfail = locationfail || function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; locationcomplete = locationcomplete || function (res) { if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) } }; if (!param.location) { that.getWXLocation(locationsuccess, locationfail, locationcomplete) } else if (that.checkLocation(param)) { var location = Utils.getLocationParam(param.location); locationsuccess(location) } } }; class QQMapWX { constructor(options) { if (!options.key) { throw Error('key值不能为空') } this.key = options.key }; search(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, orderby: options.orderby || '_distance', page_size: options.page_size || 10, page_index: options.page_index || 1, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } var distance = options.distance || "1000"; var auto_extend = options.auto_extend || 1; var region = null; var rectangle = null; if (options.region) { region = options.region } if (options.rectangle) { rectangle = options.rectangle } var locationsuccess = function (result) { if (region && !rectangle) { requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else if (rectangle && !region) { requestParam.boundary = "rectangle(" + rectangle + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else { requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SEARCH, data: requestParam }, 'search')) }; Utils.locationProcess(options, locationsuccess) }; getSuggestion(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, region: options.region || '全国', region_fix: options.region_fix || 0, policy: options.policy || 0, page_size: options.page_size || 10, page_index: options.page_index || 1, get_subpois: options.get_subpois || 0, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } if (options.location) { var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) }; Utils.locationProcess(options, locationsuccess) } else { if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) } }; reverseGeocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { coord_type: options.coord_type || 5, get_poi: options.get_poi || 0, output: 'json', key: that.key }; if (options.poi_options) { requestParam.poi_options = options.poi_options } var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'reverseGeocoder')) }; Utils.locationProcess(options, locationsuccess) }; geocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'address')) { return } var requestParam = { address: options.address, output: 'json', key: that.key }; if (options.region) { requestParam.region = options.region } if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'geocoder')) }; getCityList(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_CITY_LIST, data: requestParam }, 'getCityList')) }; getDistrictByCityId(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'id')) { return } var requestParam = { id: options.id || '', output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_AREA_LIST, data: requestParam }, 'getDistrictByCityId')) }; calculateDistance(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { mode: options.mode || 'walking', to: Utils.location2query(options.to), output: 'json', key: that.key }; if (options.from) { options.location = options.from } if (requestParam.mode == 'straight') { var locationsuccess = function (result) { var locationTo = Utils.getEndLocation(requestParam.to); var data = { message: "query ok", result: { elements: [] }, status: 0 }; for (var i = 0; i < locationTo.length; i++) { data.result.elements.push({ distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), duration: 0, from: { lat: result.latitude, lng: result.longitude }, to: { lat: locationTo[i].lat, lng: locationTo[i].lng } }) } var calculateResult = data.result.elements; var distanceResult = []; for (var i = 0; i < calculateResult.length; i++) { distanceResult.push(calculateResult[i].distance) } return options.success(data, { calculateResult: calculateResult, distanceResult: distanceResult }) }; Utils.locationProcess(options, locationsuccess) } else { var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_DISTANCE, data: requestParam }, 'calculateDistance')) }; Utils.locationProcess(options, locationsuccess) } }; direction(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { output: 'json', key: that.key }; if (typeof options.to == 'string') { requestParam.to = options.to } else { requestParam.to = options.to.latitude + ',' + options.to.longitude } var SET_URL_DIRECTION = null; options.mode = options.mode || MODE.driving; SET_URL_DIRECTION = URL_DIRECTION + options.mode; if (options.from) { options.location = options.from } if (options.mode == MODE.driving) { if (options.from_poi) { requestParam.from_poi = options.from_poi } if (options.heading) { requestParam.heading = options.heading } if (options.speed) { requestParam.speed = options.speed } if (options.accuracy) { requestParam.accuracy = options.accuracy } if (options.road_type) { requestParam.road_type = options.road_type } if (options.to_poi) { requestParam.to_poi = options.to_poi } if (options.from_track) { requestParam.from_track = options.from_track } if (options.waypoints) { requestParam.waypoints = options.waypoints } if (options.policy) { requestParam.policy = options.policy } if (options.plate_number) { requestParam.plate_number = options.plate_number } } if (options.mode == MODE.transit) { if (options.departure_time) { requestParam.departure_time = options.departure_time } if (options.policy) { requestParam.policy = options.policy } } var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction', options.mode) } wx.request(Utils.buildWxRequestConfig(options, { url: SET_URL_DIRECTION, data: requestParam }, 'direction')) }; Utils.locationProcess(options, locationsuccess) } }; module.exports = QQMapWX;
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/pickDetail.vue b/src/project/weiyang/AppNewFarmerBank/pickDetail.vue
new file mode 100644
index 0000000..02286a6
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/pickDetail.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="pickDetail">
+    <div class="container">
+      <div class="title-info" v-if="data.girdName">
+        {{data.girdName}}
+      </div>
+      <div class="type-info">{{data.createUserName}}<span>{{data.title}}</span></div>
+      <div class="content-info">{{ data.content }}</div>
+      <div class="imgs" v-if="images.length">
+        <image v-for="(img, i) in images" @click="preview(img.url, images)" :key="i" class="banner" :src="img.url"/>
+      </div>
+      <div class="imgs" v-if="videos.length">
+        <video v-for="(video, ins) in videos" :key="ins" class="file-img" :src="video.url"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'pickDetail',
+  appName: '精选动态',
+  data() {
+    return {
+      images: [],
+      videos: [],
+      id: '',
+      data: {}
+    }
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then(res=> {
+        if(res?.data) {
+          this.data = res.data
+          this.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png', 'JPG'].includes(e.postfix.split('.')[1])))
+          this.videos = res.data.files.filter(e => (['mp4','MP4', 'MOV'].includes(e.postfix.split('.')[1])))
+        }
+      })
+    },
+    preview(url, imgs) {
+      uni.previewImage({
+        urls: imgs.map((v) => v.url),
+        current: url,
+      })
+    },
+
+  },
+  onLoad(o) {
+    this.id = o.id;
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.pickDetail {
+  padding-top: 32px;
+  box-sizing: border-box;
+  .container {
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    .title-info {
+      font-family: PingFangSC-SNaNpxibold;
+      font-weight: 600;
+      font-size: 34px;
+      color: #333;
+      letter-spacing: 0;
+      line-height: 40px;
+      margin-bottom: 16px;
+    }
+    .type-info {
+      font-family: PingFangSC-Regular;
+      font-size: 34px;
+      color: #687DA6;
+      line-height: 40px;
+      margin-bottom: 28px;
+      span {
+        display: inline-block;
+        font-family: PingFangSC-Regular;
+        font-size: 26px;
+        color: #666;
+        line-height: 40px;
+        margin-left: 20px;
+      }
+    }
+    .title {
+      font-size: 34px;
+      font-weight: 600;
+      color: #333333;
+    }
+    .avatar {
+      font-size: 26px;
+      font-weight: 400;
+      color: #999999;
+      margin-top: 16px;
+    }
+    .content-info {
+      font-size: 28px;
+      font-weight: 400;
+      color: #333333;
+      background: #FFF;
+      padding: 0;
+    }
+    .imgs {
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 24px;
+      background: #FFF;
+
+      image,
+      video {
+        width: 226px;
+        height: 226px;
+        margin: 0 4px 4px 0;
+      }
+      image:nth-child(3n + 0),
+      video:nth-child(3n + 0) {
+        margin: 0;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/selectType.vue b/src/project/weiyang/AppNewFarmerBank/selectType.vue
new file mode 100644
index 0000000..87920c9
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/selectType.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="selectType">
+    <div class="user-list">
+      <template v-if="list.length>0">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div class="select-img" @click="checkClick(index)">
+            <img :src="item.isCheck ? checkIcon : cirIcon" alt="">
+          </div>
+          <div class="user-info">
+            {{ item.ruleName }}
+          </div>
+        </div>
+      </template>
+      <AiEmpty v-else/>
+    </div>
+    <div class="pad-b118"></div>
+    <div class="footer">
+      <div class="btn" @click="confirm">确定选择</div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  appName:"事件类型选择",
+  name: "selectType",
+  data() {
+    return {
+      list: [],
+      cirIcon: require('./img/xz.png'),
+      checkIcon: require('./img/xzh.png'),
+      applyItemId: ''
+    }
+  },
+  onLoad(option) {
+    this.applyItemId = option.applyItemId
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.$instance.post(`/app/appintegralrule/listByFdAndGirdInfo`).then(res => {
+        if (res.code == 0) {
+          res.data.map((item) => {
+            if(item.id == this.applyItemId) {
+              item.isCheck = true
+            }else {
+              item.isCheck = false
+            }
+            
+          })
+          this.list = res.data
+        }
+      })
+    },
+    checkClick(index) {
+      this.list.map((item) => {
+        item.isCheck = false
+      })
+      this.list[index].isCheck = true
+    },
+    confirm() {
+      let checkList = []
+      this.list.map((item) => {
+        if (item.isCheck) {
+          checkList.push(item)
+        }
+      })
+      if (!checkList.length) {
+        return this.$u.toast('请先选择事件类型')
+      } else {
+        uni.navigateBack({
+          success: () => {
+            uni.$emit("applyTypeSelect", checkList)
+          }
+        })
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.selectType {
+  ::v-deep .AiTopFixed .u-search {
+    margin-bottom: 0 !important;
+  }
+
+  .pad-b118 {
+    padding-bottom: 118px;
+  }
+
+  .user-list {
+    background-color: #fff;
+
+    .item {
+      .select-img {
+        display: inline-block;
+
+        img {
+          width: 48px;
+          height: 48px;
+          margin: 12px 36px 12px 30px;
+          vertical-align: middle;
+        }
+      }
+
+      .user-info {
+        display: inline-block;
+        padding: 20px 0 20px 0;
+        width: calc(100% - 114px);
+        height: 100%;
+        border-bottom: 1px solid #E4E5E6;
+        font-size: 36px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 74px;
+
+        img {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+          margin-right: 34px;
+          vertical-align: bottom;
+        }
+      }
+    }
+  }
+
+  .footer {
+    width: 100%;
+    height: 118px;
+    background: #F4F8FB;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    text-align: right;
+
+    .btn {
+      display: inline-block;
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      background: #1365DD;
+      border-radius: 4px;
+      text-align: center;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #FFF;
+      margin: 20px 34px 0 0;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppNewFarmerBank/signIn.vue b/src/project/weiyang/AppNewFarmerBank/signIn.vue
new file mode 100644
index 0000000..1b2d77a
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/signIn.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="signIn">
+    <div class="card">
+      <div class="imgs">
+        <img src="https://cdn.cunwuyun.cn/fengdu/img-qiandaochenggong.png" alt="">
+      </div>
+      <p class="status">今日已完成签到</p>
+      <h4>积分<span>+{{ data.changeIntegral || 0}}</span></h4>
+      <div class="times">
+        <div>时间</div>
+        <div class="value">{{ data.createTime.slice(0,16) }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'signIn',
+  appName: '签到',
+  data() {
+    return {
+      showPage: false,
+      data: {},
+    }
+  },
+  methods: {
+    sign() {
+      this.$instance.post(`/app/appwechatsigninfo/sign`,{}).then(res=> {
+        if(res?.data) {
+          this.data = res.data
+        }
+      })
+    }
+  },
+  onShow() {
+    this.sign()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.signIn {
+  width: 100vw;
+  height: 100vh;
+  padding: 32px;
+  box-sizing: border-box;
+  .card {
+    width: 100%;
+    height: 100%;
+    background: #FFFFFF;
+    border-radius: 16px;
+    padding-top: 120px;
+    box-sizing: border-box;
+
+    .imgs {
+      margin: 0 auto;
+      width: 238px;
+      height: 238px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .status {
+      margin-top: 72px;
+      text-align: center;
+      font-size: 36px;
+      font-weight: 500;
+    }
+    h4 {
+      text-align: center;
+      margin-top: 24px;
+      color: #666666;
+      font-size: 28px;
+      font-weight: 400;
+      span {
+        font-size: 52rpx;
+        font-weight: 600;
+        color: #5AAD6A;
+      }
+    }
+    .times {
+      width: 70%;
+      border-top: 2px solid #f5f5f5;
+      margin: 70px auto 0;
+      padding-top: 72px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      .value {
+        color: #666666;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppNewFarmerBank/taskDetail.vue b/src/project/weiyang/AppNewFarmerBank/taskDetail.vue
new file mode 100644
index 0000000..a2d6513
--- /dev/null
+++ b/src/project/weiyang/AppNewFarmerBank/taskDetail.vue
@@ -0,0 +1,534 @@
+<template>
+  <div class="page">
+    <div class="taskDetail" v-if="showPages">
+      <div class="task">
+        <h4>{{ info.title }}</h4>
+        <p>{{ info.detail }}</p>
+        <div class="imgs" v-if="info.files">
+          <image :src="item.url" v-for="(item, index) in info.files" :key="index" mode="aspectFill" @click="preview(item.url)" />
+        </div>
+      </div>
+
+      <div class="info">
+        <div class="title">基础信息</div>
+        <div class="items">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-dizhi.png" alt="">
+          <div class="items-info">
+            <label>活动地点：</label>
+            <div class="value">{{ info.address }}</div>
+          </div>
+          <div class="address" @click="toAddress">
+            <img src="https://cdn.cunwuyun.cn/fengdu/ic-daohang.png" alt="">
+            <i>导航</i>
+          </div>
+        </div>
+        <div class="item">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-renwuleixing.png" alt="">
+          <div class="item-info">
+            <label>任务类型：</label>
+            <div class="value">{{ $dict.getLabel('fdIntegralTaskType', info.type) }}</div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jinchangshijian.png" alt="">
+          <div class="item-info" v-if="info.intoBegintime && info.intoEndtime">
+            <label>{{ info.type == 0 ? '进场时间：' : '报名时间：' }}</label>
+            <div class="value">{{ info.intoBegintime.substring(0, 16) }} 至 {{ info.intoEndtime.substring(0, 16) }}</div>
+          </div>
+        </div>
+        <div class="item" v-if="info.type == 0">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-lichangshijian.png" alt="">
+          <div class="item-info" v-if="info.exitBegintime && info.exitEndtime">
+            <label>离场时间：</label>
+            <div class="value">{{ info.exitBegintime.substring(0, 16) }} 至 {{ info.exitEndtime.substring(0, 16) }}</div>
+          </div>
+        </div>
+      </div>
+      <div class="btn-wrapper" v-if="info.type == 1">
+        <div class="btn" @click="signUp" hover-class="text-hover" :class="baoming == 1 ? 'opacity' : baoming == 0 ? 'gray' : ''">
+          <span v-if="baoming == 2 || baoming == 0">报名得积分<span v-if="baoming == 2">/积分+{{ info.enrollIntegral }}</span></span>
+          <span v-if="baoming == 1">已报名</span>
+        </div>
+      </div>
+      <div class="btn-wrapper" v-if="info.type == 0">
+        <div class="btn" @click="clockIn" hover-class="text-hover" :class="isClock == 0 ? 'gray' : isClock == 3 ? 'gray' : isClock == 2 ? 'opacity' : isClock == 4 ? 'opacity' : ''">
+          <div class="daka">{{ dkqd }}<span v-if="isClock == 1">/积分+{{ intoIntegral }}</span></div>
+        </div>
+      </div>
+    </div>
+    <AiLogin ref="login" @success="getAuth()"/>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex'
+var QQMapWX = require('./libs/qqmap-wx-jssdk.js')
+export default {
+  name: "taskDetail",
+  appName: "任务详情",
+  data() {
+    return {
+      info: {},
+      id: '',
+      latitude: '',
+      longitude: '',
+      address: '',
+      qqmapsdk: null,
+      distance: 100,
+      flag: false,
+      showPages: false,
+    }
+  },
+  computed: {
+    ...mapState(['user', 'token']),
+    intoIntegral() {
+      const times = new Date().getTime()
+      const inSTimes = new Date(this.info.intoBegintime?.replaceAll('-', '/')).getTime()
+      const inETimes = new Date(this.info.intoEndtime?.replaceAll('-', '/')).getTime()
+      const outSTimes = new Date(this.info.exitBegintime?.replaceAll('-', '/')).getTime()
+      const outETimes = new Date(this.info.exitEndtime?.replaceAll('-', '/')).getTime()
+
+      if (times > inSTimes && times < inETimes) {
+        return this.info.intoIntegral
+      }
+
+      if (times > outSTimes && times < outETimes) {
+        return this.info.exitIntegral
+      }
+
+      return 0
+    },
+    isClock() {
+      const times = new Date().getTime()
+      const inSTimes = new Date(this.info.intoBegintime?.replaceAll('-', '/')).getTime()
+      const inETimes = new Date(this.info.intoEndtime?.replaceAll('-', '/')).getTime()
+      const outSTimes = new Date(this.info.exitBegintime?.replaceAll('-', '/')).getTime()
+      const outETimes = new Date(this.info.exitEndtime?.replaceAll('-', '/')).getTime()
+      // 不符合条件(任务未开始、已经结束..)
+      if (times < inSTimes || times > outETimes || (inETimes < times && times < outSTimes)) {
+        return 0
+      }
+      // 在打卡范围内未打卡
+      if (this.info.clockRange > this.distance && (!this.info.intoClock && (inSTimes < times && times < inETimes)) || !this.info.exitClock && (outSTimes < times && times < outETimes)) {
+        return 1
+      }
+      // 已打卡(打卡距离内 && 打卡时间内)
+      if(this.info.clockRange > this.distance && (this.info.intoClock && (inSTimes < times && times < inETimes)) || (this.info.exitClock && outSTimes < times && times < outETimes)) {
+        return 2
+      }
+      // 没在指定范围
+      if(this.distance > this.info.clockRange) {
+        return 3
+      }
+      // 在打卡范围内，没有积分
+      if (this.info.clockRange > this.distance && (this.info.intoClock && (inSTimes < times && times < inETimes) && this.info.intoIntegral) || (this.info.exitClock && outSTimes < times && times < outETimes) && !this.info.exitIntegral) {
+        return 4
+      }
+    },
+    scope() {
+      const times = new Date().getTime()
+      const inSTimes = new Date(this.info.intoBegintime?.replaceAll('-', '/')).getTime() // 进场开始
+      const inETimes = new Date(this.info.intoEndtime?.replaceAll('-', '/')).getTime() // 进场结束
+      const outSTimes = new Date(this.info.exitBegintime?.replaceAll('-', '/')).getTime() // 离场开始
+      const outETimes = new Date(this.info.exitEndtime?.replaceAll('-', '/')).getTime() // 离场结束
+
+      if (this.info.clockRange > this.distance && (this.info.intoClock && (inSTimes < times && times < inETimes)) || (this.info.exitClock && outSTimes < times && times < outETimes)) {
+        return `无法重复打卡`
+      }
+
+      if (this.info.clockRange > this.distance && (!this.info.intoClock && (times > inSTimes && times < inETimes)) || !this.info.exitClock && (times > outSTimes && times < outETimes)) {
+        return `符合打卡条件`
+      }
+
+      return `未到打卡时间/不在指定位置`
+    },
+    dkqd() {
+      const times = new Date().getTime()
+      const inSTimes = new Date(this.info.intoBegintime?.replaceAll('-', '/')).getTime() // 进场开始
+      const inETimes = new Date(this.info.intoEndtime?.replaceAll('-', '/')).getTime() // 进场结束
+      const outSTimes = new Date(this.info.exitBegintime?.replaceAll('-', '/')).getTime() // 离场开始
+      const outETimes = new Date(this.info.exitEndtime?.replaceAll('-', '/')).getTime() // 离场结束
+      if (this.info.clockRange > this.distance && (this.info.intoClock && (times > inSTimes && times < inETimes)) || (this.info.exitClock && outSTimes < times && times < outETimes)) {
+        return `已打卡`
+      }
+      if (this.info.clockRange > this.distance && (!this.info.intoClock && (times > inSTimes && times < inETimes) && this.info.intoIntegral) || !this.info.exitClock && (times > outSTimes && times < outETimes) && this.info.exitIntegral) {
+        return `打卡签到`
+      }
+
+      if (times > outSTimes && times < outETimes && !this.info.exitIntegral) {
+        return `已打卡`
+      }
+
+      return `打卡签到`
+    },
+    baoming() {
+      const times = new Date().getTime()
+      const inSTimes = new Date(this.info.intoBegintime).getTime() // 报名开始
+      const inETimes = new Date(this.info.intoEndtime).getTime() // 报名结束
+      // 1已报名
+      if (this.info.enrollClock) {
+        return 1
+      }
+      // 2可以报名
+      if (!this.info.enrollClock && times < inETimes && times > inSTimes) {
+        return 2
+      }
+      // 0不符合条件
+      return 0
+    }
+  },
+  methods: {
+    ...mapActions(['getUserInfo']),
+    toAddress() {
+      wx.openLocation({
+        latitude: this.info.lat,
+        longitude: this.info.lng,
+        scale: 18
+      })
+    },
+    preview(url) {
+      uni.previewImage({
+        urls: this.info.files.map(v => v.url),
+        current: url
+      })
+    },
+    getDetail() {
+      this.$instance.post(`/app/appintegraltask/queryDetailById?id=${this.id}`).then(res=> {
+        if(res?.data) {
+          this.info = res.data
+          this.$nextTick(() => {
+            this.getLocation()
+          })
+        }
+      })
+    },
+    // 打卡积分
+    clockIn() {
+      if(!this.user.areaId) {
+        return this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/mods/AppMine/userInfo')
+        }).catch(() => {
+        })
+      }
+      if (!this.latitude) {
+        this.$dialog.alert({
+          title: '温馨提示',
+          content: '您未授权定位，请先授权！'
+        }).then(() => {
+          this.getLocation()
+        }).catch(() => {
+        })
+
+        return false
+      }
+
+      if (this.isClock == 0 || this.isClock == 3) {
+        return this.$dialog.alert({
+          title: '温馨提示',
+          content: '不满足打卡条件！'
+        }).then(() => {
+          this.getLocation()
+        }).catch(() => {
+        })
+      }
+
+
+      if (this.isClock == 2 || this.isClock == 4) {
+        return this.$u.toast(`已打卡，请勿重复打卡！`)
+      }
+
+      this.flag = true
+      this.daKa()
+    },
+    // 报名积分
+    signUp() {
+      if(this.info.enrollClock) return
+
+      if(this.baoming==0) {
+        return this.$u.toast('不符合报名条件')
+      }
+
+      this.flag = true
+      this.daKa()
+    },
+    daKa() {
+      this.$instance.post(`/app/appintegraltask/clock`, {
+        address: this.address,
+        clockTime: this.$dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+        lat: this.latitude,
+        lng: this.longitude,
+        openId: this.user.openId,
+        realName: this.user.realName,
+        taskId: this.id,
+        type: this.info.type
+      }).then(res => {
+        if (res?.code == 0) {
+          this.flag = false
+          if (this.info.type == 1) {
+            this.$u.toast('报名成功！')
+          } else {
+            this.$u.toast('打卡签到成功！')
+          }
+          setTimeout(()=> {
+            this.getDetail()
+          }, 400)
+        }
+      }).catch(err => this.$u.toast(err))
+    },
+    getLocation() {
+      wx.authorize({
+        scope: 'scope.userLocation',
+        success: () => {
+          uni.getLocation({
+            type: 'gcj02',
+            success: res => {
+              this.latitude = res.latitude
+              this.longitude = res.longitude
+              this.qqmapsdk.reverseGeocoder({
+                location: `${res.latitude},${res.longitude}`,
+                success: data => {
+                  this.address = data.result.formatted_addresses.recommend
+                },
+                fail: function (info) {
+                  console.log(info)
+                }
+              })
+
+              this.qqmapsdk.calculateDistance({
+                from: {
+                  longitude: res.longitude,
+                  latitude: res.latitude
+                },
+                to: [{
+                  longitude: this.info.lng,
+                  latitude: this.info.lat
+                }],
+                success: res => {
+                  this.distance = res.result.elements[0].distance
+                },
+                fail: function (error) {
+                  console.error(error)
+                },
+                complete: function (res) {
+                }
+              })
+            },
+            fail: e => {
+              console.log(e)
+            }
+          })
+        },
+        fail: () => {
+          this.$dialog.confirm({
+            content: '您未授权定位，功能将无法使用'
+          }).then(() => {
+            uni.openSetting({
+              success: res => {
+                if (!res.authSetting['scope.userLocation']) {
+                  this.$dialog.alert({
+                    content: '您未授权定位，功能将无法使用'
+                  }).then(() => {
+                  })
+                } else {
+                }
+              }
+            })
+          })
+        }
+      })
+    },
+    getAuth() {
+      this.$nextTick(() => {
+        this.token && this.getUserInfo('qujing')
+        this.$nextTick(() => {
+          this.toAuth()
+        })
+      })
+    },
+    toAuth() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/pages/AppMine/userInfo')
+        }).catch(() => {
+        })
+      } else {
+        this.getDetail()
+        this.showPages = true
+      }
+    }
+  },
+  onLoad(o) {
+    this.id = o?.id
+    if (decodeURIComponent(o.scene) != 'undefined') {
+      this.id = decodeURIComponent(o.scene)
+    }
+    uni.setNavigationBarTitle({
+      title: '任务详情'
+    });
+    this.qqmapsdk = new QQMapWX({
+      key: process.env.NODE_ENV == 'production' ? 'RWWBZ-64BEJ-MVLFJ-FTHLQ-JTR6J-SAB2S' : '3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY'
+    })
+    this.$dict.load(['fdIntegralTaskType'])
+  },
+  onShow() {
+    if (!this.token) {
+      this.$refs.login.show()
+    } else {
+      this.toAuth()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.taskDetail {
+  padding-bottom: 400px;
+  box-sizing: border-box;
+  .task,
+  .info {
+    margin-top: 24px;
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    h4 {
+      font-size: 34px;
+      font-weight: 500;
+    }
+
+    p {
+      margin-top: 32px;
+      font-size: 28px;
+      font-weight: 400;
+    }
+
+    .imgs {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      padding-top: 20px;
+      box-sizing: border-box;
+
+      image {
+        height: 208px;
+        width: 33.33%;
+        padding-right: 12px;
+        margin-bottom: 12px;
+        box-sizing: border-box;
+
+        &:nth-of-type(3n) {
+          padding-right: 0;
+        }
+      }
+    }
+  }
+  .info {
+    .title {
+      font-size: 34px;
+      font-weight: 500;
+    }
+    .items,
+    .item {
+      display: flex;
+      margin-top: 24px;
+      img {
+        width: 32px;
+        height: 32px;
+        align-self: center;
+        margin-right: 32px;
+      }
+
+      .items-info {
+        width: calc(100% - 100px);
+      }
+
+      .address {
+        width: 60px;
+        img {
+          width: 60px;
+          height: 60px;
+        }
+        i {
+          font-size: 24px;
+          font-weight: 400;
+          color: #687DA6;
+          text-align: center;
+        }
+      }
+      .item-info,
+      .items-info {
+        font-size: 28px;
+        font-weight: 400;
+        label {
+          color: #666666;
+        }
+        .value {
+          color: #333333;
+          margin-top: 8px;
+        }
+      }
+    }
+  }
+  ::v-deep .btn-wrapper {
+    background: #FFF;
+  }
+
+  ::v-deep .btn-wrapper .btn {
+    height: 80px;
+    line-height: 80px;
+    border-radius: 40px;
+  }
+
+  .opacity {
+    opacity: 0.6000000238418579 !important;
+  }
+
+  .gray {
+    background: #b5b5bcff !important;
+  }
+  .btn-clock {
+    height: 372px;
+    width: 100%;
+    background: #FFF;
+    .btn-circle {
+      width: 226px;
+      height: 226px;
+      background: #2D7DFF;
+      border-radius: 50%;
+      margin: 40px auto 24px;
+      text-align: center;
+      .text,
+      .daka {
+        color: #FFF;
+        font-size: 34px;
+        font-weight: 500;
+      }
+      .daka {
+        padding-top: 62px;
+        box-sizing: border-box;
+        font-size: 40px;
+        font-weight: 500;
+      }
+    }
+
+    .opacity {
+      opacity: 0.6000000238418579 !important;
+    }
+
+    .gray {
+      background: #b5b5bcff !important;
+    }
+    .tips {
+      text-align: center;
+      color: #666666;
+      font-size: 28px;
+      font-weight: 400;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppOrganizational/AppOrganizational.vue b/src/project/weiyang/AppOrganizational/AppOrganizational.vue
new file mode 100644
index 0000000..f923dca
--- /dev/null
+++ b/src/project/weiyang/AppOrganizational/AppOrganizational.vue
@@ -0,0 +1,210 @@
+<template>
+  <view class="AppOrganizational" :class="tabIndex == 1 ? 'bg-369' : 'bg-fff'">
+    <div class="detail-top">
+      <p>{{ dataInfo.organizationName || '-' }}</p>
+      <div>成立时间：{{ formatTime(dataInfo.createOrganizationTime) || '-' }}</div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="select-tab">
+      <div :class="tabIndex == 0 ? 'tab-active' : ''" @click="tabClick(0)">当前届次</div>
+      <div :class="tabIndex == 1 ? 'tab-active' : ''" @click="tabClick(1)">历史届次</div>
+    </div>
+    <div class="organization-detail" v-if="!tabIndex">
+      <p>当前届次：{{ dataInfo.sessionTime || '-' }}</p>
+      <p>本届换届时间：{{ dataInfo.changeTime || '-' }}</p>
+      <p>换届类型：{{ $dict.getLabel('organizationChangeType', dataInfo.type) || '-' }}</p>
+      <p class="padd-b32">下届换届时间：{{ dataInfo.nextChangeTime || '-' }}</p>
+
+      <p class="fw500">本届任职</p>
+      <div style="margin-bottom: 40px;">
+        <p v-for="(item, index) in dataInfo.serveList" :key="index">{{ item.position }}：{{ item.name }}</p>
+      </div>
+
+      <p class="fw500">本届候选人</p>
+      <p v-for="(item, index) in dataInfo.candidateList" :key="index">{{ item.position }}：{{ item.name }}</p>
+    </div>
+    <div class="history-list" v-if="historyList.length && tabIndex">
+      <div class="item" v-for="(item, index) in historyList" :key="index" @click="toDetail(item.id)">
+        <div class="item-top">
+          <image src="https://cdn.cunwuyun.cn/img/organizationalchange-icon.png"/>
+          届次：{{ item.sessionTime }}
+        </div>
+        <div class="item-date">换届时间：{{ item.changeTime }}</div>
+      </div>
+    </div>
+    <AiEmpty  v-if="!historyList.length && tabIndex"/>
+  </view>
+</template>
+<script>
+import {mapState} from 'vuex'
+export default {
+  name:"AppOrganizational",
+  appName: "组织换届",
+  computed: {
+    ...mapState(['user']),
+    formatTime() {
+      return function (time) {
+        return time && time.substring(0, 10);
+      }
+    }
+  },
+  data() {
+    return {
+      tabIndex: 0,
+      historyList: [],
+      dataInfo: {}
+    };
+  },
+  onShow() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#e60012",
+    })
+    this.$dict.load('organizationChangeType').then(() => {
+      this.getDetail()
+      this.getHistory()
+    })
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/apporganizationgeneralelection/queryDetailByOrganizationId-forwx`, null, {
+        params: {organizationId: this.user.partyOrgId}
+      }).then(res => {
+        if (res?.data) {
+          this.dataInfo = res.data
+        }
+      }).catch(err => {
+        this.$toast(err)
+      })
+    },
+    getHistory() {
+      this.$instance.post(`/app/apporganizationgeneralelection/list-forwx?organizationId=${this.user.partyOrgId}`).then(res => {
+        if (res && res.data) {
+          this.historyList = res.data
+        }
+      })
+    },
+    tabClick(index) {
+      this.tabIndex = index
+    },
+    toDetail(id) {
+      uni.navigateTo({
+        url: `./detail?id=${id}`
+      })
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.AppOrganizational {
+  .detail-top {
+    padding: 32px;
+    background-color: #E60012;
+    color: #fff;
+
+    p {
+      line-height: 64px;
+      font-size: 40px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+    }
+
+    div {
+      line-height: 40px;
+      font-size: 28px;
+      margin-top: 16px;
+    }
+  }
+
+  .line-bg {
+    height: 8px;
+    background-color: #F3F6F9;
+  }
+
+  .select-tab {
+    display: flex;
+    line-height: 96px;
+    background-color: #fff;
+
+    div {
+      flex: 1;
+      border-bottom: 2px solid #D8DDE6;
+      font-size: 28px;
+      text-align: center;
+      color: #999;
+    }
+
+    .tab-active {
+      color: #F26C77;
+      border-bottom: 4px solid #E60012;
+    }
+  }
+
+  .organization-detail {
+    padding: 48px 32px 0;
+
+    p {
+      font-size: 32px;
+      color: #666;
+      line-height: 48px;
+    }
+
+    .padd-b32 {
+      padding-bottom: 40px;
+    }
+
+    .fw500 {
+      font-weight: 600;
+      font-family: PingFangSC-Medium, PingFang SC;
+    }
+  }
+
+  .history-list {
+    padding: 16px 32px;
+
+    .item {
+      width: 686px;
+      background: #fff;
+      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+      border-radius: 8px;
+      margin-bottom: 32px;
+      display: flex;
+
+      .item-top {
+        width: 622px;
+        height: 108px;
+        line-height: 106px;
+        margin-left: 16px;
+        color: #333;
+        font-size: 32px;
+        flex: 1;
+
+        image {
+          width: 40px;
+          height: 40px;
+          margin: 0 20px 0 16px;
+          vertical-align: middle;
+        }
+      }
+
+      .item-date {
+        line-height: 106px;
+        padding-right: 32px;
+        flex: 1;
+        color: #999;
+        font-size: 28px;
+        text-align: right;
+      }
+    }
+  }
+}
+
+.bg-fff {
+  background-color: #fff;
+}
+
+.bg-369 {
+  background-color: #F3F6F9 !important;
+}
+
+</style>
diff --git a/src/project/weiyang/AppOrganizational/detail.vue b/src/project/weiyang/AppOrganizational/detail.vue
new file mode 100644
index 0000000..19d0992
--- /dev/null
+++ b/src/project/weiyang/AppOrganizational/detail.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="detail">
+    <div class="line-bg"></div>
+    <div class="organization-detail">
+      <p>当前届次：{{dataInfo.sessionTime || '-'}}</p>
+      <p>换届时间：{{dataInfo.changeTime || '-'}}</p>
+      <p class="fw500">该届任职</p>
+      <div style="margin-bottom: 40rpx;">
+        <p v-for="(item, index) in dataInfo.serveList" :key="index">{{item.position}}：{{item.name}}</p>
+      </div>
+      <p class="fw500">该届候选人</p>
+      <p v-for="(item, index) in dataInfo.candidateList" :key="index">{{item.position}}：{{item.name}}</p>
+    </div>
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      id: '',
+      dataInfo: {}
+    };
+  },
+  onLoad(options){
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#e60012",
+    })
+    this.$dict.load('organizationChangeType')
+    this.id = options.id
+    this.getDetail()
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/apporganizationgeneralelection/queryDetailById-forwx?id=${this.id}`).then( res => {
+        this.dataInfo = res.data
+      })
+    },
+  },
+};
+</script>
+<style lang="scss" scope>
+.detail {
+    background-color: #fff;
+    .line-bg{
+      height: 20rpx;
+      background-color: #F3F6F9;
+    }
+  .organization-detail{
+    padding: 20rpx 32rpx 0;
+    p{
+      font-size: 32rpx;
+      color: #666;
+      line-height: 48rpx;
+    }
+    .padd-b32{
+      padding-bottom: 40rpx;
+    }
+    .fw500{
+      font-weight: 600;
+      font-family:PingFangSC-Medium,PingFang SC;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/weiyang/AppPartyEnteringCommunity/AppCommunityInfo.vue b/src/project/weiyang/AppPartyEnteringCommunity/AppCommunityInfo.vue
new file mode 100644
index 0000000..c63943a
--- /dev/null
+++ b/src/project/weiyang/AppPartyEnteringCommunity/AppCommunityInfo.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="AppCommunityInfo" v-if="pageShow">
+    <h2>{{ info.title }}</h2>
+    <div class="info-info">
+      <span>{{ info.areaName }}</span>
+      <span>{{ info.createDate }}</span>
+    </div>
+    <image class="banner" @click="preview(banner)" v-if="banner" mode="widthFix" :src="banner"/>
+    <div class="rich-content">
+      <u-parse :html="info.content"></u-parse>
+    </div>
+    <AiEmpty v-if="!info.title"></AiEmpty>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "AppCommunityInfo",
+  appName: "社区简介",
+  data() {
+    return {
+      pageShow: false,
+      info: {},
+      banner: ''
+    }
+  },
+
+  onLoad(query) {
+    if (query.type !== '0') {
+      uni.setNavigationBarTitle({
+        title: query.type == 4 ? '社区公约' : '党员阵地'
+      })
+    }
+
+    this.$loading()
+    this.getInfo(query.type)
+  },
+
+  methods: {
+    getInfo(type) {
+      this.$instance.post(`/app/appcountrysidetourism/queryDetailByAreaIdForWX?areaId=${uni.getStorageSync('areaId')}&type=${type}`).then(res => {
+        if (res.code === 0 && res.data) {
+          this.info = res.data
+          this.banner = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl)[0].url : ''
+        }
+
+        this.$nextTick(() => {
+          this.pageShow = true
+        })
+      })
+    },
+
+    preview(url) {
+      uni.previewImage({
+        urls: [url],
+        current: url
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppCommunityInfo {
+  min-height: 100vh;
+  padding: 0 32px 40px;
+  box-sizing: border-box;
+  background-color: #fff;
+
+  .banner {
+    width: 100%;
+    margin-bottom: 20px;
+  }
+
+  h2 {
+    line-height: 1.3;
+    padding: 32px 0 16px;
+    font-size: 48px;
+    font-weight: 600;
+    color: #333;
+  }
+
+  .info-info {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30px;
+
+    span {
+      color: #999999;
+      font-size: 30px;
+
+      &:last-child {
+        margin-left: 32px;
+      }
+    }
+  }
+
+  ::v-deep.emptyWrap {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue b/src/project/weiyang/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue
new file mode 100644
index 0000000..3c30171
--- /dev/null
+++ b/src/project/weiyang/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue
@@ -0,0 +1,666 @@
+<template>
+  <div class="AppPartyEnteringCommunity">
+    <div class="header" :class="[isFixed ? 'header-active' : '']">
+      <div class="status-bar" :style="{height: statusBarHeight + 'px'}"></div>
+      <div class="nav-bar">
+        <h2>进村</h2>
+      </div>
+    </div>
+    <header>
+      <image src="https://cdn.cunwuyun.cn/wechat/biaopin/custom/custom-top-bg.png"/>
+      <div>
+        <AiAreaPicker :selectRoot="false" ref="area" :value="areaId" :name.sync="areaName" :areaId="$areaId"
+                      @input="areaSelect">
+          <div class="ai-area__wrapper">
+            <span class="label" v-if="areaName">{{ areaName }}</span>
+            <span v-else>请选择</span>
+            <image src="/static/img/area-bottom.png"/>
+          </div>
+        </AiAreaPicker>
+        <div class="welcome">欢迎进入{{ areaName }}</div>
+        <div class="tag" v-if="user.homeArea === areaId">我的家乡</div>
+        <div class="tag1" @click="updateUserInfo" v-if="!user.homeArea && token">设为家乡</div>
+      </div>
+    </header>
+    <div class="card">
+      <div class="card-item" hover-class="text-hover" @click="$linkTo('./AppCommunityInfo?type=0')">
+        <image src="https://cdn.cunwuyun.cn/wechat/biaopin/custom/custom-banner-sqjj.png"/>
+      </div>
+      <div class="card-item" hover-class="text-hover" @click="$linkTo('./AppCommunityInfo?type=4')">
+        <image src="https://cdn.cunwuyun.cn/wechat/biaopin/custom/custom-banner-sqgy.png"/>
+      </div>
+      <!-- <div class="card-item" hover-class="text-hover" @click="$linkTo('./AppCommunityInfo?type=5')">
+        <image src="https://cdn.cunwuyun.cn/pingchang/dyzd.png"/>
+      </div>
+      <div class="card-item" hover-class="text-hover"
+           @click="$linkTo('/mods/AppVillagerDiscussion/AppVillagerDiscussion')">
+        <image src="https://cdn.cunwuyun.cn/pingchang/jmys.png"/>
+      </div> -->
+    </div>
+    <!-- <div class="banner" @click="linkTo('/mods/AppCreditPoints/AppCpSupermarket', 'idNumber')">
+      <image src="/static/img/jf-banner.png" class="banner"/>
+    </div> -->
+    <tempalte v-if="publicList.length">
+      <div class="title-wrap">
+        <span class="title">三务公开</span>
+        <div class="right" hover-class="text-hover"
+             @click="$linkTo(`/mods/AppContent/AppContent?names=三务公开&areaId=${areaId}`)">
+          <span class="title-more">更多专题</span>
+          <u-icon name="arrow-right" size="28" color="#999999"></u-icon>
+        </div>
+      </div>
+      <div class="list-news">
+        <div class="news-wrap" v-for="(item,index) in publicList" :key="index"
+             @click="$linkTo('/mods/AppContent/contentDetail?id='+ item.id)">
+          <div class="news-title">{{ item.title }}</div>
+          <div class="news-bottom">
+            <div class="tag">{{ item.categoryName }}</div>
+            <div class="date">{{ item.createTime ? item.createTime.split(' ')[0] : '' }}</div>
+            <div class="view">
+              <em>{{ item.viewCount }}</em>
+              人看过
+            </div>
+          </div>
+        </div>
+      </div>
+    </tempalte>
+    <div class="title-wrap" v-if="activityList.length">
+      <span class="title">专题活动</span>
+      <div class="right">
+        <span class="title-more" @click="$linkTo('/mods/AppVillageActivity/AppVillageActivity')">更多活动</span>
+        <u-icon name="arrow-right" size="28" color="#999999"></u-icon>
+      </div>
+    </div>
+    <scroll-view :scroll-x="true" style="width: 100%" class="scroll-wrap" v-if="activityList.length">
+      <div
+          class="scroll-card"
+          @click="$linkTo('/mods/AppVillageActivity/ActivityDetail?id=' + item.id)"
+          hover-class="text-hover"
+          v-for="(item, index) in activityList"
+          :key="index">
+        <image :src="item.url" mode="aspectFill"/>
+        <div class="text">
+          <span>{{ item.title }}</span>
+        </div>
+      </div>
+      <AiEmpty v-if="!activityList.length"></AiEmpty>
+    </scroll-view>
+    <!-- <div class="title-wrap">
+      <span class="title">乡村相册</span>
+    </div>
+    <div class="album-list">
+      <div
+          class="album"
+          v-for="(item, index) in albumList"
+          hover-class="text-hover"
+          :key="index"
+          @click="$linkTo('/mods/AppPhotoAlbum/AppPhotoAlbum?type=' + item.type + '&name=' + item.name + '&url=' + item.coverImg)">
+        <image :src="item.coverImg"/>
+        <div class="total">共{{ item.total }}张</div>
+        <div class="desc">{{ item.name }}</div>
+      </div>
+      <AiEmpty style="width: 100%" v-if="!albumList.length"></AiEmpty>
+    </div> -->
+    <AiLogin ref="login"/>
+  </div>
+</template>
+<script>
+import {mapActions, mapState} from 'vuex'
+
+export default {
+  name: "AppPartyEnteringCommunity",
+  appName: "社区",
+  customNavigation: true,
+  data() {
+    return {
+      isFixed: false,
+      statusBarHeight: 20,
+      top: 0,
+      areaName: '',
+      areaId: '',
+      $areaId: '',
+      albumList: [],
+      activityList: [],
+      publicList: [],
+      moduleId: "",
+      isInit: false
+    }
+  },
+
+  onLoad() {
+    this.areaId = this.$mp.query.areaId || this.$areaId
+    this.areaName = this.$mp.query.areaName || this.$areaName
+    this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+    this.autoLogin()
+
+    this.$nextTick(() => {
+      this.getName()
+      this.getAlbumList()
+      this.getActiveList()
+    })
+    uni.$on('update', () => {
+      this.getAlbumList()
+    })
+  },
+
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+
+  onShow() {
+    this.$nextTick(() => {
+      this.token && this.getUserInfo('qujing')
+    })
+
+    if (this.user.homeArea) {
+      if (!this.isInit) {
+        this.areaId = this.user.homeArea
+        this.areaName = this.user.homeName
+        uni.setStorageSync('areaId', this.user.homeArea)
+        uni.setStorageSync('areaName', this.user.homeName)
+        this.isInit = true
+      }
+    } else if (!this.isInit && !this.user.homeArea) {
+      setTimeout(() => {
+        this.$dialog.alert({
+          content: '请选择您的家乡'
+        }).then(() => {
+          this.$refs.area?.handleJump()
+          this.isInit = true
+        })
+      }, 600)
+    }
+  },
+
+  methods: {
+    ...mapActions(['autoLogin', 'getUserInfo']),
+    getName() {
+      this.$instance.post("/app/appcontentmoduleinfo/listByNames", null, {
+        params: {names: "三务公开"}
+      }).then(res => {
+        if (res.data && res.data.length) {
+          this.moduleId = res.data[0]["id"];
+          this.getPublicList();
+        }
+      })
+    },
+
+    updateUserInfo() {
+      if (this.areaId.endsWith('000')) {
+        this.$dialog.alert({
+          content: '请选择村'
+        }).then(() => {
+        })
+
+        return false
+      }
+
+      this.$instance.post("/app/appwechatuser/updateById", {
+        id: this.user.id,
+        homeArea: this.areaId,
+        homeName: this.areaName
+      }).then(res => {
+        if (res.code === 0) {
+          this.getUserInfo('qujing')
+        }
+      })
+    },
+
+    getPublicList() {
+      this.$instance.post("/app/appcontentinfo/list", null, {
+        params: {moduleId: this.moduleId, size: 3, areaId: this.areaId}
+      }).then(res => {
+        if (res?.data) {
+          this.publicList = res.data.records;
+        }
+      })
+    },
+
+    linkTo(url, type) {
+      if (type) {
+        if (this.token) {
+          if (type === 'idNumber') {
+            if (!this.user.residentId) {
+              this.$linkTo('/mods/AppAuth/AppAuth')
+            } else {
+              this.$linkTo(url)
+            }
+          }
+        } else {
+          this.$refs.login.show()
+        }
+      } else {
+        this.$linkTo(url)
+      }
+    },
+
+    areaSelect(v) {
+      this.areaId = v
+      this.isMore = false
+      this.current = 0
+      this.newsList = []
+
+      this.$nextTick(() => {
+        this.getActiveList()
+        this.getAlbumList()
+        this.getPublicList()
+        uni.setStorageSync('areaId', this.areaId)
+        uni.setStorageSync('areaName', this.areaName)
+      })
+    },
+
+    getAlbumList() {
+      this.$instance.post(`/app/appvillagepicturealbum/queryAlbumMenu?areaId=${this.areaId}`).then(res => {
+        if (res.code == 0) {
+          this.albumList = res.data.map(v => {
+            return {
+              ...v,
+              coverImg: `${this.$cdn}/dvcp/album/album${v.type}.png`
+            }
+          })
+        }
+      })
+    },
+
+    getActiveList() {
+      this.$instance.post(`/app/appvillageactivityinfo/listUp`, null, {
+        params: {
+          current: 1,
+          size: 6,
+          areaId: this.areaId
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.activityList = res.data.records.map(v => {
+            return {
+              ...v,
+              url: v.url ? JSON.parse(v.url)[0].url : ''
+            }
+          })
+        }
+      })
+    }
+  },
+
+  onShareAppMessage() {
+    return {
+      title: '欢迎使用数字党建平昌~',
+      path: `/pages/AppPartyEnteringCommunity/AppPartyEnteringCommunity`
+    }
+  },
+
+  onPageScroll(params) {
+    this.isFixed = params.scrollTop > 60;
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.AppPartyEnteringCommunity {
+  min-height: 100%;
+  background: #F3F6F9;
+
+  ::v-deep .emptyImg {
+    margin-top: 0 !important;
+  }
+
+  .header {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 0;
+    width: 100%;
+    opacity: 0;
+    transition: all 0.2s ease;
+
+    &.header-active {
+      z-index: 1111;
+      opacity: 1;
+      background: #4181FF;
+    }
+
+    .nav-bar {
+      position: relative;
+      height: 88px;
+      line-height: 88px;
+      color: #fff;
+      font-size: 32px;
+      text-align: center;
+    }
+  }
+
+  & > header {
+    position: relative;
+    height: 480px;
+    box-sizing: border-box;
+    padding-left: 32px;
+
+    & > div {
+      position: relative;
+      z-index: 11;
+    }
+
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-top: 100px;
+
+      span {
+        margin-right: 16px;
+        color: #FFFFFF;
+        font-size: 44px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    & > image {
+      position: absolute;
+      left: 0;
+      top: 0;
+      z-index: 1;
+      width: 100%;
+      height: 480px;
+    }
+
+    .welcome {
+      font-size: 28px;
+      font-weight: 400;
+      color: #FFFFFF;
+      line-height: 40px;
+      margin-top: 20px;
+    }
+
+    .tag {
+      width: 120px;
+      height: 44px;
+      background: rgba(0, 0, 0, 0.3);
+      border-radius: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 22px;
+      font-weight: 400;
+      color: #c0cae0;
+      margin-top: 16px;
+    }
+
+    .tag1 {
+      width: 120px;
+      height: 44px;
+      border: 1px solid #c0cae0;
+      background: rgba(0, 0, 0, 0.1);
+      border-radius: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 22px;
+      font-weight: 400;
+      color: #c0cae0;
+      margin-top: 16px;
+    }
+  }
+
+  .card {
+    position: relative;
+    left: 32px;
+    z-index: 1;
+    background: #FFFFFF;
+    border-radius: 32px;
+    margin-top: -132px;
+    box-sizing: border-box;
+    padding: 28px 24px 0 24px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    width: 686px;
+    box-sizing: border-box;
+
+    .card-item {
+      width: 308px;
+      height: 144px;
+      margin-bottom: 28px;
+
+      image {
+        width: 308px;
+        height: 144px;
+      }
+    }
+  }
+
+  .banner {
+    position: relative;
+    z-index: 2;
+    height: 200px;
+    background: linear-gradient(180deg, #FFFFFF 0%, #F3F6F9 100%);
+
+    image {
+      display: block;
+      width: 692px;
+      height: 200px;
+      margin: 0 auto;
+    }
+  }
+
+  .title-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 32px 32px 24px;
+
+    .title {
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+      color: #222;
+      line-height: 40px;
+    }
+
+    .right {
+
+      .title-more {
+        font-size: 28px;
+        font-weight: 400;
+        line-height: 40px;
+        color: #687DA6;
+      }
+    }
+  }
+
+  .album-list {
+    box-sizing: border-box;
+    padding: 0 32px 32px;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 16px;
+
+    .album {
+      position: relative;
+      width: 218px;
+      height: 240px;
+      background: #FFFFFF;
+      box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
+      border-radius: 16px;
+      overflow: hidden;
+
+      image {
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 1;
+        width: 100%;
+        height: 100%;
+      }
+
+      .total {
+        display: flex;
+        position: absolute;
+        align-items: center;
+        justify-content: center;
+        right: 8px;
+        top: 8px;
+        z-index: 2;
+        width: 74px;
+        height: 40px;
+        background: rgba(0, 0, 0, .6);
+        border-radius: 8px;
+        font-size: 22px;
+        font-weight: 400;
+        color: #FFFFFF;
+      }
+
+      .desc {
+        position: absolute;
+        bottom: 16px;
+        left: 0;
+        z-index: 2;
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        padding: 0 12px;
+        font-size: 32px;
+        text-align: center;
+        color: #FFFFFF;
+        font-weight: 600;
+        box-sizing: border-box;
+      }
+    }
+  }
+
+  .list-news {
+    box-sizing: border-box;
+    padding: 0 32px;
+
+    .news-wrap {
+      height: 186px;
+      background: #FFFFFF;
+      box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
+      border-radius: 16px;
+      box-sizing: border-box;
+      padding: 32px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      margin-bottom: 24px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .news-title {
+        font-size: 36px;
+        font-weight: 600;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .news-bottom {
+        display: flex;
+        align-items: center;
+
+        .tag {
+          width: 144px;
+          height: 48px;
+          background: #EEEEEE;
+          border-radius: 24px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 28px;
+          font-weight: 400;
+          color: #999999;
+        }
+
+        .date {
+          font-size: 28px;
+          font-weight: 400;
+          color: #999999;
+          margin-left: 16px;
+        }
+
+        .view {
+          font-size: 28px;
+          font-weight: 400;
+          color: #999999;
+          margin-left: auto;
+          display: flex;
+          align-items: center;
+
+          & > em {
+            color: #4181FF;
+            font-style: normal;
+          }
+        }
+      }
+    }
+  }
+
+  .scroll-wrap {
+    box-sizing: border-box;
+    padding: 0 32px;
+    width: 100%;
+    white-space: nowrap;
+
+    .scroll-card {
+      display: inline-block;
+      width: 400px;
+      height: 332px;
+      background: #FFFFFF;
+      box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
+      border-radius: 16px;
+      margin-right: 32px;
+      font-size: 0;
+
+      & > image {
+        width: 400px;
+        height: 240px;
+        border-radius: 16px 16px 0 0;
+      }
+
+      .text {
+        height: calc(100% - 240px);
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        padding: 0 32px;
+
+        & > span {
+          font-size: 32px;
+          font-weight: 600;
+          color: #333333;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+
+  ::v-deep .AiArea {
+    padding-top: 64px;
+    height: 88px;
+
+    ._img {
+      display: none;
+    }
+
+    .area-name {
+      font-size: 44px;
+      font-weight: 600;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppPartyEnteringCommunity/custom.png b/src/project/weiyang/AppPartyEnteringCommunity/custom.png
new file mode 100644
index 0000000000000000000000000000000000000000..585f1c370158eed7adfc21c950febbc950bd8cae
GIT binary patch
literal 2019
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
B)cF7a

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppPartyEnteringCommunity/custom_selected.png b/src/project/weiyang/AppPartyEnteringCommunity/custom_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..61dba5a5b330197c8550b25225aea1f59ea63c97
GIT binary patch
literal 2043
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
ZzX7V*ha3I2ek1?@002ovPDHLkV1g7W=1Two

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppPatrolReport/AppPatrolReport.vue b/src/project/weiyang/AppPatrolReport/AppPatrolReport.vue
index c172ca5..a65e47f 100644
--- a/src/project/weiyang/AppPatrolReport/AppPatrolReport.vue
+++ b/src/project/weiyang/AppPatrolReport/AppPatrolReport.vue
@@ -32,7 +32,7 @@ export default {
   customNavigation: true,
   data() {
     return {
-      component: 'List',
+      component: 'Statistics',
       params: {},
       refresh: true,
       tabIndex: 0,
diff --git a/src/project/weiyang/AppPatrolReport/Statistics.vue b/src/project/weiyang/AppPatrolReport/Statistics.vue
index 19174ba..01b2b87 100644
--- a/src/project/weiyang/AppPatrolReport/Statistics.vue
+++ b/src/project/weiyang/AppPatrolReport/Statistics.vue
@@ -91,15 +91,18 @@ export default {
 
           Object.keys(res.data.finishCountMap).forEach((key) => {
             var info = {
-              name: key,
-              value: res.data.finishCountMap[key]
+              'name': key,
+              'value': res.data.finishCountMap[key]
             }
+            this.finishData.push(info)
+
             if (res.data.finishCountMap[key] > 0) {
               this.showFinish = true
             }
-            this.finishData.push(info)
           })
 
+          console.log(this.finishData)
+
           if (this.showFinish) {
             var num = res.data.finishCountMap['累计事件办结'] / res.data.finishCountMap['累计事件上报']
             this.finshNum = Number(num * 100).toFixed(2)
@@ -110,14 +113,14 @@ export default {
           })
           res.data.groupList.map((item) => {
             var info = {
-              name: item.groupName,
-              value: item.totalNum
+              'name': item.groupName,
+              'value': item.totalNum
             }
             this.typeData.push(info)
           })
 
-          this.$nextTick(() => {
-            if (this.showFinish) {
+          console.log(this.finishData)
+          if (this.showFinish) {
             this.finishChartInit('finish')
           }
           if (this.trendData.length) {
@@ -126,7 +129,6 @@ export default {
           if (this.typeData.length) {
             this.typeChartInit('type')
           }
-          })
 
         }
       })
@@ -144,11 +146,12 @@ export default {
       })
     },
     finishChartInit(id) {
+      console.log(this.finishData)
       var ctx = uni.createCanvasContext(id, this);
       uChartsInstance[id] = new uCharts({
         type: "ring",
-        width: 300,
-        height: 240,
+        width: 350,
+        height: 250,
         context: ctx,
         series: [
           {
diff --git a/src/project/weiyang/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/weiyang/AppRedemptionPoints/AppRedemptionPoints.vue
new file mode 100644
index 0000000..d1a40a8
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/AppRedemptionPoints.vue
@@ -0,0 +1,377 @@
+<template>
+  <div class="AppRedemptionPoints">
+    <div class="fixed-top">
+      <div class="header">
+        <div class="num">
+          <p>积分余额</p>
+          <h3>{{total}}</h3>
+        </div>
+        <div class="btn" @click="toMyOrder">我的订单</div>
+      </div>
+      <div class="search">
+        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="76" font-size="28" bg-color="#fff" inactive-color="#8891A1" 
+          active-color="#1D2229 " :bar-style="barStyle" @change="changeTab" ></u-tabs>
+        <div class="type-select">
+          <div :class="currentType == index ? 'item active' : 'item'" v-for="(item, index) in typeList" :key="index" @click="typeClick(index)">
+            {{item}}
+            <span v-if="index == 1" class="down-icon">⏷</span>
+          </div>
+        </div>
+        <div class="point-select" v-if="currentType == 1">
+          <u-tabs :list="pointTypeList" :is-scroll="true" :current="currentPoint" height="80" font-size="24" bg-color="#fff" inactive-color="#666666" 
+          active-color="#4181FF" bar-width="0" :bold="false" @change="pointClick" ></u-tabs>
+        </div>
+      </div>
+    </div>
+    <div class="list-content">
+      <div class="left-list" v-if="leftList.length">
+        <div class="list-info" v-for="(item, index) in leftList" :key="index">
+          <div class="item" @click="toProductDetail(item)">
+            <img :src="item.picUrl" alt="">
+            <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGTypeText', item.typeText) }}</div>
+            <div class="content">
+              <p class="text">{{item.title}}</p>
+              <div class="item-money">
+                <h3>{{item.integralPrice}}积分</h3>
+                <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
+                <span v-if="item.type == 1">兑换后再付</span>
+              </div>
+              <div v-if="item.shopStatus == 1">
+                <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
+                <div class="btn btn0" v-else>商品缺货</div>
+              </div>
+              <div v-else>
+                <div class="btn btn0">店铺停用</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="right-list" v-if="rightList.length">
+        <div class="list-info" v-for="(item, index) in rightList" :key="index">
+          <div class="item" @click="toProductDetail(item)">
+            <img :src="item.picUrl" alt="">
+            <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGTypeText', item.typeText) }}</div>
+            <div class="content">
+              <p class="text">{{item.title}}</p>
+              <div class="item-money">
+                <h3>{{item.integralPrice}}积分</h3>
+                <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
+                <span v-if="item.type == 1">兑换后再付</span>
+              </div>
+              <div v-if="item.shopStatus == 1">
+                <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
+                <div class="btn btn0" v-else>商品缺货</div>
+              </div>
+              <div v-else>
+                <div class="btn btn0">店铺停用</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!goodsList.length"></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'AppRedemptionPoints',
+  appName: '积分兑换',
+  data() {
+    return {
+      tabList: [{name: '全部'}, {name: '积分兑换'}, {name: '低价商品'}],
+      currentTabs: 0,
+      barStyle: {
+        'width': '20px',
+        'height': '3px',
+        'border-radius': '2px',
+        'bottom': '-3px',
+        'background': '#2D7DFF'
+      },
+      typeList: ['最新上架', '积分', '我可兑换的'],
+      currentType: 0,
+      pointTypeList: [{name: '全部'}, {name: '50分以下'},  {name: '100分以下'},  {name: '200分以下'},  {name: '5000分以下'}],
+      currentPoint: 0,
+      goodsList: [],
+      leftList: [],
+      rightList: [],
+      total: 0,
+      current: 1
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.getTotal()
+    this.$dict.load(['integralSGTypeText']).then(() => {
+      this.getList()
+    })
+    uni.$on('updateGoodsList', () => {
+      this.getListInit()
+    })
+  },
+  onShow() {
+    this.getTotal()
+  },
+  methods: {
+    getTotal() {
+      this.$instance.post(`/app/appintegraluser/integralUserInfoFD`).then(res => {
+        if (res?.data) {
+          this.total = res.data.integral || 0
+        }
+      })
+    },
+    getListInit() {
+      this.goodsList = []
+      this.leftList = []
+      this.rightList = []
+      this.current = 1
+      this.getList()
+    },
+    getList() {
+      this.$instance.post(`/app/appintegralsupermarketshop/goodsListXCX`, null, {
+        params: {
+          goodsType: this.currentTabs,  //商品类型，0：全部、1：积分兑换、2：京东低价商品，默认0
+          orderType: this.currentType == 0 ? 1 : 0,  //排序类型，0：积分升序、1：上架时间倒序，默认0
+          filterIntegral: this.currentType == 2 ? true : false,  //过滤我可兑换的，默认false
+          integralRange: this.currentType == 1 ? this.currentPoint : '',  //积分区间类型，0：全部、1：50分以下、2:100分以下、3：200分以下、4：5000分以下默认0
+          current: this.current
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.goodsList = this.current == 1 ? res.data.records : [...this.goodsList, ...res.data.records]
+          res.data.records.map((item, index) => {
+            item.typeText = item.type == 0 ? 0 : 1
+            if(index%2 ==0) {
+              this.leftList.push(item)
+            }else {
+              this.rightList.push(item)
+            }
+          })
+        }
+      })
+    },
+    changeTab(index) {
+      this.currentTabs = index
+      this.getListInit()
+    },
+    typeClick(index) {
+      this.currentType = index
+      this.getListInit()
+    },
+    pointClick(index) {
+      this.currentPoint = index
+      this.getListInit()
+    },
+    toProductDetail(item) {
+      uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}`})
+    },
+    toMyOrder() {
+      uni.navigateTo({url: './myOrderList'})
+    },
+    toOrder(item) {
+      if(this.total >= item.integralPrice && item.stock > 0) {
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=3`})
+      }
+    },
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppRedemptionPoints {
+  .fixed-top {
+    background-color: #f3f6f9;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 2;
+  }
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 32px 24px;
+    background-color: #fff;
+    margin-bottom: 24px;
+    .num {
+      p {
+        font-family: PingFangSC-Regular;
+        font-weight: 400;
+        font-size: 24px;
+        color: #999;
+        line-height: 34px;
+      }
+      h3 {
+        font-family: PingFangSC-SNaNpxibold;
+        font-weight: 600;
+        font-size: 66px;
+        color: #FF6900;
+        line-height: 92px;
+      }
+    }
+    .btn {
+      width: 168px;
+      height: 64px;
+      border: 1px solid #4181FF;
+      line-height: 62px;
+      border-radius: 44px;
+      box-sizing: border-box;
+      text-align: center;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 26px;
+      color: #4181FF;
+      margin-top: 28px;
+    }
+  }
+  .search {
+    background-color: #fff;
+    .type-select {
+      display: flex; 
+      border-top: 1px solid #D8D8D8;
+      line-height: 84px;
+      .item {
+        flex: 1;
+        text-align: center;
+        font-family: PingFangSC-Regular;
+        font-size: 26px;
+        color: #8891A1;
+        .down-icon {
+          display: inline-block;
+          margin-left: 8px;
+          transition: all 0.3s ease-in-out;
+          transform: rotate(0deg);
+        }
+      }
+      .active {
+        color: #4181FF;
+        .down-icon {
+          transform: rotate(180deg);
+        }
+      }
+    }
+  }
+  .list-content {
+    padding: 396px 0 24px 24px;
+    background-color: #f3f6f9;
+    overflow: hidden;
+    .left-list,
+    .right-list {
+      width: 50%;
+      float: left;
+    }
+    .list-info {
+      width: 100%;
+    }
+    .item {
+      width: calc(100% - 24px);
+      background-color: #fff;
+      border-radius: 20px;
+      position: relative;
+      margin-bottom: 24px;
+      img {
+        width: 100%;
+        height: 340px;
+        border-top-left-radius: 20px;
+        border-top-right-radius: 20px;
+      }
+      .type {
+        padding: 8px 16px;
+        font-family: PingFangSC-Regular;
+        font-size: 20px;
+        line-height: 28px;
+        color: #FFF;
+        border-top-right-radius: 20px;
+        border-bottom-left-radius: 20px;
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+      .type2 {
+        background-color: #E64E39;
+      }
+      .type1 {
+        background-color: #E64E39;
+      }
+      .type0 {
+        background-color: #FF6900;
+      }
+      .content {
+        padding: 16px 16px 24px;
+        position: relative;
+        background-color: #fff;
+        .text {
+          font-family: PingFangSC-SNaNpxibold;
+          font-weight: 600;
+          font-size: 26px;
+          color: #222;
+          line-height: 38px;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          line-clamp: 2;					
+          -webkit-box-orient: vertical;
+          margin-bottom: 12px;
+        }
+        .item-money {
+          width: calc(100% - 160px);
+          h3 {
+            font-family: PingFangSC-SNaNpxibold;
+            font-weight: 600;
+            font-size: 34px;
+            color: #FF6900;
+            line-height: 48px;
+          }
+          p {
+            font-family: PingFangSC;
+            font-weight: 600;
+            font-size: 26px;
+            color: #4181FF;
+          }
+          span {
+            display: inline-block;
+            font-family: PingFangSC-Regular;
+            font-weight: 400;
+            font-size: 20px;
+            color: #4181FF;
+            line-height: 22px;
+          }
+        }
+        .btn {
+          padding: 14px 32px;
+          font-family: PingFangSC-Medium;
+          font-weight: 500;
+          font-size: 22px;
+          line-height: 28px;
+          border-radius: 44px;
+          position: absolute;
+          bottom: 24px;
+          right: 16px;
+        }
+        .btn1 {
+          background-color: #2D7DFF;
+          color: #FFF;
+        }
+        .btn0 {
+          background-color: #E2E2E2;
+          color: #666;
+        }
+      }
+    }
+    .item:nth-of-type(2n-1) {
+      margin-right: 22px;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppRedemptionPoints/img/success.png b/src/project/weiyang/AppRedemptionPoints/img/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..573a79c8884d53d02933c9fdc4ae343683a9d2d9
GIT binary patch
literal 19019
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
Z`u}MHC`F*?Zx{do002ovPDHLkV1o5V#MJ-*

literal 0
HcmV?d00001

diff --git a/src/project/weiyang/AppRedemptionPoints/jdH5.vue b/src/project/weiyang/AppRedemptionPoints/jdH5.vue
new file mode 100644
index 0000000..c26b96e
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/jdH5.vue
@@ -0,0 +1,20 @@
+<template>
+  <div class="jdH5">
+    <web-view :src="goodsJdUrl"></web-view>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'jdH5',
+  data() {
+    return {
+      goodsJdUrl: ''
+    }
+  },
+  onLoad(option) {
+    this.goodsJdUrl = option.goodsJdUrl
+  },
+}
+</script>
\ No newline at end of file
diff --git a/src/project/weiyang/AppRedemptionPoints/myOrderList.vue b/src/project/weiyang/AppRedemptionPoints/myOrderList.vue
new file mode 100644
index 0000000..0c7329d
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/myOrderList.vue
@@ -0,0 +1,315 @@
+<template>
+  <div class="myOrderList">
+    <div class="fixed-top">
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="90" font-size="28" bg-color="#fff" inactive-color="#8891A1" 
+          active-color="#1D2229 " :bar-style="barStyle" @change="changeTab" ></u-tabs>
+    </div>
+    <div class="list-content" v-if="list.length">
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="time-flex">
+          <p>{{item.createTime.substring(0, 16)}}</p>
+          <div :class="`status`+item.status">{{ $dict.getLabel('integralSGOStatus', item.status) }}</div>
+        </div>
+        <div class="flex">
+          <img :src="item.goodsPicUrl" alt="">
+          <div class="type" :class="`type`+item.goodsTypeText">{{ $dict.getLabel('integralSGTypeText', item.goodsTypeText) }}</div>
+          <div class="flex-right">
+            <p>{{item.goodsTitle}}</p>
+            <div class="num-flex">
+              <h3>{{item.usedIntegral}}积分<span v-if="item.goodsType == 2">+{{item.payMoney}}元</span></h3>
+              <div>x {{item.quantity}}</div>
+            </div>
+          </div>
+        </div>
+        <p class="tips" v-if="item.goodsType == 2"><span>兑换成功后，点击「去购买」前往京东低价购买</span></p>
+         <p class="tips" v-else>积分兑换商品，可到固定的兑换点进行「核销兑换」</p>
+        <p class="remark" v-if="item.remarks">备注：{{item.remarks}}</p>
+        <div class="flex-btn" v-if="item.goodsType == 2 && item.status != 2">
+          <p></p>
+          <div class="btn confirm" @click="openJd(item)">去购买</div>
+        </div>
+        <div class="flex-btn" v-if="item.goodsType != 2">
+          <p>核销码:<span>{{item.verificationCode}}</span></p>
+          <div class="btn" v-if="item.status == 0" @click="cancel(item)">取消订单</div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else></AiEmpty>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'myOrderList',
+  appName: '我的订单',
+  data() {
+    return {
+      tabList: [{name: '全部'}, {name: '待核销'}, {name: '已完成'}, {name: '已取消'}],
+      currentTabs: 0,
+      barStyle: {
+        'width': '20px',
+        'height': '3px',
+        'border-radius': '2px',
+        'bottom': '3px',
+        'background': '#2D7DFF'
+      },
+      list: [],
+      current: 1
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.$dict.load(['integralSGOStatus', 'integralSGTypeText']).then(() => {
+      this.getList()
+    })
+  },
+  methods: {
+    changeTab(index) {
+      this.currentTabs = index
+      this.getListInit()
+    },
+    getListInit() {
+      this.current = 1
+      this.getList()
+    },
+    getList() {
+      this.$instance.post(`/app/appintegralsupermarketorder/listForXCX`, null, {
+        params: {
+          current: this.current,
+          status: this.currentTabs == 0 ? '' : this.currentTabs - 1,
+          createUserId: this.user.id
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          res.data.records.map((item) => {
+            item.goodsTypeText = item.goodsType == 0 ? 0 : 1
+          })
+          this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records]
+        }
+      })
+    },
+    openJd(item) {
+      if(item.goodsType == 1) {
+        uni.navigateTo({url: `./jdH5?goodsJdUrl=${item.goodsJdUrl}`})
+      }else {
+        uni.navigateToMiniProgram({
+          appId: item.goodsJdAppid,
+          path: item.goodsJdUrl
+        })
+      }
+    },
+    cancel(item) {
+      uni.showModal({
+        title: '确认取消此订单？',
+        content: '取消订单后，积分将退回至积分余额',
+        confirmColor: "#2D7DFF",
+        cancelColor: "#2D7DFF",
+        cancelText: "我在想想",
+        confirmText: "确认取消", 
+        success: (res) => {
+          if (res.confirm) {
+            this.cancelOrder(item)
+          }
+        }
+      });
+    },
+    cancelOrder(item) {
+      this.$instance.post(`/app/appintegralsupermarketorder/cancelForXCX?id=${item.id}`).then(res => {
+        if (res.code === 0) {
+          this.getListInit()
+          uni.$emit('updateGoodsList')
+        }
+      })
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.myOrderList {
+  min-height: 100%;
+  .fixed-top {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 2;
+  }
+  .list-content {
+    padding: 112px 24px 24px;
+    background-color: #F3F6F9;
+    .item {
+      width: 100%;
+      background: #FFF;
+      border-radius: 16px;
+      margin-bottom: 32px;
+      .time-flex {
+        padding: 0 32px;
+        line-height: 64px;
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        color: #666;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 1px solid #ddd;
+        div {
+          color: #2D7DFF;
+        }
+        .status2 {
+          color: #999;
+        }
+      }
+      .flex {
+        padding: 32px 32px 0;
+        display: flex;
+        position: relative;
+        margin-bottom: 20px;
+        img {
+          width: 166px;
+          height: 166px;
+          border-radius: 16px;
+          margin-right: 20px;
+        }
+        .type {
+          position: absolute;
+          left: 32px;
+          bottom: 0;
+          border-bottom-left-radius: 16px;
+          border-bottom-right-radius: 16px;
+          width: 166px;
+          text-align: center;
+          line-height: 34px;
+          font-family: PingFangSC-Regular;
+          font-size: 18px;
+          color: #FFF;
+          p {
+            scale: 0.9;
+          }
+        }
+        .type2 {
+          background-color: #E64E39;
+        }
+        .type1 {
+          background-color: #E64E39;
+        }
+        .type0 {
+          background-color: #FF6900;
+        }
+        .flex-right {
+          width: calc(100% - 186px);
+          p {
+            word-break: break-all;
+            font-family: PingFangSC-Regular;
+            font-size: 26px;
+            color: #222;
+            line-height: 34px;
+            text-overflow: -o-ellipsis-lastline;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            line-clamp: 2;					
+            -webkit-box-orient: vertical;
+            margin-bottom: 50px;
+          }
+          .num-flex {
+            display: flex;
+            h3 {
+              width: calc(100% - 100px);
+              font-family: PingFangSC-SNaNpxibold;
+              font-weight: 600;
+              font-size: 34px;
+              color: #FF6900;
+              line-height: 48px;
+              span {
+                display: inline-block;
+                font-size: 34px;
+                color: #4181FF;
+                margin-left: 8px;
+              }
+            }
+            div {
+              width: 100px;
+              text-align: right;
+              font-family: PingFangSC-SNaNpxibold;
+              font-weight: 600;
+              font-size: 24px;
+              color: #222;
+              line-height: 48px;
+            }
+          }
+          
+        }
+      }
+      .tips {
+        display: inline-block;
+        padding: 12px;
+        line-height: 36px;
+        background: #F5FCF5;
+        border-radius: 16px;
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        color: #3BBC37;
+        margin: 0 32px 16px 32px;
+        span {
+          display: inline-block;
+          scale: 0.9;
+        }
+      }
+      .remark {
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        color: #666;
+        line-height: 34px;
+        word-break: break-all;
+        margin: 0 32px 24px 32px;
+      }
+      .flex-btn {
+        padding: 0 32px 32px;
+        display: flex;
+        justify-content: space-between;
+        p {
+          height: 56px;
+          line-height: 56px;
+          font-family: PingFangSC-Regular;
+          font-size: 24px;
+          color: #666;
+          span {
+            display: inline-block;
+            font-family: PingFangSC-SNaNpxibold;
+            font-weight: 600;
+            font-size: 28px;
+            color: #2D7DFF;
+            margin-left: 8px;
+          }
+        }
+        .btn {
+          width: 136px;
+          text-align: center;
+          line-height: 54px;
+          border: 1px solid #CCC;
+          border-radius: 44px;
+          font-family: PingFangSC-Regular;
+          font-size: 22px;
+          color: #666;
+        }
+        .confirm {
+          border: 1px solid #2D7DFF;
+          background-color: #2D7DFF;
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  
+}
+</style>
diff --git a/src/project/weiyang/AppRedemptionPoints/placeOrder.vue b/src/project/weiyang/AppRedemptionPoints/placeOrder.vue
new file mode 100644
index 0000000..8126947
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/placeOrder.vue
@@ -0,0 +1,291 @@
+<template>
+  <div class="placeOrder">
+    <div class="header-info">
+      <div class="flex">
+        <img :src="goodsInfo.picUrl" alt="">
+        <div class="type" :class="`type`+goodsInfo.typeText">{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}</div>
+        <div class="flex-right">
+          <p>{{goodsInfo.title}}</p>
+          <div>
+            <u-number-box v-model="goodsNum" @change="valChange" input-height="44" size="24" :min="1" :max="goodsInfo.stock"></u-number-box>
+          </div>
+          <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 2">+￥{{goodsInfo.payMoney}}.00</span></h3>
+        </div>
+      </div>
+      <p class="tips" v-if="goodsInfo.type == 2">兑换成功后，点击「去购买」前往京东低价购买</p>
+      <p class="tips" v-else>积分兑换商品，可到固定的兑换点进行「核销兑换」</p>
+    </div>
+    <div class="content">
+      <div class="item-flex" @click="show=true">
+        <div class="label">订单备注</div>
+        <div class="value" :class="value ? '' : 'color-999'">{{value || '无备注'}}<u-icon name="arrow-right" color="#bbb" size="24"></u-icon></div>
+      </div>
+      <div class="item-flex">
+        <div class="label">积分余额</div>
+        <div class="value color-FF6900">{{total}}积分</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">支付积分</div>
+        <div class="value">减{{(goodsNum*goodsInfo.integralPrice).toFixed(2)}}积分</div>
+      </div>
+      <div class="item-flex" v-if="goodsInfo.type == 2">
+        <div class="label">京东支付</div>
+        <div class="value color-999">¥{{(goodsNum*goodsInfo.payMoney).toFixed(2)}}</div>
+      </div>
+    </div>
+    <u-popup v-model="show" mode="bottom">
+      <div class="textarea">
+        <u-input v-model="value" type="textarea" :height="120" :auto-height="true" placeholder="请输入备注" :clearable="false" maxlength="1000" />
+        <p>字数{{value.length}}/1000</p>
+      </div>
+      <div class="btn">
+        <span @click="value=''">清空内容</span>
+        <span class="confirm" @click="confirm">保存</span>
+      </div>
+    </u-popup>
+    <div class="bottom-btn" @click="confirmOrder()">
+      <div>提交订单</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'placeOrder',
+  appName: '提交订单',
+  data() {
+    return {
+      value: '',
+      show: false,
+      total: 0,
+      goodsInfo: {},
+      goodsNum: 1,
+      backLevel: 0
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.shopGoodsId = option.shopGoodsId
+    this.total = option.total
+    this.backLevel = option.backLevel
+    this.$dict.load(['integralSGTypeText']).then(() => {
+      this.getDetail()
+    })
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/appintegralsupermarketshop/queryGoodsInfoXCX?shopGoodsId=${this.shopGoodsId}`).then(res => {
+        if (res.code === 0) {
+          this.goodsInfo = res.data
+          this.goodsInfo.typeText = this.goodsInfo.type == 0 ? 0 : 1
+        }
+      })
+    },
+    valChange(e) {
+      this.goodsNum = e.value
+    },
+    confirm() {
+      this.show = false
+    },
+    confirmOrder() {
+      this.$instance.post(`/app/appintegralsupermarketorder/add`,  {
+        shopId: this.goodsInfo.shopId,
+        goodsId: this.goodsInfo.id,
+        remarks: this.value,
+        quantity: this.goodsNum
+      }).then(res => {
+        if (res.code === 0) {
+          uni.$emit('updateGoodsList')
+          this.toSuccess()
+        }
+      })
+    },
+    toSuccess() {
+      var integralPrice = this.goodsNum*this.goodsInfo.integralPrice
+      uni.navigateTo({url: `./successOrder?integralPrice=${integralPrice}&backLevel=${this.backLevel}&shopGoodsId=${this.goodsInfo.shopGoodsId}`})
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.placeOrder {
+  .header-info {
+    padding: 48px 32px;
+    background-color: #fff;
+    margin-bottom: 24px;
+    .flex {
+      margin-bottom: 32px;
+      display: flex;
+      position: relative;
+      img {
+        width: 166px;
+        height: 166px;
+        border-radius: 16px;
+        margin-right: 20px;
+      }
+      .type {
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        border-bottom-left-radius: 16px;
+        border-bottom-right-radius: 16px;
+        width: 166px;
+        text-align: center;
+        line-height: 34px;
+        font-family: PingFangSC-Regular;
+        font-size: 18px;
+        color: #FFF;
+        p {
+          scale: 0.9;
+        }
+      }
+      .type2 {
+        background-color: #E64E39;
+      }
+      .type1 {
+        background-color: #E64E39;
+      }
+      .type0 {
+        background-color: #FF6900;
+      }
+      .flex-right {
+        width: calc(100% - 186px);
+        p {
+          word-break: break-all;
+          font-family: PingFangSC-Regular;
+          font-size: 26px;
+          color: #222;
+          line-height: 34px;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          line-clamp: 2;					
+          -webkit-box-orient: vertical;
+          margin-bottom: 22px;
+        }
+        div {
+          text-align: right;
+        }
+        h3 {
+          font-family: PingFangSC-SNaNpxibold;
+          font-weight: 600;
+          font-size: 34px;
+          color: #FF6900;
+          line-height: 48px;
+          span {
+            display: inline-block;
+            font-size: 34px;
+            color: #4181FF;
+            margin-left: 8px;
+          }
+        }
+      }
+    }
+    .tips {
+      display: inline-block;
+      padding: 12px;
+      line-height: 36px;
+      background: #F5FCF5;
+      border-radius: 16px;
+      font-family: PingFangSC-Regular;
+      font-size: 24px;
+      color: #3BBC37;
+      span {
+        display: inline-block;
+        scale: 0.9;
+      }
+    }
+  }
+  .content {
+    padding: 0 32px;
+    background-color: #fff;
+    .item-flex {
+      display: flex;
+      padding: 30px 0;
+      font-size: 26px;
+      line-height: 34px;
+      font-family: PingFangSC-Regular;
+      .label {
+        color: #222;
+        width: 120px;
+      }
+      .value {
+        width: calc(100% - 120px);
+        text-align: right;
+        color: #222;
+      }
+      .color-FF6900 {
+        color: #FF6900;
+      }
+      .color-999 {
+        color: #999;
+      }
+    }
+  }
+  .textarea {
+    margin: 32px 32px 24px;
+    width: calc(100% - 64px);
+    padding: 16px;
+    box-sizing: border-box;
+    background: #f7f7f7;
+    border-radius: 8px;
+    p {
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 36px;
+      text-align: right;
+    }
+  }
+  .btn {
+    padding: 0 32px 24px;
+    height: 64px;
+    display: flex;
+    justify-content: space-between;
+    span {
+      display: inline-block;
+      line-height: 64px;
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+    }
+    .confirm {
+      width: 144px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 32px;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #fff;
+    }
+  }
+  .bottom-btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    background-color: #fff;
+    padding: 20px 32px;
+    box-sizing: border-box;
+    div {
+      width: 100%;
+      height: 88px;
+      line-height: 88px;
+      text-align: center;
+      border-radius: 44px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+      color: #FFF;
+      background: #4181FF;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppRedemptionPoints/pointsPublicity.vue b/src/project/weiyang/AppRedemptionPoints/pointsPublicity.vue
new file mode 100644
index 0000000..6d967e9
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/pointsPublicity.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="pointsPublicity">
+    <div class="header">
+      <img :src="`${cdn}/publicity-header.png`" alt="">
+      <div class="title">{{user.girdName}}积分公示</div>
+    </div>
+    <div class="list-content">
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <span class="blue-tips"></span>
+        <p class="title">{{item.classOne}}</p>
+        <div class="item-info">
+          <p class="mini-title">{{item.classTwo}}</p>
+          <div class="text-flex">
+            <p>{{item.classThree}}</p>
+            <div>
+              <img :src="`${cdn}/star-icon.png`" alt="">+{{item.integral}}
+            </div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!list.length"></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapActions, mapState} from "vuex";
+
+export default {
+  name: 'pointsPublicity',
+  appName: '积分公示',
+  data() {
+    return {
+      cdn: "https://cdn.cunwuyun.cn/fengdu",
+      list: [],
+      current: 1
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.getAuth()
+  },
+  methods: {
+    ...mapActions(['getUserInfo']),
+    getList() {
+      this.$instance.post(`/app/appintegralpublicityinfo/list?current=${this.current}&girdId=${this.user.girdId}`).then(res => {
+        if (res.code === 0) {
+          this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records]
+        }
+      })
+    },
+    getAuth() {
+      this.$nextTick(() => {
+        this.getUserInfo('qujing')
+        this.getList()
+        
+      })
+    },
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+uni-page-body{
+  background-color: #fff;
+}
+.pointsPublicity {
+  .header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 9;
+    background-color: #f3f6f9;
+    img {
+      width: 100%;
+      height: 216px;
+    }
+    .title {
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+      color: #222;
+      line-height: 40px;
+      padding: 38px 32px;
+    }
+  }
+  .list-content {
+    padding: 332px 32px 32px;
+    .item {
+      width: 100%;
+      background: #FFF;
+      box-shadow: inset 0 0 0 0 #EEEEEE;
+      padding: 32px 32px 0;
+      box-sizing: border-box;
+      position: relative;
+      margin-bottom: 24px;
+      .blue-tips {
+        position: absolute;
+        top: 34px;
+        left: 0;
+        width: 8px;
+        height: 36px;
+        background: #2D7DFF;
+        border-radius: 4px;
+      }
+      .title {
+        font-family: PingFangSC-Medium;
+        font-weight: 500;
+        font-size: 34px;
+        color: #333;
+        line-height: 40px;
+        word-break: break-all;
+      }
+      .item-info {
+        width: 100%;
+        padding: 32px 0;
+        border-top: 1px solid #eee;
+        .mini-title {
+          font-family: PingFangSC-Regular;
+          font-size: 34px;
+          color: #333;
+          line-height: 40px;
+          word-break: break-all;
+          margin-bottom: 14px;
+        }
+        .text-flex {
+          display: flex;
+          width: 100%;
+          p {
+            width: calc(100% - 160px);
+            font-family: PingFangSC-Regular;
+            font-size: 26px;
+            color: #666;
+            word-break: break-all;
+          }
+          div {
+            width: 160px;
+            text-align: right;
+            font-family: DINAlternate-Bold;
+            font-weight: 700;
+            font-size: 30px;
+            color: #FF7109;
+            img {
+              width: 32px;
+              height: 32px;
+              margin-right: 8px;
+              vertical-align: bottom;
+            }
+          }
+        }
+      }
+      .item-info:nth-of-type(2) {
+        border-top: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppRedemptionPoints/productDetails.vue b/src/project/weiyang/AppRedemptionPoints/productDetails.vue
new file mode 100644
index 0000000..71d5796
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/productDetails.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="productDetails" v-if="goodsInfo.picUrl">
+    <img :src="goodsInfo.picUrl" alt="">
+    <div class="type" :class="`type`+goodsInfo.typeText">{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}</div>
+    <div class="product-info">
+      <p>{{goodsInfo.title}}</p>
+      <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 2">+￥{{goodsInfo.payMoney}}<span v-if="goodsInfo.type == 2">（兑换后再付）</span></span></h3>
+      <div>零售单价¥{{goodsInfo.retailPrice}}</div>
+      <span class="tips" v-if="goodsInfo.type == 2">兑换成功后，点击「去购买」前往京东低价购买</span>
+      <span class="tips" v-else>积分兑换商品，可到固定的兑换点进行「核销兑换」</span>
+    </div>
+    <div class="product-content">
+      <p>商品描述：</p>
+      <p v-html="goodsInfo.description"></p>
+    </div>
+    <div class="btn" @click="toOrder()" v-if="goodsInfo.shopStatus == 1">
+      <div :class="total >= goodsInfo.integralPrice ? 'status1' : 'status0'" v-if="goodsInfo.stock > 0">{{total >= goodsInfo.integralPrice ? '立即兑换' : '积分不足'}}</div>
+      <div class="status0" v-else>商品缺货</div>
+    </div>
+    <div class="btn" v-else>
+      <div class="status0">店铺停用</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'productDetails',
+  appName: '兑换商品',
+  data() {
+    return {
+      shopGoodsId: '',
+      goodsInfo: {},
+      total: 0
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.shopGoodsId = option.shopGoodsId
+    this.total = option.total
+    this.$dict.load(['integralSGTypeText']).then(() => {
+      this.getDetail()
+    })
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/appintegralsupermarketshop/queryGoodsInfoXCX?shopGoodsId=${this.shopGoodsId}`).then(res => {
+        if (res.code === 0) {
+          this.goodsInfo = res.data
+          this.goodsInfo.typeText = this.goodsInfo.type == 0 ? 0 : 1
+        }
+      })
+    },
+    toOrder() {
+      if(this.total >= this.goodsInfo.integralPrice && this.goodsInfo.stock > 0 && this.goodsInfo.status == 1) {
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=4`})
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.productDetails {
+  background-color: #f3f6f9;
+  position: relative;
+  img {
+    width: 100%;
+    height: 750px;
+  }
+  .type {
+    position: absolute;
+    top: 0;
+    right: 0;
+    line-height: 42px;
+    font-family: PingFangSC-SNaNpxibold;
+    font-weight: 600;
+    font-size: 30px;
+    color: #FFF;
+    padding: 16px 16px 16px 36px;
+    border-bottom-left-radius: 40px;
+  }
+  .type2 {
+    background-color: #E64E39;
+  }
+  .type1 {
+    background-color: #E64E39;
+  }
+  .type0 {
+    background-color: #FF6900;
+  }
+  .product-info {
+    padding: 32px;
+    background-color: #fff;
+    margin-bottom: 24px;
+    p {
+      word-break: break-all;
+      font-family: PingFangSC-SNaNpxibold;
+      font-weight: 600;
+      font-size: 48px;
+      color: #222;
+      letter-spacing: 0;
+      line-height: 76px;
+      margin-bottom: 8px;
+    }
+    h3 {
+      font-family: PingFangSC-SNaNpxibold;
+      font-weight: 600;
+      font-size: 44px;
+      color: #FF6900;
+      margin-bottom: 8px;
+      span {
+        font-size: 44px;
+        color: #4181FF;
+        margin-left: 8px;
+        span {
+          font-weight: 400;
+          font-family: PingFangSC-Regular;
+          font-size: 32px;
+        }
+      }
+    }
+    div {
+      font-family: PingFangSC-Regular;
+      font-weight: 400;
+      font-size: 24px;
+      color: #999;
+      line-height: 34px;
+      margin-bottom: 24px;
+      text-decoration: line-through;
+    }
+    .tips {
+      display: inline-block;
+      padding: 12px;
+      line-height: 36px;
+      background: #F5FCF5;
+      border-radius: 16px;
+      font-family: PingFangSC-Regular;
+      font-size: 24px;
+      color: #3BBC37;
+    }
+  }
+  .product-content {
+    padding: 34px 64px 162px;
+    background-color: #fff;
+    p {
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      color: #666;
+      line-height: 60px;
+    }
+  }
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    background-color: #fff;
+    padding: 20px 32px;
+    box-sizing: border-box;
+    div {
+      width: 100%;
+      height: 88px;
+      line-height: 88px;
+      text-align: center;
+      border-radius: 44px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+    }
+    .status1 {
+      color: #FFF;
+      background: #4181FF;
+    }
+    .status0 {
+      color: #666;
+      background: #E2E2E2;
+    }
+  }
+}
+</style>
diff --git a/src/project/weiyang/AppRedemptionPoints/successOrder.vue b/src/project/weiyang/AppRedemptionPoints/successOrder.vue
new file mode 100644
index 0000000..3e35e2e
--- /dev/null
+++ b/src/project/weiyang/AppRedemptionPoints/successOrder.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="successOrder">
+    <img src="./img/success.png" alt="">
+    
+    
+    <div v-if="goodsInfo.type == 0">
+      <h3>提交成功</h3>
+      <p>提交「积分兑换」订单成功，扣减 <span>{{integralPrice}}积分</span></p>
+      <div class="btn-flex">
+        <div @click="back">返回</div>
+        <div @click="toOrderList">查看订单</div>
+      </div>
+    </div>
+    <div v-else>
+      <h3>兑换成功</h3>
+      <p>提交「京东低价商品」订单成功，扣减 <span>{{integralPrice}}积分</span><br/>
+        可点击下方按钮前往京东商城进行低价购买
+      </p>
+      <div class="btn" @click="openJd">去购买</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'successOrder',
+  appName: '提交订单',
+  data() {
+    return {
+      integralPrice: 0,
+      backLevel: 1,
+      shopGoodsId: '',
+      goodsInfo: {}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    console.log(option)
+    this.integralPrice = option.integralPrice
+    this.backLevel = option.backLevel
+    this.shopGoodsId = option.shopGoodsId
+    this.getDetail()
+  },
+  methods: {
+    getDetail() {
+      this.$instance.post(`/app/appintegralsupermarketshop/queryGoodsInfoXCX?shopGoodsId=${this.shopGoodsId}`).then(res => {
+        if (res.code === 0) {
+          this.goodsInfo = res.data
+        }
+      })
+    },
+    openJd() {
+      if(this.goodsInfo.type == 1) {
+        uni.navigateTo({url: `./jdH5?goodsJdUrl=${this.goodsInfo.jdUrl}`})
+      }else {
+        uni.navigateToMiniProgram({
+          appId: this.goodsInfo.jdAppid,
+          path: this.goodsInfo.jdUrl
+        })
+      }
+    },
+    back() {
+      uni.navigateBack({delta: Number(this.backLevel)})
+    },
+    toOrderList() {
+      uni.redirectTo({
+        url: './myOrderList'
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+uni-page-body{
+  background-color: #fff;
+}
+.successOrder {
+  padding: 0 60px;
+  text-align: center;
+  img {
+    width: 240px;
+    height: 232px;
+    margin: 168px auto 32px auto;
+  }
+  h3 {
+    font-family: PingFangSC-SNaNpxibold;
+    font-weight: 600;
+    font-size: 40px;
+    color: #333;
+    line-height: 56px;
+    margin-bottom: 16px;
+  }
+  p {
+    color: #333;
+    font-size: 30px;
+    font-family: PingFangSC;
+    line-height: 50px;
+    text-align: center;
+    margin-bottom: 80px;
+    span {
+      color: #FF6900;
+    }
+  }
+  .btn {
+    width: 410px;
+    height: 88px;
+    line-height: 88px;
+    background: #2D7DFF;
+    border-radius: 44px;
+    font-family: PingFangSC-Medium;
+    font-weight: 500;
+    font-size: 34px;
+    color: #FFF;
+    text-align: center;
+    margin: 0 auto;
+  }
+  .btn-flex {
+    font-family: PingFangSC-Medium;
+    font-weight: 500;
+    font-size: 34px;
+    margin: 0 auto;
+    div {
+      display: inline-block;
+      width: 272px;
+      text-align: center;
+      height: 88px;
+      line-height: 88px;
+      border-radius: 44px;
+      color: #FFF;
+      background-color: #2D7DFF;
+    }
+    div:nth-of-type(1) {
+      background-color: #E5EFFF;
+      color: #2D7DFF;
+      margin-right: 26px;
+    }
+  }
+  
+}
+</style>
diff --git a/src/project/weiyang/AppVillageActivity/ActivityDetail.vue b/src/project/weiyang/AppVillageActivity/ActivityDetail.vue
new file mode 100644
index 0000000..a91932f
--- /dev/null
+++ b/src/project/weiyang/AppVillageActivity/ActivityDetail.vue
@@ -0,0 +1,472 @@
+<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.areaId) {
+        this.$linkTo('/pages/AppMine/userInfo')
+        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.areaId) {
+        this.$linkTo('/pages/AppMine/userInfo')
+        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/weiyang/AppVillageActivity/AddDynamic.vue b/src/project/weiyang/AppVillageActivity/AddDynamic.vue
new file mode 100644
index 0000000..5def594
--- /dev/null
+++ b/src/project/weiyang/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/weiyang/AppVillageActivity/AppVillageActivity.vue b/src/project/weiyang/AppVillageActivity/AppVillageActivity.vue
new file mode 100644
index 0000000..daef5c7
--- /dev/null
+++ b/src/project/weiyang/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" scoped>
+.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>