From 24fbbd51f71b6b597a381823f8f333db691a5d79 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 22 Aug 2022 11:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropaganda.vue              | 352 +++++++
 .../cooperationDetail.vue                     | 510 ++++++++++
 src/apps/AppCooperationPropaganda/detail.vue  | 313 ++++++
 .../AppCooperationPropaganda/images/files.png | Bin 0 -> 955 bytes
 .../images/gird--select-icon.png              | Bin 0 -> 1276 bytes
 .../images/local-icon.png                     | Bin 0 -> 1121 bytes
 .../AppCooperationPropaganda/images/pass.png  | Bin 0 -> 15287 bytes
 .../images/refuse.png                         | Bin 0 -> 15564 bytes
 .../images/right-icon.png                     | Bin 0 -> 373 bytes
 .../images/shaixuan.png                       | Bin 0 -> 663 bytes
 .../AppCooperationPropaganda/images/tx@2x.png | Bin 0 -> 1467 bytes
 .../AppCooperationPropaganda/images/xz.png    | Bin 0 -> 1489 bytes
 .../AppCooperationPropaganda/images/xzh.png   | Bin 0 -> 1730 bytes
 .../AppCooperationPropaganda/selectUser.vue   | 233 +++++
 .../AppPropagandaStatistics.vue               | 903 ++++++++++++++++++
 .../AppPropagandaStatistics/calendarInfo.vue  | 208 ++++
 .../images/shaixuan.png                       | Bin 0 -> 663 bytes
 .../uni-calendar/calendar.js                  | 546 +++++++++++
 .../uni-calendar/i18n/en.json                 |  12 +
 .../uni-calendar/i18n/index.js                |   8 +
 .../uni-calendar/i18n/zh-Hans.json            |  12 +
 .../uni-calendar/i18n/zh-Hant.json            |  12 +
 .../uni-calendar/uni-calendar-item.vue        | 188 ++++
 .../uni-calendar/uni-calendar.vue             | 563 +++++++++++
 .../uni-calendar/util.js                      | 350 +++++++
 25 files changed, 4210 insertions(+)
 create mode 100644 src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
 create mode 100644 src/apps/AppCooperationPropaganda/cooperationDetail.vue
 create mode 100644 src/apps/AppCooperationPropaganda/detail.vue
 create mode 100644 src/apps/AppCooperationPropaganda/images/files.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/gird--select-icon.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/local-icon.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/pass.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/refuse.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/right-icon.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/shaixuan.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/tx@2x.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/xz.png
 create mode 100644 src/apps/AppCooperationPropaganda/images/xzh.png
 create mode 100644 src/apps/AppCooperationPropaganda/selectUser.vue
 create mode 100644 src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue
 create mode 100644 src/apps/AppPropagandaStatistics/calendarInfo.vue
 create mode 100644 src/apps/AppPropagandaStatistics/images/shaixuan.png
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/calendar.js
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/i18n/en.json
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/i18n/index.js
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hans.json
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hant.json
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar-item.vue
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar.vue
 create mode 100644 src/apps/AppPropagandaStatistics/uni-calendar/util.js

diff --git a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
new file mode 100644
index 00000000..b99ac526
--- /dev/null
+++ b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="AppCooperationPropaganda">
+    <AiTopFixed>
+      <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" @click="toDetail(item)" v-for="(item,index) in list" :key="index">
+        <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">{{ item.groupOwnerCount || 0 }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
+        <div>
+          创建部门：
+          <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>
+        </div>
+      </div>
+    </div>
+    <AiEmpty description="暂无数据" v-if="!list.length"/>
+    <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`,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="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>
+export default {
+  name: 'AppCooperationPropaganda',
+  appName: '协同宣发',
+  data() {
+    return {
+      current: 1,
+      name: '',
+      list: [],
+      filterShow: false,
+      startTime: '',
+      endTime: '',
+      start: "",
+      end: "",
+      showStart: false,
+      showEnd: false,
+      taskTitle: '',
+      createUserId: '',
+      userList: [],
+      userIdList: []
+    }
+  },
+  methods: {
+    toDetail(item) {
+      uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
+    },
+    searchBtn() {
+      this.current = 1
+      this.list = [],
+      this.getList()
+    },
+    getList() {
+      this.$http.post(`/app/appmasssendingtask/list`, null, {
+        params: {
+          current: this.current,
+          taskTitle: this.taskTitle,
+          startTime: this.start,
+          endTime: this.end,
+          createUserId: this.createUserId,
+        }
+      }).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 = ''
+      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.list = []
+      this.getList()
+    },
+    confirmStart(val) {
+      this.startTime = val.year + '-' + val.month + '-' + val.day
+    },
+    confirmEnd(val) {
+      this.endTime = val.year + '-' + val.month + '-' + val.day
+    },
+  },
+  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>
+.AppCooperationPropaganda {
+  .search {
+    display: flex;
+    height: 80px;
+    align-items: center;
+    justify-content: space-between;
+
+    .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;
+      padding: 30px;
+      margin-bottom: 24px;
+      & > 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;
+          }
+        }
+      }
+    }
+  }
+  .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;
+          }
+        }
+      }
+      .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;
+      }
+    }
+  }
+  .page_picker {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/apps/AppCooperationPropaganda/cooperationDetail.vue b/src/apps/AppCooperationPropaganda/cooperationDetail.vue
new file mode 100644
index 00000000..413efa08
--- /dev/null
+++ b/src/apps/AppCooperationPropaganda/cooperationDetail.vue
@@ -0,0 +1,510 @@
+<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>
+                <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" v-show="update0">
+            <u-subsection
+              :list="subsection0"
+              mode="button"
+              activeColor="#3c9cff"
+              :current="subIndex0"
+              @change="changeSub0"
+            ></u-subsection>
+          </div>
+
+          <div class="tab" v-show="update1">
+            <u-subsection
+              :list="subsection1"
+              mode="button"
+              activeColor="#3c9cff"
+              :current="subIndex1"
+              @change="changeSub1"
+            ></u-subsection>
+          </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,
+      subIndex0: 0,
+      subIndex1: 0,
+      tableData: [],
+      createTime: "",
+      id: "",
+      info: {},
+      current: 1,
+      firstClickTime: "",
+      currentClickTime: "",
+      detail: {},
+
+      subsection0: [
+        { name: "未执行" },
+        { name: "已执行" },
+        { name: "无法执行" },
+      ],
+      subsection1: [
+        { name: "未送达" },
+        { name: "已送达" },
+        { name: "无法送达" },
+      ],
+      update0: true,
+      update1: false,
+    };
+  },
+  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;
+      if(this.tabIndex == 0) {
+          this.subsection = [
+          { name: "未执行" },
+          { name: "已执行" },
+          { name: "无法执行" },
+        ]
+        this.update0 = true
+        this.update1 = false
+        this.$forceUpdate()
+      } else if(this.tabIndex == 1) {
+          this.subsection = [
+          { name: "未送达" },
+          { name: "已送达" },
+          { name: "无法送达" },
+        ]
+        this.update0 = false
+        this.update1 = true
+        this.$forceUpdate()
+      }
+      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);
+      }
+    },
+    // 切换分段器
+    changeSub0(index) {
+      this.subIndex0 = index;
+      this.getStatistics();
+    },
+    changeSub1(index) {
+      this.subIndex1 = index;
+      this.getStatistics();
+    },
+    // 获取数据
+    getStatistics() {
+      this.$http
+        .post(`/app/appmasssendingtask/detailStatistics`, null, {
+          params: {
+            type: this.tabIndex,
+            sendStatus: this.tabIndex==0? this.subIndex0: this.subIndex1,
+            taskId: this.id,
+            current: this.current,
+          },
+        })
+        .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: "未执行成员"
+              },
+            ],
+          },
+        ],
+      });
+    },
+  },
+  onShow() {
+    document.title = "群发居民群统计";
+    this.$dict.load("mstStatus")
+    this.getStatistics();
+    this.getDetail();
+  },
+  mounted() {
+    this.getPieEcharts();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.cooperationDetail {
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+  ::v-deep .emptyWrap {
+    border: 2px solid #d0d4dc;
+    border-radius: 8px;
+    padding-bottom: 20px;
+  }
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975c6;
+    display: flex;
+
+    .item {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #cddcf0;
+    }
+
+    .active {
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+
+      span {
+        width: 48px;
+        height: 4px;
+        background: #fff;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
+  .header {
+    // 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;
+        }
+      }
+
+      .sub-select {
+
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/apps/AppCooperationPropaganda/detail.vue b/src/apps/AppCooperationPropaganda/detail.vue
new file mode 100644
index 00000000..fd44da21
--- /dev/null
+++ b/src/apps/AppCooperationPropaganda/detail.vue
@@ -0,0 +1,313 @@
+<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>
+          </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>
+      <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" 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 {
+  data() {
+    return {
+      id: "",
+      data: {},
+      content: '',
+      picList: [],
+      videoList: [],
+      fileList: [],
+      webpage: [],
+      miniapp: [],
+      pictres: [],
+      options: '',
+      approver: [],  //审批人
+    } 
+  },
+  onLoad(o) {
+    this.id = o.id
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    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/apps/AppCooperationPropaganda/images/files.png b/src/apps/AppCooperationPropaganda/images/files.png
new file mode 100644
index 0000000000000000000000000000000000000000..10d53502535dad10eb33a37845dd2491f07992fe
GIT binary patch
literal 955
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;}uz(rC1}R)=9PbBIuIlOH7*fIb
zcFx9Z5l4~s`!P)~m5z8>9PtZY+IekSQ^I@ugw$O1uBBT;|1n&Sj_lkTH`$L{@l@kf
z#>=i}`mCRGCR)Bv%m4m1fA4RxpgV6*SAX7@pWb$+)%bA}1B(I!BZmV6lRyI|GvO*H
z%Xzl`V}(CHPv5&Cp**Q4+%`M3xLqLW=e_Tro-cN-mfiL?p<eyZieoF|cXN7tIDhW#
ziKIJ$=9Vkv4|#HYdvR@R!Hw>ZKJ11cq|Q7!`JVgFl@!Zq5l6xoKmKuK_4CwEyEr{g
zpEF|q^l$E=N1yrQ9~r;5+WGS?OUd46&&}pMI<?XEZ8wWKV`+m%(r=~2T-GnCYHPMO
z*m*=$GiGse%*b<CWy{DI%(!Z1LjyOHh>$>l;DxO$EN28hggc2J7vuQR-tgtylN*n+
zYYfzveAH#pagbQNS7z>!)7*!q?dxrDeQ`<i)k@nKk!^2kS)NSbF0)t9nJK~YByjgk
z@i2QX#>zA6p0r-=cXD9c{AtFaw~M1$QaC>FI5w!??YYBoqTz{T6NCRQ$(@1|7*86r
zFwQG6E>c!to|MkPWb-oZiJJqP%J~Vt=bwBonlGM~ZzpOd<!)^|Tm0s|y>E3l|4rPm
z+njCN#mVmeY6=JIe_Q@#uPhH2`nx<W@q5|tL<h63FHctMrM}HNZ^U@Dan0-OnGIXS
zAOf3g6>?i%Cg)#Oi(y?@_4b>@K6|~A?mf(BZ(nEETa)5FfqC(NBUPp&w}269$XHmJ
z#=vxh<;c^Sj7f}}?2p{C;C=h}Wm@cfBgWi0ZQnkYY+lE3Q|QXG&Xn0ZUoquK=?h;d
zd9eD^Z=m!%k8LwoXK&nOyP)^-h3?q}*B{(k^}OiNbhhJ}8S|8G3QaNJ0}Pyo8-`2*
z3Tg^^=Xo3&W;E=uF=k*)VtVxHOhc$>KwbG~^TPbKQ@_7Cn$PA^eO-#NROxu!9hR6|
zTaJg-C2pG)`}kKX|KvC+^;vTd_#U`t(6ikvM?b>i%bY`-Z)g3>lPZ>~ex>;Jl8v$?
io>U4<yAk0``x#e1zF(wvaqUe|#_@FZb6Mw<&;$UGIf-rn

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

diff --git a/src/apps/AppCooperationPropaganda/images/refuse.png b/src/apps/AppCooperationPropaganda/images/refuse.png
new file mode 100644
index 0000000000000000000000000000000000000000..af15b9e598a526274565b9573afd9e645a0cc259
GIT binary patch
literal 15564
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
abN?S6n(&nTXA@!o0000<MNUMnLSTa9&CyZ-

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

diff --git a/src/apps/AppCooperationPropaganda/images/xz.png b/src/apps/AppCooperationPropaganda/images/xz.png
new file mode 100644
index 0000000000000000000000000000000000000000..98f78cdab2ae85e91b206b3aa327d3557742f637
GIT binary patch
literal 1489
zcmV;?1upuDP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHJ4r-ARA>d&noVdMM;L}@cBNJ^
z<PfNvSjC3~9|8u)v9_d#78*!%DQ)UPa%xY-$Mg@9v(HILe{w86B_{{krX?4*kV1Qi
z>B?~o1|NbirdCoHaxgS%CGGZo=f_^#iltpyyV8Qav%53jJnzmovoqgFihVd%S62_L
zudlxqhT&-;<Z+lBLHdxC@*vG4y@B*oBp=~w8R>h2gM&X04-Y@%^G*(#wD98M;-Olt
zaV`vlbFgt1e*-aX{e%3oQaX3?dH2rP*cb)IK4J^-{j~wddHi`0gqKm9dc%05A>Qm9
z&Ub@AuDGsPLwc=HC{##PtyYK73dKf46dfl#hV<KLsZ%)H`ZpX$UI~ID*FCRDVQnAQ
zK+6KC%$=W~|0oQ_G%^pd03d$>_-%mxI66A|nD^Q}mX?-|K-jymavrwNm~s^<#q`9)
z#J8~BXvbDt0u~k)UTHLfA5f7;qp0M*5V^~x(uv>Nsiak&a{1vKLe#I|<-DftOW$>!
z_r}M^|7=yZr2yZ5cnZe9hatZ86~JFAl}g{WGMwajxm<o9UUdzvdKBg1ez{4{J2AJH
ztvv<6;0Jgs-@rhD?vl^vE+p-2dqG5>>A|5sW8A8W7dC|#b}O1EntrYT1AkLzmN!bJ
zlb^Ngm(dE6q}kuf<p*D&B`&f&M11%>5lsacxA_%i3qm-bdfv&eXejN&_aA&BMDQi*
zt-_t&Z01h81hB)_>y1B92tF@wc;3XvX@f`W^Zog+O-odAIrr6_9ova!X47%BAv}Ga
zZWDc;McTM7hHEioMnX5ru}y#;=haZT!Va63&qslFrpZ7S++X1^PR3}SO#%GEnvWDa
z&82RSHc^OHX|j-s`N&9CTV_)Lrw6zR*Ae%-HO|{glbp#!HZmGkWkw0$*lXrCQ0OY9
zNh;}f8OugiGP6D<fU`=Z53=KW-uUm`21#n4Y-A*>Vb%i7lo<ErOj6_Nl?!jPF3aq2
zF@o!}P!<*nFZ`4qNV1wZ^Cc^p$?k9^g$wlRa4znYI2l4`r8Hy63ElwN9gMA~X%edL
zc4j)g(w3F%=)`IbE4Y$M523S~wpitHjzS|e$7Nt=X45MjVI83hsqqxe(l-JuE7=`f
zsD*hxpYIz1mX+-4L#AEG-8HpN&ne>7<hom|bfFCvXXqoIne1{~R<hHDo)QHY#q5yc
z)ofYGP8UMBPY4E`;+e@VcZBs31cb{(VZ<yuq<A%Nv4+cZp?fTjW<j{GKMu=EcF76R
zlP7=ujf(??!i&XTpAYGf<iBeW@$B&7mtS&Bh<g?{q>fegb}NvPte~7FyZR0=#I3RA
z`QFASoo2MmN&w^Yc(MUyXLO*oH)W8GjAS*;dPT-nKjZTnyKc_CC_=N5)kaNJ3lNo?
z3piC6;%1b%*YI`ZT7};$hE*YM3gFHN!WPrK3lUfCs$b>G_#atx*qsY6F&*8-*%UxV
zvoqo&d8}4bA?|HqyexFU=UuYkwI0P#?~^ggu}uInG`KT@3~(iOXok46J;-1>ZiQ@Q
zj1p}Vzy~_|o0~)uA?@&@4sl0|q?gupt33jS*C%&Irb)6(0B<r54_}*Nn(=vtxY?BY
zy8HiGmkz6|y#f0DRI|MSlI*#N>FX^f`=0xHlh2B1w#~{w>wd*ieShI~^v$dM1}V3|
zXtQtItX2g5viU~0oMA{Z?krZ%D*t;21H}b1%CM^LY;;=@JjeN|fsG#2YPBLDv;C<-
rR0PxfI`-v{J$4G=H5Wx${oLk%)9=4SDWBtd00000NkvXXu0mjfj7GBY

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

diff --git a/src/apps/AppCooperationPropaganda/selectUser.vue b/src/apps/AppCooperationPropaganda/selectUser.vue
new file mode 100644
index 00000000..880e871d
--- /dev/null
+++ b/src/apps/AppCooperationPropaganda/selectUser.vue
@@ -0,0 +1,233 @@
+<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">
+            <AiOpenData type="userName" :openid="e.userId"/>
+          </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, isChecked: this.isSelected(e)}))
+        }
+      })
+    },
+    itemCheck(row) {
+      this.userList.forEach(e => e.isChecked = false)
+      const index = this.userList.findIndex(o => {
+        return row.userId===o.userId
+      })
+      this.userList[index].isChecked = true
+      this.selected = this.userList[index]
+    },
+    submit() {
+      if(!this.selected.userId) {
+        return this.$u.toast('请选择创建人')
+      }
+      uni.$emit("pagePicker:custom", [this.selected])
+      uni.setStorageSync('userSelect', this.selected)
+      uni.navigateBack()
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectUser {
+  height: 100%;
+  background: #fff;
+
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .imges {
+      display: flex;
+      align-items: center;
+
+      .imgselect {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+        background-image: url("./images/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./images/xzh.png");
+        }
+      }
+
+      .avatras {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+        margin-left: 36px;
+      }
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          flex-shrink: 0;
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .idNumbers {
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .color-3F8DF5 {
+    color: #3F8DF5;
+  }
+
+  .mar-h4 {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue
new file mode 100644
index 00000000..2d77d95b
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -0,0 +1,903 @@
+<template>
+  <div class="AppPropagandaStatistics">
+    <div class="calendar_header">
+      <u-section
+        title="宣发日历"
+        :show-line="false"
+        sub-title="查看更多"
+        @click="readMore"
+      ></u-section>
+    </div>
+    <div class="threeDays">
+      <!-- 昨天 -->
+      <div class="yesterday">
+        <div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
+
+        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length">
+          <div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
+          <div v-if="calendarList[nowDate - 1].taskList.length > 2 && showYes">
+            <div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(2, calendarList[nowDate - 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
+          </div>
+        </div>
+        <div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length)">暂无宣发任务</div>
+        <div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length && calendarList[nowDate - 1].taskList.length > 2" @click="showYes = !showYes">{{ showYes ? "收起" : "展开" }}</div>
+      </div>
+
+      <!-- 今天 -->
+      <div class="today">
+        <div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
+
+        <div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length">
+          <div v-for="(item,index) in calendarList[nowDate].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
+          <div v-if="calendarList[nowDate].taskList.length > 2 && showTo">
+            <div v-for="(item,index) in calendarList[nowDate].taskList.slice(2, calendarList[nowDate].taskList.length)" :key="index">{{item.taskTitle}}</div>
+          </div>
+        </div>
+        <div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length>0)">暂无宣发任务</div>
+        <div class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length && calendarList[nowDate].taskList.length > 2" @click="showTo=!showTo">{{ showTo ? "收起" : "展开" }}</div>
+      </div>
+
+      <!-- 明天 -->
+      <div class="tomorrow">
+        <div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
+
+        <div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length">
+          <div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
+          <div v-if="calendarList[nowDate + 1].taskList.length > 2 && showTom">
+            <div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(2, calendarList[nowDate + 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
+          </div>
+        </div>
+        <div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length)">暂无宣发任务</div>
+        <div class="isShow" v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length && calendarList[nowDate + 1].taskList.length > 2" @click="showTom=!showTom">{{ showTom ? "收起" : "展开" }}</div>
+      </div>
+    </div>
+
+    <!-- 折线图 -->
+    <div class="brokenEcharts">
+      <div class="broken_title">
+        <div class="broken_left">宣发效果</div>
+        <div class="broken_right" @click="filterShow = true">
+          <img src="./images/shaixuan.png" alt="" />筛选
+        </div>
+      </div>
+      <div class="broken_statistics">
+        <div class="broken_item">
+          <div>创建宣发任务数</div>
+          <div>{{ data.createCount || 0 }}</div>
+        </div>
+        <div class="broken_item">
+          <div>执行宣发次数</div>
+          <div>{{ data.executeCount || 0 }}</div>
+        </div>
+        <div class="broken_item">
+          <div>触达人次</div>
+          <div>{{ data.receiveCount || 0 }}</div>
+        </div>
+      </div>
+      <div class="title">宣发任务数</div>
+      <div id="brokenEcharts3"></div>
+      <div class="title" >宣发次数</div>
+      <div id="brokenEcharts2"></div>
+      <div class="title" >触达人次</div>
+      <div id="brokenEcharts1"></div>
+    </div>
+    <div class="columnarEcharts" v-if="colData.length">
+      <div class="broken_title">
+        <div class="broken_left">宣发明细</div>
+        <div class="broken_right">
+          <span
+            :class="detailType == 0 ? 'active' : ''"
+            @click="detailType = 0, getColData()"
+            >近7天</span
+          >
+          <span
+            :class="detailType == 1 ? 'active' : ''"
+            @click="detailType = 1, getColData()"
+            >近30天</span
+          >
+          <span
+            :class="detailType == 2 ? 'active' : ''"
+            @click="detailType = 2, getColData()"
+            >近1年</span
+          >
+        </div>
+      </div>
+      <div id="columnarEcharts"></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>
+            <div
+              class="item"
+              v-for="(item, index) in timeList"
+              :key="index"
+              :class="index == timeSelect ? 'active' : ''"
+              @click.stop="checkTime(index)"
+            >
+              {{ item }}
+            </div>
+          </div>
+          <div class="type-list">
+            <div class="type-title">宣发部门</div>
+            <div @click="getDept" class="dept">
+              <div v-if="departmentId">
+                <AiOpenData type="departmentName" :openid="departmentId"/>
+              </div>
+              <div v-if="!departmentId">请选择部门</div>
+              <u-icon name="arrow-right"></u-icon>
+            </div>
+          </div>
+        </scroll-view>
+        <div class="popBtn">
+          <div @click="reset">重置</div>
+          <div @click="selectConfirm">确认</div>
+        </div>
+      </div>
+      <u-popup v-model="customShow" mode="bottom" border-radius="14" closeable>
+        <div class="customPop">
+          <div class="startTime">
+            <div>开始时间：</div>
+            <div style="display: flex; justify-content: space-between">
+              <u-input
+                v-model="startTime"
+                placeholder="请选择开始时间"
+                disabled
+                @click="showStart = true"
+              />
+              <u-icon name="arrow-right"></u-icon>
+            </div>
+          </div>
+          <div class="endTime">
+            <div>结束时间：</div>
+            <div style="display: flex; justify-content: space-between">
+              <u-input
+                v-model="endTime"
+                placeholder="请选择结束时间"
+                disabled
+                @click="showEnd = true"
+              />
+              <u-icon name="arrow-right"></u-icon>
+            </div>
+          </div>
+          <u-picker
+            mode="time"
+            v-model="showStart"
+            @confirm="confirmStart"
+          ></u-picker>
+          <u-picker
+            mode="time"
+            v-model="showEnd"
+            @confirm="confirmEnd"
+          ></u-picker>
+          <div class="timeBtn" @click="handleTime">确定</div>
+        </div>
+      </u-popup>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+import echarts from "echarts";
+import { mapState, mapActions } from 'vuex'
+export default {
+  name: "AppPropagandaStatistics",
+  appName: "宣发统计",
+  data() {
+    return {
+      isShow: false,
+      brokenEcharts1: null,
+      brokenEcharts2: null,
+      brokenEcharts3: null,
+      columnarEcharts: null,
+      filterShow: false,
+      customShow: false,
+      showYes: false,
+      showTo: false,
+      showTom: false,
+      timeList: ["近7天", "近30天", "近1年", "自定义"],
+      timeSelect: 0,
+      start: "",
+      end: "",
+      departmentId: '',
+      departList: [],
+      nowMonth: "",
+      nowDate: "",
+      calendarList: [],
+      detailType: 0,
+      timeType: "",
+      departId: "",
+      startTime: "",
+      endTime: "",
+      start: "",
+      end: "",
+      showStart: false,
+      showEnd: false,
+      resX: [],
+      resY: [],
+      res2Y: [],
+      res3Y: [],
+      colData: [],
+      data: {}
+    };
+  },
+
+  onShow() {
+    document.title = "宣发统计";
+    this.getBrokenDate();
+    this.getData();
+    this.getColData();
+    this.getNowDate();
+  },
+  mounted() {
+    this.getBrokenEcharts1();
+    this.getBrokenEcharts2();
+    this.getBrokenEcharts3();
+    this.getColumnarEcharts();
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    ...mapActions(['initOpenData', 'transCanvas','selectEnterpriseContact']),
+    checkTime(index) {
+      if (index == 3) {
+        this.timeSelect = index;
+        this.customShow = true;
+        this.showStart = false;
+        this.showEnd = false;
+      } else {
+        this.timeSelect = index;
+      }
+    },
+
+    readMore() {
+      uni.navigateTo({ url: `./calendarInfo` });
+    },
+    // 重置
+    reset() {
+      this.timeType = 0;
+      this.timeSelect = 0;
+      this.start = "";
+      this.end = "";
+      this.departId = "";
+      this.departmentId = "";
+    },
+
+    selectConfirm() {
+      if (this.timeSelect == 3) {
+        this.detailType = this.timeSelect;
+        this.start = this.startTime;
+        this.end = this.endTime;
+      } else {
+        this.detailType = this.timeSelect || 0;
+      }
+      this.departId = this.departmentId
+      this.getBrokenDate();
+      this.filterShow = false;
+    },
+
+    confirmStart(val) {
+      this.startTime = val.year + "-" + val.month + "-" + val.day;
+    },
+
+    confirmEnd(val) {
+      this.endTime = val.year + "-" + val.month + "-" + val.day;
+    },
+
+    handleTime() {
+      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.customShow = true
+        return
+      }
+      this.customShow = false;
+    },
+
+    getNowDate() {
+      let date = new Date();
+      this.nowDate = date.getDate();
+      this.nowMonth = date.getMonth() + 1;
+    },
+    // 宣发日历
+    getData() {
+      this.$http
+        .post(`/app/appmasssendingtask/statisticsCalendar`, null, {
+          params: {},
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.calendarList = res.data;
+          }
+        });
+    },
+
+    // 宣发效果
+    getBrokenDate() {
+      this.$http
+        .post(`/app/appmasssendingtask/statisticsEffect`, null, {
+          params: {
+            type: this.timeSelect,
+            startTime: this.start,
+            endTime: this.end,
+            departId: this.departId
+          },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.data = res.data;
+            if (this.timeType == 0) {
+              this.resX = res.data.trend.map(
+                (e) =>
+                  e.ymd.substring(5, 7) + "-" + e.ymd.substring(8, 10)
+              );
+            } else if (this.timeType == 1) {
+              this.resX = res.data.trend.map(
+                (e) =>
+                  e.ymd.substring(5, 7) + "-" + e.ymd.substring(8, 10)
+              );
+            } else if (this.timeType == 2) {
+              this.resX = res.data.trend.map(
+                (e) =>
+                  e.ymd.substring(0, 4) + "-" + e.ymd.substring(5, 7)
+              );
+            }
+            this.resY = res.data.trend.map((e) => e.receiveCount);
+            this.res2Y = res.data.trend.map((e) => e.executeCount);
+            this.res3Y = res.data.trend.map((e) => e.createCount);
+            this.getBrokenEcharts1();
+            this.getBrokenEcharts2();
+            this.getBrokenEcharts3();
+          }
+        });
+    },
+    // 触发人数
+    getBrokenEcharts1() {
+      this.brokenEcharts1 = echarts.init(
+        document.getElementById("brokenEcharts1")
+      );
+      this.brokenEcharts1.setOption({
+        tooltip: {
+          trigger: "axis",
+        },
+        grid: {
+          left: "2%",
+          right: "5%",
+          bottom: "2%",
+          containLabel: true,
+        },
+        dataZoom: [
+          {
+            type: "slider",
+            xAxisIndex: [0],
+            filterMode: "filter",
+          },
+        ],
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          data: this.resX,
+        },
+        yAxis: {
+          type: "value",
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            type: "line",
+            data: this.resY,
+            lineStyle: {
+              color: "#4B87FE",
+            },
+            itemStyle: {
+              color: "#4E8EEE",
+            },
+          },
+        ],
+      });
+    },
+    // 宣发次数
+    getBrokenEcharts2() {
+      this.brokenEcharts2 = echarts.init(
+        document.getElementById("brokenEcharts2")
+      );
+      this.brokenEcharts2.setOption({
+        tooltip: {
+          trigger: "axis",
+        },
+        grid: {
+          left: "2%",
+          right: "5%",
+          bottom: "2%",
+          containLabel: true,
+        },
+        dataZoom: [
+          {
+            type: "slider",
+            xAxisIndex: [0],
+            filterMode: "filter",
+          },
+        ],
+        calculable: true,
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          data: this.resX,
+        },
+        yAxis: {
+          type: "value",
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            type: "line",
+            data: this.res2Y,
+            lineStyle: {
+              color: "#32C5FF",
+            },
+            itemStyle: {
+              color: "#31C1FA",
+            },
+          },
+        ],
+      });
+    },
+    // 宣发任务数
+    getBrokenEcharts3() {
+      this.brokenEcharts3 = echarts.init(
+        document.getElementById("brokenEcharts3")
+      );
+      this.brokenEcharts3.setOption({
+        tooltip: {
+          trigger: "axis",
+        },
+        grid: {
+          left: "2%",
+          right: "5%",
+          bottom: "2%",
+          containLabel: true,
+        },
+        dataZoom: [
+          {
+            type: "slider",
+            xAxisIndex: [0],
+            filterMode: "filter",
+          },
+        ],
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          data: this.resX,
+        },
+        yAxis: {
+          type: "value",
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            type: "line",
+            data: this.res3Y,
+            lineStyle: {
+              color: "#FFAA44",
+            },
+            itemStyle: {
+              color: "#FFAA44",
+            },
+          },
+        ],
+      });
+    },
+
+    // 宣发明细
+    getColData() {
+      this.$http.post(`/app/appmasssendingtask/statisticsDepart`, null, {
+          params: {
+            type: this.detailType,
+          },
+        })
+        .then((res) => {
+          if (res.code ===0) {
+            if(res.data && res.data.length) {
+              this.colData = res.data
+              let items = [], xData = [], yData = []
+              res.data.forEach((item) => {
+                const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
+                items.push(i)
+                yData.push(item.taskCount)
+              })
+             
+              this.initOpenData({canvas:true})
+              setTimeout(() => {
+                this.transCanvas(items).then((data) => {
+                  data.items.map((a) => {
+                    xData.push(a.data)
+                  })
+                  this.getColumnarEcharts(xData, yData)
+                })
+              }, 2000)
+            }
+          }
+        });
+    },
+    // 柱状图
+    getColumnarEcharts(xData, yData) {
+      this.columnarEcharts = echarts.init(
+        document.getElementById("columnarEcharts")
+      );
+      this.columnarEcharts.setOption({
+        dataZoom: [
+          {
+            type: "slider",
+            xAxisIndex: [0],
+            filterMode: "filter",
+          },
+        ],
+        xAxis: {
+          type: "category",
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+        },
+        series: [
+          { 
+            data: yData,
+            itemStyle: {
+              normal: {
+                color: "#5087ec",
+                label: {
+                  show: true,  //开启显示
+                  position: 'top',    //在上方显示
+                  textStyle: {
+                    fontSize: 13,
+                    color: '#666'
+                  }
+                },
+              },
+            },
+            type: "bar",
+            barWidth: 22,
+            barGap: '20%',
+          },
+        ],
+      });
+    },
+    // 选择部门
+    getDept() {
+      this.selectEnterpriseContact({
+        fromDepartmentId: 0,
+        mode: "single",
+        type: ["department"],
+        selectedDepartmentIds: this.departList?.map(e => e.id)
+      }).then((res)=>{
+          if(res?.departmentList) {
+            this.departmentId = res.departmentList[0].id
+          }
+        }
+      ).catch((err) => {
+        console.log(err);
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.AppPropagandaStatistics {
+  .calendar_header {
+    padding: 26px 32px;
+    box-sizing: border-box;
+    background: #fff;
+    ::v-deep .u-section__title__text {
+      font-size: 32px;
+    }
+  }
+  .threeDays {
+    background: #fff;
+    padding: 8px 32px 12px 32px;
+    box-sizing: border-box;
+    .yesterday,
+    .today,
+    .tomorrow {
+      background: #f7f8fa;
+      margin-bottom: 32px;
+      padding: 30px 0 30px 40px;
+      box-sizing: border-box;
+      .isShow {
+        color: #3aa0ff;
+      }
+      .itemYesterday,
+      .itemToday,
+      .itemTomorrow {
+        color: #999999;
+        span {
+          margin-left: 20px;
+        }
+      }
+    }
+    .yesterday {
+      border-left: 6px solid #fbd444;
+    }
+    .today {
+      border-left: 6px solid #50cb74;
+    }
+    .tomorrow {
+      border-left: 6px solid #3aa0ff;
+    }
+  }
+
+  .brokenEcharts,
+  .columnarEcharts {
+    margin: 24px 0 24px 0;
+    padding: 0 32px 32px 32px;
+    box-sizing: border-box;
+
+    .broken_title {
+      display: flex;
+      justify-content: space-between;
+      height: 96px;
+      align-items: center;
+
+      .broken_left {
+        font-size: 32px;
+        font-weight: 600;
+      }
+
+      .broken_right {
+        font-size: 24px;
+
+        img {
+          width: 28px;
+          height: 28px;
+        }
+
+        span {
+          margin-right: 12px;
+          width: 108px;
+          height: 48px;
+          line-height: 48px;
+          text-align: center;
+          display: inline-block;
+          border: 1px solid #ddd;
+          border-radius: 8px;
+        }
+        .active {
+          background: #3399ff;
+          color: #fff;
+        }
+      }
+    }
+
+    .broken_statistics {
+      display: flex;
+      padding: 24px 0;
+      box-sizing: border-box;
+
+      .broken_item {
+        flex: 1;
+        text-align: center;
+
+        div:first-child {
+          font-size: 24px;
+          color: #999999;
+          padding: 10px 0;
+        }
+        div:last-child {
+          font-size: 36px;
+          color: #000000;
+          font-weight: 600;
+        }
+      }
+    }
+
+    .title {
+      padding: 30px 0;
+      box-sizing: border-box;
+      font-size: 32px;
+      font-weight: 600;
+    }
+  }
+
+
+  .brokenEcharts,
+  .columnarEcharts {
+    background: #fff;
+
+    #brokenEcharts1,
+    #brokenEcharts2,
+    #brokenEcharts3,
+    #columnarEcharts {
+      width: 100%;
+      height: 400px;
+      background: #f9f9f9;
+      border-radius: 8px;
+    }
+  }
+
+  .popup {
+    box-sizing: border-box;
+    .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: inline-block;
+        width: 210px;
+        text-align: center;
+        line-height: 64px;
+        background: #f3f4f7;
+        border-radius: 4px;
+        margin: 0 16px 16px 0;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+      }
+      .active {
+        background: #1365dd;
+        color: #fff;
+      }
+      .dept {
+        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;
+      }
+    }
+  }
+
+  .customPop {
+    padding: 80px 32px 20px 32px;
+    box-sizing: border-box;
+    height: 660px;
+
+    .startTime,
+    .endTime {
+      border-bottom: 1px solid #ddd;
+      margin-bottom: 20px;
+    }
+
+    .timeBtn {
+      width: 100%;
+      background: #3399ff;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      border-radius: 16px;
+      color: #fff;
+      margin-top: 164px;
+    }
+
+    ::v-deep .u-close {
+      z-index: auto;
+    }
+  }
+
+}
+</style>
diff --git a/src/apps/AppPropagandaStatistics/calendarInfo.vue b/src/apps/AppPropagandaStatistics/calendarInfo.vue
new file mode 100644
index 00000000..216b3a1a
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/calendarInfo.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="calendarInfo">
+    <div class="calendar">
+      <uni-calendar :insert="true" :selected="selected" :lunar="false" @bindDateChange="setDate" @change="change" @monthSwitch="changeMonth"/>
+    </div>
+    
+    <div class="dailyMatters">
+      <div v-if="list && list.length">
+        <div>
+          <div v-for="(item, index) in list.slice(0,3)" :key="index" :class="{'color1':index%4==0,'color2':index%4==1,'color3':index%4==2,'color4':index%4==3}" class="daily_item">
+            <div>{{ item.createTime.substring(10, 16) }}</div>
+            <div>{{ item.taskTitle }}</div>
+          </div>
+        </div>
+        <div v-show="show">
+          <div v-for="(item, index) in list.slice(3, list.length)" :key="index" 
+           :class="{'color1': index % 4 == 3,'color2': index % 4 == 0,'color3': index % 4 == 1,'color4': index % 4 == 2 }" class="daily_item">
+            <div>{{ item.createTime.substring(10, 16) }}</div>
+            <div>{{ item.taskTitle }}</div>
+          </div>
+        </div>
+        <div class="readMore" v-show="!show && list.length > 3" @click="show = true">查看更多</div>
+      </div>
+      <AiEmpty description="暂无宣发" v-else></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import  uniCalendar  from "./uni-calendar/uni-calendar.vue"
+export default {
+  data() {
+    return {
+      date: '',
+      selected: [{date: ''}],
+      list: [],
+      show: false,
+      calendarList: {},
+      year: '',
+      month: '',
+      day: '',
+      yyyyMM: '',
+    }
+  },
+  components: {
+    uniCalendar
+  },
+  created() {
+    this.getNowDay()
+    this.getData()
+  },
+  methods: {
+    // 切换月
+    changeMonth(e) {
+      if(e.month<=9) {
+        this.yyyyMM = e.year + '0' + e.month
+        
+      } else if(e.month > 9) {
+        this.yyyyMM = e.year + e.month
+      }
+      this.month = e.month
+      this.getData()
+    },
+    // 切换日
+    change(val) {
+      this.date = val.fulldate
+      this.day = val.date
+      this.getData()
+    },
+
+    setDate(v) {
+      this.yyyyMM = v.detail.value.replace('-', '')
+      this.getData()
+    },
+
+    getNowDay() {
+      const date = new Date()
+      this.year = date.getFullYear()
+      this.month = date.getMonth() + 1
+      this.day = date.getDate()
+    },
+    
+    toGroup() {
+      uni.navigateTo({url: './groupSendResident'})
+    },
+    getData() {
+      this.$http.post(`/app/appmasssendingtask/statisticsCalendar`, null, {
+        params: {
+          yyyyMM: this.yyyyMM,
+        },
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.calendarList = res.data;
+          let arr = Object.keys(res.data).map(key => (res.data[key]))
+          this.list = arr[this.day - 1]?.taskList
+          let calList = arr.filter(item=> (item.taskList && item.taskList.length > 0))
+          this.selected = calList.map(item=> {
+            if(item.day>=1 && item.day<=9) {
+              if(this.month>=1 && this.month <=9) {
+                return {
+                  date: this.year + '-' + '0' + this.month + '-' + '0' + item.day
+                }
+              } else {
+                return {
+                  date: this.year + '-' + this.month + '-' + '0' + item.day
+                }
+              }
+            } else if(item.day> 9) {
+              if(this.month > 9) {
+                return {
+                  date: this.year + '-' + this.month + '-' + item.day
+                }
+              } else {
+                return {
+                  date: this.year + '-' + '0' + this.month + '-' + item.day
+                }
+              }
+            }
+          })
+        }
+      });
+    },
+  },
+  onShow() {
+    document.title = '宣发日历'
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.calendarInfo {
+  ::v-deep .uni-calendar-item__weeks-box-circle {
+    top: 77%;
+    right: 45%;
+    border-radius: 12px;
+  }
+  ::v-deep .uni-calendar__header {
+    height: 76px;
+    justify-content: space-around;
+    border-bottom-style: none;
+  }
+  ::v-deep .uni-calendar__weeks-day {
+    border-bottom-style: none;
+  }
+  ::v-deep .uni-calendar__weeks-day-text,
+  ::v-deep .uni-calendar__header-text,
+  ::v-deep .uni-calendar-item__weeks-box-text {
+    font-size: 28px;
+  }
+  ::v-deep .uni-calendar__header-btn {
+    width: 16px;
+    height: 16px;
+    border-left-color: #5297FF;
+    border-top-color: #5297FF;
+  }
+  ::v-deep .uni-calendar__backtoday {
+    display: none
+  }
+
+  ::v-deep .calendarInfo .calendar {
+    height: 750px !important;
+  }
+
+  .calendar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 750px;
+  }
+
+  .dailyMatters {
+    padding: 750px 30px 30px 30px;
+    box-sizing: border-box;
+    .daily_item {
+      background: #FFF;
+      padding: 30px 20px 30px 50px;
+      margin-bottom: 30px;
+      border-radius: 0px 16px 16px 0px;
+      
+      div:first-child {
+        color: #999999;
+        margin-bottom: 20px;
+      }
+    }
+    .color1 {
+      border-left: 6px solid #3AA0FF;
+    }
+    .color2 {
+      border-left: 6px solid #50CB74;
+    }
+    .color3 {
+      border-left: 6px solid #9D73D9;
+    }
+    .color4 {
+      border-left: 6px solid #435289;
+    }
+
+    .readMore {
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      color: #3F8DF5;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/apps/AppPropagandaStatistics/images/shaixuan.png b/src/apps/AppPropagandaStatistics/images/shaixuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..88015ea5e0e538118f88586e115d588422253674
GIT binary patch
literal 663
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uvw#`F1}RM0`(+UW0~4dCi(`lf
z@7w9t9x{O<ZU5`<uo^Dgx;gZqSJM){mn=u`xnJ0^`9{PHC08ak9VW4ZdPkHNbog>P
zwuqQX3mrVJCANq|h$HNxLkGu2m5R^zUDY@D-;^vbS7;S)tNylUU-h|y_j8}_HBS?C
zSU<0VJ&|Kisl%3I-n&laIV4|rXmMag$n=fQxvhNjEN1K3PngjsoAE(wc9I(_Q?IAZ
z<t^gkA@B3Hue3bwz&Atk(ar?ss=DhkUVnnv+3%HqJoM}w<Jt{VpKV*_seQdf!so@-
zw=vJZG=vpyXVu?2t2aA&>*k`hWxHp5dVZ2QP3{B#D}xpD{(rF!)tGPCcu+j$9^VP(
zTSsmlx4FPq8>M)JySU@y*~GeUBH>M4nsUb^%FZPmW#I2#D`;}$)3np?g66r3MyXF~
z^W^dT6R4%(@?F=lhvnxKmZ<ctk3G~6M+78H*w<HZJ@}7Q3O~y&hPgb&R@rYK%9WnU
z+oAJ1UMxeCmvf1!Y`ajWey8<ASx(kEnP;8fg0)yGR=V_G`&}vZ===L6n$KsH?o|1`
zTR~no<5(P%W7&SYEl%fWT6}rJ<oG>i!P*0+QLU|xSO4_IC7O!FztO#Lz2{cP|9tPQ
z*Ux1ICO_eNE&U;?{N|nomEx~_#RVmQtn9zPIrA3(+A>@2x(#ANm4ctv=Dg5%nw>Z4
ldDp)ADpl8l?(|Q3slRGjntsxngBL)F!qe5yWt~$(69Dck3%CFP

literal 0
HcmV?d00001

diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/calendar.js b/src/apps/AppPropagandaStatistics/uni-calendar/calendar.js
new file mode 100644
index 00000000..b8d7d6fc
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/calendar.js
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/i18n/en.json b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/en.json
new file mode 100644
index 00000000..fcbd13cf
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/en.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/i18n/index.js b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/index.js
new file mode 100644
index 00000000..de7509c8
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hans.json b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hans.json
new file mode 100644
index 00000000..1ca43de0
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hant.json b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hant.json
new file mode 100644
index 00000000..e0fe33b9
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/i18n/zh-Hant.json
@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar-item.vue b/src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar-item.vue
new file mode 100644
index 00000000..30bd6c84
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar-item.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">{{todayText}}</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		emits:['change'],
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-font-size-base:14px;
+	$uni-text-color:#333;
+	$uni-font-size-sm:12px;
+	$uni-color-error: #e43d33;
+	$uni-opacity-disabled: 0.3;
+	$uni-text-color-disable:#c0c0c0;
+	$uni-color-primary: #2979ff;
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-color-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-color-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-color-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar.vue b/src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar.vue
new file mode 100644
index 00000000..a9c2908a
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/uni-calendar.vue
@@ -0,0 +1,563 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow}">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{cancelText}}</text>
+				</view>
+				<view class="uni-calendar__header-btn-box" @click="confirm">
+					<text class="uni-calendar__header-text uni-calendar--fixed-width">{{okText}}</text>
+				</view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year||'') +' / '+( nowDate.month||'')}}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<text class="uni-calendar__backtoday" @click="backtoday">{{todayText}}</text>
+
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './uni-calendar-item.vue'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem
+		},
+		emits:['close','confirm','change','monthSwitch'],
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false
+			}
+		},
+		computed:{
+			/**
+			 * for i18n
+			 */
+
+			okText() {
+				return t("uni-calender.ok")
+			},
+			cancelText() {
+				return t("uni-calender.cancel")
+			},
+			todayText() {
+				return t("uni-calender.today")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		watch: {
+			date(newVal) {
+				// this.cale.setDate(newVal)
+				this.init(newVal)
+			},
+			startDate(val){
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val){
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			}
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.date)
+			// this.setDay
+		},
+		methods: {
+			// 取消穿透
+			clean() {},
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.$emit('bindDateChange',e)
+				// console.log(this.cale.getDate(value));
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				console.log(this.cale.getDate(new Date()).fullDate);
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-bg-color-mask: rgba($color: #000000, $alpha: 0.4);
+	$uni-border-color: #EDEDED;
+	$uni-text-color: #333;
+	$uni-bg-color-hover:#f1f1f1;
+	$uni-font-size-base:14px;
+	$uni-text-color-placeholder: #808080;
+	$uni-color-subtitle: #555555;
+	$uni-text-color-grey:#999;
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: $uni-bg-color-mask;
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		bottom: 0;
+		/* #endif */
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		bottom: calc(var(--window-bottom));
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+		// padding: 0 15px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: $uni-text-color;
+		background-color: $uni-bg-color-hover;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 10px;
+		height: 10px;
+		border-left-color: $uni-text-color-placeholder;
+		border-left-style: solid;
+		border-left-width: 2px;
+		border-top-color: $uni-color-subtitle;
+		border-top-style: solid;
+		border-top-width: 2px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 14px;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: $uni-text-color-grey;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+</style>
diff --git a/src/apps/AppPropagandaStatistics/uni-calendar/util.js b/src/apps/AppPropagandaStatistics/uni-calendar/util.js
new file mode 100644
index 00000000..2d6100bf
--- /dev/null
+++ b/src/apps/AppPropagandaStatistics/uni-calendar/util.js
@@ -0,0 +1,350 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			year,
+			month
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar