From 5d5c56c1bc4e8c18fec8a9683298acbc5fa92c45 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 17 Nov 2023 09:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropagandaBeta.vue          |  544 +++++++
 .../addPropaganda.vue                         | 1354 +++++++++++++++++
 .../AppCooperationPropaganda/circleDetail.vue |  471 ++++++
 .../cooperationDetail.vue                     |  535 +++++++
 .../AppCooperationPropaganda/detail.vue       |  349 +++++
 .../AppCooperationPropaganda/fodderList.vue   |  273 ++++
 .../AppCooperationPropaganda/images/files.png |  Bin 0 -> 955 bytes
 .../images/gird--select-icon.png              |  Bin 0 -> 1276 bytes
 .../images/local-icon.png                     |  Bin 0 -> 1121 bytes
 .../AppCooperationPropaganda/images/pass.png  |  Bin 0 -> 15287 bytes
 .../images/refuse.png                         |  Bin 0 -> 15564 bytes
 .../images/right-icon.png                     |  Bin 0 -> 373 bytes
 .../images/shaixuan.png                       |  Bin 0 -> 663 bytes
 .../AppCooperationPropaganda/images/tx@2x.png |  Bin 0 -> 1467 bytes
 .../AppCooperationPropaganda/images/xz.png    |  Bin 0 -> 1489 bytes
 .../AppCooperationPropaganda/images/xzh.png   |  Bin 0 -> 1730 bytes
 .../AppCooperationPropaganda/scopedSelect.vue |  203 +++
 .../selectDeptUser.vue                        |  324 ++++
 .../selectGridMember.vue                      |  274 ++++
 .../AppCooperationPropaganda/selectTag.vue    |  240 +++
 .../AppCooperationPropaganda/selectUser.vue   |  243 +++
 .../AppCooperationPropaganda/sendScoped.vue   |  212 +++
 .../AppCooperationPropaganda/tagsList.vue     |  158 ++
 .../AppCreditPoints/AppCreditPoints.vue       |  482 ++++++
 .../AppCreditPoints/components/img/line.png   |  Bin 0 -> 700 bytes
 .../components/img/local-icon.png             |  Bin 0 -> 1121 bytes
 .../biaopin/AppCreditPoints/gridIntegral.vue  |  263 ++++
 .../AppPointsReview/AppPointsReview.vue       |  297 ++++
 .../biaopin/AppPointsReview/detail.vue        |  471 ++++++
 .../biaopin/AppPointsReview/img/del-icon.png  |  Bin 0 -> 757 bytes
 .../biaopin/AppPointsReview/integralAdd.vue   |  334 ++++
 .../AppRedemptionPoints.vue                   |  137 ++
 .../biaopin/AppRedemptionPoints/goodsList.vue |  379 +++++
 .../AppRedemptionPoints/img/success.png       |  Bin 0 -> 19019 bytes
 .../AppRedemptionPoints/img/user-img.png      |  Bin 0 -> 2424 bytes
 .../biaopin/AppRedemptionPoints/jdH5.vue      |   20 +
 .../AppRedemptionPoints/myOrderList.vue       |  317 ++++
 .../AppRedemptionPoints/placeOrder.vue        |  294 ++++
 .../AppRedemptionPoints/pointsPublicity.vue   |  165 ++
 .../AppRedemptionPoints/productDetails.vue    |  187 +++
 .../AppRedemptionPoints/successOrder.vue      |  145 ++
 41 files changed, 8671 insertions(+)
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/addPropaganda.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/circleDetail.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/cooperationDetail.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/detail.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/fodderList.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/files.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/gird--select-icon.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/local-icon.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/pass.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/refuse.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/right-icon.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/shaixuan.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/tx@2x.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/xz.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/images/xzh.png
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/scopedSelect.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/selectDeptUser.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/selectGridMember.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/selectTag.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/selectUser.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/sendScoped.vue
 create mode 100644 src/project/biaopin/AppCooperationPropaganda/tagsList.vue
 create mode 100644 src/project/biaopin/AppCreditPoints/AppCreditPoints.vue
 create mode 100644 src/project/biaopin/AppCreditPoints/components/img/line.png
 create mode 100644 src/project/biaopin/AppCreditPoints/components/img/local-icon.png
 create mode 100644 src/project/biaopin/AppCreditPoints/gridIntegral.vue
 create mode 100644 src/project/biaopin/AppPointsReview/AppPointsReview.vue
 create mode 100644 src/project/biaopin/AppPointsReview/detail.vue
 create mode 100644 src/project/biaopin/AppPointsReview/img/del-icon.png
 create mode 100644 src/project/biaopin/AppPointsReview/integralAdd.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/AppRedemptionPoints.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/goodsList.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/img/success.png
 create mode 100644 src/project/biaopin/AppRedemptionPoints/img/user-img.png
 create mode 100644 src/project/biaopin/AppRedemptionPoints/jdH5.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/myOrderList.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/placeOrder.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/pointsPublicity.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/productDetails.vue
 create mode 100644 src/project/biaopin/AppRedemptionPoints/successOrder.vue

diff --git a/src/project/biaopin/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/biaopin/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
new file mode 100644
index 00000000..004326ee
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -0,0 +1,544 @@
+<template>
+  <div class="AppCooperationPropagandaBeta">
+    <AiTopFixed>
+      <!-- <div class="tab-select">
+        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(item,index)">{{ item.name }}<span></span></div>
+      </div> -->
+      <div class="search">
+        <div class="searchBox">
+          <u-search placeholder="请输入任务名称" v-model="taskTitle" clearabled @search="searchBtn" @clear="taskTitle='',getList()" :show-action="false"></u-search>
+        </div>
+        <div class="filterBtn" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div>
+      </div>
+    </AiTopFixed>
+    <div class="resident_list" v-if="list.length">
+      <div class="card" v-for="(item,index) in list" :key="index">
+        <div class="card_top" @click="toDetail(item)">
+          <div class="card_title">
+            <div class="card_left">{{ item.taskTitle }}</div>
+            <div class="card_right"><span :class="item.status==0? 'status0': item.status==1? 'status1': item.status==2? 'status2':
+            item.status == 3? 'status3':item.status==4? 'status4': 'status5'"></span>{{ $dict.getLabel('mstStatus', item.status) }}</div>
+          </div>
+          <div>群发时间：<span>{{ item.choiceTime }}</span></div>
+          <div>共需
+            <span class="num">
+              <span v-if="tabIndex==0">{{ item.groupOwnerCount || 0 }}</span>
+              <span v-else>{{ item.receiveExecutorCount || 0 }} </span>
+            </span>名成员完成群发，目前已完成
+            <span class="num">{{ item.completionRate || 0}}%</span>
+          </div>
+          <div>
+            创建部门：
+            <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>
+          </div>
+        </div>
+        <div class="card_bottom" v-if="item.status == 4 && item.createUserId == user.wxUserId" @click="stopBtn(item.id)">关闭任务</div>
+      </div>
+    </div>
+    <AiEmpty description="暂无数据" v-if="!list.length"/>
+
+    <div class="btn">
+      <div class="addBtn" @click="toAdd">新增群发{{tabIndex==0? '居民群': tabIndex==1? '居民':'朋友圈'}}</div>
+    </div>
+
+    <u-popup v-model="filterShow" mode="bottom" border-radius="14">
+      <div class="popup">
+        <div class="tips"></div>
+        <div class="title">
+          <div
+            class="cancel"
+            @click.stop="(filterShow = false), (timeSelect = 0)"
+          >
+            取消
+          </div>
+          <p>筛选条件</p>
+          <div class="confirm" @click.stop="selectConfirm">确定</div>
+        </div>
+        <scroll-view class="select-content" scroll-y="true">
+          <div class="type-list">
+            <div class="type-title">创建人</div>
+            <AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="createUserId" :ops="{url:`./selectUser?tabIndex=${this.tabIndex}`,label: 'id'}">
+              <div class="page_picker">
+                <span class="label" v-if="userIdList.length">已选择</span>
+                <span v-else style="color:#999;">请选择</span>
+                <u-icon name="arrow-right" color="#303133" size="24" style="margin-left:8px;"/>
+              </div>
+            </AiPagePicker>
+          </div>
+          <div class="type-list">
+            <div class="type-title">任务状态</div>
+            <div class="items">
+              <AiSelect dict="mstStatus" v-model="status"></AiSelect>
+            </div>
+          </div>
+          <div class="type-list">
+            <div class="type-title">群发时间</div>
+            <div class="item">
+              <div>开始时间</div>
+              <div style="display: flex;">
+                <u-input v-model="startTime" disabled placeholder="请选择开始时间" @click="showStart = true" />
+                <u-icon name="arrow-right"></u-icon>
+              </div>
+            </div>
+            <div class="item">
+              <div>结束时间</div>
+              <div style="display: flex;">
+                <u-input v-model="endTime" disabled placeholder="请选择结束时间" @click="showEnd = true" />
+                <u-icon name="arrow-right"></u-icon>
+              </div>
+            </div>
+          </div>
+        </scroll-view>
+        <u-picker mode="time" v-model="showStart" @confirm="confirmStart"></u-picker>
+        <u-picker mode="time" v-model="showEnd" @confirm="confirmEnd"></u-picker>
+        <div class="popBtn">
+          <div @click="reset">重置</div>
+          <div @click="selectConfirm">确认</div>
+        </div>
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: 'AppCooperationPropagandaBeta',
+  appName: '协同宣发',
+  data() {
+    return {
+      tabs: [
+        {
+          name: '群发居民群',
+          value: 'ResidentsGroup'
+        },
+        {
+          name: '群发居民',
+          value: 'Residents'
+        },
+        {
+          name: '群发朋友圈',
+          value: 'CircleOfFriends'
+        },
+      ],
+      tabIndex: 0,
+      current: 1,
+      name: '',
+      list: [],
+      filterShow: false,
+      startTime: '',
+      endTime: '',
+      start: "",
+      end: "",
+      showStart: false,
+      showEnd: false,
+      taskTitle: '',
+      createUserId: '',
+      userList: [],
+      userIdList: [],
+      status: '',
+      sendType: 'ResidentsGroup',
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    tabClick(item,index) {
+      this.list = []
+      this.current = 1
+      this.tabIndex = index;
+      this.sendType = item.value
+      uni.removeStorageSync('userSelect')
+      uni.removeStorageSync('wxGroupsUser')
+      uni.removeStorageSync('girdSelect')
+      uni.removeStorageSync('deptList')
+      uni.removeStorageSync('sendScope')
+      uni.removeStorageSync('ResidentTags')
+      uni.removeStorageSync('ResidentTagsRemove')
+      uni.removeStorageSync('circleTags')
+      uni.removeStorageSync('circleTagsRemove')
+      uni.removeStorageSync('startTime')
+      uni.removeStorageSync('endTime')
+      uni.removeStorageSync('selectDeptUser')
+      uni.removeStorageSync('checkedList')
+      this.$dict.load('mstStatus').then(() => {
+        this.getList()
+      })
+    },
+    toDetail(item) {
+      if(this.tabIndex == 0) {
+        uni.navigateTo({url: `./cooperationDetail?id=${item.id}&type=${this.sendType}`})
+      } else {
+        uni.navigateTo({url: `./circleDetail??id=${item.id}&type=${this.sendType}`})
+      }
+    },
+    searchBtn() {
+      this.current = 1
+      this.list = [],
+      this.getList()
+    },
+    getList() {
+      let url = ''
+      let data = {
+        current: this.current,
+        taskTitle: this.taskTitle,
+        startTime: this.start,
+        endTime: this.end,
+        createUserId: this.createUserId,
+        status: this.status,
+      }
+      if(this.tabIndex==0) {
+        url = `/app/appmasssendingtask/list`
+      } else if(this.tabIndex==1 || this.tabIndex==2) {
+        url = `/app/whchatmomentstask/list`
+        data = {
+          ...data,
+          taskType: this.tabIndex == 0? '': this.tabIndex==1? 1:0
+        }
+      }
+      this.$http.post(url,null, {params:{...data}}).then(res=> {
+        if(res?.data) {
+          this.list = this.current == 1?  res.data.records : [...this.list, ...res.data.records]
+        }
+      })
+    },
+
+    reset() {
+      this.start = '',
+      this.end = '',
+      this.startTime = '',
+      this.endTime = ''
+      this.userIdList = []
+      this.createUserId = ''
+      this.status = ''
+      uni.setStorageSync('userSelect', [])
+    },
+
+    selectConfirm() {
+      if(this.userIdList.length) {
+        this.createUserId = this.userIdList?.[0].userId
+      }
+
+      this.start = this.startTime,
+      this.end = this.endTime
+      let startTmp = this.start.split("-");
+      let endTmp = this.end.split("-");
+      let stT = new Date(startTmp[0], startTmp[1], startTmp[2]);
+      let edT = new Date(endTmp[0], endTmp[1], endTmp[2]);
+      if (stT.getTime() > edT.getTime()) {
+        this.$u.toast("开始日期不能大于结束日期！");
+        this.filterShow = true
+        return
+      }
+      this.filterShow = false
+      this.current = 1
+      this.getList()
+    },
+    confirmStart(val) {
+      this.startTime = val.year + '-' + val.month + '-' + val.day
+    },
+    confirmEnd(val) {
+      this.endTime = val.year + '-' + val.month + '-' + val.day
+    },
+    toAdd() {
+      uni.navigateTo({url: `./addPropaganda?type=${this.sendType}`})
+    },
+    stopBtn(id) {
+      this.$confirm('确定停止该任务吗？').then(() => {
+        let url = ''
+        if(this.tabIndex==0) {
+          url = `/app/appmasssendingtask/closeTask`
+        } else {
+          url = `/app/whchatmomentstask/closeTask`
+        }
+        this.$http.post(url,null,{
+          params: {
+            id: id
+          }
+        }).then(res=> {
+          if(res?.code==0) {
+            this.$u.toast('已关闭该任务')
+            setTimeout(()=>{
+              this.getList()
+            }, 400)
+          }
+        })
+      })
+    }
+  },
+  onShow() {
+    document.title = '宣发助手'
+    this.$dict.load('mstStatus').then(() => {
+      this.list = []
+      this.current = 1
+      this.getList()
+    })
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppCooperationPropagandaBeta {
+
+  padding-bottom: 130px;
+  box-sizing: border-box;
+
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975c6;
+    display: flex;
+
+    .item {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #cddcf0;
+    }
+
+    .active {
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+
+      span {
+        width: 48px;
+        height: 4px;
+        background: #fff;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
+  .search {
+    display: flex;
+    height: 100px;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20px 32px;
+    box-sizing: border-box;
+
+    .searchBox {
+      width: 562px;
+    }
+    .filterBtn {
+      img {
+        width: 28px;
+        height: 28px;
+      }
+    }
+  }
+  .resident_list {
+    padding: 24px 32px 20px 32px;
+    box-sizing: border-box;
+    .card {
+      background: #FFF;
+      border-radius: 16px;
+      margin-bottom: 24px;
+      .card_top {
+        padding: 30px;
+        box-sizing: border-box;
+        & > div {
+          padding: 10px 0;
+        }
+        .num {
+          color: #3AA0FF;
+        }
+        .card_title {
+          display: flex;
+          justify-content: space-between;
+          .card_left {
+            font-size: 32px;
+            color: #000000;
+            font-weight: 600;
+          }
+          .card_right {
+            span {
+              display: inline-block;
+              width: 16px;
+              height: 16px;
+              // background: #3399FF;
+              border-radius: 50%;
+              margin-right: 10px;
+            }
+
+            .status0 {
+              background: #FFA938;
+            }
+            .status1 {
+              background: #FF6758;
+            }
+            .status2 {
+              background: #3399FF;
+            }
+            .status3 {
+              background: #FF6758;
+            }
+            .status4 {
+              background: #3399FF;
+            }
+            .status5 {
+              background: #1CCEB0;
+            }
+            .status6 {
+              background: #666666;
+            }
+          }
+        }
+      }
+      .card_bottom {
+        text-align: center;
+        height: 80px;
+        line-height: 80px;
+        color: #1365DD;
+        font-weight: 600;
+        border-top: 1px solid #d4d4d4;
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #FFF;
+    display: flex;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    .addBtn {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      border-radius: 8px;
+      border: 2px solid #CCCCCC;
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
+
+  .popup {
+    box-sizing: border-box;
+    // height: 800px;
+    .tips {
+      width: 80px;
+      height: 6px;
+      background: #dddddd;
+      border-radius: 4px;
+      padding: 0 32px;
+      box-sizing: border-box;
+      margin: 32px auto 8px auto;
+    }
+    .title {
+      height: 48px;
+      line-height: 48px;
+      font-size: 34px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #222;
+      padding: 0 32px;
+      box-sizing: border-box;
+      padding-bottom: 32px;
+      .cancel {
+        display: inline-block;
+        width: 200px;
+        color: #aaa;
+      }
+      .confirm {
+        display: inline-block;
+        width: 200px;
+        text-align: right;
+        color: #333;
+      }
+      p {
+        display: inline-block;
+        width: calc(100% - 400px);
+        text-align: center;
+        font-size: 28px;
+      }
+    }
+    .select-content {
+      height: calc(100% - 100px);
+      overflow-y: scroll;
+    }
+    .type-list {
+      padding: 0 32px;
+      box-sizing: border-box;
+      margin-bottom: 32px;
+      .type-title {
+        line-height: 108px;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+      }
+      .item {
+        display: flex;
+        justify-content: space-between;
+        & > div:last-child {
+          ::v-deep .uni-input-input,
+          ::v-deep .uni-input-placeholder {
+            text-align: right;
+          }
+        }
+      }
+      .items {
+        ::v-deep .AiSelect .display {
+          justify-content: space-between;
+          width: 100%;
+        }
+      }
+      .active {
+        background: #1365dd;
+        color: #fff;
+      }
+      .user {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .popBtn {
+      display: flex;
+      height: 98px;
+      line-height: 98px;
+      div {
+        width: 50%;
+        border: 2px solid #3399ff;
+        text-align: center;
+      }
+      div:first-child {
+        color: #3399ff;
+      }
+      div:last-child {
+        color: #fff;
+        background: #3399ff;
+      }
+    }
+  }
+  ::v-deep .uicon-arrow-right::before {
+    color: #606266 !important;
+  }
+  .page_picker {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppCooperationPropaganda/addPropaganda.vue b/src/project/biaopin/AppCooperationPropaganda/addPropaganda.vue
new file mode 100644
index 00000000..2505dedc
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/addPropaganda.vue
@@ -0,0 +1,1354 @@
+<template>
+  <div class="addPropaganda">
+    <div class="task_name">
+      <div><span class="color_red">*</span><span class="title">任务名称</span></div>
+      <u-input v-model="form.taskTitle" type="text" placeholder="请输入" maxlength="15" class="inpt"/>
+    </div>
+
+    <div class="send_scope">
+      <div><span class="color_red">*</span><span class="title">发送范围</span></div>
+      <div @click="toSleectScoped">
+        <span>
+          <span>
+            <span class="color_gray" v-if="sum==0">请选择</span>
+            <span v-else>预计送达{{ sum }}
+              <span v-if="type=='ResidentsGroup'">个居民群</span>
+              <span v-if="type=='Residents'">个居民</span>
+              <span v-if="type=='CircleOfFriends'">个朋友圈</span>
+            </span>
+          </span>
+          <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+        </span>
+      </div>
+    </div>
+
+    <div class="send_content">
+      <div class="content_title">
+        <div><span class="color_red">*</span><span class="title">发送内容</span></div>
+        <div style="color: #3399FF;" @click="preview">预览</div>
+      </div>
+      <div class="content_text">
+        <u-input v-model="content" type="textarea" height="372" :clearable="false" :auto-height="true" placeholder="请输入政策、活动、节日问候等内容" maxlength="1300"/>
+      </div>
+      <div class="content_fodder">
+        <div class="fodder_alls">
+          <div class="fodder_add" @click="showUpload = true"><u-icon name="plus" color="#CCD0D3" size="32"></u-icon></div>
+          <div class="fodder_title">添加素材</div>
+        </div>
+        <!-- 本地素材 -->
+        <div class="fodder_file" v-for="(item, index) in files" :key="item.id">
+          <div class="item">
+            <div class="images">
+              <img src="https://cdn.cunwuyun.cn/dvcp/h5/file.png" alt="">
+            </div>
+            <div class="info">
+              <div class="name">{{ item.name }}</div>
+              <div class="size">{{ item.fileSizeStr }}</div>
+            </div>
+            <div class="remove" @click="remove(index)" style="color: #f72c27">删除</div>
+          </div>
+        </div>
+        <!-- 素材库 -->
+        <!-- <div class="fodder_file" v-for="(item, index) in checkedList" :key="item.id">
+          <div class="item">
+            <div class="images">
+              <img src="https://cdn.cunwuyun.cn/dvcp/h5/file.png" alt="">
+            </div>
+            <div class="info">
+              <div class="name">{{ item.title }}</div>
+              <div class="size">{{ item.fileSizeStr }}</div>
+            </div>
+            <div class="remove" @click="removeSucai(index)" style="color: #f72c27">删除</div>
+          </div>
+        </div> -->
+        <!-- 网页 -->
+        <div class="fodder_file" v-for="(item, index) in webListInfo" :key="index">
+          <div class="item">
+            <div class="images">
+              <img src="https://cdn.cunwuyun.cn/dvcp/h5/file.png" alt="">
+            </div>
+            <div class="info">
+              <div class="name">{{ item.linkTitle }}</div>
+            </div>
+            <div class="remove" @click="removeWeb(index)" style="color: #f72c27">删除</div>
+          </div>
+        </div>
+        <!-- 小程序 -->
+        <div class="fodder_file" v-for="(item, index) in appListInfo" :key="index">
+          <div class="item">
+            <div class="images">
+              <img src="https://cdn.cunwuyun.cn/dvcp/h5/file.png" alt="">
+            </div>
+            <div class="info">
+              <div class="name">{{ item.mpTitle }}</div>
+            </div>
+            <div class="remove" @click="removeApp(index)" style="color: #f72c27">删除</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="send_scope">
+      <div><span class="color_red"></span><span class="title">标签</span></div>
+      <div @click="toSelectTag">
+        <span>
+          <span>
+            <span class="color_gray" v-if="tagList==0">请选择</span>
+            <span v-else>已选择{{ tagList.length }}个标签</span>
+          </span>
+          <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+        </span>
+      </div>
+    </div>
+
+    <div class="isExamine">
+      <div class="examineChange">
+        <div>宣发需要审批</div>
+        <u-switch v-model="enableExamine" size="40" @change="enableExamine = !!enableExamine"></u-switch>
+      </div>
+      <div class="examine_person" v-if="enableExamine == true">
+        <div><span class="color_red">*</span><span class="title">审批人</span></div>
+        <AiPagePicker type="custom" :selected.sync="form.examines" @select="getExamines" nodeKey="id" :ops="{url:`./selectDeptUser?selectTtype=0`,label: 'id'}">
+          <span class="label" v-if="form.examines.length">已选择{{ form.examines.length }}名人员</span>
+          <span class="color_gray" v-else>请选择</span>
+          <u-icon name="arrow-right" color="#CCD0D3" size="28"/>
+        </AiPagePicker>
+      </div>
+      <div class="examineChange">
+        <div>定时发送</div>
+        <u-switch v-model="isTimedTask" size="40" @change="isTimedTask = !!isTimedTask"></u-switch>
+      </div>
+      <div class="examine_person" v-if="isTimedTask == true">
+        <div><span class="color_red">*</span><span class="title">发送时间</span></div>
+        <div @click="showTaskTime = true">
+          <span class="color_gray" v-if="!form.choiceTime.length">请选择</span>
+          <span v-if="form.choiceTime.length">{{ form.choiceTime }}</span>
+          <u-icon name="arrow-right" color="#CCD0D3"/>
+        </div>
+      </div>
+      <div class="examineChange">
+        <div><span class="color_red">*</span>结束时间</div>
+        <div @click="showEndTime = true">
+          <span class="color_gray" v-if="!form.taskEndTime.length">请选择</span>
+          <span v-else>{{ form.taskEndTime }}</span>
+          <u-icon name="arrow-right" color="#CCD0D3"/>
+        </div>
+      </div>
+      <u-picker v-model="showEndTime" :params="endParams" mode="time" @confirm="choiceEndTime"></u-picker>
+    </div>
+
+    <u-picker v-model="showTaskTime" :params="params" mode="time" @confirm="choiceTime"></u-picker>
+
+    <div class="mask" v-show="showPopup" @tap="showPopup = false">
+      <div class="noticeModal" @tap.stop>
+        <div class="body">
+
+          <div class="text_content" v-if="content.length">
+            <img class="text_left" src="https://cdn.cunwuyun.cn/dvcp/announce/avatar.png" />
+            <div class="text_right">{{ content }}</div>
+          </div>
+          <!-- 本地素材 -->
+          <div class="file_content" v-for="item in files" :key="item.id">
+            <img class="text_left" src="https://cdn.cunwuyun.cn/dvcp/announce/avatar.png" />
+            <img class="only_pic" :src="item.url" alt="" v-if="['.jpg', '.jpeg','.png'].indexOf(getExtension(item.name)) !== -1">
+            <video controls class="only_video" :src="item.url" v-if="getExtension(item.name) == '.mp4'"></video>
+            <div class="text_right file_right" 
+            v-if="['.jpg', '.jpeg','.png','.mp4'].indexOf(getExtension(item.name)) === -1">
+              <div class="cont_left">
+                <h4>{{ item.name }}</h4>
+                <p>{{ item.fileSizeStr }}</p>
+              </div>
+              <div class="cont_right">
+                <img :src="fileIcon(item.name)" alt="">
+              </div>
+            </div>
+          </div>
+          <!-- 素材库 -->
+          <div class="file_content" v-for="item in checkedList" :key="item.id">
+            <img class="text_left" src="https://cdn.cunwuyun.cn/dvcp/announce/avatar.png" />
+            <img class="only_pic" :src="item.imgPicUrl" alt="" v-if="item.type==1">
+            <video controls class="only_video" :src="item.fileUrl" v-if="item.type == 4"></video>
+            <div class="text_right file_right" v-if="['0','2','3','5'].includes(item.type)">
+              <div class="cont_left">
+                <h4>{{ item.title }}</h4>
+                <p v-if="['1', '4', '3'].includes(item.type)">{{ item.fileSizeStr }}</p>
+                <p v-if="item.type==5">{{ item.linkUrl }}</p>
+              </div>
+              <div class="cont_right">
+                <img v-if="['2', '4', '5'].includes(item.type)" :src="item.pictureUrl" alt="">
+                <img v-else :src="sucaiIcon[item.type]" alt="">
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="footer">
+          <div class="exit" @click="showPopup = false">退出预览</div>
+        </div>
+      </div>
+    </div>
+
+    <u-popup v-model="showUpload" mode="bottom" border-radius="24">
+			<div class="uploadPopup">
+        <div class="upload_card" v-for="(item,index) in uploadList" :key="index">
+          <!-- <div class="upload_item">{{ item.title }}</div> -->
+          <scroll-view scroll-x="">
+            <div class="upload_list">
+              <div class="lists_item" v-for="(e, i) in item.list" :key="i" @click="uploadBtn(e.msgType)">
+                <img :src="e.icon" alt="">
+                <span>{{ e.name }}</span>
+              </div>
+            </div>
+          </scroll-view>
+          
+        </div>
+        <div class="btnCancel" @click="showUpload = false">取消</div>
+      </div>
+		</u-popup>
+
+    <u-popup v-model="showAddWeb" mode="bottom" border-radius="24" class="popup-form">
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>标题</span>
+        </div>
+        <input type="text" class="right__text" v-model="webInfo.linkTitle" placeholder="请输入" maxlength="42"/>
+      </div>
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>链接</span>
+        </div>
+        <input type="text" class="right__text" v-model="webInfo.linkUrl" placeholder="请输入" maxlength="682"/>
+      </div>
+      <div class="item">
+        <div class="left">
+          <span></span><span>描述</span>
+        </div>
+        <input type="text" class="right__text" v-model="webInfo.linkDesc" placeholder="请输入" maxlength="170"/>
+      </div>
+      <div class="items">
+        <div class="left">
+          <span style="margin-right: 8px"></span><span>封面图</span>
+        </div>
+        <div style="margin-top: 10px;">
+          <AiUploader :def.sync="webInfo.linkPicUrl" :limit="1" multiple action="/admin/file/add2" v-if="showAddWeb"></AiUploader>
+        </div>
+      </div>
+      <div class="popup-btn" @click="addWeb">确定</div>
+		</u-popup>
+
+    <u-popup v-model="showAddApp" mode="bottom" border-radius="24" class="popup-form">
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>小程序appid</span>
+        </div>
+        <input type="text" class="right__text" v-model="appInfo.mpAppid" placeholder="请输入" />
+      </div>
+      <!-- <div class="item">
+        <div class="left">
+          <span>*</span><span>小程序page路径</span>
+        </div>
+        <input type="text" class="right__text" v-model="appInfo.mpPage" placeholder="请输入" />
+      </div> -->
+      <div class="items">
+        <div class="left">
+          <span>*</span><span>小程序page路径</span>
+        </div>
+        <input type="text" class="textarea" v-model="appInfo.mpPage" placeholder="请输入" maxlength="100"/>
+      </div>
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>标题</span>
+        </div>
+        <input type="text" class="right__text" v-model="appInfo.mpTitle" placeholder="请输入" maxlength="170"/>
+      </div>
+      <div class="items">
+        <div class="left">
+          <span style="margin-right: 8px">*</span><span>封面图</span>
+        </div>
+        <div style="margin-top: 10px;">
+          <AiUploader :def.sync="appInfo.media" @data="appMediaChange" :limit="1" multiple action="/app/wxcp/upload/uploadFile" v-if="showAddApp"></AiUploader>
+        </div>
+      </div>
+      <div class="popup-btn" @click="addApp">确定</div>
+		</u-popup>
+
+    <div class="btn">
+      <div class="submitBtn" @click="confirm">通知成员发送</div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import { mapActions } from "vuex";
+export default {
+  name: "addPropaganda",
+  data() {
+    return {
+      type: '',
+      form: {
+        taskTitle: '',
+        contents: [], // 发送内容
+        enableExamine: '0', // 是否需要审批  0否 1是
+        examines: [], // 审批人
+        choiceTime: '', // 定时发送时间
+        sendScope: '', // 0：全部居民群、1：按部门选择、2：按网格选择
+        sendType: '0', // 0：立即发送、1：定时发送
+        wxGroups: [],  // 送达居民群
+        filterCriteria: '',
+        taskEndTime: '', // 任务结束时间
+        sendChannel: 0,
+      },
+      forms: {
+        taskTitle: '',
+        taskType: '',
+        executorList: [], // 任务执行人集合(群发朋友圈的执行人)
+        groupList: [],  // 添加人集合
+        contents: [], // 发送内容
+        enableExamine: '0', // 是否需要审批  0否 1是
+        examines: [], // 审批人
+        choiceTime: '', // 定时发送时间
+        sendScope: '', // 0：全部居民群、1：按部门选择、2：按网格选择
+        sendType: '0', // 0：立即发送、1：定时发送
+        gender: '', // 性别：0-女、1-男、2-全部
+        filterCriteria: '',
+        filterTags: '',  //过滤标签id集合
+        filterTagsName: '', //过滤标签名称
+        excludeFilterTags: '',  // 	剔除标签id集合
+        excludeFilterTagsName: '', // 剔除标签名称
+        addFromTime: '',
+        addEndTime: '',
+        taskEndTime: '', // 任务结束时间
+        markTag: '', //标签选择
+      },
+      enableExamine: false,
+      isTimedTask: false,
+      content: '',
+      files: [], 
+      showTaskTime: false,
+      userList: [],
+      showPopup: false,
+      showFodder: false,
+      showUpload: false,
+      showEndTime: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+        timestamp: false,
+      },
+      endParams: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+        timestamp: false,
+      },
+      flag: false,
+      uploadList: [
+        // {
+        //   title: '从素材库上传',
+        //   list: [
+        //     {
+        //       icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-script.png',
+        //       name: '话术',
+        //       msgType: '0'
+        //     },
+        //     {
+        //       icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png',
+        //       name: '图片',
+        //       msgType: '1'
+        //     },
+        //     {
+        //       icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png',
+        //       name: '视频',
+        //       msgType: '4'
+        //     },
+        //     {
+        //       icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-document.png',
+        //       name: '文件',
+        //       msgType: '3'
+        //     },
+        //     {
+        //       icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-routine.png',
+        //       name: '小程序',
+        //       msgType: '2'
+        //     },
+        //     {
+        //       icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png',
+        //       name: '网页',
+        //       msgType: '5'
+        //     },
+        //   ]
+        // },
+        { 
+          title: '从本地上传', 
+          list: [
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', 
+              name: '图片', 
+              msgType: 'image'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', 
+              name: '视频',
+              msgType: 'video'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-document.png', 
+              name: '文件',
+              msgType: 'file'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png',
+              name: '网页',
+              msgType: 'web'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-routine.png',
+              name: '小程序',
+              msgType: 'app'
+            },
+          ]
+        }
+      ],
+      uploadCircle: [
+        {
+          title: '从素材库上传',
+          list: [
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-script.png',
+              name: '话术',
+              msgType: '0'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png',
+              name: '图片',
+              msgType: '1'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png',
+              name: '视频',
+              msgType: '4'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png',
+              name: '网页',
+              msgType: '5'
+            },
+          ]
+        },
+        { 
+          title: '从本地上传', 
+          list: [
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png', 
+              name: '图片', 
+              msgType: 'image'
+            },
+            {
+              icon: 'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png', 
+              name: '视频',
+              msgType: 'video'
+            },
+          ]
+        }
+      ],
+      midiaIds: [],
+      sum: null,
+      // 筛选条件
+      girdListIds: [],        // 网格id集合
+      deptListIds: [],        // 部门id集合
+      ResidentTags: [],       // 居民包含
+      ResidentTagsRemove: [], // 居民剔除
+      circleTags: [],         // 朋友圈包含
+      circleTagsRemove: [],   // 朋友圈剔除
+      startTime: '',
+      endTime: '',
+      checkedList: [],
+      sucaiIcon: [
+        'https://cdn.cunwuyun.cn/dvcp/announce/ic-script.png',
+        'https://cdn.cunwuyun.cn/dvcp/announce/ic-picture.png',
+        'https://cdn.cunwuyun.cn/dvcp/announce/ic-routine.png',
+        'https://cdn.cunwuyun.cn/dvcp/announce/ic-document.png',
+        'https://cdn.cunwuyun.cn/dvcp/announce/ic-video.png',
+        'https://cdn.cunwuyun.cn/dvcp/announce/ic-web.png',
+      ],
+      tagList: [],
+
+      showAddWeb: false,
+      webInfo: {},
+      webListInfo: [],
+
+      showAddApp: false,
+      appInfo: {media: []},
+      appListInfo: []
+    }
+  },
+  methods: {
+    ...mapActions(['selectEnterpriseContact']),
+
+    // 发送范围
+    toSleectScoped() {
+      uni.navigateTo({url: `./sendScoped?type=${this.type}`})
+    },
+    // 预览
+    preview() {
+      this.showPopup = true;
+    },
+
+    fileIcon(name) {
+      if (['.zip', '.rar','.mp4'].indexOf(this.getExtension(name)) !== -1) {
+        return 'https://cdn.cunwuyun.cn/dvcp/announce/zip.png'
+      }
+
+      if (['.doc', '.docx'].indexOf(this.getExtension(name)) !== -1) {
+        return 'https://cdn.cunwuyun.cn/dvcp/announce/world.png'
+      }
+
+      if (['.xls', '.xlsx'].indexOf(this.getExtension(name)) !== -1) {
+        return 'https://cdn.cunwuyun.cn/dvcp/announce/xls.png'
+      }
+
+      if (['.txt'].indexOf(this.getExtension(name)) !== -1) {
+        return 'https://cdn.cunwuyun.cn/dvcp/announce/txt.png'
+      }
+
+      if (['.pdf'].indexOf(this.getExtension(name)) !== -1) {
+        return 'https://cdn.cunwuyun.cn/dvcp/announce/pdf.png'
+      }
+
+      if (['.ppt', '.pptx'].indexOf(this.getExtension(name)) !== -1) {
+        return 'https://cdn.cunwuyun.cn/dvcp/announce/ppt.png'
+      }
+    },
+
+    getExtension(name) {
+      return name.substring(name.lastIndexOf('.'))
+    },
+
+    uploadBtn(type) {
+      if(type == 'web') {
+        this.showAddWeb = true
+        this.webInfo = {}
+        return false
+      }
+      if(type == 'app') {
+        this.showAddApp = true
+        this.appInfo = {media: []}
+        return
+      }
+      let count = 9 - (this.files?.length || 0) - (this.checkedList?.length || 0)
+      if(count > 0){
+        let params = {
+          count,
+          sizeType: ['compressed'],
+          sourceType: ['album'],
+          success: (res) => {
+            // console.log(res);
+            let count = this.files?.length + (res.tempFiles?.length || res.tempFile ? 1 : 0)
+            if (count > 9) {
+              return this.$u.toast(`不能超过9个`)
+            }
+            let maxImage = 10 * 1024 * 1024// 10M
+            let maxVideo = 10 * 1024 * 1024// 10M
+            let maxFile = 20 * 1024 * 1024// 20M
+            if (res.tempFiles) {
+              if(type == "image") {
+                if(res.tempFiles.every(e=> e.size > maxImage)) {
+                  return this.$u.toast(`图片最大不能超过10M`)
+                }
+              }
+              if(type == "file") {
+                if(res.tempFiles.every(e=> e.size > maxFile)) {
+                  return this.$u.toast(`文件最大不能超过20M`)
+                }
+              }
+              res.tempFiles?.map((item) => {
+                this.uploadFile(item,type)
+              })
+            } else if (res?.tempFile) {
+              if(type == "video") {
+                if(res.tempFile.size > maxVideo) {
+                  return this.$u.toast(`视频最大不能超过10M`)
+                }
+              }
+              this.uploadFile(res.tempFile,type)
+            }
+          },
+        }
+        if (type == 'image') {
+          uni.chooseImage(params)
+        } else if (type == 'video') {
+          uni.chooseVideo(params)
+        } else if(type == 'file') {
+          uni.chooseFile(params)
+        } else {
+          uni.navigateTo({url: `./fodderList?type=${this.type}&msgType=${type}`})
+          this.showUpload = false
+        }
+      } else {
+        this.$u.toast(`不能超过9个`)
+      }
+    },
+
+    uploadFile(img,type) {
+      uni.showLoading({title: '上传中'})
+      let formData = new FormData()
+      formData.append('file', img)
+      formData.append('type', type)
+      let url = ''
+      if(this.type=='Residents' || this.type=='ResidentsGroup') {
+        url = `/app/wxcp/upload/uploadFile`
+      } else if(this.type=='CircleOfFriends') {
+        url = `/app/wxcp/upload/uploadAttachment?attachmentType=1&mediaType=${type}`
+      }
+      this.$http.post(url, formData,{
+        withCredentials: false
+      }).then((res) => {
+        uni.hideLoading()
+        if (res?.data) {
+          this.$u.toast('上传成功!')
+          this.showUpload = false
+          this.files.push({
+            ...res.data.file,
+            media: res.data.media,
+            msgType: type,
+            sysFileId: res.data.file.id,
+            imgPicUrl: res.data.file.url,
+            mediaId: res.data.media.mediaId
+          })
+        }
+      }).catch(res => {
+        this.$u.toast(res)
+        uni.hideLoading()
+      })
+    },
+
+    remove(index) {
+      this.files.splice(index, 1)
+      
+    },
+
+    removeSucai(index) {
+      this.checkedList.splice(index, 1)
+      uni.setStorageSync("checkedList", this.checkedList)
+    },
+
+    choiceTime(e) {
+      this.form.choiceTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second
+    },
+
+    choiceEndTime(e) {
+      this.form.taskEndTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second
+    },
+
+    confirm() {
+      if(this.flag) return
+      if(!this.form.taskTitle) {
+        return this.$u.toast('请输入任务名称')
+      }
+
+      if(!this.form.sendScope || this.sum == 0) {
+        return this.$u.toast('请选择发送范围')
+      }
+
+      if(!this.content) {
+        return this.$u.toast("请输入发送内容")
+      }
+      this.form.contents = []
+      // 文本
+      const firstContent = [
+        { 
+          content: this.content,
+          msgType: '0'
+        },
+      ]
+      this.form.contents.push(...firstContent)
+      
+      // 图片
+      const picUrl = this.files.filter(i=> ['.jpg','.jpeg','.png'].indexOf(this.getExtension(i.name)) !== -1).map(e=>{
+        return {
+          imgPicUrl: e.url, 
+          msgType: '1',
+          mediaId: e.mediaId
+        }
+      })
+      this.form.contents.push(...picUrl)
+      // 视频
+      const video = this.files.filter(i=> ['.mp4'].indexOf(this.getExtension(i.name)) !== -1).map(e=>{
+        return {
+          imgPicUrl: e.url, 
+          msgType: '2',
+          mediaId: e.mediaId
+        }
+      })
+      this.form.contents.push(...video)
+      // 文件
+      const files = this.files.filter(i=> ['.mp4','.jpg','.jpeg','.png'].indexOf(this.getExtension(i.name)) == -1).map(e=>{
+        return {
+          imgPicUrl: e.url, 
+          msgType: '3',
+          mediaId: e.mediaId
+        }
+      })
+      this.form.contents.push(...files)
+
+      //网页
+      this.webListInfo.map((item) => {
+        if(item.linkPicUrl && item.linkPicUrl.length) {
+          item.linkPicUrl = item.linkPicUrl[0].url
+        }
+        item.msgType = '4'
+      })
+      this.form.contents.push(...this.webListInfo)
+
+      //小程序
+      this.appListInfo.map((item) => {
+        if(item.media && item.media.length) {
+          item.sysFileId = item.media[0].id
+          item.mediaId = item.media[0].mediaId
+          item.url = item.media[0].url
+        }
+        item.msgType = '5'
+      })
+      this.form.contents.push(...this.appListInfo)
+
+      if(this.checkedList.length) {
+        this.form.contents.push(...this.checkedList)
+      }
+
+      if(this.type=='Residents' || this.type=='CircleOfFriends') {
+        this.forms.contents = this.form.contents
+        this.forms.taskTitle = this.form.taskTitle
+      }
+
+      if(this.enableExamine) { // 是否需要审批，0：否、1：是
+        if(!this.form.examines.length) {
+          return this.$u.toast("请选择审批人")
+        } else {
+          this.forms.examines = this.form.examines
+        }
+        this.form.enableExamine = 1
+        this.forms.enableExamine = 1 
+      } else {
+        this.form.enableExamine = 0
+        this.forms.enableExamine = 0 
+        this.form.examines = []
+        this.forms.examines = []
+      }
+
+      if(this.isTimedTask) {   // 发送类型，0：立即发送、1：定时发送
+        this.form.sendType = 1
+        this.forms.sendType = 1
+        if(!this.form.choiceTime.length) {
+          return this.$u.toast("请选择发送时间")
+        } else if (new Date(this.form.choiceTime).getTime() < Date.now()) {
+          return this.$u.toast('定时发送时间不得早于当前时间')
+        }
+        this.forms.choiceTime = this.form.choiceTime
+      } else {
+        this.form.sendType = 0
+        this.forms.sendType = 0
+        this.forms.choiceTime = ''
+        this.form.choiceTime = ''
+      }
+
+      if(!this.form.taskEndTime) {
+        return this.$u.toast("请选择结束时间")
+      }
+
+      this.flag = true
+
+      let formData = {}
+      let url = ''
+      if(this.type=='CircleOfFriends' || this.type=='Residents') { //群发朋友圈、居民
+        url = `/app/whchatmomentstask/addOrUpdate`
+        this.forms.gender = this.sex
+        this.forms.addFromTime = this.startTime
+        this.forms.addEndTime = this.endTime
+        this.forms.taskEndTime = this.form.taskEndTime
+        formData = this.forms
+      } else if(this.type=='ResidentsGroup') { // 群发居民群
+        url = `/app/appmasssendingtask/addOrUpdate`
+        this.form.filterCriteria = this.girdListIds.toString() || this.deptListIds.toString() || ''
+        formData = this.form
+      } 
+      this.form.markTag = this.tagList.join(',')
+
+      console.log(formData)
+      this.$http.post(url, { ...formData }).then(res=>{
+        if(res?.code == 0) {
+          this.flag = false
+          this.$u.toast("新增成功")
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600)
+        }
+      }).then(()=> {
+        this.removeStorage()
+      }).catch((err)=>{
+        this.flag = false
+        this.$u.toast(err)
+      })
+    },
+
+    removeStorage() {
+      uni.removeStorageSync('userSelect')
+      uni.removeStorageSync('wxGroupsUser')
+      uni.removeStorageSync('girdSelect')
+      uni.removeStorageSync('deptList')
+      uni.removeStorageSync('sendScope')
+      uni.removeStorageSync('ResidentTags')  // 居民包含
+      uni.removeStorageSync('ResidentTagsRemove') // 居民剔除
+      uni.removeStorageSync('circleTags')  // 朋友圈包含
+      uni.removeStorageSync('circleTagsRemove')  // 朋友圈剔除
+      uni.removeStorageSync('startTime')
+      uni.removeStorageSync('endTime')
+      uni.removeStorageSync('selectDeptUser')
+      uni.removeStorageSync('checkedList')
+      uni.removeStorageSync('tagList')
+    },
+
+    getExamines(list) {
+      this.form.examines = list?.map(e => {
+        return {
+          ...e,
+          examineUserId: e.id,
+          examineUserName: e.name
+        }
+      })
+      uni.setStorageSync('selectDeptUser', list)
+    },
+
+    toSelectTag() {
+      uni.navigateTo({url: `./selectTag?selected=${this.tagList.join(',')}`})
+    },
+
+    addWeb() {
+      if(!this.webInfo.linkTitle) {
+        return this.$u.toast('请输入标题')
+      }
+      if(!this.webInfo.linkUrl) {
+        return this.$u.toast('请输入链接')
+      }
+      this.webListInfo.push(this.webInfo)
+      this.showAddWeb = false
+    },
+    removeWeb(index) {
+      this.webListInfo.splice(index, 1)
+    },
+    appMediaChange(e) {
+      this.$nextTick(() => {
+        console.log(this.appInfo.media)
+        this.appInfo.media.map((item) => {
+          if(item.id == e.file.id) {
+            item.mediaId = e.media.mediaId
+          }
+        })
+      })
+    },
+    addApp() {
+      if(!this.appInfo.mpAppid) {
+        return this.$u.toast('请输入小程序appid')
+      }
+      if(!this.appInfo.mpPage) {
+        return this.$u.toast('请输入小程序page路径')
+      }
+      if(!this.appInfo.mpTitle) {
+        return this.$u.toast('请输入标题')
+      }
+      if(!this.appInfo.media.length) {
+        return this.$u.toast('请上传封面图')
+      }
+      
+      this.appListInfo.push(this.appInfo)
+      this.showAddApp = false
+    },
+    removeApp(index) {
+      this.appListInfo.splice(index, 1)
+    },
+
+  },
+  watch: {
+    type: {
+      handler(v) {
+        if(v) {
+          if(v=='Residents') {
+            this.forms.taskType = 1
+            this.uploadList = this.uploadList
+          } else if(v=='CircleOfFriends') {
+            this.forms.taskType = 0
+            this.uploadList = this.uploadCircle
+          } else if(v=='ResidentsGroup') {
+            this.uploadList = this.uploadList
+          }
+        }
+      }
+    }
+  },
+  onLoad(o) {
+    this.type = o.type;
+    document.title = this.type=='ResidentsGroup'? "群发居民群": this.type=='Residents'? "群发居民": "群发朋友圈"
+
+    //清除发送范围，审批人缓存
+    uni.setStorageSync('sendScope', [])
+    uni.setStorageSync('wxGroupsUser', [])
+    uni.setStorageSync('selectDeptUser', [])
+    uni.setStorageSync('deptList', [])
+    uni.setStorageSync('tagList', [])
+    
+  },
+  onShow() {
+    this.tagList = uni.getStorageSync('tagList') || []
+    this.form.wxGroups = uni.getStorageSync('wxGroupsUser') || []
+    this.form.sendScope = uni.getStorageSync('sendScope')
+    if(this.type=='Residents') {
+      this.forms.taskType = 1
+      this.forms.sendScope = this.form.sendScope
+      this.forms.groupList = this.form.wxGroups
+      this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.customerCount, 0)
+    } else if(this.type=='CircleOfFriends') {
+      this.forms.taskType = 0
+      this.forms.sendScope = this.form.sendScope
+      this.forms.executorList = this.form.wxGroups
+      this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.customerCount, 0)
+    } else if(this.type == 'ResidentsGroup') {
+      this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.groupCount, 0)
+    }
+    this.forms.taskTitle = this.form.taskTitle
+    const girdArr = uni.getStorageSync('girdSelect')
+    if(girdArr.length) {
+      this.girdListIds = girdArr.map(e=>e.id)
+    }
+    const deptArr = uni.getStorageSync('deptList')
+    if(deptArr.length) {
+      this.deptListIds = deptArr.map(v=>v.id)
+    }
+    // 性别
+    this.sex = uni.getStorageSync('gender')
+    // 标签
+    if(this.type == 'Residents') { 
+      this.ResidentTags = uni.getStorageSync('ResidentTags') // 居民包含
+      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove') // 居民剔除
+      if(this.ResidentTags.length) {
+        this.forms.filterTags = this.ResidentTags.map(e=> e.id).toString()
+        this.forms.filterTagsName = this.ResidentTags.map(e=> e.name).toString()
+      } else if(this.ResidentTagsRemove) {
+        this.forms.excludeFilterTags = this.ResidentTagsRemove.map(e=> e.id).toString()
+        this.forms.excludeFilterTagsName = this.ResidentTagsRemove.map(e=> e.name).toString()
+      }
+    } else if(this.type == 'CircleOfFriends') {
+      this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含
+      this.circleTagsRemove = uni.getStorageSync('circleTagsRemove') // 朋友圈剔除
+      if(this.circleTags.length) {
+        this.forms.filterTags = this.circleTags.map(e=> e.id).toString()
+        this.forms.filterTagsName = this.circleTags.map(e=> e.name).toString()
+      } else if(this.circleTagsRemove.length) {
+        this.forms.excludeFilterTags = this.circleTagsRemove.map(e=> e.id).toString()
+        this.forms.excludeFilterTagsName = this.circleTagsRemove.map(e=> e.name).toString()
+      }     
+    }
+    // 时间
+    this.startTime = uni.getStorageSync('startTime')
+    this.endTime = uni.getStorageSync('endTime')
+    uni.$on("pagePicker:custom", ()=> {
+      this.form.examines = uni.getStorageSync('selectDeptUser').map(e=> {
+        return {
+          ...e,
+          examineUserId: e.id,
+          examineUserName: e.name
+        }
+      })
+    })
+    this.form.examines = uni.getStorageSync('selectDeptUser')?.map(e => {
+      return {
+        ...e,
+        examineUserId: e.id,
+        examineUserName: e.name
+      }
+    })
+    uni.$on("fodder",()=> {
+      this.checkedList = uni.getStorageSync('checkedList').filter(i => i.type != 0)
+    })
+    this.checkedList = uni.getStorageSync('checkedList')?.filter(i=> i.type != 0) || []
+    let arr = uni.getStorageSync('checkedList')?.filter(e => e.type == 0) || []
+    if (arr.length) {
+      let arrStr = arr.map(i => i.content)
+      this.content = this.content.concat(' ', arrStr.toString())
+      uni.setStorageSync('checkedList', this.checkedList)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.addPropaganda {
+  font-size: 32px !important;
+  padding-bottom: 140px;
+  box-sizing: border-box;
+  .task_name,
+  .send_scope,
+  .send_content {
+    background: #FFF;
+    padding: 32px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    .title {
+      font-weight: 400;
+      font-size: 32px;
+    }
+  }
+
+  .send_scope {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .send_content {
+    .content_title {
+      display: flex;
+      justify-content: space-between;
+    }
+    .content_text {
+      margin-top: 12px;
+      border-bottom: 1px solid #DDD;
+    }
+    .content_fodder {
+      margin-top: 16px;
+      
+      .fodder_alls {
+        display: flex;
+        margin-top: 16px;
+        align-items: center;
+        .fodder_add {
+          border: 2px solid #DBDCDF;
+          padding: 20px 24px;
+          box-sizing: border-box;
+          border-radius: 8px;
+        }
+        .fodder_title {
+          color: #8E8F91;
+          margin-left: 20px;
+        }
+      }
+
+      .fodder_file {
+        margin-top: 16px;
+        width: 100%;
+        .item {
+          display: flex;
+          .images {
+            margin-right: 32px;
+            img {
+              width: 80px;
+              height: 80px;
+            }
+          }
+          .info {
+            width: calc(100% - 200px);
+            .name {
+              overflow: hidden; 
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+            }
+            .size {
+              color: #9b9b9b;
+            }
+          }
+          .reUpload {
+            color:  #1365DD;
+            margin-left: 20px;
+          }
+          .remove {
+            color: #f72c27;
+            margin-left: 20px;
+          }
+        }
+      }
+      
+    }
+  }
+
+  .isExamine {
+    background: #FFF;
+    padding: 0px 32px;
+    box-sizing: border-box;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    
+    .examineChange,
+    .examine_person {
+      display: flex;
+      justify-content: space-between;
+      padding: 26px 0px;
+      box-sizing: border-box;
+      border-top: 2px solid #DDD;
+    }
+
+    .examine_person {
+      
+      // padding: 26px 0 0 0;
+    }
+  }
+  .color_red {
+    color: #FF4466;
+  }
+  .color_gray {
+    color: #CCD0D3;
+  }
+  .inpt {
+    margin-left: 14px;
+  }
+
+  .mask {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    margin: 0;
+    left: 0;
+    right: 0;
+    background: rgba(#000, 0.6);
+    z-index: 202103021409;
+    width: 100%;
+    height: 100%;
+  }
+
+  ::v-deep .noticeModal {
+    position: fixed;
+    left: 50%;
+    top: 45%;
+    transform: translate(-50%, -50%);
+    width: 90%;
+    height: 85%;
+
+    .body {
+      background: #EBECF0;
+      border-radius: 16px 16px 0 0;
+      padding: 32px;
+      box-sizing: border-box;
+      height: 100%;
+      overflow-y: auto;
+      font-size: 28px;
+      font-weight: 400;
+      color: #333;
+      line-height: 48px;
+
+      .text_content,
+      .file_content {
+        display: flex;
+        margin-bottom: 32px;
+        .text_left { 
+          margin-right: 32px;
+          width: 84px;
+          height: 84px;
+        }
+        .only_pic {
+          max-width: 206px;
+          max-height: 200px;
+        }
+        .only_video {
+          max-width: 284px;
+          max-height: 160px;
+        }
+
+        .text_right {
+          width: calc(100% - 116px);
+          background: #FFF;
+          border-radius: 10px;
+          padding: 24px;
+          box-sizing: border-box;
+          position: relative;
+
+          &::before {
+            position: absolute;
+            content: "";
+            width: 0;
+            height: 0;
+            top: 18px;
+            left: 0;
+            border-top: 12px solid transparent;
+            border-bottom: 12px solid transparent;
+            border-left: 12px solid transparent;
+            border-right: 12px solid #fff;
+            transform: translate(-100%, 0%);
+          }
+        }
+        .file_right {
+          display: flex;
+          .cont_left {
+            width: calc(100% - 90px);
+            h4 { 
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              font-weight: normal;
+            }
+            p {
+              color: #888888;
+            }
+          }
+          .cont_right {
+            width: 84px;
+            height: 84px;
+            img {
+              width: 100%;
+              height: 100%;
+            }
+          }
+        }
+      }
+    }
+
+    .footer {
+      width: 100%;
+      height: 112px;
+      line-height: 112px;
+      text-align: center;
+      background: #FFF;
+      border-radius: 0 0 16px 16px;
+      border-top: 2px solid #EEEEEE;
+    }
+  }
+
+  .uploadPopup {
+    width: 100%;
+    background: #F7F7F7;
+    .upload_card {
+      padding: 32px 32px 0 32px;
+      box-sizing: border-box;
+
+      .upload_item {
+        margin-bottom: 32px;
+      }
+
+      .upload_list {
+          text-align: center;
+          height: 140px;
+          display: flex;
+          flex-wrap: nowrap;
+        .lists_item {
+          margin-right: 48px;
+          img {
+            display: inline-block;
+            width: 84px;
+            height: 84px;
+          }
+        }
+      }
+    }
+    .btnCancel {
+      width: 100%;
+      height: 120px;
+      line-height: 120px;
+      text-align: center;
+      border-top: 2px solid #DDDDDD;
+      margin-top: 80px;
+    }
+
+  }
+
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    z-index: 9;
+    .submitBtn {
+      background: #1365DD;
+      width: 100%;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      color: #FFF;
+      border-radius: 8px;
+    }
+  }
+  .popup-form {
+    .item {
+      display: flex;
+      padding: 32px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #DDDDDD;
+
+      .left {
+        width: 240px;
+        span:first-child {
+          color: #FF4466;
+        }
+      }
+      
+      .right__text {
+        width: calc(100% - 240px);
+        text-align: right;
+      }
+
+      .color-999 {
+        color: #999;
+      }
+      .color-333 {
+        color: #333;
+      }
+      
+    }
+    .items {
+      padding: 32px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #DDDDDD;
+
+      .left {
+        span:first-child {
+          color: #FF4466;
+        }
+      }
+      .text {
+        margin-top: 20px;
+      }
+      .textarea {
+        margin-top: 32px;
+      }
+      .tags {
+        margin-top: 20px;
+        span {
+          display: inline-block; 
+          width: 31%;
+          height: 80px;
+          line-height: 80px;
+          text-align: center;
+          box-sizing: border-box;
+          border-radius: 16px;
+          border: 1px solid #CCCCCC;
+          margin-right: 20px;
+          margin-bottom: 16px;
+        }
+        span:nth-child(3n) {
+          margin-right: 0;
+        }
+        .isCheck {
+          color: #FFF;
+          background: #4181FF;
+        }
+      }
+    }
+    .popup-btn {
+      width: 100%;
+      height: 98px;
+      background: #1365DD;
+      line-height: 98px;
+      text-align: center;
+      color: #FFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/circleDetail.vue b/src/project/biaopin/AppCooperationPropaganda/circleDetail.vue
new file mode 100644
index 00000000..d1579d57
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/circleDetail.vue
@@ -0,0 +1,471 @@
+<template>
+  <div class="circleDetail">
+    <div class="content">
+      <div class="header">
+        <div class="header_left">
+          <div>{{ detail.taskTitle }} <span :class="detail.status==0? 'status0': detail.status==1? 'status1': detail.status==2? 'status2':
+           detail.status == 3? 'status3':detail.status==4? 'status4': 'status5'">{{ $dict.getLabel('mstStatus', detail.status) }}</span></div>
+          <div>
+            创建时间: <span>{{ detail.createTime }}</span> 
+          </div>
+        </div>
+        <div class="header_right" @click="toDetail">查看详情</div>
+      </div>
+
+      <div class="pieEcharts">
+        <div class="pie_info">
+          <div class="tips" v-if="detail.status">
+            数据更新于<span>{{ info.remindTime }}</span>
+          </div>
+          <div class="pie_card">
+            <div id="pieEcharts"></div>
+            <div class="pie_right">
+              <div>
+                <span>计划执行成员：</span>
+                <span>{{ info.planCount || 0 }}</span>
+              </div>
+              <div>
+                <span>未执行成员：</span>
+                <span>{{ info.unExecutedCount || 0 }}</span>
+              </div>
+              <div>
+                <span>已执行成员：</span>
+                <span>{{ info.executedCount || 0 }}</span>
+              </div>
+              <div v-if="type == 'Residents'">
+                <span>无法执行成员：</span>
+                <span>{{ info.cannotExecuteCount || 0 }}</span>
+              </div>
+            </div>
+          </div>
+          <div v-if="detail.status == 4" class="btn" @click="remindSend">提醒成员发送</div>
+        </div>
+      </div>
+
+      <div class="list_content">
+        <div class="list_card">
+          <div class="tab" v-show="update">
+            <div class="item" :class="subIndex == index? 'bgactive': ''" v-for="(item,index) in subsection" :key="index" @click="changeSub(index)">
+              {{ item }}
+            </div>
+          </div>
+
+          <AiTable
+            :data="tableData"
+            :colConfigs="type =='CircleOfFriends'? colConfigs1: colConfigs0"
+            v-if="tableData.length"/>
+          <AiEmpty v-if="!tableData.length" description="暂无数据"></AiEmpty>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import echarts from "echarts";
+export default {
+  name: "circleDetail",
+  data() {
+    return {
+      pieEcharts: null,
+      subIndex: 0,
+      tableData: [],
+      id: "",
+      info: {},
+      current: 1,
+      firstClickTime: "",
+      currentClickTime: "",
+      detail: {},
+
+      subsection: [],
+      update: true,
+      type: "",
+      percent: 0,
+    };
+  },
+  computed: {
+    colConfigs0() {
+      return [
+        { prop: "userName", label: "成员" },
+        { prop: "customerCount", label: "预计送达居民"},
+      ];
+    },
+    colConfigs1() {
+      return [
+        { prop: "userName", label: "成员" },
+        { prop: "customerCount", label: "预计发送朋友圈"},
+      ];
+    },
+  },
+  onLoad(o) {
+    this.id = o.id;
+    this.type = o.type
+  },
+  watch: {
+    type: {
+      handler(v) {
+        if(v=="CircleOfFriends") {
+          this.subsection = ["未执行","已执行"]
+        }
+        if(v=="Residents") {
+          this.subsection = ["未执行","已执行","无法执行"]
+        }
+      }
+    }
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/whchatmomentstask/queryDetailById?id=${this.id}`).then((res) => {
+          if (res?.data) {
+            this.detail = res.data;
+          }
+        });
+    },
+
+    toDetail() {
+      uni.navigateTo({ url: `./detail?id=${this.id}&type=${this.type}` });
+    },
+    // 提醒发送
+    remindSend() {
+      uni.getSystemInfo({
+        success: (res)=>{
+          if(res.platform == "ios") {
+            this.firstClickTime = new Date(this.detail.remindTime?.replace(/-/g, "/")).getTime() || 0
+          } else {
+            this.firstClickTime = new Date(this.detail.remindTime).getTime() || 0
+          }
+        }
+      });
+      this.currentClickTime = +new Date();
+      let time = this.currentClickTime - this.firstClickTime;
+      if (time >= 3600000) {   
+        this.$http.post("/app/whchatmomentstask/remindSend", null, {
+            params: {
+              id: this.id,
+            },
+          })
+          .then((res) => {
+            if (res?.code == 0) {
+              this.$u.toast("已提醒成员发送");
+              this.getDetail()
+            }
+          })
+          .catch(() => {});
+      } else {
+        time = 3600000 - time;
+        const min = Math.floor(time / 60000); // 分钟
+        let second = Math.floor(time / 1000); // 秒
+        second %= 60;
+        let msg = ``;
+        if (min > 0 && second > 0) {
+          msg = `${min}分钟${second}秒后可以再次点击`;
+        } else if (min > 0 && second <= 0) {
+          msg = `${min}分钟后可以再次点击`;
+        } else if (min <= 0 && second > 0) {
+          msg = `${second}秒后可以再次点击`;
+        }
+        this.$u.toast(msg);
+      }
+    },
+    // 切换分段器
+    changeSub(index) {
+      this.subIndex = index;
+      this.getStatistics();
+    },
+    // 获取表格数据
+    getStatistics() {
+      this.$http.post('/app/whchatmomentstask/detailStatistics', null, {
+        params: { 
+          sendStatus: this.subIndex,
+          taskId: this.id,
+          current: this.current,
+          size: 3000,
+        },
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.info = res.data
+          this.tableData = res.data.executedList.records
+          setTimeout(()=>{
+            this.getPieEcharts()
+          }, 1000)
+        }
+      });
+    },
+
+    // 饼图
+    getPieEcharts() {
+      this.pieEcharts = echarts.init(document.getElementById("pieEcharts"));
+      this.pieEcharts.setOption({
+        tooltip: {
+          show: false,
+        },
+        color: ["#1684fc","#ccc"],
+        series: [
+          {
+            name: "任务完成率",
+            type: "pie",
+            radius: ["50%", "70%"],
+            avoidLabelOverlap: false,
+            label: {
+              normal: {
+                show: false,
+                position: "center",
+              },
+            },
+            labelLine: {
+              show: false,
+            },
+            data: [
+              {
+                value: this.info.executedCount,
+                name: "已执行成员",
+                label: {
+                  normal: {
+                    show: true,
+                    formatter: ({ name, value }) => {
+                      this.percent = value / this.info.planCount * 100 || 0
+                      // console.log(this.percent)
+                      return `{name|任务达成率\n\n}{value|${ this.percent }%}`
+                    },
+                    textStyle: {
+                      fontSize: 16,
+                    },
+                    rich: {
+                      name: {
+                        color: "#999",
+                        
+                      },
+                      value: {
+                        color: "#000000",
+                        fontSize: 26,
+                      },
+                    },
+                  },
+                },
+              },
+              { 
+                value: this.info.planCount - this.info.executedCount,
+                name: "未执行成员"
+              },
+            ],
+          },
+        ],
+      });
+    },
+  },
+  onShow() {
+    document.title = this.type == "Residents"? '群发居民':'群发朋友圈';
+    this.$dict.load("mstStatus")
+    this.getStatistics();
+    this.getDetail();
+  },
+  mounted() {
+    this.getPieEcharts();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.circleDetail {
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+  ::v-deep .emptyWrap {
+    border: 2px solid #d0d4dc;
+    border-radius: 8px;
+    padding-bottom: 20px;
+  }
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975c6;
+    display: flex;
+
+    .item {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #cddcf0;
+    }
+
+    .active {
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+
+      span {
+        width: 48px;
+        height: 4px;
+        background: #fff;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
+  .header {
+    padding: 32px;
+    box-sizing: border-box;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    .header_left {
+      width: calc(100% - 120px);
+      div:first-child {
+        color: #000000;
+        font-size: 32px;
+        font-weight: 600;
+        margin-bottom: 10px;
+
+        span {
+          display: inline-block;
+          padding: 0 8px;
+          border: 1px solid;
+          border-radius: 6px;
+          font-size: 26px;
+          font-weight: normal;
+          margin-left: 8px;
+        }
+        .status0 {
+          color: #FFA938 !important;
+        }
+        .status1 {
+          color: #FF6758 !important;
+        }
+        .status2 {
+          color: #3399FF !important;
+        }
+        .status3 {
+          color: #FF6758 !important;
+        }
+        .status4 {
+          color: #3399FF !important;
+        }
+        .status5 {
+          color: #1CCEB0 !important;
+        }
+        .status6 {
+          color: #666666 !important;
+        }
+      }
+      div:last-child {
+        color: #666666;
+      }
+    }
+    .header_right {
+      width: 120px;
+      color: #5297ff;
+    }
+  }
+
+  .pieEcharts {
+    width: 100%;
+    padding: 32px;
+    box-sizing: border-box;
+    .pie_info {
+      background: #fff;
+      border-radius: 16px;
+      padding-bottom: 20px;
+      box-sizing: border-box;
+      .tips {
+        color: #666666;
+        padding: 40px 32px 0 32px;
+        box-sizing: border-box;
+      }
+      .pie_card {
+        display: flex;
+        width: 100%;
+        align-items: center;
+        #pieEcharts {
+          width: 60%;
+          height: 400px;
+        }
+        ::v-deep .emptyWrap {
+          width: 60%;
+        }
+        .pie_right {
+          width: 40%;
+          padding-right: 30px;
+          box-sizing: border-box;
+          div {
+            margin-bottom: 10px;
+            display: flex;
+            justify-content: space-between;
+          }
+        }
+      }
+      .btn {
+        margin: 0 auto;
+        width: 90%;
+        height: 80px;
+        line-height: 80px;
+        text-align: center;
+        color: #fff;
+        background: #3aa0ff;
+        border-radius: 8px;
+      }
+    }
+  }
+
+  .list_content {
+    padding: 0 32px 32px 32px;
+    box-sizing: border-box;
+
+    .list_card {
+      background: #fff;
+      border-radius: 16px;
+      padding: 30px 30px;
+
+      .tab {
+        margin-bottom: 34px;
+
+        ::v-deep .u-subsection uni-view{
+          background: #eeef !important;
+        }
+      }
+
+      ::v-deep .AiTable .u-table .u-tr .u-td p{
+        width: 100%;
+        word-break: keep-all;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      
+      ::v-deep .AiTable .u-table .u-tr .u-td {
+        width: 30%;
+      }
+    }
+  }
+  .tab {
+    height: 70px;
+    background-color: #eeeeef;
+    padding: 3px 4px;
+    border-radius: 10px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .item {
+      flex: 1;
+      height: 58px;
+      line-height: 58px;
+      align-self: center;
+      text-align: center;
+      border-radius: 16px;
+      color: #606266;
+    }
+    .bgactive {
+      background: #fff;
+      font-weight: 600;
+      color: #3aa0ff;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/cooperationDetail.vue b/src/project/biaopin/AppCooperationPropaganda/cooperationDetail.vue
new file mode 100644
index 00000000..85964474
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/cooperationDetail.vue
@@ -0,0 +1,535 @@
+<template>
+  <div class="cooperationDetail">
+    <AiTopFixed>
+      <div class="tab-select">
+        <div
+          class="item"
+          :class="tabIndex == index ? 'active' : ''"
+          v-for="(item, index) in tabs"
+          :key="index"
+          @click="tabClick(index)"
+        >
+          {{ item }}<span></span>
+        </div>
+      </div>
+    </AiTopFixed>
+
+    <div class="content">
+      <div class="header">
+        <div class="header_left">
+          <div>{{ detail.taskTitle }} <span :class="detail.status==0? 'status0': detail.status==1? 'status1': detail.status==2? 'status2':
+           detail.status == 3? 'status3':detail.status==4? 'status4': 'status5'">{{ $dict.getLabel('mstStatus', detail.status) }}</span></div>
+          <div>
+            创建时间: <span>{{ detail.createTime }}</span> 
+          </div>
+        </div>
+        <div class="header_right" @click="toDetail">查看详情</div>
+      </div>
+
+      <div class="pieEcharts">
+        <div class="pie_info">
+          <div class="tips" v-if="detail.status">
+            数据更新于<span>{{ info.remindTime }}</span>
+          </div>
+          <div class="pie_card">
+            <div id="pieEcharts"></div>
+            <div class="pie_right">
+              <div>
+                <span>{{
+                  tabIndex == 0 ? "计划执行成员：" : "计划送达居民群："
+                }}</span>
+                <span>{{ info.planCount || 0 }}</span>
+              </div>
+              <div>
+                <span>{{
+                  tabIndex == 0 ? "未执行成员：" : "未送达居民群："
+                }}</span>
+                <span>{{ info.unExecutedCount || 0 }}</span>
+              </div>
+              <div>
+                <span>{{
+                  tabIndex == 0 ? "已执行成员：" : "已送达居民群："
+                }}</span>
+                <span>{{ info.executedCount || 0 }}</span>
+              </div>
+              <div>
+                <span>{{
+                  tabIndex == 0 ? "无法执行成员：" : "无法送达居民群："
+                }}</span>
+                <span>{{ info.cannotExecuteCount || 0 }}</span>
+              </div>
+            </div>
+          </div>
+          <div v-if="detail.status == 4" class="btn" @click="remindSend">提醒成员发送</div>
+        </div>
+      </div>
+
+      <div class="list_content">
+        <div class="list_card">
+          <div class="tab" >
+            <div class="item" :class="subIndex == index? 'bgactive': ''" v-for="(item,index) in subsection" :key="index" @click="changeSub(index)">
+              {{ item }}
+            </div>
+          </div>
+
+          <AiTable
+            :data="tableData"
+            :colConfigs="tabIndex == 0 ? colConfigs0 : colConfigs1"
+            v-if="tableData.length"/>
+          <AiEmpty v-if="!tableData.length" description="暂无数据"></AiEmpty>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import echarts from "echarts";
+export default {
+  data() {
+    return {
+      tabs: ["成员统计", "居民群统计"],
+      tabIndex: 0,
+      pieEcharts: null,
+      subIndex: 0,
+      tableData: [],
+      id: "",
+      info: {},
+      current: 1,
+      firstClickTime: "",
+      currentClickTime: "",
+      detail: {},
+      subsection: [],
+      update0: true,
+      update1: false,
+      type: '',
+    };
+  },
+  computed: {
+    colConfigs0() {
+      return [
+        { prop: "groupOwnerName", label: "成员" },
+        { label: "预计送达居民群", prop: "groupCount" },
+      ];
+    },
+    colConfigs1() {
+      return [
+        { label: "居民群", prop: "groupName" },
+        { label: "群人数", prop: "memberCount" },
+        { prop: "groupOwnerName", label: "群主" },
+      ];
+    },
+  },
+  onLoad(o) {
+    this.id = o.id;
+    this.type = o.type
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index;
+      this.subIndex = 0
+      if(this.sendChannel == 1) {
+        if(this.tabIndex == 0) {
+          this.subsection = ["未执行","已执行"]
+        } else if(this.tabIndex == 1){
+          this.subsection = ["未送达","已送达"]
+        }
+      } else if(this.sendChannel != 1) {
+        if(this.tabIndex == 0) {
+          this.subsection = ["未执行","已执行","无法执行"]
+        } else if(this.tabIndex == 1) {
+          this.subsection = ["未送达","已送达","无法送达"]
+        }
+      }
+      this.getStatistics();
+    },
+
+    getDetail() {
+      this.$http
+        .post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`)
+        .then((res) => {
+          if (res?.data) {
+            this.detail = res.data;
+          }
+        });
+    },
+
+    toDetail() {
+      uni.navigateTo({ url: `./detail?id=${this.id}&type=${this.type}` });
+    },
+    // 提醒发送
+    remindSend() {
+      uni.getSystemInfo({
+        success: (res)=>{
+          if(res.platform == "ios") {
+            this.firstClickTime = new Date(this.detail.remindTime.replace(/-/g, "/")).getTime() || 0
+          } else {
+            this.firstClickTime = new Date(this.detail.remindTime).getTime() || 0
+          }
+        }
+      });
+      this.currentClickTime = +new Date();
+      let time = this.currentClickTime - this.firstClickTime;
+      if (time >= 3600000) {
+        this.$http.post("/app/appmasssendingtask/remindSend", null, {
+            params: {
+              id: this.id,
+            },
+          })
+          .then((res) => {
+            if (res?.code == 0) {
+              this.$u.toast("已提醒成员发送");
+              this.getDetail()
+            }
+          })
+          .catch(() => {});
+      } else {
+        time = 3600000 - time;
+        const min = Math.floor(time / 60000); // 分钟
+        let second = Math.floor(time / 1000); // 秒
+        second %= 60;
+        let msg = ``;
+        if (min > 0 && second > 0) {
+          msg = `${min}分钟${second}秒后可以再次点击`;
+        } else if (min > 0 && second <= 0) {
+          msg = `${min}分钟后可以再次点击`;
+        } else if (min <= 0 && second > 0) {
+          msg = `${second}秒后可以再次点击`;
+        }
+        this.$u.toast(msg);
+      }
+    },
+    // 切换分段器
+    changeSub(index) {
+      this.subIndex = index;
+      this.getStatistics();
+    },
+    // 获取数据
+    getStatistics() {
+      this.$http.post(`/app/appmasssendingtask/detailStatistics`, null, {
+          params: {
+            type: this.tabIndex,
+            sendStatus: this.subIndex,
+            taskId: this.id,
+            current: this.current,
+            size: 3000,
+          },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.info = res.data;
+            this.tableData = res.data.executedList.records;
+            setTimeout(()=>{
+              this.getPieEcharts();
+            }, 1000)
+          }
+        });
+    },
+
+    // 饼图
+    getPieEcharts() {
+      this.pieEcharts = echarts.init(document.getElementById("pieEcharts"));
+      this.pieEcharts.setOption({
+        tooltip: {
+          show: false,
+        },
+        color: ["#1684fc", "#ccc"],
+        series: [
+          {
+            name: this.tabIndex == 0 ? "任务完成率" : "群发送达率",
+            type: "pie",
+            radius: ["50%", "70%"],
+            avoidLabelOverlap: false,
+            label: {
+              normal: {
+                show: false,
+                position: "center",
+              },
+            },
+            labelLine: {
+              show: false,
+            },
+            data: [
+              {
+                value: this.info.executedCount,
+                name: "已执行成员",
+                label: {
+                  normal: {
+                    show: true,
+                    formatter: ({ name, value }) => {
+                      let num = value / this.info.planCount * 100
+                      if (this.tabIndex == 0) {
+                        return num % 1==0? `{name|任务达成率\n\n}{value|${num}%}`: `{name|任务达成率\n\n}{value|${ num.toFixed(1) }%}`;
+                      } else {
+                        return num % 1==0? `{name|群发送达率\n\n}{value|${num}%}`: `{name|群发送达率\n\n}{value|${ num.toFixed(1) }%}`;
+                      }
+                    },
+                    textStyle: {
+                      fontSize: 16,
+                    },
+                    rich: {
+                      name: {
+                        color: "#999",
+                        
+                      },
+                      value: {
+                        color: "#000000",
+                        fontSize: 26,
+                      },
+                    },
+                  },
+                },
+              },
+              { 
+                value: this.info.planCount - this.info.executedCount ,
+                name: "未执行成员"
+              },
+            ],
+          },
+        ],
+      });
+    },
+  },
+  watch: {
+    detail: {
+      handler(v) {
+        if(v) {
+          this.sendChannel = v.sendChannel
+          if(v.sendChannel == 1) {
+            if(this.tabIndex == 0) {
+              this.subsection = ["未执行","已执行"]
+              this.$forceUpdate()
+            } else if(this.tabIndex == 1){
+              this.subsection = ["未送达","已送达"]
+              this.$forceUpdate()
+            }
+          } else if(v.sendChannel != 1) {
+            if(this.tabIndex == 0) {
+              this.subsection = ["未执行","已执行","无法执行"]
+              this.$forceUpdate()
+            } else if(this.tabIndex == 1){
+              this.subsection = ["未送达","已送达","无法送达"]
+              this.$forceUpdate()
+            }
+          }
+        }
+      },
+      deep: true
+    }
+  },
+  onShow() {
+    document.title = "群发居民群统计";
+    this.$dict.load("mstStatus")
+    this.getStatistics();
+    this.getDetail();
+  },
+  mounted() {
+    this.getPieEcharts();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.cooperationDetail {
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+  ::v-deep .emptyWrap {
+    border: 2px solid #d0d4dc;
+    border-radius: 8px;
+    padding-bottom: 20px;
+  }
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975c6;
+    display: flex;
+
+    .item {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #cddcf0;
+    }
+
+    .active {
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+
+      span {
+        width: 48px;
+        height: 4px;
+        background: #fff;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
+  .header {
+    padding: 32px;
+    box-sizing: border-box;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    .header_left {
+      width: calc(100% - 120px);
+      div:first-child {
+        color: #000000;
+        font-size: 32px;
+        font-weight: 600;
+        margin-bottom: 10px;
+
+        span {
+          display: inline-block;
+          padding: 0 8px;
+          border: 1px solid;
+          border-radius: 6px;
+          font-size: 26px;
+          font-weight: normal;
+          margin-left: 8px;
+        }
+        .status0 {
+          color: #FFA938 !important;
+        }
+        .status1 {
+          color: #FF6758 !important;
+        }
+        .status2 {
+          color: #3399FF !important;
+        }
+        .status3 {
+          color: #FF6758 !important;
+        }
+        .status4 {
+          color: #3399FF !important;
+        }
+        .status5 {
+          color: #1CCEB0 !important;
+        }
+        .status6 {
+          color: #666666 !important;
+        }
+      }
+      div:last-child {
+        color: #666666;
+      }
+    }
+    .header_right {
+      width: 120px;
+      color: #5297ff;
+    }
+  }
+
+  .pieEcharts {
+    width: 100%;
+    padding: 32px;
+    box-sizing: border-box;
+    .pie_info {
+      background: #fff;
+      border-radius: 16px;
+      padding-bottom: 20px;
+      box-sizing: border-box;
+      .tips {
+        color: #666666;
+        padding: 40px 32px 0 32px;
+        box-sizing: border-box;
+      }
+      .pie_card {
+        display: flex;
+        width: 100%;
+        align-items: center;
+        #pieEcharts {
+          width: 60%;
+          height: 400px;
+        }
+        ::v-deep .emptyWrap {
+          width: 60%;
+        }
+        .pie_right {
+          width: 40%;
+          padding-right: 30px;
+          box-sizing: border-box;
+          div {
+            margin-bottom: 10px;
+            display: flex;
+            justify-content: space-between;
+          }
+        }
+      }
+      .btn {
+        margin: 0 auto;
+        width: 90%;
+        height: 80px;
+        line-height: 80px;
+        text-align: center;
+        color: #fff;
+        background: #3aa0ff;
+        border-radius: 8px;
+      }
+    }
+  }
+
+  .list_content {
+    padding: 0 32px 32px 32px;
+    box-sizing: border-box;
+
+    .list_card {
+      background: #fff;
+      border-radius: 16px;
+      padding: 30px 30px;
+
+      .tab {
+        margin-bottom: 34px;
+
+        ::v-deep .u-subsection uni-view{
+          background: #eeef !important;
+        }
+      }
+
+      ::v-deep .AiTable .u-table .u-tr .u-td p{
+        width: 100%;
+        word-break: keep-all;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      
+      ::v-deep .AiTable .u-table .u-tr .u-td {
+        width: 30%;
+      }
+    }
+  }
+
+  .tab {
+    height: 70px;
+    background-color: #eeeeef;
+    padding: 3px 4px;
+    border-radius: 10px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .item {
+      flex: 1;
+      height: 58px;
+      line-height: 58px;
+      align-self: center;
+      text-align: center;
+      border-radius: 16px;
+      color: #606266;
+    }
+    .bgactive {
+      background: #fff;
+      font-weight: 600;
+      color: #3aa0ff;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/detail.vue b/src/project/biaopin/AppCooperationPropaganda/detail.vue
new file mode 100644
index 00000000..2dc33352
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/detail.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="detail">
+    <div class="task">
+      <div class="task_title">群发客户群</div>
+      <div class="task_content">
+        <div class="item">
+          <span>任务名称</span>
+          <span>{{ data.taskTitle }}</span>
+        </div>
+        <div class="item">
+          <span>创建人</span>
+          <span>
+            {{ data.createUserName }}
+          </span>
+        </div>
+        <div class="item" v-if="data.enableExamine == 1">
+          <span>审批人</span>
+          <span>
+            <span v-for="(item, index) in approver" :key="index" style="color: #333;">
+              {{ item.examineUserName }}
+              <span v-show="index < approver.length - 1">、</span>
+            </span>
+          </span>
+        </div>
+        <div class="item">
+          <span>所在部门</span>
+          <span style="display: flex;">
+            <div v-if="data.createUserDeptName">{{ data.createUserDeptName }}</div>
+          </span>
+        </div>
+        <div class="item">
+          <span>群发时间</span>
+          <span>{{ data.choiceTime }}</span>
+        </div>
+        <div class="item">
+          <span>结束时间</span>
+          <span>{{ data.taskEndTime }}</span>
+        </div>
+        <div class="item" v-if="data.markTag">
+          <span>标签</span>
+          <span>{{ data.markTag }}</span>
+        </div>
+      </div>
+      <div class="task_results" v-if="data.enableExamine == 1">
+        <img v-if="data.status == 1" src="./images/refuse.png" alt="">
+        <img v-if="data.status > 1" src="./images/pass.png" alt="">
+      </div>
+    </div>
+    <div class="info">
+      <div class="scope">
+        <span>群发范围</span>
+        <div>
+          <span v-if="data.sendScope==0">全部</span><span v-if="data.sendScope==1 || data.sendScope==2">按条件筛选的</span>
+          <span v-if="type=='ResidentsGroup'">{{ data.receiveGroupCount || 0}}</span>
+          <span v-if="type=='Residents'">{{ resSum || 0}}</span>
+          <span v-if="type=='CircleOfFriends'">{{ cirSum || 0}}</span>
+          <span v-if="type=='ResidentsGroup'">个居民群</span><span v-if="type=='Residents'">个居民</span><span v-if="type=='CircleOfFriends'">个朋友圈</span>
+        </div>
+      </div>
+      <div class="content">
+        <p>群发内容</p>
+        <div>
+          <!-- 文本 -->
+          <div class="textarea" v-show="content.length">{{ content }}</div>
+          <!-- 图片 -->
+          <div class="pictures" v-show="picList.length">
+            <image v-for="(item, index) in picList" :key="index" :src="item.imgPicUrl" @click.stop="previewImages(picList, item.imgPicUrl)"/>
+          </div>
+          <!-- 视频 -->
+          <div class="video" v-show="videoList.length">
+            <video v-for="(item, index) in videoList" :key="index" :src="item.imgPicUrl"/>
+          </div>
+          <!-- 文件 -->
+          <div class="file" v-show="fileList.length">
+            <div class="file_item" v-for="(item,index) in fileList" :key="index" @click="prevFile(item.sysFile)">
+              <img src="./images/files.png" alt="">
+              <div>{{ item.sysFile.name }}</div>
+            </div>
+          </div>
+          <!-- 网页 -->
+          <div class="webpage" v-show="webpage.length">
+            <p>链接地址</p>
+            <a v-for="(item, index) in webpage" :key="index" :href="item.linkUrl">
+              <div v-if="item.linkTitle">{{item.linkTitle}}</div>
+              <div v-else>{{ item.linkUrl }}</div>
+            </a>
+          </div>
+          <!-- 小程序 -->
+          <div class="miniapp" v-show="miniapp.length">
+            <p>小程序</p>
+            <div v-for="(item, index) in miniapp" :key="index">{{item.mpTitle}}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn" v-if="data.status==0 && data.haveExaminPower">
+      <div class="refuse" @click="refuseBtn">审核拒绝</div>
+      <div class="pass" @click="passBtn">审核通过</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState ,mapActions } from "vuex";
+export default {
+  data() {
+    return {
+      id: "",
+      data: {},
+      content: '',
+      picList: [],
+      videoList: [],
+      fileList: [],
+      webpage: [],
+      miniapp: [],
+      pictres: [],
+      options: '',
+      approver: [],  //审批人
+      type: '',
+      resSum: 0,
+      cirSum: 0,
+    } 
+  },
+  onLoad(o) {
+    this.id = o.id
+    this.type = o.type
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    getDetail() {
+      let url = ''
+      if(this.type == 'ResidentsGroup') {
+        url = `/app/appmasssendingtask/queryDetailById?id=${this.id}`
+      } else {
+        url = `/app/whchatmomentstask/queryDetailById?id=${this.id}`
+      }
+      this.$http.post(url).then(res=> {
+        if (res?.data) {
+          this.data = res.data
+          this.content = res.data.contents.filter(v=> v.msgType == 0)?.[0].content
+          this.picList = res.data.contents.filter(v=> v.msgType == 1)
+          this.videoList = res.data.contents.filter(v=> v.msgType == 2)
+          this.fileList = res.data.contents.filter(v=> v.msgType == 3)
+          this.webpage = res.data.contents.filter(v=> v.msgType == 4)
+          this.miniapp = res.data.contents.filter(v=> v.msgType == 5)
+          this.approver = res.data.examines
+          this.resSum = res.data.groupList?.reduce((pre, cur) => pre + cur.customerCount, 0)
+          this.cirSum = res.data.executorList?.reduce((pre, cur) => pre + cur.customerCount, 0)
+          // if(res.data.status==1) {  // 拒绝
+          //   this.approver = res.data.examines.filter(e=> e.examineStatus == 2)
+          // } else {  // 通过
+          //   this.approver = res.data.examines
+          // }
+        }
+      })
+    },
+    previewImages(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.imgPicUrl),
+        current: img
+      })
+    },
+    ...mapActions(['previewFile']),
+    prevFile(file) {
+      this.$loading()
+      this.previewFile({ ...file }).then(()=>{
+        this.$hideLoading()
+      })
+    },
+    // 拒绝
+    refuseBtn() {
+      this.pass = 0
+      this.$confirm('确认审核拒绝该任务？').then(() => {
+        this.examine()
+      })
+    },
+    // 通过
+    passBtn() {
+      this.pass = 1
+      this.$confirm('确认审核通过该任务？').then(() => {
+        this.examine()
+      })
+    },
+    examine() {
+      let url = ''
+      if(this.type == 'ResidentsGroup') {
+        url = `/app/appmasssendingtask/examine`
+      } else {
+        url = `/app/whchatmomentstask/examine`
+      }
+      this.$http.post(url,null,{
+        params: {
+          pass: this.pass,
+          id: this.id,
+          options: this.options
+        }
+      }).then(res => {
+        if(res?.code == 0) {
+          if(this.pass == 0) {
+            this.$u.toast('任务已拒绝')
+          } else if(this.pass == 1) {
+            this.$u.toast('任务审核通过')
+          }
+          this.getDetail()
+        }
+      }).catch(()=> {
+      })
+    },
+  },
+  onShow() {
+    document.title = "群发审批"
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  padding: 32px 32px 140px 32px;
+  box-sizing: border-box;
+  .task {
+    position: relative;
+    margin-bottom: 24px;
+    background: #FFF;
+    border-radius: 8px;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    .task_title {
+      padding: 26px 32px;
+      box-sizing: border-box;
+      border-bottom: 2px solid #DDDDDD;
+    }
+    .task_content {
+      padding: 0 32px 26px 32px;
+      box-sizing: border-box;
+      .item {
+        display: flex;
+        padding-top: 26px;
+        box-sizing: border-box;
+        span:first-child {
+          width: 160px;
+          color: #999999;
+        }
+        span:last-child {
+          width: calc(100% - 160px);
+        }
+      }
+    }
+    .task_results {
+      position: absolute;
+      right: 30px;
+      top: 30px;
+      img {
+        width: 160px;
+        height: 130px;
+      }
+    }
+  }
+
+  .info {
+    background: #FFF;
+    border-radius: 8px;
+    padding: 26px 32px;
+    box-sizing: border-box;
+    .scope {
+      display: flex;
+      margin-bottom: 16px;
+      & > span {
+        width: 160px;
+        color: #999;
+      }
+      & > div {
+        width: calc(100% - 160px);
+      }
+    }
+    .content {
+      p {
+        color: #999;
+      }
+      .textarea,
+      .pictures,
+      .video,
+      .file,
+      .webpage,
+      .miniapp {
+        background: #F9F9F9;
+        border-radius: 4px;
+        padding: 20px;
+        box-sizing: border-box;
+        margin-top: 26px;
+      }
+      .pictures {
+        margin-top: 16px;
+        image {
+          width: 190px;
+          height: 190px;
+          margin-right: 4px;
+          margin-bottom: 4px;
+        }
+        image:nth-child(3n) {
+          margin-right: 0;
+        }
+      }
+      .video {
+        video {
+          height: 300px;
+        }
+      }
+      .file {
+        .file_item {
+          display: flex;
+          align-items: center;
+          img {
+            width: 96px;
+            height: 96px;
+          }
+        }
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    display: flex;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    font-size: 32px;
+    z-index: 9;
+    .refuse {
+      width: 40%;
+      height: 100%;
+      background: #FFF;
+      color: #FF4466;
+      text-align: center;
+    }
+    .pass {
+      width: 60%;
+      height: 100%;
+      background: #3975C6;
+      color: #FFF;
+      text-align: center;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/fodderList.vue b/src/project/biaopin/AppCooperationPropaganda/fodderList.vue
new file mode 100644
index 00000000..6a278a70
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/fodderList.vue
@@ -0,0 +1,273 @@
+<template>
+  <div class="fodderList">
+    <div class="search-box">
+      <u-search placeholder="素材名称" v-model="title" :clearabled="false" @search="getList()" :show-action="false"></u-search>
+    </div>
+    <div class="card" v-for="(item,index) in list" :key="index">
+      <div class="left">
+        <!-- 话术 -->
+        <div v-if="type == 0">
+          <div class="title">{{ item.title }}</div>
+          <div class="info">{{ item.content }}</div>
+        </div>
+        <!-- 图片 -->
+        <div class="files" v-if="type == 1">
+          <div class="pics">
+            <img :src="item.imgPicUrl" alt="">
+          </div>
+          <div class="pic-r">
+            <div class="title">{{ item.title }}</div>
+            <div class="mar-top info">{{ item.fileSizeStr }}</div>
+          </div>
+        </div>
+        <!-- 小程序 -->
+        <div class="files" v-if="type == 2">
+          <div class="pic">
+            <img :src="item.pictureUrl" alt="">
+          </div>
+          <div class="files-r align">
+            <div class="title">{{ item.title }}</div>
+            <!-- <div class="mar-top info">www.baidu.com</div> -->
+          </div>
+        </div>
+        <!-- 文件 -->
+        <div class="files" v-if="type == 3">
+          <div class="pic">
+            <img src="https://cdn.cunwuyun.cn/dvcp/h5/file.png" alt="">
+          </div>
+          <div class="files-r">
+            <div class="title">{{ item.title }}</div>
+            <div class="mar-top info">{{ item.fileSizeStr }}</div>
+          </div>
+        </div>
+        <!-- 视频 -->
+        <div class="files" v-if="type == 4">
+          <div class="pic">
+            <img :src="item.pictureUrl" alt="">
+          </div>
+          <div class="files-r">
+            <div class="title">{{ item.title }}</div>
+            <div class="mar-top info">{{ item.fileSizeStr }}</div>
+          </div>
+        </div>
+        <!-- 网页 -->
+        <div class="files" v-if="type == 5">
+          <div class="pic">
+            <img :src="item.pictureUrl" alt="">
+          </div>
+          <div class="files-r">
+            <div class="title">{{ item.title }}</div>
+            <div class="mar-top info">{{ item.linkUrl }}</div>
+          </div>
+        </div>
+      </div>
+      <div class="right" @click="itemCheck(item)">
+        <img src="./images/xzh.png" v-if="item.isChecked" alt="">
+        <img src="./images/xz.png" v-else alt="">
+        
+      </div>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "fodderList",
+  data() {
+    return {
+      mstType: null,
+      current: 1,
+      title: '',
+      type: '',
+      list: [],
+      checkedList: [],
+      typeArr: ['话术','图片','小程序','文件','视频','网页'],
+      arr: []
+    }
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appmaterialinfo/listByMST`,null,{
+        params: {
+          mstType: this.mstType,
+          current: this.current,
+          title: this.title,
+          type: this.type,
+          size: 10,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.arr = this.current==1? res.data.records : [...this.arr, ...res.data.records]
+          this.list = this.arr.map(e => {
+            return {
+              ...e,
+              isChecked: this.checkedList?.find(i => i.id == e.id),
+            }
+          })
+        }
+      })
+    },
+    itemCheck(e) {
+      e.isChecked =  !!!e.isChecked
+      if (e.isChecked == true) {
+        this.checkedList.push(e)
+      } else {
+        let index = this.checkedList.findIndex(item=> item.id==e.id)
+        index>=0 && this.checkedList.splice(index,1)
+      }
+      uni.setStorageSync('checkedList', this.checkedList)
+    },
+    submit() {
+      if (!this.checkedList.length) {
+        return this.$u.toast(`请选择${this.typeArr[this.mstType]}`)
+      }
+      uni.$emit("fodder", [this.checkedList])
+      uni.setStorageSync('checkedList', this.checkedList)
+      uni.navigateBack()
+    }
+  },
+  onLoad(o) {
+    if(o.type == 'CircleOfFriends') {
+      this.mstType = 1
+    } else if(o.type == 'Residents') {
+      this.mstType = 2
+    } else if (o.type == 'ResidentsGroup') {
+      this.mstType = 0
+    }
+    this.type = o.msgType
+    this.checkedList = uni.getStorageSync('checkedList') || []
+    this.getList()
+  },
+  onReachBottom() {
+    this.current++,
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.fodderList {
+  padding: 120px 0;
+  box-sizing: border-box;
+  height: 100%; 
+
+  .search-box {
+    width: 100%;
+    height: 104px;
+    background: #FFF;
+    padding: 20px 32px;
+    box-sizing: border-box;
+    position: fixed;
+    top: 0;
+    left: 0;
+  }
+  .card {
+    background: #fff;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    background: #fff;
+
+    .left {
+      width: calc(100% - 50px);
+      height: auto;
+      background: #f2f2f2;
+      border-radius: 12px;
+      padding: 16px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 32px;
+        font-weight: 600;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      .info {
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        line-clamp: 2;
+        -webkit-box-orient: vertical;
+        color: #999;
+      }
+
+      .mar-top {
+        margin-top: auto;
+      }
+      .files {
+        display: flex;
+
+        .pic {
+          width: 100px;
+          height: 100px;
+          margin-right: 20px;
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .pics {
+          width: 140px;
+          height: 140px;
+          margin-right: 20px;
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .pic-r {
+          width: calc(100% - 160px);
+        }
+
+        .files-r {
+          width: calc(100% - 120px);
+        }
+        .align {
+          align-self: center;
+        }
+      }
+    }
+    .right {
+      text-align: right;
+      width: 50px;
+      img {
+        width: 40px;
+        height: 40px;
+      }
+    }
+  }
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/images/files.png b/src/project/biaopin/AppCooperationPropaganda/images/files.png
new file mode 100644
index 0000000000000000000000000000000000000000..10d53502535dad10eb33a37845dd2491f07992fe
GIT binary patch
literal 955
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;}uz(rC1}R)=9PbBIuIlOH7*fIb
zcFx9Z5l4~s`!P)~m5z8>9PtZY+IekSQ^I@ugw$O1uBBT;|1n&Sj_lkTH`$L{@l@kf
z#>=i}`mCRGCR)Bv%m4m1fA4RxpgV6*SAX7@pWb$+)%bA}1B(I!BZmV6lRyI|GvO*H
z%Xzl`V}(CHPv5&Cp**Q4+%`M3xLqLW=e_Tro-cN-mfiL?p<eyZieoF|cXN7tIDhW#
ziKIJ$=9Vkv4|#HYdvR@R!Hw>ZKJ11cq|Q7!`JVgFl@!Zq5l6xoKmKuK_4CwEyEr{g
zpEF|q^l$E=N1yrQ9~r;5+WGS?OUd46&&}pMI<?XEZ8wWKV`+m%(r=~2T-GnCYHPMO
z*m*=$GiGse%*b<CWy{DI%(!Z1LjyOHh>$>l;DxO$EN28hggc2J7vuQR-tgtylN*n+
zYYfzveAH#pagbQNS7z>!)7*!q?dxrDeQ`<i)k@nKk!^2kS)NSbF0)t9nJK~YByjgk
z@i2QX#>zA6p0r-=cXD9c{AtFaw~M1$QaC>FI5w!??YYBoqTz{T6NCRQ$(@1|7*86r
zFwQG6E>c!to|MkPWb-oZiJJqP%J~Vt=bwBonlGM~ZzpOd<!)^|Tm0s|y>E3l|4rPm
z+njCN#mVmeY6=JIe_Q@#uPhH2`nx<W@q5|tL<h63FHctMrM}HNZ^U@Dan0-OnGIXS
zAOf3g6>?i%Cg)#Oi(y?@_4b>@K6|~A?mf(BZ(nEETa)5FfqC(NBUPp&w}269$XHmJ
z#=vxh<;c^Sj7f}}?2p{C;C=h}Wm@cfBgWi0ZQnkYY+lE3Q|QXG&Xn0ZUoquK=?h;d
zd9eD^Z=m!%k8LwoXK&nOyP)^-h3?q}*B{(k^}OiNbhhJ}8S|8G3QaNJ0}Pyo8-`2*
z3Tg^^=Xo3&W;E=uF=k*)VtVxHOhc$>KwbG~^TPbKQ@_7Cn$PA^eO-#NROxu!9hR6|
zTaJg-C2pG)`}kKX|KvC+^;vTd_#U`t(6ikvM?b>i%bY`-Z)g3>lPZ>~ex>;Jl8v$?
io>U4<yAk0``x#e1zF(wvaqUe|#_@FZb6Mw<&;$UGIf-rn

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/gird--select-icon.png b/src/project/biaopin/AppCooperationPropaganda/images/gird--select-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..205144d26b442ba78547c82b8b09585c5b7ac0d7
GIT binary patch
literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq002w?002q|1^@s65zewU00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91OrQe*1ONa40RR91N&o-=0GatRKmY&)W=TXrRCodHoXt<vKor2=bUzSW
zV+4%E4~#KNq6s9PH0nVQ8WR%}@7|1wR}cOX9=sU!;?;v5Jm|s5LGcLDAS6VM9|R<T
ze2Bn8mTtG>n}yQtEYt3k-Lld*$)?@cH`AHlyuRt1PKJS$W*7NMn^`x3^Gh69I{?o}
zD%<=o%QE1jz*x7zlTTW9v7yoiGv^QIJUzW!xX(Dhjpv3VkMof+W^=|K?`=xl!E;lv
zC;}6(W|pkic)S>AK&rMQthcQ@lUD?^q9qB-B3LS1=#<cq1S6rr)_m3=3h6OaGeeig
zZ1icJhH&r%%ZJq3CBaCrGQ?;YtWFw50?5i(eRUupl@JiD&~L@<J*yHlDjl97N3UX|
zkP|Qk7?qfSsmLhg1WW-&B_?1hG75Q8A=eTYY=CDUO!zr%1J}wKPC0=Qa7SALuAfS+
z2E*Zs36-lV7B=$7hVN50*hq^<@UyUkhQ<r<djU@(PE`SB6(X+n+U@ez`s`F>6{rfZ
z$ZA^$HzHt~oj||{m?i;D^{Tv91l{x8u_UA=TOOb1@MY2+EjkY*pf%%l;!7rn-eFfK
z=sr<gj|AA6BS~mXdz;fgY9TOJc4B`5j_>nQoyppD2h3YTxBhgdAV9zrU{qoPrXr(|
z6EFoBl{gZo|KME?KT~<DP>=?{7yTwAr0x^3X}zULfaUVR%{HxI9a+OHa99b5Cq+M{
ztJuma79}^Q_Wz&u7MD8&-ss>S1~*POKq?Wa8mJ&W1cCbhrNY=8hf$n@sz!<hFab(T
za#kZn@<@s|_=Ms0`hS->Ow7BjIMmD_)8Oqt)8g<0XK_{OaEk#=X>YlX?i`jsSyH|u
z-|R6GVAs0R8-_-&23;6ukES*ZjUM%={nUkyB(yhsAv-`m{VKrA0k?cdzS-l(ciU{K
z+c-Y~)9hRVM!+-)XsSoz^q+skutyrq7FN79?fGg!->_FE-sI~oMFMPOHh8p}+=6e6
zVLF3+m?kv>M!+-)XsSoz!*(|^kRl_TmH}ACuR>1BV2G2FY9rQAEaqGtM|UfaQWa}c
zm0RZ<6rqtj33jzhKQyXMZT(9nALh@e>?#2(L*g$WVE%l{t`e{^B>sX(oc{Z7c}PpK
zk^E*qFjj!EId4R;q@D`%Z&eMiMgpv_f(0d?C#3IgHEi@|il#?WlO6#hV44Ip)ycv%
zfw8H@l7LPl^Sw8@b!{65H**Vowpaon$EZ%F#COPiNuAR8)!QgBkGq$5II3F5(4%A}
z>m{^m5<*#LJw~xZO8|zrT`@}u^RPw4D_>{}Yug=9)}eh^yzI(tZ9L7yZNK&z0n<cA
zzzCQo0ZnzXFaoAYKvNwpjAb?R#8{nWF%-k?>nK%3K(I2zUVjy7lM+6RteZAmtI!bE
zH(V3DNQ#XSE6f*LHNi-*DlT)w-PdT-NFP%u+cZ+_9w~N_#2L1S!t{Ld#_Cd$1u}7V
m*c6SI7E%Jx#<%_(-~I#a0*RiV93kWY0000<MNUMnLSTY)zah8)

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/local-icon.png b/src/project/biaopin/AppCooperationPropaganda/images/local-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e23aff6ab5f4ec6d80c86118da1c7f1f48fc80b
GIT binary patch
literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF%Sl8*RA>e5SUqS{Q53%CCAKzc
z6$h!sZXJt=t>Vw5;-JMYf=)V!iiiz}b5#&s9JG*bRa`oVf-a>Bia1EI^iL5ti%Zc)
z6bH%ck2S}0lDzVopLfnnZt9W?;oaQx_kHJ{`}3YL^;XY7Jp=U&{Lc)4t>DK-u`xB9
zK4=UaHwJgovki^e#{MbDJdJ&$-UoV)w06YbJnw-e8?mb<uy+Vs|17%wh~_MTi|ar^
z8o)f<urYRP`~swOHl?*HCUEjGHq55n>jeCY9(W;$ERlhZ*4WJ_r(n5Is`+0L0nYmJ
zg8P(!AJ7DmbzrQaDR!cg*$7RbJGrzYgDay1zFh_uMg!&?i1th+8b5}z3ZtCQ{G@&G
z9txPFnb;j>CLGUHdUDO@%f@o%{gJVqHiTy!%Rd^_R}<g`Yp>?ZLqf#;xme|O{1Vj~
z$d}G65m0WE{t)5&0N_R(?3lRROy@^%Q_TSH^Xmnk;nFO`{$}7>F!Y>MB)}(Z?vT>B
zBOL&w3=TPtvu|@G-oiib^BBvNUYNxhjxFg&C57Dez^F<G4A6DKIX#_ddR^dmoc@n@
zB^MqUlNm;XZ3Xh8zr?g9^(B3X1TTt&z5#ItD5Z3_Q8dmjlmx$OoFzs&>Y2zu@2YW`
zj)DMR%;ZM9!Tl1MFEV5u)-4j07@)P#Sz>t2kb(e+)6E{K#viQl9Pmf0OC>3uIU)h?
zN*sVED{6tJPm+!&SL=e=?%9-kiUi6TuFp7%?+hXVs#ozaVKTpQL9ADgv|1P8hi6mn
zDH5O!nYKo`(SkcCYvnZ5x?sLbJ{1J`HBfG}R?gEte^}CF9oCifa&mkp=_v@{h~y+I
zM+AeJ;UE%O8R^g|OO+`%$G}TTOLWA?`TS@1r}{3$R|(qZd8_nx8?JdSn{4Kl;K|;F
zhS=7ri{J*45DBnxS2CR>0DVD@Y|H4S|K4<>`KshsQ9{P>*8@7L(vmY<a?1W<#4&d?
z{!|3`6^}A9pmAtL2h3f~y8y>h5nx6B^g**Q#{F70x<0(!)ET>>jiFitp0k?2)Mxj7
z*fo=gfAwNYPxTD2BQB+A1bgXQ;V;Q?XgT?eMB!){@Eju)0XCr8eD44pu}Xr#v(L#(
z@fnU0riCgYzvJ$~bXNxPl|i$`KOVZD2S3#ppAKzH1{D+FU{#Z-5<Fw5ia=E)EP%H{
zpdu2Mz*{2_iiAb*Rtcy`SO#yMKp=@4fUgOGk|b&bzGej2@t(n@&Xvr{ZMp<v1fu;D
neU0j`7HnT{^$gTApv%BNee`t*HU#Bi00000NkvXXu0mjftbXz<

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/pass.png b/src/project/biaopin/AppCooperationPropaganda/images/pass.png
new file mode 100644
index 0000000000000000000000000000000000000000..36f698b2c2dab85450c8de337016f26818760163
GIT binary patch
literal 15287
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
JPDHLkV1j|ZAr$}s

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/refuse.png b/src/project/biaopin/AppCooperationPropaganda/images/refuse.png
new file mode 100644
index 0000000000000000000000000000000000000000..af15b9e598a526274565b9573afd9e645a0cc259
GIT binary patch
literal 15564
zcmV;-JTt?IP)<h;3K|Lk000e1NJLTq005u>004pr1^@s6!K=d%00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91pr8W)1ONa40RR91f&c&j037XQ?EnBgHc3Q5RCodHeR*_LRkrs&_f};D
z0xDz>1Vj;M1!Z&s0|_X8+TGag>-H^25>R`vd-YrITkBg*f8SsIRy%Z~3~^{%d+>=*
zZDmSG0D*)-8B|md8HEgJOTv(;s_yxId*7-`rKlt|+{z$*)=KKut$WWo_uPHX*~4$|
zt>|CntP#+6%o{{4Du>)Ui#+%v$|4hg+Ukd67g<IM8RV8@vIyTjIQEjVJfz4&+B`*C
zpTxNaa^cf*pCGrdPOVsc0_Xl!LPkJ^9G{bidgc=YNck=%uQe3JlS`J)B~qzL8jNNT
zZY_wj7Hu7&)T{&Q-Tyk3q_+A*wdWiG>NyKi=*00+WLTrfvMwQI3_j~kDeDv&MlF7?
zC*^9uwe{q4)l-_;NWRuqIxn-8n)`X^jo)}^*)oGR*1D+vh>My}y2xv!Qll{d3*rE>
z%>Jl53oGMbvaq5m$~dbnZGBCK+K&}>KMfnZPn8t$YI@F;bAkZ%8*iBO;)YAf=ed?l
zbvbF-KJAyRtyVIP10asC$S|uZb8xj<w%~L!C_vAd-;Yk4+2r*OB~y>Yrac_(rUcv4
z)Jlfl17iGyCggsh7A)`vfBTLee5VOe&zhe@UOf>^+Et`gdhi_@`YWt#`-pt|>7i*~
zseAAB1%K<t1DO~l<rk96xR`v_l|)8fTl2aFtiUJaHa4r3i)!1>ckhwTpL;bXW{N6X
zygeB$f9D8LFIZsE)|xROyvcZ>BZGsctU3q>A7Q=uxVH)eBK&v>lSSi?h6ej?&>?)^
zOpi?ayt^igp8j|q8Qwb}V~rrfWEf~Zt(Glvd}sL15TL9kFRdL%K79)*HOPK>7&xVN
zP$q3tZ!b9>e4%~dK;Kh5gwE&*AiV3_gdz+4sIi_Np0+(%gsAWTRVLM)nGT}60d0rU
z$A@aolDC~6y3hukuDe_6(^@N<Isa<%`7mh4d3K}Lx7cDg(`93}tA#(sR@Qfm2u&wz
zuLBz~8R{NeVAA>oc*wOhY3VMtKtT_bc##SGa``0kscAy+T3Zl~wqi^_BFi@y$BNQi
zi`2W%RVUtBTMd1h0QK#UjV9Au0RApV9!Xi>V8GVU<ebmIz&r9{+J>rUkA$_@QirYC
zH!Vnr{Jbvr3bpe2FB0jUE}VB6c+fjQc;`z!Cha44=5qDkQy5RIh0}{>;kPNI^kG%D
zv?P(X!td>q1gP)&b$@DVxD$hNmHj~2n%rtFjbF0EsTCo7pnA*qAR+p!{2;+->r)y;
zE7Y=*hFJOu9q3^4d1ry=94+_B1g2H0tYlAUJ^FzKX>_daNswYDY1iwj{JBp;e^2DN
zPZ6MOw}ta=1Y=x)hfV{J(n>C?f+pr|ITutGp)VSQ=%UIxUX`X|9Ne(dv_fJorwNNU
zcQpz1oL{8Vi8H*_P6Ur^h>*cs`a}7fJK`;M;iET_&%7I~Km&~&_l#5e%05GYA|ZOL
zIoNK8%Zo5*52dHQr`~zCKJ>+$YsY%d+$?G^W`YQ>_CNa(N>Oh_lJsTu++2GD`DnT*
z#TD+-w4DYTYr2wf<=#!T^KoA;{wh@2lC@5Zb)O(WUGUhIV1&Pi2Tp@k0j4WsIR;?2
z69e#FsYCcU%laNBXg@qtGq%ciLbpmi<MEM1o;%z4Wqp{md%0Q@y-*=_XzwE+Ko4bQ
zJ)@TWE~YI%(pdLu0+em0ss^(gTZI(;IStJCAGPe6rbrKSuAj42D5vkns&<7vTzWgX
zQ#O*P1uLEbMK_9K^P(zKrAt4O?=k*^Kysh(-b#NAf#knqy#1`pdo2M9NWj~2KUO=o
z4)~yUSfy4k-F(&){OiP7BcNv$-9WAC4y;sdW<FlEh&IrO>o+FCzX>bUYW*BU=pwgS
z0tx)^SsjSs1Q^iXS8Nkn>pYwIpwmltE%_JmMfaXWP}9l>n{sRL4oiPbS=KYmw<SV+
zT%YikhOtrV_ImG-_JR$?e&CAzmgL@{XF<2u>bVbF24n6HQA*xl)w>HCliO-^wd=V{
z-E?rr!(a){hxBRUE)(0Gft6;xTC=nwQZ4$4Kc>>DZ<TswL35<vojj*!%pXPtMd0%c
znDMZ=DSZrGd{0#@`pU_6Xh8M`s;?P`ak!8Q=8r|)aodS|6#?oQ^TtuD_ihlMffxG`
zP0D$zyVNVfKOH}H31Cwf<K69xDC9Kl!<ME7<M%Xq!TeUar&>pRzhcGM^VzR)eX5=@
z_c(a3!(^I=DRanYK-{#gP!aEr{-m%gzSbE~#lUQbO^pRL(<r5tOLi%xB6lwO>d(58
z`>qR$Rzn?jFVr$KFv)huYjNr|JfQF`9(9jAt)bSb(#7RxJ$VvN=$XaWgTrJY=R%N@
zJswIQ0E7Kfq~=60+J8Eg%zi!^0YKGne&g%tCCm22OuI71pe|l9?V|Kf)c<DSYrLP*
zmo2q7p%=HJ=a?KCsBGFqm!)h_3l}Ec1gWPN7oqPL;mJ0r)k{j_d5&H|fU@$DzDEea
zv><GhY>MY$;<*P>-G5-o0Du%P&r}CNjQeP0&Q4Y0+_o=-vhC{&K`6svdB}yrc$Zqe
zcyB!Y4csHDDeYwq!65q_Gz3P*N>%#Iw}ESt{i$a@GL*b7@ah<~e&!$4+t2?q);4>b
z0CmCKvEW&tzrx%#)M~7JHiH}Mlf-$wzUyb%)Z*z+!>>J@D1#nn7lOCR3)SW@>YuTz
zBUO_KXdW-jkbbBc!_3^~atH?pf)#b+fi5WiKDJ`;f$DR$X7OKQZMsJZ&{m%M?gs%T
zjrhdu)X;ndWoPbDul@c^tOL}Y*JDe20PS6hKlqLqn`rcyssL}L=Pt;g12xkj-QFnU
zrKu72?+Ti*Xj@mNw`4wp*yS7RpA@0d<$hVMTDU)!_Iiu}vGV1T&zLK`i)pS^tDlc3
zMaJ?lq1WmK+Mq4P6R_>w4(2}{f17~nT@`vwZ#x!nfY$?5iVz{V0wyy3Hf*p1Az<8&
z^RR#WVNzM?6&<aT-Thp8`n+4w*%|mdPE(dFjAcUf2m#tkX4dn8_ky&m%9p(1<e&+0
zYxM*0M>%%A)<Me5c(bqAjYXY8)^v=`sIYO_C-AFP3%?FK-=klJ$E~dX8Q6mJ$fe#>
zs}^sGwnN>nh!$O%SU5m@tmnHa=dEZv8})Ts0b;~nXaH_%<1cDW$%}o3_~aQ=y)ZRG
znH($(u(e(TBKZ|;alMN8xQn7Hb18dw0ZdHK2D=bt>3%)n;T-@svUyGalTvd3niM^s
zrPn~B&7t9AA<gz3H%A+HS2K;8Xc8t5G>q)AXRf7(^Q$_7Nk#ddlYW_6we&MRqv!x8
z{>9W%!|cL)(KOnvTd<x{%+5A2W<zWznAc)JVnp*Wef1h_VFp#zU5~LTz{Jc1Ukv53
z-bGottCQs-nvAg$jY4zN6Hw-B>aP|?<A>921ZW$v_2YQ(v{?CsWDHhssZ$pgkFeqJ
zL6=NKOrYgz`4X7X`d)!Rau+7g1W4;&0&(-FuAZP<wqTjzl{G&Ew*WjJeHIIo+R+0D
z<GZ=;Hf-lLs`U9!JG!p7p7*0l3b7Ylg=fIf048OarBG0R+*|t`Rli1Nm(#)8Yq1Jm
zqVwlpuF4mE-r0TKBZO?N8;=nlhM94aveFY4I&9*r`8ULInTp+fa%T_N+kRvFur7S;
zcCsN&AU?LhfX^E-?%6(1d>Cx8Aeq`Wqblz#c~_mhgru*4ew7P!MA+?J^j@O6E0Ll%
z@AwJNFmOtZFuF&@>~=B+-S!g{@7DlDG81DlK*odgZputw)u$x%Xh!Ry+qY3k`2;AZ
z2UArIFAy6#x-IEEAOw#egHV9b)iBj8joDNa-to5jtTU9J{*rq44|U<!^tSK%&f*KH
zMb8G&VHe<HRg)WV_yob6c3r*mzb=>$WRdkC-aDcy<RYp<<aj$t-Gar`W)mMep`BT&
zv^7xpC0FVTy`A{jOeMC`7Md@_r}Sx9WZt4Fd5gcx#K%)Yl`i@ctnD5grP7HS?0}I=
z(pEqbJgTZ6haxx|TklG>YDs0}F2r_LJos@-Z`O+m-&6H9A{lt5ij9=jPKHqh+wQu6
zZ8x^3?weQZdmcNVPWyfa?#lpJY;h#XK6yOgw&T|b@v(F_A#W?$dh&!vvNsbRKO9Sb
zR9Vf+_VYk|_|SVP!?i-7N^v3P5+1T1tAL*wTX7Y(;+v^evyHnXyfaDJf@PKR`tqeQ
z_8~n7;@q(k7X0Z$U=MyG#K(arNxuSJ*sJm2<icN6_;=Z1!cH<&OBWVR3On7iUvr17
z2hV#37Lws2goX7cDFjG=S_jAw10{iun3T6Gtj+J#SGIe?1T~u)o55}fc%T^`e9LKW
z{z3>{h(YLl(FODJX;bZgibep{v!+3KO|SJhv;%iQ)zi=UR^zKtd|}+GOz!sS!a$z`
zwK-0JGBZ8aP11njD#z*<caR{Kq~N49JkZ(R^vSEdtTrt*Phzr7#8#_dzuf{f^;7J@
zmsD24@{Isrl|f(a9w@}<^E@e_P>Tbk<CnD4Fy-~4GCp^QNd6qI_{hh%g!asF0+is8
z5}ywUj!A<%)q;n1B>Wh&dMJ$X50J<6gYe&a`n#wYO3I%=C^LAVG1gEYptSUb@bh@j
zNhp7Z&uJQ7`OV{*FUoic*QQ>@B(N<)v&RQL@C4w{VMX2ZgDgU(u|it&d2i8o|9oJe
zW#@$u3t_ytn5rt?)z6loYwp6!g<0O{H6b``sm_`SruuRbF!;s0S;AlXSztiB<x?}5
z1BHEm4QnM$EZNQ=P_P2nd2|b}zW!J`Gw4{&2yDp+qv4zvUOdkTr=>%B#-pDgO6}Fu
zc%~3_ye^LrPh}n5BMMgu=?X~sr72i;<18FNhkZ^t&&Hsfb#d0>*lq0FtMiKsM5RFb
zavLT^Yv`ujXOlsEy71>C07{+Q;p*kHYywQ}_kvpe!Ut^#WZSt4D|8{G&R<{*uYtm9
z05!mKt~Zp7%+;76UM9i-Yvt?~>_J#pDH@SU<8uqNJ^LBnjiRu+^x(|pzKF-(-cRB4
zK+L<C&}i+TjDb&MMz2qrbnk1L1R}qKzNtN5#v%Nl0UsJJ<NDVJeiF@tMKJLhnWFYk
zbOI~n8)B}s=w|WV2wdDlpJH+}T^po%kLOO_=^WdFWdL5RutS8o&G=Wp-{Msp>L{eS
zdiZek*!C+kbOxdf2zXZBcXz_1j>}8(NtULwVOd&dV<kBgm;i#ae4)I+R(iwq<uc0X
z!Koj}Ry=cFIs&%Orsh)&5`CwKXs@l={)0DCeeF0I*KIXp9V0+0SwGr#{;}%R$|bdJ
zEyi}_-%ehM?Jno8)^q*?@%HKq$>YQJ#Tx_=JO;sCG`?t3arI28I;>o<pTO)GQe={E
z+~}gcp7U_J8YvVm0@1-Y7|!9OAef-9q%zUpy+J7)gh($`01#l^0A1zgo;F|djs|_;
zY6O%2A=04DaBd4$zU%C<QoBONtj`>>ehMqeG-_z@^G+OPK(B`({h4khJ{~dCZ38T{
zAq2=SnGi7klU}U2hxS`JqH58U4dSyS6L1)l%=Bl-mGUOvP0d!&_9}$vqSX-Q6g9Up
z^WWpe4?8=;?1Cc%$QU;~)fjA^nzHmqJ^q9-c0e@r2e*Up;KIq_ZWS^Wr5Mjbt%As*
z$&ns;i<jsIk^1`J&ELvti~7rF9<@TCfN~jzeXqy%^ker-DTwt4uR`Xp#3z?ce}=k7
zoZRudD5ZV=7|@6XEspK>jXn0?wuo4q1QIX-C(5b1kr*7*rH{oLDBFqV<E=xacD7Oa
zG?d*u7Xgz}DJxaka|h$Cv#a|=m2=8dfGz$?5PKsCWM4Ru3-30)s0Ce;1%i1!gb?w9
zu-u5_{2~3R;uKM83wc@}fS_?BnEA>8KL|oy4RhdV_!7^8G`x>a)FN*RM;b$RDATnH
zD4e+2qpqH<tKVh3Jv0mBJt8pP&Jdub*_$6UXnY}`z5Ji#Y^#UgZ7XqzF-REd3|>$<
z%!VK0Mfz73XCFdb6<cbj(J3zjH4)McAvFwF$5Ou1P3W7+y%5E1W3z_RImOT0iQW+`
z!&VUSB-&Cv5tnU}9#78s24ILoc&3q%q%pDBHP!u=Ds78wuM6ki1Wn=?8kqUlL;=Fm
zW*7e?@>uN|puqKb^w%D5)4PTyUbx*E0wfCrh{<XiaoIj4e8$P9S%9X0m`t1;Rtgtw
zuA4;lzNvUYsTd6C(_lWkFlVjUER%p%3AWi>dmG*p`^21tuvSi!^LBPh?8<0j*G#N@
zm(uB`AL1T&U_}hR?-4m`>0r%RM3|Tg0^dQc$Mb+d2IAV_Z5lRdYhA<)0@~%qYCn=r
zH(!hEwgl^Q_&}bWCr9n6X~FSUYBS|!uaohHRxn`#l-YTv`2u<1@y~rlE1!@3F&bI{
zUf=*XRx@rs9D4;_-+=(zW2mwQFey&Pf=S4{QcAy-fn+RQ*AUwkqR-?EPF2-Nqyu3>
zGGS5$TrD@rmTQ~mJFb*@JkAK9Xf&)H-@w+(c3#<%12?hR55mcMoG+l}nkVpF&;znV
zyRJkm?RB!c;U%9{26%T+y^#+o8<Ku<2oQYUWmHv*009QmhJU;@#=GPj`R@OhFac6)
z>j<d}Q4ZQP@}W&cbL<@>L_x-(Xs(Xs8f;TTu#zC@p7#=IgOjoNkX>j^V%dc{>w~yj
z7R+Py2q(eDrlUTff!XCCywjcC7x+!$+Ef)Ylg_bVKBvpBT1I<6or`14oUk%Ew+cj#
zoN^#?rM{pnq^?-jd5AXV)3LJt6GT0XRXahIO<2|Oe1#2vFlofM@%h;@1F$r&du2!C
z?EnFKF9c76z8Xj4>M%!rI#kViEFX<Fz9fgXK|3l|)9v7!z;j6lo3Y-nr3dr3I62^<
z&ulB>*Zv3_`xSCtz^KM*_4Z<0u^f6aj%AfBEWQS4>GV)nRi4O@R{sP&*=1C=cmoH(
z1l$UdSXtL+7m;#(>LzUCuOnJ%8OZ!zq_XgIMSOg>AF0eLo@S@U!e*mdZiQfk<T?KF
zRz?L9D{k$qjdn}A{b(`%H~kLPraBhmo%ZENkB=4|l}QKUHQ$A{%c}>%;ZC3vjlaZ8
znS`wtmKD8?a{4{ZZULPQMrb|J9D~PcH-1vL5BftX)-D^28aYcR+k2^?cpfZ1_hPju
z6z{>1Mma|?;_ba3jK0d&UuD-V(xlh*AZ)6a%8OsU<YWAH3=6@PdN!2P9Te`b#A7_|
zVf`VS6*qTqY1F6fI*Z5Ci6%h8fPCih));SwrIjt}GNeem0gSp;|AjJxeO8`)JwH7@
z0`z*DArV5tqYq<kKm2;U#8FgL#C|AuVHVmjDVOUx5W+v4jtwXw$tr7}2nSeFn!(&1
z$VFWxR+X?$>e;`%0NdYB$k+TRRx|)Ep!#9mqo*}L?9%pMm6eLsyh$Q|wQ3L_$VVBk
zFrQ}=soQpXXhvYB2t~$*GaXsR_oY2$tVlH5kv-n<`?2VMfz`;sBsf4k-sKqYC?m`!
zwgul+glO^5F(H3gyf2s&<6-OiO(H83R)O=Vp=l<RwAlJErvx7domX-rCV)p%L+IeH
z$#~!I2i`fSF~F7xKL~X*OnTFCo~;vPCy{|P*mQclY*8E;%<!(F2}5h4Hu)L0;j!3u
zt2)e%t_&!pRRdN_!2Y$HQq`Z;3Oo8eF9awDF)0{-c{yh}SLG$2NV}4ESn=4fFvI-l
zHX7hUY{B@GPs@0p0Hn(6xiZo5KAWlKUPoC(((&nk2lemAY<fA$+Z?-0Kk-B=?eX1;
z3BYh8PMLt@g&>BBIh(*61^Fe%8Vsq()@_~orJTy?{}fL^;Q?P>cM0WWAEu)<zmior
z&00#$=1BAr{e<dA5hPmhg&`p;1Wdp|n~)|ID4SP8nvp}v2Ul<W+CC4kfnokl+#dZG
zg5|gyaRYZ^<!{7F`curoMi6N!+JO{pLDva09P^`4QsX^E<VVBXjPzYBUJW(3Vw^GF
zY<S>;oWfJGSH?Tui4h?4TD;v6B_*4-JYR%=HuGL|JqBV1+PBSBh&)ebN*T;iFvxdL
zfwX%YHrwfV*<0{F4nWc_zzaDa#IP7!>_y<w*b~eyfsnd>luF=q;1k<&G436Pwepp4
zUlK80vGJZg4AatI4Fwb+tnU=mF$=$afZgOB!7bX*F@M$A;#163iNuhW@xJ4+Ysu>^
zY#VQ+g5a@F(B(F<EtsMA8qaA0d)7@w5FiEf?!dzjl_r&S6zWVQFLXE=OEk}O(e;&d
zX!}I;1%EzHeTpp(ctL`)`H|^cfkK%m1j+e)hvvN{%GXtkBiEd!S3)K&0x{17W4|9O
zO3)(1#(VI7E*g;cMW`wVD<9NX1a%K$EoNnk{s4C2QcR2%@Qb`<AEeTyp9Te)$Srqz
zR-&~Q7DJ82lLPDxoAk7~0?#@E?IO4m>mK7Ti4mYyg4Ph8EB-!2b*F4YCyWBT;A@5G
zIT?$hGFrWKXCea}RpSvZ(gol<5AAGQfq8{9td~`3NsU~-Y9Rq^fNjwCZ}>ihM*OCg
zXhDRULQaYK4UYUAD=;kk5b9;Z4i*sre4Za+ELtc{zbZ;+|E~;|4PL001P^05K>Y(m
zFw(q*W1|d9egl5>d=NQ9#(I(f;pN0dfjLf65h?TVM>kOecqj#FF_4TUEAM@=D5#Po
zwQN@_u=wL&XNQ^yVdS4mR?}2m0b4CxPg(U~ArOzsNDb`_3qi0{9LBOSoHoz90l#ev
z{hg14;Dly>HcO;C0BGPy_;sP*#rfUqxes@1pmzQmZe0kyHr8XTzAobAHy#hhTS35N
zSQ_li!SVJJw2y41y5VPmVr|HOePSyh=`>Iu#@A?$r+x4};9c}3u!}B=#Ka17erP+k
z7#kM{<NBwRD*TM2TfPWW%H<7BF(3j3`!^r01(F!h{5ijPD!9rR3>2`i;%Q`SFWF98
ze>xIjI39u}aVGesC4m)L*ab479<hp{Bg==-^ie?9Dd2?Gx~cFpfuh_nF%D2;xmR_C
z#DRo;E%|&u0C6CLXv%A9#li#ejD4hg1Rhp}s19OP!4;j2cdGjoHMQXN^Hv{!NsIuM
zPO+C~NM>;rcJM(6i%%PP8UHp=h3LA-xD)!N5yE#UU5l5)$(0WVu5s#9h{Qs!63YTd
zQ?!zOdiBhrE9k|wu;J1L*m{7JG1kzPPq)yrXY6JfWxVXO9kK$ieu2;J2Vv|5pL7|q
z{g>!tf9kQBlse=oYN`DM&v`X{;k_9v%z8nuG}rP93UC4h3*_%5D3b$(%N2G~CgH6^
z!gsxj3FF9k2u9Fn%?7(LA~@b|=m}SpbWGf-gU(PBUJF4#nLtU504-4~pwHRy5g>1=
zEW}U?_#;fX`+t>5b!U*C0M1R!&f9zykRwY&Jiqu#=L+;?NA&HFy-KF%dq9=ksi)7K
zOkRb!E-?NxBKopaJMUU)8!zS8Swh(yQZj(UI|Ce^MFn`F$H{BmiI>v~5;LeZ9j3CT
zEAU)50j+W!h;a~}wgr-NDNW8{_f>3jOG7Gaf5_v~rf1D~gVN9RQ|~?3={DWIhREN7
zx=Ak}Vyvp+@iyV@Hz_v?SXzVs`2*^h$Zd3WHZcMe9sy0<e??1lG10@iqnXD*$sFQE
z(!eQz?O?lOn3N=A*+K*T$ymyg%jZ!V8_X43Brd~tI0(eIg9cat50o@O%!#USKyFB-
zAL2#ci0G$~W-+-8*IxosE7*-K*ezfu)c_3ufs);Stq@fw_4|Pog;aMk4>~xGvDfO)
z1sB{cqUv1OMYg`OVm#HJ&c}EI@PKJ!0wy&eZLP2wrC~Qj{F(&<Y{D-+Nr1wHqYrcD
z1XTtR``XdTz!rY2W<DOohDkA^!v*w2H{`<*JL*Xo&|9s^XkWmeq+N@^hgEZzMF6S$
zXMein(vwkzRm-Av5SAcpz&fOnL6T$S1q$F%)X)gXnZeuchixlb;DWYK0nDEC!9Bpb
z5yA~Zeh~P>hJLsrA;RMp;0iDr>;=?V>H@n(2pR5_=VBi3D?zlCsKJuF$#zw7{7-BJ
z<duq%55N5_zdZ0I(HDsMgUQ><%Q*S~;$sVep}>PBmPInO2e!ic$wA>6BxMD7aSa0&
zrlJ4ocrAYGfI7cj>WJ!UsC=Mk-@E%Y)Vn9N?(kzjgbIpUMp&a5EU~v0URkipufr(K
z!jAxr(#vhX+DAc&|Ag0u(JPI><vJGrFucm(cNuS=cNSa$M*Ca)r#<f4jG6ej0;H*>
z8S_wuAYX#*#CibDVj{&45Biifl+hJlRYdw_laVan;DwN)l^&V)M@NZ|ktzknF!(nX
zi3usRdoNVnD^>~vv)}Z+!}-my_10tSZw<W+i=xdUxXt$G+g$|mU4W!A8;j?F_^!d~
zR);euu`)~$6-(%~6LPkq4M5~+l&nPl-)uw)vW6bq!HAN4yi{<&Fr`h-6OX(og_F>h
zg2yu61x0W(#dyOh34H_aiMj`7*cx%II(@caMd1g_mIdB<dtNyFx-Py4D(T{~4t_SY
zzwrip`|98_K5Y*&U^_=^VLt^gWXMYKA+a45`GFGwBSdOeED4&9f++gY$+}zGU1O$i
zmdNy3d5CZj2yFpr&Ips{HH`jTJj%l#dgi=|Fn#@B2pQM$_h8vnJexhy@M2GpnfeNd
zxm;ETc0LLzwyFs)pNq!}iwB@%97}m~5T()&JHcienfrTq<ZXzgnhL3|(?c0=&Om>x
z4nz%L1dq4Y+i9TrG}nzlRrWhmVUw=YT0?$(?K4~Y4WG0jmqc@z*cQx6N{m?WVLE6L
zaQKms{y35p^0(n4MuJ#~8k+1(NddkK#&c{z+pyKxc4DKo8K{$rcHPy`XDPpO6+hU)
zee`8=O`6+YB`jh-44?;J*s1|Lv_^)@ey%^Mw-=to%in27hX+0n?w6rTY(}YI2Y~$+
zrmf22C-6B$+CcskSTsu2drQBO?+N^q@!nK>2c9Qas^RfY#dyDK^R{x%`?a5dAnnIf
ztUCMt@JSnET?rDP(Sr8+Q_G1=eA=4vkPgU8Z1F*n>;-HGl*c+RG60iWvODCmq#X+1
zH645x8|#6$gI)6j*p6mWt8W;#$7chPOL?_`zX&pSssnPorDg)6+Rs3jQ_yEk!@1um
z7BFvI!W8eK%2}}B*}#g$t1nizRS+T`M22+c_u6zge81bZ3cT1{AwITcv(V*0#Qb3L
z8|}S{hg-(mN<mbIHjg-NUdpwD8vy06!!x%DN`c>^`P9%>VAkROu*n$B&285tMt~aj
zSc20DXB;O2?_-xBY^N14DTVkmqEj>8r{ULc>h|P;Q^0ps!ZS-5uxY}s$#2G>{lK#E
zE3(Uu6N7P{g&`kR);@~Qi{u(jBOrwy4_Gg-#b)rB!|HL?pa+OAP$f&i*sk|s`@1w0
zpU1y5vEf`5xy-M?etaCbC*DsPZ)P)Efk@`(;PK|%93#eU>}b6G{rzLSZGu;Y6^x6D
z%L-=So2XZuHsE52s!Z9Mz+%8A%CMdKngVoefHcBkBL-TfYT1(H*^4`HtPwR!WzAGj
zoZn`R7vln!Ze^H5QftfQ_JFYe2qu+b{x^*5P;#kJ;N^}41`E?2D?J{#Uw=rDQIz!5
zRn**sggUAKE9<AcG6wF#s%Zyo44jDbQ=nR*$#0bYn6d^U$>HykHr~=z&4H6J778Ks
z5-5qSfF=mg!kBt}1KPuOxMQ$wrt0M|l!v^)1bQ0bR`@?)^#wxa#R_Hx-VD7&1cipi
zJJAt_=AXt&WZ?G<F#lqE3B6VzMezFpp=_hPyfTJO0atggOfJJZ%-4$Q=7ow2vHX1-
zv<bJX<m@ku+k=U2KZy7el2x{CmpJ?C*v^PklGnxFXBXLofbn*L&vRfakE$mU1s7Ku
zi9zuaBS4F{U=()#Aq%!sCcNasq=F`-CIY-2Lx6w!uE(p|G1)$rT(KQ-9ySgMcB1xf
z^z>Sc*c|X@(E8H{L0I~fMayZ&&$kAEo;C|n%cipy8lAF7JoR3Ae<<o>#(N(>a#uy_
zI8{9!gg+eJ^N@#UYT`xW{I#5%0evEr+9*7^$S9-I#XAyF*Tmd2AHkf6V)^;wm@BYv
zh?@YhrMRfF?tG>`i~?`BJ{(rknAG*cGbI5gC5l@1!KgiTs}O?%+Lufa1fW{Y9%lAm
zvL6e-G8Agg{KIP5^CBD}97Q#3y&ynrqn6I6dYXz=ZZ`yq&2WSK3ikzhSZb)d8qeYe
z-?%Br|5<d2)D7nwNYtZf*i}b5;;&?EHdW8Z{eWmO*ueF6T*}_S!{F0D-czWt{x;Oh
z`bnT+Fy5D5iShm^bbGd1FXWcw9x4zZzk0*81++L@!;%$y5!en(cY$S?RR~!~y4Qt6
zbhIt`x4Q!9uD*f9ye-IEdc6QDFf_|*fFxN)E1v&I>MQ`9oe|Q8@uzm?uaE{IAzqBw
zBoEuC5DSLGR`{SF<H+p_`oh%AWgI2Jj^R=bB{}%ojEvt05(z?eQVg;l)>ft9<c?td
z{fzqOeiE?x27U*T4kcgf#RSLkZ~-N7O|+ka&hbH#m(&-07cheZ(-2pta|iU!>gO>|
zME45N27FY&Tc=siB!Wkbi2wz*<Mpu}@nU&6*7}>ND=@qFclNNc{w7d!OZ`}sx$JL2
zGz@Km|6)Zkr0J2@RfVoT;tSgXo!2AzA9ggTV%I%Z`+u+^K{*X#MFJffas5VOu&c%j
zYNWlQRzG_PgmxcZ@Kvm|g?r&!+;`iI<@p&7kHJ>_4<Mf}!#!iL0$^K4VO0&=uvag6
z&B<->tnp@(p(|y1qT?+%OR|21p8tit66G0U_$Mq-?dkt5@1tzV|4ZbVquPQwKq4Ki
z%ZF16q8l-62Y^gNuSph6N?bJyAAJ`g#_k5;!QX<>F(AYMf+T#f#w|Tc)g?6@5g%VJ
zg2jxvFt-`3_P78#y_>0a{|8tx*8%Rog9Z)s2-wpC@v%i?%#|ys+}}`Z>ol<>DB9>(
zo@48$bs)?Ez|f5YA9N!KFg1}E;crPkWEE}>8E=N_o3O4-SiBAFLgKunK{tRM0bU2d
zh<M7^XY7e*sG3Bdxl;lR8to4<Dj3K%3lDDqN;EJ7ex=VeQ4(NM_Uu9^FE77T9v#F+
zN$<D1qaZ?pX09wQ#Dy#ztmHd7EF9p+WU1JP?H7Q6rjz-&_HBuk!a+7I1J(ndhGKYG
z0R7@${lF8#@n>@GXQA*czhz||Olt4bu3y+{rw$wM`Ue?rMq#(qpkL^xjJMuOsks&E
zy#<Zbkwa70RR^!IU0FRB%c?yz=ZoMEu^d<$yAg`TDDK2chXjbN=u&#A9NVo4B`u1f
zzr<?9-t>OtNMa3#-z@^hk)4bQyaj^~yDYXlBMmt)1|A^<v&Oc3LFjg&r$3%Y3WA4E
zgB=h`Js*xjTf&hq?b=}@zxG~0lP-J{rm~43?s15l4C(m~b&R!x-f#(>Y9887mEptc
z#|Rfgv9EE&)yKaoCB%%&c$Z+jS#aU!;qlJEcmrqH?imvO@`ZH?s(>9>9ga47!C6fz
zx=;iVx5+y}Lgg$16x~`Y!aFd$+~OCDnXh0fDt#_yULl&E*^nvt_#WJeS<eCiAV`Y-
z5rC*`1F5<^>K^ptTS$Um(x*+CcEkZMki~3Zho1-;=p)i7=%yK{<MqzlH8WT!z{*($
z;{BmNZt|b`9zRq6ZQy<Z3TW$Ud~bjiXJ_ENlb?c^Y4l;dIm9uKH!@6V1g<Py^tqGm
zwAE#eu#a7Fy-z{@RL-;ONJ%+l*A@SNR?bQh*v<@u6l*qqD#XVOzX6!}l-xf8pcz+Z
z19f-wiS2C^O`rD|w!ZJ<8mxL~FARbts}XzkbNbV&+JC3|dd|%Tr*wUk+-3<Z3V)-y
z)4;7^qG-BW6yhB<Xe*oTXI{1F6I&ob++^-YSdqAgKI?}d2&@-rZ-fdxVVB1BRg&MZ
zQx@mbW#S9Kq^9KkAv9`2T$OirlZnhzoa-bj1$OZ`%C^T@697j8>+67qAdXssx45vX
z7`(*+wu99JIx?&&*xR?$AhS#qwWYyp9X$Y{!1n@i<gkQc=5HoM`;;vqtUck2O4in)
zUywYJjZ(Ab9i}~h>=W)33m<S~T91hXLI&6%LS9<F4utzHh)w_n%sj(^dlj^4kHWUg
z&fx5sCtIxO+^VYY!*+;kjS7~I<$eeL$#}Eh@1ET-S0bqlkGHr0<icEu_<>~(G}1{G
ze)i&UCzo{olh-?1SOkqwdJYsQldI=pAoB2bP_I5rDd0PnFHM-a?6PlJ-cPB);4Krr
zZ+_wnyGi_CUo0;KAzTpr2|7o$#tyv0=Y)4W^zkHw#kftb;k>j3k6jrtFwvCU*J;bK
z>*YH9v-6h~e}*1hL7S_u!>Jwe+a?HIiX$&r2eBfrcZw(^BwJ-QCLNErEW}5Ew^<%3
zlX#$yz3}r=>64*Y=u5bO2bB1J4Ui63<Atz_qFahco(1zZf$pc$p&FL5-wQM>@$Xs?
z(TS{)P@DKbW|h!?eL$WTwk}L$VS`pbeL{c_hqn8b(;B=Rbc6&L6=Jkt<=hjlmSNrx
zZM5HdQms;IQe&`sP6si6B3tdyocF1w&PPTn)E@S#80cF(pZ*}@2xHL<eo_d}Ki-SG
zZM@^@clbRLouWbUV&$d&IS0dkkLP<p2x;&q4~eIa`0p9*+DLm^#-oBOVLL4)Pkjag
zXU{;e2{xJGv<APDQ5ukJArx$Y&MhA>`+ESlhxZ(m(@Hhr!j&{7Z>tCwGak)_<bE~1
z46iThIshYU@u8RnR37$hR!T#^Cox<os0GBS_=>$c@4T7LG~J5z7GupW0LYbg(KQ>K
z<|*UrVT^Y*C=QFllF}a58pL>a#LE%nkd4`Nktks!UXr|%VrSL#7a&lcl?Q5UybX^B
z;)5ipj3tN?_4ferNiR~3y}~oGC5F+}yfS8GJf+qk@~OSLL5}WMCOR&!nkLqdXu8kQ
z=2-~PSaBUH0+Twp^A~twSlt<;=lg`S8L8FJSM*8ZlX20^reLVdUGnL`Ki-1NP~-Q&
z2Nhx!`rIkXj<#=%CJtU}rmiKQht(^Yl%3J04q=CN&NI>IVT%LLKongK0&S;w7JF~~
z8EoCq@^i$_nwr~i;cC9Rv%<m;B9|`eNZH-lz2U#Lhe`3T08F?M)nVn5!{OI<*LP(6
zyc>GOfi!XPtMOV=#4PBsvY~xwqPe$yLFJ1a>Apdevv*<@gwO#*OStonBTYnKiC7l2
z-iW@WGQsf{CNcPGIS?ekq6Q%}n6(t2HMnM&fFe*mTPqO6`+fl%*nSXj5a;+UYGSmj
zV4}o_$=gro7a_WWs~BCn2!wZr-1=>>28-J%wxb^oN3ImRuh#G{)<fwx!q>!Cug5o5
zZZzqWaNat;3hldOHDSjY+eZOB3U3q0JC;bLiQFqVx`t}@<YE;C*aL=oLC0sfzzaSP
zrLz#+D5!8AlJgqydV+0}{ZknbkOm(J27>0#znn7M-v%&#iS((ndqri#$yj`9noJyq
zNrfh3>Fnkt|0ZKuU;A@3lZ8q94@MTn)1=>g_iNmn25s#kC#7}~LU@Mi+lxNN&UFnK
zX4a$qJ)Vv_aSyWqy718oNWXWZzDzRpa(d|YZS7_quy}NEJ4?On(0;zGhz24{g`jeh
zs?7C2s1SK2qDirmoQnbH^$c@mz}d-vS<ii(Kma5q)}><{??r&M@$_bI^ElSV<M|Fb
zNqpRufD{bhw)9eJY`z@Z)>W*pa#Hyk^D}eEv&!PhSW$+M<*p47pD1xzUw3fFbi8e>
zj3|sY9+3W$fFojVD83tDKhCC>W|+^|t_rn^Mr;`qQCdSoal}`(vv(;A$R0x@jN7~M
zs*_~QH`PqWIO9<v^f_EGdUo+|yBp-2w^`Du2Y&1BPhphVbx{he6mWJDb6L=V8*vE@
zz>_#GG$WT!HbTvj{K8I72sk+#6BVfm;O8Ov*swy+&0pB-h>wTE?S2yk_zHH0qj8VU
z=C3aYO9A*jG!qkY9XHAPB}%({qPOC_xr}s0$O?`c5O>ENxDgEWLm;qGvc*~eoH8!Z
zL_U!LCg5O;PK$p;<H;v6J55+{p5YV;4m5jK6=HzjI)6O;Iyh_w;9LNpY7@y=kbW!5
zd>Cg{+6PX^>W5q?vJ<(~d!gB!oa%mX1>_1vKc!RbmB;6r9<2oFRA<hrM<Hg6*rq{z
zEMOQ4D-DvM_;XyScmE46lmw|61Q?Pf{H%HsI3X)9M=<c}**5VZ8B1FFLS!*|_q$Ad
zGGt<&1RKNvT@K2bgwl=xxqej+FM75KGce&;&9o%68FiHs@LSPN`v&7+L@Z)f&L*r#
zAVg#d=cFtS6>PWXVFmuNEp2o73~WIz{a3_Qc`4bFwL_1PP&FdmixM5xxXkhZAD&R9
z5pF(<0OguA_i|Zz2zoU3z3s_@K#`aXClSr3B~mv;ac-)2VQhHK3Gk-Cr1FaksJ`jv
z*#6;~i72Op5V{PLTDA1ENPXxH=NL64tb$XWVbzkvini)#{E(#CtlRN`p?ybK34lPM
zUjr78lkSE7*4@WExXGG<foBn5Y{7geTP>tsKtwGrjGIdxP$pY_;KE+`$%=ULwLE|c
z(+H%{^NDuR&dj8KhKZL7kjkr0hRqA_Tbmjt{Fi~o8e|r~8q(fnh@m`MRfL7J2){mw
z-;+*!tcWi_G8XZ?lR0^WTwZwly%@jrn8fi2ty)w<O-&DDwy@&9I`p@=kL%TJAwHnZ
z5xWLp;N+DK2~ecW!nv@`0v6@+%)%<PKiPzkyvK}Ovt+Y8(NF*@5C9NNc-ZO<LNuwR
zA4R^ScbygcY-7vAP_<-Wr}~nHk9{N29*TL>@?DOxXd!p%@<i+F>i!N1P;Q)<w*_I#
z5MBa~GB2*5fOAz{RoEAP55lAx8W0MXL+Qc<X&4)6K+cBl24f^NUYuHiK^N?@Fe&$M
zYC#d>9pf$%%&A`D=|J!>x+U*kWFf@=2m*0}Ly~;e7Qg}U5ANed=RbZm%y>3Tij~-m
zIb{2H>0(61cLw9ueM4kcLHb{36Q6)>6KlGm>3i4-*ur##CS=EDH;%Of9SR|#6#*;w
zplJS)37eA<hyK=Aj>V1B@FM9RjgUTTAZlD`%X`%1*oy{_!w-wDldU@`>bYbo^}`>z
z(-kmyG5mqW3SsCQh3^Rd(EAVA(OvLx%8P8_One*{#(0Nr%31U;;<MkMOir%`r~*a7
zQ9nr*CA+ou|D##~`4%W;5#t%Kb);oyWo-Ludfzuz-O$VBlY%fQNhtw{{)M?~{gC_K
z*Xam75`OjY&g&5{v$h?0H^Q~?oU+4!)BwYXR2c?#I9QtEsVClhIu}AhYt2fpKwgdO
z(9w%oQVL-6LNDnp#}eG=g$m4Qz_qwAlb+IVWul<d?tVUjdmY-r>Y+j4^$wtYM<>2m
zJ2uz;Scs32+r!7%{C+n+XmndJIwWu>4oJiWq1mMK@}>9u!zw)l2<iu*!N1=gRDa(z
zd@@>^(tA%&JMRg5(INcVBQP=kM2L@*H7X>ucDih;Wmk+5*xyc)EA_RW@KuR^1>}cE
z(m<*zf;t9Cl{u#@(Rx1J(?!$=4NbQLc0K_wj3-qybYm4j^wis7J%FeoYm@{Hcey#7
z+}Azb=T6&iY?*{HhD$2k3S0;yH*pC({v3#k71F3Kn3s?7VlTH=fPOjiCd{4PU!q<C
zxoa{AhzBU$^wO;`0okC??(es>$hJ>xw@A6wgm4|;PdRZk_!!FRhh!{^s>F7C`4ztx
z>>v{*A(scItLp6~J97h&H*e7(c>E!KtmDKtqv#e8AJEc(mATaG!7T4RFfLIGA)$Q}
zln5K@0SJXa(k?i7=yl0F77sX&4}uX^V=0JY;07vr<)Ye1?aC^73Ouaxebv(@He0ax
zXgDG1b9W<au=3pu;zP6vOj%{U1>)NgX}r4YTzmuwsFI*X7>DO_FHQ(?8{?BAD#Ce)
zf`#Nam;hWDtEOB?eq%c<#aLbNa)~qOv97}tK|km^OydV13;G%duZsV`4)R%hJ?h6Q
ztVg2bV1M*UxR(Ad{#s+ZvmNn~dRvt(-X2>G&R-oH59n{7!<Zq!cO_;Kmh#p+fh1X)
zXr#=p9?ka5^4&^S6Z4)(mj&L%MeozZT#nn9kO@lKwh)Gmow77t1KThmVT}*TWcCm{
z$8%i42t^PyoGJ95=b2Q0#6_d}wRG5*LpAq-=q`rO96qGJqd=N$iBN4)PWgGhsdnYP
zgZQ{FaS@<A#O3bww72DY*olWpj25C@_QN^*UtV${;s@?+K_DZeztqmYAg&bKR@tT7
zd6fOh%6*s49RHGhzTsg0hoh|__!~v{{ubss5PMibK*`&wVBS>T$cX&Ae(mXID88SL
zoC{cOMHSzIM?FA8`hOYuny^M3_$u0pjWyrLwu{Ndp^lArdc(>Wc(k~-;K0oYi8j`b
z?FTV_VD2+c+fuOtA!QcA<_3a+8yb%3CZe=1`YO<eWPOS|LjUu0AXIO7J3@e(ZnIZ2
zfEhH>d@1-Zj~x3_PpC7(`^Vqyi2pUL%E6=puvWYO-jlGpNPSF<068^RLGe61Ac6$x
z^$<vGJz=DlVmK$#wYP=i=Rxs}!trYmy^B^Z-qq1|7(?~v#HC2wlSfUh*!J0H84HBl
z{BuVFT2Bs0Olp|$jtVg#9haQvl&E*i8x(#`EZ<o=L<Fp<h!68*kodR)OCf6|GJAKx
zi^bB$xp1v6ESf}3UYOUI_+a61r64>=WbHstk4Hi)V4(95NI0(=K%IIwN3;r@kL44p
zovScdkZw5<4GJf}G2LZ|UJ5}ckd_MPvirT$UHnrl{qGIe`tf|<$KU}_io!WoCg-l|
zP%!ERopy!*=giGQv{S~|xuIQn5iz9?M*D2wBXh|z?*Q?RlzTY&joVxfL<ZYFr3i*k
zdGE%TG}(?_uKz(ekuUr||LX%I;Ge*(7iB@M87Z`&<4a66)g1%t2mx|OW$WbNksP^d
z5};09L>85NAay6F<JKE6Xsi}(gmPsKO<Me6B+b8U@2&b?T#v|8D2hIzEDPzuN*d(*
zIr>kcuQoN$#x5~NhJama-Nv%+gj6Lm^v)3=_%}MV9j=VnLOY4XBrvHL)=osHr{OP6
zR0F25g$AUp?JB;D9id>}Bs)R@683Ri7!5@5l<c+um5Gc-AG%l6E9^SyH4x7lk)~zU
zL-?W9i$CZ~ys~2i$nTCbg98NcBU#Oc<~$XSyAx}Jg`5~V7<7CeEGaRA1H^3*5u(x7
zl{U>l{lTfMCT8#MYUQ=B@4NqH5^gIV3y=j*;4J_1@22#u<-Of~G}5R$N`Tw|0!1S2
z0gb>>Wgvp7?Y9aLfYzg>6N<ip)nR3#{-%g)I9gIY1PB_rD@d7Zzl(&370*DP6qp|^
z4$5u^3t*U*4{;NF&}CNMX9EA6CqPM|#qf7zAUDhs((o-7BsIgN;Ob}Uwe(Q_W~W>{
zWkuLrbe$ld1L<R#5Xq>5m)kC<mE#GFbzHY{qz2l%XB-^&7@`HW3KxV4G0ioEWIKIn
zyS4k?{=ee{$kmGv28V?W6c#Z^eMs4vYm%ix5#I8pwVb)~HoU07*3<(2XeVW=txkmP
z2s}=Ad`g^~Gsp<9^;nEus<f#AyfD=UdU)D)rzUWBJWFS7B!>Vcs5r-U#=s$}CRwf(
z{xqkZ^~I6jgb-g`i<ox62MR0Tua=WiE43Te@7=vsLbN4)fFTqd<%2LY?mwVrE>*?x
z`MzsBZc+%4hYYJARwG|)Xi6<U-<`!D*&SP#zB;&yNC#jYFpW=<67~RsOCIZ~)x>t3
zT00Ej9;6`iUJ8p3j{Svm1hdbw%eAGqS}_7$P2@9a1ei#toW5677F%mZ0}92lZpQf4
z7Irf>tm`m%NUSohqtwrb)UAt7JKYDak0a^RnXmIOG4sHb41=c|^7cZV6ez4#@*zL6
z>Hdfwxn*BZO^iTyy5sYlAi&Up6g2WzI{*rWpNOSLfdB@F{%#+`cbF|Q+F;+21~Po7
zfLuFC85W#(tQJZe;H7~rUb^{aFU^@_QBjGDn)ap8w`Woik2!^!eHmnW2ZG45z>`8R
z3f-t><)A(rP8QlA$Coyc_|G!-)1V>y`?}B+`e@M{pK}BlJ}82`v06uhSS|vOm;=5s
z2iK&9U+2tsXaSJs9&G`2Z5#!(>_AUB13B|NiPv(@6JVqv6k)()W|QFox(BgRyqxL)
zpUT%C#N)<F#voM}a^~Vw07YI9t_R;4xa!5KdKxQi1FmSmeGO0=H&Cjs?XAL3q%r8O
abN?S6n(&nTXA@!o0000<MNUMnLSTa9&CyZ-

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/right-icon.png b/src/project/biaopin/AppCooperationPropaganda/images/right-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c626b7c87f84c92030092297eed2f61f7a8eec
GIT binary patch
literal 373
zcmV-*0gC>KP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px$FG)l}RA@u(*f9=*KoAAcnchnP*RnI##yfZbdqe5577pP7#z19^gamf}teZ~_
zv-|$1*sMzBk5=vz0{^{XHpm7GPk_H@;RUU3j}5LyRQL;Qu<(Lbx5oxoBP#p_Hn^vt
zVHj>^b`g=jZQHA=+Man^zIAOdrSuY!!?ZC~?VF}KqmkagyNFB;&QAo=6=-HUj^o43
zPEkl#;Dm}sx&xz;5MU${28=>Nfe}bJ5RD80B9URhC8UTPyRLg~IhOtUhQM4&e$PQ2
z074o>;pX$NS3^s4kvKRIje`Osa4=vL4g!qCxdWqd?!c5%-B%XXUpiHPZHPWZ6nEH0
z1OPv(AyA)d5Qt7Z_j+tFccSQdY!IDz?)BJU?nKe^*dRLb-0QKy+=-&+Ro~zn`K16z
TcgI<d00000NkvXXu0mjfWagc2

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/shaixuan.png b/src/project/biaopin/AppCooperationPropaganda/images/shaixuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..88015ea5e0e538118f88586e115d588422253674
GIT binary patch
literal 663
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uvw#`F1}RM0`(+UW0~4dCi(`lf
z@7w9t9x{O<ZU5`<uo^Dgx;gZqSJM){mn=u`xnJ0^`9{PHC08ak9VW4ZdPkHNbog>P
zwuqQX3mrVJCANq|h$HNxLkGu2m5R^zUDY@D-;^vbS7;S)tNylUU-h|y_j8}_HBS?C
zSU<0VJ&|Kisl%3I-n&laIV4|rXmMag$n=fQxvhNjEN1K3PngjsoAE(wc9I(_Q?IAZ
z<t^gkA@B3Hue3bwz&Atk(ar?ss=DhkUVnnv+3%HqJoM}w<Jt{VpKV*_seQdf!so@-
zw=vJZG=vpyXVu?2t2aA&>*k`hWxHp5dVZ2QP3{B#D}xpD{(rF!)tGPCcu+j$9^VP(
zTSsmlx4FPq8>M)JySU@y*~GeUBH>M4nsUb^%FZPmW#I2#D`;}$)3np?g66r3MyXF~
z^W^dT6R4%(@?F=lhvnxKmZ<ctk3G~6M+78H*w<HZJ@}7Q3O~y&hPgb&R@rYK%9WnU
z+oAJ1UMxeCmvf1!Y`ajWey8<ASx(kEnP;8fg0)yGR=V_G`&}vZ===L6n$KsH?o|1`
zTR~no<5(P%W7&SYEl%fWT6}rJ<oG>i!P*0+QLU|xSO4_IC7O!FztO#Lz2{cP|9tPQ
z*Ux1ICO_eNE&U;?{N|nomEx~_#RVmQtn9zPIrA3(+A>@2x(#ANm4ctv=Dg5%nw>Z4
ldDp)ADpl8l?(|Q3slRGjntsxngBL)F!qe5yWt~$(69Dck3%CFP

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/tx@2x.png b/src/project/biaopin/AppCooperationPropaganda/images/tx@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9620e086f8e6738ca671aacc434531257ce7add
GIT binary patch
literal 1467
zcmV;s1w{IZP)<h;3K|Lk000e1NJLTq002q=002q|1^@s69MHmX00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91N}vM(1ONa40RR91N&o-=06xuyNB{r@B}qg<RCodHoLg@jMHI)+?#7oG
z$B9YYCQX5orWFtf^Z^Nac_~t=z963Z2@n#md=TDHC4|I#zd)rvR8(rAZ-`1oh(am7
zL349UT(@>=FXz9hrE2YUXJ=>6#`Yd*W$$?Q>^Z+VGdr_09*cbP?d6T7Hnlz{*IjYR
zdY#BE`mzk^sa3Pcy-k*N!6xUsFOE-Nf6-B^b8_ywo87FgeeDu`$&l<$`bd6SR-3_`
zeYITq>dcbW1OpEgAZ=7v&y!0hM-ohs(-vKvF7G)FSYG5Hl2S-LXmQ|pY!FdslUmfe
zHuBZ22PZFytD!^Avi-c_9_=<M2oln{y#^y2Pq%*g(%(E-EA~zoAjQ#-02pzV8<l=i
zKNK(f%`K*F)5{n=|2+kjf>I=)m@SPcMNngk`C`kKaV%P_<Y@m?mMX;zjc0bs?#XtW
z)@s{y_hFO%SZmOBi$|deN@AdF9%UZcU!djr0_DcK13Tk5RLVPaa3)V59ca_Fdv*Hx
zZk^f*@k#_#F=x~1ccy6i6}8&~<cDt*X@Q}g|Mel&8g22|>MqKdO_<2r^x1M*8Pbd9
z04%PB4rvj+BdXiVTa#4GIof{W+Ec6px+Fyu)cf2Xp}~$SGpyqS)+H%opwM2U;Wj1E
z)#DjpN`03eF;MgT`0qUWyR6Vi$a6OWI;BJo)TDW*=3~$q1YQgj`b4H>a@@SmAREO%
z6|&}U6^G8D1ZA?#3j)+hH($&h&A!h#oEplAvV=Q`zH*9uDi%?3jQ-=$8ALP%6-36D
zo`UiL2|5)6Rd1SqH4=x;#6hh;eimedcKSvPI)jW6i>TGD?I0Vp(;vj3GsqY*P<N_L
zevNDHJuY-Xr<90+YVzcONynfII;BJm6dd}6CkRZ5NnI*7iGsTSXlMFK#jt*P?(q~B
zbV-URC^&ZM#(z9Vr{7gTZ~O<=AuZydws@-P%FUX#pI2^f5p+n4I4C&y+k>a{_huus
zuebRcT$_X>0t${^y%j#HbgnT4H8D`tdW*tzLXmfquSrT00|kexb@gFQn7nboOcYd@
z35Sy4L_#mniGg}|Zk*;qOgGJyvh?1*@m@ZNq$L7si6I?Z2>)NCqi+^zX*L;HYU^$c
zm05vjcRyx8hbnn3jTXOnKe0GLv!x9E_*adv*i1@d2ZcF>z3dp^9Nv>BtgwqJhgi>n
z=^XvO`jl?)f!8f@507I3RW3L*$8h#>8}wQ^+jB)-R9FCxDvYD?tnIy-xc{h0|L_>F
z`ow%U!Wby5!Cailc_obn6q14!d5aveI3TE!w>BE|=X%3i18TyS$e?B?GG4p0mp^xl
zV6ydXZuD`WTK>di%YP%j4UJUvSk3$C@)YeRNdCftZLkrxMiFgLh@?*rmw1U_^u{@g
z11i_TM%W6QbwwN0@q<PFpYra9)ByuqVY9AifkHn9>nI0JU^8sj5iL*)+=m%d(Y0L*
zRAnOa!!j|>y0&Y9n#>O_C|%pNK;^~;rxEvuuCDD`pa$q+=jX&v>aHZE1T9dK3%HcL
z2$4zGcCE(d`>X3AOdF1@S`jrIu7~p?1*OO<1(kwQB%qj$BgzUtWvi%sc(PeF{v#!C
zSC&d&0$^lgPq)6g(jU3f@xFK1_>RBG&HD@*cxD4eHg*T(Uj5lYvtP<yumK~ldw|^m
zd0W7XQa2x%`!Exa4IAu%!mfbW9gts_ev?*1rh@GynMG&EL=<e-SUTOXwD*Rk{{wHl
VVH*lAC%^yz002ovPDHLkV1jT#mkR&@

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCooperationPropaganda/images/xz.png b/src/project/biaopin/AppCooperationPropaganda/images/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/biaopin/AppCooperationPropaganda/images/xzh.png b/src/project/biaopin/AppCooperationPropaganda/images/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/biaopin/AppCooperationPropaganda/scopedSelect.vue b/src/project/biaopin/AppCooperationPropaganda/scopedSelect.vue
new file mode 100644
index 00000000..ab0ae830
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/scopedSelect.vue
@@ -0,0 +1,203 @@
+<template>
+  <div class="scopedSelect">
+    <div class="item">
+      <div>添加人</div>
+      <div v-if="type == 1" style="display: inline-block;">
+        <AiPagePicker type="custom" :selected.sync="deptListArr" @select="getDeptList" nodeKey="id" isRequire="0" :ops="{ url: `./selectDeptUser?selectTtype=1`, label: 'id' }">
+          <span class="label" v-if="deptListArr.length">已选择{{ deptListArr.length }}个部门</span>
+          <span class="color_gray" v-else>请选择</span>
+          <u-icon name="arrow-right" color="#CCD0D3" size="28"/>
+        </AiPagePicker>
+      </div>
+      <div @click="selectUser" v-if="type == 2" style="display: inline-block;">
+        <span v-if="selectedUser.length">已选择{{ selectedUser.length }}个网格</span>
+        <span class="color_gray" v-else>请选择</span>
+        <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+      </div>
+    </div>
+
+    <div class="item" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
+      <div>包含标签</div>
+      <div @click="toTagsList(0)">
+        <span v-if="circleTags.length || ResidentTags.length">已选择{{ circleTags.length || ResidentTags.length }}个标签</span>
+        <span class="color_gray" v-else>请选择</span>
+        <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+      </div>
+    </div>
+
+    <div class="item" v-if="['Residents'].includes(sendType)">
+      <div>剔除标签</div>
+      <div @click="toTagsList(1)">
+        <span v-if="circleTagsRemove.length || ResidentTagsRemove.length">已剔除{{ circleTagsRemove.length || ResidentTagsRemove.length }}个标签</span>
+        <span class="color_gray" v-else>请选择</span>
+        <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+      </div>
+    </div>
+
+    <div class="item" v-if="['Residents'].includes(sendType)">
+      <div>添加时间</div>
+      <div @click="showCalendar = true">
+        <span v-if="!startTime.length && !endTime.length" class="color_gray">请选择</span>
+        <span v-if="startTime.length && endTime.length">{{ startTime }} - {{ endTime }}</span>
+        <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+      </div>
+    </div>
+
+    <div class="items" v-if="['Residents'].includes(sendType)">
+      <div>性别</div>
+      <div class="sex">
+        <span :class="sex == 0? 'active':''" @click="sex = 0">全部</span>
+        <span :class="sex == 1? 'active':''" @click="sex = 1">男</span>
+        <span :class="sex == 2? 'active':''" @click="sex = 2">女</span>
+      </div>
+    </div>
+
+    <u-calendar v-model="showCalendar" mode="range" @change="selectDate"></u-calendar>
+
+    <div class="btn">
+      <div class="submitBtn" @click="submit">确定</div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapActions } from "vuex";
+export default {
+  name: "scopedSelect",
+  data() {
+    return {
+      type: "",
+      sendType: '',
+      showCalendar: false,
+      startTime: '',
+      endTime: '',
+      sex: 0,  // 性别：0-女、1-男、2-全部
+      userList: [],
+      deptListArr: [],
+      selectedUser: [],
+      circleTags: [], // 朋友圈包含标签
+      circleTagsRemove: [], // 朋友圈剔除标签
+      ResidentTags: [],  // 居民包含标签
+      ResidentTagsRemove: [],  // 居民剔除标签
+    }
+  },
+  methods: {
+    ...mapActions(['selectEnterpriseContact']),
+    // 选网格
+    selectUser() {
+      uni.navigateTo({url: `./selectGridMember`})
+    },
+    // 选部门
+    getDeptList(e) {
+      this.deptListArr = e
+      uni.setStorageSync('deptList', this.deptListArr)
+    },
+
+    //  选择包含、剔除的标签 0包含  1剔除
+    toTagsList(e) {
+      uni.navigateTo({url: `./tagsList?type=${e}&sendType=${this.sendType}`})
+    },
+
+    // 选时间范围
+    selectDate(e) {
+      this.startTime = e.startDate
+      this.endTime = e.endDate
+    },
+    submit() {
+      uni.setStorageSync('gender',this.sex)
+      uni.setStorageSync('startTime', this.startTime)
+      uni.setStorageSync('endTime', this.endTime)
+      uni.setStorageSync('deptList',this.deptListArr)
+      uni.navigateBack()
+    }
+  },
+  onLoad(o) {
+    this.type = o.type;
+    this.sendType = o.sendType;
+    document.title = this.type == 1? '按部门选择':'按网格选择'
+  },
+  onShow() {
+    // 网格或者部门
+    this.selectedUser = uni.getStorageSync('girdSelect') || []
+    this.deptListArr = uni.getStorageSync('deptList') || []
+
+    // 添加时间
+    this.startTime = uni.getStorageSync('startTime')
+    this.endTime = uni.getStorageSync('endTime')
+    // 标签
+    if(this.sendType == 'Residents') { 
+      this.ResidentTags = uni.getStorageSync('ResidentTags') // 居民包含
+      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove') // 居民剔除
+    } else if(this.sendType == 'CircleOfFriends') {
+      this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含
+      this.circleTagsRemove = uni.getStorageSync('circleTagsRemove') // 朋友圈剔除
+    }
+    // 性别
+    this.sex = uni.getStorageSync('gender')
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+.scopedSelect {
+  .item {
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    display: flex;
+    justify-content: space-between;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    margin-bottom: 8px;
+  }
+
+  .items {
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFF;
+    .sex {
+      margin-top: 32px;
+      span {
+        display: inline-block;
+        width: 30%;
+        border: 2px solid #CCCCCC;
+        text-align: center;
+        padding: 20px 0;
+        box-sizing: border-box;
+        margin-right: 16px;
+        border-radius: 8px;
+      }
+      .active {
+        background: #1365DD;
+        color: #FFF;
+      }
+    }
+  }
+
+  .color_gray {
+    color: #CCD0D3;
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #FFF;
+    display: flex;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    .submitBtn {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      border-radius: 8px;
+      border: 2px solid #CCCCCC;
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/selectDeptUser.vue b/src/project/biaopin/AppCooperationPropaganda/selectDeptUser.vue
new file mode 100644
index 00000000..c0b282dc
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/selectDeptUser.vue
@@ -0,0 +1,324 @@
+<template>
+  <section class="selectDeptUser">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in selectDeptPath" :key="index">
+          <span v-if="index>0" class="mar-h4">/</span>
+          <span class="color-3F8DF5" @click="deptNameClick(item, index)">{{ item.name }}</span>
+        </span>
+      </div>
+      <div class="cards" v-for="item in treeList" :key="item.id" @click="itemClick(item)">
+        <div class="imges">
+          <div class="imgselect" v-if="type == 1" :class="{checked:item.isChecked}" @click.stop="itemCheck(item, 'dept')"/>
+          <img src="./images/gird--select-icon.png" alt="" class="avatras"/>
+        </div>
+        <div class="rightes">
+          <div class="applicationNames">{{ item.name }}</div>
+          <img src="./images/right-icon.png" alt="" class="imgs"/>
+        </div>
+      </div>
+      <div v-if="type == 0">
+        <div class="userCards" v-for="e in userList" :key="e.id">
+          <div class="imges">
+            <div class="imgselect" :class="{checked:e.isChecked}" @click.stop="itemCheck(e, 'user')"/>
+            <img src="./images/tx@2x.png" alt="" class="avatras"/>
+          </div>
+          <div class="rights fill">
+            <div class="applicationNames" v-text="e.name"></div>
+            <div class="idNumbers">{{ e.phone }}</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" v-if="!hasData"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "selectDeptUser",
+  appName: "选择人员",
+  data() {
+    return {
+      selected: [],
+      allData: null,
+      treeList: [],
+      selectDeptPath: [],
+      userList: [],
+      type: null,
+    }
+  },
+  computed: {
+    hasData() {
+      return this.treeList?.length > 0 || this.userList?.length > 0
+    },
+    ...mapState(['user'])
+  },
+  onLoad(o) {
+    
+    this.type = o.selectTtype.split('?')[0]
+
+    if(this.type == 1) {  //选择发送范围部门
+      this.getAllDepts()
+      this.selected = uni.getStorageSync('deptList') || []
+    }else {  //选择审批人
+      this.getListAll()
+      this.selected = uni.getStorageSync('selectDeptUser') || []
+    }
+  },
+  methods: {
+    isSelected(id, corpId) {
+      return !!this.selected.find(e => e.id == id && e.corpId == corpId)
+    },
+    getListAll() {
+      this.$http.post('/app/wxcp/wxdepartment/listAllByCorp').then((res) => {
+        if (res?.data) {
+          let parents = res.data.map(e => e.parentid)
+          this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id), isChecked: this.isSelected(e.id, e.corpId)}))
+          this.deptInit()
+        }
+      })
+    },
+    getAllDepts() {
+      // this.$http.post('/app/wxcp/wxdepartment/listAllByCorp').then((res) => {
+      //   if (res?.data) {
+      //     let parents = res.data.map(e => e.parentid)
+      //     this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id), isChecked: this.isSelected(e.id, e.corpId)}))
+      //     this.deptInit()
+      //   }
+      // })
+
+      this.$http.post(`/app/wxcp/wxdepartment/listAll?wxMainDepartmentId=${this.user.wxMainDepartmentId}`).then((res) => {
+        if (res?.data) {
+          let parents = res.data.map(e => e.parentid)
+          this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id), isChecked: this.isSelected(e.id, e.corpId)}))
+          this.deptInit()
+        }
+      })
+    },
+    deptInit() {
+      if(this.type == 1) {  //选择发送范围部门
+        this.treeList = this.allData.filter(e => e.id == this.user.wxMainDepartmentId)
+      }else {  //选择审批人
+        this.treeList = this.allData.filter(e => !e.parentid)
+      }
+      this.selectDeptPath = [{name: "可选范围", id: ''}]
+    },
+    itemClick({id, name, corpId}) {
+      let index = this.selectDeptPath.findIndex(e => e.id == id && e.corpId == corpId)
+      if (index == -1) {
+        this.selectDeptPath.push({name, id, corpId})
+        this.getDeptsAndUsersByParent(id, corpId)
+      }
+    },
+    getDeptsAndUsersByParent(departmentId, corpId) {
+      this.treeList = this.allData.filter(e => e.parentid == departmentId && e.corpId == corpId)
+      this.userList = []
+      this.$http.post(`/app/wxcp/wxuser/listByDeptId`, null, {
+        params: {departmentId, status: 1, cid: corpId}
+      }).then(res => {
+        if (res?.data) {
+          this.userList = res.data.map(e => ({...e, isChecked: this.isSelected(e.id, e.corpId)}))
+        }
+      })
+    },
+    deptNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.deptInit()
+      } else {
+        let length = this.selectDeptPath.length - index
+        this.selectDeptPath.splice(index + 1, length)
+        this.getDeptsAndUsersByParent(row.id, row.corpId)
+      }
+    },
+    itemCheck(row, kind) {
+      row.isChecked = !row.isChecked
+      if (row.isChecked) {
+        this.selected.push({...row, kind})
+      } else {
+        let index = this.selected.findIndex(e => e.id == row.id)
+        this.selected.splice(index, 1)
+      }
+      this.$forceUpdate()
+    },
+    submit() {
+      console.log([this.selected].flat())
+      if(this.type == 1) {  //选择部门
+      if(![this.selected].flat().length) {
+          return this.$u.toast('请选择部门')
+        }
+        uni.setStorageSync('deptList', [this.selected].flat())
+      }else {  //选择人
+        if(![this.selected].flat().length) {
+          return this.$u.toast('请选择审核人员')
+        }
+        uni.$emit("pagePicker:custom", [this.selected].flat())
+        // uni.setStorageSync('selectDeptUser', [this.selected].flat())
+      }
+      uni.navigateBack()
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectDeptUser {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .imges {
+      display: flex;
+      align-items: center;
+
+      .imgselect {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+        background-image: url("./images/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./images/xzh.png");
+        }
+      }
+
+      .avatras {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+        margin-left: 36px;
+      }
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          flex-shrink: 0;
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .idNumbers {
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .color-3F8DF5 {
+    color: #3F8DF5;
+  }
+
+  .mar-h4 {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppCooperationPropaganda/selectGridMember.vue b/src/project/biaopin/AppCooperationPropaganda/selectGridMember.vue
new file mode 100644
index 00000000..a8b074b8
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/selectGridMember.vue
@@ -0,0 +1,274 @@
+<template>
+  <section class="selectGridMember">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in selectGridPath" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span
+            style="color:#3F8DF5" @click="girdNameClick(item, index)">{{ item.girdName }}</span></span>
+      </div>
+      <div class="cards" v-for="item in treeList" :key="item.id" @click="itemClick(item)">
+        <div class="imges">
+          <img src="./images/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+               @click.stop="girdClick(item)"/>
+          <img src="./images/xz.png" alt="" class="imgselect" v-else
+               @click.stop="girdClick(item)"/>
+          <img src="./images/gird--select-icon.png" alt="" class="avatras"/>
+        </div>
+        <div class="rightes">
+          <div class="applicationNames">{{ item.girdName }}</div>
+          <img src="./images/right-icon.png" alt="" class="imgs"/>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" v-if="!hasData"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+
+  </section>
+</template>
+
+<script>
+export default {
+  // 选择网格
+  name: "selectGridMember",
+  data() {
+    return {
+      selected: {},
+      allData: null,
+      treeList: [],
+      selectGridPath: [],
+      userList: [],
+    }
+  },
+  computed: {
+    hasData() {
+      return this.treeList?.length > 0 || this.userList?.length > 0
+    }
+  },
+  onLoad() {
+    this.selected.id = this.$route.query.id
+    this.getAllGrids()
+    this.selected = uni.getStorageSync('girdSelect') || []
+  },
+  onShow() {
+    document.title = '选择人员'
+  },
+  methods: {
+    getAllGrids() {
+      uni.showLoading({title: '加载中'})
+      this.$http.post('/app/appgirdinfo/listByInfo').then((res) => {
+        if (res?.data) {
+          let parents = res.data.map(e => e.parentGirdId)
+          this.allData = res.data.map(e => ({...e, isChecked: this.selected.find(i=> i.id == e.id), hasChildren: parents.includes(e.id)}))
+          this.gridInit()
+        }
+      }).then(()=> {
+        uni.hideLoading()
+      }).finally(()=> {
+        uni.hideLoading()
+      })
+    },
+    gridInit() {
+      this.treeList = this.allData.filter(e => !e.parentGirdId)
+      this.selectGridPath = [{girdName: "可选范围", id: ''}]
+    },
+    itemClick({id,girdName}) {
+      this.selectGridPath.push({girdName,id})
+      this.getGridsAndUsersByParent(id)
+    },
+
+    getGridsAndUsersByParent(id) {
+      this.treeList = this.allData.filter(e => (e.parentGirdId == id)).map(v=> ({...v, isChecked: this.selected.find(i=>i.id == v.id)}))
+    },
+    girdNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.gridInit()
+      } else {
+        let length = this.selectGridPath.length - index
+        this.selectGridPath.splice(index, length)
+        this.getGridsAndUsersByParent(row.id)
+      }
+    },
+    girdClick(row) {
+      row.isChecked = !!!row.isChecked
+      if(row.isChecked) {
+        this.selected.push(row)
+      } else {
+        let index=this.selected.findIndex(item=>row.id == item.id)
+        index >= 0 && this.selected.splice(index, 1)
+      }
+      uni.setStorageSync('girdSelect', this.selected)
+      this.$forceUpdate()
+    },
+
+    submit() {
+      if (!this.selected.length) {
+        return this.$u.toast('请选择网格员')
+      } else {
+        uni.navigateBack()
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectGridMember {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      // word-break: break-all;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .imges {
+        display: flex;
+        align-items: center;
+
+        .imgselect {
+          width: 48px;
+          height: 48px;
+          vertical-align: middle;
+        }
+
+        .avatras {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+          margin-left: 36px;
+        }
+      }
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .imges {
+        display: flex;
+        align-items: center;
+
+        .imgselect {
+          width: 48px;
+          height: 48px;
+        }
+
+        .avatras {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+          margin-left: 36px;
+        }
+      }
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .idNumbers {
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppCooperationPropaganda/selectTag.vue b/src/project/biaopin/AppCooperationPropaganda/selectTag.vue
new file mode 100644
index 00000000..049f9551
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/selectTag.vue
@@ -0,0 +1,240 @@
+<template>
+  <section class="selectTag">
+    <div class="header-middle">
+      <div class="userCards" v-for="(e, index) in tagList" :key="index">
+        <div class="imges">
+          <div class="imgselect" :class="{ 'checked': e.isChecked }" @click.stop="itemCheck(index)" />
+        </div>
+        <div class="rights fill">
+          <div class="applicationNames">{{ e.dictName }}</div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" v-if="!tagList.length"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  // 选择标签
+  name: "selectTag",
+  data() {
+    return {
+      selected: {},
+      tagList: [],
+      current: 1,
+      tabIndex: null,
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    hasData() {
+      return this.userList?.length > 0
+    }
+  },
+  onLoad(o) {
+    this.tabIndex = o.tabIndex
+    this.selected = o.selected.split(',') || []
+    this.getTagList()
+  },
+  methods: {
+    isSelected(val) {
+      var isCheck = false
+      this.selected.map((item) => {
+        if(item == val) {
+          isCheck = true
+        }
+      })
+      return isCheck
+    },
+    getTagList() {
+      this.$dict.load(['mstTag']).then(() => {
+        var list = this.$dict.getDict('mstTag')
+        list.map((item) => {
+          item.isChecked = this.isSelected(item.dictValue)
+        })
+        this.tagList = list
+      })
+    },
+    itemCheck(index) {
+      this.tagList[index].isChecked = !this.tagList[index].isChecked
+    },
+    submit() {
+      this.selected = []
+      this.tagList.map((item) => {
+        if(item.isChecked) {
+          this.selected.push(item.dictValue)
+        }
+      })
+      if(!this.selected.length) {
+        return this.$u.toast('请选择标签')
+      }
+      uni.$emit("tagSelect", this.selected)
+      uni.setStorageSync('tagList', this.selected)
+      uni.navigateBack()
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectTag {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .imges {
+      display: flex;
+      align-items: center;
+
+      .imgselect {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+        background-image: url("./images/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./images/xzh.png");
+        }
+      }
+
+      .avatras {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+        margin-left: 36px;
+      }
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          flex-shrink: 0;
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .idNumbers {
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .color-3F8DF5 {
+    color: #3F8DF5;
+  }
+
+  .mar-h4 {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppCooperationPropaganda/selectUser.vue b/src/project/biaopin/AppCooperationPropaganda/selectUser.vue
new file mode 100644
index 00000000..32c04582
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/selectUser.vue
@@ -0,0 +1,243 @@
+<template>
+  <section class="selectUser">
+    <div class="header-middle">
+      <div class="userCards" v-for="e in userList" :key="e.userId">
+        <div class="imges">
+          <div class="imgselect" :class="{ 'checked': e.isChecked }" @click.stop="itemCheck(e)" />
+          <img src="./images/tx@2x.png" alt="" class="avatras"/>
+        </div>
+        <div class="rights fill">
+          <div class="applicationNames">{{ e.userName }}</div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" v-if="!userList.length"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  // 选择创建人
+  name: "selectUser",
+  data() {
+    return {
+      selected: {},
+      userList: [],
+      current: 1,
+      tabIndex: null,
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    hasData() {
+      return this.userList?.length > 0
+    }
+  },
+  onLoad(o) {
+    this.tabIndex = o.tabIndex
+    this.selected = uni.getStorageSync('userSelect') || []
+    this.getCreateUserList()
+  },
+  methods: {
+    isSelected(userId) {
+      return this.selected.userId===userId
+    },
+    getCreateUserList() {
+      this.userList = []
+      let url = '/app/appmasssendingtask/createUserlist'
+      // if(this.tabIndex == 0) {
+      //   url = `/app/appmasssendingtask/createUserlist`
+      // } else {
+      //   url = `/app/whchatmomentstask/createUserlist`
+      // }
+      this.$http.post(url).then(res => {
+        if (res?.data) {
+          this.userList = res.data.map(e => ({
+            userId: e.create_user_id,
+            userName: e.create_user_name, 
+            isChecked: this.isSelected(e.create_user_id)}
+          ))
+        }
+      })
+    },
+    itemCheck(row) {
+      this.userList.forEach(e => e.isChecked = false)
+      const index = this.userList.findIndex(o => {
+        return row.userId===o.userId
+      })
+      this.userList[index].isChecked = true
+      this.selected = this.userList[index]
+    },
+    submit() {
+      if(!this.selected.userId) {
+        return this.$u.toast('请选择创建人')
+      }
+      uni.$emit("pagePicker:custom", [this.selected])
+      uni.setStorageSync('userSelect', this.selected)
+      uni.navigateBack()
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectUser {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .imges {
+      display: flex;
+      align-items: center;
+
+      .imgselect {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+        background-image: url("./images/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./images/xzh.png");
+        }
+      }
+
+      .avatras {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+        margin-left: 36px;
+      }
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          flex-shrink: 0;
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .idNumbers {
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .color-3F8DF5 {
+    color: #3F8DF5;
+  }
+
+  .mar-h4 {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppCooperationPropaganda/sendScoped.vue b/src/project/biaopin/AppCooperationPropaganda/sendScoped.vue
new file mode 100644
index 00000000..b9a1b709
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/sendScoped.vue
@@ -0,0 +1,212 @@
+<template>
+  <div class="sendScoped">
+    <div class="checkedBox">
+      <div class="item" v-for="(item,index) in checkList" :key="index" @click="checkBtn(item)">
+        <div class="left">
+          <icon type="success" size="18" v-if="item.value == sendScope"/>
+          <icon type="circle" size="18" v-if="item.value != sendScope" />
+          <div class="title">{{ item.name }}</div>
+        </div>
+        <div class="right" v-if="item.value != 0">
+          <div v-if="item.value == '1' && deptSelect.length">已选择{{ deptSelect.length }}个部门</div>
+          <div v-if="item.value == '2' && girdSelect.length">已选择{{ girdSelect.length }}个网格</div>
+          <u-icon name="arrow-right" color="#CCD0D3" ></u-icon>
+        </div>
+      </div>
+    </div>
+    <div class="btn">
+      <div class="submitBtn" @click="submit">确定</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'sendScoped',
+  data() {
+    return {
+      value: '',
+      checkList: [
+        // { name: '全部居民群', value: '0'},
+        { name: '按部门选择', value: '1'},
+        // { name: '按网格选择', value: '2'}
+      ],
+      showContent: false,
+      sendType: '', // Residents,CircleOfFriends,ResidentsGroup
+      deptSelect: [],
+      girdSelect: [],
+      sendScope: '1',
+      girdListIds: [],
+      deptListIds: [],
+      wxGroups: [],  // 居民群,居民,朋友圈
+      sex: '',
+      ResidentTags: [],
+      ResidentTagsRemove: [],
+      circleTags: [],
+      circleTagsRemove: [],
+      startTime: '',
+      endTime: '',
+    }
+  },
+  methods: {
+    checkBtn(e) {
+      if(e.value == '1' || e.value == '2') {
+        uni.navigateTo({url: `./scopedSelect?type=${e.value}&sendType=${this.sendType}`})
+      }
+      this.sendScope = e.value;
+      uni.setStorageSync('sendScope', this.sendScope)
+    },
+    submit() {
+      this.$loading()
+      if(this.sendType == 'ResidentsGroup') {
+        this.getWxGroups()
+      }
+      if(this.sendType == 'Residents' || this.sendType == 'CircleOfFriends') {
+        this.getSendScope()
+      }
+      uni.setStorageSync('sendScope', this.sendScope)
+      
+    },
+    // 群发居民群
+    getWxGroups() {
+      uni.showLoading({title: '加载中'})
+      this.$http.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.sendScope}`,
+      {
+        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',') || ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.wxGroups = res.data
+          uni.hideLoading()
+          uni.setStorageSync('wxGroupsUser', this.wxGroups)
+        }
+      }).then(()=> {
+        uni.hideLoading()
+        uni.navigateBack()
+      }).finally(()=> {
+        uni.hideLoading()
+      })
+    },
+    // 群发朋友圈、居民
+    getSendScope() {
+      uni.showLoading({title: '加载中'})
+      let formData = {}
+      if(this.sendScope == 0) {
+        formData = {
+          sendScope: this.sendScope,
+          taskType: this.sendType == 'Residents'? 1:0,
+        }
+      } else {
+        let resTags='', cirTags='', resRemove='', cirRemove=''
+        if(this.ResidentTags.length) {
+          resTags = this.ResidentTags?.map(e=> e.id).toString()
+        } else if(this.circleTags.length) {
+          cirTags = this.circleTags?.map(e=> e.id).toString()
+        } else if(this.ResidentTagsRemove.length) {
+          resRemove = this.ResidentTagsRemove?.map(e=> e.id).toString() || ''
+        } else if(this.circleTagsRemove.length) {
+          cirRemove = this.circleTagsRemove?.map(e=> e.id).toString() || ''
+        }
+        
+        formData = {
+          filterCriteria: this.girdListIds.toString() || this.deptListIds.toString() || '',
+          sendScope: this.sendScope,
+          tags: resTags || cirTags,
+          excludeTags: resRemove || cirRemove,
+          addFromTime: this.startTime,
+          addEndTime: this.endTime,
+          gender: this.sex,
+          taskType: this.sendType == 'Residents'? 1:0,
+        }
+      }
+      this.$http.post(`/app/whchatmomentstask/getSendScope`,{...formData}).then(res => {
+        if (res.code === 0) {
+          this.wxGroups = res.data
+          uni.setStorageSync('wxGroupsUser', this.wxGroups)
+        }
+      }).then(()=> {
+        uni.hideLoading()
+        uni.navigateBack()
+      })
+    }
+  },
+  onLoad(o) {
+    this.sendType = o.type;
+    document.title = "选择发送范围"
+  },
+  onShow() {
+    this.sendScope = uni.getStorageSync('sendScope') || ''
+    // 部门、网格
+    const girdArr = uni.getStorageSync('girdSelect')
+    if(girdArr.length) {
+      this.girdListIds = girdArr.map(e=>e.id)
+    }
+    const deptArr = uni.getStorageSync('deptList')
+    if(deptArr.length) {
+      this.deptListIds = deptArr.map(v=>v.id)
+    }
+    // 性别
+    this.sex = uni.getStorageSync('gender')
+    // 标签
+    if(this.sendType == 'Residents') { 
+      this.ResidentTags = uni.getStorageSync('ResidentTags') // 居民包含
+      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove') // 居民剔除
+    } else if(this.sendType == 'CircleOfFriends') {
+      this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含
+      this.circleTagsRemove = uni.getStorageSync('circleTagsRemove') // 朋友圈剔除
+    }
+    // 时间
+    this.startTime = uni.getStorageSync('startTime')
+    this.endTime = uni.getStorageSync('endTime')
+    
+  }
+}
+</script>
+<style lang="scss" scoped>
+.sendScoped {
+  .checkedBox {
+    background: #FFF;
+    padding: 0 32px;
+    box-sizing: border-box;
+    .item {
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 1px solid #DDD;
+      padding: 30px 0;
+      box-sizing: border-box;
+      .left,
+      .right {
+        display: flex;
+        align-items: center;
+        .title {
+          margin-left: 12px;
+        }
+      }
+    }
+  }
+  
+
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #FFF;
+    display: flex;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    .submitBtn {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      border-radius: 8px;
+      border: 2px solid #CCCCCC;
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCooperationPropaganda/tagsList.vue b/src/project/biaopin/AppCooperationPropaganda/tagsList.vue
new file mode 100644
index 00000000..9164faef
--- /dev/null
+++ b/src/project/biaopin/AppCooperationPropaganda/tagsList.vue
@@ -0,0 +1,158 @@
+<template>
+  <div class="tagsList">
+    <div class="tags-group">
+      <div class="tags-list" v-for="items in subTags" :key="items.id">
+        <div class="tag_title">{{ items.name }}</div>
+        <div class="item"
+          v-for="item in items.tagList"
+          :class="checked.map(e=>e.id).includes(item.id)? 'active' : ''"
+          :key="item.id"
+          @click="onClick(item)">
+          {{ item.name }}
+        </div>
+      </div>
+    </div>
+    <div class="btn" @click="submit">
+      <div>确定</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "tagsList",
+  data() {
+    return {
+      sendType: '',
+      subTags: [],
+      checked: [],
+      type: '',
+    }
+  },
+  methods: {
+    getTags() {
+      this.$http.post(`/app/wxcp/wxcorptag/listAll?current=1&size=3000`).then(res => {
+        if (res?.data) {
+          this.subTags = res.data.records
+        }
+      })
+    },
+    onClick(item) {
+      const index = this.checked.map(i=>i.id).indexOf(item.id)
+      if (index === -1) {
+        this.checked.push(item)
+      } else {
+        this.checked.splice(index, 1)
+      }
+    },
+    submit() {
+      if(this.sendType == 'Residents') {
+        if(this.type == '0') {  // 居民包含
+          uni.setStorageSync('ResidentTags', this.checked)
+        } else if(this.type == '1') {  // 居民剔除
+          uni.setStorageSync('ResidentTagsRemove', this.checked)
+        }
+      } else if(this.sendType == 'CircleOfFriends') {
+        if(this.type == '0') {  // 朋友圈包含
+          uni.setStorageSync('circleTags', this.checked)
+        } else if(this.type == '1') {  // 朋友圈剔除
+          uni.setStorageSync('circleTagsRemove', this.checked)
+        }
+      }
+      uni.navigateBack()
+    }
+  },
+  onShow() {
+    this.getTags()
+    this.checked = []
+    if(this.sendType == 'Residents') {
+      if(this.type == 0) {  // 居民包含
+        this.checked = uni.getStorageSync('ResidentTags') || []
+      } else {  // 居民剔除
+        this.checked = uni.getStorageSync('ResidentTagsRemove') || []
+      }
+    } else if(this.sendType == 'CircleOfFriends') {
+      if(this.type == 0) {  // 朋友圈包含
+        this.checked = uni.getStorageSync('circleTags') || []
+      } else {  // 朋友圈剔除
+        this.checked = uni.getStorageSync('circleTagsRemove') || []
+      }
+    }
+  },
+  onLoad(o) {
+    document.title = o.type ==0? '包含标签': '剔除标签'
+    this.sendType = o.sendType
+    this.type = o.type
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tagsList {
+  padding-bottom: 120px;
+  box-sizing: border-box;
+
+  .tags-group {
+    margin-bottom: 16px;
+    .tags-list {
+      display: flex;
+      flex-wrap: wrap;
+      line-height: 1;
+      padding: 0 32px;
+      box-sizing: border-box;
+      background: #FFF;
+      margin-bottom: 16px;
+
+      .tag_title {
+        width: 100%;
+        height: 108px;
+        line-height: 108px;
+        color: #333333;
+        font-size: 32px;
+      }
+
+      .item {
+        height: 64px;
+        line-height: 64px;
+        margin: 0 16px 16px 0;
+        padding: 0 32px;
+        color: #333333;
+        font-size: 28px;
+        background: #F3F4F7;
+        border-radius: 4px;
+        max-width: 100%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+
+        &.active {
+          color: #fff;
+          background: #1365DD;
+        }
+      }
+    }
+  }
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #FFF;
+    display: flex;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    div {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      border-radius: 8px;
+      border: 2px solid #CCCCCC;
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppCreditPoints/AppCreditPoints.vue b/src/project/biaopin/AppCreditPoints/AppCreditPoints.vue
new file mode 100644
index 00000000..0cfd507b
--- /dev/null
+++ b/src/project/biaopin/AppCreditPoints/AppCreditPoints.vue
@@ -0,0 +1,482 @@
+<template>
+  <section class="AppCreditPoints">
+     <AiTabPanes :tabs="tabList" v-model="tabIndex" @change="handChangeTab" />
+    <div class="area-content">
+      <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
+        <img src="components/img/local-icon.png" alt="">
+        <span class="label" v-if="areaName">{{ areaName }}</span>
+        <span v-else>请选择</span>
+        <u-icon name="arrow-down" color="#666" size="24"/>
+      </AiAreaPicker>
+    </div>
+    <u-gap height="6"/>
+    <div class="fill" v-if="info && info.length">
+      <div class="ranking-content" v-if="info && info.length">
+        <div class="item" v-if="info.length > 1" @click="toGridIntegral(2, info[1].integral_user_id)">
+          <img
+              src="https://cdn.cunwuyun.cn/dvcp/credit/2.png"
+              alt=""
+              class="top-img"
+          />
+          <img
+              :src="info[1].avatar_url"
+              alt=""
+              class="user-img mar-b4"
+              v-if="info[1].avatar_url"
+          />
+          <div class="user-name-bg mar-b4" v-else>
+            {{ formatName(info[1].name) }}
+          </div>
+          <p class="user-name mar-b8">
+            {{ info[1].name }}
+          </p>
+          <p class="item-num">{{ info[1].integral }}</p>
+        </div>
+        <div class="item-top item" v-if="info.length > 0" @click="toGridIntegral(1, info[0].integral_user_id)">
+          <img
+              src="https://cdn.cunwuyun.cn/dvcp/credit/1.png"
+              alt=""
+              class="top-img-one"
+          />
+          <img
+              :src="info[0].avatar_url"
+              alt=""
+              class="user-img mar-b4"
+              v-if="info[0].avatar_url"
+          />
+          <div class="user-name-bg mar-b4" v-else>
+            {{ formatName(info[0].name) }}
+          </div>
+          <p class="user-name mar-b8">
+            {{ info[0].name }}
+          </p>
+          <p class="item-num">{{ info[0].integral }}</p>
+        </div>
+        <div class="item" v-if="info.length > 2" @click="toGridIntegral(3, info[2].integral_user_id)">
+          <img
+              src="https://cdn.cunwuyun.cn/dvcp/credit/3.png"
+              alt=""
+              class="top-img"
+          />
+          <img
+              :src="info[2].avatar_url"
+              alt=""
+              class="user-img mar-b4"
+              v-if="info[2].avatar_url"
+          />
+          <div class="user-name-bg mar-b4" v-else>
+            {{ formatName(info[2].name) }}
+          </div>
+          <p class="user-name mar-b8">
+            {{ info[2].name }}
+          </p>
+          <p class="item-num">{{ info[2].integral }}</p>
+        </div>
+      </div>
+      <u-gap height="6"/>
+      <div class="ranking-list" v-if="info && info.length">
+        <div
+            class="item"
+            v-for="(item, index) in info"
+            :key="index"
+            v-if="index > 2"
+            @click="toGridIntegral(index, item.integral_user_id)"
+        >
+          <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-else/>
+  </section>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppCreditPoints",
+  appName: "积分排行",
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      info: [],
+      current: 1,
+      areaId: '',
+      areaName: '',
+      tabIndex: 0,
+      tabList: ['总榜', '月榜', "周榜"],
+    }
+  },
+  created() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName || ''
+    this.getInfo();
+  },
+  methods: {
+    handChangeTab() {
+      this.getInfo()
+    },
+    areaSelect(e) {
+      this.areaId = e
+      this.getInfo()
+    },
+    // 积分排行
+    getInfo() {
+      this.info = []
+      this.$http.post(`/app/appintegraluser/integralSortFD?type=${this.tabIndex}&areaId=${this.areaId}`).then((res) => {
+        if (res?.data) {
+          this.info = res.data
+        }
+      });
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
+    },
+    toGridIntegral(rankNum, userId) {
+      uni.navigateTo({url: `./gridIntegral?rankNum=${rankNum}&userId=${userId}`})
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+.AppCreditPoints {
+  width: 100vw;
+  background-color: #f3f6f9;
+
+  .bg-blue {
+    width: 100%;
+    height: 176px;
+    background-color: #3975C6;
+  }
+
+  .header-content {
+    width: 690px;
+    height: 256px;
+    background: #fff;
+    border-radius: 16px;
+    margin: -130px 0 40px 30px;
+    padding: 100px 60px 40px 60px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+
+    .item {
+      text-align: center;
+      z-index: 99;
+
+      .num {
+        font-family: DIN;
+        font-size: 52px;
+        font-weight: bold;
+        line-height: 60px;
+      }
+
+      .label {
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 40px;
+        margin-top: 10px;
+      }
+
+      .color-5AAD6A {
+        color: #5aad6a;
+      }
+
+      .color-4185F5 {
+        color: #4185f5;
+      }
+
+      .color-CD413A {
+        color: #cd413a;
+      }
+    }
+
+    img {
+      position: absolute;
+      width: 360px;
+      height: 250px;
+      top: -40px;
+      right: 0;
+    }
+  }
+
+  .ranking-content {
+    padding: 94px 30px 32px;
+    background-color: #fff;
+    .item {
+      display: inline-block;
+      width: 216px;
+      height: 320px;
+      box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+      border-radius: 12px;
+      padding: 40px 0 0 0;
+      text-align: center;
+      box-sizing: border-box;
+      position: relative;
+      vertical-align: top;
+      background: #fff;
+
+      .user-name {
+        font-size: 30px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 42px;
+        word-break: break-all;
+      }
+
+      .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;
+      height: 366px;
+
+      .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;
+      }
+
+      .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: 432px 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;
+  }
+
+  .header-tab {
+    height: 96px;
+    background-color: #3975C6;
+    padding: 20px 0;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  .header-tab .tab-item {
+    flex: 1;
+    text-align: center;
+    position: relative;
+    color: #fff;
+    font-size: 28px;
+  }
+
+  .header-tab .tab-active {
+    font-weight: 500;
+  }
+
+  .header-tab .active-line {
+    position: absolute;
+    width: 40px;
+    height: 4px;
+    background: #FFF;
+    top: 48px;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .area-content {
+    padding: 32px;
+    background-color: #fff;
+
+    img {
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
+  }
+
+
+  ::v-deep .content {
+    padding: 0;
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppCreditPoints/components/img/line.png b/src/project/biaopin/AppCreditPoints/components/img/line.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde78ee820f24f4e7ac3e5572cf074674acba05c
GIT binary patch
literal 700
zcmeAS@N?(olHy`uVBq!ia0y~yV0s5+b8s*N$%&3#en5&P-O<;Pfnj4m_n$;oAfK@~
z$lZxy-8q?;K#oglglC$sFM}44&B4Ifp2@%hQUb(MK+M3vynvAbWELYxYylHYmg(IB
zW*8f&4+#G8TH6Du$pJngu0ENCm)$o5(N*^?_lgtm6h{Erdl&ZX@I16P@F0-wy?4>&
z6!*(nZdbD0+uSc-$#ipDdb!Q*^5y03?m&h+2mv7oExY_Bz2|F2FOa;v!oAw<lE+mK
zpkk29EAC%1dO)h&+%CDfT}}d$n=S#3T5_r1?b7G;?n}!+5<o3L+0!{in}E*KC<*cl
zW@z~2D`|a$O`Uh6<l|#$4YSVNxR&p?aoIh~XKBaMK3XoAnKo-})%#!fs?G=ieeUe(
z;usQf`0cdQLQMuduB*koSzQG_=<Ykd{qO(v#m90t?MU7{@#Wq23tvo%ukiY;^r*Va
zJ*{!s(VNmfZrO{!bfum!S@$j>%RB4qlg?D3i^tBsX-%CqA<CM;{qEa~$CL}Au5VnZ
z9%s8jM@in{#fr%?s>OcNudjRz++V+$dEV1Y3xl_qa{OL4X|LVXg<Fcx^DLWNnf6=U
z%lhx@9sGT}<R?cNyB#-8^4r6Z8J{WdknvV#sjdHv{dU&+cZwg@3X3beZT;}|rqoiP
zu55vC&-<9NmubAMzNx#i{lS)?G+TYg8}jVR+#a3lzUgkh=y$I2;l8PN%~#!O*mC{Q
zb#ZZpH+PJ0FWj;|^D&F)%t+<ks<nI0%LLq-?j<(ilJmy57k@sK+hUvX`+v4|SM`N&
z3*PEpDC7CQ;H~5B=!I_u-Z|cG-nQNO_Wqv?p@pkgTgTd71f>*DS3j3^P6<r_Umh|Q

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCreditPoints/components/img/local-icon.png b/src/project/biaopin/AppCreditPoints/components/img/local-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e23aff6ab5f4ec6d80c86118da1c7f1f48fc80b
GIT binary patch
literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF%Sl8*RA>e5SUqS{Q53%CCAKzc
z6$h!sZXJt=t>Vw5;-JMYf=)V!iiiz}b5#&s9JG*bRa`oVf-a>Bia1EI^iL5ti%Zc)
z6bH%ck2S}0lDzVopLfnnZt9W?;oaQx_kHJ{`}3YL^;XY7Jp=U&{Lc)4t>DK-u`xB9
zK4=UaHwJgovki^e#{MbDJdJ&$-UoV)w06YbJnw-e8?mb<uy+Vs|17%wh~_MTi|ar^
z8o)f<urYRP`~swOHl?*HCUEjGHq55n>jeCY9(W;$ERlhZ*4WJ_r(n5Is`+0L0nYmJ
zg8P(!AJ7DmbzrQaDR!cg*$7RbJGrzYgDay1zFh_uMg!&?i1th+8b5}z3ZtCQ{G@&G
z9txPFnb;j>CLGUHdUDO@%f@o%{gJVqHiTy!%Rd^_R}<g`Yp>?ZLqf#;xme|O{1Vj~
z$d}G65m0WE{t)5&0N_R(?3lRROy@^%Q_TSH^Xmnk;nFO`{$}7>F!Y>MB)}(Z?vT>B
zBOL&w3=TPtvu|@G-oiib^BBvNUYNxhjxFg&C57Dez^F<G4A6DKIX#_ddR^dmoc@n@
zB^MqUlNm;XZ3Xh8zr?g9^(B3X1TTt&z5#ItD5Z3_Q8dmjlmx$OoFzs&>Y2zu@2YW`
zj)DMR%;ZM9!Tl1MFEV5u)-4j07@)P#Sz>t2kb(e+)6E{K#viQl9Pmf0OC>3uIU)h?
zN*sVED{6tJPm+!&SL=e=?%9-kiUi6TuFp7%?+hXVs#ozaVKTpQL9ADgv|1P8hi6mn
zDH5O!nYKo`(SkcCYvnZ5x?sLbJ{1J`HBfG}R?gEte^}CF9oCifa&mkp=_v@{h~y+I
zM+AeJ;UE%O8R^g|OO+`%$G}TTOLWA?`TS@1r}{3$R|(qZd8_nx8?JdSn{4Kl;K|;F
zhS=7ri{J*45DBnxS2CR>0DVD@Y|H4S|K4<>`KshsQ9{P>*8@7L(vmY<a?1W<#4&d?
z{!|3`6^}A9pmAtL2h3f~y8y>h5nx6B^g**Q#{F70x<0(!)ET>>jiFitp0k?2)Mxj7
z*fo=gfAwNYPxTD2BQB+A1bgXQ;V;Q?XgT?eMB!){@Eju)0XCr8eD44pu}Xr#v(L#(
z@fnU0riCgYzvJ$~bXNxPl|i$`KOVZD2S3#ppAKzH1{D+FU{#Z-5<Fw5ia=E)EP%H{
zpdu2Mz*{2_iiAb*Rtcy`SO#yMKp=@4fUgOGk|b&bzGej2@t(n@&Xvr{ZMp<v1fu;D
neU0j`7HnT{^$gTApv%BNee`t*HU#Bi00000NkvXXu0mjftbXz<

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppCreditPoints/gridIntegral.vue b/src/project/biaopin/AppCreditPoints/gridIntegral.vue
new file mode 100644
index 00000000..a216fc6b
--- /dev/null
+++ b/src/project/biaopin/AppCreditPoints/gridIntegral.vue
@@ -0,0 +1,263 @@
+<template>
+  <div class="gridIntegral">
+    <div class="bg-blue"></div>
+    <div class="header-content">
+      <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+      <div class="headerDataPane">
+        <div class="header-user" flex>
+          <div class="user-name">{{info.userName}}</div>
+          <div class="headerItem top">
+            <div v-text="`积分余额`"/>
+            <b v-text="info.integral||0"/>
+          </div>
+        </div>
+        <div class="header-rank" flex>
+          <div class="headerItem">
+            <div v-text="`历史累计积分`"/>
+            <b v-text="info.totalIntegral||0"/>
+          </div>
+          <div class="divider"/>
+          <div class="headerItem">
+            <div v-text="`积分排名`"/>
+            <b v-text="rankNum"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="detail-content" v-if="list.length">
+      <div flex>
+        <div class="title fill">积分明细</div>
+        <!-- <u-icon name="question-circle" label="积分规则" color="#3F8DF5" label-color="#3F8DF5" @click="gotoRules"/> -->
+      </div>
+      <u-gap/>
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-info">
+          <p v-text="item.eventDesc||item.integralRuleName"/>
+          <span v-text="item.doTime"/>
+        </div>
+        <div class="item-num" :class="'color-'+ item.integralCalcType">
+          {{ (item.integralCalcType == 1 ? '+' : '-') + item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else/>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "gridIntegral",
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      info: {},
+      list: [],
+      current: 1,
+      pages: 0,
+      userId: '',
+      rankNum: ''
+    }
+  },
+  created() {
+    this.getInfo()
+    this.getList()
+  },
+  onLoad(option) {
+    this.rankNum = option.rankNum
+    this.userId = option.userId
+  },
+  onShow() {
+    document.title = '积分明细'
+  },
+  methods: {
+    // 积分排行
+    getInfo() {
+      this.$http.post(`/app/appintegraluser/integralUserInfoFD?integralUserId=${this.userId}`).then(res => {
+        if (res?.data) {
+          this.info = res.data
+        }
+      })
+    },
+    getList() {
+      this.$http.post(`/app/appintegraldetail/list`, null, {
+        params: {current: this.current, size: 10, integralUserId: this.userId}
+      }).then(res => {
+        if (res?.data) {
+          this.list = [this.list, res.data.records || []].flat()
+        }
+      })
+    },
+    gotoRules() {
+      uni.navigateTo({url: './integralRules'})
+    }
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  }
+}
+</script>
+<style scoped lang="scss">
+.gridIntegral {
+  width: 100vw;
+  min-height: 100vh;
+  background-color: #f3f6f9;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .bg-blue {
+    width: 100%;
+    height: 270px;
+    background-color: #3975C6;
+  }
+
+  .header-content {
+    width: 690px;
+    height: 408px;
+    margin: -130px 0 40px;
+    padding: 32px;
+    box-sizing: border-box;
+    position: relative;
+    background: #FFF;
+    border-radius: 16px;
+
+    .headerDataPane {
+      
+      top: 76px;
+      left: 0;
+      right: 0;
+      position: absolute;
+      z-index: 9;
+      
+
+      .header-rank {
+        flex-wrap: wrap;
+        justify-content: space-around;
+      }
+      .header-user {
+        padding: 0 64px;
+        display: flex;
+        justify-content: space-between;
+        .user-name {
+          font-size: 50px;
+          font-weight: 500;
+        }
+      }
+      .headerItem {
+        text-align: center;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999999;
+        line-height: 40px;
+
+        b {
+          display: block;
+          line-height: 50px;
+          color: #000;
+          font-size: 36px;
+          font-family: DIN, DINAlternate-Bold, DINAlternate;
+          margin-bottom: 10px;
+        }
+
+        &.top {
+          b {
+            font-size: 104px;
+            line-height: 122px;
+          }
+        }
+      }
+    }
+
+    & > img {
+      position: absolute;
+      width: 342px;
+      height: 220px;
+      top: -60px;
+      right: 10px;
+      z-index: 2;
+    }
+  }
+
+  .mar-b4 {
+    margin-bottom: 8px;
+  }
+
+  .mar-b8 {
+    margin-bottom: 16px;
+  }
+
+  .detail-content {
+    width: 690px;
+    background: #FFF;
+    border-radius: 16px;
+    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;
+    }
+
+    .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-1 {
+    color: #2C51CE !important;
+  }
+
+  .color-0 {
+    color: #E6736E !important;
+  }
+
+  .divider {
+    width: 2px;
+    height: 60px;
+    background: #ededed;
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppPointsReview/AppPointsReview.vue b/src/project/biaopin/AppPointsReview/AppPointsReview.vue
new file mode 100644
index 00000000..ce3f0a4f
--- /dev/null
+++ b/src/project/biaopin/AppPointsReview/AppPointsReview.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="AppPointsReview">
+    <AiTopFixed>
+      <div class="top-search">
+        <div class="left">
+          <u-search v-model="search.createUserName" :clearabled="true" placeholder="请输入申请人、审批人" :show-action="false" bg-color="#F5F5F5"
+            search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
+          </u-search>
+        </div>
+      </div>
+      <div class="top-select">
+        <div class="item" @click="showDateSelect=true">
+          <span v-if="!search.startTime" style="color:#999;">日期筛选</span>
+          <span v-else>{{ search.startTime }}至{{ search.endTime }}</span>
+          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" v-if="!search.startTime" />
+          <img src="./img/del-icon.png" alt="" class="del-icon" v-else @click.stop="clearDate">
+        </div>
+        <div class="item" @click="isShowType=true">
+          <span style="color:#999;" v-if="!search.type">事件类型</span>
+          <span v-else>{{ search.typeName }}</span>
+          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" v-if="!search.type"/>
+          <img src="./img/del-icon.png" alt="" class="del-icon" v-else @click.stop="clearType">
+        </div>
+      </div>
+    </AiTopFixed>
+    <div class="list-content">
+      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
+        <div class="title-flex">
+          <p class="title">{{item.applyItemName}}</p>
+          <div class="btn" v-if="item.status == 1">
+            <p v-if="item.pushStatus == 1">已推送</p>
+            <div @click.stop="pushNew(item.id)" v-else>推送精选</div>
+          </div>
+        </div>
+        <div class="user-name">{{item.integralUserName}}<span>积分+{{item.applyIntegral}}</span></div>
+        <div class="time-flex">
+          <span>{{item.createTime}}</span>
+          <span :class="`color-${item.status}`">{{ $dict.getLabel('appIntegralApplyEventStatus', item.status) }}</span>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-if="!list.length" description="暂无数据"></AiEmpty>
+
+    <u-calendar v-model="showDateSelect" mode="range" min-year="2023" @change="dateConfirm"></u-calendar>
+    <u-select v-model="isShowType" :list="typeList" value-name="id" label-name="ruleName" @confirm="typeConfirm"></u-select>
+    <u-modal v-model="showPush" :show-cancel-button="true" content="是否将精选内容对全体居民公开，选择否将只对本村/社区公开" 
+      confirm-text="是" cancel-text="否" @confirm="pushNewConfirm(1)" @cancel="pushNewConfirm(1)" :mask-close-able="true"></u-modal>
+    <AiAdd @add="toAdd"/>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "AppPointsReview",
+  appName: "积分审核",
+  data() {
+    return {
+      keyword: '',
+      areaId: '',
+      areaName: '',
+
+      showDateSelect: false,
+      search: {
+        createUserName: '',
+        startTime: '',
+        endTime: '',
+        type: '',
+        typeName: ''
+      },
+      list: [],
+      current: 1,
+      pages: 2,
+      typeList: [],
+      isShowType: false,
+      showPush: false,
+      pushNewId: ''
+    };
+  },
+  computed: {
+    ...mapState(['user']),
+    isGridMember() {
+      return this.user.girdCheckType > 0
+    },
+  },
+  onLoad() {
+    this.$dict.load('appIntegralApplyEventStatus').then(() => {
+      this.getListInit()
+    })
+    this.getTypeList()
+    uni.$on('updateList', () => {
+      this.getListInit()
+    })
+  },
+  methods: {
+    getListInit() {
+      this.current = 1
+      this.pages = 2
+      this.getList()
+    },
+    getList() {
+      console.log(4)
+      if (this.current > this.pages) return
+      this.$http.post(`/app/appintegraluserapply/listByGridMember`,null, {
+        params:{
+          ...this.search,
+          current: this.current,
+          size: 10,
+          applyItemId: this.search.type,
+          createTimeStart: this.search.startTime,
+          createTimeEnd: this.search.endTime
+        }
+      }).then(res=> {
+        if(res?.data) {
+          res.data.records.map((item) => {
+            item.createTime = item.createTime.substring(0, 16)
+          })
+          this.list = this.current > 1 ? [...this.list, ...res.data.records]: res.data.records
+          this.pages = Math.ceil(res.data.total / 10)
+        }
+      })
+    },
+    dateConfirm(e) {
+      console.log(123)
+      this.search.startTime = e.startDate
+      this.search.endTime = e.endDate
+      this.getListInit()
+    },
+    toDetail(id) {
+      uni.navigateTo({url: `./detail?id=${id}`})
+    },
+    getTypeList() {
+      this.$http.post(`/app/appintegralrule/listByFD`).then(res=> {
+        if(res?.data) {
+          this.typeList = res.data
+        }
+      })
+    },
+    typeConfirm(e) {
+      this.search.type = e[0].value
+      this.search.typeName = e[0].label
+      this.getListInit()
+    },
+    pushNew(id) {
+      this.pushNewId = id
+      this.showPush = true
+    },
+    pushNewConfirm(status) {
+      this.$http.post(`/app/appintegraluserapply/pushById?id=${this.pushNewId}&status=${status}`).then(res=> {
+        if(res.code == 0) {
+          this.$u.toast('推送成功')
+          this.getListInit()
+        }
+      })
+    },
+    clearDate() {
+      this.search.startTime = ''
+      this.search.endTime = ''
+      this.getListInit()
+    },
+    clearType() {
+      this.search.type = ''
+      this.search.typeName = ''
+      this.getListInit()
+    },
+    toAdd() {
+      uni.navigateTo({url: './integralAdd'})
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1;
+    this.getList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.AppPointsReview {
+  height: 100%;
+  ::v-deep .AiTopFixed {
+    .placeholder {
+      .content {
+        padding: 0 !important;
+      }
+    }
+    .fixed {
+      margin: 0 !important;
+      .content {
+        padding: 0 !important;
+      }
+    }
+  }
+  .top-search {
+    padding: 20px 32px;
+    display: flex;
+    .left {
+      width: 100%;
+    }
+  }
+  .top-select {
+    display: flex;
+    padding: 28px 0;
+    .item {
+      flex: 1;
+      // padding: 0 8px;
+      text-align: center;
+      span {
+        display: inline-block;
+        font-family: PingFangSC-Medium;
+        font-weight: 500;
+        font-size: 28px;
+        color: #666;
+        line-height: 40px;
+      }
+      .del-icon {
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+        margin-left: 4px;
+      }
+    }
+  }
+  .list-content {
+    padding: 32px;
+    .item {
+      border-radius: 8px;
+      padding: 32px;
+      background-color: #fff;
+      margin-bottom: 32px;
+      .title-flex {
+        display: flex;
+        .title {
+          word-break: break-all;
+          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: 16px;
+          color: #333;
+          font-size: 32px;
+          font-weight: 500;
+          font-family: "PingFang SC";
+          line-height: 44px;
+          width: calc(100% - 182px);
+        }
+        .btn {
+          width: 182px;
+          text-align: right;
+          padding-left: 32px;
+          box-sizing: border-box;
+          div {
+            width: 150px;
+            text-align: center;
+            border-radius: 8px;
+            line-height: 56px;
+            background: #1365DD;
+            color: #fff;
+            font-size: 28px;
+          }
+          p {
+            font-size: 28px;
+            color: #666;
+          }
+        }
+      }
+      .user-name {
+        font-size: 28px;
+        color: #666;
+        line-height: 34px;
+        margin-bottom: 16px;
+        span {
+          margin-left: 32px;
+        }
+      }
+      .time-flex {
+        display: flex;
+        justify-content: space-between;
+        font-size: 28px;
+        color: #999;
+        line-height: 34px;
+        .color-0{
+          color: #FF9A40;
+        }
+        .color-1{
+          color: #42D784;
+        }
+        .color-2{
+          color: #cd413aff;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppPointsReview/detail.vue b/src/project/biaopin/AppPointsReview/detail.vue
new file mode 100644
index 00000000..02ab4283
--- /dev/null
+++ b/src/project/biaopin/AppPointsReview/detail.vue
@@ -0,0 +1,471 @@
+<template>
+  <div class="detail">
+    <div class="header-content">
+      <div class="title-flex">
+        <p>{{info.applyItemName}}</p>
+        <div :class="`color-${info.status}`">{{ $dict.getLabel('appIntegralApplyEventStatus', info.status) }}</div>
+      </div>
+      <div class="user-flex">
+        <div>申请人：{{info.integralUserName}}</div>
+        <div>电话号码：<span style="color:#1365DD;" @click="callPhone(info.phone)">{{info.phone}}</span></div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="title-flex">
+        <p>申请信息</p>
+        <div style="color:#1365DD;" v-if="info.status == 0">
+          <span style="margin-right:16px" v-if="isEdit" @click="isEdit=false;getDetail()">取消</span>
+          <span @click="edit">{{isEdit ? '保存' : '编辑'}}</span>
+        </div>
+      </div>
+      <div class="info-flex solid">
+        <div class="label">积分值</div>
+        <div class="value">
+          <u-input type="number" placeholder="请输入" input-align="right" placeholder-style="color:#999;font-size:16px;" height="40" v-model="info.applyIntegral" maxlength="10" v-if="isEdit"/>
+          <!-- <u-number-box v-model="info.applyIntegral" input-height="44" size="14" :min="1" :max="100" v-if="isEdit"></u-number-box> -->
+          <span v-else>{{info.applyIntegral}}</span>
+        </div>
+      </div>
+
+      <div class="info-flex">
+        <div class="label">详情描述</div>
+      </div>
+      <div class="info-textarea" v-if="isEdit">
+        <u-input v-model="info.content" type="textarea" :height="200" auto-height maxlength="300" placeholder="请输入详细描述" />
+        <div class="hint">{{ info.content.length }}/300</div>
+      </div>
+      <p class="text solid" v-else>{{info.content}}</p>
+
+      <div class="items solid" v-if="isEdit">
+        <p>上传图片</p>
+        <div class="upload">
+          <AiUploader :def.sync="info.images" placeholder="上传图片" type="image" :limit="9" multiple></AiUploader>
+        </div>
+        <div class="text-tips left">可上传图片，最多上传9张。</div>
+      </div>
+      <div class="items" v-if="isEdit">
+        <p>上传视频</p>
+        <div class="upload">
+          <AiUploader :def.sync="info.videos" placeholder="上传视频" type="video" :limit="9" multiple :size="30 * 1024 * 1024"></AiUploader>
+        </div>
+        <div class="text-tips left">可上传视频，最大30M。</div>
+      </div>
+      <div class="img-list" v-if="info.files && info.files.length && !isEdit">
+        <div v-for="(item, index) in info.files"  :key="index">
+          <div v-if="item.postfix == '.mp4' || item.postfix == '.MOV'" class="video-item" @click="choose(item)" >
+            <img :src="item.facePicture" alt="" class="pic-img">
+            <img :src="`${$cdn}video/play-icon.png`" alt="" class="play-icon">
+          </div>
+          <img :src="item.accessUrl" alt="" @click="previewImages(item.accessUrl)" class="pic-img" v-else>
+        </div>
+      </div>
+
+    </div>
+    <div class="pass-info" v-if="info.status == 2">
+      <div class="title"><span></span>未通过理由</div>
+      <p>{{info.auditDesc}}</p>
+    </div>
+    <div class="footer" v-if="info.status == 0 && !isEdit">
+      <div class="confirm" @click="agree()">通过</div>
+      <div class="cancel" @click="show=true">不通过</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="500" />
+        <p>字数{{ value.length }}/500</p>
+      </div>
+      <div class="btn">
+        <span @click="value = ''">清空内容</span>
+        <span class="confirm" @click="confirm">保存</span>
+      </div>
+    </u-popup>
+    <u-popup v-model="showVideo" mode="bottom">
+      <div class="audio">
+        <video controls class="only_video" :src="videoUrl" autoplay></video>
+        <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detail",
+  data() {
+    return {
+      show: false,
+      value: '',
+      id: '',
+      info: {},
+      showVideo: false,
+      videoUrl: '',
+      isEdit: false,
+      flag: false
+    };
+  },
+  onLoad(option) {
+    this.id = option.id
+    this.$dict.load('appIntegralApplyEventStatus').then(() => {
+      this.getDetail()
+    })
+  },
+  onShow() {
+    document.title = '积分详情'
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appintegraluserapply/queryDetailById?id=${this.id}`).then(res=> {
+        if(res?.data) {
+          this.info = res.data
+          this.info.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png'].includes(e.postfix.split('.')[1])))
+          this.info.videos = res.data.files.filter(e => (['mp4', 'MOV'].includes(e.postfix.split('.')[1])))
+          this.flag = false
+        }
+      })
+    },
+    confirm() {
+      if(!this.value) {
+        return this.$u.toast('请输入不通过原因')
+      }
+      this.submit(0)
+    },
+    agree() {
+      this.$confirm('确定通过该条申请').then(() => {
+        this.submit(1)
+      })
+    },
+    submit(status) {
+      this.$http.post(`/app/appintegraluserapply/auditById`, {
+        auditDesc: this.value,
+        id: this.id,
+        auditStatus: status
+      }).then(res=> {
+        if(res.code == 0) {
+          this.$u.toast('操作成功')
+          uni.$emit('updateList')
+          this.show = false
+          this.getDetail()
+
+        }
+      })
+    },
+    previewImages(img) {
+      var imgs = []
+      this.info.files.map((item) => {
+        if(item.postfix != '.mp4' || item.postfix != '.MOV') {
+          imgs.push(item.accessUrl)
+        }
+      })
+      uni.previewImage({
+        urls: imgs,
+        current: img
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({ phoneNumber: phone })
+    },
+    choose(item) {
+      this.videoUrl = item.accessUrl
+      this.showVideo = true
+    },
+    edit() {
+      if(this.isEdit) {
+        this.editSubmit()
+      }else {
+        this.isEdit = true
+      }
+    },
+    editSubmit() {
+      if(this.flag) return
+
+      if (!/^([1-9]\d*|0)(\.\d{1,2})?$/g.test(this.info.applyIntegral)) {
+        this.info.applyIntegral = Number(this.info.applyIntegral).toFixed(2)
+        return this.$u.toast('积分值最多只保留两位小数点')
+      }
+
+      if (!this.info.content) {
+        return this.$u.toast('请输入详细描述')
+      }
+
+      if ((this.info.images.length + this.info.videos.length) > 9) {
+        return this.$u.toast('图片和视频不得超过9个')
+      } else {
+        this.info.files = [...this.info.images,...this.info.videos]
+      }
+
+      this.flag = true
+      this.$http.post(`/app/appintegraluserapply/updateByGirdMember`,{
+        ...this.info,
+        userId: this.info.integralUserId,
+      }).then(res=> {
+        if(res?.data) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateList')
+          this.getDetail()
+          this.isEdit = false
+        }
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+uni-page-body {
+  background-color: #F4F5FA;
+}
+.detail {
+  height: 100%;
+  padding-top: 32px;
+  .title-flex {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 32px;
+    p {
+      color: #333;
+      font-size: 34px;
+      font-weight: 600;
+      font-family: "PingFang SC";
+      line-height: 40px;
+      word-break: break-all;
+    }
+    div {
+      font-size: 28px;
+      font-family: "PingFang SC";
+      line-height: 40px;
+      width: 280px;
+      text-align: right;
+      span {
+        display: inline-block;
+      }
+    }
+    .color-0{
+      color: #FF9A40;
+    }
+    .color-1{
+      color: #42D784;
+    }
+    .color-2{
+      color: #cd413aff;
+    }
+  }
+  .header-content {
+    background-color: #fff;
+    padding: 40px;
+    box-sizing: border-box;
+    margin-bottom: 32px;
+    .user-flex {
+      display: flex;
+      justify-content: space-between;
+      line-height: 42px;
+      margin-bottom: 16px;
+      font-size: 28px;
+      color: #333;
+    }
+  }
+  .content {
+    background-color: #fff;
+    padding: 32px;
+    box-sizing: border-box;
+    .info-flex {
+      display: flex;
+      padding: 24px 0;
+      line-height: 40px;
+      box-sizing: border-box;
+      .label {
+        color: #999;
+        vertical-align: top;
+        width: 160px;
+      }
+
+      .value {
+        display: inline-block;
+        width: calc(100% - 160px);
+        word-break: break-all;
+        text-align: right;
+      }
+      
+    }
+    .text {
+      color: #333;
+      font-size: 28px;
+      font-family: "PingFang SC";
+      line-height: 42px;
+      margin-bottom: 32px;
+      padding-bottom: 24px;
+    }
+    .info-textarea{
+      padding: 16px 0;
+      box-sizing: border-box;
+      border-bottom: 1px solid #ddd;
+      margin-bottom: 32px;
+      .hint {
+        padding: 4px 0 8px 0;
+        text-align: right;
+        color: #999;
+      }
+    }
+    .img-list {
+      div {
+        display: inline-block;
+      }
+      .pic-img {
+        width: 210px;
+        height: 210px;
+        margin: 0 16px 16px 0;
+      }
+      .pic-img:nth-of-type(3n) {
+        margin-right: 0;
+      }
+      .video-item {
+        position: relative;
+      }
+      .play-icon {
+        position: absolute;
+        top: 80px;
+        left: 80px;
+        width: 50px;
+        height: 50px;
+      }
+    }
+  }
+  .pass-info {
+    padding: 40px;
+    background-color: #fff;
+    .title {
+      color: #222;
+      font-size: 30px;
+      font-family: "PingFang SC";
+      line-height: 40px;
+      margin-bottom: 24px;
+
+      span {
+        display: inline-block;
+        width: 12px;
+        height: 12px;
+        background-color: #CD413A;
+        border-radius: 50%;
+        margin-right: 8px;
+      }
+    }
+    p {
+      color: #666;
+      font-size: 28px;
+      font-family: "PingFang SC";
+      line-height: 42px;
+      word-break: break-all;
+    }
+  }
+  .footer{
+    width: 100%;
+    height: 96px;
+    background: #FFF;
+    box-shadow: inset 0 0 0 0 #D4D4D4;
+    box-sizing: border-box;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    div {
+      flex: 1;
+      height: 96px;
+      line-height: 96px;
+      background: #FFF;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      text-align: center;
+      font-weight: 500;
+    }
+    .cancel {
+      color: #1365DD;
+      box-sizing: border-box;
+    }
+    .confirm {
+      background-color: #1365DD;
+      color: #fff;
+    }
+  }
+  .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;
+    }
+  }
+  .audio {
+    width: 100%;
+    height: 600px;
+    box-sizing: border-box;
+    padding: 32px;
+    .only_video {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .items {
+    width: 100%;
+    background: #FFF;
+    margin-bottom: 24px;
+    p {
+      padding: 24px 0;
+      box-sizing: border-box;
+    }
+    textarea {
+      padding: 24px 32px;
+      box-sizing: border-box;
+      width: 100%;
+    }
+    .tips {
+      color: #f46;
+      font-size: 24px;
+      vertical-align: middle;
+      margin-right: 8px;
+    }
+
+    .text-tips {
+      padding: 12px 0;
+      box-sizing: border-box;
+      text-align: right;
+      color: #999999;
+      font-size: 24px;
+      font-weight: 400;
+    }
+    .left {
+      text-align: left;
+    }
+    .upload {
+      padding: 24px 0 0 0;
+      box-sizing: border-box;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppPointsReview/img/del-icon.png b/src/project/biaopin/AppPointsReview/img/del-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..12a7abae176ad6732ea5ba049c333a8e82b225b7
GIT binary patch
literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%uSrBfR9HvNmpyFLP!Pxe_ngpy3KsBJ#1JYNiV#d7n1Bts74cDK=+2Z*AjCqE
zDv+3HM<ifk>)K9;kF7%Lf?#MA$96W9inO)gp_ebEA&%{kkb1J@d-wmndw1u1goKap
z`;$`287Xm%na_c662Ot>@?T*5B%%!=uqK39)pfm^#5Khkd7d{FhFoCqJphN}?3>@W
z3G`OeXwfi?AN|%u0(@tlm~{OolI24HhY|{Ro9zk`FRG^g_!QAjFCRSteBU?2P=1ii
zmj)Exw@eUys?~na=JR>C+uvURuIru+C9eWFF%0nzA4N^jjA@$RI{oegP&?lX!mlF`
zZ)p~@8SR3u>+MLi0UBrStq&{gQPES!Q8kULt(<5Bl*`^T$+9ryu=jK)NGw{Gv7kQI
z0aU34q1^n3Y){L*o6*FyD$zQC<G9NVeh}q_nN>M0G598c({XA<cms%I%<_7aErC{S
z+nguW;r4=1B}HVDAz;(CtuvnI8KLAgW}c38On7Qr)}vyvd_`zj?*qG?&1fdMu6rkx
z{6211AUw}mR-qpRHO05KDz=shlz880X@c&O<G8OGJRb|t$e2iowBikSv`nQ^`7;O?
z69Gg(3?g3FV|<~KQ}zKIPYlon5d?fYmor}_4SSbPMFG?ROr!$nfKaakimRnN0|T_e
z-s~f>)e*75IzZ|p=sfdmR?b<Lv6Q4ldq7lDCt=ToOHiUcBcPHnO&Rvh_5mR3Wtg-P
zB`UR)5cNisq!ojCBbT$!C(8CFM9K3mBa|OwTd^`IInD||_xl*v2=o%*TMSIal`MhY
zf%qshZp8kK4#e+RL5y`EQ2=8f$rQv`htgKEjCCw;L5$*JqG@8ba~yAJ9n7m)XYDp7
n=5PU^x&L}O?QS5Wx}N_5d`sr~b<f6p00000NkvXXu0mjf&=6c1

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppPointsReview/integralAdd.vue b/src/project/biaopin/AppPointsReview/integralAdd.vue
new file mode 100644
index 00000000..09e3d705
--- /dev/null
+++ b/src/project/biaopin/AppPointsReview/integralAdd.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="integralAdd">
+    <div class="item">
+      <div class="left"><span class="tips">*</span>姓名</div>
+      <div class="right name-flex" :class="form.name ? '' : 'color-999'" >
+        <AiPagePicker single :isShowPhone="true" @select="handleSelectUser" type="sysUser" class="pick" action="/app/appwechatuserqujing/listByFdAppletUserByGirdMember" nodeKey="openId">
+          <AiMore v-model="form.name"/>
+        </AiPagePicker>
+        <u-icon name="scan" color="#333" size="40" class="scan" @click="scan"></u-icon>
+      </div>
+    </div>
+    <div class="item">
+      <div class="left"><span class="tips">*</span>身份证</div>
+      <div class="right" :class="form.idNumber ? '' : 'color-999'">{{form.idNumber || '自动获取'}}</div>
+    </div>
+    <div class="item mar-b32">
+      <div class="left"><span class="tips">*</span>手机号</div>
+      <div class="right" :class="form.phone ? '' : 'color-999'">{{form.phone || '自动获取'}}</div>
+    </div>
+    <div class="item mar-b32">
+      <div class="left"><span class="tips">*</span>事件类型</div>
+      <div class="right">
+        <AiSelect :list="dictList" v-model="form.applyItemId" @data="selectType" v-if="dictList && dictList.length"></AiSelect>
+        <span v-else class="color-999">请选择</span>
+      </div>
+    </div>
+    <div class="item mar-b32">
+      <div class="left"><span class="tips">*</span>积分值</div>
+      <div class="right">
+        <u-input type="number" placeholder="请输入" input-align="right" placeholder-style="color:#999;font-size:16px;" height="40" v-model="form.applyIntegral" maxlength="10" />
+        <!-- <u-number-box v-model="form.applyIntegral" input-height="44" size="14" :min="1" :max="100"></u-number-box> -->
+      </div>
+    </div>
+    <div class="items">
+      <p><span class="tips">*</span>详情描述</p>
+      <textarea v-model="form.content" :maxlength="300" placeholder="请输入详细描述..."></textarea>
+      <div class="text-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="text-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="text-tips left">可上传视频，最大30M。</div>
+    </div>
+
+    <div class="item mar-b32">
+      <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 class="right" :class="form.girdName ? '' : 'color-999'">{{form.girdName || '自动获取'}}</div>
+    </div>
+
+    <div class="footer">
+      <div hover-class="text-hover" @click="submit">提交申请</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapActions, mapState} from "vuex";
+export default {
+  name: "integralAdd",
+  appName: '积分申请',
+  data() {
+    return {
+      form: {
+        name: '',
+        userId: '',
+        phone: '',
+        idNumber: '',
+        applyItemId: '',
+        applyIntegral: '',
+        applyItemName: '',
+        content: '',
+        files: [],
+        images: [],
+        videos: [],
+        girdId: '',
+        girdName: '',
+      },
+      list: [],
+      dictList: [],
+      flag: false,
+      id: '',
+      delta: 1
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(o) {
+    if(o.id) {
+      this.id = o.id
+      this.getDetail()
+    }
+    this.$dict.load(['clapEventStatus'])
+  },
+  onShow() {
+    document.title = '积分代申请'
+    this.agentSign()
+  },
+  methods: {
+    ...mapActions(['injectJWeixin', 'agentSign']),
+    submit() {
+      if(this.flag) return
+
+      if (!this.form.name) {
+        return this.$u.toast('请选择代申请人员')
+      }
+
+      if (!this.form.applyItemId) {
+        return this.$u.toast('请选择事件类型')
+      }
+      if (!/^([1-9]\d*|0)(\.\d{1,2})?$/g.test(this.form.applyIntegral)) {
+        this.form.applyIntegral = Number(this.form.applyIntegral).toFixed(2)
+        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]
+      }
+
+      this.flag = true
+      this.$http.post(`/app/appintegraluserapply/add`,{
+        ...this.form
+      }).then(res=> {
+        if(res?.data) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateList')
+          setTimeout(()=> {
+            uni.navigateBack({delta: this.delta})
+          },500)
+        }
+      })
+    },
+    selectType(selecteds) {
+      this.form.applyItemName = this.list.filter(e=> (e.id==selecteds[0].value))[0].ruleName
+      this.form.applyIntegral = this.list.filter(e => (e.id == selecteds[0].value))[0].integral
+    },
+    // 事件类型
+    getType() {
+      this.$http.post(`/app/appintegralrule/listByFdGirdMember?openId=${this.form.userId}`).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.$http.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.name.split('.')[1])))
+          this.form.videos = res.data.files.filter(e => (['mp4'].includes(e.name.split('.')[1])))
+          this.form.files = []
+        }
+      })
+    },
+    handleSelectUser(v) {
+      this.form.name = v?.[0]?.realName || ""
+      this.form.userId = v?.[0]?.openId || ""
+      this.form.phone = v?.[0]?.phone || ""
+      this.form.idNumber = v?.[0]?.idNumber || ""
+      this.form.girdId = v?.[0]?.girdId || ""
+      this.form.girdName = v?.[0]?.girdName || ""
+      this.form.applyIntegral = ''
+      this.form.applyItemId = ''
+      this.form.applyItemName = ''
+      this.dictList = []
+      this.getType()
+    },
+    scan() {
+      this.injectJWeixin('scanQRCode').then(() => {
+        wx.scanQRCode({
+          desc: '扫描居民信息',
+          needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
+          scanType: ["qrCode",], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+          success: (res) => {
+            this.delta = 2
+            var info = JSON.parse(res.resultStr)
+            info.realName = info.name
+            var userList = [{...info}]
+            this.handleSelectUser(userList)
+          },
+          error: (res) => {
+            console.log(res)
+            alert(res)
+            if (res.errMsg.indexOf('function_not_exist') > 0) {
+              alert('版本过低请升级')
+            }
+          }
+        });
+      }).catch((err) => {
+        alert(JSON.stringify(err))
+      })
+    }
+  }
+}
+</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;
+    
+    .left {
+      width: 250px;
+      .tips {
+        color: #f46;
+        font-size: 24px;
+        vertical-align: middle;
+        margin-right: 8px;
+      }
+    }
+    .right {
+      width: calc(100% - 200px);
+      text-align: right;
+    }
+    .name-flex {
+      display: flex;
+      .pick {
+        width: calc(100% - 60px);
+        text-align:right;
+      }
+      .scan {
+        width: 60px;
+        padding-left: 20px;
+      }
+    }
+    ::v-deep .AiSelect {
+      float: right;
+    }
+  }
+  .mar-b32 {
+    margin-bottom: 24px;
+  }
+  .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 {
+      color: #f46;
+      font-size: 24px;
+      vertical-align: middle;
+      margin-right: 8px;
+    }
+
+    .text-tips {
+      padding: 12px 32px 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 .display {
+  //   display: inline-block;
+  // }
+  .footer{
+    width: 100%;
+    height: 96px;
+    background: #FFF;
+    box-shadow: inset 0 0 0 0 #D4D4D4;
+    box-sizing: border-box;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    z-index: 3;
+    div {
+      flex: 1;
+      height: 96px;
+      line-height: 96px;
+      background: #1365DD;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      text-align: center;
+      font-weight: 500;
+      color: #fff;
+      box-sizing: border-box;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/project/biaopin/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/biaopin/AppRedemptionPoints/AppRedemptionPoints.vue
new file mode 100644
index 00000000..abd7f00a
--- /dev/null
+++ b/src/project/biaopin/AppRedemptionPoints/AppRedemptionPoints.vue
@@ -0,0 +1,137 @@
+<template>
+  <div class="AppRedemptionPoints">
+    <AiTopFixed>
+      <u-search v-model="keyword" :clearabled="false" placeholder="请输入申请人" :show-action="false" bg-color="#F5F5F5"
+        search-icon-color="#999" color="#666" @search="getListInit"></u-search>
+    </AiTopFixed>
+    <div class="list-content">
+      <div class="item" v-for="(item, index) in list" :key="index"  @click="toGoodsList(item)">
+        <div class="name">
+          <img :src="item.avatarUrl" alt="" v-if="item.avatarUrl">
+          <img src="./img/user-img.png" alt="" v-else>{{item.name}}
+        </div>
+        <div class="total">
+          <span>积分总额：{{item.allIntegral}}</span>
+          <span>积分余额：{{item.integral}}</span>
+        </div>
+        <div class="bottom">
+          <p>帮兑换</p>
+          <u-icon name="arrow-right" color="#CACACA" size="24" />
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-if="!list.length" />
+
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppRedemptionPoints",
+  appName: "积分代兑换",
+  data() {
+    return {
+      list: [],
+      keyword: '',
+      current: 1
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.getListInit()
+    uni.$on('updateGoodsList', () => {
+      this.getListInit()
+    })
+  },
+  onShow() {
+    document.title = "积分代兑换"
+  },
+
+  methods: {
+    getListInit() {
+      this.current = 1
+      this.getList()
+    },
+    getList() {
+      this.$http.post(`/app/appwechatuserqujing/listByFdAppletUserByGirdMember`, null, {
+        params: {
+          current: this.current,
+          con: this.keyword
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records]
+        }
+      })
+    },
+    toGoodsList(item) {
+      uni.navigateTo({url: `./goodsList?openId=${item.openId}&userId=${item.id}&integralUserId=${item.integralUserId}`})
+    }
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppRedemptionPoints {
+  ::v-deep .fixed {
+    z-index: 9999;
+  }
+  ::v-deep .u-search {
+    margin-bottom: 0 !important;
+  }
+  .list-content {
+    padding: 32px;
+    .item {
+      width: 100%;
+      padding: 32px 30px 0;
+      background-color: #fff;
+      box-sizing: border-box;
+      border-radius: 8px;
+      margin-bottom: 32px;
+      .name {
+        font-family: PingFangSC-SNaNpxibold;
+        font-weight: 600;
+        font-size: 32px;
+        color: #000;
+        line-height: 40px;
+        margin-bottom: 20px;
+        img {
+          width: 40px;
+          height: 40px;
+          margin-right: 12px;
+          vertical-align: bottom;
+        }
+      }
+      .total {
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        color: #666;
+        line-height: 34px;
+        padding-bottom: 34px;
+        span {
+          display: inline-block;
+          width: 250px;
+        }
+      }
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        padding: 24px 0;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        color: #000;
+        line-height: 38px;
+        border-top: 1px solid #eee;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/biaopin/AppRedemptionPoints/goodsList.vue b/src/project/biaopin/AppRedemptionPoints/goodsList.vue
new file mode 100644
index 00000000..9cb99f95
--- /dev/null
+++ b/src/project/biaopin/AppRedemptionPoints/goodsList.vue
@@ -0,0 +1,379 @@
+<template>
+  <div class="goodsList">
+    <div class="fixed-top">
+      <div class="header">
+        <div class="num">
+          <p>积分余额</p>
+          <h3>{{total}}</h3>
+        </div>
+        <div class="btn" @click="toMyOrder">ta的订单</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">
+        <div class="list-info" v-for="(item, index) in leftList" :key="index" v-if="goodsList.length">
+          <div class="item" @click="toProductDetail(item)">
+            <img :src="item.picUrl" alt="">
+            <div class="type" :class="`type`+item.typeText">{{ $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">
+        <div class="list-info" v-for="(item, index) in rightList" :key="index" v-if="goodsList.length">
+          <div class="item" @click="toProductDetail(item)">
+            <img :src="item.picUrl" alt="">
+            <div class="type" :class="`type`+item.typeText">{{ $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: 'goodsList',
+  data() {
+    return {
+      tabList: [{name: '全部'}, {name: '积分兑换'}, {name: '京东低价商品'}],
+      currentTabs: 1,
+      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,
+      openId: '',
+      integralUserId: '',
+      userId: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.openId = option.openId
+    this.userId = option.userId
+    this.integralUserId = option.integralUserId
+    this.getTotal()
+    this.$dict.load(['integralSGTypeText']).then(() => {
+      this.getList()
+    })
+  },
+  onShow() {
+    document.title = '积分代兑换'
+    this.getTotal()
+  },
+  methods: {
+    getTotal() {
+      this.$http.post(`/app/appintegraluser/integralUserInfoFD?integralUserId=${this.integralUserId}`).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.$http.post(`/app/appintegralsupermarketshop/goodsListWXCP`, 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,
+          userId: this.userId,
+          openId: this.openId
+        }
+      }).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}&userId=${this.userId}`})
+    },
+    toMyOrder() {
+      uni.navigateTo({url: `./myOrderList?userId=${this.userId}`})
+    },
+    toOrder(item) {
+      if(this.total >= item.integralPrice && item.stock > 0) {
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=3&userId=${this.userId}`})
+      }
+    },
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.goodsList {
+  .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;
+      }
+      .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/biaopin/AppRedemptionPoints/img/success.png b/src/project/biaopin/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/biaopin/AppRedemptionPoints/img/user-img.png b/src/project/biaopin/AppRedemptionPoints/img/user-img.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7eb9e0e18a8d4559588e692e0fc09d351688090
GIT binary patch
literal 2424
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

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppRedemptionPoints/jdH5.vue b/src/project/biaopin/AppRedemptionPoints/jdH5.vue
new file mode 100644
index 00000000..c26b96e5
--- /dev/null
+++ b/src/project/biaopin/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/biaopin/AppRedemptionPoints/myOrderList.vue b/src/project/biaopin/AppRedemptionPoints/myOrderList.vue
new file mode 100644
index 00000000..5afedb18
--- /dev/null
+++ b/src/project/biaopin/AppRedemptionPoints/myOrderList.vue
@@ -0,0 +1,317 @@
+<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-else>
+          <p>核销码:<span>{{item.verificationCode}}</span></p>
+          <div class="btn" v-if="item.status == 0" @click="cancel(item)">取消订单</div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty class="pad-t112" 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,
+      userId: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.userId = option.userId
+    this.$dict.load(['integralSGOStatus', 'integralSGTypeText']).then(() => {
+      this.getList()
+    })
+  },
+  methods: {
+    changeTab(index) {
+      this.currentTabs = index
+      this.getListInit()
+    },
+    getListInit() {
+      this.current = 1
+      this.getList()
+    },
+    getList() {
+      this.$http.post(`/app/appintegralsupermarketorder/listForXCX`, null, {
+        params: {
+          current: this.current,
+          status: this.currentTabs == 0 ? '' : this.currentTabs - 1,
+          createUserId: this.userId
+        }
+      }).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.$http.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;
+          }
+        }
+        .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;
+        }
+      }
+    }
+  }
+  .pad-t112 {
+    padding-top: 112px;
+  }
+
+  
+}
+</style>
diff --git a/src/project/biaopin/AppRedemptionPoints/placeOrder.vue b/src/project/biaopin/AppRedemptionPoints/placeOrder.vue
new file mode 100644
index 00000000..bde5e0ca
--- /dev/null
+++ b/src/project/biaopin/AppRedemptionPoints/placeOrder.vue
@@ -0,0 +1,294 @@
+<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,
+      userId: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.userId = option.userId
+    this.shopGoodsId = option.shopGoodsId
+    this.total = option.total
+    this.backLevel = option.backLevel
+    this.$dict.load(['integralSGTypeText']).then(() => {
+      this.getDetail()
+    })
+  },
+  onShow() {
+    document.title = '提交订单'
+  },
+  methods: {
+    getDetail() {
+      this.$http.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.$http.post(`/app/appintegralsupermarketorder/addWXCP`,  {
+        shopId: this.goodsInfo.shopId,
+        goodsId: this.goodsInfo.id,
+        remarks: this.value,
+        quantity: this.goodsNum,
+        createUserId: this.userId
+      }).then(res => {
+        if (res.code === 0) {
+          uni.$emit('updateGoodsList')
+          this.toSuccess()
+        }
+      })
+    },
+    toSuccess() {
+      var integralPrice = this.goodsNum*this.goodsInfo.integralPrice
+      uni.navigateTo({url: `./successOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&integralPrice=${integralPrice}&backLevel=${this.backLevel}`})
+    }
+  },
+}
+</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;
+        }
+      }
+      .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/biaopin/AppRedemptionPoints/pointsPublicity.vue b/src/project/biaopin/AppRedemptionPoints/pointsPublicity.vue
new file mode 100644
index 00000000..23166191
--- /dev/null
+++ b/src/project/biaopin/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" v-if="list.length">
+      <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>
+    </div>
+    <AiEmpty v-else></AiEmpty>
+  </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()
+  },
+  onShow() {
+    document.title = '积分公示'
+  },
+  methods: {
+    ...mapActions(['getUserInfo']),
+    getList() {
+      this.$http.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%;
+    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: 0 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/biaopin/AppRedemptionPoints/productDetails.vue b/src/project/biaopin/AppRedemptionPoints/productDetails.vue
new file mode 100644
index 00000000..2ef42365
--- /dev/null
+++ b/src/project/biaopin/AppRedemptionPoints/productDetails.vue
@@ -0,0 +1,187 @@
+<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,
+      userId: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad(option) {
+    this.shopGoodsId = option.shopGoodsId
+     this.userId = option.userId
+    this.total = option.total
+    this.$dict.load(['integralSGTypeText']).then(() => {
+      this.getDetail()
+    })
+  },
+  onShow() {
+    document.title = '兑换商品'
+  },
+  methods: {
+    getDetail() {
+      this.$http.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&userId=${this.userId}`})
+      }
+    },
+  },
+}
+</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;
+  }
+  .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/biaopin/AppRedemptionPoints/successOrder.vue b/src/project/biaopin/AppRedemptionPoints/successOrder.vue
new file mode 100644
index 00000000..298f7b4e
--- /dev/null
+++ b/src/project/biaopin/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>
+        可点击下方按钮前往京东商城进行低价购买
+      </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) {
+    this.integralPrice = option.integralPrice
+    this.backLevel = option.backLevel
+    this.shopGoodsId = option.shopGoodsId
+    this.getDetail()
+  },
+  onShow() {
+    document.title = '提交订单'
+  },
+  methods: {
+    getDetail() {
+      this.$http.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>