diff --git a/src/apps/party/AppPartyStudy/AppPartyStudy.vue b/src/apps/party/AppPartyStudy/AppPartyStudy.vue
new file mode 100644
index 00000000..3584ab46
--- /dev/null
+++ b/src/apps/party/AppPartyStudy/AppPartyStudy.vue
@@ -0,0 +1,485 @@
+<template>
+  <div class="page">
+    <div v-if="isShow" style="height: 100%">
+      <div class="fixed-top">
+        <!-- 头部搜索样式 -->
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <image src="https://cdn.cunwuyun.cn/img/search-red.svg"></image>
+            <span>{{ inputValue }}</span>
+          </div>
+        </div>
+        <!-- 选择时间和类型 -->
+        <div class="slect flex-row">
+          <!-- 类型选择 -->
+          <div class="uni-list type-select">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                    @change="bindPickerChange"
+                    :range="array"
+                    range-key="dictName"
+                >
+                  <div class="uni-input" v-if="partyStudyType === ''">
+                    学习类别
+                  </div>
+                  <div class="uni-input" v-else>
+                    {{ array[partyStudyType + 1].dictName }}
+                  </div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+          <!-- 时间选择 -->
+          <div class="uni-list type-select">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                    mode="date"
+                    :value="date"
+                    :start="startDate"
+                    :end="endDate"
+                    @change="bindDateChange"
+                    fields="month"
+                >
+                  <div class="uni-input">{{ day }}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="session-list">
+        <div
+            class="session-item"
+            v-for="(item, index) in meetList"
+            :key="index"
+        >
+          <div class="item-top" @click="toDetail(item.id)">
+            <div class="item-title mar-b12">{{ item.title }}</div>
+            <div class="item-info">
+              <span class="info-label">学习类别：</span>
+              <span class="info-value">{{
+                  $dict.getLabel("partyStudyType", item.type)
+                }}</span>
+            </div>
+            <div class="item-info">
+              <span class="info-label">发布时间：</span>
+              <span class="info-value">{{ item.publishTime }}</span>
+            </div>
+            <div class="item-info mar-b12">
+              <span class="info-label">发布人员：</span>
+              <span class="info-value">{{ item.publishUserName }}</span>
+            </div>
+          </div>
+          <div class="item-status" :class="'item-status' + item.studyStatus">
+            {{ $dict.getLabel("partyStudyStatus", item.studyStatus) }}
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="meetList.length == 0"/>
+    </div>
+    <div v-if="!isShow" class="search-input">
+      <div class="input-box flex-row">
+        <input
+            type="span"
+            class="input"
+            placeholder="请输入学习标题"
+            focus="false"
+            v-model="searchValue"
+            @blur="onBlur"
+        />
+        <image
+            class="sousuo"
+            src="https://cdn.cunwuyun.cn/img/search-active.svg"
+        ></image>
+        <image
+            v-if="searchValue"
+            @tap="clearInput"
+            class="clear"
+            src="https://cdn.cunwuyun.cn/img/empty-Input.svg"
+        ></image>
+        <div class="search-word" @click="search">搜索</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  appName: "党员学习",
+  data() {
+    const currentDate = this.getDate({
+      format: true,
+    });
+    return {
+      inputValue: "请输入学习标题",
+      isShow: true,
+      array: [],
+      meetType: "",
+      partyStudyType: "",
+      index: 0,
+      date: currentDate,
+      day: "时间",
+      createDate: "", //创建时间
+      meetList: [],
+      searchValue: "", //搜索框输入值
+      pageNum: 1,
+      pageSize: 10,
+      pages: 2,
+      userId: "",
+      partyId: "",
+    };
+  },
+  computed: {
+    startDate() {
+      return this.getDate("start");
+    },
+    endDate() {
+      return this.getDate("end");
+    },
+  },
+  onLoad(options) {
+    this.partyId = options.partyId;
+    this.$dict.load("partyStudyStatus", "partyStudyType").then((res) => {
+      this.array = this.$dict.getDict("partyStudyType");
+      this.array.unshift({dictName: "全部类型", dictValue: ""})
+      this.getList();
+    });
+  },
+  onShow() {
+    this.$dict.load("partyStudyStatus", "partyStudyType");
+    this.getList();
+  },
+  methods: {
+    bindPickerChange(e) {
+      if (e.detail.value - 1 >= 0) {
+        this.partyStudyType = e.detail.value - 1;
+      } else {
+        this.partyStudyType = "";
+      }
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList();
+    },
+    bindDateChange: function (e) {
+      this.day = e.target.value;
+      this.createDate = e.target.value;
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList();
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+
+      if (type === "start") {
+        year = year - 60;
+      } else if (type === "end") {
+        year = year + 2;
+      }
+      month = month > 9 ? month : "0" + month;
+      day = day > 9 ? day : "0" + day;
+
+      return `${year}-${month}-08 00:00:00  `;
+    },
+    changeSearchBox() {
+      this.isShow = false;
+    },
+    onBlur(e) {
+      this.searchValue = e.target.value;
+      if (this.searchValue) {
+        this.inputValue = this.searchValue;
+      } else {
+        this.inputValue = "请输入学习标题";
+      }
+    },
+    search() {
+      this.isShow = true;
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.pages = 2;
+      this.getList();
+    },
+    clearInput() {
+      this.searchValue = "";
+      this.inputValue = "请输入学习标题";
+    },
+    getList() {
+      if (this.pageNum > this.pages) return;
+
+      this.$http.post(`/app/apppartystudy/listWechat`, {
+        title: this.searchValue,
+        type: this.partyStudyType,
+        searchMonth: this.createDate,
+        current: this.pageNum,
+        size: this.pageSize,
+      }).then((res) => {
+        if (res.code == 0) {
+          const meetList = this.pageNum > 1 ? [...this.meetList, ...res.data.records] : res.data.records;
+          this.pages = Math.ceil(res.data.total / 10);
+          this.meetList = meetList;
+        }
+      });
+    },
+    toDetail(id) {
+      uni.navigateTo({
+        url: "./partyStudyDetail?id=" + id,
+      });
+    },
+  },
+  onReachBottom() {
+    this.pageNum = this.pageNum + 1;
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  .search-box {
+    width: 100%;
+    height: 112px;
+    background-color: #e60012;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    .search-input {
+      line-height: 64px;
+      width: 100%;
+      height: 100%;
+      background: #ce0010;
+      border-radius: 32px;
+      color: #f0cbcd;
+      font-size: 26px;
+
+      image {
+        width: 34px;
+        height: 34px;
+        margin: 8px 8px 8px 24px;
+        position: relative;
+        top: 6px;
+      }
+
+      span {
+        display: inline-block;
+        overflow: hidden;
+        white-space: nowrap;
+        span-overflow: ellipsis;
+        width: 600px;
+      }
+    }
+  }
+
+  .slect {
+    width: 100%;
+    height: 96px;
+    background-color: #fff;
+    color: #666;
+
+    .type-select {
+      width: 50%;
+      border-right: 1px solid #f7f7f7;
+      margin: 30px 0;
+      box-sizing: border-box;
+      text-align: center;
+      font-size: 26px;
+
+      .uni-input {
+        display: inline-block;
+      }
+
+      image {
+        width: 32px;
+        height: 32px;
+        display: inline-block;
+        position: relative;
+        top: 6px;
+        margin-left: 8px;
+      }
+    }
+
+    .type-select:nth-child(2) {
+      border: none;
+    }
+  }
+
+  .search-input {
+    .input-box {
+      width: 100%;
+      height: 112px;
+      background-color: #fff;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      position: relative;
+
+      .sousuo {
+        position: absolute;
+        top: 35px;
+        left: 60px;
+        width: 34px;
+        height: 34px;
+      }
+
+      .input {
+        background-color: #f3f3f3;
+        width: 598px;
+        height: 64px;
+        color: #999999;
+        font-size: 26px;
+        margin-left: 8px;
+        border-radius: 32px;
+        padding-left: 70px;
+        padding-right: 60px;
+        box-sizing: border-box;
+      }
+
+      .clear {
+        width: 32px;
+        height: 32px;
+        position: absolute;
+        top: 40px;
+        right: 130px;
+        z-index: 10;
+      }
+
+      .search-word {
+        font-size: 28px;
+        color: #135ab8;
+        line-height: 60px;
+        margin-left: 20px;
+      }
+    }
+  }
+
+  .session-list {
+    padding-top: 224px;
+
+    .session-item {
+      width: 686px;
+      margin: 0 auto 32px auto;
+      background-color: #fff;
+      position: relative;
+      overflow: hidden;
+
+      .item-top {
+        padding: 32px 32px 0 32px;
+      }
+
+      .item-title {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 44px;
+        word-break: break-all;
+        width: 600px;
+      }
+
+      .item-info {
+        line-height: 42px;
+        font-size: 28px;
+        margin-bottom: 8px;
+
+        .info-label {
+          color: #999;
+        }
+      }
+
+      .item-bottom {
+        border-top: 2px solid #eee;
+        text-align: right;
+        padding-right: 64px;
+        box-sizing: border-box;
+        line-height: 96px;
+
+        .item-btn {
+          display: inline-block;
+          width: 152px;
+          height: 52px;
+          line-height: 52px;
+          border-radius: 28px;
+          text-align: center;
+          font-size: 28px;
+          margin-left: 32px;
+          border: 2px solid #e1e1e1;
+        }
+      }
+
+      .info-value {
+        color: #343d65;
+        background-color: #fff !important;
+      }
+
+      .item-status {
+        position: absolute;
+        top: 14px;
+        right: -30px;
+        width: 140px;
+        text-align: center;
+        line-height: 44px;
+        font-size: 24px;
+        transform: rotate(45deg);
+      }
+
+      .item-status1 {
+        color: #5a98f2;
+        background-color: #f1f6ff;
+      }
+
+      .item-status0 {
+        color: #ff9b2b;
+        background-color: #fff3e8;
+      }
+
+      .color-1365DD {
+        color: #1365dd;
+      }
+
+      .color-FF4466 {
+        color: #ff4466;
+      }
+
+      .color-333333 {
+        color: #333;
+      }
+
+      .color-606060 {
+        color: #606060;
+      }
+
+      .border-1365DD {
+        border-color: #1365dd !important;
+        color: #1365dd !important;
+      }
+
+      .border-E1E1E1 {
+        border-color: #e1e1e1 !important;
+        color: #606060;
+      }
+
+      .border-E1E1E1 {
+        border-color: #e1e1e1 !important;
+      }
+
+      .mar-b12 {
+        margin-bottom: 26px !important;
+      }
+    }
+  }
+
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210px);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/apps/party/AppPartyStudy/partyStudyContent.vue b/src/apps/party/AppPartyStudy/partyStudyContent.vue
new file mode 100644
index 00000000..83aa2613
--- /dev/null
+++ b/src/apps/party/AppPartyStudy/partyStudyContent.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="page">
+    <header></header>
+    <div class="form">
+      <div class="main">
+        <div class="textarea">
+          <div class="color-333 fs32">
+            <span class="color-red">*</span>学习心得
+          </div>
+          <textarea
+              type="textarea"
+              placeholder="请输入学习心得（200字以内）"
+              v-model="content"
+              adjust-position="false"
+              maxlength="200"
+              class="fs32"
+          ></textarea>
+        </div>
+      </div>
+    </div>
+    <p class="tips-span">说明 : 提交学习心得，意味着完成本次内容的学习。</p>
+    <div class="report" @click="changeStatus()">提交</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "fillLog",
+  data() {
+    return {
+      id: "",
+      content: "",
+    };
+  },
+  onLoad(options) {
+    this.id = options.id;
+    this.getDetailInfo();
+  },
+  methods: {
+    getDetailInfo() {
+      this.$http
+      .post(`/app/apppartystudylog/queryStudyLog?id=${this.id}`, null, {})
+      .then((res) => {
+        if (res.data) {
+          if (res.data.content != null) {
+            this.content = res.data.content;
+          } else {
+            this.content = "";
+          }
+        }
+      });
+    },
+    changeStatus() {
+      if (!this.content) {
+        this.$toast("请输入学习心得");
+        return;
+      }
+      let params = {
+        studyId: this.id,
+        content: this.content,
+      };
+      this.$http
+      .post(`/app/apppartystudylog/addStudyLog`, params)
+      .then((res) => {
+        if (res.code == 0) {
+          this.$toast("学习心得提交完成");
+          setTimeout(function () {
+            uni.navigateBack({
+              delta: 2,
+            });
+          }, 1000);
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  height: 100%;
+
+  .tips-span {
+    width: 626px;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: rgba(153, 153, 153, 1);
+    line-height: 40px;
+    margin-top: 20px;
+    padding-left: 32px;
+  }
+
+  textarea {
+    width: 100%;
+    height: 688px;
+    margin-top: 16px;
+  }
+
+  header {
+    width: 100%;
+    height: 112px;
+    background-color: #e60012;
+  }
+
+  .form {
+    width: 100%;
+    padding: 32px;
+    box-sizing: border-box;
+    margin-top: -100px;
+
+    .main {
+      background-color: #fff;
+      border-radius: 8px;
+      padding: 16px;
+      box-sizing: border-box;
+    }
+
+    .basic-item {
+      font-size: 32px;
+      justify-content: space-between;
+      width: 100%;
+      height: 112px;
+      padding: 32px 32px 32px 12px;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-bottom: 1px solid #eee;
+
+      input {
+        text-align: right;
+      }
+
+      .wid-110 {
+        width: 214px;
+      }
+
+      .skill-span {
+        max-width: 432px;
+        text-align: right;
+        display: inline-block;
+        overflow: hidden;
+        span-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 30px;
+      }
+
+      .picker {
+        justify-content: flex-end;
+        align-items: center;
+        color: #999999;
+        font-size: 32px;
+        background-color: #ffffff;
+      }
+
+      .picker > .AiArea {
+        background-color: #fff !important;
+      }
+
+      .image {
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+      }
+
+      .wei-span {
+        width: 40%;
+      }
+
+      .msg-value {
+        width: 60%;
+      }
+
+      .msg-btn {
+        width: 160px;
+        text-align: right;
+        background-color: #fff !important;
+      }
+
+      button {
+        font-size: 28px;
+        background-color: #fff;
+        line-height: 48px;
+        padding: 0;
+      }
+
+      button::after {
+        border: 0;
+      }
+
+      .button-hover {
+        background-color: #fff;
+      }
+
+      button[disabled] {
+        background-color: #fff !important;
+        font-size: 28px;
+        border-radius: 0;
+      }
+    }
+  }
+
+  .report {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 112px;
+    line-height: 112px;
+    font-size: 32px;
+    text-align: center;
+    background: rgba(230, 0, 18, 1);
+    color: #fff;
+  }
+
+  .fs32 {
+    font-size: 32px;
+  }
+}
+</style>
diff --git a/src/apps/party/AppPartyStudy/partyStudyDetail.vue b/src/apps/party/AppPartyStudy/partyStudyDetail.vue
new file mode 100644
index 00000000..d5aee353
--- /dev/null
+++ b/src/apps/party/AppPartyStudy/partyStudyDetail.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="page">
+    <div class="detail-content">
+      <div class="detail-info">
+        <div class="info-title">{{ data.title }}</div>
+        <div class="item-info">
+          <span class="info-label">学习类别：</span>
+          <span class="info-value">{{ $dict.getLabel('partyStudyType', data.type) }}</span>
+        </div>
+        <div class="item-info">
+          <span class="info-label">发布人员：</span>
+          <span class="info-value">{{ data.publishUserName }}</span>
+        </div>
+        <div class="item-info">
+          <span class="info-label">发布时间：</span>
+          <span class="info-value">{{ data.publishTime }}</span>
+        </div>
+        <div class="item-info">
+          <span class="info-label">学习时间：</span>
+          <span class="info-value">{{ data.studyBeginDate }}至{{ data.studyEndDate }}</span>
+        </div>
+        <div class="item-info">
+          <span class="info-label">学习状态：</span>
+          <span class="info-value">{{ $dict.getLabel('partyStudyStatus', data.studyStatus) }}</span>
+        </div>
+        <div class="item-info" v-if="data.studyStatus == 1">
+          <span class="info-label">完成时间：</span>
+          <span class="info-value">{{ data.finishDate || '-' }}</span>
+        </div>
+      </div>
+      <!-- <div class="page-title">学习内容</div> -->
+      <u-parse :html="data.content" class="content" v-if="data.content"></u-parse>
+      <AiTransSpeech :src="data.speech"/>
+    </div>
+    <div class="btn-box" @click="toContent()">
+      <span class="active">学习心得</span>
+    </div>
+  </div>
+</template>
+<script>
+
+export default {
+  data() {
+    return {
+      id: '',
+      data: {},
+    };
+  },
+  onLoad(options) {
+    this.$dict.load('partyStudyStatus', 'partyStudyType')
+    this.id = options.id
+    this.getDetailInfo()
+  },
+  onShow() {
+    this.getDetailInfo()
+  },
+  methods: {
+    toContent() {
+      uni.navigateTo({url: `./AppPartyStudy?id=${this.id}`})
+    },
+    getDetailInfo() {
+      this.$http.post(`/app/apppartystudy/queryDetailByIdWeChat?id=${this.id}`, null, {}).then(res => {
+        if (res.data) {
+          if (res.data.files && res.data.files.length) {
+            res.data.files.map(item => {
+              var size = item.size / 1024;
+              item.fileSize = size.toFixed(0);
+              return item
+            })
+          }
+          this.data = res.data
+        }
+      })
+    },
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  background-color: #fff;
+
+  .detail-content {
+    padding-bottom: 140px;
+  }
+  .content{
+    padding: 20px;
+    background-color: #fff;
+  }
+
+  .detail-info {
+    padding: 16px 32px 8px 32px;
+    border-bottom: 2px solid #D8DDE6;
+    background-color: #E60012;
+    padding-bottom: 80px;
+    position: relative;
+
+    .info-title {
+      line-height: 64px;
+      font-size: 40px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #fff;
+      word-break: break-all;
+      margin-bottom: 16px;
+    }
+
+    .item-info {
+      line-height: 48px;
+      font-size: 30px;
+      margin-bottom: 8px;
+
+      .info-label {
+        display: inline-block;
+        color: #fff;
+        vertical-align: top;
+      }
+
+      .info-value {
+        display: inline-block;
+        width: 510px;
+        word-break: break-all;
+        color: #FFE8E8;
+      }
+
+      .item-status0 {
+        color: #FF9B2B;
+      }
+
+      .item-status1 {
+        color: #2EA222;
+      }
+
+      .item-status2 {
+        color: #343D65;
+      }
+
+      .item-status3 {
+        color: #5A98F2;
+      }
+
+      .item-status4 {
+        color: #f46;
+      }
+
+    }
+
+    .retract-btn {
+      line-height: 80px;
+      text-align: center;
+      font-size: 28px;
+      color: #fff;
+      position: absolute;
+      bottom: 0;
+      width: 690px;
+
+      .down-icon {
+        width: 32px;
+        height: 32px;
+        margin-left: 4px;
+        vertical-align: middle;
+        transition: all .3s ease-in-out;
+      }
+
+      .icon-active {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  .page-title {
+    line-height: 96px;
+    color: #333;
+    font-size: 32px;
+    padding-left: 32px;
+    background-color: #fff;
+
+    span {
+      font-size: 28px;
+    }
+  }
+
+  .info-content {
+    padding: 16px 32px;
+    background-color: #fff;
+    line-height: 48px;
+    color: #333;
+    font-size: 32px;
+    box-sizing: border-box;
+  }
+
+  .user-list {
+    background-color: #fff;
+
+    .user-item {
+      height: 112px;
+      padding-top: 16px;
+      box-sizing: border-box;
+
+      .user-bg {
+        display: inline-block;
+        width: 80px;
+        height: 80px;
+        background-color: #4E8EEE;
+        color: #fff;
+        text-align: center;
+        line-height: 80px;
+        margin: 0 16px 0 32px;
+        font-size: 28px;
+        border-radius: 50%;
+        vertical-align: top;
+      }
+
+      .user-info {
+        display: inline-block;
+        width: 622px;
+        height: 96px;
+        border-bottom: 2px solid #D8DDE6;
+        box-sizing: border-box;
+
+        .user-name {
+          line-height: 44px;
+          color: #333;
+          font-size: 32px;
+        }
+
+        .user-unit {
+          line-height: 34px;
+          color: #999;
+          font-size: 24px;
+        }
+      }
+    }
+
+    .user-item:nth-last-of-type(1) {
+      .user-info {
+        border-bottom: 0;
+      }
+    }
+  }
+
+  .mar-b8 {
+    margin-bottom: 16px;
+  }
+
+  .color-1365DD {
+    color: #1365DD;
+  }
+
+  .color-999999 {
+    color: #999999;
+  }
+
+  .pad-l7 {
+    padding-left: 14px;
+  }
+
+  .attachment {
+    width: 100%;
+    padding: 32px;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    margin-top: 16px;
+
+    .attachment-title {
+      font-size: 32px;
+      color: #333333;
+      font-weight: 500;
+
+      image {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+      }
+    }
+
+    .attachment-item {
+      border: 1px solid rgba(204, 204, 204, 1);
+      padding: 16px;
+      box-sizing: border-box;
+      margin-top: 34px;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      border-radius: 8px;
+
+      .file-name {
+        justify-content: flex-start;
+        align-items: center;
+
+        image {
+          width: 96px;
+          height: 96px;
+          vertical-align: middle;
+        }
+
+        .title {
+          color: #333333;
+          font-size: 32px;
+          word-break: break-all;
+          flex: 1;
+        }
+      }
+
+      .size {
+        color: #999;
+        font-size: 28px;
+        display: flex;
+        justify-content: cemter;
+        align-items: center;
+      }
+    }
+  }
+
+  .btn-box {
+    position: fixed;
+    display: flex;
+    bottom: 0;
+    height: 112px;
+    line-height: 112px;
+    width: 100%;
+    color: #333;
+    background-color: #fff;
+    font-size: 36px;
+
+    span {
+      flex: 1;
+      text-align: center;
+    }
+
+    .active {
+      background-color: #E60012;
+      color: #fff;
+    }
+  }
+}
+
+
+.partyStudyContent {
+  width: 100%;
+  height: calc(100% - 184rpx);
+  padding: 32px;
+  box-sizing: border-box;
+  color: #666;
+  font-size: 32px;
+  background-color: #fff;
+  word-break: break-all;
+}
+</style>
diff --git a/src/apps/party/AppThreeSessions/AppThreeSessions.vue b/src/apps/party/AppThreeSessions/AppThreeSessions.vue
new file mode 100644
index 00000000..17dae2bb
--- /dev/null
+++ b/src/apps/party/AppThreeSessions/AppThreeSessions.vue
@@ -0,0 +1,552 @@
+<template>
+  <div class="page">
+    <div v-if="isShow" style="height:100%;">
+      <div class="fixed-top" style="width:100%;">
+        <!-- 头部搜索样式 -->
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <image src="https://cdn.cunwuyun.cn/img/search-red.svg"></image>
+            <span>{{ inputValue }}</span>
+          </div>
+        </div>
+        <!-- 选择时间和类型 -->
+        <div class='slect flex-row'>
+          <!-- 类型选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker @change="bindPickerChange" :range="array" range-key="dictName">
+                  <div class="uni-input">{{ meetTypespan }}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+          <!-- 时间选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange"
+                        fields='month'>
+                  <div class="uni-input">{{ day }}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="session-list">
+        <div class="session-item" v-for="(item, index) in meetList" :key="index">
+          <div class="item-top" @click="toSessionDetail(item.meetingId, item.status)">
+            <div class="item-title mar-b12">{{ item.meetingAgenda }}</div>
+            <div class="item-info">
+              <span class="info-label">会议状态：</span>
+              <span :class="'item-status'+item.postStatus" class="info-value">
+                {{ $dict.getLabel('postStatus', item.postStatus) }}
+              </span>
+            </div>
+            <div class="item-info">
+              <span class="info-label">开始时间：</span>
+              <span class="info-value">{{ item.startTime || '-' }}</span>
+            </div>
+            <div class="item-info">
+              <span class="info-label">会议地点：</span>
+              <span class="info-value">{{ item.meetingAddress || '-' }}</span>
+            </div>
+            <div class="item-info">
+              <span class="info-label">主持人员：</span>
+              <span class="info-value">{{ item.hostName || '-' }}</span>
+            </div>
+            <div class="item-info mar-b12">
+              <span class="info-label">会议类型：</span>
+              <span class="info-value">{{ item.meetingClassification || '-' }}</span>
+            </div>
+          </div>
+          <div class="item-bottom">
+            <span class="item-btn border-E1E1E1" v-if="item.status == 3">已请假</span>
+            <span class="item-btn border-1365DD" v-if="item.status == 0" @click="signMeeting(item.meetingId)">签到</span>
+            <span class="item-btn border-E1E1E1" v-if="item.status == 1">已签到</span>
+            <span class="item-btn border-E1E1E1" v-if="item.status == 4">不签到</span>
+          </div>
+          <div class="item-status" :class="'item-status'+item.postStatus">
+            {{ $dict.getLabel('postStatus', item.postStatus) }}
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="meetList.length == 0"/>
+    </div>
+    <div v-if="!isShow" class="search-input">
+      <div class="input-box flex-row">
+        <input class="input" placeholder="请输入会议标题" focus="false" v-model="searchValue" @blur="onBlur"/>
+        <image class="sousuo" src="https://cdn.cunwuyun.cn/img/search-active.svg"></image>
+        <image v-if="searchValue" @tap="clearInput" class="clear"
+               src="https://cdn.cunwuyun.cn/img/empty-Input.svg"></image>
+        <div class="search-word" @click="search">搜索</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  appName: "三会一课",
+  data() {
+    const currentDate = this.getDate({
+      format: true
+    })
+    return {
+      inputValue: "请输入会议标题",
+      isShow: true,
+      array: [],
+      meetType: "",
+      meetTypespan: "会议类型",
+      index: 0,
+      date: currentDate,
+      day: "会议时间",
+      createDate: "",//创建时间
+      meetList: [],
+      searchValue: "",//搜索框输入值
+      pageNum: 1,
+      pageSize: 10,
+      pages: 2,
+      userId: '',
+      partyId: '',
+      meetTypeIndex: '',
+    };
+  },
+  computed: {
+    startDate() {
+      return this.getDate('start');
+    },
+    endDate() {
+      return this.getDate('end');
+    },
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.partyId = this.user.id
+    this.$dict.load('postStatus', 'meetingClassification')
+    this.array = this.$dict.getDict('meetingClassification')
+    this.getList()
+  },
+  methods: {
+    signMeeting(id) {
+      this.$http.post(`/app/appthreemeetinguser/signByMeetingIdAndUserIdForWX?meetingId=${id}&userId=${this.user.id}`, null, {}).then(res => {
+        if (res.code == 0) {
+          this.$toast('签到成功')
+          this.pageNum = 1;
+          this.pages = 2;
+          this.getList()
+        }
+      }).catch(err => {
+        uni.showToast({
+          icon: 'none',
+          title: err,
+          duration: 2000
+        });
+      })
+    },
+    btnClick(span) {
+      uni.showToast({
+        icon: 'none',
+        title: span,
+        duration: 2000
+      });
+    },
+    bindPickerChange(e) {
+      this.array.map((item, index) => {
+        if (e.detail.value == item.dictValue) {
+          this.meetTypespan = this.array[index].dictName
+        }
+      })
+      this.meetTypeIndex = e.detail.value
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList()
+    },
+    bindDateChange: function (e) {
+      this.day = e.target.value;
+      this.createDate = e.target.value + '-' + "01"
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList()
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+
+      if (type === 'start') {
+        year = year - 60;
+      } else if (type === 'end') {
+        year = year + 2;
+      }
+      month = month > 9 ? month : '0' + month;
+      day = day > 9 ? day : '0' + day;
+
+      return `${year}-${month}-08 00:00:00  `;
+    },
+    changeSearchBox() {
+      this.isShow = false;
+    },
+    onBlur(e) {
+      this.searchValue = e.target.value;
+      if (this.searchValue) {
+        this.inputValue = this.searchValue;
+      } else {
+        this.inputValue = "请输入会议标题";
+      }
+    },
+    search() {
+      this.isShow = true;
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.pages = 2;
+      this.getList()
+    },
+    clearInput() {
+      this.searchValue = ''
+      this.inputValue = "请输入会议标题";
+    },
+    getList() {
+      if (this.pageNum > this.pages) return
+      // var searchYMD = ''
+      // if(this.createDate) {
+      //     searchYMD = this.createDate + '-01'
+      // }
+      this.$http.post(`/app/appthreemeetinguser/listForWX?meetingUserId=${this.user.id}&meetingAgenda=${this.searchValue}&meetingClassification=${this.meetTypeIndex}&searchYMD=${this.createDate}&current=${this.pageNum}&size=${this.pageSize}`
+      ).then(res => {
+        if (res.code == 0) {
+          const meetList = this.pageNum > 1 ? [...this.meetList, ...res.data.records] : res.data.records
+          meetList.map(item => {
+            if (item.meetingClassification.length == 1) {
+              item.meetingClassification = this.$dict.getLabel('meetingClassification', item.meetingClassification)
+            } else {
+              var typeList = item.meetingClassification.split(',')
+              typeList.map((items, index) => {
+                if (index == 0) {
+                  item.meetingClassification = this.$dict.getLabel('meetingClassification', items)
+                } else {
+                  item.meetingClassification = item.meetingClassification + ',' + this.$dict.getLabel('meetingClassification', items)
+                }
+                return item.meetingClassification
+              })
+              return item.meetingClassification
+            }
+            return item
+          })
+          this.pages = Math.ceil(res.data.total / 10)
+          this.meetList = meetList
+        }
+      })
+    },
+    toSessionDetail(id, signStatus) {
+      uni.navigateTo({
+        url: `../threeSessions/threeSessionsDetail?id=${id}&signStatus=${signStatus}&token=${uni.getStorageSync("token")}`
+      })
+    },
+    leave() {
+      uni.showModal({
+        title: '如需请假，请联系签到负责人',
+        confirmspan: "确认",
+        confirmColor: "#135AB8",
+        success: function (res) {
+          if (res.confirm) {
+          } else if (res.cancel) {
+          }
+        }
+      });
+    },
+    changeStatus(id, signStatus, joinStatus, signMethod, absence, meetingUserId, meetingId, successspan) {
+      let signTime = new Date().getFullYear() + '-' + this.isDate(new Date().getMonth() + 1) + '-' + this.isDate(new Date().getDate()) + ' ' + this.isDate(new Date().getHours()) + ':' + this.isDate(new Date().getMinutes()) + ':' + this.isDate(new Date().getSeconds())
+      var params = {
+        id,
+        signStatus,
+        joinStatus,
+        signMethod,
+        absence,
+        signUserId: this.user.id,
+        signUserName: this.user.realName,
+        signTime,
+        meetingUserId,
+        meetingId
+      }
+      this.$http.post(`/app/appthreemeetinguser/addOrUpdate`, null, {
+        data: params
+      }).then(res => {
+        if (res?.code == 0) {
+          uni.showToast({
+            title: successspan + '成功！',
+            duration: 2000
+          });
+          this.pageNum = 1;
+          this.pages = 2;
+          this.getList()
+        }
+      })
+    },
+    isDate(num) {
+      if (num < 10) {
+        num = '0' + num
+      }
+      return num
+    },
+  },
+  onReachBottom() {
+    this.pageNum = this.pageNum + 1
+    this.getList()
+  }
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  .search-box {
+    width: 100%;
+    height: 112px;
+    background-color: #e60012;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    .search-input {
+      line-height: 64px;
+      width: 100%;
+      height: 100%;
+      background: #CE0010;
+      border-radius: 32px;
+      color: #F0CBCD;
+      font-size: 26px;
+
+      image {
+        width: 34px;
+        height: 34px;
+        margin: 8px 8px 8px 24px;
+        position: relative;
+        top: 6px;
+      }
+    }
+  }
+
+  .slect {
+    width: 100%;
+    height: 96px;
+    background-color: #fff;
+    color: #666;
+
+    .type-slect {
+      width: 50%;
+      border-right: 1px solid #F7F7F7;
+      margin: 30px 0;
+      box-sizing: border-box;
+      text-align: center;
+      font-size: 26px;
+
+      .uni-input {
+        display: inline-block;
+      }
+
+      image {
+        width: 32px;
+        height: 32px;
+        display: inline-block;
+        position: relative;
+        top: 6px;
+        margin-left: 8 srpx;
+      }
+    }
+
+    .type-slect:nth-child(2) {
+      border: none;
+    }
+  }
+
+  .search-input {
+    .input-box {
+      width: 100%;
+      height: 112px;
+      background-color: #fff;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      position: relative;
+
+      .sousuo {
+        position: absolute;
+        top: 35px;
+        left: 60px;
+        width: 34px;
+        height: 34px;
+      }
+
+      .input {
+        background-color: #F3F3F3;
+        width: 598px;
+        height: 64px;
+        color: #999999;
+        font-size: 26px;
+        margin-left: 8px;
+        border-radius: 32px;
+        padding-left: 70px;
+        padding-right: 60px;
+        box-sizing: border-box;
+      }
+
+      .clear {
+        width: 32px;
+        height: 32px;
+        position: absolute;
+        top: 40px;
+        right: 130px;
+        z-index: 10;
+      }
+
+      .search-word {
+        font-size: 28px;
+        color: #135AB8;
+        line-height: 60px;
+        margin-left: 20px;
+      }
+    }
+  }
+
+  .session-list {
+    padding-top: 224px;
+
+    .session-item {
+      width: 686px;
+      margin: 0 auto 32px auto;
+      background-color: #fff;
+      // height: 462rpx;
+      position: relative;
+      overflow: hidden;
+
+      .item-top {
+        padding: 32px 32px 0 32px;
+      }
+
+      .item-title {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 44px;
+        word-break: break-all;
+      }
+
+      .item-info {
+        line-height: 42px;
+        font-size: 28px;
+        margin-bottom: 8px;
+
+        .info-label {
+          color: #999;
+        }
+
+      }
+
+      .item-bottom {
+        border-top: 2px solid #EEE;
+        text-align: right;
+        padding-right: 64px;
+        box-sizing: border-box;
+        line-height: 96px;
+
+        .item-btn {
+          display: inline-block;
+          width: 152px;
+          height: 52px;
+          line-height: 52px;
+          border-radius: 28px;
+          text-align: center;
+          font-size: 28px;
+          margin-left: 32px;
+          border: 2px solid #E1E1E1;
+        }
+      }
+
+      .info-value {
+        color: #343D65;
+        background-color: #fff !important;
+      }
+
+      .item-status {
+        position: absolute;
+        top: 14px;
+        right: -36rpx;
+        width: 140px;
+        text-align: center;
+        line-height: 44px;
+        font-size: 24px;
+        transform: rotate(45deg);
+      }
+
+      .item-status1 {
+        color: #FF9B2B;
+        background-color: #FFF3E8;
+      }
+
+      .item-status0 {
+        color: #2EA222;
+        background-color: #EAF5E8;
+      }
+
+      .item-status3 {
+        color: #999;
+        background-color: #F2F2F2;
+      }
+
+      .item-status2 {
+        color: #5A98F2;
+        background-color: #F1F6FF;
+      }
+
+      .color-1365DD {
+        color: #1365DD;
+      }
+
+      .color-FF4466 {
+        color: #FF4466;
+      }
+
+      .color-333333 {
+        color: #333;
+      }
+
+      .color-606060 {
+        color: #606060;
+      }
+
+      .border-1365DD {
+        border-color: #1365DD !important;
+        color: #1365DD !important;
+      }
+
+      .border-E1E1E1 {
+        border-color: #E1E1E1 !important;
+        color: #606060;
+      }
+
+      .border-E1E1E1 {
+        border-color: #E1E1E1 !important;
+      }
+
+      .mar-b12 {
+        margin-bottom: 26px !important;
+      }
+    }
+  }
+
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/apps/party/AppThreeSessions/qrcode.vue b/src/apps/party/AppThreeSessions/qrcode.vue
new file mode 100644
index 00000000..fd3a3ee2
--- /dev/null
+++ b/src/apps/party/AppThreeSessions/qrcode.vue
@@ -0,0 +1,209 @@
+<template>
+  <div class="page">
+    <!-- <span class="close-img" @click="closePage()">×</span> -->
+    <image src="https://cdn.cunwuyun.cn/img/qrcode-sign-img.png" class="banner-img"></image>
+    <div class="btn" @click="btnClick()">{{ btnspan }}</div>
+    <div class="mask" v-if="showFail">
+      <div class="mask-content">
+        <image src="https://cdn.cunwuyun.cn/img/qrcode-sign-fail.png" class="fail-img"></image>
+        <div class="mask-span">签到失败！请重新签到</div>
+        <div class="mask-btn" @click="btnClick()">确认签到</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      showFail: false,
+      meetingId: '',
+      btnspan: '',
+      scene: '',
+      userId: '',
+      isSign: true
+    };
+  },
+  onShow() {
+    if (uni.getStorageSync('token')) {
+      this.meetingId = this.$mp.query.scene
+      // this.meetingId = 'c29aacb54f074c14ab93532e384a6daa'
+      this.getUserInfo()
+    } else {
+      uni.showModal({
+        title: '提示',
+        content: '您还未登录,请先登录!',
+        confirmspan: "去登录",
+        showCancel: false,
+        success(res) {
+          if (res.confirm) {
+            wx.switchTab({
+              url: '../mine/mine',
+            })
+          }
+        }
+      })
+    }
+  },
+  methods: {
+    getUserInfo() {
+      this.$store.commit("getUserInfo", v => {
+        if (v) {
+          this.userId = res.data.id
+          this.getDetailInfo()
+        }
+      })
+    },
+    getDetailInfo() {
+      this.$http.post(`/app/appthreemeetinguser/queryWeathersignByMeetingIdAndUserIdForWX?meetingId=${this.meetingId}&userId=${this.userId}`, null, {}).then(res => {
+        if (res.data) {
+          this.isSign = true
+          // if(res.data.status == 1) { //已签到
+          //     this.btnspan = '已签到'
+          // }
+          if (res.data.status == 0) { //未签
+            this.btnspan = '确认签到'
+          } else {
+            this.btnspan = '已签到'
+          }
+        } else {
+          this.btnspan = '确认签到'
+          this.isSign = false   //不是参会人员
+        }
+      }).catch(err => {
+        uni.showToast({
+          icon: 'none',
+          title: err,
+          duration: 2000
+        });
+        return
+      })
+    },
+    btnClick() {
+      // if(!this.isSign) {
+      //     uni.showToast({
+      //         icon: 'none',
+      //         title: '您不是参会人员',
+      //         duration: 2000
+      //     });
+      //     return
+      // }
+      if (this.btnspan == '已签到') {
+        uni.showToast({
+          icon: 'none',
+          title: '已签到',
+          duration: 2000
+        });
+        return
+      }
+      this.$http.post(`/app/appthreemeetinguser/signByMeetingIdAndUserIdForWX?meetingId=${this.meetingId}&userId=${this.userId}`, null, {}).then(res => {
+        if (res.code == 0) {
+          this.btnspan = '已签到'
+          uni.showToast({
+            title: '签到成功',
+            duration: 2000
+          });
+        } else {
+          this.showFail = true
+        }
+
+      }).catch(err => {
+        uni.showToast({
+          icon: 'none',
+          title: err,
+          duration: 2000
+        });
+        return
+      })
+    },
+    closePage() {
+      uni.reLaunch({
+        url: "../home/portal"
+      })
+    }
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  background-color: #FFFFFF;
+  position: relative;
+
+  .close-img {
+    position: absolute;
+    font-size: 50px;
+    left: 32px;
+  }
+
+  .banner-img {
+    width: 514px;
+    height: 340px;
+    margin: 48px 0 118px 96px;
+  }
+
+  .btn {
+    width: 622px;
+    line-height: 96px;
+    text-align: center;
+    background: rgba(19, 90, 184, 1);
+    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+    border-radius: 8px;
+    margin: 0 auto;
+    color: #fff;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+  }
+
+  .mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, .3);
+
+    .mask-content {
+      width: 686px;
+      height: 640px;
+      background: #fff;
+      border-radius: 8px;
+      border: 2px solid rgba(151, 151, 151, 1);
+      margin: 260px auto 0;
+
+      .fail-img {
+        width: 160px;
+        height: 160px;
+        margin: 112px 0 32px 264px;
+      }
+
+      .mask-span {
+        width: 100%;
+        line-height: 50px;
+        font-size: 36px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 700;
+        color: rgba(51, 51, 51, 1);
+        text-align: center;
+        margin-bottom: 134px;
+      }
+
+      .mask-btn {
+        width: 560px;
+        line-height: 96px;
+        text-align: center;
+        background: rgba(19, 90, 184, 1);
+        box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+        border-radius: 8px;
+        margin: 0 auto;
+        color: #fff;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/AppThreeSessions/threeSessionsContent.vue b/src/apps/party/AppThreeSessions/threeSessionsContent.vue
new file mode 100644
index 00000000..2dc5db0b
--- /dev/null
+++ b/src/apps/party/AppThreeSessions/threeSessionsContent.vue
@@ -0,0 +1,460 @@
+<template>
+  <div class="page">
+    <header></header>
+    <div class="form">
+      <div class="main">
+        <div class="textarea">
+          <div class="color-666"><span class="color-red">*</span>会议内容</div>
+          <textarea
+              type="textarea"
+              placeholder="请输入会议内容（3000字以内）"
+              v-model="baseInfo.content"
+              adjust-position="false"
+              maxlength="3000"
+          ></textarea>
+        </div>
+        <div class="uni-uploader">
+          <div class="title-box title-box-margin">
+            <span class="title color-666">图片资料（最多9张）</span>
+          </div>
+          <div class="uni-uploader-body">
+            <div class="uni-uploader__files">
+              <block v-for="(image, index) in imageList" :key="index">
+                <div class="uni-uploader__file">
+                  <image
+                      class="uni-uploader__img"
+                      :src="image.accessUrl"
+                      :data-index="index"
+                      @tap="previewImage"
+                  ></image>
+                  <AiUniIcon
+                      type="clear"
+                      class="icon"
+                      color="#8f8f94"
+                      size="26"
+                      @click="deleteImage(index)"
+                  ></AiUniIcon>
+                </div>
+              </block>
+              <div
+                  class="pre-div"
+                  @tap="chooseImageType"
+                  v-if="imageList.length < 9"
+              >
+                <span class="pre-label">+</span>
+                <span class="add-image">添加照片</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="report" @click="report()">提交</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "fillLog",
+  data() {
+    return {
+      reportId: "",
+      baseInfo: {
+        content: "",
+        fileIds: [],
+        reportId: "",
+        id: "",
+        images: [],
+        meetingId: "",
+        createUserName: "",
+      },
+      imageList: [],
+      sourceTypeIndex: 2,
+      sourceType: [
+        // 图片来源类型
+        ["camera"],
+        ["album"],
+      ],
+    };
+  },
+  computed: {
+    user() {
+      return uni.getStorageSync("userInfo");
+    },
+  },
+  onLoad(options) {
+    this.baseInfo.meetingId = options.id;
+    this.getDetailInfo();
+  },
+  methods: {
+    getDetailInfo() {
+      this.$http.post(`/app/appthreemeetinginfoexpand/queryDetailById?id=${this.baseInfo.meetingId}`).then((res) => {
+        if (res.data) {
+          if (res.data.images != null) {
+            this.imageList = JSON.parse(res.data.images);
+          }
+          this.baseInfo = {...res.data};
+        }
+      })
+      .catch((err) => {
+      });
+    },
+    // 选择照片类型
+    chooseImageType() {
+      let that = this;
+      uni.showActionSheet({
+        itemList: ["拍照", "从相册选择"],
+        success: function (res) {
+          // console.log(res.tapIndex)
+          that.sourceTypeIndex = res.tapIndex;
+          // console.log(that.sourceTypeIndex)
+          that.chooseImage();
+        },
+      });
+    },
+    showModel(title) {
+      uni.showModal({
+        title: "温馨提示",
+        content: title,
+        showCancel: false,
+        confirmColor: "#135AB8",
+        success(res) {
+          if (res.confirm) {
+          }
+        },
+      });
+    },
+    chooseImage: async function () {
+      let that = this;
+      if (that.imageList.length === 9) {
+        let isContinue = await that.isFullImg();
+        // console.log("是否继续?", isContinue);
+        if (!isContinue) {
+          return;
+        }
+      }
+      uni.chooseImage({
+        // 从相册选择或相机拍摄
+        sourceType: that.sourceType[that.sourceTypeIndex],
+        // 最多可以选择的图片数量
+        count: 9,
+        success: (res) => {
+          // 图片的本地文件路径列表
+          that.tempFilePaths = res.tempFilePaths;
+          // console.log(res.tempFilePaths)
+          for (let i = 0; i < that.tempFilePaths.length; i++) {
+            let str = "";
+            let token = uni.getStorageSync("token");
+            // console.log('token',token)
+            let params = {
+              token: token,
+            };
+            // url String 是 开发者服务器 url
+            // files Aarry 否 需要上传的文件列表。使用 files 时，filePath 和 name 不生效。 5+App
+            // filePath String 是 要上传文件资源的路径。
+            // name String 是 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
+            // header Object 否 HTTP 请求 Header, header 中不能设置 Referer
+            // formData Object 否 HTTP 请求中其他额外的 form data
+            // success Function 否 接口调用成功的回调函数
+            // fail Function 否 接口调用失败的回调函数
+            // complete Function 否 接口调用结束的回调函数（调用成功、失败都会执行）
+            uni.uploadFile({
+              url: this.$http.baseURL + "/admin/file/add",
+              filePath: that.tempFilePaths[i],
+              name: "file",
+              // formData:params,
+              header: {
+                "Content-Type": "multipart/form-data",
+                access_token: token,
+                Authorization: token,
+              },
+              success(res) {
+                // console.log('uploader',res)
+                str = JSON.stringify(JSON.parse(res.data).data[0]).replace(
+                    /\"/g,
+                    ""
+                );
+                var temp = {
+                  fileId: str.split(";")[1],
+                  accessUrl: str.split(";")[0],
+                };
+                that.imageList = that.imageList.concat(temp);
+                if (that.imageList.length > 9) {
+                  that.imageList = that.imageList.slice(0, 9);
+                  uni.showToast({
+                    title: "图片最多只能上传9张",
+                    icon: "none",
+                  });
+                }
+                that.imgUrl = JSON.stringify(that.imageList);
+
+                // console.log('imageList-upload',that.imageList)
+              },
+              fail(res) {
+                console.log("error", res);
+              },
+            });
+          }
+        },
+      });
+    },
+    // 预览图片(大图预览)
+    previewImage: function (e) {
+      let that = this;
+      // console.log('预览',e)
+      var current = e.target.dataset.index;
+      // console.log(current)
+
+      var tempList = [];
+      for (var i in that.imageList) {
+        tempList.push(that.imageList[i].accessUrl);
+      }
+
+      uni.previewImage({
+        // 当前图片的索引、链接
+        current: tempList[current],
+        urls: tempList,
+        longPressActions: {
+          itemList: ["发送给朋友", "保存图片", "收藏"],
+          success: function (data) {
+            // console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+          },
+          fail: function (err) {
+            // console.log(err.errMsg);
+          },
+        },
+      });
+    },
+    // 删除照片
+    deleteImage(index) {
+      this.imageList.splice(index, 1);
+    },
+    report() {
+      if (!this.baseInfo.content) {
+        uni.showToast({title: "会议内容不能为空", icon: "none"});
+        return false;
+      }
+      this.baseInfo.fileIds = [];
+      this.imageList.forEach((e) => {
+        this.baseInfo.fileIds.push(e.fileId);
+      });
+      this.baseInfo.images = JSON.stringify(this.imageList);
+      this.baseInfo.createUserName = this.user.realName;
+      this.$http
+      .post(`/app/appthreemeetinginfoexpand/addOrUpdate`, this.baseInfo, null)
+      .then((res) => {
+        if (res.code == 0) {
+          uni.showToast({
+            title: "会议纪要提交成功",
+            icon: "none",
+            duration: 2000,
+          });
+          setTimeout(() => {
+            uni.navigateBack({
+              delta: 2,
+            });
+          }, 2000);
+        }
+      })
+      .catch((err) => {
+        uni.showToast({
+          title: err,
+          icon: "none",
+          duration: 1000,
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  height: 100%;
+  font-size: 32 rpx;
+
+  header {
+    width: 100%;
+    height: 112 rpx;
+    background-color: #e60012;
+  }
+
+  .form {
+    width: 100%;
+    padding: 32 rpx;
+    box-sizing: border-box;
+    margin-top: -100rpx;
+
+    .main {
+      background-color: #fff;
+      border-radius: 8 rpx;
+      padding: 16 rpx;
+      box-sizing: border-box;
+    }
+
+    .basic-item {
+      font-size: 32 rpx;
+      justify-content: space-between;
+      width: 100%;
+      height: 112 rpx;
+      padding: 32 rpx 32 rpx 32 rpx 12 rpx;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-bottom: 1 rpx solid #eee;
+
+      input {
+        text-align: right;
+      }
+
+      .wid-110 {
+        width: 214 rpx;
+      }
+
+      .skill-span {
+        max-width: 432 rpx;
+        text-align: right;
+        display: inline-block;
+        overflow: hidden;
+        span-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 30 rpx;
+      }
+
+      .picker {
+        justify-content: flex-end;
+        align-items: center;
+        color: #999999;
+        font-size: 32 rpx;
+        background-color: #ffffff;
+      }
+
+      .picker > .AiArea {
+        background-color: #fff !important;
+      }
+
+      .image {
+        width: 32 rpx;
+        height: 32 rpx;
+        vertical-align: middle;
+      }
+
+      .wei-span {
+        width: 40%;
+      }
+
+      .msg-value {
+        width: 60%;
+      }
+
+      .msg-btn {
+        width: 160px;
+        text-align: right;
+        background-color: #fff !important;
+      }
+
+      button {
+        font-size: 28 rpx;
+        background-color: #fff;
+        line-height: 48 rpx;
+        padding: 0;
+      }
+
+      button::after {
+        border: 0;
+      }
+
+      .button-hover {
+        background-color: #fff;
+      }
+
+      button[disabled] {
+        background-color: #fff !important;
+        font-size: 28 rpx;
+        border-radius: 0;
+      }
+    }
+
+    /* 上传照片 */
+    .uni-uploader {
+      flex: 1;
+      flex-direction: column;
+    }
+
+    .uni-uploader-head {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+    }
+
+    .uni-uploader-info {
+      color: #b2b2b2;
+    }
+
+    .uni-uploader-body {
+      margin-top: 16 rpx;
+    }
+
+    .uni-uploader__files {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+    }
+
+    .uni-uploader__file {
+      margin-right: 10 rpx;
+      margin-bottom: 20 rpx;
+      width: 160 rpx;
+      height: 160 rpx;
+      position: relative;
+    }
+
+    .uni-uploader__img {
+      display: block;
+      width: 160 rpx;
+      height: 160 rpx;
+    }
+
+    .pre-label {
+      font-size: 80 rpx;
+      color: #dddddd;
+    }
+
+    .add-image {
+      color: #dddddd;
+      font-size: 24 rpx;
+    }
+
+    .pre-div {
+      width: 160 rpx;
+      height: 160 rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      align-items: center;
+      border-radius: 8 rpx;
+      border: 2 rpx solid #dddddd;
+    }
+
+    .icon {
+      position: absolute;
+      top: -15rpx;
+      right: -10rpx;
+    }
+  }
+
+  .report {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 112 rpx;
+    line-height: 112 rpx;
+    font-size: 32 rpx;
+    text-align: center;
+    background: rgba(230, 0, 18, 1);
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/apps/party/AppThreeSessions/threeSessionsDetail.vue b/src/apps/party/AppThreeSessions/threeSessionsDetail.vue
new file mode 100644
index 00000000..34a48c51
--- /dev/null
+++ b/src/apps/party/AppThreeSessions/threeSessionsDetail.vue
@@ -0,0 +1,525 @@
+<template>
+  <div class="page">
+    <div class="detail-info">
+      <div class="info-title">{{ data.meetingAgenda }}</div>
+      <div class="item-info">
+        <span class="info-label">会议状态：</span>
+        <span class="info-value">{{ $dict.getLabel('postStatus', data.postStatus) }}</span>
+      </div>
+      <div class="item-info">
+        <span class="info-label">举办方式：</span>
+        <span class="info-value">{{ data.isOnline == 1 ? '线上会议' : '线下会议' }}</span>
+      </div>
+      <div class="item-info">
+        <span class="info-label">会议分类：</span>
+        <span class="info-value" v-if="data.meetingClassification && data.meetingClassification.length">
+          <span v-for="(item, index) in data.meetingClassification" :key="index">
+            {{ $dict.getLabel('meetingClassification', item) }}
+            <span v-if="index < data.meetingClassification.length - 1">,</span>
+          </span>
+        </span>
+        <span class="info-value" v-else>-</span>
+      </div>
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">会议时间：</span>
+        <span class="info-value">{{ data.startTime || '-' }}</span>
+      </div>
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">签到时间：</span>
+        <span class="info-value" v-if="data.signMethod == 1 && signStart">{{ signStart }}</span>
+        <span class="info-value sign-end" v-if="data.signMethod == 1 && signEnd">至 {{ signEnd }}</span>
+        <span class="info-value" v-if="data.signMethod != 1">-</span>
+      </div>
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">会议地点：</span>
+        <span class="info-value">{{ data.meetingAddress || '-' }}</span>
+      </div>
+      <!-- <div class="item-info" v-if="showAll">
+        <span class="info-label">会议主题：</span>
+        <span class="info-value" v-if="data.topicClassification &&  data.topicClassification.length">
+          <span v-for="(item, index) in data.topicClassification" :key="index">
+            {{ $dict.getLabel('topicClassification', item) }}
+            <span v-if="index < data.topicClassification.length - 1">,</span>
+          </span>
+        </span>
+        <span class="info-value" v-else>-</span>
+      </div> -->
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">主持人员：</span>
+        <span class="info-value">{{ data.hostName || '-' }}</span>
+      </div>
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">发布人员：</span>
+        <span class="info-value">{{ data.createUserName || '-' }}</span>
+      </div>
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">签到人员：</span>
+        <span class="info-value" v-if="data.chargeOfSignInList && data.chargeOfSignInList.length">
+          <span v-for="(item, index) in data.chargeOfSignInList" :key="index">
+            {{ item.userName }}
+            <span v-if="index < data.chargeOfSignInList.length - 1">,</span>
+          </span>
+        </span>
+        <span class="info-value" v-else>-</span>
+      </div>
+      <div class="item-info" v-if="showAll">
+        <span class="info-label">记录人员：</span>
+        <span class="info-value">{{ data.recorderName || '-' }}</span>
+      </div>
+      <div class="retract-btn" @click="divAll()">
+        <span>{{ btnspan }}</span>
+        <image src="https://cdn.cunwuyun.cn/img/down-icon-fff.png"
+               :class="btnspan == '收起' ? 'down-icon icon-active' : 'down-icon'"></image>
+      </div>
+    </div>
+    <div class="page-title">会议内容</div>
+    <div class="info-content mar-b8" v-html="data.meetingDescription"></div>
+    <div class="page-title mar-b8" @click="toSessionUser">参会情况
+      <span class="pad-l7" v-for="(item, index) in titleList" :key="index">
+        <span class="color-999999">{{ item.label }}</span>
+        <span class="color-1365DD">({{ item.value }})</span>
+      </span>
+      <img src="https://cdn.cunwuyun.cn/img/down.svg" class="right-icon">
+    </div>
+    <div class="user-list">
+      <div class="user-item" v-for="(item, index) in data.appThreeMeetingUserList" :key="index"
+           v-if="item.meetingUserRole == 0 || item.meetingUserRole == 3">
+        <div class="user-bg">{{ formatName(item.meetingUserName) }}</div>
+        <div class="user-info">
+          <div class="user-name">{{ item.meetingUserName }}</div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-bottom" v-if="signStatus < 1 || data.isOnline == 1">
+      <div class="btn" @click="signMeeting()" v-if="data.isOnline != 1">签到</div>
+      <div class="btn" @click="isWeiXin" v-if="data.isOnline == 1">进入直播间</div>
+    </div>
+    <div class="mask" v-if="showMask" @click="showMask=false">
+      <img src="https://cdn.cunwuyun.cn/guangdong/h5/mask-text.png" alt="" class="text-img">
+    </div>
+    <img src="https://cdn.cunwuyun.cn/guangdong/h5/vote-img.png" alt="" class="vote-img" v-if="data.isVote == 1" @click="toVote">
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      titleList: [
+        {label: '参与', value: '0'},
+        {label: '已到', value: '0'},
+        {label: '未到', value: '0'},
+        {label: '请假', value: '0'}
+      ],
+      id: '',
+      data: {},
+      btnspan: '展开',
+      showAll: false,
+      partyId: '',
+      signStart: '',
+      signEnd: '',
+      signStatus: '', //0表示显示签到
+      showMask: false,
+      user: {}
+    };
+  },
+  onLoad(options) {
+    if (!uni.getStorageSync("token")) {
+      uni.setStorageSync("token", options.token)
+    }
+    this.$dict.load('postStatus', 'meetingClassification', 'topicClassification').then(() => {
+      this.id = options.id
+      this.signStatus = options.signStatus
+      this.getUserInfo()
+    })
+  },
+  methods: {
+    getUserInfo() {
+      this.$store.commit("getUserInfo")
+      this.$http.post("/app/appparty/chanhudetail").then(res => {
+        if (res?.data) {
+          this.user = res.data
+          this.partyId = this.user.id
+          this.getDetailInfo()
+        }
+      })
+    },
+    isWeiXin() {
+      uni.navigateTo({url: `./ylinkMeetingRoom?meetingNum=${this.data.onlineNum}&pwd=${this.data.onlinePwd}`})
+    },
+    copy() {
+      var token = uni.getStorageSync('token')
+      uni.setClipboardData({data: `https://gdpartyh5.cunwuyun.cn/pages/party/threeSessions/threeSessionsDetail?id=${this.id}&signStatus=${this.signStatus}&token=${token}`});
+    },
+    signMeeting() {
+      this.$http.post(`/app/appthreemeetinguser/signByMeetingIdAndUserIdForWX?meetingId=${this.data.id}&userId=${this.user.id}`, null, {}).then(res => {
+        if (res.code == 0) {
+          this.$toast('签到成功')
+          this.getDetailInfo()
+        }
+      }).catch(err => {
+        uni.showToast({
+          icon: 'none',
+          title: err,
+          duration: 2000
+        });
+      })
+    },
+    toContent() {
+      uni.navigateTo({
+        url: './threeSessionsContent?id=' + this.id
+      })
+    },
+    toSessionUser() {
+      uni.navigateTo({
+        url: './threeSessionsUser?id=' + this.id
+      })
+    },
+    getDetailInfo() {
+      this.$loading()
+      this.$http.post(`/app/appthreemeetinginfo/queryDetailById?id=${this.id}`, null, {}).then(res => {
+        if (res.data) {
+          var data = res.data
+          if (data.startTime && data.meetingBefore) {
+            var dStart = new Date(data.startTime);
+            var timeStart = dStart.getTime();
+            var minStart = (Number(data.meetingBefore)) * 60000
+            var totalStart = timeStart - minStart;
+            this.signStart = this.countTime(totalStart);
+          }
+          if (data.startTime && data.meetingAfter) {
+            var dEnd = new Date(data.startTime);
+            var timeEnd = dEnd.getTime();
+            var minEnd = (Number(data.meetingAfter)) * 60000
+            var totalEnd = timeEnd + minEnd;
+            this.signEnd = this.countTime(totalEnd);
+          }
+          data.meetingClassification = data.meetingClassification.split(',')
+          this.titleList[0].value = data.participantList.length + 1 || '0'
+          if (data.isArriveLIst) {
+            this.titleList[1].value = data.isArriveLIst.length
+          }
+          if (data.isArriveLIst) {
+            this.titleList[2].value = data.notArriveLIst.length
+          }
+          if (data.isArriveLIst) {
+            this.titleList[3].value = data.leaveLIst.length
+          }
+          this.data = data
+
+          // var methodsObj = data.reminderMethod
+          // this.objInit(methodsObj, 'reminderMethod')
+
+          // var meetingClassificationObj = data.meetingClassification
+          // this.objInit(meetingClassificationObj, 'meetingClassification')
+
+          // var topicClassificationObj = data.topicClassification
+          // this.objInit(topicClassificationObj, 'topicClassification')
+
+          this.$hideLoading()
+        }
+      })
+    },
+    objInit(obj, name) {
+      this.data[name] = []
+      for (let i in obj) {
+        if (obj[i] !== '') {
+          this.data[name].push(obj[i])
+        }
+      }
+    },
+    //会议签到时间计算
+    countTime(total) {
+      var now = new Date(total)
+      var y = now.getFullYear();
+      var m = now.getMonth() + 1;
+      m = m < 10 ? ('0' + m) : m;
+      var da = now.getDate();
+      da = da < 10 ? ('0' + da) : da;
+      var h = now.getHours();
+      h = h < 10 ? ('0' + h) : h;
+      var minute = now.getMinutes();
+      minute = minute < 10 ? ('0' + minute) : minute;
+      var seconds = now.getSeconds();
+      seconds = seconds < 10 ? ('0' + seconds) : seconds;
+      var resDate = y + '-' + m + '-' + da + ' ' + h + ':' + minute + ":" + seconds;
+      resDate = resDate.substring(0, 16)
+      return resDate;
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
+    },
+    divAll() {
+      if (this.btnspan == '展开') {
+        this.btnspan = '收起'
+        this.showAll = true
+      } else {
+        this.btnspan = '展开'
+        this.showAll = false
+      }
+    },
+    toVote() {
+      var myVote = ''
+      if (this.data.myVote) {
+        myVote = this.data.myVote
+      }
+      uni.navigateTo({
+        url: `./vote?id=${this.id}`
+      })
+    }
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #F4F6F8;
+
+  .mask {
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, .8);
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+
+    .cancel-img {
+      width: 219px;
+      height: 94px;
+      margin: 580px 0 166px 266px;
+    }
+
+    .text-img {
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 90%;
+    }
+
+    .btn {
+      width: 50%;
+      line-height: 112px;
+      background: #E60012;
+      color: #fff;
+      font-size: 32px;
+      text-align: center;
+      position: absolute;
+      bottom: 0;
+      right: 0;
+    }
+  }
+
+  .right-icon {
+    width: 32px;
+    height: 32px;
+    float: right;
+    vertical-align: middle;
+    transform: rotate(270deg);
+    padding: 0 72px 0 0;
+  }
+
+  .vote-img {
+    width: 140px;
+    height: 140px;
+    position: fixed;
+    bottom: 344px;
+    right: 48px;
+  }
+
+  .sign-end {
+    padding-left: 150 rpx;
+  }
+
+  .btn-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 9;
+    width: 100%;
+    display: flex;
+
+    .btn {
+      flex: 1;
+      line-height: 112px;
+      background: #E60012;
+      color: #fff;
+      font-size: 32px;
+      text-align: center;
+    }
+
+    .sign {
+      background-color: #fff;
+      color: #666;
+    }
+  }
+
+  .detail-info {
+    padding: 16px 0 8px 32px;
+    border-bottom: 2px solid #D8DDE6;
+    background-color: #D40A05;
+    padding-bottom: 80px;
+    position: relative;
+
+    .info-title {
+      line-height: 64px;
+      font-size: 40px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #fff;
+      word-break: break-all;
+      margin-bottom: 16px;
+    }
+
+    .item-info {
+      line-height: 48px;
+      font-size: 30px;
+      margin-bottom: 8px;
+
+      .info-label {
+        display: inline-block;
+        color: #fff;
+        vertical-align: top;
+      }
+
+      .info-value {
+        display: inline-block;
+        width: 550px;
+        word-break: break-all;
+        color: #FFE8E8;
+      }
+
+      .item-status0 {
+        color: #FF9B2B;
+      }
+
+      .item-status1 {
+        color: #2EA222;
+      }
+
+      .item-status2 {
+        color: #343D65;
+      }
+
+      .item-status3 {
+        color: #5A98F2;
+      }
+
+      .item-status4 {
+        color: #f46;
+      }
+
+    }
+
+    .retract-btn {
+      line-height: 80px;
+      text-align: center;
+      font-size: 28px;
+      color: #fff;
+      position: absolute;
+      bottom: 0;
+      width: 690px;
+
+      .down-icon {
+        width: 32px;
+        height: 32px;
+        margin-left: 4px;
+        vertical-align: middle;
+        transition: all .3s ease-in-out;
+      }
+
+      .icon-active {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  .page-title {
+    line-height: 96px;
+    color: #333;
+    font-size: 32px;
+    padding-left: 32px;
+    background-color: #fff;
+
+    span {
+      font-size: 28px;
+    }
+  }
+
+  .info-content {
+    padding: 16px 32px;
+    background-color: #fff;
+    line-height: 48px;
+    color: #333;
+    font-size: 32px;
+    box-sizing: border-box;
+  }
+
+  .user-list {
+    padding-bottom: 140px;
+
+    .user-item {
+      background-color: #fff;
+      height: 112px;
+      padding-top: 16px;
+      box-sizing: border-box;
+
+      .user-bg {
+        display: inline-block;
+        width: 80px;
+        height: 80px;
+        background-color: #4E8EEE;
+        color: #fff;
+        text-align: center;
+        line-height: 80px;
+        margin: 0 16px 0 32px;
+        font-size: 28px;
+        border-radius: 50%;
+        vertical-align: top;
+      }
+
+      .user-info {
+        display: inline-block;
+        width: 622px;
+        height: 96px;
+        border-bottom: 2px solid #D8DDE6;
+        box-sizing: border-box;
+
+        .user-name {
+          line-height: 44px;
+          color: #333;
+          font-size: 32px;
+          margin-top: 16px;
+        }
+      }
+    }
+
+    .user-item:nth-last-of-type(1) {
+      .user-info {
+        border-bottom: 0;
+      }
+    }
+  }
+
+  .mar-b8 {
+    margin-bottom: 16px;
+  }
+
+  .color-1365DD {
+    color: #1365DD;
+  }
+
+  .color-999999 {
+    color: #999999;
+  }
+
+  .pad-l7 {
+    padding-left: 14px;
+  }
+}
+</style>
diff --git a/src/apps/party/AppThreeSessions/threeSessionsUser.vue b/src/apps/party/AppThreeSessions/threeSessionsUser.vue
new file mode 100644
index 00000000..fc2354bf
--- /dev/null
+++ b/src/apps/party/AppThreeSessions/threeSessionsUser.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="page">
+    <div class="tab-list">
+      <div
+        class="tab-item"
+        v-for="(item, index) in tabList"
+        :key="index"
+        :class="tabIndex == index ? 'tab-active' : ''"
+        @click="tabClick(index)"
+      >
+        {{ item.label }}({{ item.value }})
+        <span class="line"></span>
+      </div>
+    </div>
+    <div
+      class="user-list"
+      v-for="(item, index) in list"
+      :key="index"
+      v-if="tabIndex != 0"
+    >
+      <div class="user-item">
+        <div class="user-bg">{{ formatName(item.meetingUserName) }}</div>
+        <div class="user-info">
+          <div class="user-name">{{ item.meetingUserName }}</div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="user-list"
+      v-for="(item, index) in list"
+      :key="index"
+      v-if="tabIndex == 0"
+    >
+      <div
+        class="user-item"
+        v-if="item.meetingUserRole == 0 || item.meetingUserRole == 3"
+      >
+        <div class="user-bg">{{ formatName(item.meetingUserName) }}</div>
+        <div class="user-info">
+          <div class="user-name">{{ item.meetingUserName }}</div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-if="list.length == 0 || list == null" />
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tabList: [
+        { label: "参与", value: "0" },
+        { label: "已到", value: "0" },
+        { label: "未到", value: "0" },
+        { label: "请假", value: "0" },
+      ],
+      tabIndex: 0,
+      id: "",
+      data: {},
+      list: [],
+    };
+  },
+  onLoad(options) {
+    this.id = options.id;
+    this.getDetailInfo();
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index;
+      if (index == 0) {
+        this.list = this.data.appThreeMeetingUserList;
+      }
+      if (index == 1) {
+        this.list = this.data.isArriveLIst;
+      }
+      if (index == 2) {
+        this.list = this.data.notArriveLIst;
+      }
+      if (index == 3) {
+        this.list = this.data.leaveLIst;
+      }
+    },
+    getDetailInfo() {
+      this.$http
+        .post(
+          `/app/appthreemeetinginfo/queryDetailById?id=${this.id}`,
+          null,
+          {}
+        )
+        .then((res) => {
+          if (res.data) {
+            var data = res.data;
+            if (data.appThreeMeetingUserList) {
+              this.tabList[0].value = data.participantList.length + 1;
+            }
+            if (data.isArriveLIst) {
+              this.tabList[1].value = data.isArriveLIst.length;
+            }
+            if (data.isArriveLIst) {
+              this.tabList[2].value = data.notArriveLIst.length;
+            }
+            if (data.isArriveLIst) {
+              this.tabList[3].value = data.leaveLIst.length;
+            }
+            this.data = data;
+            this.list = this.data.appThreeMeetingUserList;
+          }
+        });
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return;
+      }
+      return name.substr(
+        name.length - 2,
+        name.length > 2 ? name.length - 1 : name.length
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+.page {
+  background-color: #f4f6f8;
+  .tab-list {
+    display: flex;
+    background-color: #e60012;
+    line-height: 96rpx;
+    .tab-item {
+      flex: 1;
+      text-align: center;
+      color: #fff;
+      font-size: 28rpx;
+      position: relative;
+    }
+    .tab-active {
+      .line {
+        position: absolute;
+        bottom: 14rpx;
+        left: 50%;
+        margin-left: -20rpx;
+        display: inline-block;
+        width: 40rpx;
+        height: 4rpx;
+        border-radius: 4rpx;
+        background: #fff;
+      }
+    }
+  }
+  .user-list {
+    background-color: #fff;
+    .user-item {
+      height: 112rpx;
+      padding-top: 16rpx;
+      box-sizing: border-box;
+      .user-bg {
+        display: inline-block;
+        width: 80rpx;
+        height: 80rpx;
+        background-color: #4e8eee;
+        color: #fff;
+        text-align: center;
+        line-height: 80rpx;
+        margin: 0 16rpx 0 32rpx;
+        font-size: 28rpx;
+        border-radius: 50%;
+        vertical-align: top;
+      }
+      .user-info {
+        display: inline-block;
+        width: 622rpx;
+        height: 96rpx;
+        border-bottom: 2rpx solid #d8dde6;
+        box-sizing: border-box;
+        .user-name {
+          line-height: 44rpx;
+          color: #333;
+          font-size: 32rpx;
+          margin-top: 16px;
+        }
+      }
+    }
+    .user-item:nth-last-of-type(1) {
+      .user-info {
+        border-bottom: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/AppThreeSessions/vote.vue b/src/apps/party/AppThreeSessions/vote.vue
new file mode 100644
index 00000000..7a25baaa
--- /dev/null
+++ b/src/apps/party/AppThreeSessions/vote.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="page">
+    <img src="https://cdn.cunwuyun.cn/guangdong/h5/bg@2x.png" alt="" class="bg-img">
+    <div class="title">会议投票</div>
+    <div class="content">
+      <img src="https://cdn.cunwuyun.cn/guangdong/h5/dh@2x.png" alt="">
+      <div>投票主题</div>
+      <p v-html="info.voteTopic"></p>
+    </div>
+    <div class="footer">
+      <div class="bg-gray" v-if="info.myVote">已投票</div>
+      <div class="bg-pink" @click="voteSubmit(0)" v-if="!info.myVote">不同意</div>
+      <div class="bg-red" @click="voteSubmit(1)"  v-if="!info.myVote">同意观点</div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+export default {
+  computed: {
+    ...mapState(['user']),
+  },
+  data() {
+    return {
+      id: '',
+      info: {},
+    };
+  },
+  onLoad(options) {
+    this.id = options.id
+    this.getDetailInfo()
+  },
+  methods: {
+    voteSubmit(myVote) {
+      this.$http.post(`/app/appthreemeetinguser/voteMeetting?meetingId=${this.id}&myVote=${myVote}&userId=${this.user.id}`).then((res) => {
+        if(res.code == 0) {
+          this.$toast('投票成功')
+          this.getDetailInfo()
+        }
+      }).catch((err) => {
+        this.$toast(err)
+      })
+    },
+    getDetailInfo() {
+      this.$http.post(`/app/appthreemeetinginfo/queryDetailById?id=${this.id}`, null, {}).then(res => {
+        if (res.data) {
+          this.info = res.data
+        }
+      })
+    },
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  background-color: #F3F6F9;
+  position: relative;
+  width: 100%;
+  overflow-x: hidden;
+  .bg-img{
+    width: 100%;
+    height: 340px;
+  }
+  .title{
+    width: 100%;
+    height: 60px;
+    font-size: 44px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #FFF;
+    line-height: 60px;
+    position: absolute;
+    top: 50px;
+    left: 290px;
+  }
+  .content{
+    position: absolute;
+    top: 210px;
+    left: 20px;
+    width: 710px;
+    background: #FFF;
+    border-radius: 24px;
+    padding: 100px 32px 172px;
+    box-sizing: border-box;
+    img{
+      position: absolute;
+      top: -60px;
+      left: 310px;
+      width: 120px;
+      height: 120px;
+    }
+    div{
+      font-size: 32px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 44px;
+      margin-bottom: 36px;
+    }
+    p{
+      font-size: 28px;
+      color: #333;
+      line-height: 40px;
+    }
+  }
+  .footer{
+    display: flex;
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    div{
+      flex: 1;
+      text-align: center;
+      height: 112px;
+      line-height: 112px;
+    }
+    .bg-gray{
+      font-size: 36px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #999;
+      background: #EAE9E9;
+    }
+    .bg-pink{
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #D73D3D;
+      background: #FFE4DD;
+    }
+    .bg-red{
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #fff;
+      background: #FE5A49;
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/onlineAnswer/onlineAnswer.vue b/src/apps/party/onlineAnswer/onlineAnswer.vue
new file mode 100644
index 00000000..283dc90e
--- /dev/null
+++ b/src/apps/party/onlineAnswer/onlineAnswer.vue
@@ -0,0 +1,430 @@
+<template>
+  <section class="home">
+    <div class="page" v-if="list.length">
+      <img src="../../static/img/answer-bg.png" alt="" class="bg-img">
+      <div class="subject-content" v-if="!showAnwser">
+        <div class="btn" v-if="showTopBtn" @click="confirm()">{{topBtnText}}</div>
+        <div class="bg-fff pad-b48">
+          <div class="title">
+            <div class="left">
+              <span class="tips"></span>{{list[index].type == 1 ? '单选' : '多选'}}题
+            </div>
+            <div class="right">
+              <span class="big-num">{{index+1}}</span>/{{list.length}}
+            </div>
+          </div>
+          <div class="text">{{list[index].title}}</div>
+          <!-- 单选 -->
+          <div v-if="list[index].type == 1">
+            <div class="item" v-for="(item, i) in list[index].items" :key="i" @click="itemClick(i)" :class="{ 'item-click': clickIndex === i, 'item-success': showAnalysis && item.checked == 1, 'item-error': showAnalysis && clickIndex == i && item.checked == 0}">
+              <img src="../../static/img/success-icon.png" alt="" v-if="showAnalysis && item.checked == 1">
+              <img src="../../static/img/error-icon.png" alt="" v-if="showAnalysis && clickIndex == i && item.checked == 0">
+              {{item.sort}} &nbsp;{{item.content}}
+            </div>
+          </div>
+          <!-- 多选 -->
+          <div v-if="list[index].type == 2">
+            <div class="item" v-for="(item, i) in list[index].items" :key="i" @click="itemClick(i)" :class="{ 'item-click': item.isCheked, 'item-success': showAnalysis && item.checked == 1, 'item-error': showAnalysis && item.isCheked && item.checked == 0}">
+              <img src="../../static/img/success-icon.png" alt="" v-if="showAnalysis && item.checked == 1">
+              <img src="../../static/img/error-icon.png" alt="" v-if="showAnalysis && clickIndex == i && item.checked == 0">
+              {{item.sort}} &nbsp;{{item.content}}
+            </div>
+          </div>
+
+          <!-- <div class="item item-click">A.  吴起镇</div>
+          <div class="item item-success"> <img src="../../static/img/success-icon.png" alt="">吴起镇</div>
+          <div class="item item-error"> <img src="../../static/img/error-icon.png" alt="">吴起镇</div>
+          <div class="item">A.  吴起镇</div> -->
+        </div>
+        <div class="bg-fff mar-t32" v-if="showAnalysis">
+          <div class="title">
+            <div class="left">
+              <span class="tips"></span>答案解析
+            </div>
+          </div>
+          <div class="success-title">正确答案：{{list[index].answer}}</div>
+          <div class="success-text"><u-parse :html="list[index].analysis"></u-parse></div>
+
+        </div>
+      </div>
+      <div class="subject-content" v-else>
+        <div class="bg-fff pad-b48">
+          <img src="../../static/img/answer-head.png" alt="" class="head-img">
+          <div class="head-content">
+            <p>本次答对题目数</p>
+            <div>{{resultInfo.right}}</div>
+          </div>
+          <div class="info-content">
+            <span class="info-item">正确率:  {{resultInfo.rate}}</span>
+            <span class="info-item">用时:  {{useTime}}</span>
+            <span class="info-item mar-b132">错题数:  {{resultInfo.wrong}}</span>
+          </div>
+          <span class="big-btn mar-r22" @click="back">返回</span>
+          <span class="big-btn bg-red" @click="again">再来一组</span>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-if="list.length == 0" />
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      showAnwser: false,
+      index: 0,
+      clickIndex: '',
+      list: [],
+      showTopBtn: false,
+      topBtnText: '',
+      showAnalysis: false,
+      createdTime: '',
+      endTime: '',
+      useTime: '',
+      resultInfo: {}
+    };
+  },
+  onLoad(options) {
+    this.createdTime = Date.parse(new Date())
+    this.getList()
+  },
+  methods: {
+    itemClick(i) {
+      if (this.showAnalysis) return
+
+      if(this.list[this.index].type == 1) { //单选
+        this.clickIndex = i
+        this.showTopBtn = true
+      }
+      if(this.list[this.index].type == 2) { //多选
+        this.showTopBtn = false
+        this.list[this.index].items[i].isCheked = !this.list[this.index].items[i].isCheked
+        this.list[this.index].items.map((item) => {
+          if(item.isCheked) {
+            this.showTopBtn = true
+          }
+        })
+
+      }
+      this.topBtnText = '确定'
+    },
+    confirm() {
+      if(this.list[this.index].type == 1) { //单选
+        this.list[this.index].result = this.list[this.index].items[this.clickIndex].sort
+      }
+      if(this.list[this.index].type == 2) { //多选
+        var resultList = []
+        this.list[this.index].items.map((item) => {
+          if(item.isCheked) {
+            resultList.push(item.sort)
+          }
+        })
+        this.list[this.index].result = resultList.join(',')
+      }
+
+      console.log(this.list)
+
+
+      if(this.topBtnText == '下一题') { //next
+        if(this.index < this.list.length - 1) {
+          this.index ++
+          this.init()
+        }else { //答完了
+          this.showTopBtn = false
+          this.endTime = Date.parse(new Date());var timestamp = Date.parse(new Date());
+          this.useTime = this.intervalTime(this.endTime - this.createdTime)
+          this.getResult()
+        }
+      }
+      if(this.topBtnText == '确定') { //确定选项
+        this.showAnalysis = true
+        this.topBtnText = '下一题'
+      }
+    },
+    getResult() {
+      this.$http.post(`/app/apppartyquestion/checkAnswer`, this.list).then((res) => {
+        if (res.code == 0) {
+          this.resultInfo = res.data
+          this.showAnwser = true
+        }
+      });
+    },
+    getList() {
+      this.$http.post(`/app/apppartyquestion/getQuestions`).then((res) => {
+        if (res.code == 0) {
+          res.data.map((item) => {
+            item.answerList = []
+            item.items.map((i) => {
+              if(i.checked == 1) {
+                item.answerList.push(i.sort)
+              }
+            })
+            item.answer = item.answerList.join(',')
+
+            if(item.type == 2) { //多选
+              item.isCheck = false
+            }
+          })
+          this.list = res.data
+        }
+      });
+    },
+    intervalTime(time) {
+      var date3 =  time
+      var days = Math.floor(date3 / (24 * 3600 * 1000));
+      var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
+      var hours = Math.floor(leave1 / (3600 * 1000));
+      hours = hours < 10 ? '0'+hours : hours
+      var leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
+      var minutes = Math.floor(leave2 / (60 * 1000));
+      minutes = minutes < 10 ? '0'+minutes : minutes
+      var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
+      var seconds = Math.round(leave3 / 1000);
+      seconds = seconds < 10 ? '0'+seconds : seconds
+      return   hours + ":" + minutes + ":" + seconds
+    },
+    back() {
+      uni.navigateBack({delta: 1})
+    },
+    again() {
+      this.init()
+      this.index = 0
+      this.list = []
+      this.getList()
+      this.createdTime = Date.parse(new Date())
+    },
+    init() {
+      this.showAnwser = false
+      this.clickIndex = ''
+      this.showTopBtn = false
+      this.topBtnText = ''
+      this.showAnalysis = false
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+
+.page {
+  width: 100%;
+  height: 100%;
+  background-color: #F6F6F6;
+  .bg-img{
+    width: 100%;
+    height: 800px;
+  }
+  .subject-content{
+    width: 100%;
+    border-radius: 4px;
+    padding: 24px 36px 48px 36px;
+    box-sizing: border-box;
+    position: absolute;
+    top: 124px;
+    z-index: 9;
+    .btn{
+      padding: 0 30px;
+      height: 64px;
+      line-height: 64px;
+      text-align: center;
+      background: #D03A28;
+      border-radius: 4px;
+      font-size: 28px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #FFF;
+      position: absolute;
+      top: -100px;
+      right: 36px;
+      z-index: 99;
+    }
+    .pad-top{
+      padding-top: 100px;
+    }
+    .pad-b48{
+      padding-bottom: 48px;
+    }
+    .mar-t32{
+      margin-top: 32px;
+    }
+    .bg-fff{
+      width: 100%;
+      background-color: #fff;
+      border-radius: 4px;
+      box-shadow: 0px 6px 8px 4px rgba(218, 227, 234, 0.42);
+      position: relative;
+      .title{
+        width: 100%;
+        height: 100px;
+        border-bottom: 1px solid #F2F3F5;
+        padding: 24px 30px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        .left{
+          font-size: 36px;
+          font-family: PingFang-SC-Heavy, PingFang-SC;
+          font-weight: 800;
+          color: #333;
+          line-height: 50px;
+          .tips{
+            display: inline-block;
+            width: 8px;
+            height: 36px;
+            background: #E02617;
+            margin-right: 16px;
+          }
+        }
+        .right{
+          font-size: 34px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #999;
+          line-height: 48px;
+          .big-num{
+            font-size: 72px;
+            font-family: PingFang-SC-Heavy, PingFang-SC;
+            font-weight: 800;
+            color: #333;
+          }
+        }
+      }
+      .text{
+        padding: 48px 40px;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        word-break: break-all;
+      }
+      .item{
+        width: 612px;
+        background: #FAFBFC;
+        border-radius: 12px;
+        border: 1px solid #F2F3F5;
+        margin-bottom: 28px;
+        margin-left: 32px;
+        padding: 26px 48px;
+        box-sizing: border-box;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #687178;
+        line-height: 44px;
+        img{
+          width: 36px;
+          height: 36px;
+          vertical-align: middle;
+          margin-right: 14px;
+        }
+      }
+      .item-click{
+        background: #F5F5F2;
+        border: 1px solid #AD9B8D;
+        color: #B7A38E;
+      }
+      .item-success{
+        background: #E9FAF0;
+        border: 1px solid #E9FAF0;
+        color: #40BF6F;
+      }
+      .item-error{
+        background: #FDEBEB;
+        border: 1px solid #FDEBEB;
+        color: #D03A28;
+      }
+      .success-title{
+        padding: 32px 0 0 40px;
+        font-size: 32px;
+        font-family: PingFang-SC-Heavy, PingFang-SC;
+        font-weight: 800;
+        color: #333;
+        line-height: 44px;
+      }
+      .success-text{
+        padding: 32px 40px 56px;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        word-break: break-all;
+      }
+      .head-img{
+        width: 100%;
+        height: 260px;
+      }
+      .head-content{
+        position: absolute;
+        width: 100%;
+        height: 260px;
+        top: 0;
+        left: 0;
+        padding: 56px 0 0 72px;
+        box-sizing: border-box;
+        p{
+          font-size: 38px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #FBE5E6;
+          line-height: 52px;
+        }
+        div{
+          font-size: 100px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #FBE5E6;
+          line-height: 140px;
+        }
+      }
+      .info-content{
+        padding: 88px 32px 40px;
+        .info-item{
+          display: inline-block;
+          width: 300px;
+          font-size: 34px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #666;
+          line-height: 48px;
+          margin-bottom: 42px;
+        }
+        .mar-b132{
+          margin-bottom: 132px;
+        }
+      }
+      .big-btn{
+        display: inline-block;
+        width: 296px;
+        height: 88px;
+        line-height: 88px;
+        text-align: center;
+        border-radius: 4px;
+        border: 1px solid #E4E5E7;
+        font-size: 34px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #666;
+      }
+      .bg-red{
+        border: 0;
+        background: #D03A28;
+        color: #fff;
+      }
+      .mar-r22{
+        margin: 0 22px 0 32px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistory/commentList.vue b/src/apps/party/partyHistory/commentList.vue
new file mode 100644
index 00000000..883d8f81
--- /dev/null
+++ b/src/apps/party/partyHistory/commentList.vue
@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <scroll-view
+      scroll-y
+      class="commentList"
+      @scrolltolower="page.current++, getComments()"
+    >
+      <div class="comments-list" v-if="commentList.length">
+        <div
+          class="comments-item flex-row"
+          v-for="(item, i) in commentList"
+          :key="i"
+        >
+          <div class="user-avatar">
+            <image v-if="item.avatar" :src="item.avatar"></image>
+            <image v-else src="https://cdn.cunwuyun.cn/img/personal.png"></image>
+          </div>
+          <div class="content flex-column">
+            <div class="flex-row" style="justify-content: space-between">
+              <text>{{ item.createUser }}</text>
+              <text class="commentTime">{{ item.commentTime }}</text>
+            </div>
+            <div>{{ item.content }}</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-else />
+      <view class="tips" v-if="commentList.length"> 已加载全部评论</view>
+    </scroll-view>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "commentList",
+  props: {
+    detail: Object,
+  },
+  data() {
+    return {
+      commentList: [],
+      page: {
+        current: 1,
+        size: 10000,
+      },
+    };
+  },
+  methods: {
+    getComments() {
+      this.$http.post(`/app/apppartyhistorycomment/list?partyHistoryId=${this.detail.id}&size=10000`).then((res) => {
+        if (res && res.data) {
+          this.commentList = res.data.records;
+          this.$emit("comments", res.data.total);
+        }
+      });
+    },
+  },
+  mounted() {
+    this.$nextTick(() => this.getComments());
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.commentList {
+  width: 100%;
+  margin-bottom: 135px;
+  overflow-y: auto;
+
+  .comments-list {
+    width: 100%;
+    overflow-y: auto;
+    box-sizing: border-box;
+
+    .user-avatar {
+      display: inline-block;
+      width: 80rpx;
+      margin: 46rpx 20rpx 0 0;
+      image {
+        width: 80rpx;
+        height: 80rpx;
+        border-radius: 50%;
+      }
+      .user-bg {
+        display: inline-block;
+        width: 80rpx;
+        height: 80rpx;
+        border-radius: 50%;
+        line-height: 80rpx;
+        text-align: center;
+        background-color: #26f;
+        color: #fff;
+        font-size: 28rpx;
+      }
+    }
+
+    .comments-item {
+      border-bottom: 1px solid #f7f7f7;
+      padding: 0 32px;
+      color: #333;
+      font-size: 28px;
+      background-color: #fff;
+
+      & + .comments-item {
+        border-top: 4px solid #eee;
+      }
+
+      .content {
+        display: inline-block;
+        width: calc(100% - 120rpx);
+        background-color: #fff;
+        padding: 46px 0 32px 0;
+        box-sizing: border-box;
+
+        .name {
+          margin-bottom: 10px;
+        }
+      }
+
+      .commentTime {
+        color: #999;
+        font-size: 24px;
+      }
+    }
+  }
+
+  .tips {
+    line-height: 90px;
+    width: 100%;
+    color: #999;
+    font-size: 24px;
+    text-align: center;
+    background-color: #f3f6f9;
+  }
+
+  .no-comment-list {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 30px;
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistory/detail.vue b/src/apps/party/partyHistory/detail.vue
new file mode 100644
index 00000000..d51dc8f7
--- /dev/null
+++ b/src/apps/party/partyHistory/detail.vue
@@ -0,0 +1,278 @@
+<template>
+  <div class="page">
+    <div>
+      <div v-if="!showCommentList" class="detail">
+        <!-- 文章标题 -->
+        <div class="created-unit">
+          <div class="artical-title break-word">{{ affairs.title }}</div>
+          <div class="artical-unit">
+            <span> 发布党组织 ：{{ affairs.organizationName || "-" }}</span>
+          </div>
+          <div class="artical-unit">
+            <text>发布时间：{{ affairs.createDate }}</text>
+            <text />
+          </div>
+        </div>
+        <!-- 文章内容 -->
+        <div class="artical-content break-word">
+          <u-parse :html="affairs.content" class="content" v-if="affairs.content"></u-parse>
+        </div>
+        <!-- 语音播报-->
+        <AiTransSpeech :src="affairs.speech" v-if="affairs.speech"/>
+      </div>
+      <commentList v-else :detail="affairs"></commentList>
+      <AiComment
+        :comment-count="commentCount"
+        @submitComment="submitComment"
+        @showCommentList="showCommentList = true"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import commentList from './commentList'
+export default {
+  name: "policyDetail",
+  components: {commentList},
+  computed: {
+    ...mapState(["user"]),
+  },
+  data() {
+    return {
+      affairs: {},
+      showCommentList: false,
+      commentCount: 0,
+    };
+  },
+  onLoad(options) {
+    this.$dict.load("policyPromotionType");
+    this.id = options.id;
+    this.getPartyAffairsDetail(this.id);
+    this.getCount();
+  },
+  methods: {
+    getCount() {
+      this.$http.post(`/app/apppartyhistorycomment/list?partyHistoryId=${this.id}`).then((res) => {
+        if (res && res.data) {
+          this.commentCount = res.data.total;
+        }
+      });
+    },
+    getPartyAffairsDetail(id) {
+      this.$http.post(`/app/apppartyhistory/queryDetailByIdWeChat?id=${id}`).then((res) => {
+          if (res && res.data) {
+            res.data.createDate = res.data.createDate.substring(0, 10);
+            const regex = new RegExp("<img", "gi");
+            res.data.content = res.data.content
+              .replace(
+                regex,
+                `<img style="max-width:100%!important;" calss="img"`
+              )
+              .replace(/<p([\s\w"=\/\.:;]+)((?:(class="[^"]+")))/gi, "<p")
+              .replace(/<p>/gi, '<p class="p_class">')
+              .replace(/style=""/g, 'style="max-width:100%!important;"');
+            res.data.content = res.data.content.replace(
+              /<img[^>]*>/gi,
+              function (match, capture) {
+                return match.replace(
+                  /style\s*?=\s*?([‘"])[\s\S]*?\1/gi,
+                  'style="max-width:100%;"'
+                ); // 替换style
+              }
+            );
+
+            if (res.data.files && res.data.files.length) {
+              res.data.files.map(item => {
+                var size = item.size / 1024;
+                item.fileSize = size.toFixed(0);
+                return item
+              })
+            }
+
+            this.affairs = { ...res.data };
+          }
+        });
+    },
+    back() {
+      if (getCurrentPages().length === 1) {
+        uni.switchTab({
+          url: "/pages/home/home",
+        });
+        return false;
+      }
+      this.showCommentList
+        ? (this.showCommentList = false)
+        : uni.navigateBack();
+    },
+    submitComment(content) {
+      this.$http
+        .post("/app/apppartyhistorycomment/addOrUpdate", {
+          partyHistoryId: this.affairs.id,
+          content: content,
+          name: this.user.nickName,
+          avatar: this.user.avatarUrl,
+          organizationId: this.affairs.organizationId
+        })
+        .then((res) => {
+          if (res && res.code == 0) {
+            uni.showToast({ icon: "success", title: "评论成功" });
+            this.showCommentList = true
+            this.getCount()
+          } else {
+            uni.showToast({ icon: "none", title: res.msg });
+          }
+        })
+        .catch((err) => {
+          uni.showToast({ icon: "none", title: err });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  .navHeadBar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #135ab8;
+    color: #fff;
+    font-size: 13px;
+    height: 40px;
+  }
+
+  .detail {
+    width: 100%;
+    overflow-y: auto;
+
+    .created-unit {
+      width: 100%;
+      padding: 32px;
+      box-sizing: border-box;
+      background-color: #D40A05;
+      color: #fff;
+
+      .artical-title {
+        font-size: 40px;
+      }
+
+      .artical-unit {
+        font-size: 28px;
+        margin-top: 16px;
+        opacity: 0.8;
+      }
+    }
+
+    .artical-content {
+      color: #666666;
+      font-size: 32px;
+      padding: 32px 32px 128px 32px;
+      box-sizing: border-box;
+      background-color: #fff;
+
+      .p_class {
+        margin-top: 40px;
+        font-size: 32px;
+        color: #333;
+        text-indent: 0;
+        width: 100%;
+      }
+
+      .img {
+        width: 100% !important;
+      }
+    }
+
+    .attachment {
+      width: 100%;
+      padding: 32px 32px 96px 32px;
+      box-sizing: border-box;
+      background-color: #ffffff;
+      margin-top: 16px;
+
+      .attachment-title {
+        font-size: 32px;
+        color: #333333;
+        font-weight: 500;
+
+        image {
+          width: 48px;
+          height: 48px;
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+}
+
+.p_class {
+  margin-top: 40px;
+  font-size: 32px;
+  color: #333;
+  text-indent: 0;
+  width: 100%;
+}
+
+.img {
+  max-width: 100% !important;
+}
+  .attachment {
+    width: 100%;
+    padding: 32px;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    margin-top: 16px;
+
+    .attachment-title {
+      font-size: 32px;
+      color: #333333;
+      font-weight: 500;
+
+      image {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+      }
+    }
+
+    .attachment-item {
+      border: 1px solid rgba(204, 204, 204, 1);
+      padding: 16px;
+      box-sizing: border-box;
+      margin-top: 34px;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      border-radius: 8px;
+
+      .file-name {
+        justify-content: flex-start;
+        align-items: center;
+
+        image {
+          width: 96px;
+          height: 96px;
+          vertical-align: middle;
+        }
+
+        .title {
+          color: #333333;
+          font-size: 32px;
+          word-break: break-all;
+          flex: 1;
+        }
+      }
+
+      .size {
+        color: #999;
+        font-size: 28px;
+        display: flex;
+        justify-content: cemter;
+        align-items: center;
+      }
+    }
+  }
+</style>
diff --git a/src/apps/party/partyHistory/list.vue b/src/apps/party/partyHistory/list.vue
new file mode 100644
index 00000000..8b7f1264
--- /dev/null
+++ b/src/apps/party/partyHistory/list.vue
@@ -0,0 +1,387 @@
+<template>
+  <div class="page">
+    <div v-if="isShow" style="height: 100%">
+      <!-- 头部搜索样式 -->
+      <div class="fixed-top" style="width:100%;">
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <img src="https://cdn.cunwuyun.cn/img/search-red.svg" />
+            <span class="color-fff">请输入文章标题</span>
+          </div>
+        </div>
+        <!-- 选择时间和类型 -->
+        <div class="slect flex-row">
+          <!-- 类型选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker @change="bindPickerChange" :value="index" :range="array" range-key="dictName">
+                  <div class="uni-input">{{ partyType }}</div>
+                  <img src="https://cdn.cunwuyun.cn/img/down.svg" />
+                </picker>
+              </div>
+            </div>
+          </div>
+          <!-- 时间选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                  mode="date"
+                  :value="date"
+                  :start="startDate"
+                  :end="endDate"
+                  @change="bindDateChange"
+                  fields="month"
+                >
+                  <div class="uni-input">{{ day }}</div>
+                  <img src="https://cdn.cunwuyun.cn/img/down.svg" />
+                </picker>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 党务公开列表 -->
+      <div class="affairs-list">
+        <div class="affairs" v-if="affairsList.length > 0">
+          <!-- 循环 v-for -->
+          <div v-for="(item, index) in affairsList" :key="index">
+            <div class="affairs-item" @click="getDetail(item.id)">
+              <div class="break-word">
+                <span class="type">{{ $dict.getLabel(`partyHistoryType${style}`, item.type) }}</span>
+                <span class="affirs-title">{{ item.title }}</span>
+              </div>
+              <div class="created-unit flex-row">
+                <span>{{ item.organizationName || "" }}</span>
+                <span>{{ item.createDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="affairsList.length == 0" />
+    </div>
+    <div v-if="!isShow" class="search-input">
+      <div class="input-box flex-row">
+        <input
+          type="text"
+          class="input"
+          placeholder="请输入文章标题"
+          focus="false"
+          v-model="searchValue"
+          @blur="onBlur"
+        />
+        <img
+          class="sousuo"
+          src="https://cdn.cunwuyun.cn/img/search-active.svg"
+        />
+        <img
+          v-if="searchValue"
+          @tap="clearInput"
+          class="clear"
+          src="https://cdn.cunwuyun.cn/img/empty-Input.svg"
+        />
+        <div class="search-word" @click="search">搜索</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  data() {
+    const currentDate = this.getDate({
+      format: true,
+    });
+    return {
+      inputValue: "请输入文章标题",
+      isShow: true,
+      array: [],
+      index: 0,
+      partyType: "类型",
+      partyTypeIndex: "", //类型index 0:党务公开,1:三会一课
+      date: currentDate,
+      day: "时间",
+      createData: "", //创建时间
+      affairsList: [],
+      searchValue: "", //搜索框输入值
+      pageNum: 1,
+      pageSize: 10,
+      pages: 2,
+      style: '',
+    };
+  },
+  computed: {
+    startDate() {
+      return this.getDate("start");
+    },
+    endDate() {
+      return this.getDate("end");
+    },
+    ...mapState(["user"]),
+  },
+  onLoad(option) {
+    this.style = option.style
+    console.log(this.style)
+    this.$dict.load("partyHistoryType0", "partyHistoryType1", "partyHistoryType2").then(() => {
+      this.array = this.$dict.getDict(`partyHistoryType${this.style}`)
+      this.array.unshift({dictName: "全部类型", dictValue: ""})
+      this.getPartyList()
+    })
+  },
+  methods: {
+    bindPickerChange(e) {
+      console.log(e)
+      this.partyType = this.array[e.detail.value].dictName;
+      this.partyTypeIndex = this.array[e.detail.value].dictValue;
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getPartyList();
+    },
+    bindDateChange: function (e) {
+      this.day = e.target.value;
+      this.createData =
+        e.target.value + "-" + "08" + " " + "00" + ":" + "00" + ":" + "00";
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getPartyList();
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+
+      if (type === "start") {
+        year = year - 60;
+      } else if (type === "end") {
+        year = year + 2;
+      }
+      month = month > 9 ? month : "0" + month;
+      day = day > 9 ? day : "0" + day;
+
+      return `${year}-${month}-08 00:00:00  `;
+    },
+    changeSearchBox() {
+      this.isShow = false;
+    },
+    onBlur(e) {
+      this.searchValue = e.target.value;
+
+      if (this.searchValue) {
+        this.inputValue = this.searchValue;
+      } else {
+        this.inputValue = "请输入文章标题";
+      }
+    },
+    search() {
+      this.isShow = true;
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.pages = 2;
+      this.getPartyList();
+    },
+    clearInput() {
+      this.searchValue = "";
+      this.inputValue = "请输入文章标题";
+    },
+    getDetail(id) {
+      uni.navigateTo({
+        url: `./detail?id=${id}`,
+      });
+    },
+    getPartyList() {
+      if (this.pageNum > this.pages) return;
+      this.$http.post(`/app/apppartyhistory/listWechat`, {
+        condition: this.searchValue,
+        style: this.style,
+        type: this.partyTypeIndex,
+        createDate: this.createData,
+        current: this.pageNum,
+        size: this.pageSize,
+        // organizationId: this.user.partyOrgId
+      }).then((res) => {
+        if (res.code == 0) {
+          const affairsList = this.pageNum > 1 ? [...this.affairsList, ...res.data.records] : res.data.records;
+          this.pages = Math.ceil(res.data.total / 10);
+          this.affairsList = affairsList;
+        }
+      });
+    },
+  },
+  onReachBottom() {
+    console.log(123)
+    this.pageNum = this.pageNum + 1;
+    this.getPartyList();
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  .search-box {
+    width: 100%;
+    height: 112px;
+    background-color: #e60012;
+    padding: 24px 32px;
+    box-sizing: border-box;
+
+    .search-input {
+      line-height: 64px;
+      width: 100%;
+      height: 100%;
+      background: #ce0010;
+      //   background:rgba(0,0,0,1);
+      border-radius: 32px;
+      //   opacity: 0.1;
+      color: #f0cbcd;
+      font-size: 26px;
+
+      img {
+        width: 40px;
+        height: 40px;
+        margin: 8px 8px 8px 24px;
+        position: relative;
+        top: 6px;
+      }
+      .color-fff{
+        color: #fff;
+      }
+    }
+  }
+
+  .slect {
+    width: 100%;
+    height: 96px;
+    background-color: #fff;
+    color: #666;
+
+    .type-slect {
+      width: 50%;
+      border-right: 1px solid #f7f7f7;
+      margin: 30px 0;
+      box-sizing: border-box;
+      text-align: center;
+      font-size: 26px;
+
+      .uni-input {
+        display: inline-block;
+      }
+
+      img {
+        width: 32px;
+        height: 32px;
+        display: inline-block;
+        position: relative;
+        top: 6px;
+        margin-left: 8 srpx;
+      }
+    }
+
+    .type-slect:nth-child(2) {
+      border: none;
+    }
+  }
+
+  .affairs-list {
+    width: 100%;
+    //   height:calc(100% - 210rpx);
+    //   overflow-y: auto;
+    padding-top: 200px;
+    .affairs {
+      background-color: #fff;
+      margin: 32px;
+
+      .affairs-item {
+        padding: 32px;
+        box-sizing: border-box;
+
+        .type {
+          padding: 8px;
+          box-sizing: border-box;
+          background-color: #e6edf7;
+          color: #135ab8;
+          font-size: 26px;
+          margin-right: 16px;
+          border-radius: 8px;
+        }
+
+        .affirs-title {
+          color: #333333;
+          font-size: 32px;
+        }
+
+        .created-unit {
+          font-size: 28px;
+          color: #999;
+          justify-content: space-between;
+          margin-top: 16px;
+        }
+      }
+    }
+  }
+
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .search-input {
+    //   width:100%;
+    //   height:112rpx;
+    .input-box {
+      width: 100%;
+      height: 112px;
+      background-color: #fff;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      position: relative;
+
+      .sousuo {
+        position: absolute;
+        top: 35px;
+        left: 60px;
+        width: 40px;
+        height: 40px;
+      }
+
+      .input {
+        background-color: #f3f3f3;
+        width: 598px;
+        height: 64px;
+        color: #999999;
+        font-size: 26px;
+        margin-left: 8px;
+        border-radius: 32px;
+        padding-left: 70px;
+        padding-right: 60px;
+        box-sizing: border-box;
+      }
+
+      .clear {
+        width: 32px;
+        height: 32px;
+        position: absolute;
+        top: 40px;
+        right: 130px;
+        z-index: 10;
+      }
+
+      .search-word {
+        font-size: 28px;
+        color: #135ab8;
+        line-height: 60px;
+        margin-left: 20px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/classroomList.vue b/src/apps/party/partyHistoryEducation/classroomList.vue
new file mode 100644
index 00000000..f7ee97df
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/classroomList.vue
@@ -0,0 +1,105 @@
+<template>
+  <section class="home">
+    <div class="page">
+      <div class="item" v-for="(item, index) in classList" :key="index" @click.stop="toDetail(item.id)">
+        <img :src="item.thumbUrl[0].url" alt="" class="banner-img">
+        <img src="https://cdn.cunwuyun.cn/dvcp/pay-btn.png" alt="" class="play-img">
+        <p>{{item.title}}</p>
+        <div>{{item.organizationName}}  {{item.createDate}}</div>
+      </div>
+      <AiEmpty v-if="classList.length == 0" />
+    </div>
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      current: 1,
+      pages: 2,
+      classList: []
+    };
+  },
+  onLoad(options) {
+    this.getClassList()
+  },
+  methods: {
+    getClassList() {
+      if (this.current > this.pages) return;
+      this.$http.post(`/app/apppartyclassroom/list?size=10&status=1&current=${this.current}`).then((res) => {
+        if (res.code == 0) {
+          if (res.data && res.data.records) {
+            res.data.records.map((item) => {
+              item.thumbUrl = JSON.parse(item.thumbUrl)
+              item.createDate = item.createDate.substring(0, 10)
+            })
+            const classList = this.current > 1 ? [...this.classList, ...res.data.records]: res.data.records
+            this.pages = Math.ceil(res.data.total / 10)
+            this.classList = classList
+            this.classList = res.data.records
+          }
+        }
+      });
+    },
+    toDetail(id) {
+      uni.navigateTo({url: `./videoDetail?id=${id}`})
+    }
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getClassList()
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  .item{
+    position: relative;
+    video{
+      width: 100%;
+      height: 416px;
+      // background: rgba(0, 0, 0, 0.3);
+    }
+    .banner-img{
+      width: 100%;
+      height: 416px;
+    }
+    .play-img{
+      width: 80px;
+      height: 80px;
+      position: absolute;
+      top: 148px;
+      left: 334px;
+    }
+    p{
+      padding: 20px 32px;
+      width: 686px;
+      font-size: 34px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 48px;
+    }
+    div{
+      padding: 0 0 34px 32px;
+      font-size: 22px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 22px;
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/detail.vue b/src/apps/party/partyHistoryEducation/detail.vue
new file mode 100644
index 00000000..ffb141a4
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/detail.vue
@@ -0,0 +1,100 @@
+<template>
+  <section class="home">
+    <div class="page">
+      <div class="header">
+        <p class="title">{{info.title}}</p>
+        <div class="info mar-b16"><span class="label">发布单位：</span><span class="value">{{info.organizationName}}</span></div>
+        <div class="info">发布时间：{{info.publishDate || info.createDate}}</div>
+
+      </div>
+      <div class="content">
+        <u-parse :html="info.content"></u-parse>
+      </div>
+      <AiTransSpeech :src="info.speech" v-if="info.speech"/>
+    </div>
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      id: '',
+      info: {},
+      content: ''
+    };
+  },
+  onLoad(options) {
+    this.id = options.id
+    this.getDetail()
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/apppartyhistory/queryDetailByIdWeChat?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data.publishDate) {
+            res.data.publishDate = res.data.publishDate.substring(0, 10)
+          }
+          if(res.data.createDate) {
+            res.data.createDate = res.data.createDate.substring(0, 10)
+          }
+          this.info = res.data
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  .header{
+    width: 100%;
+    padding: 24px 32px 32px;
+    box-sizing: border-box;
+    background: #D03A28;
+    .title{
+      width: 100%;
+      font-size: 40px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #FFF;
+      line-height: 64px;
+      letter-spacing: 1px;
+      word-break: break-all;
+      margin-bottom: 16px;
+    }
+    .info{
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #FFF;
+      line-height: 40px;
+      .label{
+        width: 140px;
+      }
+      .value{
+        width: calc(100% - 140px);
+        word-break: break-all;
+      }
+    }
+    .mar-b16{
+      margin-bottom: 16px;
+    }
+  }
+  .content{
+    padding: 32px;
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/home.vue b/src/apps/party/partyHistoryEducation/home.vue
new file mode 100644
index 00000000..ce4ac6ab
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/home.vue
@@ -0,0 +1,308 @@
+<template>
+  <section class="home">
+    <div class="page">
+      <div class="title">
+        <div class="left">
+          <span class="tips"></span>党史上的今天
+        </div>
+        <div class="right" @click="handleGoto('./todayList')">
+          查看全部
+          <img src="https://cdn.cunwuyun.cn/img/down.svg" class="right-icon">
+        </div>
+      </div>
+      <div class="header" v-for="(item, index) in todayList" :key="index" @click="handleGoto(`./todayDetail?id=${item.id}`)">
+        <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length">
+        <p class="text">{{item.title}}</p>
+        <p class="time">{{item.organizationName}}  {{item.publishDate || ''}}</p>
+      </div>
+      <AiEmpty v-if="todayList.length == 0" />
+      <div class="line-bg"></div>
+      <div class="title">
+        <div class="left">
+          <span class="tips"></span>党史课堂
+        </div>
+        <div class="right" @click="handleGoto('./classroomList')">
+          查看全部
+          <img src="https://cdn.cunwuyun.cn/img/down.svg" class="right-icon">
+        </div>
+      </div>
+      <div class="tab-content">
+        <div class="tab-item" v-for="(item, index) in classList" :key="index" @click="handleGoto(`./videoDetail?id=${item.id}`)">
+          <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length">
+          <p>{{item.title}}</p>
+        </div>
+      </div>
+      <AiEmpty v-if="classList.length == 0" />
+      <div class="line-bg"></div>
+      <div class="title">
+        <div class="left">
+          <span class="tips"></span>党史知识
+        </div>
+        <div class="right" @click="handleGoto('./knowledgeList?type=knowledge')">
+          查看全部
+          <img src="https://cdn.cunwuyun.cn/img/down.svg" class="right-icon">
+        </div>
+      </div>
+      <div class="new-list">
+        <div class="list-content">
+          <div class="bg-fff" v-for="(item, index) in knowledgeList" :key="index" @click="handleGoto(`./todayDetail?type=know&id=${item.id}`)">
+            <div class="item">
+              <div class="info">
+                <p>{{ item.title }}</p>
+                <span>{{ item.organizationName }} {{ item.createDate }}</span>
+              </div>
+              <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length" />
+            </div>
+          </div>
+          <AiEmpty v-if="knowledgeList.length == 0" />
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      todayList: [],
+      classList: [],
+      knowledgeList: []
+    };
+  },
+  onLoad(options) {
+    this.getTodayList()
+    this.getClassList()
+    this.getKnowledgeList()
+  },
+  methods: {
+    getTodayList() {
+      this.$http.post(`/app/apppartyeducation/list?style=2&size=1&status=1`).then((res) => {
+        if (res.code == 0) {
+          if (res.data && res.data.records) {
+            res.data.records.map((item) => {
+              if(item.thumbUrl) {
+                item.thumbUrl = JSON.parse(item.thumbUrl)
+              }
+              if(item.publishDate) {
+                item.publishDate = item.publishDate.substring(0, 10)
+              }
+            })
+            this.todayList = res.data.records
+          }
+        }
+      });
+    },
+    getClassList() {
+      this.$http.post(`/app/apppartyclassroom/list?size=3&status=1`).then((res) => {
+        if (res.code == 0) {
+          if (res.data && res.data.records) {
+            res.data.records.map((item) => {
+              item.thumbUrl = JSON.parse(item.thumbUrl)
+            })
+            this.classList = res.data.records
+          }
+        }
+      });
+    },
+    getKnowledgeList() {
+      this.$http.post(`/app/apppartyeducation/list?style=0&size=4&status=1`).then((res) => {
+        if (res.code == 0) {
+          if (res.data && res.data.records) {
+            res.data.records.map((item) => {
+              if(item.thumbUrl) {
+                item.thumbUrl = JSON.parse(item.thumbUrl)
+              }
+              if(item.createDate) {
+                item.createDate = item.createDate.substring(0, 10)
+              }
+            })
+            this.knowledgeList = res.data.records
+          }
+        }
+      });
+    },
+    handleGoto(url) {
+      uni.navigateTo({ url });
+    },
+    toNewDetail(id) {
+      this.handleGoto(`/pages/party/partyHistory/detail?id=${id}`);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  .title{
+    padding: 28px 16px 28px 28px;
+    background-color: #fff;
+    display: flex;
+    justify-content: space-between;
+    .tips{
+      display: inline-block;
+      width: 8px;
+      height: 32px;
+      background: #E02617;
+      vertical-align: middle;
+      margin-right: 18px;
+    }
+    .right-icon{
+      width: 32px;
+      height: 32px;
+      float: right;
+      vertical-align: middle;
+      transform:rotate(270deg);
+      padding: 0px 8px 0 0;
+    }
+    .left{
+      font-size: 34px;
+      font-family: PingFang-SC-Heavy, PingFang-SC;
+      font-weight: 800;
+      color: #333;
+      line-height: 48px;
+    }
+    .right{
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666;
+      line-height: 40px;
+    }
+  }
+  .header{
+    padding: 0 34px 40px 34px;
+    img{
+      width: 684px;
+      height: 252px;
+      margin-bottom: 32px;
+    }
+    .text{
+      font-size: 32px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 48px;
+      word-break: break-all;
+      margin-bottom: 16px;
+      height: 96px;
+      text-overflow: -o-ellipsis-lastline;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      line-clamp: 2;
+      -webkit-box-orient: vertical;
+    }
+    .time{
+      font-size: 24px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #999;
+      line-height: 30px;
+    }
+  }
+  .line-bg{
+    width: 100%;
+    height: 12px;
+    background: #F2F2F2;
+  }
+  .tab-content{
+    padding: 0 0 40px 30px;
+    overflow-x: hidden;
+    height: 236px;
+    width: 800px;
+    .tab-item{
+      float: left;
+      width: 236px;
+      height: 236px;
+      background: #FFF;
+      box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.12);
+      border-radius: 8px;
+      margin-right: 16px;
+      img{
+        width: 236px;
+        height: 160px;
+      }
+      p{
+        padding: 12px 8px 0;
+        font-size: 26px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 36px;
+        overflow: hidden;
+        text-overflow:ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+  .new-list {
+    background-color: #fff;
+    .list-content {
+      .bg-fff {
+        padding: 0 30px;
+        border-top: 1px solid #ddd;
+        .item {
+          padding: 24px 0 32px 0;
+          border-bottom: 2px solid #eee;
+          display: flex;
+          justify-content: space-between;
+
+          .info {
+            // width: 410px;
+            p {
+              // width: 410px;
+              font-size: 30px;
+              font-family: PingFangSC-Medium, PingFang SC;
+              font-weight: 500;
+              color: #333;
+              line-height: 46px;
+              text-overflow: -o-ellipsis-lastline;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-line-clamp: 2;
+              line-clamp: 2;
+              -webkit-box-orient: vertical;
+              margin-bottom: 52px;
+            }
+            span {
+              font-size: 24px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #999999;
+              line-height: 30px;
+            }
+          }
+          img {
+            width: 224px;
+            height: 168px;
+            margin-left: 56px;
+          }
+        }
+      }
+      .view-more {
+        background-color: #fff;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #c50000;
+        line-height: 40px;
+        padding: 30px 0 40px 30px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/knowledgeList.vue b/src/apps/party/partyHistoryEducation/knowledgeList.vue
new file mode 100644
index 00000000..c3a25d56
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/knowledgeList.vue
@@ -0,0 +1,295 @@
+<template>
+  <div class="page">
+    <div style="height: 100%">
+      <div class="fixed-top">
+        <!-- 选择时间和类型 -->
+        <div class="slect flex-row">
+          <!-- 类型选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                  @change="bindPickerChange"
+                  :range="array"
+                  range-key="dictName"
+                >
+                  <div class="uni-input">{{styleText}}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+          <!-- 时间选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                  mode="date"
+                  :value="date"
+                  :start="startDate"
+                  :end="endDate"
+                  @change="bindDateChange"
+                  fields="month"
+                >
+                  <div class="uni-input">{{ day }}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="session-list">
+        <div class="session-item" v-for="(item, index) in meetList" :key="index" @click="toDetail(item.id)">
+          <div class="info">
+            <p v-if="fromType != 'style'"><span :class="item.style == 0 ? 'status0' : 'status1'">{{item.style == 0 ? '党史知识' : '党史图书馆'}}</span>{{item.title}}</p>
+            <p v-else><span class="status0">{{ $dict.getLabel(`partyHistoryType${optionStyle}`, item.type) }}</span>{{item.title}}</p>
+            <span class="time">{{item.organizationName}} {{item.createDate}}</span>
+          </div>
+          <div class="img" v-if="item.thumbUrl && item.thumbUrl.length">
+            <img :src="item.thumbUrl[0].url" alt="">
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="meetList.length == 0" />
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    const currentDate = this.getDate({
+      format: true,
+    });
+    return {
+      array: [],
+      partyStudyType: "",
+      date: currentDate,
+      day: "时间",
+      createDate: "", //创建时间
+      meetList: [],
+      pageNum: 1,
+      pageSize: 10,
+      pages: 2,
+      fromType: '', //style 0、党建要闻 1、政策解读  knowledge 党史知识 policy 党史图书馆
+      style: '4',
+      styleText: '类型',
+      optionStyle: ''
+    };
+  },
+  computed: {
+    startDate() {
+      return this.getDate("start");
+    },
+    endDate() {
+      return this.getDate("end");
+    },
+  },
+  onLoad(options) {
+    console.log(options)
+    if(options.type == 'knowledge'){
+      this.array = [{dictName: "全部类型", dictValue: "4"}, {dictName: "党史知识 ", dictValue: 0}, {dictName: "党史图书馆", dictValue: 1}]
+    }
+    if(options.type == 'style'){
+      this.style = ''
+      this.optionStyle = options.style
+      this.$dict.load("partyHistoryType0", "partyHistoryType1").then(() => {
+        this.array = this.$dict.getDict(`partyHistoryType${options.style}`)
+        this.array.unshift({dictName: "全部类型", dictValue: ""})
+      })
+    }
+
+    this.fromType = options.type
+    this.getList();
+  },
+  methods: {
+    bindPickerChange(e) {
+      console.log(e)
+      this.style = this.array[e.detail.value].dictValue
+      if(this.style === ''){
+        this.styleText = '类型'
+      }else {
+        this.styleText = this.array[e.detail.value].dictName
+      }
+
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList();
+    },
+    bindDateChange (e) {
+      this.day = e.target.value;
+      this.createDate = e.target.value;
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList();
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+
+      if (type === "start") {
+        year = year - 60;
+      } else if (type === "end") {
+        year = year + 2;
+      }
+      month = month > 9 ? month : "0" + month;
+      day = day > 9 ? day : "0" + day;
+
+      return `${year}-${month}-08 00:00:00  `;
+    },
+
+    search() {
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.pages = 2;
+      this.getList();
+    },
+    getList() {
+      if (this.pageNum > this.pages) return;
+
+      var createDate = ''
+      if(this.createDate) {
+        createDate = this.createDate + '-01'
+      }
+      this.$http.post(`/app/apppartyeducation/list?size=10&current=${this.pageNum}&createDateParam=${createDate}&style=${this.style}&status=1`).then((res) => {
+        if (res.code == 0) {
+          res.data.records.map((item) => {
+            if(item.thumbUrl) {
+              item.thumbUrl = JSON.parse(item.thumbUrl)
+            }
+            if(item.createDate) {
+              item.createDate = item.createDate.substring(0, 10)
+            }
+          })
+          const meetList = this.pageNum > 1 ? [...this.meetList, ...res.data.records]: res.data.records
+          this.pages = Math.ceil(res.data.total / 10)
+          this.meetList = meetList
+        }
+      });
+    },
+    toDetail(id) {
+      uni.navigateTo({
+        url: "./todayDetail?type=know&id=" + id,
+      });
+    },
+  },
+  onReachBottom() {
+    this.pageNum = this.pageNum + 1;
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+.page {
+  .search-box {
+    width: 100%;
+    height: 112rpx;
+    background-color: #e60012;
+    padding: 24rpx 32rpx;
+    box-sizing: border-box;
+  }
+  .slect {
+    width: 100%;
+    height: 96rpx;
+    background-color: #fff;
+    color: #666;
+    .type-slect {
+      width: 50%;
+      border-right: 1rpx solid #f7f7f7;
+      margin: 30rpx 0;
+      box-sizing: border-box;
+      text-align: center;
+      font-size: 26rpx;
+      .uni-input {
+        display: inline-block;
+      }
+      image {
+        width: 32rpx;
+        height: 32rpx;
+        display: inline-block;
+        position: relative;
+        top: 6rpx;
+        margin-left: 8srpx;
+      }
+    }
+    .type-slect:nth-child(2) {
+      border: none;
+    }
+  }
+  .session-list {
+    padding-top: 112rpx;
+    .session-item {
+      width: 686rpx;
+      padding: 32px;
+      box-sizing: border-box;
+      margin: 0 auto 32rpx auto;
+      background-color: #fff;
+      position: relative;
+      overflow: hidden;
+      display: flex;
+      justify-content: space-between;
+      border-radius: 8px;
+      .info{
+        p{
+          height: 88px;
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 44px;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          line-clamp: 2;
+          -webkit-box-orient: vertical;
+          margin-bottom: 24px;
+          span{
+            display: inline-block;
+            padding: 0 8px;
+            font-size: 26px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            line-height: 44px;
+            margin-right: 16px;
+            border-radius: 8px;
+          }
+          .status0{
+            color: #2266FF;
+            background-color: #E8EFFF;
+          }
+          .status1{
+            color: #FF8822;
+            background-color: #FFF3E9;
+          }
+        }
+        .time {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #999;
+          line-height: 22px;
+        }
+      }
+      .img{
+        padding-left: 24px;
+        img{
+          width: 192px;
+          height: 144px;
+        }
+      }
+    }
+  }
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/list.vue b/src/apps/party/partyHistoryEducation/list.vue
new file mode 100644
index 00000000..660ba279
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/list.vue
@@ -0,0 +1,305 @@
+<template>
+  <div class="page">
+    <div style="height: 100%">
+      <div class="fixed-top">
+        <!-- 选择时间和类型 -->
+        <div class="slect flex-row">
+          <!-- 类型选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                  @change="bindPickerChange"
+                  :range="array"
+                  range-key="dictName"
+                >
+                  <div class="uni-input">{{styleText}}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+          <!-- 时间选择 -->
+          <div class="uni-list type-slect">
+            <div class="uni-list-cell">
+              <div class="uni-list-cell-db">
+                <picker
+                  mode="date"
+                  :value="date"
+                  :start="startDate"
+                  :end="endDate"
+                  @change="bindDateChange"
+                  fields="month"
+                >
+                  <div class="uni-input">{{ day }}</div>
+                  <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+                </picker>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="session-list">
+        <div class="session-item" v-for="(item, index) in meetList" :key="index" @click="toDetail(item.id)">
+          <div class="info">
+            <p v-if="fromType != 'style'"><span :class="item.style == 0 ? 'status0' : 'status1'">{{item.style == 0 ? '党史知识' : '党史图书馆'}}</span>{{item.title}}</p>
+            <p v-else><span class="status0">{{ $dict.getLabel(`partyHistoryType${optionStyle}`, item.type) }}</span>{{item.title}}</p>
+            <span class="time">{{item.organizationName}} {{item.createDate}}</span>
+          </div>
+          <div class="img" v-if="item.thumbUrl && item.thumbUrl.length">
+            <img :src="item.thumbUrl[0].url" alt="">
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="meetList.length == 0" />
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    const currentDate = this.getDate({
+      format: true,
+    });
+    return {
+      array: [],
+      partyStudyType: "",
+      date: currentDate,
+      day: "时间",
+      createDate: "", //创建时间
+      meetList: [],
+      pageNum: 1,
+      pageSize: 10,
+      pages: 2,
+      fromType: '', //style 0、党建要闻 1、政策解读  knowledge 党史知识 policy 党史图书馆
+      style: '',
+      styleText: '类型',
+      optionStyle: ''
+    };
+  },
+  computed: {
+    startDate() {
+      return this.getDate("start");
+    },
+    endDate() {
+      return this.getDate("end");
+    },
+  },
+  onLoad(options) {
+    console.log(options)
+    if(options.type == 'knowledge'){
+      this.array = [{dictName: "全部类型", dictValue: "0|1"}, {dictName: "党史知识 ", dictValue: 0}, {dictName: "党史图书馆", dictValue: 1}]
+    }
+    if(options.type == 'style'){
+      this.style = ''
+      this.optionStyle = options.style
+      this.$dict.load("partyHistoryType0", "partyHistoryType1").then(() => {
+        this.array = this.$dict.getDict(`partyHistoryType${options.style}`)
+        this.array.unshift({dictName: "全部类型", dictValue: ""})
+      })
+    }
+
+    this.fromType = options.type
+    this.getList();
+  },
+  methods: {
+    bindPickerChange(e) {
+      console.log(e)
+      this.style = this.array[e.detail.value].dictValue
+      if(this.style === ''){
+        this.styleText = '类型'
+      }else {
+        this.styleText = this.array[e.detail.value].dictName
+      }
+
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList();
+    },
+    bindDateChange (e) {
+      this.day = e.target.value;
+      this.createDate = e.target.value;
+      this.pageNum = 1;
+      this.pages = 2;
+      this.pageSize = 10;
+      this.getList();
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+
+      if (type === "start") {
+        year = year - 60;
+      } else if (type === "end") {
+        year = year + 2;
+      }
+      month = month > 9 ? month : "0" + month;
+      day = day > 9 ? day : "0" + day;
+
+      return `${year}-${month}-08 00:00:00  `;
+    },
+
+    search() {
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.pages = 2;
+      this.getList();
+    },
+    getList() {
+      if (this.pageNum > this.pages) return;
+
+      var createDate = ''
+      if(this.createDate) {
+        createDate = this.createDate + '-01 00:00:00'
+      }
+      this.$http.post(`/app/apppartyhistory/listWechat`, {
+        style: this.fromType == 'style' ? this.optionStyle : this.style,
+        type: this.style,
+        createDate: createDate,
+        current: this.pageNum,
+        size: this.pageSize,
+        status: 1
+      }).then((res) => {
+        if (res.code == 0) {
+          res.data.records.map((item) => {
+            if(item.thumbUrl) {
+              item.thumbUrl = JSON.parse(item.thumbUrl)
+            }
+            if(item.createDate) {
+              item.createDate = item.createDate.substring(0, 10)
+            }
+          })
+          const meetList = this.pageNum > 1 ? [...this.meetList, ...res.data.records]: res.data.records
+          this.pages = Math.ceil(res.data.total / 10)
+          this.meetList = meetList
+          // this.meetList.map((item) => {
+          //   item.thumbUrl = JSON.parse(item.thumbUrl)
+          // })
+        }
+      });
+    },
+    toDetail(id) {
+      uni.navigateTo({
+        url: "./detail?id=" + id,
+      });
+    },
+  },
+  onReachBottom() {
+    this.pageNum = this.pageNum + 1;
+    this.getList();
+  },
+};
+</script>
+<style lang="scss" scope>
+@import "../../../common/common.css";
+.page {
+  .search-box {
+    width: 100%;
+    height: 112rpx;
+    background-color: #e60012;
+    padding: 24rpx 32rpx;
+    box-sizing: border-box;
+  }
+  .slect {
+    width: 100%;
+    height: 96rpx;
+    background-color: #fff;
+    color: #666;
+    .type-slect {
+      width: 50%;
+      border-right: 1rpx solid #f7f7f7;
+      margin: 30rpx 0;
+      box-sizing: border-box;
+      text-align: center;
+      font-size: 26rpx;
+      .uni-input {
+        display: inline-block;
+      }
+      image {
+        width: 32rpx;
+        height: 32rpx;
+        display: inline-block;
+        position: relative;
+        top: 6rpx;
+        margin-left: 8srpx;
+      }
+    }
+    .type-slect:nth-child(2) {
+      border: none;
+    }
+  }
+  .session-list {
+    padding-top: 112rpx;
+    .session-item {
+      width: 686rpx;
+      padding: 32px;
+      box-sizing: border-box;
+      margin: 0 auto 32rpx auto;
+      background-color: #fff;
+      position: relative;
+      overflow: hidden;
+      display: flex;
+      justify-content: space-between;
+      border-radius: 8px;
+      .info{
+        p{
+          height: 88px;
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 44px;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          line-clamp: 2;
+          -webkit-box-orient: vertical;
+          margin-bottom: 24px;
+          span{
+            display: inline-block;
+            padding: 0 8px;
+            font-size: 26px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            line-height: 44px;
+            margin-right: 16px;
+            border-radius: 8px;
+          }
+          .status0{
+            color: #2266FF;
+            background-color: #E8EFFF;
+          }
+          .status1{
+            color: #FF8822;
+            background-color: #FFF3E9;
+          }
+        }
+        .time {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #999;
+          line-height: 22px;
+        }
+      }
+      .img{
+        padding-left: 24px;
+        img{
+          width: 192px;
+          height: 144px;
+        }
+      }
+    }
+  }
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/select.vue b/src/apps/party/partyHistoryEducation/select.vue
new file mode 100644
index 00000000..ff90dc3d
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/select.vue
@@ -0,0 +1,76 @@
+<template>
+  <section class="home">
+    <div class="page">
+      <p class="title">点击进入月份</p>
+      <div class="tab-content">
+        <span v-for="(item, index) in tabList" :key="index" class="tab-item" :class="tabIndex == index ? 'active' : ''" @click="back(index)">{{item}}</span>
+      </div>
+    </div>
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      tabList: ['全部', '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+      tabIndex: 0,
+    };
+  },
+  onLoad(options) {
+    this.tabIndex = options.index
+  },
+  methods: {
+    back(index) {
+      this.tabIndex = index
+      uni.setStorageSync('partyTabIndex', this.tabIndex)
+      uni.navigateBack({delta:1})
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  .title{
+    padding: 32px 0 40px 30px;
+    font-size: 26px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #B9B9B9;
+    line-height: 36px;
+  }
+  .tab-content{
+    padding-left: 30px;
+    .tab-item{
+      display: inline-block;
+      width: 144px;
+      height: 48px;
+      text-align: center;
+      line-height: 48px;
+      border-radius: 24px;
+      box-sizing: border-box;
+      border: 1px solid #CBCBCB;
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #333;
+      margin: 0 38px 32px 0;
+    }
+    .active{
+      color: #DA2D1A;
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/todayDetail.vue b/src/apps/party/partyHistoryEducation/todayDetail.vue
new file mode 100644
index 00000000..2867b848
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/todayDetail.vue
@@ -0,0 +1,104 @@
+<template>
+  <section class="home">
+    <div class="page">
+      <div class="header">
+        <p class="title">{{info.title}}</p>
+        <div class="info mar-b16"><span class="label">发布单位：</span><span class="value">{{info.organizationName}}</span></div>
+        <div class="info" v-if="type == 'know'">发布时间：{{info.createDate || '-'}}</div>
+        <div class="info" v-else>发布时间：{{info.publishDate || '-'}}</div>
+      </div>
+      <div class="content">
+        <u-parse :html="info.content"></u-parse>
+      </div>
+      <AiTransSpeech :src="info.speech" v-if="info.speech"/>
+    </div>
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      id: '',
+      info: {},
+      content: '',
+      type: '', //know 党史知识
+    };
+  },
+  onLoad(options) {
+    console.log(options)
+    this.id = options.id
+    this.type = options.type
+    this.getDetail()
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/apppartyeducation/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data.createDate) {
+            res.data.createDate = res.data.createDate.substring(0, 10)
+          }
+          if(res.data.publishDate) {
+            res.data.publishDate = res.data.publishDate.substring(0, 10)
+          }
+          this.info = res.data
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  .header{
+    width: 100%;
+    padding: 24px 32px 32px;
+    box-sizing: border-box;
+    background: #D03A28;
+    .title{
+      width: 100%;
+      font-size: 40px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #FFF;
+      line-height: 64px;
+      letter-spacing: 1px;
+      word-break: break-all;
+      margin-bottom: 16px;
+    }
+    .info{
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #FFF;
+      line-height: 40px;
+      display: flex;
+      .label{
+        width: 140px;
+      }
+      .value{
+        width: calc(100% - 140px);
+        word-break: break-all;
+      }
+    }
+    .mar-b16{
+      margin-bottom: 16px;
+    }
+  }
+  .content{
+    padding: 32px;
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/todayList.vue b/src/apps/party/partyHistoryEducation/todayList.vue
new file mode 100644
index 00000000..1694ccd3
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/todayList.vue
@@ -0,0 +1,160 @@
+<template>
+  <section class="home">
+    <div class="page">
+      <div class="tab-content">
+        <span v-for="(item, index) in tabList" :key="index" class="tab-item" :class="tabIndex == index ? 'active' : ''" @click="timeSelect(index)">{{item}}</span>
+        <img src="https://cdn.cunwuyun.cn/img/party_detail.png" alt="" @click="handleGoto(`./select?index=${tabIndex}`)">
+      </div>
+      <div class="item" v-for="(item, index) in todayList" :key="index" @click="handleGoto(`./todayDetail?id=${item.id}`)">
+        <div class="header">
+          <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length" />
+          <p class="text">{{item.title}}</p>
+          <p class="time">{{item.organizationName}} {{item.publishDate || ''}}</p>
+        </div>
+        <div class="line-bg"></div>
+      </div>
+      <AiEmpty v-if="todayList.length == 0" />
+    </div>
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      tabList: ['全部', '一月', '二月', '三月', '四月', '五月'],
+      tabIndex: 0,
+      todayList: [],
+      current: 1,
+      pages: 2
+    };
+  },
+  onLoad(options) {
+    this.getTodayList();
+  },
+  onShow() {
+    if(uni.getStorageSync('partyTabIndex')) {
+      this.tabIndex = uni.getStorageSync('partyTabIndex')
+      uni.setStorageSync('partyTabIndex', '')
+      this.timeSelect(this.tabIndex);
+    }
+  },
+  methods: {
+    getTodayList() {
+      if (this.current > this.pages) return;
+      var publishDate = ''
+      if(this.tabIndex > 0) {
+        var myDate = new Date();
+        var tYear = myDate.getFullYear();
+        var month = this.tabIndex < 10 ? '0' + this.tabIndex : this.tabIndex
+        publishDate = tYear + '-' + month + '-01'
+      }
+      this.$http.post(`/app/apppartyeducation/list?style=2&current=${this.current}&size=10&publishDate=${publishDate}&status=1`).then((res) => {
+        if (res.code == 0) {
+          if (res.data.records && res.data.records.length) {
+            res.data.records.map((item) => {
+              console.log(item.thumbUrl)
+              if(item.thumbUrl) {
+                item.thumbUrl = JSON.parse(item.thumbUrl)
+              }
+              if(item.publishDate) {
+                item.publishDate = item.publishDate.substring(0, 10)
+              }
+            })
+            const todayList = this.current > 1 ? [...this.todayList, ...res.data.records]: res.data.records
+            this.pages = Math.ceil(res.data.total / 10)
+            this.todayList = todayList
+          }
+        }
+      });
+    },
+    handleGoto(url) {
+      uni.navigateTo({url})
+    },
+    timeSelect(index) {
+      this.tabIndex = index
+      this.current = 1
+      this.pages = 2
+      this.todayList = []
+      this.getTodayList()
+    }
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getTodayList()
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  .tab-content{
+    width: 100%;
+    height: 84px;
+    padding: 0 30px;
+    box-sizing: border-box;
+    background: #FCF0ED;
+    .tab-item{
+      display: inline-block;
+      width: 60px;
+      line-height: 80px;
+      height: 80px;
+      margin-right: 48px;
+      font-size: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #70737B;
+    }
+    .active{
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #DA2D1A;
+      border-bottom: 4px solid #DE2C19;
+    }
+    img{
+      width: 32px;
+      vertical-align: middle;
+    }
+  }
+  .header {
+    padding: 0 34px;
+    img {
+      width: 684px;
+      height: 252px;
+      margin: 32px 0;
+    }
+    .text {
+      font-size: 32px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 48px;
+      word-break: break-all;
+      margin-bottom: 16px;
+    }
+    .time {
+      font-size: 24px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #999;
+      line-height: 30px;
+      padding-bottom: 40px;
+    }
+  }
+  .line-bg {
+    width: 100%;
+    height: 12px;
+    background: #f2f2f2;
+  }
+}
+</style>
diff --git a/src/apps/party/partyHistoryEducation/videoDetail.vue b/src/apps/party/partyHistoryEducation/videoDetail.vue
new file mode 100644
index 00000000..6f2c5cd3
--- /dev/null
+++ b/src/apps/party/partyHistoryEducation/videoDetail.vue
@@ -0,0 +1,180 @@
+<template>
+  <section class="home" v-if="pageShow">
+    <div class="page" v-if="videoList.length">
+      <video :src="videoList[activeIndex].videoUrl" :id="`video${activeIndex+1}`"></video>
+      <p class="video-name">{{videoList[activeIndex].title}}</p>
+      <div class="time">{{info.organizationName}}  {{info.createDate}}</div>
+      <div class="title">
+        <span>选集</span>
+        <p @click="show=true" v-if="videoList.length > 7">查看全部&nbsp;&nbsp;></p>
+      </div>
+      <div class="select page-select">
+        <div class="item" :class="index == activeIndex ? 'active' : ''" v-for="(item, index) in videoList" :key="index" @click="activeIndex=index">{{item.num}}</div>
+      </div>
+      <div class="title">
+        <span>内容简介</span>
+      </div>
+      <div class="content">
+        <u-parse :html="info.content"></u-parse>
+      </div>
+      <u-popup v-model="show" mode="bottom">
+        <div class="title">
+          <span>选集</span>
+        </div>
+        <div class="select pop-select">
+          <div class="item" :class="index == activeIndex ? 'active' : ''" v-for="(item, index) in videoList" :key="index" @click="activeIndex=index;show=false">{{item.num}}</div>
+        </div>
+      </u-popup>
+    </div>
+    <AiEmpty v-else />
+  </section>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "home",
+  computed: {
+    ...mapState(["user", "token"]),
+  },
+  data() {
+    return {
+      show: false,
+      id: '',
+      info: {},
+      videoList: [],
+      activeIndex: 0,
+      pageShow: false
+    };
+  },
+  onLoad(options) {
+    this.id = options.id
+    this.getClassDetail()
+    this.getVideoList()
+  },
+  methods: {
+    change(index) {
+      this.current = index;
+    },
+    getClassDetail() {
+      this.$http.post(`/app/apppartyclassroom/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          if (res.data) {
+            res.data.createDate = res.data.createDate.substring(0, 10)
+            this.info= res.data
+          }
+        }
+      });
+    },
+    getVideoList() {
+      this.$http.post(`/app/apppartyclassroomepisode/list?classroomId=${this.id}&size=10000`).then((res) => {
+        if (res.code == 0) {
+          console.log(res)
+          if (res.data && res.data.records) {
+            this.videoList = res.data.records
+            this.pageShow = true
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "../../../common/common.css";
+.home {
+  width: 100%;
+  height: 100%;
+}
+.page {
+  width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  background-color: #fff;
+  video{
+    width: 100%;
+    height: 416px;
+  }
+  .video-name{
+    padding: 24px 32px 20px;
+    width: 686px;
+    font-size: 34px;
+    font-family: PingFang-SC-Heavy, PingFang-SC;
+    font-weight: 800;
+    color: #333;
+    line-height: 48px;
+  }
+  .time{
+    font-size: 24px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #999;
+    line-height: 30px;
+    margin-bottom: 32px;
+    padding-left: 32px;
+  }
+  .title{
+    width: 100%;
+    height: 80px;
+    line-height: 80px;
+    padding: 0 32px 16px 32px;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+    span{
+      display: inline-block;
+      font-size: 34px;
+      font-family: PingFang-SC-Heavy, PingFang-SC;
+      font-weight: 800;
+      color: #333;
+      line-height: 80px;
+    }
+    p{
+      font-size: 26px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #999;
+      line-height: 80px;
+    }
+  }
+  .select{
+    padding: 0 0 24px 32px;
+    width: 800px;
+    overflow-x: hidden;
+    .item{
+      width: 96px;
+      height: 96px;
+      line-height: 96px;
+      text-align: center;
+      background: #F0F4FB;
+      border-radius: 8px;
+      float: left;
+      font-size: 32px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      margin-right: 11px;
+    }
+    .active{
+      color: #DA2D1A;
+    }
+  }
+  .page-select{
+    height: 96px;
+    padding-bottom: 0;
+    overflow-y: hidden;
+  }
+  .content{
+    padding: 0 32px;
+    font-size: 32px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #333;
+    line-height: 48px;
+    word-break: break-all;
+  }
+  .pop-select{
+    .item{
+      margin: 0 22px 22px 0;
+    }
+  }
+}
+</style>
diff --git a/src/apps/party/partyIntegral/listInSort.vue b/src/apps/party/partyIntegral/listInSort.vue
new file mode 100644
index 00000000..b40f0c0b
--- /dev/null
+++ b/src/apps/party/partyIntegral/listInSort.vue
@@ -0,0 +1,398 @@
+<template>
+  <div>
+    <div class="list-wrap" v-show="!isSearch">
+     <div class="fixed-top" style="background-color:#f3f6f9;">
+        <div class="header box flex-between">
+          <div class="address flex-row">
+            <i class="iconfont">&#xe6a7;</i>
+            <span @click="switchParty">{{user.partyOrgName}}</span>
+            <i class="iconfont">&#xe695;</i>
+          </div>
+          <div class="calendar">
+            <picker class="picker" mode="date" :value="date" fields="month" :start="startDate" :end="endDate" @change="bindDateChange">
+              <span>{{date}}</span>
+              <i class="iconfont">&#xe6cf;</i>
+            </picker>
+          </div>
+        </div>
+        <div class="nav-bar box flex-row">
+          <div class="flex-column" data-index="0" @click="tabChange">月度排行
+            <div class="bor-line" :class="navId==0?'active':''"></div>
+          </div>
+          <div class="flex-column" data-index="1" @click="tabChange">累计排行
+            <div class="bor-line" :class="navId==1?'active':''"></div>
+          </div>
+        </div>
+     </div>
+      <div class="score-list">
+        <div class="item line flex-between box" v-for="(item,index) in scoreSortList" :key="index">
+          <div class="left flex-row">
+            <span>{{index + 1}}</span>
+            <img :src="item.avatarUrl?item.avatarUrl:'https://cdn.cunwuyun.cn/profile.png'">
+            <span>{{item.partyName}}</span>
+          </div>
+          <div class="right">{{item.activityIntegral || 0}}分</div>
+        </div>
+        <AiEmpty v-if="scoreSortList.length==0"/>
+      </div>
+    </div>
+    <div class="search-wrap" v-show="isSearch">
+      <div class="header">
+        <div class="flex-row search search-input">
+          <i class="iconfont searIcon">&#xe6d1;</i>
+          <input class="input" type="span" v-model.trim="searchVal" placeholder="请输入党组织" confirm-type="search" @confirm="search">
+        </div>
+      </div>
+      <div class="flex-between history" v-if="searchHis.length && !searchEmpty">
+        <span>历史搜索</span>
+        <div class="cls flex-row" @click="clear">
+          <i class="iconfont clrIcon">&#xe6d2;</i>
+          <span>清空</span>
+        </div>
+      </div>
+      <div class="his-list flex-row" v-if="searchHis.length && !searchEmpty">
+        <div class="his-item" v-for="(item,index) in searchHis" :key="index" @click="searchPartyOrgan(item)">{{item}}</div>
+      </div>
+      <div class="sear-list" v-if="partyOrganList.length">
+        <div class="sear-item flex-align line" v-for="(item,idx) in partyOrganList" :key="idx" @click="selectedPartyOrgan(item)">{{item.name}}</div>
+      </div>
+      <AiEmpty v-if="!partyOrganList.length"/>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {mapState} from "vuex";
+  import moment from "dayjs";
+  export default {
+    name:"listInSort",
+    data(){
+      const currentDate = this.getDate({
+        format: true
+      })
+      return{
+        date:currentDate,
+        navId:0,
+        pageNum: 1,
+        pageSize: 10,
+        pages: 2,
+        searchVal:"",
+        isSearch:false,
+        searchEmpty:false,
+        scoreSortList:[],
+        searchHis:[],
+        partyOrganList:[],
+      }
+    },
+    onLoad(){
+      this.getScoreSort() ;
+      const searchList = uni.getStorageSync("searchHis") || "[]" ;
+      this.searchHis = JSON.parse(searchList) ;
+    },
+    computed:{
+      ...mapState(["user"]),
+      startDate() {
+        return this.getDate('start');
+      },
+      endDate() {
+        return this.getDate('end');
+      },
+      rewriteDate(){
+        return (this.date + "-01 00:00:00");
+      }
+    },
+    methods:{
+      selectedPartyOrgan(item){
+        uni.setNavigationBarTitle({
+            title:"积分排行榜",
+            success:()=>{
+              this.user.partyOrgName = item.name ;
+              this.user.partyOrgId = item.id ;
+              this.searchVal = "" ;
+              this.isSearch = false ;
+              this.searchEmpty = false ;
+              this.pageNum = 1 ;
+              this.pages = 2 ;
+              this.getScoreSort() ;
+            }
+          })
+      },
+      bindDateChange(e) {
+        this.date = e.target.value ;
+        this.$nextTick(()=>{
+          this.pages = 2 ;
+          this.getScoreSort();
+        })
+      },
+      getDate(type) {
+        const date = new Date();
+        let year = date.getFullYear();
+        let month = date.getMonth() + 1;
+
+        if (type === 'start') {
+          year = year - 60;
+        } else if (type === 'end') {
+          year = year + 2;
+        }
+        month = month > 9 ? month : '0' + month;;
+        return `${year}-${month}`;
+      },
+      clear(){
+        if(!this.searchHis.length) return ;
+        uni.showModal({
+          title:"提示",
+          content:"确定要清空历史搜索？",
+          success:(res)=>{
+            if (res.confirm) {
+              uni.setStorageSync("searchHis","") ;
+              this.searchHis = [] ;
+            }
+          }
+        })
+      },
+      search(){
+        let searchHis = uni.getStorageSync("searchHis") || "[]" ;
+        searchHis = JSON.parse(searchHis) ;
+        if(searchHis.indexOf(this.searchVal)==-1 && this.searchVal.trim() !=""){
+          searchHis.unshift(this.searchVal);
+          this.searchHis.unshift(this.searchVal);
+          uni.setStorageSync("searchHis",JSON.stringify(searchHis)) ;
+        }
+        this.searchPartyOrgan(this.searchVal) ;
+      },
+      tabChange(e){
+        this.navId = e.currentTarget.dataset.index ;
+        this.pageNum = 1 ;
+        this.pages = 2 ;
+        this.getScoreSort() ;
+      },
+      switchParty(){
+        uni.setNavigationBarTitle({
+          title:"选择党组织",
+          success:()=>{
+            this.isSearch = true ;
+            this.searchEmpty=false;
+            this.partyOrganList = [] ;
+            const searchList = uni.getStorageSync("searchHis") || "[]" ;
+            this.searchHis = JSON.parse(searchList) ;
+          }
+        })
+      },
+      getScoreSort(){
+        if (this.pageNum > this.pages) return
+        this.$http.post(`/app/apppartyintegralmanage/listInSortForWx?size=${this.pageSize}&current=${this.pageNum}&searchType=${this.navId}&partyOrgId=${this.user.partyOrgId}&searchTime=${this.rewriteDate}`).then(res => {
+          this.scoreSortList = this.pageNum > 1 ? [...this.scoreSortList, ...res.data.records] : res.data.records
+          this.pages = Math.ceil(res.data.total / 10);
+        })
+      },
+
+      searchPartyOrgan(searchVal){
+        this.searchEmpty = true
+        this.$http.post(`/admin/partyOrganization/queryPartyOrganizationListByName?name=${searchVal}`).then((res)=>{
+          if(res && res.data){
+            this.partyOrganList = res.data ;
+          }
+        })
+      },
+    },
+
+    onReachBottom() {
+      console.log(123)
+      this.pageNum = this.pageNum + 1;
+      this.getScoreSort() ;
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import "../../../common/common.css";
+  @import "../../../common/style";
+
+
+    .line{
+      border-bottom: 2px solid #EEEEEE;
+    }
+    .list-wrap{
+      .header{
+        width: 100%;
+        height:104px;
+        background: #FFFFFF;
+        .address{
+          width: 80%;
+          overflow:hidden;
+          span-overflow:ellipsis;
+          display:-webkit-box;
+          -webkit-line-clamp:1;
+          -webkit-box-orient:vertical;
+          span{
+            font-size: 32px;
+            font-weight: 400;
+            color: #E6736E;
+            margin: 0 10px;
+          }
+          .iconfont{
+            display: inline-block;
+            vertical-align: middle;
+            color: #E6736E;
+            &:nth-child(1){
+              font-size: 42px;
+            }
+          }
+        }
+        .calendar{
+          width: 256px;
+          height: 56px;
+          background: #F5DFDF;
+          border-radius: 28px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .picker{
+            display: flex;
+            align-items: center;
+          }
+          span{
+            display: inline-block;
+            padding-right: 10px;
+            border-right: 4px solid #E6736E;
+            line-height: 26px;
+            font-size: 28px;
+            font-weight: 800;
+            color: #E6736E;
+            box-sizing: border-box;
+          }
+          .iconfont{
+            display: inline-block;
+            font-size: 36px;
+            color: #E6736E;
+            padding-left: 10px;
+          }
+        }
+      }
+      .nav-bar{
+        width: 100%;
+        height:104px;
+        margin-top: 8px;
+        align-items: center;
+        justify-content: center;
+        background: #FFFFFF;
+        > div{
+          width: 50%;
+          align-items: center;
+        }
+        .bor-line{
+          width: 52px;
+          height: 11px;
+          background: transparent;
+          border-radius: 4px;
+          margin-top: 24px;
+        }
+        .active{
+          background: #E05953;
+        }
+      }
+      .score-list{
+        width: 100%;
+        padding-top: 224px;
+        .item{
+          align-items: center;
+          height: 148px;
+          background: #FFFFFF;
+          .left{
+            align-items: center;
+            span{
+              font-size: 40px;
+              font-weight: 500;
+              color: #666666;
+            }
+            img{
+              width: 80px;
+              height: 80px;
+              margin: 0 16px;
+              border-radius: 50%;
+            }
+          }
+          .right{
+            font-size: 36px;
+            font-weight: 500;
+            color: #E6736E;
+          }
+        }
+      }
+      .box{
+        box-sizing: border-box;
+        padding: 0 32px;
+      }
+    }
+    .search-wrap{
+      background: #F5F5F5;
+      .header{
+        width: 100%;
+        height: 95px;
+        background: #FFFFFF;
+        box-sizing: border-box;
+        padding: 0 32px;
+        .search{
+          width: 100%;
+          height: 64px;
+          border-radius: 32px;
+          align-items: center;
+          background: #F5F5F5;
+          box-sizing: border-box;
+          padding: 0 32px;
+          .searIcon{
+            color: #CCCCCC;
+            font-size: 38px;
+          }
+          input{
+            width: 100%;
+          }
+          .input{
+            font-size: 26px;
+            font-weight: 400;
+            color: #999999;
+          }
+        }
+      }
+      .history{
+        align-items: center;
+        box-sizing: border-box;
+        padding: 26px 32px 47px 32px;
+        span{
+          font-size: 30px;
+          font-weight: bold;
+          color: #333333;
+        }
+        .cls{
+          align-items: center;
+          .clrIcon{
+            color: #999999;
+            font-size: 44px;
+          }
+        }
+      }
+      .his-list{
+        width: 100%;
+        flex-wrap: wrap;
+        box-sizing: border-box;
+        padding: 0 32px;
+        .his-item{
+          box-sizing: border-box;
+          padding: 20px 24px;
+          background: #FFFFFF;
+          margin: 0 16px 16px 0;
+        }
+      }
+      .sear-list{
+        width: 100%;
+        .sear-item{
+          width: 100%;
+          height: 104px;
+          box-sizing: border-box;
+          padding: 0 32px;
+          background: #FFFFFF;
+          align-items: center;
+        }
+      }
+    }
+</style>
diff --git a/src/apps/party/partyIntegral/partyIntegral.vue b/src/apps/party/partyIntegral/partyIntegral.vue
new file mode 100644
index 00000000..d6e02283
--- /dev/null
+++ b/src/apps/party/partyIntegral/partyIntegral.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="page">
+    <img class="header-avatar" :src="user.avatarUrl" />
+    <div class="header">
+      <div class="score">{{ integralInfo.totalIntegral || 0 }}</div>
+      <div class="header-tip">累计获得积分</div>
+      <div class="detail-btn" @click="toDetail">查看明细</div>
+    </div>
+    <div class="link-list">
+      <div class="link-item baoder-r-t border-b">
+        <div class="label">本月获得积分</div>
+        <div class="value">{{ integralInfo.monthIntegral || 0 }}</div>
+      </div>
+      <div class="link-item baoder-r-t border-b">
+        <div class="label">本月组织内排名({{ user.partyOrgName }}）</div>
+        <div>第{{ integralInfo.rankNum || 0 }}名</div>
+      </div>
+    </div>
+    <div class="check-btn" @click="checkRank">查看排行榜</div>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "partyIntegral",
+  data() {
+    return {
+      userInfo: {},
+      integralInfo: {},
+    };
+  },
+  computed: {
+    ...mapState(["user"]),
+  },
+  onLoad() {
+    this.getInfo();
+  },
+  methods: {
+    getInfo() {
+      this.$http.post(`/app/apppartyintegralmanage/queryDetailByOpenIdForWx`).then((res) => {
+        if (res && res.data) this.integralInfo = res.data;
+      });
+    },
+    toDetail() {
+      uni.navigateTo({
+        url: "./partyIntegralDetail",
+      });
+    },
+    checkRank() {
+      uni.navigateTo({
+        url: "./listInSort",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scope>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  background: #ffffff;
+  padding-top: 100px;
+  position: relative;
+
+  .header-avatar {
+    position: absolute;
+    width: 120px;
+    height: 120px;
+    border-radius: 50%;
+    top: 50px;
+    left: 316px;
+    z-index: 99;
+  }
+
+  .header {
+    padding-top: 100px;
+    width: 686px;
+    background: url("https://cdn.cunwuyun.cn/guangdong/h5/partyLogo01.png") no-repeat
+      no-repeat;
+    background-size: 100% 100%;
+    border-radius: 4px;
+    margin: 0 0 32px 32px;
+    position: relative;
+    box-sizing: border-box;
+    overflow: hidden;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .score {
+      font-size: 72px;
+      font-weight: bold;
+      color: #ffffff;
+      line-height: 84px;
+      margin-bottom: 8px;
+      text-align: center;
+    }
+
+    .header-tip {
+      font-size: 26px;
+      font-weight: 500;
+      color: #ffffff;
+      line-height: 36px;
+      text-align: center;
+    }
+
+    .detail-btn {
+      width: 240px;
+      height: 56px;
+      border-radius: 28px;
+      border: 2px solid #ffffff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 28px;
+      font-weight: 500;
+      color: #ffffff;
+      margin: 34px 0;
+    }
+  }
+
+  .link-list {
+    width: 686px;
+    margin: 0 auto;
+
+    .link-item {
+      width: 100%;
+      height: 128px;
+      padding-right: 32px;
+      box-sizing: border-box;
+      line-height: 128px;
+      background-color: #fff;
+      display: flex;
+      justify-content: space-between;
+
+      .label {
+        width: 450px;
+        display: flex;
+        padding-left: 34px;
+        color: #292d33;
+        font-size: 30px;
+        justify-content: center;
+        overflow: hidden;
+        span-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+      }
+      .value {
+        font-size: 30px;
+        font-weight: 400;
+        color: #333333;
+      }
+    }
+
+    .baoder-r-t {
+      border-radius: 20px 20px 0 0;
+    }
+
+    .border-b {
+      border-bottom: 2px solid #ddd;
+    }
+  }
+  .check-btn {
+    width: 686px;
+    height: 95px;
+    margin: 0 auto;
+    background: #e76056;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 42px;
+    font-size: 32px;
+    font-weight: 500;
+    color: #ffffff;
+  }
+}
+</style>
diff --git a/src/apps/party/partyIntegral/partyIntegralDetail.vue b/src/apps/party/partyIntegral/partyIntegralDetail.vue
new file mode 100644
index 00000000..2fc4da70
--- /dev/null
+++ b/src/apps/party/partyIntegral/partyIntegralDetail.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="page">
+    <div class="header box flex-align">
+      <div class="date flex-between">
+        <div class="calendar">
+          <picker class="picker" mode="date" :value="date" fields="month" :start="startDate" :end="endDate" @change="bindDateChange">
+            <span>{{date}}</span>
+            <i class="iconfont">&#xe6cf;</i>
+          </picker>
+        </div>
+        <span class="score-tip">获得积分 {{integral}}</span>
+      </div>
+    </div>
+    <div class="score-list">
+      <div class="item line flex-row box" v-for="item of scoreList" :key="item">
+        <div class="left">
+          <div>{{item.doTime && item.doTime.split(" ")[0]}}</div>
+          <div>{{item.doTime && item.doTime.split(" ")[1]}}</div>
+        </div>
+        <div class="right">
+          <div class="rig-cir">
+            <span></span>
+            <span></span>
+          </div>
+          <div class="rig-conn">
+            <div :style="{color:color[item.integralType]}">
+              <span v-if="item.integralType==1">＋</span>
+              {{item.activityIntegral || 0}}
+            </div>
+            <div>{{item.ruleName || "-"}}</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!scoreList.length"/>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {mapState} from "vuex";
+  import axios from "axios" ;
+  export default {
+    name:"partyIntegralDetail",
+    data(){
+      const currentDate = this.getDate({
+        format: true
+      })
+      return{
+        date:currentDate,
+        pageNum: 1,
+        pageSize: 10,
+        pages: 2,
+        integral:0,
+        scoreList:[],
+      }
+    },
+    computed: {
+      ...mapState(["user"]),
+      startDate() {
+        return this.getDate('start');
+      },
+      endDate() {
+        return this.getDate('end');
+      },
+      color(){
+        return ["#FF9B2B","#E6736E"]
+      },
+      rewriteDate(){
+        return (this.date + "-01 00:00:00") ;
+      }
+    },
+    onLoad(){
+      axios.all([this.getScoreList(),this.totalIntegral()])
+    },
+    methods:{
+      bindDateChange(e) {
+        this.date = e.target.value ;
+        this.$nextTick(()=>{
+          this.pages = 2 ;
+          axios.all([this.getScoreList(),this.totalIntegral()])
+        })
+      },
+      getDate(type) {
+        const date = new Date();
+        let year = date.getFullYear();
+        let month = date.getMonth() + 1;
+
+        if (type === 'start') {
+          year = year - 60;
+        } else if (type === 'end') {
+          year = year + 2;
+        }
+        month = month > 9 ? month : '0' + month;;
+        return `${year}-${month}`;
+      },
+
+      getScoreList(){
+        if (this.pageNum > this.pages) return
+        this.$http.post(`/app/apppartyintegralmanage/listForWx?size=${this.pageSize}&current=${this.pageNum}&partyId=${this.user.id}&doTime=${this.rewriteDate}`).then(res => {
+          this.scoreList = this.pageNum > 1 ? [...this.scoreList, ...res.data.records] : res.data.records
+          this.pages = Math.ceil(res.data.total / 10);
+        })
+      },
+      totalIntegral(){
+        this.$http.post(`/app/apppartyintegralmanage/totalIntegralForWx`,{
+          partyId:this.user.id,
+          doTime:this.rewriteDate
+        }).then((res)=>{
+          res.data && (this.integral = res.data)
+        })
+      }
+    },
+
+    onReachBottom() {
+      this.pageNum = this.pageNum + 1;
+      this.getScoreList()
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import "../../../common/common.css";
+  .page {
+    width: 100%;
+    background: #F4F5F6;
+    .header{
+      width: 100%;
+      height:104px;
+      background: #FFFFFF;
+      .date{
+        width: 100%;
+        .calendar{
+          width: 224px;
+          height: 56px;
+          background: #F5DFDF;
+          border-radius: 28px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .picker{
+            display: flex;
+            align-items: center;
+          }
+          span{
+            display: inline-block;
+            padding-right: 10px;
+            border-right: 4px solid #E6736E;
+            line-height: 26px;
+            font-size: 28px;
+            font-weight: 800;
+            color: #E6736E;
+            box-sizing: border-box;
+          }
+          .iconfont{
+            display: inline-block;
+            font-size: 36px;
+            color: #E6736E;
+            padding-left: 10px;
+          }
+        }
+        .score-tip{
+          font-size: 32px;
+          font-weight: 500;
+          color: #333333;
+        }
+      }
+    }
+    .score-list{
+      width: 100%;
+      height: 100%;
+      margin-top: 8px;
+      background: #FFFFFF;
+      .item{
+        align-items: center;
+        height: 184px;
+        background: #ffffff;
+        .left{
+          width: 250px;
+          text-align: center;
+          div:nth-child(1){
+            font-size: 30px;
+            font-weight: 500;
+            color: #333333;
+          }
+          div:nth-child(2){
+            font-size: 28px;
+            font-weight: 500;
+            color: #999999;
+          }
+        }
+        .right{
+          display: flex;
+          .rig-cir{
+            position: relative;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            padding: 10px 10px 10px 0;
+            span{
+              display: inline-block;
+              width: 18px;
+              height: 18px;
+              border-radius: 50%;
+              border: 4px solid #EAEBEB;
+              &:after{
+                content: " ";
+                position: absolute;
+                left: 11px;
+                top: 30px;
+                width: 4px;
+                height: calc(100% - 58px);
+                background: #EAEBEB;
+              }
+            }
+          }
+          .rig-conn:nth-child(1){
+            font-size: 34px;
+            font-weight: 600;
+            color: #E6736E;
+            line-height: 64px;
+          }
+          .rig-conn:nth-child(2){
+            width: 452px;
+            word-break: break-all;
+            overflow: hidden;
+            span-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            font-size: 30px;
+            font-weight: 400;
+            color: #333333;
+            line-height: 42px;
+          }
+        }
+      }
+    }
+    .box{
+      box-sizing: border-box;
+      padding: 0 32px;
+    }
+    .line{
+      border-bottom: 2px solid #EEEEEE;
+    }
+  }
+</style>
diff --git a/src/apps/party/partyOrganization/detail.vue b/src/apps/party/partyOrganization/detail.vue
new file mode 100644
index 00000000..b2153c49
--- /dev/null
+++ b/src/apps/party/partyOrganization/detail.vue
@@ -0,0 +1,285 @@
+<template>
+  <div class="detail">
+    <div class="header"></div>
+    <div class="content">
+      <div class="party-org">
+        <div class="title">所在组织</div>
+        <p class="org-select" @click="selectShow = true">{{detail.name || '请选择'}}<img src="https://cdn.cunwuyun.cn/img/down.svg" /></p>
+      </div>
+      <div class="org-info" >
+        <div class="title">组织信息</div>
+        <div class="flex-row">
+          <span class="color-666">组织类型</span>
+          <span class="color-333">{{$dict.getLabel("orgType", detail.orgType)}}</span>
+        </div>
+        <div class="flex-row">
+          <span class="color-666">组织级别</span>
+          <span class="color-333">{{$dict.getLabel("orgPartyType", detail.partyType)}}</span>
+        </div>
+        <div class="flex-row">
+          <span class="color-666">党员人数</span>
+          <span class="color-333">{{count}}人</span>
+        </div>
+      </div>
+      <div class="org-info">
+        <div class="flex-row">
+          <span class="title">报到状态</span>
+          <span :class="userInfo.reportOrgId ? 'status1' : 'status0'">{{userInfo.reportOrgId ? '已报到' : '未报到'}}</span>
+        </div>
+      </div>
+    </div>
+
+    <u-select v-model="selectShow" :list="treeData" @confirm="confirm"></u-select>
+    <u-popup v-model="dialog" mode="center" border-radius="8">
+      <div class="estateNotice">
+        <b>您已加入过党组织,是否变更？</b>
+        <u-gap height="40"/>
+        <div class="curEstate">
+          <div class="flexRow">
+            <b>当前党组织：</b>
+            <span>{{ detail.name}}</span>
+          </div>
+          <div class="flexRow">
+            <b>当前报到状态：</b>
+            <span :class="userInfo.reportOrgId ? 'status1' : 'status0'">{{userInfo.reportOrgId ? '已报到' : '未报到'}}</span>
+          </div>
+          <div class="flexRow">
+            <b>变更党组织：</b>
+            <span>{{changeOrgInfo.label}}</span>
+          </div>
+        </div>
+        <u-gap height="34"/>
+        <div class="alert">变更党组织后需尽快前往新党组织报到</div>
+        <u-gap height="62"/>
+        <div class="flexRow footer">
+          <div class="fill"/>
+          <span @click="dialog=false">取消</span>
+          <span @click="dialog=false,bindEstate()">确认</span>
+        </div>
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detail",
+  data() {
+    return {
+      dialog: false,
+      detail: {},
+      treeData: [],
+      selectShow: false,
+      reportOrgName: '', //报到党组织名称
+      reportOrgId: '',
+      changeOrgInfo: {},
+      userInfo: {},
+      count: 0
+    }
+  },
+  onLoad() {
+    this.$dict.load("orgType", "orgPartyType").then(() => {
+      this.getUserInfo()
+    })
+
+  },
+  methods: {
+    getUserInfo() {
+      this.$http.post("/app/appparty/chanhudetail").then(res => {
+        if (res?.data) {
+          if(res.data.reportOrgId) {
+            this.reportOrgName = res.data.reportOrgName
+            this.reportOrgId = res.data.reportOrgId
+          }else {
+            this.reportOrgName = res.data.partyOrgName
+            this.reportOrgId = res.data.partyOrgId
+          }
+          this.userInfo = res.data
+          this.getDetail()
+          this.getTree()
+        }
+      })
+    },
+    getTree() {
+      this.$http.post(`/admin/partyOrganization/queryAllChildren?id=${this.userInfo.topOrgId}`).then(res => {
+        if (res?.data) {
+          res.data.map((item) => {
+            item.label = item.name
+            item.value = item.id
+          })
+          this.treeData = res.data
+        }
+      })
+    },
+    getDetail() {
+      this.$http.post(`/admin/partyOrganization/detail?id=${this.userInfo.reportOrgId}`).then(res => {
+        if (res?.data) {
+          this.detail = res.data
+          this.count = res.data.memberCount.one || 0
+        }
+      })
+    },
+    confirm(e) {
+      this.treeData.map((item) => {
+        if(item.id == e[0].value) {
+          this.changeOrgInfo = item
+        }
+      })
+      this.dialog = true
+    },
+    bindEstate() {
+      this.$http.post("/app/apppartyreportorgchange/changeReportOrg", {
+        orgId: this.changeOrgInfo.id,
+        orgName: this.changeOrgInfo.name,
+        partyId: this.userInfo.id,
+      }).then(res => {
+        if (res?.code == 0) {
+          this.$toast('党组织变更成功')
+          this.getUserInfo()
+          this.$store.commit("getUserInfo")
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  height: 100%;
+  padding-bottom: 112px;
+  box-sizing: border-box;
+  position: relative;
+
+  .header {
+    height: 160px;
+    background: #E60012;
+  }
+
+  .content{
+    width: 686px;
+    position: absolute;
+    top: 50px;
+    left: 32px;
+    .party-org{
+      padding: 32px;
+      margin-bottom: 16px;
+      background: #FFFFFF;
+      .title{
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 700;
+        color: #333;
+        line-height: 60px;
+      }
+      .org-select{
+        font-size: 30px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #666;
+        line-height: 42px;
+        img{
+          width: 32px;
+          height: 32px;
+          vertical-align: middle;
+          transform:rotate(270deg);
+        }
+      }
+    }
+    .org-info{
+      padding: 0 32px;
+      background: #FFFFFF;
+      margin-bottom: 16px;
+      div{
+        line-height: 100px;
+        font-size: 30px;
+        border-bottom: 2px solid #eee;
+        box-sizing: content-box;
+      }
+      div:nth-last-of-type(1) {
+        border-bottom: 0;
+      }
+      .title{
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 700;
+        color: #333;
+      }
+      .flex-row{
+        display: flex;
+        justify-content: space-between;
+        .color-666{
+          color: #666;
+        }
+        .color-333{
+          color: #333;
+        }
+      }
+      .status0 {
+        color: #FF8822 ;
+      }
+      .status1 {
+        color: #2EA222 ;
+      }
+    }
+
+  }
+
+
+  /deep/ .estateNotice {
+    width: 560px;
+    background: #FFFFFF;
+    padding: 48px;
+    box-sizing: border-box;
+    .status0 {
+      color: #FF8822 ;
+    }
+    .status1 {
+      color: #2EA222 ;
+    }
+    .curEstate {
+      color: #666;
+      font-size: 28px;
+
+      b {
+        color: #333
+      }
+    }
+
+    .alert {
+      font-size: 28px;
+      font-weight: 400;
+      color: #F14242;
+    }
+
+    .footer{
+      span {
+        width: 128px;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        color: #1365DD;
+        font-size: 28px;
+        transform: translateX(32px);
+
+        & + span {
+          margin-left: 16px;
+        }
+      }
+    }
+  }
+
+  .bottomBtn {
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    text-align: center;
+    height: 112px;
+    line-height: 112px;
+    background: #E60012;
+    font-size: 32px;
+    font-weight: 500;
+    color: #FFFFFF;
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/communityList.vue b/src/apps/party/partyReport/communityList.vue
new file mode 100644
index 00000000..93880bae
--- /dev/null
+++ b/src/apps/party/partyReport/communityList.vue
@@ -0,0 +1,488 @@
+<template>
+  <div class="page">
+    <div v-if="isShow" style="height:100%;width:100%">
+      <div class="party_header" v-if="list.length > 0">
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <image src="https://cdn.cunwuyun.cn/img/search-red.svg"/>
+            <span>{{ title || '请输入活动名称或活动地点' }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="party_header" v-if="list.length == 0" style="height: auto;">
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <image src="https://cdn.cunwuyun.cn/img/search-red.svg"/>
+            <span>{{ title || '请输入活动名称或活动地点' }}</span>
+          </div>
+        </div>
+      </div>
+      <div class='slect flex-row'>
+        <div class="uni-list type-slect">
+          <div class="uni-list-cell">
+            <div class="uni-list-cell-db">
+              <picker @change="bindPickerChange" :range="activeTypeArr">
+                <div class="uni-input">{{ actionName }}</div>
+                <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+              </picker>
+            </div>
+          </div>
+        </div>
+        <div class="uni-list type-slect">
+          <div class="uni-list-cell">
+            <div class="uni-list-cell-db">
+              <picker @change="bindStatusChange" :range="applyStatusArr">
+                <div class="uni-input">{{ signupName }}</div>
+                <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
+              </picker>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="list_content" v-if="list.length > 0">
+        <ul class="list_div">
+          <li v-for="(e,index) in list" :key="index">
+            <div class="up" @click="goToDetail(e)">
+              <h3>{{ e.title }}</h3>
+              <div class="info">
+                <span>活动时间：</span>
+                <p>{{ e.beginTime|timeVal }}至<br/>{{ e.endTime|timeVal }}</p>
+              </div>
+              <div class="info">
+                <span>活动地点：</span>
+                <p>{{ e.address }}</p>
+              </div>
+            </div>
+            <div class="btn">
+              <div class="button callBtn"
+                    :class="{color4:e.actionStatus==0,color5:e.actionStatus==1&&e.signupStatus==1 || e.actionStatus==2&&e.signupStatus==1}"
+                    @click="handlerCall(e)" v-if="e.nowUsersignupStatus">
+                <span>呼叫联系人</span>
+              </div>
+              <div class="button" :class="{color4:e.nowUsersignupStatus==null,color5:e.nowUsersignupStatus==1}"
+                    v-if="e.nowUsersignupStatus==null&&e.actionStatus!=2&&e.signupStatus==0">
+                <span @click="signUp(e)">去报名</span>
+              </div>
+              <div class="button color4"
+                    v-if="e.nowUsersignupStatus && e.signupContent==null && e.signupStatus==1 && ['1','2'].includes(e.actionStatus)">
+                <span @click="goToLog(e)">填写日志</span>
+              </div>
+              <div class="button color4"
+                    v-if="e.nowUsersignupStatus && e.signupContent && e.signupStatus==1 && ['1','2'].includes(e.actionStatus)">
+                <span @click="goToLog(e)">编辑日志</span>
+              </div>
+            </div>
+            <p class="tip" :class="{color1:e.actionStatus==0,color2:e.actionStatus==1,color3:e.actionStatus==2}">
+              <span v-if="e.actionStatus==0">未开始</span>
+              <span v-if="e.actionStatus==1">进行中</span>
+              <span v-if="e.actionStatus==2">已结束</span>
+            </p>
+          </li>
+        </ul>
+      </div>
+      <AiEmpty v-if="list.length==0" />
+
+    </div>
+    <div v-if="!isShow" class="search-input">
+      <div class="input-box flex-row">
+        <input type="span" class="input" placeholder="请输入活动名称或活动地点" focus="false" v-model="title"/>
+        <image class="sousuo" src="https://cdn.cunwuyun.cn/img/search-active.svg"/>
+        <image v-if="title" @tap="clearInput" class="clear" src="https://cdn.cunwuyun.cn/img/empty-Input.svg"/>
+        <div class="search-word" @click="getList()">搜索</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import mixins from "@/pages/party/partyReport/mixins/mixin";
+import {mapState} from 'vuex'
+
+export default {
+  name: "partyReportList",
+  mixins: [mixins],
+  computed: {
+    ...mapState(['user']),
+  },
+  data() {
+    return {
+      navId: 0,
+      list: [],
+      title: '',
+      isShow: true,
+      applyStatusArr: [],
+      activeTypeArr: [],
+      actionStatus: '',
+      signupStatus: '',
+      actionName: '活动状态',
+      signupName: '报名状态'
+
+    }
+  },
+  filters: {
+    timeVal(val) {
+      if (val) {
+        return val.substring(0, 16)
+      }
+    }
+  },
+  onLoad(options) {
+    this.navId = options.id;
+    this.$dict.load('partyReportActionStatus', 'partyReportSignupStatus');
+    this.$dict.getDict('partyReportActionStatus').map(i => {
+      this.activeTypeArr.push(i.dictName)
+    });
+    this.$dict.getDict('partyReportSignupStatus').map(i => {
+      this.applyStatusArr.push(i.dictName)
+    })
+    this.getList();
+  },
+  onShow() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/apppartyreport/list-xcx?listType=${this.navId}&partyId=${this.user.id}&partyOrgId=${this.user.partyOrgId}&title=${this.title}&actionStatus=${this.actionStatus}&signupStatus=${this.signupStatus}&size=${10000}`, null, {}).then(res => {
+        if (res.code == 0) {
+          if (res.data.records == null) {
+            this.list = [];
+          } else {
+            this.list = res.data.records;
+          }
+          this.isShow = true;
+        } else {
+
+        }
+      }).catch(err => {
+
+      })
+    },
+    changeSearchBox() {
+      this.isShow = false
+    },
+    clearInput() {
+      this.title = ''
+    },
+    bindPickerChange(e) {
+      this.actionName = this.activeTypeArr[Number(e.detail.value)];
+      this.actionStatus = e.detail.value;
+      this.getList();
+    },
+    bindStatusChange(e) {
+      this.signupName = this.applyStatusArr[Number(e.detail.value)];
+      this.signupStatus = e.detail.value;
+      this.getList();
+    },
+    goToDetail(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/partyDetail?id=${e.id}&listType=${this.navId}`
+      })
+    },
+    signUp(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/signUp?reportId=${e.id}`
+      })
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+
+  .slect {
+    width: 100%;
+    height: 96px;
+    background-color: #fff;
+    color: #666;
+
+    .type-slect {
+      width: 50%;
+      border-right: 1px solid #F7F7F7;
+      margin: 30px 0;
+      box-sizing: border-box;
+      text-align: center;
+      font-size: 26px;
+
+      .uni-input {
+        display: inline-block;
+      }
+
+      image {
+        width: 32px;
+        height: 32px;
+        display: inline-block;
+        position: relative;
+        top: 6px;
+        margin-left: 8px;
+      }
+    }
+
+    .type-slect:nth-child(2) {
+      border: none;
+    }
+  }
+
+  .party_header {
+    background: #E60012;
+
+    .search-box {
+      width: 100%;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      background: #E60012;
+
+      .search-input {
+        line-height: 64px;
+        width: 100%;
+        height: 100%;
+        border-radius: 32px;
+        background: #CE0010;
+        color: #fff;
+        font-size: 26px;
+
+        span {
+          white-space: nowrap;
+          overflow: hidden;
+          color: #fff;
+          span-overflow: ellipsis;
+        }
+
+        image {
+          width: 40px;
+          height: 40px;
+          margin: 8px 8px 8px 24px;
+          position: relative;
+          top: 6px;
+        }
+      }
+    }
+  }
+
+  .search-input {
+    .input-box {
+      width: 100%;
+      height: 112px;
+      background-color: #fff;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      position: relative;
+
+      .sousuo {
+        position: absolute;
+        top: 35px;
+        left: 60px;
+        width: 40px;
+        height: 40px;
+      }
+
+      .input {
+        background-color: #F3F3F3;
+        width: 598px;
+        height: 64px;
+        color: #999999;
+        font-size: 26px;
+        margin-left: 8px;
+        border-radius: 32px;
+        padding-left: 70px;
+        padding-right: 60px;
+        box-sizing: border-box;
+      }
+
+      .clear {
+        width: 32px;
+        height: 32px;
+        position: absolute;
+        top: 40px;
+        right: 130px;
+        z-index: 10;
+      }
+
+      .search-word {
+        font-size: 28px;
+        color: #135AB8;
+        line-height: 60px;
+        margin-left: 20px;
+      }
+    }
+  }
+
+  .list_content {
+    width: calc(100% - 64rpx);
+    height: calc(100% - 260rpx);
+    padding: 32px 32px 0 32px;
+    overflow: auto;
+
+    .list_div {
+      width: 100%;
+      height: 100%;
+
+      li {
+        width: 100%;
+        height: 426px;
+        background-color: #fff;
+        border-radius: 4px;
+        margin-bottom: 32px;
+        position: relative;
+        overflow: hidden;
+
+        .up {
+          height: 330px;
+          width: 100%;
+          padding: 32px;
+          box-sizing: border-box;
+          border-bottom: 2px solid #eeeeee;
+
+          h3 {
+            color: #333333;
+            font-size: 32px;
+            font-weight: bold;
+            width: 90%;
+            word-break: break-all;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            overflow: hidden;
+            span-overflow: ellipsis;
+            -webkit-box-orient: vertical;
+          }
+
+          .info {
+            width: 100%;
+            display: flex;
+            font-size: 30px;
+            margin-top: 32px;
+
+            span {
+              width: 150px;
+              color: rgba(153, 153, 153, 1);
+            }
+
+            p {
+              flex: 1;
+              color: #343D65;
+              word-break: break-all;
+              display: -webkit-box;
+              -webkit-line-clamp: 2;
+              overflow: hidden;
+              span-overflow: ellipsis;
+              -webkit-box-orient: vertical;
+            }
+
+          }
+
+        }
+
+        .btn {
+          height: 96px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          padding: 0 32px;
+          box-sizing: border-box;
+
+          .button {
+            width: 152px;
+            height: 56px;
+            border-radius: 28px;
+            color: #1365DD;
+            text-align: center;
+            line-height: 56px;
+            font-size: 28px;
+            margin-left: 16px;
+            border: 2px solid rgba(19, 101, 221, 1);
+          }
+
+          .callBtn {
+            width: 196px !important;
+            margin-left: 0 !important;
+          }
+
+          .color4 {
+            color: #1365DD;
+            border: 2px solid rgba(19, 101, 221, 1);
+          }
+
+          .color5 {
+            color: #606060;
+            border: 2px solid #E1E1E1;
+          }
+        }
+
+        .tip {
+          position: absolute;
+          width: 200px;
+          height: 56px;
+          text-align: center;
+          line-height: 56px;
+          right: -50rpx;
+          -webkit-transform: rotate(45deg);
+          -ms-transform: rotate(45deg);
+          transform: rotate(45deg);
+
+          top: 20px;
+
+          &.color1 {
+            color: #ff8822;
+            background-color: #FFF3E9;
+          }
+
+          &.color2 {
+            color: #5A98F2;
+            background-color: #EEF5FF;
+          }
+
+          &.color3 {
+            color: #999999;
+            background-color: #F2F2F2;
+          }
+
+        }
+
+
+      }
+    }
+  }
+
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .footer {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 104px;
+    background: rgba(255, 228, 221, 1);
+    color: #D73D3D;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 32px;
+
+    p {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &.active {
+        background-color: #D73D3D;
+        color: #ffffff;
+      }
+    }
+
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/fillLog.vue b/src/apps/party/partyReport/fillLog.vue
new file mode 100644
index 00000000..409b9db8
--- /dev/null
+++ b/src/apps/party/partyReport/fillLog.vue
@@ -0,0 +1,436 @@
+<template>
+  <div class="page">
+    <header></header>
+    <div class="form">
+      <div class="main">
+        <div class="textarea">
+          <div class="color-333"><span class="color-red">*</span>活动总结</div>
+          <textarea
+            type="textarea"
+            placeholder="填写本次活动参与心得体会（200字以内）"
+            v-model="baseInfo.content"
+            adjust-position="false"
+            maxlength="200"
+          ></textarea>
+        </div>
+        <div class="uni-uploader">
+          <div class="title-box title-box-margin">
+            <span class="title">活动照片（最多9张）</span>
+          </div>
+          <div class="uni-uploader-body">
+            <div class="uni-uploader__files">
+              <div v-for="(image, index) in imageList" :key="index">
+                <div class="uni-uploader__file">
+                  <image
+                    class="uni-uploader__img"
+                    :src="image.url"
+                    :data-index="index"
+                    @tap="previewImage(index)"
+                  ></image>
+                  <AiUniIcon
+                    type="clear"
+                    class="icon"
+                    color="#8f8f94"
+                    size="20"
+                    @click="deleteImage(index)"
+                  ></AiUniIcon>
+                </div>
+              </div>
+              <div
+                class="pre-div"
+                @tap="chooseImageType"
+                v-if="imageList.length < 9"
+              >
+                <span class="pre-label">+</span>
+                <span class="add-image">添加照片</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="report" @click="report()">提交</div>
+  </div>
+</template>
+
+<script>
+import axios from "@/utils/axios.js";
+export default {
+  name: "fillLog",
+  data() {
+    return {
+      reportId: "",
+      baseInfo: {
+        content: "",
+        fileIds: [],
+        reportId: "",
+        id: "",
+      },
+      imageList: [],
+      sourceTypeIndex: 2,
+      sourceType: [
+        // 图片来源类型
+        ["camera"],
+        ["album"],
+      ],
+    };
+  },
+  onLoad(options) {
+    this.baseInfo.reportId = options.reportId;
+    this.baseInfo.id = options.signupId;
+    options.signupContent ? this.logReport() : null;
+  },
+  methods: {
+    // 选择照片类型
+    chooseImageType() {
+      let that = this;
+      uni.showActionSheet({
+        itemList: ["拍照", "从相册选择"],
+        success: function (res) {
+          that.sourceTypeIndex = res.tapIndex;
+          that.chooseImage();
+        },
+      });
+    },
+    showModel(title) {
+      uni.showModal({
+        title: "温馨提示",
+        content: title,
+        showCancel: false,
+        confirmColor: "#135AB8",
+      });
+    },
+    chooseImage () {
+      let params = {
+        count: 9,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          let count = this.fileList?.length + (res.tempFiles?.length || res.tempFile ? 1 : 0)
+          if (count > 9) {
+            return this.$u.toast(`不能超过9个`)
+          }
+          if (res.tempFiles) {
+            res.tempFiles.map((item, index) => {
+              this.uploadFile(item, index)
+            })
+          }
+        }
+      }
+      uni.chooseImage(params)
+    },
+
+    uploadFile (img, index) {
+      uni.showLoading({title: '上传中'})
+      let formData = new FormData()
+      formData.append('file', img)
+      this.$http.post('/admin/file/add', formData).then((res) => {
+        uni.hideLoading()
+        if (res?.data) {
+          this.$u.toast('上传成功!')
+          console.log(res.data)
+          this.imageList.push({
+            id: res.data[0].split(';')[1],
+            url: res.data[0].split(';')[0]
+          })
+
+          console.log(this.imageList)
+        }
+      }).catch(res => {
+        this.$u.toast(res)
+        uni.hideLoading()
+      })
+    },
+    // chooseImage: async function () {
+    //   let that = this;
+    //   if (that.imageList.length === 9) {
+    //     let isContinue = await that.isFullImg();
+    //     if (!isContinue) {
+    //       return;
+    //     }
+    //   }
+    //   uni.chooseImage({
+    //     // 从相册选择或相机拍摄
+    //     sourceType: that.sourceType[that.sourceTypeIndex],
+    //     // 最多可以选择的图片数量
+    //     count: 9,
+    //     success: (res) => {
+    //       // 图片的本地文件路径列表
+    //       that.tempFilePaths = res.tempFilePaths;
+    //       console.log(res.tempFilePaths)
+    //       for (let i = 0; i < that.tempFilePaths.length; i++) {
+    //         let str = "";
+    //         let token = uni.getStorageSync("token");
+    //         // console.log('token',token)
+    //         let params = {
+    //           token: token,
+    //         };
+    //         // url String 是 开发者服务器 url
+    //         // files Aarry 否 需要上传的文件列表。使用 files 时，filePath 和 name 不生效。 5+App
+    //         // filePath String 是 要上传文件资源的路径。
+    //         // name String 是 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
+    //         // header Object 否 HTTP 请求 Header, header 中不能设置 Referer
+    //         // formData Object 否 HTTP 请求中其他额外的 form data
+    //         // success Function 否 接口调用成功的回调函数
+    //         // fail Function 否 接口调用失败的回调函数
+    //         // complete Function 否 接口调用结束的回调函数（调用成功、失败都会执行）
+    //         let formData = new FormData()
+    //         formData.append('file', that.tempFilePaths[i])
+    //         that.$http.post('/admin/file/add2', formData).then((res) => {
+    //           if(res.data) {
+    //             str = JSON.stringify(JSON.parse(res.data).data[0]).replace(
+    //               /\"/g,
+    //               ""
+    //             );
+    //             var temp = {
+    //               fileId: str.split(";")[1],
+    //               accessUrl: str.split(";")[0],
+    //             };
+    //             that.imageList = that.imageList.concat(temp);
+    //             if (that.imageList.length > 9) {
+    //               that.imageList = that.imageList.slice(0, 9);
+    //               uni.showToast({
+    //                 title: "图片最多只能上传9张",
+    //                 icon: "none",
+    //               });
+    //             }
+    //             that.imgUrl = JSON.stringify(that.imageList);
+    //           }
+    //         });
+    //       }
+    //     },
+    //   });
+    // },
+    // 预览图片(大图预览)
+    previewImage(index) {
+      var tempList = [];
+      for (var i in this.imageList) {
+        tempList.push(this.imageList[i].url);
+      }
+
+      uni.previewImage({
+        // 当前图片的索引、链接
+        current: index,
+        urls: tempList
+      });
+    },
+    // 删除照片
+    deleteImage(index) {
+      this.imageList.splice(index, 1);
+    },
+    report() {
+      let arr = [];
+      if (!this.baseInfo.content) {
+        this.showModel("请填写活动总结");
+        return false;
+      }
+      this.imageList.map((e) => {
+        arr.push(e.id);
+      });
+      this.baseInfo.fileIds = arr;
+      this.$http
+        .post(`/app/apppartyreport/log-add`, this.baseInfo, null)
+        .then((res) => {
+          if (res.code == 0) {
+            uni.showToast({
+              title: "提交",
+              icon: "success",
+              duration: 2000,
+            });
+            uni.navigateBack({
+              delta: 1,
+            });
+          }
+        })
+        .catch((err) => {
+          uni.showToast({
+            title: err,
+            icon: "none",
+            duration: 1000,
+          });
+        });
+    },
+
+    logReport() {
+      const userInfo = uni.getStorageSync("userInfo");
+      this.$http
+        .post(
+          `/app/apppartyreport/log-report?partyId=${userInfo.id}&reportId=${this.baseInfo.reportId}`
+        )
+        .then((res) => {
+          if (res.code == 0 && res.data) {
+            this.baseInfo.content = res.data.content;
+            this.baseInfo.fileIds = res.data.fileIds;
+            res.data.files.map((e) => {
+              this.imageList.push({ url: e.accessUrl, id: e.id });
+            });
+          }
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+.page {
+  width: 100%;
+  height: 100%;
+  header {
+    width: 100%;
+    height: 112rpx;
+    background-color: #e60012;
+  }
+  .form {
+    width: 100%;
+    padding: 32rpx;
+    box-sizing: border-box;
+    margin-top: -100rpx;
+    .main {
+      background-color: #fff;
+      border-radius: 8rpx;
+      padding: 16rpx;
+      box-sizing: border-box;
+    }
+    .basic-item {
+      font-size: 32rpx;
+      justify-content: space-between;
+      width: 100%;
+      height: 112rpx;
+      padding: 32rpx 32rpx 32rpx 12rpx;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-bottom: 1rpx solid #eee;
+      input {
+        text-align: right;
+      }
+      .wid-110 {
+        width: 214rpx;
+      }
+      .skill-span {
+        max-width: 432rpx;
+        text-align: right;
+        display: inline-block;
+        overflow: hidden;
+        span-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 30rpx;
+      }
+      .picker {
+        justify-content: flex-end;
+        align-items: center;
+        color: #999999;
+        font-size: 32rpx;
+        background-color: #ffffff;
+      }
+      .picker > .AiArea {
+        background-color: #fff !important;
+      }
+      .image {
+        width: 32rpx;
+        height: 32rpx;
+        vertical-align: middle;
+      }
+      .wei-span {
+        width: 40%;
+      }
+      .msg-value {
+        width: 60%;
+      }
+      .msg-btn {
+        width: 160px;
+        text-align: right;
+        background-color: #fff !important;
+      }
+
+      button {
+        font-size: 28rpx;
+        background-color: #fff;
+        line-height: 48rpx;
+        padding: 0;
+      }
+
+      button::after {
+        border: 0;
+      }
+
+      .button-hover {
+        background-color: #fff;
+      }
+
+      button[disabled] {
+        background-color: #fff !important;
+        font-size: 28rpx;
+        border-radius: 0;
+      }
+    }
+    /* 上传照片 */
+    .uni-uploader {
+      flex: 1;
+      flex-direction: column;
+    }
+    .uni-uploader-head {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+    }
+    .uni-uploader-info {
+      color: #b2b2b2;
+    }
+    .uni-uploader-body {
+      margin-top: 16rpx;
+    }
+    .uni-uploader__files {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+    }
+    .uni-uploader__file {
+      margin-right: 7rpx;
+      margin-bottom: 20rpx;
+      width: 160rpx;
+      height: 160rpx;
+      position: relative;
+    }
+    .uni-uploader__img {
+      display: block;
+      width: 160rpx;
+      height: 160rpx;
+    }
+    .pre-label {
+      font-size: 80rpx;
+      color: #dddddd;
+    }
+    .add-image {
+      color: #dddddd;
+      font-size: 24rpx;
+    }
+    .pre-div {
+      width: 160rpx;
+      height: 160rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      align-items: center;
+      border-radius: 8rpx;
+      border: 2rpx solid #dddddd;
+    }
+    .icon {
+      position: absolute;
+      top: -15rpx;
+      right: -10rpx;
+    }
+  }
+  .report {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 112rpx;
+    line-height: 112rpx;
+    font-size: 32rpx;
+    text-align: center;
+    background: rgba(230, 0, 18, 1);
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/list.vue b/src/apps/party/partyReport/list.vue
new file mode 100644
index 00000000..34f6cdf2
--- /dev/null
+++ b/src/apps/party/partyReport/list.vue
@@ -0,0 +1,373 @@
+<template>
+  <div class="page">
+    <ul class="nav_bar">
+      <li v-for="(e,index) in navList" :key="index" :class="{active:navId==e.id}" @click="getList(e.id)">{{ e.name }}
+      </li>
+    </ul>
+    <div class="list_content" v-if="list.length>0">
+      <ul class="list_div">
+        <li v-for="(e,index) in list" :key="index">
+          <div class="up" @click="goToDetail(e)">
+            <h3>{{ e.title }}</h3>
+            <div class="info">
+              <span>活动时间：</span>
+              <p>{{ e.beginTime|timeVal }}至<br/>{{ e.endTime|timeVal }}</p>
+            </div>
+            <div class="info">
+              <span>活动地点：</span>
+              <span class="address">{{ e.address }}</span>
+            </div>
+          </div>
+          <div class="btn">
+            <div class="button" :class="{color4:e.nowUsersignupStatus==null,color5:e.nowUsersignupStatus==1}"
+                  v-if="e.nowUsersignupStatus==null&&e.actionStatus!=2&&e.signupStatus==0">
+              <span @click="signUp(e)">去报名</span>
+            </div>
+            <div class="button callBtn"
+                  :class="{color4:e.actionStatus==0,color5:e.actionStatus==1&&e.signupStatus==1 || e.actionStatus==2&&e.signupStatus==1}"
+                  v-if="navId==1" @click="handlerCall(e)">
+              <span>呼叫联系人</span>
+            </div>
+            <div class="button color4"
+                  v-if="navId==1 && e.nowUsersignupStatus && e.signupContent==null && e.signupStatus==1 && ['1','2'].includes(e.actionStatus)">
+              <span @click="goToLog(e)">填写日志</span>
+            </div>
+            <div class="button color4"
+                  v-if="navId==1 && e.nowUsersignupStatus && e.signupContent && e.signupStatus==1 && ['1','2'].includes(e.actionStatus)">
+              <span @click="goToLog(e)">编辑日志</span>
+            </div>
+          </div>
+          <p class="tip" :class="{color1:e.actionStatus==0,color2:e.actionStatus==1,color3:e.actionStatus==2}">
+            <span v-if="e.actionStatus==0">未开始</span>
+            <span v-if="e.actionStatus==1">进行中</span>
+            <span v-if="e.actionStatus==2">已结束</span>
+          </p>
+        </li>
+      </ul>
+    </div>
+    <AiEmpty v-if="list.length==0"/>
+    <div class="footer">
+      <p v-for="(e,index) in footerList" :key="index" :class="{active:navId==e.id}" @click="goToList(e.id)">
+        <image src="https://cdn.cunwuyun.cn/img/party_detail.png" v-if='e.id==2'></image>
+        <image src="https://cdn.cunwuyun.cn/img/party_now_reg.png" v-if='e.id==3'></image>
+        <span>{{ e.name }}</span>
+      </p>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import mixins from "@/pages/party/partyReport/mixins/mixin";
+import {mapState} from 'vuex'
+
+export default {
+  name: "partyReportList",
+  mixins: [mixins],
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      navList: [
+        {name: "可报名的活动", id: 0},
+        {name: "我的活动日程", id: 1}
+      ],
+      footerList: [
+        {name: "社区活动列表", id: 2},
+        {name: "我的活动记录", id: 3}
+      ],
+      navId: 0,
+      list: [],
+    }
+  },
+  filters: {
+    timeVal(val) {
+      if (val) {
+        return val.substring(0, 16)
+      }
+    }
+  },
+  onLoad() {
+    this.getList(0)
+  },
+  onShow() {
+    this.getList(this.navId);
+  },
+  methods: {
+    getList(id) {
+      this.navId = id;
+      this.list = [];
+      this.$http.post(`/app/apppartyreport/list-xcx?listType=${id}&partyId=${this.user.id}&partyOrgId=${this.user.reportOrgId}&size=${10000}`).then(res => {
+        if (res.code == 0) {
+          if (res.data.records == null) {
+            this.list = [];
+          } else {
+            this.list = res.data.records;
+          }
+        }
+      })
+    },
+    goToList(id) {
+      if (id == 2) {
+
+        uni.navigateTo({
+          url: `/pages/party/partyReport/communityList?id=${id}`
+        })
+      } else if (id == 3) {
+        uni.navigateTo({
+          url: `/pages/party/partyReport/myList?id=${id}`
+        })
+      }
+    },
+    goToDetail(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/partyDetail?id=${e.id}&listType=${this.navId}`
+      })
+    },
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+
+  .nav_bar {
+    width: 100%;
+    height: 112px;
+    background: #E60012;
+
+    li {
+      width: 50%;
+      float: left;
+      height: 90px;
+      line-height: 90px;
+      text-align: center;
+      color: #fff;
+      font-size: 28px;
+      opacity: 0.8;
+      position: relative;
+
+      &:after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 4px;
+        width: 40px;
+        background-color: transparent;
+
+      }
+
+    }
+
+    li.active {
+      opacity: 1;
+
+      &:after {
+        background-color: #fff;
+
+      }
+    }
+  }
+
+  .list_content {
+    width: calc(100% - 64px);
+    height: calc(100% - 284px);
+    padding: 32px;
+    overflow: auto;
+
+    .list_div {
+      width: 100%;
+      height: 100%;
+      padding: 0 0 400px 0;
+
+      li {
+        width: 100%;
+        height: 446px;
+        background-color: #fff;
+        border-radius: 4px;
+        margin-bottom: 32px;
+        position: relative;
+        overflow: hidden;
+
+        .up {
+          height: 330px;
+          width: 100%;
+          padding: 32px;
+          word-break: break-all;
+          box-sizing: border-box;
+          border-bottom: 2px solid #eeeeee;
+
+          h3 {
+            color: #333333;
+            font-size: 32px;
+            font-weight: bold;
+            width: 90%;
+            display: -webkit-box;
+            word-break: break-all;
+            -webkit-line-clamp: 1;
+            overflow: hidden;
+            span-overflow: ellipsis;
+            -webkit-box-orient: vertical;
+          }
+
+          .info {
+            width: 100%;
+            display: flex;
+            font-size: 30px;
+            margin-top: 32px;
+
+            span {
+              width: 150px;
+              color: rgba(153, 153, 153, 1);
+            }
+
+            p {
+              flex: 1;
+              color: #343D65;
+              word-break: break-all;
+              display: -webkit-box;
+              -webkit-line-clamp: 2;
+              overflow: hidden;
+              span-overflow: ellipsis;
+              -webkit-box-orient: vertical;
+            }
+
+            .address {
+              width: 320px;
+            }
+          }
+
+          .endTime {
+            box-sizing: border-box;
+            padding-left: 150px;
+            font-size: 30px;
+            color: #343D65;
+          }
+        }
+
+        .btn {
+          height: 118px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          padding: 0 32px;
+          box-sizing: border-box;
+
+          .button {
+            width: 152px;
+            height: 56px;
+            border-radius: 28px;
+            color: #1365DD;
+            text-align: center;
+            line-height: 56px;
+            margin-left: 16px;
+            font-size: 28px;
+            border: 2px solid rgba(19, 101, 221, 1);
+          }
+
+          .callBtn {
+            width: 196px !important;
+            margin-left: 0 !important;
+          }
+
+          .color4 {
+            color: #1365DD;
+            border: 2px solid rgba(19, 101, 221, 1);
+          }
+
+          .color5 {
+            color: #606060;
+            border: 2px solid #E1E1E1;
+          }
+        }
+
+        .tip {
+          position: absolute;
+          width: 200px;
+          height: 56px;
+          text-align: center;
+          line-height: 56px;
+          right: -50px;
+          -webkit-transform: rotate(45deg);
+          -ms-transform: rotate(45deg);
+          transform: rotate(45deg);
+
+          top: 20px;
+
+          &.color1 {
+            color: #ff8822;
+            background-color: #FFF3E9;
+          }
+
+          &.color2 {
+            color: #5A98F2;
+            background-color: #EEF5FF;
+          }
+
+          &.color3 {
+            color: #999999;
+            background-color: #F2F2F2;
+          }
+
+        }
+
+
+      }
+    }
+  }
+
+  .footer {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 104px;
+    background: rgba(255, 228, 221, 1);
+    color: #D73D3D;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 32px;
+
+    image {
+      width: 32px;
+      height: 32px;
+    }
+
+    p {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &.active {
+        background-color: #D73D3D;
+        color: #ffffff;
+      }
+    }
+
+    p:nth-child(1) {
+      border-right: 2px solid rgb(241, 178, 178);
+      box-sizing: border-box;
+    }
+
+    p:nth-child(2) {
+      background-color: #FE5A49;
+      box-sizing: border-box;
+      color: #fff;
+    }
+
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/mixins/mixin.js b/src/apps/party/partyReport/mixins/mixin.js
new file mode 100644
index 00000000..e8cdb497
--- /dev/null
+++ b/src/apps/party/partyReport/mixins/mixin.js
@@ -0,0 +1,36 @@
+export default {
+  methods:{
+    handlerCall({contactPerson,contactPhone}){
+      uni.showModal({
+        title:contactPerson,
+        content:contactPhone,
+        confirmspan:"拨打",
+        cancelspan:"复制",
+        confirmColor:"#135AB8",
+        success(res){
+          if (res.confirm) {
+            uni.makePhoneCall({
+              phoneNumber: contactPhone
+            });
+          } else if (res.cancel) {
+            // uni.setClipboardData({
+            //   data:contactPhone,
+            // })
+          }
+        }
+      })
+    },
+
+    goToLog(e){
+      uni.navigateTo({
+        url:`/pages/party/partyReport/fillLog?reportId=${e.id}&signupId=${e.signupId}&signupContent=${e.signupContent}`
+      })
+    },
+
+    signUp(e){
+      uni.navigateTo({
+        url:`/pages/party/partyReport/signUp?reportId=${e.id}`
+      })
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/apps/party/partyReport/myList.vue b/src/apps/party/partyReport/myList.vue
new file mode 100644
index 00000000..5be37cf6
--- /dev/null
+++ b/src/apps/party/partyReport/myList.vue
@@ -0,0 +1,495 @@
+<template>
+  <div class="page">
+    <div v-if="isShow" style="height:100%;width:100%">
+      <ul class="nav_bar">
+        <li v-for="(e,index) in navList" :key="index" :class="{active:navId==e.id}" @click="navClick(e.id)">
+          <span>{{ e.name }}</span>
+          <span v-if="e.id==4">({{ total }})</span>
+        </li>
+      </ul>
+      <div class="party_header" v-if="list.length > 0">
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <image src="https://cdn.cunwuyun.cn/img/search-red.svg"/>
+            <span>{{ title || '请输入活动名称或活动地点' }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="party_header" v-if="list.length == 0" style="height: auto;">
+        <div class="search-box">
+          <div class="search-input flex-row" @click="changeSearchBox">
+            <image src="https://cdn.cunwuyun.cn/img/search-red.svg"/>
+            <span>{{ title || '请输入活动名称或活动地点' }}</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="list_content" v-if="list.length > 0">
+        <ul class="list_div">
+          <li v-for="(e,index) in list" :key="index">
+            <div class="up" @click="goToDetail(e)">
+              <h3>{{ e.title }}</h3>
+              <div class="info">
+                <span>活动时间：</span>
+                <p>{{ e.beginTime }}至<br/>{{ e.endTime }}</p>
+              </div>
+              <div class="info">
+                <span>活动地点：</span>
+                <p>{{ e.address }}</p>
+              </div>
+            </div>
+            <div class="btn">
+              <div class="button callBtn"
+                    :class="{color4:e.actionStatus==0,color5:e.actionStatus==1&&e.signupStatus==1 || e.actionStatus==2&&e.signupStatus==1}"
+                    @click="handlerCall(e)">
+                <span>呼叫联系人</span>
+              </div>
+              <div class="button color4"
+                    v-if="e.logStatus==0 && e.nowUsersignupStatus==1 && ['1','2'].includes(e.actionStatus)">
+                <span @click="goToLog(e)">填写日志</span>
+              </div>
+              <div class="button color4"
+                    v-if="['1','3'].includes(e.logStatus)&& e.nowUsersignupStatus==1 && ['1','2'].includes(e.actionStatus)">
+                <span @click="goToLog(e)">编辑日志</span>
+              </div>
+            </div>
+            <p class="tip" :class="{color1:e.actionStatus==0,color2:e.actionStatus==1,color3:e.actionStatus==2}">
+              <span v-if="e.actionStatus==0">未开始</span>
+              <span v-if="e.actionStatus==1">进行中</span>
+              <span v-if="e.actionStatus==2">已结束</span>
+            </p>
+          </li>
+        </ul>
+      </div>
+      <AiEmpty v-if="list.length==0" />
+    </div>
+    <div v-if="!isShow" class="search-input">
+      <div class="input-box flex-row">
+        <input type="span" class="input" placeholder="请输入活动名称或活动地点" focus="false" v-model="title"/>
+        <image class="sousuo" src="https://cdn.cunwuyun.cn/img/search-active.svg"/>
+        <image v-if="title" @tap="clearInput" class="clear" src="https://cdn.cunwuyun.cn/img/empty-Input.svg"/>
+        <div class="search-word" @click="getList()">搜索</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import mixins from "@/pages/party/partyReport/mixins/mixin";
+import {mapState} from 'vuex'
+
+export default {
+  name: "partyReportList",
+  mixins: [mixins],
+  data() {
+    return {
+      navId: 0,
+      list: [],
+      title: '',
+      isShow: true,
+      applyStatusArr: [],
+      activeTypeArr: [],
+      actionStatus: '',
+      signupStatus: '',
+      navList: [
+        {name: "全部活动", id: 3},
+        {name: "日志未提交", id: 4}
+      ],
+      total: 0
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  onLoad(options) {
+    this.navId = options.id;
+    this.$dict.load('partyReportActionStatus', 'partyReportSignupStatus').then(() => {
+      this.$dict.getDict('partyReportActionStatus').map(i => {
+        this.activeTypeArr.push(i.dictName)
+      });
+      this.$dict.getDict('partyReportSignupStatus').map(i => {
+        this.applyStatusArr.push(i.dictName)
+      })
+    });
+    this.getList();
+    this.getToatal();
+  },
+  filters: {
+    timeVal(val) {
+      if (val) {
+        return val.substring(0, 16)
+      }
+    }
+  },
+  onShow() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/apppartyreport/list-xcx?listType=${this.navId}&partyId=${this.user.id}&partyOrgId=${this.user.partyOrgId}&title=${this.title}&size=${10000}`, null, {}).then(res => {
+        if (res.code == 0) {
+          if (res.data.records == null) {
+            this.list = [];
+          } else {
+            this.list = res.data.records;
+            if (this.navId == 4) {
+              this.total = res.data.total;
+            }
+          }
+          this.isShow = true;
+        } else {
+
+        }
+      }).catch(err => {
+
+      })
+    },
+    getToatal() {
+      this.$http.post(`/app/apppartyreport/list-xcx?listType=4&partyId=${this.user.id}&partyOrgId=${this.user.partyOrgId}&title=${this.title}&size=${10000}`, null, {}).then(res => {
+        if (res.code == 0) {
+          if (res.data.records == null) {
+            this.total = 0
+          } else {
+            this.total = res.data.total;
+          }
+        } else {
+
+        }
+      }).catch(err => {
+
+      })
+    },
+    changeSearchBox() {
+      this.isShow = false
+    },
+    clearInput() {
+      this.title = ''
+    },
+    bindPickerChange(e) {
+      this.actionStatus = e.detail.value;
+      this.getList();
+    },
+    bindStatusChange(e) {
+      this.signupStatus = e.detail.value;
+      this.getList();
+    },
+    navClick(id) {
+      this.navId = id;
+      this.getList();
+    },
+    goToDetail(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/partyDetail?id=${e.id}&listType=${this.navId}`
+      })
+    },
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+@import "../../../common/style.scss";
+
+.page {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+
+  .party_header {
+    background: #E60012;
+
+    .search-box {
+      width: 100%;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      background: #E60012;
+
+      .search-input {
+        line-height: 64px;
+        width: 100%;
+        height: 100%;
+        border-radius: 32px;
+        background: #CE0010;
+        color: #fff;
+        font-size: 26px;
+
+        span {
+          white-space: nowrap;
+          overflow: hidden;
+          color: #fff;
+          span-overflow: ellipsis;
+        }
+
+        image {
+          width: 40px;
+          height: 40px;
+          margin: 8px 8px 8px 24px;
+          position: relative;
+          top: 6px;
+        }
+      }
+    }
+  }
+
+  .nav_bar {
+    width: 100%;
+    height: 112px;
+    background: #E60012;
+
+    li {
+      width: 50%;
+      float: left;
+      height: 90px;
+      line-height: 90px;
+      text-align: center;
+      color: #fff;
+      font-size: 28px;
+      opacity: 0.8;
+      position: relative;
+
+      &:after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 4px;
+        width: 40px;
+        background-color: transparent;
+
+      }
+
+    }
+
+    li.active {
+      opacity: 1;
+
+      &:after {
+        background-color: #fff;
+      }
+    }
+  }
+
+  .search-input {
+    .input-box {
+      width: 100%;
+      height: 112px;
+      background-color: #fff;
+      padding: 24px 32px;
+      box-sizing: border-box;
+      position: relative;
+
+      .sousuo {
+        position: absolute;
+        top: 35px;
+        left: 60px;
+        width: 40px;
+        height: 40px;
+      }
+
+      .input {
+        background-color: #F3F3F3;
+        width: 598px;
+        height: 64px;
+        color: #999999;
+        font-size: 26px;
+        margin-left: 8px;
+        border-radius: 32px;
+        padding-left: 70px;
+        padding-right: 60px;
+        box-sizing: border-box;
+      }
+
+      .clear {
+        width: 32px;
+        height: 32px;
+        position: absolute;
+        top: 40px;
+        right: 130px;
+        z-index: 10;
+      }
+
+      .search-word {
+        font-size: 28px;
+        color: #135AB8;
+        line-height: 60px;
+        margin-left: 20px;
+      }
+    }
+  }
+
+  .list_content {
+    width: calc(100% - 64rpx);
+    height: calc(100% - 300rpx);
+    padding: 32px 32px 0 32px;
+    overflow: auto;
+
+    .list_div {
+      width: 100%;
+      height: 100%;
+
+      li {
+        width: 100%;
+        height: 426px;
+        background-color: #fff;
+        border-radius: 4px;
+        margin-bottom: 32px;
+        position: relative;
+        overflow: hidden;
+
+        .up {
+          height: 330px;
+          width: 100%;
+          padding: 32px;
+          box-sizing: border-box;
+          border-bottom: 2px solid #eeeeee;
+
+          h3 {
+            color: #333333;
+            font-size: 32px;
+            font-weight: bold;
+            word-break: break-all;
+            width: 90%;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            overflow: hidden;
+            span-overflow: ellipsis;
+            -webkit-box-orient: vertical;
+          }
+
+          .info {
+            width: 100%;
+            display: flex;
+            font-size: 30px;
+            margin-top: 32px;
+
+            span {
+              width: 150px;
+              color: rgba(153, 153, 153, 1);
+            }
+
+            p {
+              flex: 1;
+              color: #343D65;
+              word-break: break-all;
+              display: -webkit-box;
+              -webkit-line-clamp: 2;
+              overflow: hidden;
+              span-overflow: ellipsis;
+              -webkit-box-orient: vertical;
+            }
+
+          }
+
+        }
+
+        .btn {
+          height: 96px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          padding: 0 32px;
+          box-sizing: border-box;
+
+          .button {
+            width: 152px;
+            height: 56px;
+            border-radius: 28px;
+            color: #1365DD;
+            text-align: center;
+            font-size: 28px;
+            line-height: 56px;
+            margin-left: 16px;
+            border: 2px solid rgba(19, 101, 221, 1);
+          }
+
+          .callBtn {
+            width: 196px !important;
+            margin-left: 0 !important;
+          }
+
+          .color4 {
+            color: #1365DD;
+            border: 2px solid rgba(19, 101, 221, 1);
+          }
+
+          .color5 {
+            color: #606060;
+            border: 2px solid #E1E1E1;
+          }
+        }
+
+        .tip {
+          position: absolute;
+          width: 200px;
+          height: 56px;
+          text-align: center;
+          line-height: 56px;
+          right: -50rpx;
+          -webkit-transform: rotate(45deg);
+          -ms-transform: rotate(45deg);
+          transform: rotate(45deg);
+
+          top: 20px;
+
+          &.color1 {
+            color: #ff8822;
+            background-color: #FFF3E9;
+          }
+
+          &.color2 {
+            color: #5A98F2;
+            background-color: #EEF5FF;
+          }
+
+          &.color3 {
+            color: #999999;
+            background-color: #F2F2F2;
+          }
+
+        }
+
+
+      }
+    }
+  }
+
+  .no-affairs {
+    width: 100%;
+    height: calc(100% - 210rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .footer {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 104px;
+    background: rgba(255, 228, 221, 1);
+    color: #D73D3D;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 32px;
+
+    p {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &.active {
+        background-color: #D73D3D;
+        color: #ffffff;
+      }
+    }
+
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/myLog.vue b/src/apps/party/partyReport/myLog.vue
new file mode 100644
index 00000000..eba83132
--- /dev/null
+++ b/src/apps/party/partyReport/myLog.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="page">
+    <header>
+      <p class="title">{{ title }}</p>
+      <div class="time">
+        <span>提交时间：</span>
+        <span>{{ baseInfo.submitTime }}</span>
+      </div>
+    </header>
+    <div class="mylog_main">
+      <div class="mylog_main_summary">
+        <p class="word">活动总结</p>
+        <p class="value">{{ baseInfo.content }}</p>
+      </div>
+      <div class="imageList">
+        <p class="word">活动照片</p>
+        <image v-for="(e, index) in baseInfo.files" :key="index" @click="previewImage(baseInfo.files,index)"
+               mode="aspectFill" :src="e.accessUrl"></image>
+      </div>
+    </div>
+    <div class="editLog" @click="editLog">
+      <div class="iconfont">&#xe6c2;</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "myLog",
+  data() {
+    return {
+      signupId: '',
+      baseInfo: {},
+      title: ''
+    }
+  },
+  onLoad(options) {
+    this.signupId = options.signupId;
+    this.title = options.title;
+  },
+  methods: {
+    editLog() {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/fillLog?reportId=${this.baseInfo.reportId}&signupId=${this.signupId}&signupContent=${this.baseInfo.signupContent}`
+      })
+    },
+    searchDetail() {
+      this.$http.post(`/app/apppartyreport/log?id=${this.signupId}`).then(res => {
+        if (res.code == 0) {
+          this.baseInfo = {...res.data};
+        }
+      })
+    },
+    previewImage(arr, index) {
+      let list = [];
+      let current = index;
+      arr.map((e, index) => {
+        list.push(e.accessUrl)
+
+      })
+      uni.previewImage({
+        urls: list,
+        current: current,
+        longPressActions: {
+          itemList: ['发送给朋友', '保存图片'],
+          success: function (data) {
+
+          },
+          fail: function (err) {
+
+          }
+        }
+      });
+    },
+  },
+
+  onShow(){
+    this.searchDetail();
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+    width: 100%;
+    height: 100%;
+    position: relative;
+    header{
+        width: 100%;
+        min-height: 256rpx;
+        background:rgba(230,0,18,1);
+        padding: 32rpx;
+        box-sizing: border-box;
+        .title{
+            font-size:40rpx;
+            color:#fff;
+        }
+        .time{
+            height: 112rpx;
+            line-height: 112rpx;
+            font-size:28rpx;
+            color:#fff;
+            span:nth-child(2){
+                opacity: 0.7;
+            }
+        }
+    }
+    .mylog_main{
+        width: 100%;
+        .word{
+            height: 44rpx;
+            width: 100%;
+            border-left: 6rpx solid  #E60012;
+            box-sizing: border-box;
+            color:#333333;
+            font-size:38rpx;
+            line-height: 44rpx;
+            span-indent: 16rpx;
+            font-weight: 600;
+        }
+        .mylog_main_summary{
+             width: 100%;
+             padding: 32rpx;
+             background-color: #fff;
+             box-sizing: border-box;
+            .value{
+                margin-top: 56rpx;
+                color:#333333;
+                font-size:32rpx;
+                word-break: break-all;
+            }
+        }
+        .imageList{
+            width: 100%;
+            background-color: #fff;
+            padding: 32rpx;
+            box-sizing: border-box;
+            margin-top: 16rpx;
+            image{
+                width: 100%;
+                height: 384rpx;
+                border-radius: 4rpx;
+                margin-top:32rpx;
+            }
+        }
+    }
+    .editLog{
+      width: 96px;
+      height: 96px;
+      border-radius: 48px;
+      background: #FFFFFF;
+      position: fixed;
+      right: 0;
+      top: calc(100% - 400px);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);
+      .iconfont {
+        font-size: 66px;
+        color: #F85461;
+      }
+    }
+}
+</style>
diff --git a/src/apps/party/partyReport/partyDetail.vue b/src/apps/party/partyReport/partyDetail.vue
new file mode 100644
index 00000000..65ef9f2f
--- /dev/null
+++ b/src/apps/party/partyReport/partyDetail.vue
@@ -0,0 +1,331 @@
+<template>
+  <div class="page">
+    <div class="baseInfo">
+      <div class="content" style="transition:height .5s ease;">
+        <p class="title">{{ baseInfo.title }}</p>
+        <ul>
+          <li>
+            <span class="label">活动发起方：</span>
+            <div class="value">{{ baseInfo.orgName }}</div>
+          </li>
+          <li>
+            <span class="label">活动时间：</span>
+            <div class="value"> {{ baseInfo.beginTime|timeVal }} 至 {{ baseInfo.endTime|timeVal }}</div>
+          </li>
+          <template v-if="stretchWord=='收起'">
+            <li>
+              <span class="label">活动地点：</span>
+              <div class="value">{{ baseInfo.address || '-' }}</div>
+            </li>
+            <li>
+              <span class="label">参与名额：</span>
+              <div class="value">{{ baseInfo.total ? baseInfo.total : "不限" }}</div>
+            </li>
+            <li>
+              <span class="label">报名截止时间：</span>
+              <div class="value">
+                {{ baseInfo.stopSignupTime || '-' }}
+                <span v-if="baseInfo.signupStatus==0">({{ "剩余" + baseInfo.timeRemaining }})</span>
+              </div>
+              <!-- <div class="value" v-else>-</div> -->
+            </li>
+            <li>
+              <span class="label">活动报名人数：</span>
+              <div class="value">{{ baseInfo.signupCount || '-' }}</div>
+            </li>
+            <li>
+              <span class="label">活动状态：</span>
+              <div class="value">{{ $dict.getLabel('partyReportActionStatus', baseInfo.actionStatus) }}</div>
+              <!-- <div class="value">{{ activeStatus }}</div> -->
+            </li>
+            <li>
+              <span class="label">联系人：</span>
+              <div class="value">{{ baseInfo.contactPerson || '-' }}</div>
+            </li>
+            <li>
+              <span class="label">联系电话：</span>
+              <div class="value">{{ baseInfo.contactPhone || '-' }}</div>
+            </li>
+          </template>
+        </ul>
+      </div>
+      <div class="footer" @click="stretch()">
+        <span>{{ stretchWord }}</span>
+        <image :src="dowm" v-if="stretchWord=='展开'"></image>
+        <image :src="up" v-if="stretchWord=='收起'"></image>
+      </div>
+    </div>
+    <div class="html">
+      <header>活动介绍</header>
+      <u-parse :html="baseInfo.content" class="content" v-if="baseInfo.content"></u-parse>
+      <AiTransSpeech v-if="showTrans" :src="baseInfo.speech"/>
+    </div>
+    <div class="page_footer">
+      <p @click="seeSignUpList(baseInfo)">
+        <image src="https://cdn.cunwuyun.cn/img/party_detail.png"></image>
+        <span>查看报名情况</span>
+      </p>
+      <p v-if="baseInfo.nowUsersignupStatus==null&&baseInfo.actionStatus!=2&&baseInfo.signupStatus==0"
+         @click="signUp(baseInfo)">
+        <image src="https://cdn.cunwuyun.cn/img/party_now_reg.png"></image>
+        <span>立即报名</span>
+      </p>
+      <p v-if="baseInfo.nowUsersignupStatus==1&&baseInfo.actionStatus!=2&&baseInfo.signupStatus==0"
+         @click="open()">
+        <image src="https://cdn.cunwuyun.cn/img/party_cancel_reg.png"></image>
+        <span>取消报名</span>
+      </p>
+      <p v-if="baseInfo.nowUsersignupStatus==1&&baseInfo.signupContent==null&&['1','2'].includes(baseInfo.actionStatus)&&baseInfo.signupStatus==1"
+         @click="goLog(baseInfo)">
+        <image src="https://cdn.cunwuyun.cn/img/party_add_log.png"></image>
+        <span>填写活动日志</span>
+      </p>
+      <p v-if="baseInfo.nowUsersignupStatus==1&&baseInfo.signupContent!=null&&['1','2'].includes(baseInfo.actionStatus)&&baseInfo.signupStatus==1"
+         @click="goMyLog(baseInfo)">
+        <image src="https://cdn.cunwuyun.cn/img/party_log.png"></image>
+        <span>我的活动日志</span>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'partyDetail',
+  computed: {
+    user() {
+      return uni.getStorageSync("userInfo")
+    }
+  },
+  data() {
+    return {
+      baseInfo: {},
+      height: 210,
+      stretchWord: "展开",
+      listType: '',
+      footerList: [
+        {name: "查看报名情况", id: 0},
+        {name: "立即报名", id: 1}
+      ],
+      id: '',
+      dowm: 'https://cdn.cunwuyun.cn/img/party_down.png',
+      up: 'https://cdn.cunwuyun.cn/img/party_up.png',
+      showTrans: false,
+      activeStatus:""
+    }
+  },
+  onLoad(options) {
+    this.id = options.id;
+    this.searchDetail(options.id);
+    this.listType = options.listType;
+    this.$dict.load('partyReportActionStatus');
+  },
+  onShow() {
+    this.showTrans = true;
+    this.searchDetail(this.id);
+  },
+  onHide() {
+    this.showTrans = false
+  },
+  filters: {
+    timeVal(val) {
+      if (val) {
+        return val.substring(0, 16)
+      }
+    }
+  },
+  methods: {
+    searchDetail(id) {
+      this.$http.post(`/app/apppartyreport/queryDetailById?id=${id}&partyId=${this.user.id}`).then(res => {
+        if (res && res.data) {
+          this.baseInfo = {...res.data};
+          this.baseInfo.stopSignupTime = this.baseInfo.stopSignupTime && this.baseInfo.stopSignupTime.substring(0, 16);
+        }
+      })
+    },
+    stretch() {
+      this.stretchWord == '展开' ? this.stretchWord = '收起' : this.stretchWord = '展开';
+      this.height == 210 ? this.height = 506 : this.height = 210;
+    },
+    signUp(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/signUp?reportId=${e.id}`
+      })
+    },
+    seeSignUpList(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/signUpList?reportId=${e.id}`
+      })
+    },
+    goLog(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/fillLog?reportId=${e.id}&signupId=${e.signupId}`
+      })
+    },
+    goMyLog(e) {
+      uni.navigateTo({
+        url: `/pages/party/partyReport/myLog?signupId=${e.signupId}&title=${e.title}`
+      })
+    },
+    open() {
+
+      uni.showModal({
+        title: '提示',
+        content: '取消报名后，本次活动不允许再次报名，是否确定取消？',
+        success: (res) => {
+          if (res.confirm) {
+            this.cale();
+          } else if (res.cancel) {
+
+          }
+        }
+      });
+    },
+    cale() {
+      this.$http.post(`/app/apppartyreport/signup-cancel?id=${this.baseInfo.signupId}`,).then(res => {
+        if (res.code == 0) {
+          uni.navigateBack({
+            delta: 1
+          });
+        }
+      }).catch(err => {
+        uni.showToast({
+          title: err,
+          icon: "none",
+          duration: 1000
+        })
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+
+  .baseInfo {
+    width: 100%;
+    background: rgba(230, 0, 18, 1);
+    overflow: hidden;
+
+    .content {
+      width: 100%;
+      background: rgba(230, 0, 18, 1);
+      overflow: hidden;
+      padding: 0 32px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 40px;
+        color: #fff;
+        word-break: break-all;
+      }
+
+      ul {
+        width: 100%;
+
+        li {
+          width: 100%;
+          display: flex;
+          font-size: 30px;
+          margin-bottom: 16px;
+
+          .label {
+            font-size: 28px;
+            color: #fff;
+          }
+
+          .value {
+            flex: 1;
+            font-size: 28px;
+            color: rgba(255, 232, 232, 1);
+            opacity: 0.8;
+          }
+        }
+      }
+    }
+
+    .footer {
+      width: 100%;
+      height: 80px;
+      color: #fff;
+      font-size: 28px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      image {
+        width: 28px;
+        height: 28px;
+      }
+    }
+  }
+
+  .html {
+    width: 100%;
+    padding: 0 32px 180px 32px;
+    box-sizing: border-box;
+    background-color: #fff;
+
+    header {
+      height: 96px;
+      line-height: 96px;
+    }
+  }
+
+  .page_footer {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 104px;
+    background: rgba(255, 228, 221, 1);
+    color: #D73D3D;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 32px;
+
+    image {
+      width: 32px;
+      height: 32px;
+    }
+
+    p {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &.active {
+        background-color: #D73D3D;
+        color: #ffffff;
+      }
+    }
+
+    p:nth-child(1) {
+      border-right: 2px solid rgb(241, 178, 178);
+      box-sizing: border-box;
+    }
+
+    p:nth-child(2) {
+      background-color: #FE5A49;
+      box-sizing: border-box;
+      color: #fff;
+    }
+
+    p:only-child {
+      width: 100%;
+      border-right: none;
+    }
+
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/signUp.vue b/src/apps/party/partyReport/signUp.vue
new file mode 100644
index 00000000..935b2ac6
--- /dev/null
+++ b/src/apps/party/partyReport/signUp.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="page">
+    <div class="form">
+      <div class=" basic-item flex-row">
+        <div class="color-333"><span class="color-red">*</span>活动报名类型</div>
+        <div class="select" @click="open()">
+          <span class="content-span" :class="reportName == '请选择' ? 'colo-999' : 'color-333'">{{ reportName }}</span>
+          <image src="https://cdn.cunwuyun.cn/img/jiantou.png" class="image"></image>
+        </div>
+      </div>
+      <div class=" basic-item flex-row">
+        <div class="color-333"><span class="color-red">*</span>联系手机</div>
+        <input type="span" placeholder="请输入手机号码" maxlength="11" v-model="baseInfo.phone" adjust-position="false">
+      </div>
+      <div class="textarea">
+        <div class="color-333">报名备注</div>
+        <textarea type="textarea" v-if="showtextarea" placeholder="填写报名备注（100字以内）" v-model="baseInfo.remark"
+                  adjust-position="false" maxlength="100"></textarea>
+        <p v-else style="color:#999;font-size:34rpx;width:100%;height:302rpx;">填写报名备注（100字以内）</p>
+      </div>
+    </div>
+    <div class="notice">
+      <p>报到类型说明：</p>
+      <p>1、单位联系社区报到服务：党员所属单位联系的社区参与活动，到社区服务；</p>
+      <p>2、居住地社区报到服务：党员所在本人居住的社区参与活动，到社区服务；</p>
+      <p>3、其他村(社区)报到服务：党员所在除单位联系社区与居住社区以外的其他社区参与活动，到社区服务；</p>
+    </div>
+    <div class="report" @click="report()">提交</div>
+    <AiDrawer mode="right" ref="drawer" @status="drawerStatus">
+      <div class="drawer_main">
+        <header>
+          <p>活动报到类型</p>
+          <span>（单选）</span>
+        </header>
+        <ul>
+          <li v-for="(e,index) in list" :key="index" @click="selectType(e)" :class="{active:activeId==e.dictValue}">
+            {{ e.dictName }}
+          </li>
+        </ul>
+        <div class="footer" @click="saveType()">
+          保存
+        </div>
+      </div>
+    </AiDrawer>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "signUp",
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      baseInfo: {
+        reportId: '',
+        remark: '',
+        phone: '',
+        reportType: '',
+        partyId: ''
+      },
+      reportName: '请选择',
+      show: false,
+      list: [],
+      activeId: '',
+      activeObj: {},
+      showtextarea: true
+    }
+  },
+  onLoad(options) {
+    this.$dict.load('partyReportSignupReportType');
+    this.baseInfo.reportId = options.reportId;
+    this.baseInfo.partyId = this.user.id;
+    this.baseInfo.phone = this.user.phone;
+  },
+  methods: {
+    showModel(title) {
+      uni.showModal({
+        title: '温馨提示',
+        content: title,
+        showCancel: false,
+        confirmColor: "#135AB8",
+        success(res) {
+          if (res.confirm) {
+          }
+        }
+      })
+    },
+    open() {
+      this.list = this.$dict.getDict('partyReportSignupReportType');
+      this.$refs.drawer.open();
+
+    },
+    selectType(e) {
+      this.activeId = e.dictValue;
+      this.activeObj = e;
+
+    },
+    drawerStatus(val) {
+      this.showtextarea = !val;
+    },
+    saveType() {
+      this.reportName = this.activeObj.dictName;
+      this.$refs.drawer.close();
+    },
+    report() {
+      if (this.reportName == null || this.reportName == '' || this.reportName == '请选择') {
+        this.showModel('请选择活动报名类型')
+        return false
+      }
+      if (!this.baseInfo.phone) {
+        this.showModel('请填写手机号码')
+        return false
+      }
+      this.baseInfo.reportType = this.$dict.getValue('partyReportSignupReportType', this.reportName);
+      this.$http.post(`/app/apppartyreport/signup`, this.baseInfo, null).then(res => {
+        if (res.code == 0) {
+          uni.showToast({
+            title: '提交成功',
+            icon: 'success',
+            duration: 2000
+          })
+          setTimeout(() => {
+            uni.navigateBack({
+              delta: 1
+            });
+          }, 2000)
+        }
+      }).catch(err => {
+        uni.showToast({
+          title: err,
+          icon: "none",
+          duration: 1000
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+
+.page {
+  width: 100%;
+  height: 100%;
+
+  .form {
+    width: 100%;
+    background-color: #fff;
+
+    .basic-item {
+      font-size: 32px;
+      justify-content: space-between;
+      width: 100%;
+      height: 112px;
+      padding: 32px 32px 32px 12px;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-bottom: 1px solid #eee;
+
+      input {
+        text-align: right;
+      }
+
+      .wid-110 {
+        width: 214px;
+      }
+
+      .skill-span {
+        max-width: 432px;
+        text-align: right;
+        display: inline-block;
+        overflow: hidden;
+        span-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 30px;
+      }
+
+      .picker {
+        justify-content: flex-end;
+        align-items: center;
+        color: #999999;
+        font-size: 32px;
+        background-color: #FFFFFF;
+      }
+
+      .picker > .AiArea {
+        background-color: #fff !important;
+      }
+
+      .image {
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+      }
+
+      .wei-span {
+        width: 40%;
+      }
+
+      .msg-value {
+        width: 60%;
+      }
+
+      .msg-btn {
+        width: 160px;
+        text-align: right;
+        background-color: #fff !important;
+      }
+
+      button {
+        font-size: 28px;
+        background-color: #fff;
+        line-height: 48px;
+        padding: 0;
+
+      }
+
+      button::after {
+        border: 0;
+      }
+
+      .button-hover {
+        background-color: #fff;
+      }
+
+      button[disabled] {
+        background-color: #fff !important;
+        font-size: 28px;
+        border-radius: 0;
+      }
+    }
+
+    .textarea {
+      padding: 32px;
+    }
+  }
+
+  /deep/ .uni-drawer {
+    z-index: 20000 !important;
+  }
+
+  .drawer_main {
+    width: 100%;
+    height: 100%;
+    padding: 64px 32px 0 32px;
+    box-sizing: border-box;
+    position: relative;
+
+    header {
+      width: 100%;
+      height: 96px;
+      display: flex;
+      align-items: center;
+
+      p {
+        color: #333333;
+        font-size: 32px;
+        width: 192px;
+        font-weight: 600;
+      }
+
+      span {
+        font-size: 24px;
+        color: #666;
+      }
+    }
+
+    ul {
+      width: 100%;
+      overflow: hidden;
+      height: 500px;
+
+      li {
+        width: 344px;
+        height: 96px;
+        background: rgba(249, 249, 249, 1);
+        margin-bottom: 40px;
+        font-size: 28px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-radius: 2px;
+      }
+
+      li.active {
+        background: rgba(255, 228, 221, 1);
+        color: #D73D3D;
+
+      }
+    }
+
+    .footer {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 100%;
+      height: 112px;
+      line-height: 112px;
+      text-align: center;
+      color: #ffffff;
+      font-size: 36px;
+      background: rgba(230, 0, 18, 1);
+    }
+  }
+
+  .notice {
+    width: 100%;
+    font-weight: 400;
+    box-sizing: border-box;
+    padding: 64px 32px 0 32px;
+    color: rgba(153, 153, 153, 1);
+    font-size: 24px;
+
+
+  }
+
+  .report {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 112px;
+    line-height: 112px;
+    font-size: 32px;
+    text-align: center;
+    background: rgba(230, 0, 18, 1);
+    color: #fff;
+
+
+  }
+}
+</style>
diff --git a/src/apps/party/partyReport/signUpList.vue b/src/apps/party/partyReport/signUpList.vue
new file mode 100644
index 00000000..d139ee90
--- /dev/null
+++ b/src/apps/party/partyReport/signUpList.vue
@@ -0,0 +1,103 @@
+<template>
+    <div class="page">
+        <header>
+            报名记录（已有 <span class="num">{{list.length}}</span>人报名）
+        </header>
+        <ul>
+            <li v-for="(e,index) in list" :key="index">
+               <p>
+                   <image :src="e.partyAvatar" v-if="e.partyAvatar"></image>
+                   <image src="https://cdn.cunwuyun.cn/img/no-content.png" v-else></image>
+                   <span>{{e.partyName.replace(/^./g,'*')}}</span>
+               </p>
+               <p>{{e.signupTime.substring(0,16)}}</p>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<script>
+    export default {
+        name:"signUpList",
+        data(){
+            return{
+                reportId:'',
+                list:[]
+            }
+        },
+        onLoad(options){
+            this.reportId= options.reportId;
+            this.getList();
+
+        },
+        methods:{
+             getList(){
+                this.$http.post(`/app/apppartyreport/signup-info?id=${this.reportId}`,null,{}).then( res => {
+                    if(res.code == 0){
+                        this.list = res.data;
+
+                    }else{
+
+                    }
+                }).catch( err => {
+
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+@import "../../../common/common.css";
+.page{
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+    header{
+        width: 100%;
+        height: 112rpx;
+        padding: 0 32rpx;
+        font-size:32rpx;
+        line-height: 112rpx;
+        color:#333333;
+        border-bottom: 1px solid #eee;
+        box-sizing: border-box;
+        .num{
+            color:#D73D3D;
+        }
+    }
+    ul{
+        width: 100%;
+        height: calc(100% - 112rpx) ;
+        overflow: auto;
+        li{
+            width: 100%;
+            height: 148rpx;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            border-bottom: 1px solid #eee;
+            padding: 0 32rpx;
+            box-sizing: border-box;
+            p:nth-child(2){
+                color:#999999;
+                font-size:30rpx;
+            }
+             p:nth-child(1){
+                display: flex;
+                align-items: center;
+               image{
+                   width: 80rpx;
+                   height: 80rpx;
+                   border-radius: 50%;
+               }
+               span{
+                   font-size:30rpx;
+                   color:#2D2D2E;
+                   margin-left: 8rpx;
+               }
+            }
+        }
+    }
+}
+</style>
diff --git a/src/common/common.css b/src/common/common.css
new file mode 100644
index 00000000..1996f57d
--- /dev/null
+++ b/src/common/common.css
@@ -0,0 +1,261 @@
+@font-face {
+    font-family: 'iconfont';
+    /* project id 1862352 */
+    src: url('https://at.alicdn.com/t/font_1862352_i00id3q02qr.eot');
+    src: url('https://at.alicdn.com/t/font_1862352_i00id3q02qr.eot?#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_1862352_i00id3q02qr.woff2') format('woff2'),
+    url('https://at.alicdn.com/t/font_1862352_i00id3q02qr.woff') format('woff'),
+    url('https://at.alicdn.com/t/font_1862352_i00id3q02qr.ttf') format('truetype'),
+    url('https://at.alicdn.com/t/font_1862352_i00id3q02qr.svg#iconfont') format('svg');
+}
+
+.iconfont {
+    font-family: "iconfont" !important;
+    font-size: 32px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+ul,
+li,
+span,
+div,
+p {
+    padding: 0;
+    margin: 0;
+}
+
+ul, li { padding: 0;margin: 0;list-style: none}
+
+page {
+    width: 100%;
+    min-height: 100%;
+    background-color: #f3f6f9;
+}
+
+::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    color: transparent;
+}
+
+.page {
+    width: 100%;
+    height: 100%;
+    background-color: #f3f6f9;
+}
+
+.span-hover {
+    background: transparent;
+    opacity: 0.5;
+}
+
+.bg-hover {
+    background: #eee !important;
+}
+
+.flex {
+    display: flex;
+}
+
+.flex-align {
+    display: flex;
+    align-items: center;
+}
+
+.flex-between {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.flex1 {
+    flex: 1;
+}
+
+.solid {
+    border-bottom: 2px solid #E8E8E8;
+}
+
+.flex-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.flex-column {
+    display: flex;
+    flex-direction: column;
+}
+
+uni-button[disabled] {
+    background-color: #F7F7F7 !important;
+    color: #999 !important;
+    border: 0;
+}
+
+uni-button:after {
+    border: none !important;
+}
+
+.break-word {
+    word-break: break-all;
+}
+
+.masking-layer {
+    position: absolute;
+    left: 0;
+    top: 0;
+    height: 100%;
+    width: 100%;
+    background-color: rgb(0, 0, 0);
+    opacity: 0.6;
+}
+
+/* 入口页列表 */
+.list {
+    justify-content: space-between;
+    align-items: center;
+    height: 112px;
+    background-color: #fff;
+    padding-left: 32px;
+    padding-right: 32px;
+    box-sizing: border-box;
+}
+
+.list-cell {
+    width: 48px;
+    height: 48px;
+}
+
+.image {
+    width: 48px;
+    height: 48px;
+}
+
+.title-sub {
+    height: 112px;
+    margin-left: 16px;
+    width: 654px;
+    justify-content: space-between;
+    align-items: center;
+    background: rgba(255, 255, 255, 1);
+    font-size: 32px;
+    color: #333333;
+}
+
+.more {
+    width: 32px;
+    height: 32px;
+}
+
+.title-line {
+    border-bottom: 2px solid #DDDDDD;
+}
+
+.last {
+    margin-top: 16px;
+}
+
+.no-content-pds {
+    margin-top: 360px;
+    width: 100%;
+    text-align: center;
+}
+
+.no-content-pds div {
+    height: 40px;
+    font-size: 28px;
+    line-height: 40px;
+    font-family: PingFangSC-Regular, PingFangSC;
+}
+
+.no-content-pds .span {
+    color: rgba(51, 51, 51, 1);
+}
+
+.no-content-pds .span-p {
+    color: rgba(153, 153, 153, 1);
+    margin-top: 16px;
+}
+
+/* margin */
+.mar-t8 {
+    margin-top: 16px;
+}
+
+.mar-r20 {
+    margin-right: 40px;
+}
+
+.mar-l10 {
+    margin-left: 20px;
+}
+
+/* color */
+.color-333 {
+    color: #333;
+}
+
+.color-999 {
+    color: #999;
+}
+
+.color-red {
+    color: #FF4466;
+}
+
+.color-666 {
+    color: #666;
+}
+
+/*  */
+.font-12 {
+    font-size: 24px;
+}
+
+/*  */
+.report {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    height: 112px;
+    background-color: #135AB8;
+    color: #fff;
+    text-align: center;
+    line-height: 112px;
+    font-size: 32px;
+}
+
+.span-right {
+    text-align: right;
+}
+
+input::-webkit-input-placeholder {
+    color: #999;
+}
+
+/* 多级下拉选择css */
+.type-picke-more {
+    position: fixed;
+    width: 100%;
+    height: 330px;
+    bottom: 0;
+    left: 0;
+    background-color: #fff;
+    z-index: 99;
+}
+
+.type-picke-more picker-div-column {
+    text-align: center;
+    line-height: 110px;
+}
+
+.fixed-top {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 99;
+    width: 100%
+}
diff --git a/src/components/AiTransSpeech.vue b/src/components/AiTransSpeech.vue
new file mode 100644
index 00000000..42bf7e04
--- /dev/null
+++ b/src/components/AiTransSpeech.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <div class="AiTransSpeech" v-if="!noSpeech">
+      <button title="语音播报" @click="getSpeech">
+        <div>
+          <div class="iconfont" :class="{playing:loading}">&#xe6b1;</div>
+        </div>
+        <div>{{ text }}</div>
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "AiTransSpeech",
+  props: {
+    src: String,
+    content: String
+  },
+  data() {
+    return {
+      audioContext: null,
+      speech: "",
+      loading: false,
+      text: "开始"
+    }
+  },
+  computed: {
+    speechString() {
+      return this.content ? this.content.replace(/<\/?.+?\/?>/g, "") : ""
+    },
+    noSpeech() {
+      return !this.src && !this.content
+    }
+  },
+  methods: {
+    getSpeech() {
+      if (!this.noSpeech) {
+        if (this.audioContext) {
+          if (this.loading) {
+            this.loading = false
+            this.audioContext.pause()
+          } else {
+            this.loading = true
+            this.audioContext.play()
+          }
+        } else if (this.content) {
+          this.loading = true
+          if (!this.speech) {
+            this.$instance.post("/app/msc/transToSpeech" + `?fileName=demo&words=${this.speechString}`).then(res => {
+              if (res && res.data) {
+                let url = res.data.join("")
+                this.speech = url.substring(0, url.indexOf(";"))
+                this.playAudio()
+              }
+            }).catch(() => this.loading = false)
+          } else {
+            this.playAudio()
+          }
+        } else if (this.src) {
+          this.loading = true
+          this.speech = this.src
+          this.playAudio()
+        }
+      }
+    },
+    playAudio() {
+      let _ = this
+      this.audioContext = uni.createInnerAudioContext();
+      this.audioContext.src = this.speech;
+      this.audioContext.play()
+      this.audioContext.onPlay(() => {
+        _.text = "暂停"
+      });
+      this.audioContext.onPause(() => {
+        _.loading = false
+        _.text = "开始"
+      });
+      this.audioContext.onEnded(() => {
+        _.loading = false
+        _.text = "开始"
+      });
+      this.audioContext.onError((res) => {
+        console.error(res.errMsg);
+        _.text = "开始"
+      });
+    },
+  },
+  destroyed() {
+    if (this.audioContext) {
+      this.audioContext.pause()
+      this.audioContext.destroy()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AiTransSpeech {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  button {
+    position: fixed;
+    right: 80px;
+    bottom: 150px;
+    width: 104px;
+    height: 104px;
+    background: linear-gradient(130deg, rgba(70, 192, 253, 1) 0%, rgba(37, 158, 249, 1) 57%, rgba(39, 148, 248, 1) 100%);
+    border-radius: 50%;
+    font-size: 24px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #fff !important;
+    z-index: 10000;
+
+    & > div {
+      width: 48px;
+      white-space: nowrap;
+      line-height: normal;
+
+      .iconfont {
+        width: 48px;
+        font-size: 48px;
+        line-height: 48px;
+        overflow: hidden;
+
+        &.playing {
+          animation: playingSpeech .5s infinite;
+        }
+      }
+    }
+  }
+
+  @keyframes playingSpeech {
+    from {
+      width: 30px
+    }
+    to {
+      width: 100%
+    }
+  }
+}
+</style>
diff --git a/src/components/AiUniIcon.vue b/src/components/AiUniIcon.vue
new file mode 100644
index 00000000..f411a7c5
--- /dev/null
+++ b/src/components/AiUniIcon.vue
@@ -0,0 +1,419 @@
+<template>
+	<view :class="'uni-icon-' + type" :style="{ color: color, 'font-size': size + 'px' }" class="uni-icon" @click="_onClick" />
+</template>
+
+<script>
+	export default {
+		name: 'UniIcon',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style>
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		src: url(data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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AVkBWgFbAVwBXQd1bmlFMTAwB3VuaUUxMDEHdW5pRTEwMgd1bmlFMTMwB3VuaUUxMzEHdW5pRTEzMgd1bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvBEV1cm8AAQAB//8ADwABAAAADAAAABYAAAACAAEAAQBfAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANJrTZkAAAAA2DhhuQ==) format('truetype');
+	}
+
+	.uni-icon-wrapper {
+		line-height: 1;
+	}
+
+	.uni-icon {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		line-height: 1;
+		display: inline-block;
+		text-decoration: none;
+		-webkit-font-smoothing: antialiased;
+	}
+
+	.uni-icon.uni-active {
+		color: #007aff;
+	}
+
+	.uni-icon-contact:before {
+		content: '\e100';
+	}
+
+	.uni-icon-person:before {
+		content: '\e101';
+	}
+
+	.uni-icon-personadd:before {
+		content: '\e102';
+	}
+
+	.uni-icon-contact-filled:before {
+		content: '\e130';
+	}
+
+	.uni-icon-person-filled:before {
+		content: '\e131';
+	}
+
+	.uni-icon-personadd-filled:before {
+		content: '\e132';
+	}
+
+	.uni-icon-phone:before {
+		content: '\e200';
+	}
+
+	.uni-icon-email:before {
+		content: '\e201';
+	}
+
+	.uni-icon-chatbubble:before {
+		content: '\e202';
+	}
+
+	.uni-icon-chatboxes:before {
+		content: '\e203';
+	}
+
+	.uni-icon-phone-filled:before {
+		content: '\e230';
+	}
+
+	.uni-icon-email-filled:before {
+		content: '\e231';
+	}
+
+	.uni-icon-chatbubble-filled:before {
+		content: '\e232';
+	}
+
+	.uni-icon-chatboxes-filled:before {
+		content: '\e233';
+	}
+
+	.uni-icon-weibo:before {
+		content: '\e260';
+	}
+
+	.uni-icon-weixin:before {
+		content: '\e261';
+	}
+
+	.uni-icon-pengyouquan:before {
+		content: '\e262';
+	}
+
+	.uni-icon-chat:before {
+		content: '\e263';
+	}
+
+	.uni-icon-qq:before {
+		content: '\e264';
+	}
+
+	.uni-icon-videocam:before {
+		content: '\e300';
+	}
+
+	.uni-icon-camera:before {
+		content: '\e301';
+	}
+
+	.uni-icon-mic:before {
+		content: '\e302';
+	}
+
+	.uni-icon-location:before {
+		content: '\e303';
+	}
+
+	.uni-icon-mic-filled:before,
+	.uni-icon-speech:before {
+		content: '\e332';
+	}
+
+	.uni-icon-location-filled:before {
+		content: '\e333';
+	}
+
+	.uni-icon-micoff:before {
+		content: '\e360';
+	}
+
+	.uni-icon-image:before {
+		content: '\e363';
+	}
+
+	.uni-icon-map:before {
+		content: '\e364';
+	}
+
+	.uni-icon-compose:before {
+		content: '\e400';
+	}
+
+	.uni-icon-trash:before {
+		content: '\e401';
+	}
+
+	.uni-icon-upload:before {
+		content: '\e402';
+	}
+
+	.uni-icon-download:before {
+		content: '\e403';
+	}
+
+	.uni-icon-close:before {
+		content: '\e404';
+	}
+
+	.uni-icon-redo:before {
+		content: '\e405';
+	}
+
+	.uni-icon-undo:before {
+		content: '\e406';
+	}
+
+	.uni-icon-refresh:before {
+		content: '\e407';
+	}
+
+	.uni-icon-star:before {
+		content: '\e408';
+	}
+
+	.uni-icon-plus:before {
+		content: '\e409';
+	}
+
+	.uni-icon-minus:before {
+		content: '\e410';
+	}
+
+	.uni-icon-circle:before,
+	.uni-icon-checkbox:before {
+		content: '\e411';
+	}
+
+	.uni-icon-close-filled:before,
+	.uni-icon-clear:before {
+		content: '\e434';
+	}
+
+	.uni-icon-refresh-filled:before {
+		content: '\e437';
+	}
+
+	.uni-icon-star-filled:before {
+		content: '\e438';
+	}
+
+	.uni-icon-plus-filled:before {
+		content: '\e439';
+	}
+
+	.uni-icon-minus-filled:before {
+		content: '\e440';
+	}
+
+	.uni-icon-circle-filled:before {
+		content: '\e441';
+	}
+
+	.uni-icon-checkbox-filled:before {
+		content: '\e442';
+	}
+
+	.uni-icon-closeempty:before {
+		content: '\e460';
+	}
+
+	.uni-icon-refreshempty:before {
+		content: '\e461';
+	}
+
+	.uni-icon-reload:before {
+		content: '\e462';
+	}
+
+	.uni-icon-starhalf:before {
+		content: '\e463';
+	}
+
+	.uni-icon-spinner:before {
+		content: '\e464';
+	}
+
+	.uni-icon-spinner-cycle:before {
+		content: '\e465';
+	}
+
+	.uni-icon-search:before {
+		content: '\e466';
+	}
+
+	.uni-icon-plusempty:before {
+		content: '\e468';
+	}
+
+	.uni-icon-forward:before {
+		content: '\e470';
+	}
+
+	.uni-icon-back:before,
+	.uni-icon-left-nav:before {
+		content: '\e471';
+	}
+
+	.uni-icon-checkmarkempty:before {
+		content: '\e472';
+	}
+
+	.uni-icon-home:before {
+		content: '\e500';
+	}
+
+	.uni-icon-navigate:before {
+		content: '\e501';
+	}
+
+	.uni-icon-gear:before {
+		content: '\e502';
+	}
+
+	.uni-icon-paperplane:before {
+		content: '\e503';
+	}
+
+	.uni-icon-info:before {
+		content: '\e504';
+	}
+
+	.uni-icon-help:before {
+		content: '\e505';
+	}
+
+	.uni-icon-locked:before {
+		content: '\e506';
+	}
+
+	.uni-icon-more:before {
+		content: '\e507';
+	}
+
+	.uni-icon-flag:before {
+		content: '\e508';
+	}
+
+	.uni-icon-home-filled:before {
+		content: '\e530';
+	}
+
+	.uni-icon-gear-filled:before {
+		content: '\e532';
+	}
+
+	.uni-icon-info-filled:before {
+		content: '\e534';
+	}
+
+	.uni-icon-help-filled:before {
+		content: '\e535';
+	}
+
+	.uni-icon-more-filled:before {
+		content: '\e537';
+	}
+
+	.uni-icon-settings:before {
+		content: '\e560';
+	}
+
+	.uni-icon-list:before {
+		content: '\e562';
+	}
+
+	.uni-icon-bars:before {
+		content: '\e563';
+	}
+
+	.uni-icon-loop:before {
+		content: '\e565';
+	}
+
+	.uni-icon-paperclip:before {
+		content: '\e567';
+	}
+
+	.uni-icon-eye:before {
+		content: '\e568';
+	}
+
+	.uni-icon-arrowup:before {
+		content: '\e580';
+	}
+
+	.uni-icon-arrowdown:before {
+		content: '\e581';
+	}
+
+	.uni-icon-arrowleft:before {
+		content: '\e582';
+	}
+
+	.uni-icon-arrowright:before {
+		content: '\e583';
+	}
+
+	.uni-icon-arrowthinup:before {
+		content: '\e584';
+	}
+
+	.uni-icon-arrowthindown:before {
+		content: '\e585';
+	}
+
+	.uni-icon-arrowthinleft:before {
+		content: '\e586';
+	}
+
+	.uni-icon-arrowthinright:before {
+		content: '\e587';
+	}
+
+	.uni-icon-pulldown:before {
+		content: '\e588';
+	}
+
+	.uni-icon-closefill:before {
+		content: '\e589';
+	}
+
+	.uni-icon-sound:before {
+		content: '\e590';
+	}
+
+	.uni-icon-scan:before {
+		content: '\e612';
+	}
+</style>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index d9a52b29..5813b384 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -241,7 +241,6 @@ const store = new Vuex.Store({
         return Promise.resolve()
       } else {
         agentSignURL = url
-        console.log(qs.parse(location.search))
         if (qs.parse(location.search)?.corpId) {
           params = {
             corpId: qs.parse(location.search).corpId