diff --git a/src/project/qianxinan/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/qianxinan/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
new file mode 100644
index 00000000..3559da1e
--- /dev/null
+++ b/src/project/qianxinan/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/qianxinan/AppCooperationPropaganda/addPropaganda.vue b/src/project/qianxinan/AppCooperationPropaganda/addPropaganda.vue
new file mode 100644
index 00000000..a3563018
--- /dev/null
+++ b/src/project/qianxinan/AppCooperationPropaganda/addPropaganda.vue
@@ -0,0 +1,1055 @@
+<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>
+    </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>
+    
+    <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: '', // 任务结束时间
+      },
+      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'
+            },
+          ]
+        }
+      ],
+      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',
+      ]
+    }
+  },
+  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) {
+      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)
+
+      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.$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')
+    },
+
+  },
+  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'? "群发居民": "群发朋友圈"
+  },
+  onShow() {
+    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;
+          width: 106px;
+          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;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/qianxinan/AppCooperationPropaganda/circleDetail.vue b/src/project/qianxinan/AppCooperationPropaganda/circleDetail.vue
new file mode 100644
index 00000000..d1579d57
--- /dev/null
+++ b/src/project/qianxinan/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/qianxinan/AppCooperationPropaganda/cooperationDetail.vue b/src/project/qianxinan/AppCooperationPropaganda/cooperationDetail.vue
index 1740467e..4a77da06 100644
--- a/src/project/qianxinan/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/qianxinan/AppCooperationPropaganda/cooperationDetail.vue
@@ -20,7 +20,7 @@
           <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>{{ createTime }}</span> 
+            创建时间: <span>{{ detail.createTime }}</span> 
           </div>
         </div>
         <div class="header_right" @click="toDetail">查看详情</div>
@@ -52,7 +52,7 @@
                 }}</span>
                 <span>{{ info.executedCount || 0 }}</span>
               </div>
-              <div v-if="detail.sendChannel !=1">
+              <div>
                 <span>{{
                   tabIndex == 0 ? "无法执行成员：" : "无法送达居民群："
                 }}</span>
@@ -71,6 +71,7 @@
               {{ item }}
             </div>
           </div>
+
           <AiTable
             :data="tableData"
             :colConfigs="tabIndex == 0 ? colConfigs0 : colConfigs1"
@@ -92,7 +93,6 @@ export default {
       pieEcharts: null,
       subIndex: 0,
       tableData: [],
-      createTime: "",
       id: "",
       info: {},
       current: 1,
@@ -100,14 +100,16 @@ export default {
       currentClickTime: "",
       detail: {},
       subsection: [],
-      sendChannel: ''
+      update0: true,
+      update1: false,
+      type: '',
     };
   },
   computed: {
     colConfigs0() {
       return [
         { prop: "groupOwnerName", label: "成员" },
-        { label: "预计送达居民群", prop: "groupCount" },
+        { label: "预计送达居民", prop: "groupCount" },
       ];
     },
     colConfigs1() {
@@ -120,7 +122,7 @@ export default {
   },
   onLoad(o) {
     this.id = o.id;
-    this.createTime = o.time;
+    this.type = o.type
   },
   methods: {
     tabClick(index) {
@@ -153,7 +155,7 @@ export default {
     },
 
     toDetail() {
-      uni.navigateTo({ url: `./detail?id=${this.id}` });
+      uni.navigateTo({ url: `./detail?id=${this.id}&type=${this.type}` });
     },
     // 提醒发送
     remindSend() {
@@ -204,14 +206,13 @@ export default {
     },
     // 获取数据
     getStatistics() {
-      this.$http
-        .post(`/app/appmasssendingtask/detailStatistics`, null, {
+      this.$http.post(`/app/appmasssendingtask/detailStatistics`, null, {
           params: {
             type: this.tabIndex,
             sendStatus: this.subIndex,
             taskId: this.id,
             current: this.current,
-            size: 3000
+            size: 3000,
           },
         })
         .then((res) => {
@@ -319,8 +320,8 @@ export default {
   onShow() {
     document.title = "群发居民群统计";
     this.$dict.load("mstStatus")
-    this.getDetail();
     this.getStatistics();
+    this.getDetail();
   },
   mounted() {
     this.getPieEcharts();
@@ -372,7 +373,6 @@ export default {
   }
 
   .header {
-    // height: 160px;
     padding: 32px;
     box-sizing: border-box;
     background: #fff;
@@ -479,6 +479,7 @@ export default {
   .list_content {
     padding: 0 32px 32px 32px;
     box-sizing: border-box;
+
     .list_card {
       background: #fff;
       border-radius: 16px;
@@ -499,6 +500,7 @@ export default {
         overflow: hidden;
         text-overflow: ellipsis;
       }
+      
       ::v-deep .AiTable .u-table .u-tr .u-td {
         width: 30%;
       }
@@ -519,14 +521,14 @@ export default {
       height: 58px;
       line-height: 58px;
       align-self: center;
-      color: #3aa0ff;
       text-align: center;
       border-radius: 16px;
-      
+      color: #606266;
     }
     .bgactive {
       background: #fff;
       font-weight: 600;
+      color: #3aa0ff;
     }
   }
 }
diff --git a/src/project/qianxinan/AppCooperationPropaganda/detail.vue b/src/project/qianxinan/AppCooperationPropaganda/detail.vue
index 0e7447d9..5ec11c1f 100644
--- a/src/project/qianxinan/AppCooperationPropaganda/detail.vue
+++ b/src/project/qianxinan/AppCooperationPropaganda/detail.vue
@@ -9,7 +9,9 @@
         </div>
         <div class="item">
           <span>创建人</span>
-          <span>{{ data.createUserName }}</span>
+          <span>
+            {{ data.createUserName }}
+          </span>
         </div>
         <div class="item" v-if="data.enableExamine == 1">
           <span>审批人</span>
@@ -30,21 +32,26 @@
           <span>群发时间</span>
           <span>{{ data.choiceTime }}</span>
         </div>
-        <div class="item" v-if="data.sendChannel == 1">
+        <div class="item">
           <span>结束时间</span>
           <span>{{ data.taskEndTime }}</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 == 2 || data.status == 4" src="./images/pass.png" alt="">
+        <img v-if="data.status > 1" src="./images/pass.png" alt="">
       </div>
     </div>
     <div class="info">
       <div class="scope">
         <span>群发范围</span>
-        <span v-if="data.sendScope==0">全部{{ data.receiveGroupCount || 0}}个居民群</span>
-        <span v-if="data.sendScope==1 || data.sendScope==2">按条件筛选的{{ data.receiveGroupCount || 0}}个居民群</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>
@@ -82,7 +89,6 @@
         </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>
@@ -93,7 +99,6 @@
 <script>
 import { mapState ,mapActions } from "vuex";
 export default {
-  name : "detail",
   data() {
     return {
       id: "",
@@ -107,20 +112,27 @@ export default {
       pictres: [],
       options: '',
       approver: [],  //审批人
+      type: '',
+      resSum: 0,
+      cirSum: 0,
     } 
   },
   onLoad(o) {
     this.id = o.id
+    this.type = o.type
   },
   computed: {
     ...mapState(['user'])
   },
   methods: {
-    toMassDispatch() {
-      uni.navigateTo({ url: `./massDispatch?id=${this.id}`})
-    },
     getDetail() {
-      this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> {
+      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
@@ -130,6 +142,8 @@ export default {
           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 {  // 通过
@@ -166,7 +180,13 @@ export default {
       })
     },
     examine() {
-      this.$http.post(`/app/appmasssendingtask/examine`,null,{
+      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,
@@ -196,7 +216,6 @@ export default {
 .detail {
   padding: 32px 32px 140px 32px;
   box-sizing: border-box;
-  
   .task {
     position: relative;
     margin-bottom: 24px;
@@ -243,11 +262,11 @@ export default {
     .scope {
       display: flex;
       margin-bottom: 16px;
-      span:first-child {
+      & > span {
         width: 160px;
         color: #999;
       }
-      span:last-child {
+      & > div {
         width: calc(100% - 160px);
       }
     }
diff --git a/src/project/qianxinan/AppCooperationPropaganda/fodderList.vue b/src/project/qianxinan/AppCooperationPropaganda/fodderList.vue
new file mode 100644
index 00000000..6a278a70
--- /dev/null
+++ b/src/project/qianxinan/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/qianxinan/AppCooperationPropaganda/scopedSelect.vue b/src/project/qianxinan/AppCooperationPropaganda/scopedSelect.vue
new file mode 100644
index 00000000..b91c0f52
--- /dev/null
+++ b/src/project/qianxinan/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/qianxinan/AppCooperationPropaganda/selectDeptUser.vue b/src/project/qianxinan/AppCooperationPropaganda/selectDeptUser.vue
new file mode 100644
index 00000000..79031964
--- /dev/null
+++ b/src/project/qianxinan/AppCooperationPropaganda/selectDeptUser.vue
@@ -0,0 +1,287 @@
+<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>
+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
+    }
+  },
+  onLoad(o) {
+    this.selected = uni.getStorageSync('selectDeptUser') || []
+    this.getAllDepts()
+    this.type = o.selectTtype.split('?')[0]
+  },
+  methods: {
+    isSelected(id, corpId) {
+      return !!this.selected.find(e => e.id == id && e.corpId == corpId)
+    },
+    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()
+        }
+      })
+    },
+    deptInit() {
+      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.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/qianxinan/AppCooperationPropaganda/selectGridMember.vue b/src/project/qianxinan/AppCooperationPropaganda/selectGridMember.vue
new file mode 100644
index 00000000..a8b074b8
--- /dev/null
+++ b/src/project/qianxinan/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/qianxinan/AppCooperationPropaganda/selectUser.vue b/src/project/qianxinan/AppCooperationPropaganda/selectUser.vue
index eab1d853..cc1c935a 100644
--- a/src/project/qianxinan/AppCooperationPropaganda/selectUser.vue
+++ b/src/project/qianxinan/AppCooperationPropaganda/selectUser.vue
@@ -10,7 +10,7 @@
           <div class="applicationNames">{{ e.userName }}</div>
         </div>
       </div>
-      <AiEmpty description="暂无数据" v-if="!userList"/>
+      <AiEmpty description="暂无数据" v-if="!userList.length"/>
     </div>
     <div class="subBtn" @click="submit">
       <div>确定选择</div>
@@ -22,13 +22,14 @@
 import { mapState } from 'vuex'
 
 export default {
+  // 选择创建人
   name: "selectUser",
-  appName: "选择创建人",
   data() {
     return {
       selected: {},
       userList: [],
       current: 1,
+      tabIndex: null,
     }
   },
   computed: {
@@ -37,17 +38,24 @@ export default {
       return this.userList?.length > 0
     }
   },
-  onLoad() {
+  onLoad(o) {
+    this.tabIndex = o.tabIndex
     this.selected = uni.getStorageSync('userSelect') || []
     this.getCreateUserList()
   },
   methods: {
     isSelected(userId) {
-      return this.selected.userId === userId
+      return this.selected.userId===userId
     },
     getCreateUserList() {
       this.userList = []
-      this.$http.post(`/app/appmasssendingtask/createUserlist`).then(res => {
+      let url = ''
+      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,
diff --git a/src/project/qianxinan/AppCooperationPropaganda/sendScoped.vue b/src/project/qianxinan/AppCooperationPropaganda/sendScoped.vue
new file mode 100644
index 00000000..14659872
--- /dev/null
+++ b/src/project/qianxinan/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: 0,
+      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/qianxinan/AppCooperationPropaganda/tagsList.vue b/src/project/qianxinan/AppCooperationPropaganda/tagsList.vue
new file mode 100644
index 00000000..9164faef
--- /dev/null
+++ b/src/project/qianxinan/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/qianxinan/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/qianxinan/AppCooperationPropagandaOld/AppCooperationPropaganda.vue
similarity index 99%
rename from src/project/qianxinan/AppCooperationPropaganda/AppCooperationPropaganda.vue
rename to src/project/qianxinan/AppCooperationPropagandaOld/AppCooperationPropaganda.vue
index 99b8763f..88463f05 100644
--- a/src/project/qianxinan/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/project/qianxinan/AppCooperationPropagandaOld/AppCooperationPropaganda.vue
@@ -26,7 +26,6 @@
     <AiEmpty description="暂无数据" v-if="!list.length"/>
 
     <AiConsole></AiConsole>
-
     <u-popup v-model="filterShow" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="tips"></div>
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/cooperationDetail.vue b/src/project/qianxinan/AppCooperationPropagandaOld/cooperationDetail.vue
new file mode 100644
index 00000000..1740467e
--- /dev/null
+++ b/src/project/qianxinan/AppCooperationPropagandaOld/cooperationDetail.vue
@@ -0,0 +1,533 @@
+<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>{{ 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 v-if="detail.sendChannel !=1">
+                <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: [],
+      createTime: "",
+      id: "",
+      info: {},
+      current: 1,
+      firstClickTime: "",
+      currentClickTime: "",
+      detail: {},
+      subsection: [],
+      sendChannel: ''
+    };
+  },
+  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.createTime = o.time;
+  },
+  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}` });
+    },
+    // 提醒发送
+    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.getDetail();
+    this.getStatistics();
+  },
+  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 {
+    // height: 160px;
+    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;
+      color: #3aa0ff;
+      text-align: center;
+      border-radius: 16px;
+      
+    }
+    .bgactive {
+      background: #fff;
+      font-weight: 600;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/detail.vue b/src/project/qianxinan/AppCooperationPropagandaOld/detail.vue
new file mode 100644
index 00000000..0e7447d9
--- /dev/null
+++ b/src/project/qianxinan/AppCooperationPropagandaOld/detail.vue
@@ -0,0 +1,326 @@
+<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" v-if="data.sendChannel == 1">
+          <span>结束时间</span>
+          <span>{{ data.taskEndTime }}</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 == 2 || data.status == 4" src="./images/pass.png" alt="">
+      </div>
+    </div>
+    <div class="info">
+      <div class="scope">
+        <span>群发范围</span>
+        <span v-if="data.sendScope==0">全部{{ data.receiveGroupCount || 0}}个居民群</span>
+        <span v-if="data.sendScope==1 || data.sendScope==2">按条件筛选的{{ data.receiveGroupCount || 0}}个居民群</span>
+      </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 {
+  name : "detail",
+  data() {
+    return {
+      id: "",
+      data: {},
+      content: '',
+      picList: [],
+      videoList: [],
+      fileList: [],
+      webpage: [],
+      miniapp: [],
+      pictres: [],
+      options: '',
+      approver: [],  //审批人
+    } 
+  },
+  onLoad(o) {
+    this.id = o.id
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    toMassDispatch() {
+      uni.navigateTo({ url: `./massDispatch?id=${this.id}`})
+    },
+    getDetail() {
+      this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).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
+          // 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() {
+      this.$http.post(`/app/appmasssendingtask/examine`,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:first-child {
+        width: 160px;
+        color: #999;
+      }
+      span:last-child {
+        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/qianxinan/AppCooperationPropaganda/images/close.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/close.png
similarity index 100%
rename from src/project/qianxinan/AppCooperationPropaganda/images/close.png
rename to src/project/qianxinan/AppCooperationPropagandaOld/images/close.png
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/files.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/files.png
new file mode 100644
index 00000000..10d53502
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/files.png differ
diff --git a/src/project/qianxinan/AppCooperationPropaganda/images/finish.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/finish.png
similarity index 100%
rename from src/project/qianxinan/AppCooperationPropaganda/images/finish.png
rename to src/project/qianxinan/AppCooperationPropagandaOld/images/finish.png
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/gird--select-icon.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/gird--select-icon.png
new file mode 100644
index 00000000..205144d2
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/gird--select-icon.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/local-icon.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/local-icon.png
new file mode 100644
index 00000000..3e23aff6
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/local-icon.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/pass.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/pass.png
new file mode 100644
index 00000000..36f698b2
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/pass.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/refuse.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/refuse.png
new file mode 100644
index 00000000..af15b9e5
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/refuse.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/right-icon.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/right-icon.png
new file mode 100644
index 00000000..e1c626b7
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/right-icon.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/shaixuan.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/shaixuan.png
new file mode 100644
index 00000000..88015ea5
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/shaixuan.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/tx@2x.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/tx@2x.png
new file mode 100644
index 00000000..d9620e08
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/tx@2x.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/xz.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/xz.png
new file mode 100644
index 00000000..98f78cda
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/xz.png differ
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/images/xzh.png b/src/project/qianxinan/AppCooperationPropagandaOld/images/xzh.png
new file mode 100644
index 00000000..967fa399
Binary files /dev/null and b/src/project/qianxinan/AppCooperationPropagandaOld/images/xzh.png differ
diff --git a/src/project/qianxinan/AppCooperationPropaganda/massDispatch.vue b/src/project/qianxinan/AppCooperationPropagandaOld/massDispatch.vue
similarity index 100%
rename from src/project/qianxinan/AppCooperationPropaganda/massDispatch.vue
rename to src/project/qianxinan/AppCooperationPropagandaOld/massDispatch.vue
diff --git a/src/project/qianxinan/AppCooperationPropagandaOld/selectUser.vue b/src/project/qianxinan/AppCooperationPropagandaOld/selectUser.vue
new file mode 100644
index 00000000..eab1d853
--- /dev/null
+++ b/src/project/qianxinan/AppCooperationPropagandaOld/selectUser.vue
@@ -0,0 +1,235 @@
+<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"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: "selectUser",
+  appName: "选择创建人",
+  data() {
+    return {
+      selected: {},
+      userList: [],
+      current: 1,
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    hasData() {
+      return this.userList?.length > 0
+    }
+  },
+  onLoad() {
+    this.selected = uni.getStorageSync('userSelect') || []
+    this.getCreateUserList()
+  },
+  methods: {
+    isSelected(userId) {
+      return this.selected.userId === userId
+    },
+    getCreateUserList() {
+      this.userList = []
+      this.$http.post(`/app/appmasssendingtask/createUserlist`).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>