diff --git a/bin/serve.js b/bin/serve.js
index effe9275..44756966 100644
--- a/bin/serve.js
+++ b/bin/serve.js
@@ -69,13 +69,23 @@ const start = () => {
     }
   }
   findApp('src/apps', file => {
-    if (/.*\\.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) {
+    if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) {
       let app = {
         name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
         path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g, '/')
       }
       json.pages.push(app)
     }
+  }).then(() => {
+    return findApp('src/sass', file => {
+      if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) {
+        let app = {
+          name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
+          path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g, '/')
+        }
+        json.pages.push(app)
+      }
+    })
   }).then(() => {
     fsExtra.outputJson('src/pages.json', json, () => {
       chalkTag.done('生成pages.json')
diff --git a/package.json b/package.json
index 348ca233..cd2bd6b1 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
   "main": "src/apps/index.js",
   "files": [
     "src/components",
-    "src/apps"
+    "src/apps",
+    "src/sass"
   ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
diff --git a/src/apps/AppAskForm/components/AddList.vue b/src/apps/AppAskForm/components/AddList.vue
deleted file mode 100644
index 14edc1b3..00000000
--- a/src/apps/AppAskForm/components/AddList.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div class="template-wrapper">
-    <div class="form-list">
-      <div
-        class="form-list__item"
-        @click="toAdd(index)"
-        :style="{'background-image': `url(${$cdn}askform/${index + 1}.png)`}"
-        v-for="(item, index) in itemList"
-        :key="index">
-        <h2>{{ item.name }}</h2>
-        <div>立即创建</div>
-      </div>
-    </div>
-    <div class="template" v-if="list.length">
-      <h2>共享模板</h2>
-      <div class="template-list">
-        <div class="template-item" v-for="(item, index) in list" :key="index" hover-class="bg-hover" @click="quote(item.id)">
-          <image :src="`${$cdn}askform/6.png`" />
-          <h2>{{ item.title }}</h2>
-          <u-icon name="arrow-right" color="#E1E2E3" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'addList',
-  label: '新建项目',
-
-  data () {
-    return {
-      itemList: [{
-        name: '问卷调查'
-      }, {
-        name: '考试测评'
-      }, {
-        name: '报名登记'
-      }, {
-        name: '满意调查'
-      }, {
-        name: '投票评选'
-      }],
-      list: []
-    }
-  },
-
-  mounted () {
-    this.getList()
-  },
-
-  methods: {
-    toAdd (type) {
-      this.$emit('change', {
-        type: 'AddForm',
-        params: {
-          type
-        }
-      })
-    },
-
-    quote (id) {
-      this.$emit('change', {
-        type: 'AddForm',
-        params: {
-          id,
-          isQuote: 1
-        }
-      })
-    },
-
-    getList () {
-      this.$http.post(`/app/appquestionnairetemplate/list`, null, {
-        params: {
-          current: 1,
-          templateType: 1,
-          size: 10000
-        }
-      }).then(res => {
-        if (res.code == 0) {
-          this.list = res.data.records
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .template-wrapper {
-    padding-bottom: 120rpx;
-
-    .template {
-      margin: 32px 32px 0;
-      background: #fff;
-      border-radius: 8px;
-      overflow: hidden;
-
-      & > h2 {
-        height: 88px;
-        line-height: 88px;
-        padding: 0 24px;
-        color: #333333;
-        font-size: 30px;
-      }
-
-      .template-item {
-        display: flex;
-        align-items: center;
-        height: 104px;
-        padding: 0 24px;
-        border-bottom: 1px solid #D8DDE6;
-
-        &:active {
-          background-color: #eee;
-        }
-
-        &:last-child {
-          border: none;
-        }
-
-        image {
-          width: 36px;
-          height: 42px;
-        }
-
-        i {
-          font-size: 30px;
-          color: #E1E2E3;
-        }
-
-        h2 {
-          flex: 1;
-          padding: 0 18px;
-          color: #333333;
-          font-size: 28px;
-          font-weight: normal;
-          overflow: hidden;
-          text-overflow:ellipsis;
-          white-space: nowrap;
-        }
-      }
-    }
-
-    .form-list {
-      display: flex;
-      flex-wrap: wrap;
-      padding: 0 32px 0;
-
-      div {
-        box-sizing: border-box;
-      }
-
-      .form-list__item {
-        width: calc(50% - 13px);
-        height: 216px;
-        margin: 32px 24px 0 0;
-        padding: 40px 20px 52px;
-        background-color: #FFFFFF;
-        border-radius: 8px;
-        background-size: 100% 100%;
-
-        &:active {
-          background-color: #eee;
-        }
-
-        &:nth-of-type(2n) {
-          margin-right: 0;
-        }
-
-        div {
-          width: 148px;
-          height: 48px;
-          line-height: 48px;
-          text-align: center;
-          color: #fff;
-          font-size: 28px;
-          background: #6BA1F9;
-          border-radius: 24px;
-        }
-
-        h2 {
-          margin-bottom: 32px;
-          padding-left: 10px;
-          color: #333333;
-          font-weight: 700;
-          font-size: 32px;
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/apps/AppAskForm/components/config.js b/src/apps/AppAskForm/components/config.js
deleted file mode 100644
index affd9efb..00000000
--- a/src/apps/AppAskForm/components/config.js
+++ /dev/null
@@ -1,163 +0,0 @@
-export const components = [
-	{
-		type: 'radio',
-		label: '单选',
-		fixedLabel: '单选',
-		value: '',
-		points: '',
-		icon: 'iconradio',
-		isShowPoints: false,
-		required: true,
-		hasAnswer: false,
-		answer: '',
-		pointType: '0',
-		pointDict: [
-			{
-				dictName: '此题有唯一答案和分值',
-				dictValue: '0'
-			},
-			{
-				dictName: '每个选项都有对应分值',
-				dictValue: '1'
-			}
-		],
-		options: [
-			{
-				label: '选项1',
-				value: '',
-				point: '',
-				img: []
-			},
-			{
-				label: '选项2',
-				value: '',
-				point: '',
-				img: []
-			}
-		],
-		title: ''
-	},
-	{
-		type: 'checkbox',
-		label: '多选',
-		fixedLabel: '多选',
-		points: '',
-		icon: 'iconcheck_box',
-		isShowPoints: false,
-		required: true,
-		hasAnswer: false,
-		answer: [],
-		value: [],
-		pointType: '0',
-		pointDict: [
-			{
-				dictName: '此题有唯一答案和分值',
-				dictValue: '0'
-			},
-			{
-				dictName: '每个选项都有对应分值',
-				dictValue: '1'
-			},
-			{
-				dictName: '答对几项得几分，答错不得分',
-				dictValue: '2'
-			}
-		],
-		options: [
-			{
-				label: '选项1',
-				value: '',
-				point: '',
-				img: [],
-				checked: false
-			},
-			{
-				label: '选项2',
-				point: '',
-				value: '',
-				img: [],
-				checked: false
-			}
-		],
-		title: ''
-	},
-	{
-		type: 'select',
-		label: '单下拉框',
-		fixedLabel: '单下拉框',
-		value: '',
-		points: '',
-		icon: 'iconSelect',
-		isShowPoints: false,
-		required: true,
-		hasAnswer: false,
-		answer: '',
-		pointType: '0',
-		placeholder: '请选择',
-		pointDict: [
-			{
-				dictName: '此题有唯一答案和分值',
-				dictValue: '0'
-			},
-			{
-				dictName: '每个选项都有对应分值',
-				dictValue: '1'
-			}
-		],
-		options: [
-			{
-				label: '选项1',
-				value: '',
-				point: '',
-				img: []
-			},
-			{
-				label: '选项2',
-				value: '',
-				point: '',
-				img: []
-			}
-		],
-		title: ''
-	},
-	{
-		type: 'input',
-		label: '单行填空',
-		fixedLabel: '单行填空',
-		value: '',
-		pointType: '0',
-		icon: 'icontext_box',
-		isShowPoints: false,
-		points: '',
-		required: true,
-		hasAnswer: false,
-		placeholder: '请输入...',
-		answer: ''
-	},
-	{
-		type: 'textarea',
-		label: '多行填空',
-		fixedLabel: '多行填空',
-		pointType: '0',
-		icon: 'icontext_area',
-		points: '',
-		isShowPoints: false,
-		required: true,
-		hasAnswer: false,
-		answer: '',
-		placeholder: '请输入...',
-		value: ''
-	},
-	{
-		type: 'upload',
-		label: '上传图片',
-		fixedLabel: '上传图片',
-		value: '',
-		icon: 'iconpic',
-		isShowPoints: false,
-		points: '',
-		required: true,
-		hasAnswer: false,
-		answer: ''
-	}
-];
diff --git a/src/apps/AppMeetingNotice/detail.vue b/src/apps/AppMeetingNotice/detail.vue
deleted file mode 100644
index 7d66ea0e..00000000
--- a/src/apps/AppMeetingNotice/detail.vue
+++ /dev/null
@@ -1,558 +0,0 @@
-<template>
-  <div class="detail" v-if="pageShow">
-    <template v-if="!list">
-      <div class="card">
-        <header>{{ detail.title }}</header>
-        <u-gap height="16"></u-gap>
-        <u-row v-if="detail.createUserId">
-<!--          <u-avatar :src="$cdn + 'common/xzh.png'" v-if="false"></u-avatar>-->
-          <div class="u-avatar__img">
-            <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
-          </div>
-          <span class="user-name">
-            <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
-          </span>
-        </u-row>
-        <u-gap height="32"></u-gap>
-        <u-row>
-          <img :src="$cdn + 'common/meeting.png'" alt="">
-          <span :style="{color:color(detail.status)}">{{ $dict.getLabel('meetStatus', detail.status) }}</span>
-        </u-row>
-        <u-gap height="8"></u-gap>
-        <u-row>
-          <img :src="$cdn + 'common/date.png'" alt="">
-          <span>{{ detail.startTime && detail.startTime.substr(0, 16) }} 至 {{ detail.endTime && detail.endTime.substr(0, 16) }}</span>
-        </u-row>
-        <u-gap height="8"></u-gap>
-        <u-row style="align-items: start;flex-wrap: nowrap;">
-          <img :src="$cdn + 'common/location.png'" alt="">
-          <span>{{ detail.address }}</span>
-        </u-row>
-      </div>
-      <div class="card">
-        <span>{{ detail.content }}</span>
-      </div>
-      <div class="card" v-if="detail.files && detail.files.length">
-        <div class="label">相关附件</div>
-        <div class="file" v-for="(item,index) in detail.files" @click="preFile(item)" :key="index">
-          <u-row justify="between">
-            <label class="left">
-              <img :src="$cdn + 'common/appendix.png'" alt="">
-              <span>{{ item.fileName }}.{{ item.postfix }}</span>
-            </label>
-            <span>{{ item.fileSizeStr }}</span>
-          </u-row>
-        </div>
-      </div>
-      <div class="card item-wrap">
-        <u-row justify="between">
-          <span>参会人</span>
-          <label class="right" @click="list=true">
-            查看全部<em>{{ detail.attendees && detail.attendees.length }}</em>人
-            <div class="right-arrow"></div>
-          </label>
-        </u-row>
-      </div>
-
-      <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议
-      </div>
-
-      <template v-else>
-        <div class="footer" v-if="['1','2'].includes(detail.status) && ['0','3'].includes(detail.joinStatus)">
-          <div class="leave" @click="updateStatus(0)">
-            <img :src="$cdn + 'sass/leave.png'" alt="">请假
-          </div>
-          <div @click="toDo" class="leave">
-            <img :src="$cdn + 'sass/toBe.png'" alt="">待定
-          </div>
-          <div @click="updateStatus(1)">确认会议</div>
-        </div>
-
-        <!--        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
-        <!--          <label>{{ detail.joinStatus|transform }}</label>-->
-        <!--          <img :src="$cdn + tag(detail.joinStatus)" alt="">-->
-        <!--        </div>-->
-      </template>
-
-    </template>
-    <template v-else>
-      <div class="att-list">
-        <AiTopFixed>
-          <u-tabs :list="tabs" :current="current" height="96" :is-scroll="false" bar-width="192"
-                  @change="change"></u-tabs>
-        </AiTopFixed>
-        <div v-for="(item,index) in detail.attendees && detail.attendees.filter(e=>e.joinStatus==current)" :key="index"
-             class="att-wrap">
-          <div class="left">
-            <u-avatar :src="item.avatar || (($cdn + 'common/xztx.png'))" size="74" mode="square" style="margin-right: 8px"></u-avatar>
-            <AiOpenData type="userName" :openid="item.name"></AiOpenData>
-          </div>
-          <!--          <img :src="$cdn + 'common/phone.png'" alt="" @click="call(item)">-->
-        </div>
-      </div>
-    </template>
-    <u-modal v-model="show" title="提示" show-cancel-button content='是否要取消该会议？' @confirm="onConfirm"></u-modal>
-    <AiBack/>
-  </div>
-</template>
-
-<script>
-  import {mapActions, mapState} from "vuex";
-
-  export default {
-    name: "detail",
-    data() {
-      return {
-        detail: {},
-        list: false,
-        current: 0,
-        pageShow: false,
-        show: false,
-        id:null,
-      }
-    },
-    onLoad(opt){
-      this.id = opt.id;
-    },
-    computed: {
-      ...mapState(["user"]),
-      tabs() {
-        return [
-          {name: this.count(0) + "人未确认"},
-          {name: this.count(1) + "人已确认"},
-          {name: this.count(2) + "人已请假"},
-          {name: this.count(3) + "人待定"},
-        ]
-      },
-    },
-    methods: {
-      onConfirm() {
-        this.$http.post("/app/appmeetinginfo/cancel", null, {
-          params: {
-            meetingId: this.id,
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast("取消成功");
-            this.getDetail();
-          }
-        })
-      },
-      handleCancel() {
-        this.show = true;
-      },
-      toDo() {
-        this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
-          params: {
-            meetingId: this.id,
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast("会议待定");
-            setTimeout(_ => {
-              uni.navigateBack();
-            }, 800)
-          }
-        })
-      },
-      count(sta) {
-        return this.detail.attendees ? this.detail.attendees?.filter(e => e.joinStatus == sta)?.length : 0;
-      },
-      change(index) {
-        this.current = index;
-        this.detail = {};
-        this.getDetail();
-      },
-      call(item) {
-        if (item.phone) {
-          uni.makePhoneCall({
-            phoneNumber: item.phone
-          });
-        }
-      },
-      ...mapActions(['previewFile', 'injectJWeixin']),
-      preFile(e) {
-        if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
-          uni.previewImage({
-            current: e.url,
-            urls: [e.url]
-          })
-        } else {
-          this.previewFile({...e})
-        }
-      },
-      tag(status) {
-        return {
-          "1": "common/2confirmed2.png",
-          "2": "common/2absent2.png"
-        }[status]
-      },
-      updateStatus(status) {
-        this.$http.post(status == 0 ? "/app/appmeetinginfo/absent" : "/app/appmeetinginfo/confirm", null, {
-          params: {
-            meetingId: this.id,
-            reason: status == 0 ? "" : null
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast(status == 0 ? "请假成功" : "确认成功")
-            this.getDetail()
-          }
-        })
-      },
-      color(status) {
-        if (status == 1) {
-          return "#FF8822"
-        }
-
-        if (status == 2) {
-          return "#1365DD"
-        }
-
-        if (status == 3) {
-          return "#FF4466"
-        }
-
-        return "#343D65"
-      },
-      getDetail() {
-        this.$http.post("/app/appmeetinginfo/info-id", null, {
-          params: {id: this.id}
-        }).then(res => {
-          if (res && res.data) {
-            this.detail = res.data
-            this.pageShow = true
-          }
-        })
-      }
-    },
-    created() {
-      this.injectJWeixin(['sendChatMessage']).then(() => {
-        this.getDetail()
-      })
-    },
-
-    onShow() {
-      document.title = "会议详情";
-      this.$dict.load("meetStatus");
-      wx.hideOptionMenu();
-    },
-    filters: {
-      transform(status) {
-        if (status == 1) {
-          return "已确认"
-        }
-        if (status == 2) {
-          return "已请假"
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .detail {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 140px;
-
-
-    ::v-deep .AiTopFixed {
-      margin-bottom: 16px;
-
-      .content {
-        padding: 0 !important;
-      }
-    }
-
-
-    .att-list {
-      min-height: 100%;
-
-      .att-wrap {
-        display: flex;
-        height: 112px;
-        align-items: center;
-        justify-content: space-between;
-        background-color: #ffffff;
-        box-sizing: border-box;
-        padding: 0 50px;
-        border-bottom: 1px solid #E4E5E6;
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          &:after {
-            content: "";
-            position: absolute;
-            right: 0;
-            bottom: 0;
-            width: 622px;
-            height: 2px;
-            background-color: rgba(216, 221, 230, 0.5);
-          }
-
-          .name {
-            font-size: 30px;
-            font-weight: 600;
-            color: #333333;
-          }
-        }
-
-        & > img {
-          width: 48px;
-          height: 48px;
-        }
-      }
-    }
-
-    .card {
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
-      box-sizing: border-box;
-      padding: 16px 32px;
-
-      header {
-        font-size: 40px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 64px;
-        letter-spacing: 1px;
-      }
-
-      .u-row {
-        & > div {
-          border-radius: 50%;
-          text-align: center;
-          font-size: 30px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          /*margin-left: 8px;*/
-        }
-
-        & > span {
-          font-size: 30px;
-          color: #343D65;
-          margin-left: 16px;
-        }
-
-        ::v-deep .u-avatar__img {
-          width: 56px;
-          height: 56px;
-          vertical-align: middle;
-          color: #ffffff;
-          background-color: #2266FF;
-          font-size: 16px;
-        }
-
-        .user-name{
-          font-size: 30px;
-          color: #343D65;
-        }
-
-        img {
-          width: 48px;
-          height: 48px;
-        }
-      }
-
-      & > span {
-        font-size: 32px;
-        color: #333333;
-        line-height: 48px;
-        letter-spacing: 1px;
-        display: inline-block;
-        box-sizing: border-box;
-        padding: 16px 0;
-      }
-
-      .label {
-        height: 96px;
-        font-size: 32px;
-        color: #333333;
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-      }
-
-      .file {
-        height: 128px;
-        background: #FFFFFF;
-        border-radius: 8px;
-        border: 1px solid #CCCCCC;
-        box-sizing: border-box;
-        padding: 0 16px;
-        margin-bottom: 32px;
-
-        & > .u-row {
-          height: 100%;
-
-          .left {
-            width: 522px;
-            display: flex;
-            align-items: center;
-
-            & > img {
-              width: 96px;
-              height: 96px;
-            }
-
-            & > span {
-              font-size: 32px;
-              color: #333333;
-              display: inline-block;
-              line-height: 44px;
-              text-overflow: ellipsis;
-              overflow-x: hidden;
-              white-space: nowrap;
-            }
-          }
-
-          & > span {
-            font-size: 28px;
-            color: #999999;
-          }
-        }
-      }
-
-      .active {
-        background-color: #F3F6F9;
-      }
-
-      .name {
-        font-size: 32px;
-        font-weight: 400;
-        color: #333333;
-      }
-
-      .wrap {
-        height: 112px;
-        display: flex;
-        align-items: center;
-        position: relative;
-
-        &:after {
-          content: "";
-          position: absolute;
-          right: 0;
-          bottom: 0;
-          width: 622px;
-          height: 2px;
-          background-color: rgba(216, 221, 230, 0.5);
-        }
-
-        & > label {
-          width: 80px;
-          height: 80px;
-          border-radius: 50%;
-          background-color: #4E8EEE;
-          font-size: 28px;
-          font-weight: 600;
-          color: #FFFFFF;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-
-    .item-wrap {
-      height: 112px;
-      padding: 0 32px;
-
-      .u-row {
-        height: 100%;
-
-        & > span {
-          font-size: 32px;
-          font-weight: 400;
-          color: #333333;
-        }
-      }
-
-      .right {
-        font-size: 28px;
-        color: #999999;
-        display: flex;
-        align-items: center;
-
-        em {
-          font-style: normal;
-          color: #1365DD;
-        }
-
-        .right-arrow {
-          width: 16px;
-          height: 16px;
-          border-top: 5px solid #CCCCCC;
-          border-right: 5px solid #CCCCCC;
-          transform: rotate(45deg);
-        }
-      }
-    }
-
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background-color: #FFFFFF;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      & > div {
-        font-size: 28px;
-        color: #666666;
-        display:flex;
-        flex-direction: column;
-
-        & > img {
-          width: 48px;
-          height: 48px;
-        }
-      }
-
-      & > div:nth-child(1), & > div:nth-child(2) {
-        width: 135px;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      & > div:last-child {
-        width: calc(100% - 270px);
-        height: 100%;
-        color: #FFFFFF;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-color: #1365DD;
-      }
-
-      & > label {
-        font-size: 36px;
-        font-weight: 400;
-        color: #999999;
-      }
-
-      /*img {*/
-      /*  width: 158px;*/
-      /*  height: 104px;*/
-      /*  position: absolute;*/
-      /*  right: 0;*/
-      /*  top: 0;*/
-      /*}*/
-    }
-
-    .cancel {
-      color: #ffffff;
-      font-size: 36px;
-      background-color: #005DFF
-    }
-  }
-</style>
diff --git a/src/apps/AppMeetingNotice/meetingList.vue b/src/apps/AppMeetingNotice/meetingList.vue
deleted file mode 100644
index c698b564..00000000
--- a/src/apps/AppMeetingNotice/meetingList.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<template>
-  <div class="meeting-list">
-    <div class="card" v-for="(item,index) in list" :key="index" @click="detail(item)">
-      <header>
-        <span>{{item.title}}</span>
-        <span>
-          <span v-if="index==2">保存于</span>
-          {{item.createTime}}</span>
-      </header>
-      <u-row justify="between">
-        <div class="time">
-          <span>{{item.startTime|format}}</span>
-          <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
-        </div>
-        <div class="arrow"></div>
-        <div class="time">
-          <span>{{item.endTime|format}}</span>
-          <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
-        </div>
-      </u-row>
-      <u-row class="info">
-        <span>发起人员：</span>
-        <AiOpenData type="userName" :openid="item.createUserId"/>
-      </u-row>
-      <u-gap height="20"></u-gap>
-      <u-row class="info">
-        <span>会议地点：</span>
-        <span>{{item.address}}</span>
-      </u-row>
-      <div class="tag" v-if="item.status!=0" :style="{background:'url(' + $cdn + tag(item.status) +')'}"></div>
-    </div>
-    <u-loadmore :status="status" v-if="list.length"/>
-    <AiEmpty v-if="!list.length"></AiEmpty>
-    <AiBack/>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    name: "meetingList",
-    props: {
-      params: {
-        type: [String, Number, Object],
-      }
-    },
-    data() {
-      return {
-        list: [],
-        current: 1,
-        index: null,
-        status: "加载更多",
-      }
-    },
-
-    onLoad(opt) {
-      this.index = opt.index
-      uni.setNavigationBarTitle({
-        title: opt.index == 0 ? "历史会议" : "草稿箱"
-      });
-      this.getData();
-    },
-
-    methods: {
-      detail({id}) {
-        let url
-        if (this.index == 2) {
-          url = "/apps/AppMeetingNotice/addMeeting?id=" + id
-        } else {
-          url = "/apps/AppMeetingNotice/detail?id=" + id
-        }
-        uni.navigateTo({url})
-      },
-      tag(status) {
-        return {
-          "1": 'common/1wks.png',
-          "2": 'common/1jxz.png',
-          "3": 'common/1yqx.png',
-          "4": 'common/1yjs.png'
-        }[status]
-      },
-      getData() {
-        this.$http.post("/app/appmeetinginfo/list", null, {
-          params: {
-            listType: this.index == 0 ? "2" : '0',
-            meetingStatus: this.index == 0 ? "4" : "0",
-            size: 10,
-            current: this.current,
-          }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          }
-        })
-      },
-    },
-
-    onReachBottom() {
-      this.current ++;
-      this.getData();
-    },
-
-    filters: {
-      format(date) {
-        return date.split(" ")[1].substr(0, 5)
-      },
-      formatDate(date, index) {
-        return date.split(" ")[0].split("-")[index]
-      },
-      formatWeek(date) {
-        return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
-      }
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-  .meeting-list {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    box-sizing: border-box;
-    padding: 32px;
-
-    .card {
-      background-color: #FFFFFF;
-      box-sizing: border-box;
-      padding: 32px;
-      border-radius: 8px;
-      margin-bottom: 32px;
-      position: relative;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      & > header {
-        width: 95%;
-        font-size: 32px;
-        font-weight: 600;
-        color: #333333;
-        display: flex;
-        flex-direction: column;
-
-        & > span:last-child {
-          font-size: 28px;
-          font-weight: 400;
-          color: #999999;
-          margin-top: 10px;
-        }
-      }
-
-      .time {
-        display: flex;
-        flex-direction: column;
-        margin: 46px 0;
-
-        & > span:first-child {
-          font-size: 60px;
-          font-weight: 600;
-          color: #333333;
-          line-height: 84px;
-        }
-
-        & > span:last-child {
-          font-size: 22px;
-          color: #333333;
-        }
-      }
-
-      .arrow {
-        width: 28px;
-        height: 68px;
-        overflow: hidden;
-        position: relative;
-        transform: rotate(180deg);
-
-        &:before, &:after {
-          content: "";
-          width: 50px;
-          height: 50px;
-          position: absolute;
-          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-        }
-
-        &:before {
-          top: 59px;
-          background-color: #CCCCCC;
-        }
-
-        &:after {
-          left: 7px;
-          top: 59px;
-          background-color: #FFFFFF;
-        }
-      }
-
-      .info {
-        flex-wrap: nowrap;
-
-        & > span:first-child {
-          flex-shrink: 0;
-          font-size: 30px;
-          color: #999999;
-        }
-
-        & > span:last-child {
-          font-size: 30px;
-          color: #343D65;
-        }
-      }
-
-      .tag {
-        width: 112px;
-        height: 112px;
-        background-repeat: no-repeat !important;
-        background-size: 100% 100% !important;
-        position: absolute;
-        top: 0;
-        right: 0;
-      }
-    }
-  }
-</style>
diff --git a/src/apps/AppNotification/detail.vue b/src/apps/AppNotification/detail.vue
deleted file mode 100644
index aa53409c..00000000
--- a/src/apps/AppNotification/detail.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
-  <div class="detail" v-if="pageShow">
-    <template v-if="detailObj.status!=2">
-      <div class="card">
-        <header>{{ detailObj.title }}</header>
-        <u-gap height="16"></u-gap>
-        <u-row>
-          <span>发布人：</span>
-          <span v-if="detailObj.createUserId">
-            <AiOpenData type="userName" :openid="detailObj.createUserId"></AiOpenData>
-          </span>
-        </u-row>
-        <u-gap height="8"></u-gap>
-        <u-row>
-          <span>发布部门：</span>
-          <span v-if="detailObj.unitName">
-            <AiOpenData type="departmentName" :openid="detailObj.unitName"></AiOpenData>
-          </span>
-        </u-row>
-        <u-gap height="8"></u-gap>
-        <u-row>
-          <span>发布日期：</span>
-          <span>{{ detailObj.releaseTime }}</span>
-        </u-row>
-        <u-gap height="8"></u-gap>
-      </div>
-
-      <div class="card">
-        <div class="label">公告内容</div>
-        <u-parse :html="detailObj.content"></u-parse>
-      </div>
-
-      <div class="card" style="padding-top: 0" v-if="detailObj.files && detailObj.files.length">
-        <div class="label">相关附件</div>
-        <div class="file" v-for="(item,index) in detailObj.files" :key="index" @click="preFile(item)">
-          <u-row justify="between">
-            <label class="left">
-              <img :src="$cdn + 'common/appendix.png'" alt="">
-              <span>{{ item.name }}.{{ item.postfix }}</span>
-            </label>
-            <span>{{ (item.size / 1024).toFixed(2) }}KB</span>
-          </u-row>
-        </div>
-      </div>
-
-      <div class="card" @click="handleClick">
-        <u-row justify="between" class="item">
-          <span>接收对象</span>
-          <div class="right">
-            <em>{{ detailObj.readNum }}人</em>已读
-            <em>{{ detailObj.unReadNum }}人</em>未读
-            <div class="arrow"></div>
-          </div>
-        </u-row>
-      </div>
-    </template>
-    <AiEmpty description="该通知已撤回" v-else/>
-    <AiBack/>
-  </div>
-</template>
-
-<script>
-  import {mapActions} from "vuex";
-
-  export default {
-    name: "detail",
-    data() {
-      return {
-        detailObj: {},
-        id: null,
-        pageShow: false,
-        flag: false,
-      }
-    },
-
-    onLoad(opt) {
-      this.id = opt.id;
-      this.flag = opt.flag;
-    },
-
-    created() {
-      this.injectJWeixin(['sendChatMessage']).then(() => {
-        this.getDetail()
-      })
-    },
-
-    onShow() {
-      document.title = "公告详情";
-      wx.hideOptionMenu();
-    },
-
-    methods: {
-      ...mapActions(['previewFile', 'injectJWeixin']),
-      preFile(e) {
-        if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
-          uni.previewImage({
-            current: e.url,
-            urls: [e.url]
-          })
-        } else {
-          this.previewFile({...e})
-        }
-      },
-      getDetail() {
-        this.$http.post("/app/appannouncement/detail", null, {
-          params: {
-            id: this.id,
-            detail: this.flag
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.detailObj = res.data;
-            this.pageShow = true
-          }
-        })
-      },
-      handleClick() {
-        uni.navigateTo({
-          url:"/apps/AppNotification/read?id=" + this.id,
-        })
-      }
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-  .detail {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 140px;
-
-    ::v-deep .content {
-      padding: 0;
-    }
-
-    .card {
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
-      box-sizing: border-box;
-      padding: 16px 32px;
-
-      header {
-        font-size: 40px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 64px;
-        letter-spacing: 1px;
-      }
-
-      .u-row {
-        & > div {
-          border-radius: 50%;
-          text-align: center;
-          font-size: 22px;
-          font-weight: bold;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-
-        & > span {
-          font-size: 30px;
-          color: #343D65;
-          line-height: 48px;
-        }
-
-        & > span:last-child {
-          font-size: 30px;
-          /*color: #343D65;*/
-          /*margin-left: 16px;*/
-          line-height: 48px;
-        }
-
-        .title {
-          width: 490px;
-          height: 112px;
-          display: flex;
-          align-items: center;
-          font-size: 32px;
-          color: #333333;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-
-        .right {
-          font-size: 28px;
-          display: flex;
-          align-items: center;
-          color: #666666;
-
-          .arrow {
-            width: 16px;
-            height: 16px;
-            border-top: 3px solid #CCCCCC;
-            border-right: 3px solid #CCCCCC;
-            transform: rotate(45deg);
-          }
-        }
-      }
-
-      .item {
-        position: relative;
-        height: 80px;
-
-        &:after {
-          width: 100%;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          content: "";
-          position: absolute;
-          left: 0;
-          bottom: 0;
-        }
-      }
-
-      & > span {
-        font-size: 32px;
-        color: #333333;
-        line-height: 48px;
-        letter-spacing: 1px;
-        display: inline-block;
-      }
-
-      .label {
-        height: 80px;
-        font-size: 32px;
-        color: #333333;
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-
-        & > em {
-          font-style: normal;
-          font-size: 32px;
-          color: #1365DD;
-        }
-      }
-
-      .file {
-        height: 128px;
-        background: #FFFFFF;
-        border-radius: 8px;
-        border: 1px solid #CCCCCC;
-        box-sizing: border-box;
-        padding: 0 16px;
-        margin-bottom: 32px;
-
-        & > .u-row {
-          height: 100%;
-
-          .left {
-            width: 476px;
-            display: flex;
-            align-items: center;
-            word-break: break-all;
-
-            & > img {
-              flex-shrink: 0;
-              width: 96px;
-              height: 96px;
-            }
-
-            & > span {
-              font-size: 32px;
-              color: #333333;
-              display: inline-block;
-              line-height: 44px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 2;
-            }
-          }
-
-          & > span {
-            font-size: 28px;
-            color: #999999;
-          }
-        }
-      }
-
-      .active {
-        background-color: #F3F6F9;
-      }
-
-      & > text {
-        width: 100%;
-        display: inline-block;
-        font-size: 30px;
-        color: #649EFD;
-        text-align: center;
-      }
-
-      .progress {
-        height: 12px;
-        background: #F2F4FC;
-        border-radius: 12px;
-        position: relative;
-        margin: 16px 0 64px 0;
-
-        .pro-active {
-          height: 12px;
-          background: #639EFD;
-          border-radius: 12px;
-          position: absolute;
-          left: 0;
-          top: 0;
-        }
-
-      }
-
-      em {
-        font-style: normal;
-        font-size: 28px;
-        color: #1365DD;
-      }
-
-      ::v-deep .u-collapse {
-        position: relative;
-
-        &:after {
-          content: "";
-          width: 718px;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          position: absolute;
-          left: 0;
-          bottom: 0;
-        }
-
-        .u-collapse-head {
-          padding: 40px 0;
-        }
-
-        .u-collapse-content {
-          font-size: 32px;
-          color: #333333;
-          line-height: 48px;
-          letter-spacing: 1px;
-        }
-      }
-    }
-
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background: #1365DD;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 36px;
-      color: #FFFFFF;
-    }
-  }
-</style>
diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 453750da..868f94d7 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -2,19 +2,23 @@
   <div class="AppWalkask">
     <template v-if="isList">
       <div class="header-top">
-        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6"
+                inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
       </div>
 
       <div class="header-middle">
         <div class="currentLeft" v-if="currentTabs == 0">
           <div class="currentLeft-top">
             <div class="left">
-              <img src="./components/images/icon2.png" alt="" />
+              <img src="./components/images/icon2.png" alt=""/>
 
-              <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </AiAreaPicker>
+              <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect"
+                            style="color: #fff"></AiAreaPicker>
             </div>
 
-            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF"
+                      search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch"
+                      @clear="handerClear"></u-search>
           </div>
 
           <template v-if="data.length > 0">
@@ -29,7 +33,8 @@
                 <div class="cards-hint">{{ item.description }}</div>
 
                 <div class="imgs">
-                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" />
+                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i"
+                       @click.stop="previewImage(item.images, items.url)"/>
                 </div>
 
                 <div class="cards-bottom">
@@ -46,7 +51,7 @@
           </template>
 
           <div v-else>
-            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"> </AiEmpty>
+            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"></AiEmpty>
 
             <div class="addBtn">点击<span class="toAdds" @click="goDetail">新增按钮</span>试试试吧~</div>
           </div>
@@ -55,12 +60,15 @@
         <div class="currentRight" v-if="currentTabs == 1">
           <div class="currentLeft-top">
             <div class="left">
-              <img src="./components/images/icon2.png" alt="" />
+              <img src="./components/images/icon2.png" alt=""/>
 
-              <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </AiAreaPicker>
+              <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect"
+                            style="color: #fff"></AiAreaPicker>
             </div>
 
-            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+            <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF"
+                      search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch"
+                      @clear="handerClear"></u-search>
           </div>
 
           <template v-if="data.length > 0">
@@ -75,7 +83,8 @@
                 <div class="cards-hint">{{ item.description }}</div>
 
                 <div class="imgs">
-                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" />
+                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i"
+                       @click.stop="previewImage(item.images, items.url)"/>
                 </div>
 
                 <div class="cards-bottom">
@@ -92,17 +101,18 @@
           </template>
 
           <div v-else>
-            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"> </AiEmpty>
+            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"></AiEmpty>
 
             <div class="addBtn">点击<span class="toAdds" @click="goDetail">新增按钮</span>试试试吧~</div>
           </div>
         </div>
       </div>
 
-      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
+      <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true"
+               :show-title="false" @confirm="delet"></u-modal>
 
       <AiFixedBtn>
-        <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" />
+        <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()"/>
       </AiFixedBtn>
     </template>
 
@@ -111,7 +121,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 import add from './add.vue'
 import detail from './detail.vue'
 
@@ -147,37 +157,38 @@ export default {
       deletId: '',
     }
   },
-  computed: { ...mapState(['user']) },
+  computed: {...mapState(['user'])},
   created() {
     this.areaId = this.user.areaId
     this.getList()
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     getList() {
       this.$http
-        .post('/app/appvisitvondolence/list', null, {
-          params: {
-            size: 6,
-            current: this.current,
-            areaId: this.areaId,
-            createUserId: this.currentTabs == 1 ? this.user.id : '',
-            title: this.keyword,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.data = res.data.records
-            if (this.data) {
-              this.data.map((item) => {
-                if (item.images) {
-                  item.images = JSON.parse(item.images || '[]')
-                }
-                return item
-              })
-            }
+      .post('/app/appvisitvondolence/list', null, {
+        params: {
+          size: 6,
+          current: this.current,
+          areaId: this.areaId,
+          createUserId: this.currentTabs == 1 ? this.user.id : '',
+          title: this.keyword,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.data = res.data.records
+          if (this.data) {
+            this.data.map((item) => {
+              if (item.images) {
+                item.images = JSON.parse(item.images || '[]')
+              }
+              return item
+            })
           }
-        })
+        }
+      })
     },
 
     areaSelect(e) {
@@ -247,11 +258,13 @@ export default {
 <style lang="scss" scoped>
 .AppWalkask {
   height: 100%;
+
   .header-middle {
     .currentLeft,
     .currentRight {
       padding-bottom: 56px;
       background: #fff;
+
       .currentLeft-top {
         display: flex;
         align-items: center;
@@ -262,6 +275,7 @@ export default {
           width: 40%;
           display: flex;
           align-items: center;
+
           img {
             width: 48px;
             height: 48px;
@@ -272,6 +286,7 @@ export default {
       .AiCard {
         ::v-deep .start {
           border-bottom: 1px solid #dddddd;
+
           .fill {
             .cards-left {
               .walkName {
@@ -280,6 +295,7 @@ export default {
                 margin-right: 16px;
                 color: #333;
               }
+
               .tags {
                 display: inline-block;
                 padding: 6px 16px;
@@ -290,6 +306,7 @@ export default {
                 margin-left: 16px;
               }
             }
+
             .cards-hint {
               margin-top: 16px;
               font-size: 30px;
@@ -302,17 +319,21 @@ export default {
               -webkit-line-clamp: 2;
               -webkit-box-orient: vertical;
             }
+
             .imgs {
               margin-top: 20px;
+
               img {
                 width: 221px;
                 height: 221px;
                 margin-right: 8px;
               }
+
               img:nth-child(3n + 0) {
                 margin-right: 0;
               }
             }
+
             .cards-bottom {
               margin: 24px 0 16px 0;
               font-size: 24px;
@@ -341,6 +362,7 @@ export default {
         color: #b7b7b7;
         margin-top: 5px;
         font-weight: 800;
+
         .toAdds {
           color: #467dfe;
         }
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index 1ded95dd..48367c68 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -4,30 +4,34 @@
       <div class="header-description">
         <u-form :model="forms" ref="uForm" label-width="auto">
           <u-form-item label="区域选择" prop="areaId" style="position: relative">
-            <AiAreaPicker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect" style="color: #333"> </AiAreaPicker>
+            <AiAreaPicker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect"
+                          style="color: #333"></AiAreaPicker>
           </u-form-item>
 
           <u-form-item label="走访对象" prop="create_user_name" required style="position: relative">
-            <u-input v-model="forms.create_user_name" disabled placeholder="请选择走访对象" @click="toWalkObject" />
+            <u-input v-model="forms.create_user_name" disabled placeholder="请选择走访对象" @click="toWalkObject"/>
 
             <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
           </u-form-item>
 
           <u-form-item label="现实状态" prop="reality" style="position: relative">
-            <u-input v-model="forms.reality" disabled placeholder="请选择走访慰问对象" @click="showStstus = true" />
+            <u-input v-model="forms.reality" disabled placeholder="请选择走访慰问对象" @click="showStstus = true"/>
 
-            <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="realityStstus"></u-select>
+            <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue"
+                      label-name="dictName" @confirm="realityStstus"></u-select>
 
             <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
           </u-form-item>
 
           <u-form-item label="入户走访事项" prop="title" required label-position="top">
-            <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" maxlength="30" />
+            <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60"
+                     maxlength="30"/>
             <div>{{ forms.title.length }}/30</div>
           </u-form-item>
 
           <u-form-item label="入户走访内容" prop="description" label-position="top">
-            <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" maxlength="500" />
+            <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60"
+                     maxlength="500"/>
             <div>{{ forms.description.length }}/500</div>
           </u-form-item>
 
@@ -47,7 +51,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 import walkObject from './walkObject'
 
 export default {
@@ -79,7 +83,7 @@ export default {
       clickedUserSelect: false,
     }
   },
-  computed: { ...mapState(['user']) },
+  computed: {...mapState(['user'])},
   created() {
     this.areaIdProps = this.user.areaId
     this.$dict.load('realityStatus').then(() => {
@@ -118,35 +122,35 @@ export default {
           if (this.forms.images) {
             this.forms.images.map((e) => {
               console.log(e)
-              imgs.push({ url: e.url, id: e.id })
+              imgs.push({url: e.url, id: e.id})
             })
           }
 
           this.flag = true
           this.$http
-            .post(`/app/appvisitvondolence/addOrUpdate`, {
-              areaId: this.forms.areaId,
-              applicationId: this.forms.applicationId,
-              name: this.forms.create_user_name,
-              optionId: this.forms.applicationId,
-              reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
-              title: this.forms.title,
-              description: this.forms.description,
-              createUserId: this.user.id,
-              createUserName: this.user.name,
-              images: JSON.stringify(imgs) || [],
-              id: this.id,
-            })
-            .then((res) => {
-              console.log(4)
-              if (res.code == 0) {
-                console.log(5)
-                this.$u.toast('保存成功')
-                this.flag = false
-                uni.navigateTo({ url: `./AppWalkask` })
-                console.log(6)
-              }
-            })
+          .post(`/app/appvisitvondolence/addOrUpdate`, {
+            areaId: this.forms.areaId,
+            applicationId: this.forms.applicationId,
+            name: this.forms.create_user_name,
+            optionId: this.forms.applicationId,
+            reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
+            title: this.forms.title,
+            description: this.forms.description,
+            createUserId: this.user.id,
+            createUserName: this.user.name,
+            images: JSON.stringify(imgs) || [],
+            id: this.id,
+          })
+          .then((res) => {
+            console.log(4)
+            if (res.code == 0) {
+              console.log(5)
+              this.$u.toast('保存成功')
+              this.flag = false
+              uni.navigateTo({url: `./AppWalkask`})
+              console.log(6)
+            }
+          })
         } else {
           this.$u.toast('保存失败')
         }
@@ -187,20 +191,24 @@ export default {
 .add {
   height: 100%;
   padding-bottom: 112px;
+
   .header-description {
     ::v-deep .u-form {
       .u-form-item {
         margin-bottom: 16px;
+
         .u-form-item__body {
           .u-form-item--right__content__slot {
             padding-bottom: 0;
           }
         }
       }
+
       .u-form-item:last-child {
         margin-bottom: 0;
         padding-bottom: 20px !important;
       }
+
       .avatars {
         .u-form-item__body {
           .default {
diff --git a/src/apps/AppWalkask/detail.vue b/src/apps/AppWalkask/detail.vue
index a8572ceb..8da84c86 100644
--- a/src/apps/AppWalkask/detail.vue
+++ b/src/apps/AppWalkask/detail.vue
@@ -28,7 +28,7 @@
       <div class="hint-con" v-if="data.description">{{ data.description }}</div>
 
       <div class="imgs">
-        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" />
+        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index"/>
       </div>
     </div>
 
@@ -54,7 +54,8 @@ export default {
       this.getDetail()
     })
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     getDetail() {
       this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.params.id}`).then((res) => {
@@ -73,14 +74,17 @@ export default {
 <style lang="scss" scoped>
 .detail {
   height: 100%;
+
   .header-top {
     background: #3975c6;
     padding: 24px 32px 32px;
+
     .hint {
       font-size: 40px;
       font-weight: 500;
       color: #ffffff;
     }
+
     .walk-item {
       font-size: 28px;
       color: #d7e3f3;
@@ -91,17 +95,21 @@ export default {
   .header-middle {
     background: #fff;
     padding: 32px 32px 32px 32px;
+
     .hint-con {
       font-size: 32px;
       color: #666666;
     }
+
     .imgs {
       margin: 32px 0 48px 0;
+
       img {
         width: 218px;
         height: 218px;
         margin-right: 16px;
       }
+
       img:nth-child(3n + 0) {
         margin-right: 0;
       }
diff --git a/src/apps/AppWalkask/walkObject.vue b/src/apps/AppWalkask/walkObject.vue
index d19c088e..0e4d548b 100644
--- a/src/apps/AppWalkask/walkObject.vue
+++ b/src/apps/AppWalkask/walkObject.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="walkObject">
     <div class="header-top">
-      <u-search v-model="keyword" placeholder="搜索" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
+      <u-search v-model="keyword" placeholder="搜索" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC"
+                placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
     </div>
 
     <div class="header-middle">
@@ -12,7 +13,8 @@
       <div class="Checkbox">
         <div v-if="DiyList.length > 0">
           <u-collapse event-type="close" arrowaccordion>
-            <u-collapse-item v-for="(item, index) in DiyList" :title="item.menuLevel2Name" :key="index" @change="selectUser(item)">
+            <u-collapse-item v-for="(item, index) in DiyList" :title="item.menuLevel2Name" :key="index"
+                             @change="selectUser(item)">
               <u-radio-group v-model="value">
                 <u-radio v-for="(item, index) in userList" :key="index" :name="item.create_user_name">
                   {{ item.create_user_name }}
@@ -26,7 +28,7 @@
           </u-collapse>
         </div>
 
-        <AiEmpty description="没有数据" class="emptyWrap" v-else> </AiEmpty>
+        <AiEmpty description="没有数据" class="emptyWrap" v-else></AiEmpty>
       </div>
     </div>
 
@@ -73,7 +75,8 @@ export default {
   created() {
     this.getDiyList()
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     getDiyList() {
       this.$http.post('/app/appapplicationinfo/queryApplicationListByType?type=0').then((res) => {
@@ -86,7 +89,7 @@ export default {
     selectUser(item) {
       console.log(item.id)
       this.appId = item.id
-      this.$http.post(`/app/appapplicationinfo/list?appId=${item.id}&current=${this.current}&size=${99}`, { searchParam: this.keyword }).then((res) => {
+      this.$http.post(`/app/appapplicationinfo/list?appId=${item.id}&current=${this.current}&size=${99}`, {searchParam: this.keyword}).then((res) => {
         if (res.code == 0) {
           this.userList = res.data.records
         }
@@ -96,7 +99,7 @@ export default {
     submit() {
       this.userList.map((item) => {
         if (item.create_user_name == this.value) {
-          this.$emit('back', { item: item, appId: this.appId })
+          this.$emit('back', {item: item, appId: this.appId})
         }
       })
     },
@@ -109,6 +112,7 @@ export default {
 .walkObject {
   background: #ffffff;
   padding-bottom: 118px;
+
   .header-top {
     background: #fff;
     padding: 20px 32px;
@@ -123,10 +127,12 @@ export default {
       font-size: 30px;
       font-weight: 500;
     }
+
     .empty-div {
       height: 16px;
       background: #f5f5f5;
     }
+
     .Checkbox {
       padding: 0 20px 0 30px;
 
@@ -153,6 +159,7 @@ export default {
     width: 100%;
     box-sizing: border-box;
     padding: 0 32px;
+
     .subBtn {
       margin: 20px 0 18px 0;
       padding: 18px 32px;
@@ -161,8 +168,10 @@ export default {
       font-size: 32px;
       color: #ffffff;
     }
+
     .typeName {
       margin: 36px 0 22px 0;
+
       .typeName-box {
         padding: 16px 14px;
         background: #eaeef1;
@@ -171,6 +180,7 @@ export default {
         font-weight: 500;
         margin-left: 10px;
       }
+
       .typeName-box:first-child {
         margin-left: 0;
       }
diff --git a/src/common/permission.js b/src/common/permission.js
index 03abce62..68f6c14a 100644
--- a/src/common/permission.js
+++ b/src/common/permission.js
@@ -3,243 +3,243 @@
 var isIOS
 
 function album() {
-    var result = 0;
-    var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
-    var authStatus = PHPhotoLibrary.authorizationStatus();
-    if (authStatus === 0) {
-        result = null;
-    } else if (authStatus == 3) {
-        result = 1;
-    } else {
-        result = 0;
-    }
-    plus.ios.deleteObject(PHPhotoLibrary);
-    return result;
+  var result = 0;
+  var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+  var authStatus = PHPhotoLibrary.authorizationStatus();
+  if (authStatus === 0) {
+    result = null;
+  } else if (authStatus == 3) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(PHPhotoLibrary);
+  return result;
 }
 
 function camera() {
-    var result = 0;
-    var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
-    var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
-    if (authStatus === 0) {
-        result = null;
-    } else if (authStatus == 3) {
-        result = 1;
-    } else {
-        result = 0;
-    }
-    plus.ios.deleteObject(AVCaptureDevice);
-    return result;
+  var result = 0;
+  var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+  var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+  if (authStatus === 0) {
+    result = null;
+  } else if (authStatus == 3) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(AVCaptureDevice);
+  return result;
 }
 
 function location() {
-    var result = 0;
-    var cllocationManger = plus.ios.import("CLLocationManager");
-    var enable = cllocationManger.locationServicesEnabled();
-    var status = cllocationManger.authorizationStatus();
-    if (!enable) {
-        result = 2;
-    } else if (status === 0) {
-        result = null;
-    } else if (status === 3 || status === 4) {
-        result = 1;
-    } else {
-        result = 0;
-    }
-    plus.ios.deleteObject(cllocationManger);
-    return result;
+  var result = 0;
+  var cllocationManger = plus.ios.import("CLLocationManager");
+  var enable = cllocationManger.locationServicesEnabled();
+  var status = cllocationManger.authorizationStatus();
+  if (!enable) {
+    result = 2;
+  } else if (status === 0) {
+    result = null;
+  } else if (status === 3 || status === 4) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(cllocationManger);
+  return result;
 }
 
 function push() {
-    var result = 0;
-    var UIApplication = plus.ios.import("UIApplication");
-    var app = UIApplication.sharedApplication();
-    var enabledTypes = 0;
-    if (app.currentUserNotificationSettings) {
-        var settings = app.currentUserNotificationSettings();
-        enabledTypes = settings.plusGetAttribute("types");
-        if (enabledTypes == 0) {
-            result = 0;
-            console.log("推送权限没有开启");
-        } else {
-            result = 1;
-            console.log("已经开启推送功能!")
-        }
-        plus.ios.deleteObject(settings);
+  var result = 0;
+  var UIApplication = plus.ios.import("UIApplication");
+  var app = UIApplication.sharedApplication();
+  var enabledTypes = 0;
+  if (app.currentUserNotificationSettings) {
+    var settings = app.currentUserNotificationSettings();
+    enabledTypes = settings.plusGetAttribute("types");
+    if (enabledTypes == 0) {
+      result = 0;
+      console.log("推送权限没有开启");
     } else {
-        enabledTypes = app.enabledRemoteNotificationTypes();
-        if (enabledTypes == 0) {
-            result = 3;
-            console.log("推送权限没有开启!");
-        } else {
-            result = 4;
-            console.log("已经开启推送功能!")
-        }
+      result = 1;
+      console.log("已经开启推送功能!")
     }
-    plus.ios.deleteObject(app);
-    plus.ios.deleteObject(UIApplication);
-    return result;
+    plus.ios.deleteObject(settings);
+  } else {
+    enabledTypes = app.enabledRemoteNotificationTypes();
+    if (enabledTypes == 0) {
+      result = 3;
+      console.log("推送权限没有开启!");
+    } else {
+      result = 4;
+      console.log("已经开启推送功能!")
+    }
+  }
+  plus.ios.deleteObject(app);
+  plus.ios.deleteObject(UIApplication);
+  return result;
 }
 
 function contact() {
-    var result = 0;
-    var CNContactStore = plus.ios.import("CNContactStore");
-    var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
-    if (cnAuthStatus === 0) {
-        result = null;
-    } else if (cnAuthStatus == 3) {
-        result = 1;
-    } else {
-        result = 0;
-    }
-    plus.ios.deleteObject(CNContactStore);
-    return result;
+  var result = 0;
+  var CNContactStore = plus.ios.import("CNContactStore");
+  var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+  if (cnAuthStatus === 0) {
+    result = null;
+  } else if (cnAuthStatus == 3) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(CNContactStore);
+  return result;
 }
 
 function record() {
-    var result = null;
-    var avaudiosession = plus.ios.import("AVAudioSession");
-    var avaudio = avaudiosession.sharedInstance();
-    var status = avaudio.recordPermission();
-    console.log("permissionStatus:" + status);
-    if (status === 1970168948) {
-        result = null;
-    } else if (status === 1735552628) {
-        result = 1;
-    } else {
-        result = 0;
-    }
-    plus.ios.deleteObject(avaudiosession);
-    return result;
+  var result = null;
+  var avaudiosession = plus.ios.import("AVAudioSession");
+  var avaudio = avaudiosession.sharedInstance();
+  var status = avaudio.recordPermission();
+  console.log("permissionStatus:" + status);
+  if (status === 1970168948) {
+    result = null;
+  } else if (status === 1735552628) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(avaudiosession);
+  return result;
 }
 
 function calendar() {
-    var result = null;
-    var EKEventStore = plus.ios.import("EKEventStore");
-    var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
-    if (ekAuthStatus == 3) {
-        result = 1;
-        console.log("日历权限已经开启");
-    } else {
-        console.log("日历权限没有开启");
-    }
-    plus.ios.deleteObject(EKEventStore);
-    return result;
+  var result = null;
+  var EKEventStore = plus.ios.import("EKEventStore");
+  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+  if (ekAuthStatus == 3) {
+    result = 1;
+    console.log("日历权限已经开启");
+  } else {
+    console.log("日历权限没有开启");
+  }
+  plus.ios.deleteObject(EKEventStore);
+  return result;
 }
 
 function memo() {
-    var result = null;
-    var EKEventStore = plus.ios.import("EKEventStore");
-    var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
-    if (ekAuthStatus == 3) {
-        result = 1;
-        console.log("备忘录权限已经开启");
-    } else {
-        console.log("备忘录权限没有开启");
-    }
-    plus.ios.deleteObject(EKEventStore);
-    return result;
+  var result = null;
+  var EKEventStore = plus.ios.import("EKEventStore");
+  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+  if (ekAuthStatus == 3) {
+    result = 1;
+    console.log("备忘录权限已经开启");
+  } else {
+    console.log("备忘录权限没有开启");
+  }
+  plus.ios.deleteObject(EKEventStore);
+  return result;
 }
 
 
 function requestIOS(permissionID) {
-    return new Promise((resolve, reject) => {
-        switch (permissionID) {
-            case "push":
-                resolve(push());
-                break;
-            case "location":
-                resolve(location());
-                break;
-            case "record":
-                resolve(record());
-                break;
-            case "camera":
-                resolve(camera());
-                break;
-            case "album":
-                resolve(album());
-                break;
-            case "contact":
-                resolve(contact());
-                break;
-            case "calendar":
-                resolve(calendar());
-                break;
-            case "memo":
-                resolve(memo());
-                break;
-            default:
-                resolve(0);
-                break;
-        }
-    });
+  return new Promise((resolve, reject) => {
+    switch (permissionID) {
+      case "push":
+        resolve(push());
+        break;
+      case "location":
+        resolve(location());
+        break;
+      case "record":
+        resolve(record());
+        break;
+      case "camera":
+        resolve(camera());
+        break;
+      case "album":
+        resolve(album());
+        break;
+      case "contact":
+        resolve(contact());
+        break;
+      case "calendar":
+        resolve(calendar());
+        break;
+      case "memo":
+        resolve(memo());
+        break;
+      default:
+        resolve(0);
+        break;
+    }
+  });
 }
 
 function requestAndroid(permissionID) {
-    return new Promise((resolve, reject) => {
-        plus.android.requestPermissions(
-            [permissionID],
-            function(resultObj) {
-                var result = 0;
-                for (var i = 0; i < resultObj.granted.length; i++) {
-                    var grantedPermission = resultObj.granted[i];
-                    console.log('已获取的权限：' + grantedPermission);
-                    result = 1
-                }
-                for (var i = 0; i < resultObj.deniedPresent.length; i++) {
-                    var deniedPresentPermission = resultObj.deniedPresent[i];
-                    console.log('拒绝本次申请的权限：' + deniedPresentPermission);
-                    result = 0
-                }
-                for (var i = 0; i < resultObj.deniedAlways.length; i++) {
-                    var deniedAlwaysPermission = resultObj.deniedAlways[i];
-                    console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
-                    result = -1
-                }
-                resolve(result);
-            },
-            function(error) {
-                console.log('result error: ' + error.message)
-                resolve({
-                    code: error.code,
-                    message: error.message
-                });
-            }
-        );
-    });
+  return new Promise((resolve, reject) => {
+    plus.android.requestPermissions(
+        [permissionID],
+        function (resultObj) {
+          var result = 0;
+          for (var i = 0; i < resultObj.granted.length; i++) {
+            var grantedPermission = resultObj.granted[i];
+            console.log('已获取的权限：' + grantedPermission);
+            result = 1
+          }
+          for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+            var deniedPresentPermission = resultObj.deniedPresent[i];
+            console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+            result = 0
+          }
+          for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+            var deniedAlwaysPermission = resultObj.deniedAlways[i];
+            console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+            result = -1
+          }
+          resolve(result);
+        },
+        function (error) {
+          console.log('result error: ' + error.message)
+          resolve({
+            code: error.code,
+            message: error.message
+          });
+        }
+    );
+  });
 }
 
 function gotoAppPermissionSetting() {
-    if (permission.isIOS) {
-        var UIApplication = plus.ios.import("UIApplication");
-        var application2 = UIApplication.sharedApplication();
-        var NSURL2 = plus.ios.import("NSURL");
-        var setting2 = NSURL2.URLWithString("app-settings:");
-        application2.openURL(setting2);
-        plus.ios.deleteObject(setting2);
-        plus.ios.deleteObject(NSURL2);
-        plus.ios.deleteObject(application2);
-    } else {
-        var Intent = plus.android.importClass("android.content.Intent");
-        var Settings = plus.android.importClass("android.provider.Settings");
-        var Uri = plus.android.importClass("android.net.Uri");
-        var mainActivity = plus.android.runtimeMainActivity();
-        var intent = new Intent();
-        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-        var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
-        intent.setData(uri);
-        mainActivity.startActivity(intent);
-    }
+  if (permission.isIOS) {
+    var UIApplication = plus.ios.import("UIApplication");
+    var application2 = UIApplication.sharedApplication();
+    var NSURL2 = plus.ios.import("NSURL");
+    var setting2 = NSURL2.URLWithString("app-settings:");
+    application2.openURL(setting2);
+    plus.ios.deleteObject(setting2);
+    plus.ios.deleteObject(NSURL2);
+    plus.ios.deleteObject(application2);
+  } else {
+    var Intent = plus.android.importClass("android.content.Intent");
+    var Settings = plus.android.importClass("android.provider.Settings");
+    var Uri = plus.android.importClass("android.net.Uri");
+    var mainActivity = plus.android.runtimeMainActivity();
+    var intent = new Intent();
+    intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+    var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+    intent.setData(uri);
+    mainActivity.startActivity(intent);
+  }
 }
 
 const permission = {
-    get isIOS(){
-        return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios')
-    },
-    requestIOS: requestIOS,
-    requestAndroid: requestAndroid,
-    gotoAppSetting: gotoAppPermissionSetting
+  get isIOS() {
+    return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios')
+  },
+  requestIOS: requestIOS,
+  requestAndroid: requestAndroid,
+  gotoAppSetting: gotoAppPermissionSetting
 }
 
 module.exports = permission
diff --git a/src/components/AiAdd.vue b/src/components/AiAdd.vue
index 875a4879..c9e02d66 100644
--- a/src/components/AiAdd.vue
+++ b/src/components/AiAdd.vue
@@ -7,63 +7,62 @@
 </template>
 
 <script>
-  export default {
-    name: "AiAdd",
-    props: {
-
-    },
-    data() {
-      return {}
-    },
-    methods: {
-      add() {
-        this.$emit("add")
-      }
+export default {
+  name: "AiAdd",
+  props: {},
+  data() {
+    return {}
+  },
+  methods: {
+    add() {
+      this.$emit("add")
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .movableArea {
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    pointer-events: none;
-    z-index: 999;
+.movableArea {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 999;
 
-    uni-movable-view {
-      pointer-events: auto;
-    }
+  uni-movable-view {
+    pointer-events: auto;
+  }
+}
+
+.AiAdd {
+  width: 96px;
+  height: 96px;
+  background: #1365DD;
+  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+
+  &:before, &:after {
+    content: "";
+    background: #FFFFFF;
+    display: block;
+    position: absolute;
+    border-radius: 4px;
   }
 
-  .AiAdd {
-    width: 96px;
-    height: 96px;
-    background: #1365DD;
-    box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    &:before , &:after{
-      content: "";
-      background: #FFFFFF;
-      display: block;
-      position: absolute;
-      border-radius: 4px;
-    }
-
-    &:before{
-      height: 48px;
-      width: 4px;
-    }
-
-    &:after{
-      height: 4px;
-      width: 48px;
-    }
+  &:before {
+    height: 48px;
+    width: 4px;
   }
+
+  &:after {
+    height: 4px;
+    width: 48px;
+  }
+}
 </style>
diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue
index 67abc4fb..8526f2d5 100644
--- a/src/components/AiAreaPicker.vue
+++ b/src/components/AiAreaPicker.vue
@@ -2,21 +2,22 @@
   <section class="AiAreaPicker">
     <ai-search-popup mode="bottom" ref="areaSelector">
       <div slot="btn" @tap="handleInit">
-        <slot v-if="$slots.default" />
+        <slot v-if="$slots.default"/>
         <div v-else class="areaSelector">
-          <image :src="icon" class="location" />
-          <div v-text="currentArea.name" />
+          <image :src="icon" class="location"/>
+          <div v-text="currentArea.name"/>
         </div>
       </div>
       <div class="areaSelector">
         <div class="fixedTop">
-          <span v-for="(area, i) in fullArea" :key="area.id" v-text="area.name" :class="{ current: area.id == index }" @click="selectNode(area, i)" />
+          <span v-for="(area, i) in fullArea" :key="area.id" v-text="area.name" :class="{ current: area.id == index }"
+                @click="selectNode(area, i)"/>
         </div>
-        <span v-text="currentArea.name" />
+        <span v-text="currentArea.name"/>
       </div>
       <div class="pendingItem flexRow" flex v-for="op in list" :key="op.id">
-        <div class="fill" :class="{ self: index == op.id }" v-html="op.name" @tap="handleSelect(op)" />
-        <u-icon v-if="index != op.id" name="arrow-right" color="#ddd" @click="getChild(op)" />
+        <div class="fill" :class="{ self: index == op.id }" v-html="op.name" @tap="handleSelect(op)"/>
+        <u-icon v-if="index != op.id" name="arrow-right" color="#ddd" @click="getChild(op)"/>
       </div>
     </ai-search-popup>
   </section>
@@ -25,21 +26,21 @@
 <script>
 import AiSearchPopup from './AiSearchPopup'
 import AiCell from './AiCell.vue'
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
 export default {
   name: 'AiAreaPicker',
-  components: { AiCell, AiSearchPopup },
+  components: {AiCell, AiSearchPopup},
   props: {
-    areaId: { default: '' },
-    name: { default: '' },
+    areaId: {default: ''},
+    name: {default: ''},
     all: Boolean,
   },
   computed: {
     ...mapState(['user']),
     dataRange() {
       let rules = [10, 8, 6, 3, 0],
-        level = 0
+          level = 0
       if (this.all) return (level = 0)
       rules.some((e, i) => {
         let reg = new RegExp(`0{${e}}`, 'g')
@@ -58,7 +59,7 @@ export default {
   },
   data() {
     return {
-      fullArea: [{ name: '全国', id: 0 }],
+      fullArea: [{name: '全国', id: 0}],
       index: '',
       list: [],
     }
@@ -72,39 +73,39 @@ export default {
     getFullArea() {
       let areaId = this.areaId || (this.all ? '' : this.$areaId)
       areaId &&
-        this.$http
-          .post('/admin/area/getAllParentAreaId', null, {
-            withoutToken: true,
-            params: { areaId },
-          })
-          .then((res) => {
-            if (res?.data) {
-              if (res.data.length > 1) {
-                this.fullArea = res.data.reverse().slice(this.dataRange)
-              } else {
-                this.fullArea = res.data
-              }
-              this.fullArea.unshift({ name: '全国', id: 0 })
-            }
-          })
+      this.$http
+      .post('/admin/area/getAllParentAreaId', null, {
+        withoutToken: true,
+        params: {areaId},
+      })
+      .then((res) => {
+        if (res?.data) {
+          if (res.data.length > 1) {
+            this.fullArea = res.data.reverse().slice(this.dataRange)
+          } else {
+            this.fullArea = res.data
+          }
+          this.fullArea.unshift({name: '全国', id: 0})
+        }
+      })
     },
     getChildAreas(id) {
       id &&
-        this.$http
-          .post('/admin/area/queryAreaByParentId', null, {
-            withoutToken: true,
-            params: { id },
-          })
-          .then((res) => {
-            if (res?.data) {
-              this.list = res.data
-              let self = this.fullArea.find((e) => e.id == this.index)
-              this.list.unshift(self)
-            }
-          })
+      this.$http
+      .post('/admin/area/queryAreaByParentId', null, {
+        withoutToken: true,
+        params: {id},
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.list = res.data
+          let self = this.fullArea.find((e) => e.id == this.index)
+          this.list.unshift(self)
+        }
+      })
     },
     getProvinces() {
-      this.$http.post('/admin/area/queryProvinceList', null, { withoutToken: true }).then((res) => {
+      this.$http.post('/admin/area/queryProvinceList', null, {withoutToken: true}).then((res) => {
         if (res?.data) {
           this.list = res.data
         }
diff --git a/src/components/AiEmpty.vue b/src/components/AiEmpty.vue
index de1c10dc..35abe98a 100644
--- a/src/components/AiEmpty.vue
+++ b/src/components/AiEmpty.vue
@@ -26,13 +26,13 @@ export default {
   justify-content: center;
 
   .emptyImg {
-    width: 400 rpx;
-    height: 240 rpx;
+    width: 400px;
+    height: 240px;
     margin-top: 112px;
   }
 
   .emptyText {
-    font-size: 29 rpx;
+    font-size: 29px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     color: rgba(183, 183, 183, 1);
diff --git a/src/components/AiImage.vue b/src/components/AiImage.vue
index 820a14a2..aafb06b9 100644
--- a/src/components/AiImage.vue
+++ b/src/components/AiImage.vue
@@ -45,7 +45,7 @@ export default {
             current: this.image,
             urls: [this.image],
             success() {
-              sessionStorage.setItem("previewImage"," 1")
+              sessionStorage.setItem("previewImage", " 1")
             }
           })
         } else {
diff --git a/src/components/AiSelectEnterprise.vue b/src/components/AiSelectEnterprise.vue
index c1382e5f..a422660d 100644
--- a/src/components/AiSelectEnterprise.vue
+++ b/src/components/AiSelectEnterprise.vue
@@ -12,137 +12,137 @@
 </template>
 
 <script>
-  import tree from "./AiSelectEnterprise/tree";
-  import AiBack from "./AiBack";
+import tree from "./AiSelectEnterprise/tree";
+import AiBack from "./AiBack";
 
-  export default {
-    name: "AiSelectEnterprise",
-    components: {tree, AiBack},
-    props: {
-      value: {
-        type: Array,
-        default: () => []
-      },
-      multiple: {
-        type: Boolean,
-        default: true
-      },
-      rootId: Object,
+export default {
+  name: "AiSelectEnterprise",
+  components: {tree, AiBack},
+  props: {
+    value: {
+      type: Array,
+      default: () => []
     },
-    data() {
-      return {
-        tree: [],
-        checkList: this.value,
-        prop: {
-          label: 'name',
-          multiple: this.multiple,
-        },
-        map: {},
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    rootId: Object,
+  },
+  data() {
+    return {
+      tree: [],
+      checkList: this.value,
+      prop: {
+        label: 'name',
+        multiple: this.multiple,
+      },
+      map: {},
+    }
+  },
+
+  created() {
+    uni.pageScrollTo({
+      duration: 0,
+      scrollTop: 0
+    })
+  },
+
+  methods: {
+    confirm() {
+      let filter = []
+      this.map = {}
+      this.recursion(this.checkList)
+      Object.keys(this.map).map(e => filter.push(this.map[e]))
+      this.$emit("change", filter)
+      this.$emit('update:visible', false)
+    },
+
+    recursion(arr) {
+      if (arr?.length) {
+        arr.map(e => {
+          if ((e.type == 0 || e.openId) && e.checked && !this.map[e.id]) {
+            this.map[e.id] = e
+            this.recursion(e.childrenUser)
+          }
+          if (e.childrenDept?.length) {
+            this.recursion(e.childrenDept)
+          }
+        })
       }
-    },
-
-    created() {
-      uni.pageScrollTo({
-        duration: 0,
-        scrollTop: 0
-      })
-    },
-
-    methods: {
-      confirm() {
-        let filter = []
-        this.map = {}
-        this.recursion(this.checkList)
-        Object.keys(this.map).map(e => filter.push(this.map[e]))
-        this.$emit("change", filter)
-        this.$emit('update:visible', false)
-      },
-
-      recursion(arr) {
-        if (arr?.length) {
-          arr.map(e => {
-            if ((e.type == 0 || e.openId) && e.checked && !this.map[e.id]) {
-              this.map[e.id] = e
-              this.recursion(e.childrenUser)
-            }
-            if (e.childrenDept?.length) {
-              this.recursion(e.childrenDept)
-            }
-          })
-        }
-      }
-    },
-  }
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .AiSelectEnterprise {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    position: relative;
+.AiSelectEnterprise {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  position: relative;
 
-    .footer {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      z-index: 10;
-      background: #F4F8FB;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      box-sizing: border-box;
-      padding: 0 32px;
+  .footer {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    z-index: 10;
+    background: #F4F8FB;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    box-sizing: border-box;
+    padding: 0 32px;
 
-      .scroll {
-        height: 118px;
+    .scroll {
+      height: 118px;
 
-        ::v-deep .uni-scroll-view-content {
+      ::v-deep .uni-scroll-view-content {
+        display: flex;
+        align-items: center;
+
+        .tag {
+          width: 236px;
+          height: 72px;
+          background: #EAEEF1;
+          border-radius: 8px;
           display: flex;
           align-items: center;
+          margin-right: 16px;
 
-          .tag {
-            width: 236px;
-            height: 72px;
-            background: #EAEEF1;
-            border-radius: 8px;
-            display: flex;
-            align-items: center;
-            margin-right: 16px;
+          & > img {
+            width: 48px;
+            height: 45px;
+            margin-right: 8px;
+            flex-shrink: 0;
+          }
 
-            & > img {
-              width: 48px;
-              height: 45px;
-              margin-right: 8px;
-              flex-shrink: 0;
-            }
-
-            & > label {
-              width: 148px;
-              height: 42px;
-              font-size: 30px;
-              font-weight: 600;
-              color: #333333;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-            }
+          & > label {
+            width: 148px;
+            height: 42px;
+            font-size: 30px;
+            font-weight: 600;
+            color: #333333;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
         }
       }
+    }
 
-      .btn {
-        width: 192px;
-        height: 80px;
-        background: #1365DD;
-        border-radius: 4px;
-        z-index: 10;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 32px;
-        color: #FFFFFF;
-        margin-left: 8px;
-      }
+    .btn {
+      width: 192px;
+      height: 80px;
+      background: #1365DD;
+      border-radius: 4px;
+      z-index: 10;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 32px;
+      color: #FFFFFF;
+      margin-left: 8px;
     }
   }
+}
 </style>
diff --git a/src/components/AiSelectEnterprise/tree.vue b/src/components/AiSelectEnterprise/tree.vue
index 520061e6..bbe9fc94 100644
--- a/src/components/AiSelectEnterprise/tree.vue
+++ b/src/components/AiSelectEnterprise/tree.vue
@@ -24,10 +24,10 @@
           <div class="inline-item" @click.stop="backTree(item,index)" v-if="index!=0">
             <span style="margin: 0 8px">/</span>
             <text v-if="index==parent.length-1" class="none inline-item">
-              {{item[tag]}}
+              {{ item[tag] }}
             </text>
             <text v-else class="active">
-              {{item[tag]}}
+              {{ item[tag] }}
             </text>
           </div>
         </div>
@@ -50,17 +50,17 @@
             <u-row justify="between" style="width: 100%;">
               <div class="word" v-if="tag=='name'">
                 <img :src="$cdn + 'common/xzbq.png'" v-if="item.type==1" alt="">
-                <span class="ellipsis">{{item[tag]}}</span>
+                <span class="ellipsis">{{ item[tag] }}</span>
               </div>
               <div class="word" v-else-if="tag=='tagname'">
                 <template v-if="!item.openId">
                   <img :src="$cdn + 'common/xzbqbottom.png'" alt="">
-                  <span class="ellipsis">{{item[tag]}}</span>
+                  <span class="ellipsis">{{ item[tag] }}</span>
                 </template>
                 <template v-else>
                   <u-avatar :src="item.avatar || ($cdn + 'common/xztx.png')" mode="square" :size="37"
                             style="margin: 0 17px;"></u-avatar>
-                  <span class="ellipsis">{{item["name"]}}</span>
+                  <span class="ellipsis">{{ item["name"] }}</span>
                 </template>
               </div>
               <div class="right"
@@ -75,61 +75,119 @@
 </template>
 
 <script>
-  import AiTopFixed from "../AiTopFixed";
+import AiTopFixed from "../AiTopFixed";
 
-  export default {
-    name: "tree",
-    components: {AiTopFixed},
-    props: {
-      checkList: {
-        type: Array,
-        default: () => []
-      },
-      searchIf: {
-        type: Boolean,
-        default: () => true
-      },
-      multiple: {
-        type: Boolean,
-        default: true
-      },
-      rootId: Object,
+export default {
+  name: "tree",
+  components: {AiTopFixed},
+  props: {
+    checkList: {
+      type: Array,
+      default: () => []
     },
-    data() {
-      return {
-        isSear: false,
-        tree: [],
-        parent: [1],
-        searchResult: [],
-        allData: [],
-        newCheckList: this.checkList,
-        scrollLeft: Infinity,
-        keyword: "",
-        current: 0,
-        tag: "name",
+    searchIf: {
+      type: Boolean,
+      default: () => true
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    rootId: Object,
+  },
+  data() {
+    return {
+      isSear: false,
+      tree: [],
+      parent: [1],
+      searchResult: [],
+      allData: [],
+      newCheckList: this.checkList,
+      scrollLeft: Infinity,
+      keyword: "",
+      current: 0,
+      tag: "name",
+    }
+  },
+
+  methods: {
+    tabChange(e) {
+      this.tag = e == 0 ? "name" : "tagname"
+      this.current = e
+      this.parent = [1]
+      // this.newCheckList = []
+      this.getTree()
+    },
+
+    clear() {
+      this.keyword = ""
+      this.tree = this.allData
+      this.parent = [1]
+      this.isSear = false
+    },
+
+    checkboxChange(item, index) {
+      if (item.checked) {
+        this.$set(this.tree[index], 'checked', false)
+        this.delChild(item)
+        for (let index = 0, n = this.newCheckList.length; index < n; index++) {
+          let temp = this.newCheckList[index];
+          if (temp.id == item.id) {
+            this.newCheckList.splice(index, 1)
+            break
+          }
+        }
+      } else {
+        (item.type == 0 || item.openId) && this.newCheckList.push(item)
+        this.$set(this.tree[index], 'checked', true)
+        this.chooseChild(item)
+      }
+      this.$emit('sendValue', this.newCheckList)
+    },
+
+    delUser(id) {
+      for (let i = 0, len = this.newCheckList.length; i < len; i++) {
+        if (this.newCheckList[i].id === id) {
+          return this.newCheckList.splice(i, 1)
+        }
       }
     },
 
-    methods: {
-      tabChange(e) {
-        this.tag = e == 0 ? "name" : "tagname"
-        this.current = e
-        this.parent = [1]
-        // this.newCheckList = []
-        this.getTree()
-      },
+    chooseChild(arr) {
+      if (arr.childrenDept?.length) {
+        for (let i = 0, len = arr.childrenDept.length; i < len; i++) {
+          let item = arr.childrenDept[i]
+          item.checked = true
+          this.newCheckList.push(item)
+          this.chooseChild(item)
+        }
+      }
 
-      clear() {
-        this.keyword = ""
-        this.tree = this.allData
-        this.parent = [1]
-        this.isSear = false
-      },
+      if (arr.childrenUser?.length) {
+        for (let i = 0, len = arr.childrenUser.length; i < len; i++) {
+          let item = arr.childrenUser[i]
+          item.checked = true
+          this.newCheckList.push(item)
+          this.chooseChild(item)
+        }
+      }
 
-      checkboxChange(item, index) {
-        if (item.checked) {
-          this.$set(this.tree[index], 'checked', false)
-          this.delChild(item)
+      if (arr.users?.length) {
+        for (let i = 0, len = arr.users.length; i < len; i++) {
+          let item = arr.users[i]
+          item.checked = true
+          this.newCheckList.push(item)
+          this.chooseChild(item)
+        }
+      }
+      this.newCheckList = Array.from(new Set(this.newCheckList))
+    },
+
+    delChild(arr) {
+      if (arr.childrenDept?.length) {
+        for (let i = 0, len = arr.childrenDept.length; i < len; i++) {
+          let item = arr.childrenDept[i];
+          item.checked = false
           for (let index = 0, n = this.newCheckList.length; index < n; index++) {
             let temp = this.newCheckList[index];
             if (temp.id == item.id) {
@@ -137,345 +195,287 @@
               break
             }
           }
-        } else {
-          (item.type == 0 || item.openId) && this.newCheckList.push(item)
-          this.$set(this.tree[index], 'checked', true)
-          this.chooseChild(item)
+          this.delChild(item)
         }
-        this.$emit('sendValue', this.newCheckList)
-      },
+      }
 
-      delUser(id) {
-        for (let i = 0, len = this.newCheckList.length; i < len; i++) {
-          if (this.newCheckList[i].id === id) {
-            return this.newCheckList.splice(i, 1)
+      if (arr.childrenUser?.length) {
+        for (let i = 0, len = arr.childrenUser.length; i < len; i++) {
+          let item = arr.childrenUser[i];
+          item.checked = false
+          for (let index = 0, n = this.newCheckList.length; index < n; index++) {
+            let temp = this.newCheckList[index];
+            if (temp.id == item.id) {
+              this.newCheckList.splice(index, 1)
+              break
+            }
           }
+          this.delChild(item)
         }
-      },
+      }
+    },
 
-      chooseChild(arr) {
-        if (arr.childrenDept?.length) {
-          for (let i = 0, len = arr.childrenDept.length; i < len; i++) {
-            let item = arr.childrenDept[i]
-            item.checked = true
-            this.newCheckList.push(item)
-            this.chooseChild(item)
-          }
-        }
-
-        if (arr.childrenUser?.length) {
-          for (let i = 0, len = arr.childrenUser.length; i < len; i++) {
-            let item = arr.childrenUser[i]
-            item.checked = true
-            this.newCheckList.push(item)
-            this.chooseChild(item)
-          }
-        }
-
-        if (arr.users?.length) {
-          for (let i = 0, len = arr.users.length; i < len; i++) {
-            let item = arr.users[i]
-            item.checked = true
-            this.newCheckList.push(item)
-            this.chooseChild(item)
-          }
-        }
-        this.newCheckList = Array.from(new Set(this.newCheckList))
-      },
-
-      delChild(arr) {
-        if (arr.childrenDept?.length) {
-          for (let i = 0, len = arr.childrenDept.length; i < len; i++) {
-            let item = arr.childrenDept[i];
+    //单选
+    checkbox(item, index) {
+      let status = !this.tree[index].checked
+      this.$set(this.tree[index], 'checked', status)
+      if (this.newCheckList.length <= 0) {
+        this.newCheckList = [this.tree[index]]
+      } else if (this.newCheckList.length == 1) {
+        this.tree.forEach(item => {
+          if (item.id != this.tree[index].id) {
             item.checked = false
-            for (let index = 0, n = this.newCheckList.length; index < n; index++) {
-              let temp = this.newCheckList[index];
-              if (temp.id == item.id) {
-                this.newCheckList.splice(index, 1)
-                break
-              }
-            }
-            this.delChild(item)
           }
+        })
+        this.newCheckList = []
+        if (this.tree[index].checked) {
+          this.newCheckList.push(this.tree[index])
         }
+      }
+      this.$emit('sendValue', this.newCheckList)
+    },
 
-        if (arr.childrenUser?.length) {
-          for (let i = 0, len = arr.childrenUser.length; i < len; i++) {
-            let item = arr.childrenUser[i];
-            item.checked = false
-            for (let index = 0, n = this.newCheckList.length; index < n; index++) {
-              let temp = this.newCheckList[index];
-              if (temp.id == item.id) {
-                this.newCheckList.splice(index, 1)
-                break
-              }
-            }
-            this.delChild(item)
+    toNext(item) {
+      if (this.tag == "name") {
+        if (item.type == 1 && (item["childrenDept"].length || item["childrenUser"].length)) {
+          this.tree = []
+          if (item["childrenDept"].length) {
+            this.tree = item["childrenDept"]
           }
-        }
-      },
 
-      //单选
-      checkbox(item, index) {
-        let status = !this.tree[index].checked
-        this.$set(this.tree[index], 'checked', status)
-        if (this.newCheckList.length <= 0) {
-          this.newCheckList = [this.tree[index]]
-        } else if (this.newCheckList.length == 1) {
-          this.tree.forEach(item => {
-            if (item.id != this.tree[index].id) {
-              item.checked = false
-            }
-          })
-          this.newCheckList = []
-          if (this.tree[index].checked) {
-            this.newCheckList.push(this.tree[index])
+          if (item["childrenUser"].length) {
+            this.tree = [...this.tree, ...item["childrenUser"]]
           }
-        }
-        this.$emit('sendValue', this.newCheckList)
-      },
-
-      toNext(item) {
-        if (this.tag == "name") {
-          if (item.type == 1 && (item["childrenDept"].length || item["childrenUser"].length)) {
-            this.tree = []
-            if (item["childrenDept"].length) {
-              this.tree = item["childrenDept"]
-            }
-
-            if (item["childrenUser"].length) {
-              this.tree = [...this.tree, ...item["childrenUser"]]
-            }
-            this.checkIf()
-            if (this.parent[0].id !== item.id) {
-              this.parent.push(item)
-            }
-          }
-        } else if (this.tag == "tagname" && !item.openId) {
-          this.tree = item.users
+          this.checkIf()
           if (this.parent[0].id !== item.id) {
             this.parent.push(item)
           }
         }
-
-        this.$nextTick(() => {
-          this.scrollLeft += 200
-        })
-      },
-
-      checkIf() {
-        for (let i = 0, len = this.tree.length; i < len; i++) {
-          for (let j = 0, lens = this.newCheckList.length; j < lens; j++) {
-            if (this.newCheckList[j].id == this.tree[i].id) {
-              this.$set(this.tree[i], 'checked', true)
-              break
-            } else {
-              this.$set(this.tree[i], 'checked', false)
-            }
-          }
+      } else if (this.tag == "tagname" && !item.openId) {
+        this.tree = item.users
+        if (this.parent[0].id !== item.id) {
+          this.parent.push(item)
         }
-      },
+      }
 
-      confirmSearch(val) {
-        this.searchResult = []
-        this.search(this.tree, val)
-        this.isSear = true
-        this.parent.splice(1, Infinity)
-        this.tree = this.searchResult
-        if(!val) this.clear()
-      },
-
-      search(data, keyword) {
-        if (data.length) {
-          for (let i = 0, len = data.length; i < len; i++) {
-            if (data[i].name?.indexOf(keyword) != -1) {
-              this.searchResult.push(data[i])
-            }
-            if (data[i]["childrenDept"]?.length || data[i]["childrenUser"]?.length) {
-              this.search(data[i]["childrenDept"].concat(data[i]["childrenUser"]), keyword)
-            }
-            if (data[i]["users"]?.length) {
-              this.search(data[i]["users"], keyword)
-            }
-          }
-        }
-      },
-
-      backTree(item, index) {
-        if (index == -1) {
-          this.tree = this.allData
-          this.parent.splice(1, Infinity)
-          this.isSear = false
-          this.keyword = ""
-        } else if (index == -2) {
-          this.tree = this.searchResult
-          this.parent.splice(1, Infinity)
-        } else {
-          if (this.parent.length - index > 2) {
-            this.parent.forEach((item, i) => {
-              if (i > index) {
-                this.parent.splice(i, Infinity)
-              }
-            })
-          } else if (index != this.parent.length - 1) {
-            this.parent.splice(this.parent.length - 1, 1)
-          }
-          this.tree = item["childrenDept"].concat(item["childrenUser"] || [])
-        }
-        if (this.multiple) return
-        this.checkIf()
-      },
-
-      getTree() {
-        this.$http.post(this.current == 0 ? "/app/wxcp/wxuser/tree" : "/app/wxcp/wxtag/tree", null, {
-          params: {
-            rootId: this.rootId
-          }
-        }).then(res => {
-          if (res && res.data) {
-            let result = this.tag == 'name' ? [res.data] : res.data
-            this.tree = result
-            this.allData = result
-          }
-        })
-      },
+      this.$nextTick(() => {
+        this.scrollLeft += 200
+      })
     },
 
-    computed: {
-      list() {
-        return [
-          {name: "组织架构"},
-          {name: "标签"}
-        ]
+    checkIf() {
+      for (let i = 0, len = this.tree.length; i < len; i++) {
+        for (let j = 0, lens = this.newCheckList.length; j < lens; j++) {
+          if (this.newCheckList[j].id == this.tree[i].id) {
+            this.$set(this.tree[i], 'checked', true)
+            break
+          } else {
+            this.$set(this.tree[i], 'checked', false)
+          }
+        }
       }
     },
 
-    created() {
-      this.getTree()
+    confirmSearch(val) {
+      this.searchResult = []
+      this.search(this.tree, val)
+      this.isSear = true
+      this.parent.splice(1, Infinity)
+      this.tree = this.searchResult
+      if (!val) this.clear()
+    },
+
+    search(data, keyword) {
+      if (data.length) {
+        for (let i = 0, len = data.length; i < len; i++) {
+          if (data[i].name?.indexOf(keyword) != -1) {
+            this.searchResult.push(data[i])
+          }
+          if (data[i]["childrenDept"]?.length || data[i]["childrenUser"]?.length) {
+            this.search(data[i]["childrenDept"].concat(data[i]["childrenUser"]), keyword)
+          }
+          if (data[i]["users"]?.length) {
+            this.search(data[i]["users"], keyword)
+          }
+        }
+      }
+    },
+
+    backTree(item, index) {
+      if (index == -1) {
+        this.tree = this.allData
+        this.parent.splice(1, Infinity)
+        this.isSear = false
+        this.keyword = ""
+      } else if (index == -2) {
+        this.tree = this.searchResult
+        this.parent.splice(1, Infinity)
+      } else {
+        if (this.parent.length - index > 2) {
+          this.parent.forEach((item, i) => {
+            if (i > index) {
+              this.parent.splice(i, Infinity)
+            }
+          })
+        } else if (index != this.parent.length - 1) {
+          this.parent.splice(this.parent.length - 1, 1)
+        }
+        this.tree = item["childrenDept"].concat(item["childrenUser"] || [])
+      }
+      if (this.multiple) return
+      this.checkIf()
+    },
+
+    getTree() {
+      this.$http.post(this.current == 0 ? "/app/wxcp/wxuser/tree" : "/app/wxcp/wxtag/tree", null, {
+        params: {
+          rootId: this.rootId
+        }
+      }).then(res => {
+        if (res && res.data) {
+          let result = this.tag == 'name' ? [res.data] : res.data
+          this.tree = result
+          this.allData = result
+        }
+      })
+    },
+  },
+
+  computed: {
+    list() {
+      return [
+        {name: "组织架构"},
+        {name: "标签"}
+      ]
     }
+  },
+
+  created() {
+    this.getTree()
   }
+}
 </script>
 
 <style lang="scss" scoped>
 
-  .tree {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.tree {
+  min-height: 100%;
+  background-color: #F5F5F5;
 
-    .top {
-      background-color: #FFFFFF;
-    }
+  .top {
+    background-color: #FFFFFF;
+  }
 
-    .tree-list {
-      margin-top: 24px;
-      background-color: #FFFFFF;
+  .tree-list {
+    margin-top: 24px;
+    background-color: #FFFFFF;
 
-      .scroll {
-        white-space: nowrap;
-        border-bottom: 1px solid #f4f4f4;
+    .scroll {
+      white-space: nowrap;
+      border-bottom: 1px solid #f4f4f4;
 
-        .inline-item {
-          height: 112px;
-          font-size: 30px;
-          display: inline-block;
-          line-height: 112px;
+      .inline-item {
+        height: 112px;
+        font-size: 30px;
+        display: inline-block;
+        line-height: 112px;
 
-          .active {
-            color: #4297ED !important;
-            font-weight: 600;
-          }
+        .active {
+          color: #4297ED !important;
+          font-weight: 600;
+        }
 
-          .none {
-            color: #666666;
-            font-weight: 600;
-          }
+        .none {
+          color: #666666;
+          font-weight: 600;
         }
       }
+    }
 
-      .container-list {
-        min-height: 1000px;
-        overflow-y: scroll;
-        overflow-x: hidden;
+    .container-list {
+      min-height: 1000px;
+      overflow-y: scroll;
+      overflow-x: hidden;
 
-        .common {
-          background-color: #fff;
-          border-bottom: 1px solid #f4f4f4;
-          box-sizing: border-box;
-          padding: 0 30px;
+      .common {
+        background-color: #fff;
+        border-bottom: 1px solid #f4f4f4;
+        box-sizing: border-box;
+        padding: 0 30px;
 
-          .content {
+        .content {
+          display: flex;
+          align-items: center;
+          height: 100px;
+          width: 100%;
+          line-height: 100px;
+          position: relative;
+          font-size: 32px;
+
+          .right {
+            width: 16px;
+            height: 16px;
+            border-right: 4px solid #CCCCCC;
+            border-top: 4px solid #CCCCCC;
+            transform: rotate(45deg);
+          }
+
+          .word {
             display: flex;
             align-items: center;
-            height: 100px;
-            width: 100%;
-            line-height: 100px;
-            position: relative;
-            font-size: 32px;
 
-            .right {
-              width: 16px;
-              height: 16px;
-              border-right: 4px solid #CCCCCC;
-              border-top: 4px solid #CCCCCC;
-              transform: rotate(45deg);
-            }
-
-            .word {
-              display: flex;
-              align-items: center;
-
-              & > img {
-                width: 74px;
-                height: 74px;
-                margin: 0 34px;
-              }
-
-              .ellipsis{
-                width: 450px;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-              }
-            }
-
-            .checkbox {
-              position: relative;
-              display: flex;
-              align-items: center;
-
-              & > img {
-                width: 48px;
-                height: 48px;
-                border-radius: 50%;
-              }
-
-              .color {
-                color: #00aaff;
-                background-color: #00aaff;
-              }
-            }
-
-            .person {
-              display: flex;
-              align-items: center;
-              color: #f57a00;
-              font-size: 36px;
-              text-align: center;
+            & > img {
+              width: 74px;
+              height: 74px;
               margin: 0 34px;
-              flex-shrink: 0;
             }
+
+            .ellipsis {
+              width: 450px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+
+          .checkbox {
+            position: relative;
+            display: flex;
+            align-items: center;
+
+            & > img {
+              width: 48px;
+              height: 48px;
+              border-radius: 50%;
+            }
+
+            .color {
+              color: #00aaff;
+              background-color: #00aaff;
+            }
+          }
+
+          .person {
+            display: flex;
+            align-items: center;
+            color: #f57a00;
+            font-size: 36px;
+            text-align: center;
+            margin: 0 34px;
+            flex-shrink: 0;
           }
         }
       }
     }
-
-    ::v-deep .content {
-      padding: 0 !important;
-    }
-
-    .pad {
-      box-sizing: border-box;
-      padding: 20px 32px 0;
-    }
   }
+
+  ::v-deep .content {
+    padding: 0 !important;
+  }
+
+  .pad {
+    box-sizing: border-box;
+    padding: 20px 32px 0;
+  }
+}
 </style>
diff --git a/src/components/AiVideo.vue b/src/components/AiVideo.vue
index 70af7aba..46e49d4e 100644
--- a/src/components/AiVideo.vue
+++ b/src/components/AiVideo.vue
@@ -1,185 +1,187 @@
 <template>
-	<view class="imt-audio">
-		<view class="audio-wrapper">
-			<view class="audio-number">{{format(current)}}</view>
-			<slider class="audio-slider" :activeColor="color" block-size="16" :value="current" :max="duration || 10" @changing="seek=true,current=$event.detail.value" @change="audio.seek($event.detail.value)"></slider>
-			<view class="audio-number">{{format(duration)}}</view>
-		</view>
-		<view class="audio-control-wrapper" :style="{color}">
+  <view class="imt-audio">
+    <view class="audio-wrapper">
+      <view class="audio-number">{{ format(current) }}</view>
+      <slider class="audio-slider" :activeColor="color" block-size="16" :value="current" :max="duration || 10"
+              @changing="seek=true,current=$event.detail.value" @change="audio.seek($event.detail.value)"></slider>
+      <view class="audio-number">{{ format(duration) }}</view>
+    </view>
+    <view class="audio-control-wrapper" :style="{color}">
       <image
-        class="audio-control audio-control-switch"
-        @click="audio.paused?play():audio.pause()"
-        :src="paused ? playImg : stopImg" />
+          class="audio-control audio-control-switch"
+          @click="audio.paused?play():audio.pause()"
+          :src="paused ? playImg : stopImg"/>
       <p>{{ paused ? '点击播放' : '点击停止播放' }}</p>
-		</view>
-	</view>
+    </view>
+  </view>
 </template>
 
 <script>
-  import stopImg from '../pages/resourcesManage/img/stop-img.png'
-  import playImg from '../pages/resourcesManage/img/play-icon.png'
-	export default {
-		data() {
-			return {
-				audio: uni.createInnerAudioContext(),
-				current: 0, //当前进度(s)
-				duration: 0, //总时长(s)
-				paused: true, //是否处于暂停状态
-				loading: false, //是否处于读取状态
-				seek: false,
-        stopImg,
-        playImg
-			}
-		},
-		props: {
-			src: String, //音频链接
-			autoplay: Boolean, //是否自动播放
-			continue: Boolean, //播放完成后是否继续播放下一首，需定义@next事件
-			control: {
-				type: Boolean,
-				default: true
-			}, //是否需要上一曲/下一曲按钮
-			color: {
-				type: String,
-				default: '#007BFF'
-			} //主色调
-		},
-		methods: {
-			//返回prev事件
-			prev() {
-				this.$emit('prev')
-			},
-			//返回next事件
-			next() {
-				this.$emit('next')
-			},
-			//格式化时长
-			format(num) {
-				return '0'.repeat(2 - String(Math.floor(num / 60)).length) + Math.floor(num / 60) + ':' + '0'.repeat(2 - String(Math.floor(num % 60)).length) + Math.floor(num % 60)
-			},
-			//点击播放按钮
-			play() {
-				this.audio.play()
-				this.loading = true
-			}
-		},
-		created() {
-			if (this.src) {
-				this.audio.src = this.src
-				this.autoplay && this.play()
-			}
-			this.audio.obeyMuteSwitch = false
-			//音频进度更新事件
-			this.audio.onTimeUpdate(() => {
-				if (!this.seek) {
-					this.current = this.audio.currentTime
-				}
-				if (!this.duration) {
-					this.duration = this.audio.duration
-				}
-			})
-			//音频播放事件
-			this.audio.onPlay(() => {
-				this.paused = false
-				this.loading = false
-			})
-			//音频暂停事件
-			this.audio.onPause(() => {
-				this.paused = true
-			})
-			//音频结束事件
-			this.audio.onEnded(() => {
-				if (this.continue) {
-					this.next()
-				} else {
-					this.paused = true
-					this.current = 0
-				}
-			})
-			//音频完成更改进度事件
-			this.audio.onSeeked(() => {
-				this.seek = false
-			})
-		},
-		beforeDestroy(){
-			this.audio.destroy()
-		},
-		watch: {
-			src(src, old) {
-				this.audio.src = src
-				this.current = 0
-				this.duration = 0
-				if (old || this.autoplay) {
-					this.play()
-				}
-			}
-		}
-	}
+import stopImg from '../pages/resourcesManage/img/stop-img.png'
+import playImg from '../pages/resourcesManage/img/play-icon.png'
+
+export default {
+  data() {
+    return {
+      audio: uni.createInnerAudioContext(),
+      current: 0, //当前进度(s)
+      duration: 0, //总时长(s)
+      paused: true, //是否处于暂停状态
+      loading: false, //是否处于读取状态
+      seek: false,
+      stopImg,
+      playImg
+    }
+  },
+  props: {
+    src: String, //音频链接
+    autoplay: Boolean, //是否自动播放
+    continue: Boolean, //播放完成后是否继续播放下一首，需定义@next事件
+    control: {
+      type: Boolean,
+      default: true
+    }, //是否需要上一曲/下一曲按钮
+    color: {
+      type: String,
+      default: '#007BFF'
+    } //主色调
+  },
+  methods: {
+    //返回prev事件
+    prev() {
+      this.$emit('prev')
+    },
+    //返回next事件
+    next() {
+      this.$emit('next')
+    },
+    //格式化时长
+    format(num) {
+      return '0'.repeat(2 - String(Math.floor(num / 60)).length) + Math.floor(num / 60) + ':' + '0'.repeat(2 - String(Math.floor(num % 60)).length) + Math.floor(num % 60)
+    },
+    //点击播放按钮
+    play() {
+      this.audio.play()
+      this.loading = true
+    }
+  },
+  created() {
+    if (this.src) {
+      this.audio.src = this.src
+      this.autoplay && this.play()
+    }
+    this.audio.obeyMuteSwitch = false
+    //音频进度更新事件
+    this.audio.onTimeUpdate(() => {
+      if (!this.seek) {
+        this.current = this.audio.currentTime
+      }
+      if (!this.duration) {
+        this.duration = this.audio.duration
+      }
+    })
+    //音频播放事件
+    this.audio.onPlay(() => {
+      this.paused = false
+      this.loading = false
+    })
+    //音频暂停事件
+    this.audio.onPause(() => {
+      this.paused = true
+    })
+    //音频结束事件
+    this.audio.onEnded(() => {
+      if (this.continue) {
+        this.next()
+      } else {
+        this.paused = true
+        this.current = 0
+      }
+    })
+    //音频完成更改进度事件
+    this.audio.onSeeked(() => {
+      this.seek = false
+    })
+  },
+  beforeDestroy() {
+    this.audio.destroy()
+  },
+  watch: {
+    src(src, old) {
+      this.audio.src = src
+      this.current = 0
+      this.duration = 0
+      if (old || this.autoplay) {
+        this.play()
+      }
+    }
+  }
+}
 </script>
 
 <style>
-	.imt-audio {
-		background: #fff;
-		border-radius: 20upx;
-	}
+.imt-audio {
+  background: #fff;
+  border-radius: 20 upx;
+}
 
-	.audio-wrapper {
-		display: flex;
-		align-items: center;
-	}
+.audio-wrapper {
+  display: flex;
+  align-items: center;
+}
 
-	.audio-number {
-		width: 120upx;
-		font-size: 24upx;
-		line-height: 1;
-		color: #999999;
-		text-align: center;
-	}
+.audio-number {
+  width: 120 upx;
+  font-size: 24 upx;
+  line-height: 1;
+  color: #999999;
+  text-align: center;
+}
 
-	.audio-slider {
-		flex: 1;
-		margin: 0;
-	}
+.audio-slider {
+  flex: 1;
+  margin: 0;
+}
 
-	.audio-control-wrapper {
-		margin-top: 40upx;
-    text-align: center;
-	}
+.audio-control-wrapper {
+  margin-top: 40 upx;
+  text-align: center;
+}
 
-  .audio-control-wrapper p {
-    color: #999999;
-    font-size: 26rpx;
+.audio-control-wrapper p {
+  color: #999999;
+  font-size: 26 rpx;
+}
+
+.audio-control-wrapper image {
+  width: 128 rpx;
+  height: 128 rpx;
+}
+
+.audio-control {
+  font-size: 32 upx;
+  line-height: 1;
+  border-radius: 50%;
+}
+
+.audio-control-next {
+  transform: rotate(180deg);
+}
+
+.audio-control-switch {
+  font-size: 40 upx;
+  margin: 0 100 upx;
+}
+
+.audioLoading {
+  animation: loading 2s;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+}
+
+@keyframes loading {
+  to {
+    transform: rotate(360deg);
   }
-
-  .audio-control-wrapper image {
-    width: 128rpx;
-    height: 128rpx;
-  }
-
-	.audio-control {
-		font-size: 32upx;
-		line-height: 1;
-		border-radius: 50%;
-	}
-
-	.audio-control-next {
-		transform: rotate(180deg);
-	}
-
-	.audio-control-switch {
-		font-size: 40upx;
-		margin: 0 100upx;
-	}
-
-	.audioLoading {
-		animation: loading 2s;
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-	}
-
-	@keyframes loading {
-		to {
-			transform: rotate(360deg);
-		}
-	}
+}
 </style>
diff --git a/src/pages/Monitor/Add.vue b/src/pages/Monitor/Add.vue
index 883b1e95..4c6035aa 100644
--- a/src/pages/Monitor/Add.vue
+++ b/src/pages/Monitor/Add.vue
@@ -19,7 +19,8 @@
             <span>联系方式</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -52,7 +53,7 @@
             <span>家庭住址</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.address" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.address" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -64,7 +65,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.move">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -78,7 +81,8 @@
             <span>安置地区</span>
           </div>
           <div class="right">
-            <AiAreaPicker ref="area" class="aiArea" :areaId.sync="form.placeAreaId" mode="custom" all @select="onChange">
+            <AiAreaPicker ref="area" class="aiArea" :areaId.sync="form.placeAreaId" mode="custom" all
+                          @select="onChange">
               <span class="label" v-if="form.placeArea">{{ form.placeArea }}</span>
               <i v-else>请选择</i>
               <u-icon name="arrow-right" color="#ddd"/>
@@ -93,7 +97,7 @@
             <span>安置地区详细地址</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.place" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.place" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -103,263 +107,264 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader'
-  import AiSelect from '@/components/AiSelect'
-  import AiArea from '@/components/AiArea'
-  import AiAreaPicker from '@/components/AiAreaPicker'
+import AiUploader from '@/components/AiUploader'
+import AiSelect from '@/components/AiSelect'
+import AiArea from '@/components/AiArea'
+import AiAreaPicker from '@/components/AiAreaPicker'
 
-  export default {
-    data () {
-      return {
-        form: {
-          addressAreaId: '',
-          address: '',
-          addressArea: '',
-          move: '02',
-          place: '',
-          placeAreaId: '',
-          placeArea: '',
-          type: ''
-        },
-        $areaId: '',
-        isEdit: false,
-        id: '',
-        areaName: ''
+export default {
+  data() {
+    return {
+      form: {
+        addressAreaId: '',
+        address: '',
+        addressArea: '',
+        move: '02',
+        place: '',
+        placeAreaId: '',
+        placeArea: '',
+        type: ''
+      },
+      $areaId: '',
+      isEdit: false,
+      id: '',
+      areaName: ''
+    }
+  },
+
+  components: {
+    AiArea,
+    AiSelect,
+    AiUploader,
+    AiAreaPicker
+  },
+
+  created() {
+    this.$areaId = this.$store.state.user.areaId
+    this.areaName = this.$store.state.user.areaFullName
+    this.$dict.load(['fpType', 'fpYesOrNo'])
+  },
+
+  onLoad(query) {
+    if (query.id) {
+      this.isEdit = true
+      this.id = query.id
+
+      this.getInfo(this.id)
+    }
+  },
+
+  methods: {
+    submit() {
+      if (!this.form.type) {
+        return this.$u.toast('请选择监测类型')
       }
-    },
 
-    components: {
-      AiArea,
-      AiSelect,
-      AiUploader,
-      AiAreaPicker
-    },
-
-    created () {
-      this.$areaId = this.$store.state.user.areaId
-      this.areaName = this.$store.state.user.areaFullName
-      this.$dict.load(['fpType', 'fpYesOrNo'])
-    },
-
-    onLoad (query) {
-      if (query.id) {
-        this.isEdit = true
-        this.id = query.id
-
-        this.getInfo(this.id)
+      if (!this.form.phone) {
+        return this.$u.toast('请输入联系方式')
       }
+
+      if (!this.form.addressAreaId) {
+        return this.$u.toast('请选择住址')
+      }
+
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.form,
+        id: this.isEdit ? this.id : ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
     },
 
-    methods: {
-      submit () {
-        if (!this.form.type) {
-          return this.$u.toast('请选择监测类型')
-        }
+    onAreaChange(e) {
+      this.form.addressAreaId = e.id
+      const areaList = this.$refs.address.fullArea
+      let fullAreaName = ''
+      areaList.forEach(item => {
+        fullAreaName = fullAreaName + item.name
+      })
 
-        if (!this.form.phone) {
-          return this.$u.toast('请输入联系方式')
-        }
+      this.form.addressArea = fullAreaName.replace('全国', '')
+    },
 
-        if (!this.form.addressAreaId) {
-          return this.$u.toast('请选择住址')
-        }
+    onChange(e) {
+      this.form.placeAreaId = e.id
+      const areaList = this.$refs.area.fullArea
+      let fullAreaName = ''
+      areaList.forEach(item => {
+        fullAreaName = fullAreaName + item.name
+      })
 
-        uni.showLoading()
-        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-          ...this.form,
-          id: this.isEdit ? this.id : ''
-        }).then(res => {
-          if (res.code === 0) {
-            this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
-            uni.$emit('reload')
-            uni.navigateBack({
-              delta: 1
-            })
+      this.form.placeArea = fullAreaName.replace('全国', '')
+    },
+
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
           }
-          uni.hideLoading()
-        })
-      },
-
-      onAreaChange (e) {
-        this.form.addressAreaId = e.id
-        const areaList = this.$refs.address.fullArea
-        let fullAreaName = ''
-        areaList.forEach(item => {
-          fullAreaName = fullAreaName + item.name
-        })
-
-        this.form.addressArea = fullAreaName.replace('全国', '')
-      },
-
-      onChange (e) {
-        this.form.placeAreaId = e.id
-        const areaList = this.$refs.area.fullArea
-        let fullAreaName = ''
-        areaList.forEach(item => {
-          fullAreaName = fullAreaName + item.name
-        })
-
-        this.form.placeArea = fullAreaName.replace('全国', '')
-      },
-
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = {
-              ...this.form,
-              ...res.data
-            }
-          }
-        })
-      }
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .add {
-    padding-bottom: 120px;
+.add {
+  padding-bottom: 120px;
 
-    .aiArea {
-      display: flex;
-      align-items: center;
-      .label {
-        color: #303133!important;
-        font-size: 30px;
-      }
+  .aiArea {
+    display: flex;
+    align-items: center;
 
-      i {
-        margin-left: 4px;
-        font-style: normal;
-        color: #999999;
-        font-size: 30px;
-      }
+    .label {
+      color: #303133 !important;
+      font-size: 30px;
     }
 
-    ::v-deep .u-radio {
-      &:last-child {
-        .u-radio__label {
-          margin-right: 0;
-        }
+    i {
+      margin-left: 4px;
+      font-style: normal;
+      color: #999999;
+      font-size: 30px;
+    }
+  }
+
+  ::v-deep .u-radio {
+    &:last-child {
+      .u-radio__label {
+        margin-right: 0;
       }
     }
+  }
 
-    & > div {
-      margin-bottom: 16px;
-      background: #fff;
-    }
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
 
-    .form-group {
-      .form-item {
-        padding-left: 32px;
+  .form-group {
+    .form-item {
+      padding-left: 32px;
 
-        .form-item__wrapper {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          height: 112px;
-          border-bottom: 1px solid #E4E5E6;
-        }
-
-        .right {
-          height: 112px;
-          line-height: 112px;
-          padding-right: 32px;
-
-          span {
-            font-size: 30px;
-            color: #999999;
-          }
-        }
-
-        input {
-          height: 100%;
-          text-align: right;
-        }
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #333333;
-            font-size: 32px;
-          }
-
-          i {
-            margin-right: 4px;
-            font-style: normal;
-            color: #FF4466;
-            font-size: 32px;
-          }
-        }
-
-        &:last-child {
-          .form-item__wrapper {
-            border: none;
-          }
-        }
-      }
-    }
-
-    .form-item__imgs {
-      padding: 32px;
-
-      .form-item__title {
+      .form-item__wrapper {
         display: flex;
         align-items: center;
-        margin-bottom: 34px;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
 
-        h2 {
+      .right {
+        height: 112px;
+        line-height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
           color: #333333;
-          font-weight: normal;
           font-size: 32px;
         }
 
         i {
-          color: #999999;
-          font-size: 28px;
+          margin-right: 4px;
           font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
         }
       }
 
-      textarea {
-        width: 100%;
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
       }
     }
+  }
 
-    .form-type {
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/Monitor/AddFamilyMember.vue b/src/pages/Monitor/AddFamilyMember.vue
index 13ee6a61..e488822e 100644
--- a/src/pages/Monitor/AddFamilyMember.vue
+++ b/src/pages/Monitor/AddFamilyMember.vue
@@ -21,7 +21,7 @@
             <span>姓名</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.name" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.name" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -32,7 +32,7 @@
             <span>身份证号</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.idNumber" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.idNumber" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -122,7 +122,7 @@
             <span>务工区域</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.workArea" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.workArea" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -133,7 +133,8 @@
             <span>务工时长(月)</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" type="number" v-model="form.workingMonths" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" type="number" v-model="form.workingMonths"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -147,7 +148,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.medicalInsurance">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -160,7 +163,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.sicknessInsurance">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -173,7 +178,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.endowmentInsurance">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -186,7 +193,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.subsistenceAllowance">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -199,7 +208,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.destitute">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -210,252 +221,253 @@
 </template>
 
 <script>
-  import AiSelect from '@/components/AiSelect'
-  import AiDate from '@/components/AiDate'
-  export default {
-    data () {
-      return {
-        form: {
-          destitute: '',
-          education: '',
-          endowmentInsurance: '',
-          health: '',
-          idNumber: '',
-          laborSkills: '',
-          medicalInsurance: '',
-          name: '',
-          nation: '',
-          politicalOutlook: '',
-          relationship: '',
-          relocation: '',
-          sex: '',
-          sicknessInsurance: '',
-          studentsInSchool: '',
-          subsistenceAllowance: '',
-          workArea: '',
-          workingMonths: ''
-        },
-        id: '',
-        info: {},
-        isEdit: false,
-        index: ''
-      }
-    },
+import AiSelect from '@/components/AiSelect'
+import AiDate from '@/components/AiDate'
 
-    components: {
-      AiSelect,
-      AiDate
-    },
+export default {
+  data() {
+    return {
+      form: {
+        destitute: '',
+        education: '',
+        endowmentInsurance: '',
+        health: '',
+        idNumber: '',
+        laborSkills: '',
+        medicalInsurance: '',
+        name: '',
+        nation: '',
+        politicalOutlook: '',
+        relationship: '',
+        relocation: '',
+        sex: '',
+        sicknessInsurance: '',
+        studentsInSchool: '',
+        subsistenceAllowance: '',
+        workArea: '',
+        workingMonths: ''
+      },
+      id: '',
+      info: {},
+      isEdit: false,
+      index: ''
+    }
+  },
 
-    onLoad (query) {
-      uni.showLoading()
-      this.id = query.id
-      this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook', 
-        'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
-        this.getInfo(query.id)
-      })
+  components: {
+    AiSelect,
+    AiDate
+  },
 
-      if (query.index > -1) {
-        this.isEdit = true
-        this.index = Number(query.index)
-      }
-    },
+  onLoad(query) {
+    uni.showLoading()
+    this.id = query.id
+    this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook',
+      'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
+      this.getInfo(query.id)
+    })
 
-    methods: {
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            if (this.isEdit) {
-              this.form = {
-                ...res.data.familyList[this.index]
-              }
+    if (query.index > -1) {
+      this.isEdit = true
+      this.index = Number(query.index)
+    }
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          if (this.isEdit) {
+            this.form = {
+              ...res.data.familyList[this.index]
             }
-            this.info = res.data
-          }
-
-          uni.hideLoading()
-        })
-      },
-
-      rules () {
-        return {
-          relationship: '请选择与户主关系',
-          name: '请输入姓名',
-          idNumber: '请输入身份证号',
-          sex: '请选择性别',
-          studentsInSchool: '请选择在校情况',
-          health: '请选择健康状况',
-          medicalInsurance: '请选择是否参加医保',
-          sicknessInsurance: '请选择是否参加大病保险',
-          endowmentInsurance: '请选择是否参加养老保险',
-          subsistenceAllowance: '请选择是否享受最低生活保障',
-          destitute: '请选择是否特困供养',
-        }
-      },
-
-      submit () {
-        const rules = this.rules()
-
-        for (let v of Object.keys(rules)) {
-          if (!this.form[v]) {
-            return this.$u.toast(rules[v])
           }
+          this.info = res.data
         }
 
-        uni.showLoading()
-        let familyList = this.info.familyList
-        if (this.isEdit) {
-          familyList[this.index] = this.form
-        } else {
-          familyList.push(this.form)
-        }
-        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-          ...this.info,
-          familyList, 
-          id: this.id
-        }).then(res => {
-          if (res.code === 0) {
-            this.$u.toast(this.isEdit ? '编辑成功' : '提交成功')
-            uni.$emit('reload')
-            uni.navigateBack({
-              delta: 1
-            })
-          }
-          uni.hideLoading()
-        })
+        uni.hideLoading()
+      })
+    },
+
+    rules() {
+      return {
+        relationship: '请选择与户主关系',
+        name: '请输入姓名',
+        idNumber: '请输入身份证号',
+        sex: '请选择性别',
+        studentsInSchool: '请选择在校情况',
+        health: '请选择健康状况',
+        medicalInsurance: '请选择是否参加医保',
+        sicknessInsurance: '请选择是否参加大病保险',
+        endowmentInsurance: '请选择是否参加养老保险',
+        subsistenceAllowance: '请选择是否享受最低生活保障',
+        destitute: '请选择是否特困供养',
       }
+    },
+
+    submit() {
+      const rules = this.rules()
+
+      for (let v of Object.keys(rules)) {
+        if (!this.form[v]) {
+          return this.$u.toast(rules[v])
+        }
+      }
+
+      uni.showLoading()
+      let familyList = this.info.familyList
+      if (this.isEdit) {
+        familyList[this.index] = this.form
+      } else {
+        familyList.push(this.form)
+      }
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.info,
+        familyList,
+        id: this.id
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '编辑成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .add {
-    padding-bottom: 120px;
+.add {
+  padding-bottom: 120px;
 
-    ::v-deep .u-radio {
-      &:last-child {
-        .u-radio__label {
-          margin-right: 0;
-        }
+  ::v-deep .u-radio {
+    &:last-child {
+      .u-radio__label {
+        margin-right: 0;
       }
     }
+  }
 
-    & > div {
-      margin-bottom: 16px;
-      background: #fff;
-    }
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
 
-    .form-group {
-      .form-item {
-        padding-left: 32px;
+  .form-group {
+    .form-item {
+      padding-left: 32px;
 
-        .form-item__wrapper {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          height: 112px;
-          border-bottom: 1px solid #E4E5E6;
-        }
-
-        .right {
-          height: 112px;
-          line-height: 112px;
-          padding-right: 32px;
-
-          span {
-            font-size: 30px;
-            color: #999999;
-          }
-        }
-
-        input {
-          height: 100%;
-          text-align: right;
-        }
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #333333;
-            font-size: 32px;
-          }
-
-          i {
-            margin-right: 4px;
-            font-style: normal;
-            color: #FF4466;
-            font-size: 32px;
-          }
-        }
-
-        &:last-child {
-          .form-item__wrapper {
-            border: none;
-          }
-        }
-      }
-    }
-
-    .form-item__imgs {
-      padding: 32px;
-
-      .form-item__title {
+      .form-item__wrapper {
         display: flex;
         align-items: center;
-        margin-bottom: 34px;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
 
-        h2 {
+      .right {
+        height: 112px;
+        line-height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
           color: #333333;
-          font-weight: normal;
           font-size: 32px;
         }
 
         i {
-          color: #999999;
-          font-size: 28px;
+          margin-right: 4px;
           font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
         }
       }
 
-      textarea {
-        width: 100%;
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
       }
     }
+  }
 
-    .form-type {
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/Monitor/AddLog.vue b/src/pages/Monitor/AddLog.vue
index afbdad1f..3774cbf2 100644
--- a/src/pages/Monitor/AddLog.vue
+++ b/src/pages/Monitor/AddLog.vue
@@ -21,139 +21,139 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader'
+import AiUploader from '@/components/AiUploader'
 
-  export default {
-    data () {
-      return {
-        detail: '',
-        pid: '',
-        id: '',
-        picture: []
-      }
-    },
+export default {
+  data() {
+    return {
+      detail: '',
+      pid: '',
+      id: '',
+      picture: []
+    }
+  },
 
-    components: {
-      AiUploader
-    },
+  components: {
+    AiUploader
+  },
 
-    onLoad (query) {
-      if (query.id) {
-        this.getInfo(query.id)
-        this.id = query.id
-      }
-      this.pid = query.pid
-    },
+  onLoad(query) {
+    if (query.id) {
+      this.getInfo(query.id)
+      this.id = query.id
+    }
+    this.pid = query.pid
+  },
 
-    methods: {
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.detail = res.data.detail
-            this.picture = JSON.parse(res.data.picture)
-          }
-        })
-      },
-
-      submit () {
-        if (!this.detail) {
-          return this.$u.toast('请输入帮扶内容')
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.detail = res.data.detail
+          this.picture = JSON.parse(res.data.picture)
         }
+      })
+    },
 
-        uni.showLoading()
-        this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', {
-          detail: this.detail,
-          picture: JSON.stringify(this.picture),
-          pid: this.pid,
-          id: this.id || ''
-        }).then(res => {
-          if (res.code === 0) {
-            this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
-            uni.$emit('reload')
-            uni.navigateBack({
-              delta: 1
-            })
-          }
-          uni.hideLoading()
-        })
+    submit() {
+      if (!this.detail) {
+        return this.$u.toast('请输入帮扶内容')
       }
+
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', {
+        detail: this.detail,
+        picture: JSON.stringify(this.picture),
+        pid: this.pid,
+        id: this.id || ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .form {
-    padding-bottom: 120px;
+.form {
+  padding-bottom: 120px;
 
-    div {
-      margin-bottom: 16px;
-      background: #fff;
-    }
+  div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
 
-    .form-item {
-      padding: 32px;
+  .form-item {
+    padding: 32px;
 
-      .form-item__title {
-        display: flex;
-        align-items: center;
-        margin-bottom: 34px;
-
-        em {
-          margin-right: 4px;
-          font-style: normal;
-          color: #FF4466;
-        }
-
-        h2 {
-          color: #333333;
-          font-weight: normal;
-          font-size: 32px;
-        }
-
-        i {
-          color: #999999;
-          font-size: 28px;
-          font-style: normal;
-        }
-      }
-
-      textarea {
-        width: 100%;
-      }
-    }
-
-    .form-type {
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
+
+      em {
+        margin-right: 4px;
+        font-style: normal;
+        color: #FF4466;
+      }
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/Monitor/Detail.vue b/src/pages/Monitor/Detail.vue
index ee4ad61e..62e2f4e9 100644
--- a/src/pages/Monitor/Detail.vue
+++ b/src/pages/Monitor/Detail.vue
@@ -9,7 +9,7 @@
         <div class="item-wrapper">
           <div class="item-header item-avatar">
             <div class="left">
-              <image src="/static/images/avatar.png" />
+              <image src="/static/images/avatar.png"/>
               <div class="left-right">
                 <h2>{{ info.name }}</h2>
                 <p>{{ info.phone }}</p>
@@ -47,14 +47,17 @@
           </div>
           <div class="item-info">
             <label>监测员电话</label>
-            <span style="color: #3D94FB;" @click="call(info.monitoringContactPhone)">{{ info.monitoringContactPhone || '-' }}</span>
+            <span style="color: #3D94FB;"
+                  @click="call(info.monitoringContactPhone)">{{ info.monitoringContactPhone || '-' }}</span>
           </div>
         </div>
         <div class="item-wrapper">
           <div class="item-header">
             <div class="left">
               <h2>家庭成员</h2>
-              <i :style="{color: info.familyList.length ? '#2EA222' : '#FF4466'}">({{ info.familyList.length ? '已填写' : '未填写' }})</i>
+              <i :style="{color: info.familyList.length ? '#2EA222' : '#FF4466'}">({{
+                  info.familyList.length ? '已填写' : '未填写'
+                }})</i>
             </div>
             <span @click="linkTo('/pages/Monitor/FamilyMember?id=' + info.id)">编辑</span>
           </div>
@@ -71,7 +74,9 @@
           <div class="item-header">
             <div class="left">
               <h2>家庭情况</h2>
-              <i :style="{color: isFamilySituation ? '#2EA222' : '#FF4466'}">({{ isFamilySituation ? '已填写' : '未填写' }})</i>
+              <i :style="{color: isFamilySituation ? '#2EA222' : '#FF4466'}">({{
+                  isFamilySituation ? '已填写' : '未填写'
+                }})</i>
             </div>
             <span @click="linkTo('/pages/Monitor/FamilySituation?id=' + info.id)">编辑</span>
           </div>
@@ -111,7 +116,7 @@
           </div>
           <div class="item-info">
             <label>是否消除风险</label>
-            <span>{{ info.riskEliminationMethod ? '是' : '-'  }}</span>
+            <span>{{ info.riskEliminationMethod ? '是' : '-' }}</span>
           </div>
         </div>
       </div>
@@ -121,18 +126,19 @@
             <div class="log-item__user">
               <div class="left">
                 <div class="user">
-                  <span>{{ item.createUserName.substr(item.createUserName.length - 2)}}</span>
+                  <span>{{ item.createUserName.substr(item.createUserName.length - 2) }}</span>
                 </div>
                 <h2>{{ item.createUserName }}</h2>
               </div>
               <div class="right">
                 <span>{{ item.createTime }}</span>
-                <image src="/static/images/more.png" @click="edit(item.id)" />
+                <image src="/static/images/more.png" @click="edit(item.id)"/>
               </div>
             </div>
             <p>{{ item.detail }}</p>
             <div class="imgs">
-              <image :src="img.url" @click="prevImg(item.imgs, img.url)" v-for="(img, index) in item.imgs" :key="index" />
+              <image :src="img.url" @click="prevImg(item.imgs, img.url)" v-for="(img, index) in item.imgs"
+                     :key="index"/>
             </div>
           </div>
         </div>
@@ -146,394 +152,395 @@
 </template>
 
 <script>
-  import AiFixedBtn from '@/components/AiFixedBtn'
-  import AiEmpty from '@/components/AiEmpty/AiEmpty'
-  export default {
-    name: 'detail',
+import AiFixedBtn from '@/components/AiFixedBtn'
+import AiEmpty from '@/components/AiEmpty/AiEmpty'
 
-    data () {
-      return {
-        info: {},
-        pageShow: false,
-        currIndex: 0,
-        list: [],
-        isFrom: false
+export default {
+  name: 'detail',
+
+  data() {
+    return {
+      info: {},
+      pageShow: false,
+      currIndex: 0,
+      list: [],
+      isFrom: false
+    }
+  },
+
+  components: {
+    AiEmpty,
+    AiFixedBtn
+  },
+
+  computed: {
+    isIncome() {
+      if (!this.info.id) {
+        return false
       }
+
+      return this.info.income6 > 0 && this.info.income7 > 0;
+
+
     },
 
-    components: {
-      AiEmpty,
-      AiFixedBtn
+    isPoorStatus() {
+      if (!this.info.id) {
+        return false
+      }
+
+      return !!this.info.riskEliminationMethod;
+
+
     },
 
-    computed: {
-      isIncome () {
-        if (!this.info.id) {
-          return false
-        }
-
-        return this.info.income6 > 0 && this.info.income7 > 0;
-
-
-      },
-
-      isPoorStatus () {
-        if (!this.info.id) {
-          return false
-        }
-
-        return !!this.info.riskEliminationMethod;
-
-
-      },
-
-      isFamilySituation () {
-        if (!this.info.id) {
-          return false
-        }
-
-        return !!(this.info.drinkingWaterSafety && this.info.dilapidatedHouse);
-
-
+    isFamilySituation() {
+      if (!this.info.id) {
+        return false
       }
-    },
 
-    onLoad (query) {
-      if (query.isFrom) {
-        this.isFrom = true
-        uni.setNavigationBarTitle({
-          title: '风险预警详情'
-        })
-      }
-      uni.showLoading()
-      this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo']).then(() => {
-        this.getInfo(query.id)
+      return !!(this.info.drinkingWaterSafety && this.info.dilapidatedHouse);
+
+
+    }
+  },
+
+  onLoad(query) {
+    if (query.isFrom) {
+      this.isFrom = true
+      uni.setNavigationBarTitle({
+        title: '风险预警详情'
       })
+    }
+    uni.showLoading()
+    this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo']).then(() => {
+      this.getInfo(query.id)
+    })
 
-      this.id = query.id
-      uni.$on('reload', () => {
-        this.getInfo(query.id)
+    this.id = query.id
+    uni.$on('reload', () => {
+      this.getInfo(query.id)
+    })
+  },
+
+  methods: {
+    linkTo(url) {
+      uni.navigateTo({
+        url
       })
     },
 
-    methods: {
-      linkTo (url) {
-        uni.navigateTo({
-          url
+    call(phone) {
+      if (phone) {
+        uni.makePhoneCall({
+          phoneNumber: phone
         })
-      },
+      }
+    },
 
-      call (phone) {
-        if (phone) {
-          uni.makePhoneCall({
-            phoneNumber: phone
+    edit(id) {
+      uni.showActionSheet({
+        itemList: ['编辑', '删除'],
+        success: res => {
+          if (res.tapIndex === 0) {
+            uni.navigateTo({
+              url: `/pages/Monitor/AddLog?pid=${this.info.id}&id=${id}`
+            })
+          } else if (res.tapIndex === 1) {
+            this.$confirm('确定删除该数据？').then(() => {
+              uni.showLoading()
+              this.$http.post(`/app/apppreventionreturntopovertylog/delete?ids=${id}`).then(res => {
+                if (res.code === 0) {
+                  this.$u.toast('删除成功')
+                  this.getInfo(this.id)
+                }
+                uni.hideLoading()
+              })
+            }).catch(() => {
+            })
+          }
+        }
+      })
+    },
+
+    prevImg(urls, img) {
+      const imgs = urls.map(v => v.url)
+      uni.previewImage({
+        urls: imgs,
+        current: img
+      })
+    },
+
+    toAddLog() {
+      uni.navigateTo({
+        url: '/pages/Monitor/AddLog?pid=' + this.info.id
+      })
+    },
+
+    changeTab(index) {
+      this.currIndex = index
+    },
+
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+
+          let ylbxCount = 0
+          let ylCount = 0
+          res.data.familyList.forEach(item => {
+            if (item.medicalInsurance === '02') {
+              ylbxCount = ylbxCount + 1
+            }
+            if (item.endowmentInsurance === '02') {
+              ylCount = ylCount + 1
+            }
+          })
+          this.info.ylbxCount = ylbxCount
+          this.info.ylCount = ylCount
+          this.pageShow = true
+        }
+
+        uni.hideLoading()
+      })
+      this.$http.post(`/app/apppreventionreturntopovertylog/list?pid=${id}&size=1000&current=1`).then(res => {
+        if (res.code === 0) {
+          this.list = res.data.records.map(item => {
+            return {
+              ...item,
+              imgs: JSON.parse(item.picture)
+            }
           })
         }
-      },
-
-      edit (id) {
-        uni.showActionSheet({
-          itemList: ['编辑', '删除'],
-          success: res => {
-            if (res.tapIndex === 0) {
-              uni.navigateTo({
-                url: `/pages/Monitor/AddLog?pid=${this.info.id}&id=${id}`
-              })
-            } else if (res.tapIndex === 1) {
-              this.$confirm('确定删除该数据？').then(() => {
-                uni.showLoading()
-                this.$http.post(`/app/apppreventionreturntopovertylog/delete?ids=${id}`).then(res => {
-                  if (res.code === 0) {
-                    this.$u.toast('删除成功')
-                    this.getInfo(this.id)
-                  }
-                  uni.hideLoading()
-                })
-              }).catch(() => {
-              })
-            }
-          }
-        })
-      },
-
-      prevImg (urls, img) {
-        const imgs = urls.map(v => v.url)
-        uni.previewImage({
-          urls: imgs,
-          current: img
-        })
-      },
-
-      toAddLog () {
-        uni.navigateTo({
-          url: '/pages/Monitor/AddLog?pid=' + this.info.id
-        })
-      },
-
-      changeTab (index) {
-        this.currIndex = index
-      },
-
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-
-            let ylbxCount = 0
-            let ylCount = 0
-            res.data.familyList.forEach(item => {
-              if (item.medicalInsurance === '02') {
-                ylbxCount = ylbxCount + 1
-              }
-              if (item.endowmentInsurance === '02') {
-                ylCount = ylCount + 1
-              }
-            })
-            this.info.ylbxCount = ylbxCount
-            this.info.ylCount = ylCount
-            this.pageShow = true
-          }
-
-          uni.hideLoading()
-        })
-        this.$http.post(`/app/apppreventionreturntopovertylog/list?pid=${id}&size=1000&current=1`).then(res => {
-          if (res.code === 0) {
-            this.list = res.data.records.map(item => {
-              return {
-                ...item,
-                imgs: JSON.parse(item.picture)
-              }
-            })
-          }
-        })
-      }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .detail {
-    padding-top: 96px;
-    padding-bottom: 60px;
+.detail {
+  padding-top: 96px;
+  padding-bottom: 60px;
 
-    &.active {
-      padding-top: 0;
-    }
+  &.active {
+    padding-top: 0;
+  }
 
-    .addBtn {
-      width: 96px;
-      height: 96px;
-      flex-shrink: 0;
-      background: $uni-color-primary;
-      box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-      font-size: 48px;
-      color: #fff;
-      border-radius: 50%;
-      justify-content: center;
-      align-items: center;
-      display: flex;
-    }
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
 
-    .tab {
-      display: flex;
-      position: fixed;
-      align-items: center;
-      left: 0;
-      top: 0;
-      z-index: 1;
-      width: 100%;
-      height: 96px;
-      padding: 0 60px;
-      background: #FFFFFF;
-      border-bottom: 1px solid #D4D4D4;
+  .tab {
+    display: flex;
+    position: fixed;
+    align-items: center;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    width: 100%;
+    height: 96px;
+    padding: 0 60px;
+    background: #FFFFFF;
+    border-bottom: 1px solid #D4D4D4;
+    box-sizing: border-box;
+
+    * {
       box-sizing: border-box;
+    }
 
-      * {
-        box-sizing: border-box;
+    span {
+      position: relative;
+      flex: 1;
+      height: 96 rpx;
+      line-height: 96 rpx;
+      color: #000000;
+      text-align: center;
+      font-size: 32px;
+
+      &::after {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        width: 192px;
+        height: 6px;
+        background: transparent;
+        transform: translateX(-50%);
+        content: ' ';
+      }
+
+      &.active {
+        color: #1365DD;
+
+        &::after {
+          background: #1365DD;
+        }
+      }
+    }
+  }
+
+  .item-wrapper {
+    background: #fff;
+    margin-bottom: 16px;
+    padding: 0 32px 16px;
+
+    .item-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 96px;
+
+      & > span {
+        color: #3975C6;
+        font-size: 32px;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        h2 {
+          color: #333333;
+          font-size: 32px;
+          font-weight: 500;
+        }
+
+        i {
+          font-style: normal;
+          color: #2EA222;
+          font-size: 32px;
+        }
+      }
+    }
+
+    .item-info {
+      display: flex;
+      justify-content: space-between;
+      padding: 14px 0;
+
+      label {
+        color: #999999;
+        font-size: 32px;
       }
 
       span {
-        position: relative;
-        flex: 1;
-        height: 96rpx;
-        line-height: 96rpx;
-        color: #000000;
-        text-align: center;
+        max-width: 496px;
+        text-align: right;
+        color: #333333;
         font-size: 32px;
-
-        &::after {
-          position: absolute;
-          bottom: 0;
-          left: 50%;
-          width: 192px;
-          height: 6px;
-          background: transparent;
-          transform: translateX(-50%);
-          content: ' ';
-        }
-
-        &.active {
-          color: #1365DD;
-
-          &::after {
-            background: #1365DD;
-          }
-        }
       }
     }
 
-    .item-wrapper {
-      background: #fff;
-      margin-bottom: 16px;
-      padding: 0 32px 16px;
+    .item-avatar {
+      height: 192px;
 
-      .item-header {
+      image {
+        width: 112px;
+        height: 112px;
+        margin-right: 24px;
+      }
+
+      .left-right {
+        p {
+          margin-top: 8px;
+          color: #999999;
+          font-size: 28px;
+        }
+      }
+    }
+  }
+
+  .log-item {
+    padding: 0 0 0 32px;
+    background: #fff;
+
+    &:first-child {
+      margin-top: 16px;
+    }
+
+    &:last-child {
+      .log-item__wrapper {
+        border: none !important;
+      }
+    }
+
+    .log-item__wrapper {
+      padding: 32px 32px 32px 0;
+      border-bottom: 1px solid #E4E5E6;
+
+      .log-item__user {
         display: flex;
         align-items: center;
         justify-content: space-between;
-        height: 96px;
 
-        & > span {
-          color: #3975C6;
-          font-size: 32px;
+        & > div {
+          display: flex;
+          align-items: center;
         }
 
         .left {
-          display: flex;
-          align-items: center;
+          .user, image {
+            width: 80px;
+            height: 80px;
+            line-height: 80px;
+            margin-right: 16px;
+            text-align: center;
+            border-radius: 50%;
+            background: #2266FF;
+
+            span {
+              color: #fff;
+              font-size: 28px;
+            }
+          }
 
           h2 {
-            color: #333333;
-            font-size: 32px;
-            font-weight: 500;
-          }
-
-          i {
-            font-style: normal;
-            color: #2EA222;
+            color: #333;
             font-size: 32px;
           }
         }
-      }
 
-      .item-info {
-        display: flex;
-        justify-content: space-between;
-        padding: 14px 0;
+        .right {
+          image {
+            width: 32px;
+            height: 32px;
+          }
 
-        label {
-          color: #999999;
-          font-size: 32px;
-        }
-
-        span {
-          max-width: 496px;
-          text-align: right;
-          color: #333333;
-          font-size: 32px;
-        }
-      }
-
-      .item-avatar {
-        height: 192px;
-
-        image {
-          width: 112px;
-          height: 112px;
-          margin-right: 24px;
-        }
-
-        .left-right {
-          p {
-            margin-top: 8px;
+          span {
+            margin-right: 6px;
             color: #999999;
             font-size: 28px;
           }
         }
       }
-    }
 
-    .log-item {
-      padding: 0 0 0 32px;
-      background: #fff;
-
-      &:first-child {
-        margin-top: 16px;
+      p {
+        margin: 4px 0 16px 96px;
+        color: #343D65;
+        font-size: 28px;
       }
 
-      &:last-child {
-        .log-item__wrapper {
-          border: none!important;
-        }
-      }
+      .imgs {
+        margin-left: 96px;
 
-      .log-item__wrapper {
-        padding: 32px 32px 32px 0;
-        border-bottom: 1px solid #E4E5E6;
-
-        .log-item__user {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-
-          & > div {
-            display: flex;
-            align-items: center;
-          }
-
-          .left {
-            .user, image {
-              width: 80px;
-              height: 80px;
-              line-height: 80px;
-              margin-right: 16px;
-              text-align: center;
-              border-radius: 50%;
-              background: #2266FF;
-
-              span {
-                color: #fff;
-                font-size: 28px;
-              }
-            }
-
-            h2 {
-              color: #333;
-              font-size: 32px;
-            }
-          }
-
-          .right {
-            image {
-              width: 32px;
-              height: 32px;
-            }
-
-            span {
-              margin-right: 6px;
-              color: #999999;
-              font-size: 28px;
-            }
-          }
-        }
-
-        p {
-          margin: 4px 0 16px 96px;
-          color: #343D65;
-          font-size: 28px;
-        }
-
-        .imgs {
-          margin-left: 96px;
-
-          image {
-            width: 136px;
-            height: 136px;
-            margin-right: 8px;
-            margin-bottom: 8px;
-          }
+        image {
+          width: 136px;
+          height: 136px;
+          margin-right: 8px;
+          margin-bottom: 8px;
         }
       }
     }
   }
+}
 </style>
diff --git a/src/pages/Monitor/FamilyMember.vue b/src/pages/Monitor/FamilyMember.vue
index 03a5dcc9..27076467 100644
--- a/src/pages/Monitor/FamilyMember.vue
+++ b/src/pages/Monitor/FamilyMember.vue
@@ -80,7 +80,7 @@
       <div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd"></div>
     </ai-fixed-btn>
     <div class="no-more" v-if="!list.length">
-      <image src="/static/images/empty.png" />
+      <image src="/static/images/empty.png"/>
       <div>
         <span>您还未添加过家庭成员点击</span>
         <i>新增按钮</i>
@@ -91,246 +91,246 @@
 </template>
 
 <script>
-  import AiFixedBtn from '@/components/AiFixedBtn'
-  import AiBack from '@/components/AiBack'
+import AiFixedBtn from '@/components/AiFixedBtn'
+import AiBack from '@/components/AiBack'
 
-  export default {
-    data () {
-      return {
-        list: [],
-        id: '',
-        info: {},
-        pageShow: false
-      }
-    },
+export default {
+  data() {
+    return {
+      list: [],
+      id: '',
+      info: {},
+      pageShow: false
+    }
+  },
 
-    components: {
-      AiBack,
-      AiFixedBtn
-    },
+  components: {
+    AiBack,
+    AiFixedBtn
+  },
 
-    onLoad (query) {
-      uni.showLoading()
-      this.id = query.id
-      this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook',
-        'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
-        this.getInfo(query.id)
-      })
+  onLoad(query) {
+    uni.showLoading()
+    this.id = query.id
+    this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook',
+      'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
+      this.getInfo(query.id)
+    })
 
-      uni.$on('reload', () => {
-        this.getInfo(query.id)
+    uni.$on('reload', () => {
+      this.getInfo(query.id)
+    })
+  },
+
+  methods: {
+    toAdd() {
+      uni.navigateTo({
+        url: '/pages/Monitor/AddFamilyMember?id=' + this.id
       })
     },
 
-    methods: {
-      toAdd () {
+    toEdit(index) {
+      this.$confirm('确定编辑该数据？').then(() => {
         uni.navigateTo({
-          url: '/pages/Monitor/AddFamilyMember?id=' + this.id
+          url: `/pages/Monitor/AddFamilyMember?id=${this.id}&index=${index}`
         })
-      },
+      }).catch(() => {
+      })
+    },
 
-      toEdit (index) {
-        this.$confirm('确定编辑该数据？').then(() => {
-          uni.navigateTo({
-            url: `/pages/Monitor/AddFamilyMember?id=${this.id}&index=${index}`
-          })
-        }).catch(() => {
-        })
-      },
-
-      remove (index) {
-        this.$confirm('确定删除该数据？').then(() => {
-          let familyList = JSON.parse(JSON.stringify(this.list))
-          familyList.splice(index, 1)
-          uni.showLoading()
-          this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-            ...this.info,
-            familyList,
-            id: this.id
-          }).then(res => {
-            if (res.code === 0) {
-              this.$u.toast('删除成功')
-              this.getInfo(this.id)
-            }
-            uni.hideLoading()
-          })
-        }).catch(() => {
-        })
-      },
-
-      showMore (index) {
-        this.list[index].isShow = !this.list[index].isShow
-      },
-
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+    remove(index) {
+      this.$confirm('确定删除该数据？').then(() => {
+        let familyList = JSON.parse(JSON.stringify(this.list))
+        familyList.splice(index, 1)
+        uni.showLoading()
+        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+          ...this.info,
+          familyList,
+          id: this.id
+        }).then(res => {
           if (res.code === 0) {
-            this.info = res.data
-            this.list = res.data.familyList.map(item => {
-              return {
-                ...item,
-                isShow: false,
-                age: this.$calcAge(item.idNumber)
-              }
-            })
-
-            this.pageShow = true
+            this.$u.toast('删除成功')
+            this.getInfo(this.id)
           }
-
           uni.hideLoading()
         })
-      }
+      }).catch(() => {
+      })
+    },
+
+    showMore(index) {
+      this.list[index].isShow = !this.list[index].isShow
+    },
+
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.list = res.data.familyList.map(item => {
+            return {
+              ...item,
+              isShow: false,
+              age: this.$calcAge(item.idNumber)
+            }
+          })
+
+          this.pageShow = true
+        }
+
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .familyMember {
-    padding: 32px 0;
+.familyMember {
+  padding: 32px 0;
 
-    .no-more {
-      padding-top: 160px;
-      text-align: center;
+  .no-more {
+    padding-top: 160px;
+    text-align: center;
 
-      image {
-        width: 282px;
-        height: 304px;
-      }
-
-      div {
-        width: 280px;
-        margin: 0 auto;
-
-        span {
-          color: #999999;
-          font-size: 28px;
-        }
-
-        i {
-          font-style: normal;
-          color: #467DFE;
-          font-size: 28px;
-        }
-      }
+    image {
+      width: 282px;
+      height: 304px;
     }
 
-    .addBtn {
-      width: 96px;
-      height: 96px;
-      flex-shrink: 0;
-      background: $uni-color-primary;
-      box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-      font-size: 48px;
-      color: #fff;
-      border-radius: 50%;
-      justify-content: center;
-      align-items: center;
+    div {
+      width: 280px;
+      margin: 0 auto;
+
+      span {
+        color: #999999;
+        font-size: 28px;
+      }
+
+      i {
+        font-style: normal;
+        color: #467DFE;
+        font-size: 28px;
+      }
+    }
+  }
+
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+
+  .item {
+    width: 686px;
+    margin: 0 auto 32px;
+    border-radius: 16px;
+    overflow: hidden;
+    background: #fff;
+
+    .item-bottom {
       display: flex;
+      align-items: center;
+      height: 94px;
+
+      span {
+        flex: 1;
+        height: 100%;
+        line-height: 96px;
+        color: #3975C6;
+        font-size: 26px;
+        text-align: center;
+      }
     }
 
-    .item {
-      width: 686px;
-      margin: 0 auto 32px;
-      border-radius: 16px;
-      overflow: hidden;
-      background: #fff;
+    .item-title {
+      padding: 32px;
+      background: #FFFFFF;
+      border-bottom: 1px solid #DDDDDD;
 
-      .item-bottom {
+      .top {
         display: flex;
         align-items: center;
-        height: 94px;
+        justify-content: space-between;
+        margin-bottom: 8px;
 
-        span {
-          flex: 1;
-          height: 100%;
-          line-height: 96px;
-          color: #3975C6;
-          font-size: 26px;
-          text-align: center;
-        }
-      }
-
-      .item-title {
-        padding: 32px;
-        background: #FFFFFF;
-        border-bottom: 1px solid #DDDDDD;
-
-        .top {
+        .left {
           display: flex;
           align-items: center;
-          justify-content: space-between;
-          margin-bottom: 8px;
 
-          .left {
-            display: flex;
-            align-items: center;
-
-            h2 {
-              margin-right: 32px;
-              color: #333333;
-              font-size: 40px;
-              font-weight: 500;
-            }
-
-            span {
-              color: #999999;
-              font-size: 28px;
-            }
+          h2 {
+            margin-right: 32px;
+            color: #333333;
+            font-size: 40px;
+            font-weight: 500;
           }
 
-          & > span {
-            color: #3975C6;
+          span {
+            color: #999999;
             font-size: 28px;
           }
         }
-      }
 
-      .item-info {
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        background: #F9F9F9;
-
-        .item-info__item {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          width: 50%;
-          height: 72px;
-          padding: 0 20px;
-          border-bottom: 1px solid #DDDDDD;
-          border-right: 1px solid #DDDDDD;
-          box-sizing: border-box;
-
-          &:nth-of-type(2n) {
-            border-right: none;
-          }
-        }
-
-        label {
-          color: #999999;
-          font-size: 26px;
-        }
-
-        span {
+        & > span {
           color: #3975C6;
-          font-size: 26px;
+          font-size: 28px;
+        }
+      }
+    }
+
+    .item-info {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      background: #F9F9F9;
+
+      .item-info__item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 50%;
+        height: 72px;
+        padding: 0 20px;
+        border-bottom: 1px solid #DDDDDD;
+        border-right: 1px solid #DDDDDD;
+        box-sizing: border-box;
+
+        &:nth-of-type(2n) {
+          border-right: none;
         }
       }
 
-      .bottom {
-        display: flex;
-        align-items: center;
+      label {
+        color: #999999;
+        font-size: 26px;
+      }
 
-        span {
-          color: #999999;
-          font-size: 28px;
+      span {
+        color: #3975C6;
+        font-size: 26px;
+      }
+    }
 
-          &:first-child {
-            margin-right: 20px;
-          }
+    .bottom {
+      display: flex;
+      align-items: center;
+
+      span {
+        color: #999999;
+        font-size: 28px;
+
+        &:first-child {
+          margin-right: 20px;
         }
       }
     }
   }
+}
 </style>
diff --git a/src/pages/Monitor/FamilySituation.vue b/src/pages/Monitor/FamilySituation.vue
index 042b12bd..204ae99a 100644
--- a/src/pages/Monitor/FamilySituation.vue
+++ b/src/pages/Monitor/FamilySituation.vue
@@ -9,7 +9,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.dilapidatedHouse">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -22,7 +24,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.drinkingWaterSafety">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -49,211 +53,211 @@
 </template>
 
 <script>
-  import AiBack from '@/components/AiBack'
-  import AiSelect from '@/components/AiSelect'
+import AiBack from '@/components/AiBack'
+import AiSelect from '@/components/AiSelect'
 
-  export default {
-    data () {
-      return {
-        form: {
-          dilapidatedHouse: '',
-          drinkingWaterSafety: '',
-          riskType: ''
-        },
-        id: ''
-      }
-    },
-
-    components: {
-      AiBack,
-      AiSelect
-    },
-
-    onLoad (query) {
-      this.$dict.load(['fpYesOrNo', 'fpRiskType'])
-      uni.showLoading()
-      this.id = query.id
-      this.getInfo(query.id)
-    },
-
-    methods: {
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = {
-              ...this.form,
-              ...res.data
-            }
-          }
-
-          uni.hideLoading()
-        })
-      },
-
-      submit () {
-        uni.showLoading()
-        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-          ...this.form,
-          id: this.id
-        }).then(res => {
-          if (res.code === 0) {
-            this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
-            uni.$emit('reload')
-            uni.navigateBack({
-              delta: 1
-            })
-          }
-          uni.hideLoading()
-        })
+export default {
+  data() {
+    return {
+      form: {
+        dilapidatedHouse: '',
+        drinkingWaterSafety: '',
+        riskType: ''
       },
+      id: ''
     }
+  },
+
+  components: {
+    AiBack,
+    AiSelect
+  },
+
+  onLoad(query) {
+    this.$dict.load(['fpYesOrNo', 'fpRiskType'])
+    uni.showLoading()
+    this.id = query.id
+    this.getInfo(query.id)
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
+          }
+        }
+
+        uni.hideLoading()
+      })
+    },
+
+    submit() {
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.form,
+        id: this.id
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
+    },
   }
+}
 </script>
 
 <style lang="scss">
-  .add {
-    padding-bottom: 120px;
+.add {
+  padding-bottom: 120px;
 
-    .form-textarea {
-      padding: 32px;
+  .form-textarea {
+    padding: 32px;
 
-      h2 {
-        margin-bottom: 32px;
-        color: #333333;
-        font-size: 32px;
-        font-weight: 500;
-      }
-
-      textarea {
-        width: 100%;
-        height: 200px;
-      }
+    h2 {
+      margin-bottom: 32px;
+      color: #333333;
+      font-size: 32px;
+      font-weight: 500;
     }
 
-    & > div {
-      margin-bottom: 16px;
-      background: #fff;
+    textarea {
+      width: 100%;
+      height: 200px;
     }
+  }
 
-    ::v-deep .u-radio {
-      &:last-child {
-        .u-radio__label {
-          margin-right: 0;
-        }
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
+
+  ::v-deep .u-radio {
+    &:last-child {
+      .u-radio__label {
+        margin-right: 0;
       }
     }
+  }
 
-    .form-group {
-      .form-item {
-        padding-left: 32px;
+  .form-group {
+    .form-item {
+      padding-left: 32px;
 
-        .form-item__wrapper {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          height: 112px;
-          border-bottom: 1px solid #E4E5E6;
-        }
-
-        .right {
-          height: 112px;
-          line-height: 112px;
-          padding-right: 32px;
-
-          span {
-            font-size: 30px;
-            color: #999999;
-          }
-        }
-
-        input {
-          height: 100%;
-          text-align: right;
-        }
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #333333;
-            font-size: 32px;
-          }
-
-          i {
-            margin-right: 4px;
-            font-style: normal;
-            color: #FF4466;
-            font-size: 32px;
-          }
-        }
-
-        &:last-child {
-          .form-item__wrapper {
-            border: none;
-          }
-        }
-      }
-    }
-
-    .form-item__imgs {
-      padding: 32px;
-
-      .form-item__title {
+      .form-item__wrapper {
         display: flex;
         align-items: center;
-        margin-bottom: 34px;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
 
-        h2 {
+      .right {
+        height: 112px;
+        line-height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
           color: #333333;
-          font-weight: normal;
           font-size: 32px;
         }
 
         i {
-          color: #999999;
-          font-size: 28px;
+          margin-right: 4px;
           font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
         }
       }
 
-      textarea {
-        width: 100%;
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
       }
     }
+  }
 
-    .form-type {
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/Monitor/Income.vue b/src/pages/Monitor/Income.vue
index f5df1bf8..3766ede0 100644
--- a/src/pages/Monitor/Income.vue
+++ b/src/pages/Monitor/Income.vue
@@ -7,7 +7,8 @@
             <span>工资收入</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income1" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income1" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -17,7 +18,8 @@
             <span>生产经营收入</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income2" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income2" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -27,7 +29,8 @@
             <span>财产性收入</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income3" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income3" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -37,7 +40,8 @@
             <span>转移性收入</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income4" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income4" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -47,7 +51,8 @@
             <span>理赔收入</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income8" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income8" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -59,7 +64,8 @@
             <span>生产经营支出</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income5" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income5" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -69,7 +75,8 @@
             <span>合规自然支出</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.income9" type="number" placeholder-style="color: #999; font-size: 30rpx;" />
+            <input placeholder="请输入" v-model="form.income9" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -80,188 +87,188 @@
 </template>
 
 <script>
-  export default {
-    data () {
-      return {
-        form: {
-          income1: '',
-          income2: '',
-          income3: '',
-          income4: '',
-          income5: '',
-          income8: '',
-          income9: ''
-        },
-        id: ''
-      }
-    },
-
-    onLoad (query) {
-      uni.showLoading()
-      this.id = query.id
-      this.getInfo(query.id)
-    },
-
-    methods: {
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = {
-              ...this.form,
-              ...res.data
-            }
-          }
-
-          uni.hideLoading()
-        })
+export default {
+  data() {
+    return {
+      form: {
+        income1: '',
+        income2: '',
+        income3: '',
+        income4: '',
+        income5: '',
+        income8: '',
+        income9: ''
       },
+      id: ''
+    }
+  },
 
-      submit () {
-        uni.showLoading()
-        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-          ...this.form,
-          id: this.id
-        }).then(res => {
-          if (res.code === 0) {
-            this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
-            uni.$emit('reload')
-            uni.navigateBack({
-              delta: 1
-            })
+  onLoad(query) {
+    uni.showLoading()
+    this.id = query.id
+    this.getInfo(query.id)
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
           }
-          uni.hideLoading()
-        })
-      }
+        }
+
+        uni.hideLoading()
+      })
+    },
+
+    submit() {
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.form,
+        id: this.id
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .add {
-    padding-bottom: 120px;
+.add {
+  padding-bottom: 120px;
 
-    .tips {
-      margin: 32px 0 0 32px;
-      color: #999999;
-      font-size: 26px;
-    }
+  .tips {
+    margin: 32px 0 0 32px;
+    color: #999999;
+    font-size: 26px;
+  }
 
-    & > div {
-      margin-bottom: 16px;
-      background: #fff;
-    }
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
 
-    .form-group {
-      .form-item {
-        padding-left: 32px;
+  .form-group {
+    .form-item {
+      padding-left: 32px;
 
-        .form-item__wrapper {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          height: 112px;
-          border-bottom: 1px solid #E4E5E6;
-        }
-
-        .right {
-          height: 112px;
-          line-height: 112px;
-          padding-right: 32px;
-
-          span {
-            font-size: 30px;
-            color: #999999;
-          }
-        }
-
-        input {
-          height: 100%;
-          text-align: right;
-        }
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #333333;
-            font-size: 32px;
-          }
-
-          i {
-            margin-right: 4px;
-            font-style: normal;
-            color: #FF4466;
-            font-size: 32px;
-          }
-        }
-
-        &:last-child {
-          .form-item__wrapper {
-            border: none;
-          }
-        }
-      }
-    }
-
-    .form-item__imgs {
-      padding: 32px;
-
-      .form-item__title {
+      .form-item__wrapper {
         display: flex;
         align-items: center;
-        margin-bottom: 34px;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
 
-        h2 {
+      .right {
+        height: 112px;
+        line-height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
           color: #333333;
-          font-weight: normal;
           font-size: 32px;
         }
 
         i {
-          color: #999999;
-          font-size: 28px;
+          margin-right: 4px;
           font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
         }
       }
 
-      textarea {
-        width: 100%;
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
       }
     }
+  }
 
-    .form-type {
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/Monitor/Monitor.vue b/src/pages/Monitor/Monitor.vue
index 9b02c420..f6ee4cb8 100644
--- a/src/pages/Monitor/Monitor.vue
+++ b/src/pages/Monitor/Monitor.vue
@@ -12,76 +12,76 @@
 </template>
 
 <script>
-  import Statistics from './components/Statistics.vue'
-  import List from './components/List.vue'
+import Statistics from './components/Statistics.vue'
+import List from './components/List.vue'
 
-  export default {
-    data () {
-      return {
-        currIndex: 0
-      }
-    },
+export default {
+  data() {
+    return {
+      currIndex: 0
+    }
+  },
 
-    components: {
-      List,
-      Statistics
-    },
+  components: {
+    List,
+    Statistics
+  },
 
-    computed: {
-      tabBar () {
-        const link = icon => `${this.$cdn}askform/${icon}.png`
-        return [
-          {text: "监测对象列表", iconPath: "bdlb1", selectedIconPath: "bdlb2" },
-          {text: "数据统计", iconPath: "xjxm1", selectedIconPath: "xjxm2" }
-        ].map(e => ({
-          ...e,
-          iconPath: link(e.iconPath),
-          selectedIconPath: link(e.selectedIconPath)
-        }))
-      }
-    },
+  computed: {
+    tabBar() {
+      const link = icon => `${this.$cdn}askform/${icon}.png`
+      return [
+        {text: "监测对象列表", iconPath: "bdlb1", selectedIconPath: "bdlb2"},
+        {text: "数据统计", iconPath: "xjxm1", selectedIconPath: "xjxm2"}
+      ].map(e => ({
+        ...e,
+        iconPath: link(e.iconPath),
+        selectedIconPath: link(e.selectedIconPath)
+      }))
+    }
+  },
 
-    onLoad () {
-      uni.$on('reload', () => {
-        if (this.currIndex === 0) {
-          this.$refs.list.reload()
-        }
-      })
-    },
-
-    onReachBottom() {
+  onLoad() {
+    uni.$on('reload', () => {
       if (this.currIndex === 0) {
-        this.$refs.list.getList()
+        this.$refs.list.reload()
       }
+    })
+  },
+
+  onReachBottom() {
+    if (this.currIndex === 0) {
+      this.$refs.list.getList()
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .povertyMonitor {
-    .footer {
-      display: flex;
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      z-index: 11;
-      width: 100%;
+.povertyMonitor {
+  .footer {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 11;
+    width: 100%;
+    height: 98px;
+
+    div {
+      flex: 1;
       height: 98px;
+      line-height: 98px;
+      text-align: center;
+      color: #333333;
+      font-size: 32px;
+      background: #fff;
 
-      div {
-        flex: 1;
-        height: 98px;
-        line-height: 98px;
-        text-align: center;
-        color: #333333;
-        font-size: 32px;
-        background: #fff;
-
-        &.active {
-          color: #fff;
-          background: #3192F4;
-        }
+      &.active {
+        color: #fff;
+        background: #3192F4;
       }
     }
   }
+}
 </style>
diff --git a/src/pages/Monitor/PoorStatus.vue b/src/pages/Monitor/PoorStatus.vue
index 5f8c85bb..6a17d0d2 100644
--- a/src/pages/Monitor/PoorStatus.vue
+++ b/src/pages/Monitor/PoorStatus.vue
@@ -86,7 +86,9 @@
           </div>
           <div class="right">
             <u-radio-group v-model="form.isRisk" @change="onRiskChange">
-              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">{{ item.dictName }}</u-radio>
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
             </u-radio-group>
           </div>
         </div>
@@ -119,232 +121,232 @@
 </template>
 
 <script>
-  import AiSelect from '@/components/AiSelect'
-  import AiDate from '@/components/AiDate'
+import AiSelect from '@/components/AiSelect'
+import AiDate from '@/components/AiDate'
 
-  export default {
-    data () {
-      return {
-        result: '',
-        form: {
-          isRisk: '02',
-          riskEliminationMethod: '',
-          riskEliminationDate: '',
-          industrialAssistance: '',
-          healthAssistance: '',
-          employmentAssistance: '',
-          educationalAssistance: '',
-          financialAssistance: '',
-          socialAssistance: '',
-          publicWelfarePostAssistance: ''
-        },
-        id: ''
-      }
-    },
+export default {
+  data() {
+    return {
+      result: '',
+      form: {
+        isRisk: '02',
+        riskEliminationMethod: '',
+        riskEliminationDate: '',
+        industrialAssistance: '',
+        healthAssistance: '',
+        employmentAssistance: '',
+        educationalAssistance: '',
+        financialAssistance: '',
+        socialAssistance: '',
+        publicWelfarePostAssistance: ''
+      },
+      id: ''
+    }
+  },
 
-    components: {
-      AiDate,
-      AiSelect
-    },
+  components: {
+    AiDate,
+    AiSelect
+  },
 
-    onLoad (query) {
-      uni.showLoading()
-      this.$dict.load(['fpYesOrNo', 'fpRiskEliminationMethod', 'fpIndustrialAssistance', 'fpHealthAssistance', 'fpEmploymentAssistance', 
+  onLoad(query) {
+    uni.showLoading()
+    this.$dict.load(['fpYesOrNo', 'fpRiskEliminationMethod', 'fpIndustrialAssistance', 'fpHealthAssistance', 'fpEmploymentAssistance',
       'fpEducationalAssistance', 'fpFinancialAssistance', 'fpSocialAssistance', 'fpPublicWelfarePostAssistance']).then(() => {
-        this.getInfo(query.id)
+      this.getInfo(query.id)
+    })
+    this.id = query.id
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
+          }
+
+          if (this.form.riskEliminationMethod) {
+            this.form.isRisk = '01'
+          }
+        }
+
+        uni.hideLoading()
       })
-      this.id = query.id
     },
 
-    methods: {
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = {
-              ...this.form,
-              ...res.data
-            }
-
-            if (this.form.riskEliminationMethod) {
-              this.form.isRisk = '01'
-            }
-          }
-
-          uni.hideLoading()
-        })
-      },
-
-      onRiskChange (e) {
-        if (e === '02') {
-          this.form.riskEliminationMethod = ''
-          this.form.riskEliminationDate = ''
-        }
-      },
-
-      submit () {
-        if (!this.form.isRisk) {
-          return this.$u.toast('请选择是否消除风险')
-        }
-
-        if (this.form.isRisk === '01') {
-          if (!this.form.riskEliminationMethod) {
-            return this.$u.toast('请选择风险消除方式')
-          }
-
-          if (!this.form.riskEliminationDate) {
-            return this.$u.toast('请选择风险消除时间')
-          }
-        }
-
-        uni.showLoading()
-        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-          ...this.form,
-          riskEliminationMethod: this.form.isRisk ? this.form.riskEliminationMethod : '',
-          id: this.id,
-          status: this.form.isRisk === '01' ? 1 : ''
-        }).then(res => {
-          if (res.code === 0) {
-            this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
-            uni.$emit('reload')
-            uni.navigateBack({
-              delta: 1
-            })
-          }
-          uni.hideLoading()
-        })
+    onRiskChange(e) {
+      if (e === '02') {
+        this.form.riskEliminationMethod = ''
+        this.form.riskEliminationDate = ''
       }
+    },
+
+    submit() {
+      if (!this.form.isRisk) {
+        return this.$u.toast('请选择是否消除风险')
+      }
+
+      if (this.form.isRisk === '01') {
+        if (!this.form.riskEliminationMethod) {
+          return this.$u.toast('请选择风险消除方式')
+        }
+
+        if (!this.form.riskEliminationDate) {
+          return this.$u.toast('请选择风险消除时间')
+        }
+      }
+
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.form,
+        riskEliminationMethod: this.form.isRisk ? this.form.riskEliminationMethod : '',
+        id: this.id,
+        status: this.form.isRisk === '01' ? 1 : ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .add {
-    padding-bottom: 120px;
+.add {
+  padding-bottom: 120px;
 
-    & > div {
-      margin-bottom: 16px;
-      background: #fff;
-    }
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
 
-    ::v-deep .u-radio {
-      &:last-child {
-        .u-radio__label {
-          margin-right: 0;
-        }
+  ::v-deep .u-radio {
+    &:last-child {
+      .u-radio__label {
+        margin-right: 0;
       }
     }
+  }
 
-    .form-group {
-      .form-item {
-        padding-left: 32px;
+  .form-group {
+    .form-item {
+      padding-left: 32px;
 
-        .form-item__wrapper {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          height: 112px;
-          border-bottom: 1px solid #E4E5E6;
-        }
-
-        .right {
-          height: 112px;
-          line-height: 112px;
-          padding-right: 32px;
-
-          span {
-            font-size: 30px;
-            color: #999999;
-          }
-        }
-
-        input {
-          height: 100%;
-          text-align: right;
-        }
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #333333;
-            font-size: 32px;
-          }
-
-          i {
-            margin-right: 4px;
-            font-style: normal;
-            color: #FF4466;
-            font-size: 32px;
-          }
-        }
-
-        &:last-child {
-          .form-item__wrapper {
-            border: none;
-          }
-        }
-      }
-    }
-
-    .form-item__imgs {
-      padding: 32px;
-
-      .form-item__title {
+      .form-item__wrapper {
         display: flex;
         align-items: center;
-        margin-bottom: 34px;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
 
-        h2 {
+      .right {
+        height: 112px;
+        line-height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
           color: #333333;
-          font-weight: normal;
           font-size: 32px;
         }
 
         i {
-          color: #999999;
-          font-size: 28px;
+          margin-right: 4px;
           font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
         }
       }
 
-      textarea {
-        width: 100%;
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
       }
     }
+  }
 
-    .form-type {
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/Monitor/components/List.vue b/src/pages/Monitor/components/List.vue
index dc2f2b6f..ea3b0199 100644
--- a/src/pages/Monitor/components/List.vue
+++ b/src/pages/Monitor/components/List.vue
@@ -7,7 +7,8 @@
         <div class="label" v-if="addressArea">{{ addressArea }}</div>
         <i v-else>请选择</i>
       </AiArea> -->
-      <AiAreaPicker ref="area" class="aiArea" :name.sync="addressArea" :areaId="areaId" mode="custom" @select="onChange">
+      <AiAreaPicker ref="area" class="aiArea" :name.sync="addressArea" :areaId="areaId" mode="custom"
+                    @select="onChange">
         <span class="label" v-if="addressArea">{{ addressArea }}</span>
         <i v-else>请选择</i>
       </AiAreaPicker>
@@ -19,16 +20,16 @@
       </div>
       <div class="search">
         <u-search
-          placeholder="请输入"
-          :show-action="false"
-          search-icon-color="#ccc"
-          v-model="name"
-          @search="reload">
+            placeholder="请输入"
+            :show-action="false"
+            search-icon-color="#ccc"
+            v-model="name"
+            @search="reload">
         </u-search>
       </div>
       <div class="list-item__wrapper">
         <div class="list-item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
-          <image src="/static/images/avatar.png" />
+          <image src="/static/images/avatar.png"/>
           <div class="right">
             <h2>{{ item.name || item.phone }}</h2>
             <p>{{ item.addressArea }}</p>
@@ -44,252 +45,252 @@
 </template>
 
 <script>
-  import AiArea from '@/components/AiArea'
-  import AiFixedBtn from '@/components/AiFixedBtn'
-  import AiEmpty from '@/components/AiEmpty/AiEmpty'
-  import AiAreaPicker from '@/components/AiAreaPicker'
+import AiArea from '@/components/AiArea'
+import AiFixedBtn from '@/components/AiFixedBtn'
+import AiEmpty from '@/components/AiEmpty/AiEmpty'
+import AiAreaPicker from '@/components/AiAreaPicker'
 
-  export default {
-    name: 'list',
+export default {
+  name: 'list',
 
-    data () {
-      return {
-        currIndex: 0,
-        name: '',
-        list: [],
-        areaId: '',
-        addressAreaId: '',
-        addressArea: '',
-        isMore: false,
-        current: 1
+  data() {
+    return {
+      currIndex: 0,
+      name: '',
+      list: [],
+      areaId: '',
+      addressAreaId: '',
+      addressArea: '',
+      isMore: false,
+      current: 1
+    }
+  },
+
+  components: {
+    AiArea,
+    AiEmpty,
+    AiAreaPicker,
+    AiFixedBtn
+  },
+
+  created() {
+    uni.showLoading()
+    this.areaId = this.$store.state.user.areaId
+    this.addressAreaId = this.$store.state.user.areaId
+    this.addressArea = this.$store.state.user.areaName
+
+    this.$nextTick(() => {
+      this.getList()
+    })
+    uni.$on('reload', () => {
+      if (this.currIndex === 0) {
+      } else {
       }
+    })
+  },
+
+  methods: {
+    toDetail(id) {
+      uni.navigateTo({
+        url: '/pages/Monitor/Detail?id=' + id
+      })
     },
 
-    components: {
-      AiArea,
-      AiEmpty,
-      AiAreaPicker,
-      AiFixedBtn
+    onChange(e) {
+      this.addressAreaId = e.id
+
+      this.$nextTick(() => {
+        this.reload()
+      })
     },
 
-    created () {
+    toAdd() {
+      uni.navigateTo({
+        url: '/pages/Monitor/Add'
+      })
+    },
+
+    reload() {
+      this.isMore = false
+      this.current = 1
       uni.showLoading()
-      this.areaId = this.$store.state.user.areaId
-      this.addressAreaId = this.$store.state.user.areaId
-      this.addressArea = this.$store.state.user.areaName
 
       this.$nextTick(() => {
         this.getList()
       })
-      uni.$on('reload', () => {
-        if (this.currIndex === 0) {
-        } else {
-        }
-      })
     },
 
-    methods: {
-      toDetail (id) {
-        uni.navigateTo({
-          url: '/pages/Monitor/Detail?id=' + id
-        })
-      },
+    changeTab(index) {
+      this.currIndex = index
+      this.reload()
+    },
 
-      onChange (e) {
-        this.addressAreaId = e.id
+    getList() {
+      if (this.isMore) return
 
-        this.$nextTick(() => {
-          this.reload()
-        })
-      },
-
-      toAdd () {
-        uni.navigateTo({
-          url: '/pages/Monitor/Add'
-        })
-      },
-
-      reload() {
-        this.isMore = false
-        this.current = 1
-        uni.showLoading()
-
-        this.$nextTick(() => {
-          this.getList()
-        })
-      },
-
-      changeTab (index) {
-        this.currIndex = index
-        this.reload()
-      },
-
-      getList() {
-        if (this.isMore) return
-
-        this.$http.post(`/app/apppreventionreturntopoverty/list`, null, {
-          params: {
-            current: this.current,
-            size: 15,
-            status: this.currIndex === 1 ? '1' : '',
-            addressAreaId: this.addressAreaId,
-            name: this.name
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            uni.hideLoading()
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
+      this.$http.post(`/app/apppreventionreturntopoverty/list`, null, {
+        params: {
+          current: this.current,
+          size: 15,
+          status: this.currIndex === 1 ? '1' : '',
+          addressAreaId: this.addressAreaId,
+          name: this.name
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
           } else {
-            uni.hideLoading()
+            this.list = res.data.records
           }
-        }).catch(() => {
+
           uni.hideLoading()
-        })
-      }
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .list {
-    padding: 112px 0 120px;
+.list {
+  padding: 112px 0 120px;
 
-    .addBtn {
-      width: 96px;
-      height: 96px;
-      flex-shrink: 0;
-      background: $uni-color-primary;
-      box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-      font-size: 48px;
-      color: #fff;
-      border-radius: 50%;
-      justify-content: center;
-      align-items: center;
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+
+  .list-wrapper {
+    margin-top: 16px;
+    background: #fff;
+
+    .list-item {
       display: flex;
-    }
+      align-items: center;
+      padding: 20px 32px;
 
-    .list-wrapper {
-      margin-top: 16px;
-      background: #fff;
-
-      .list-item {
-        display: flex;
-        align-items: center;
-        padding: 20px 32px;
-
-        image {
-          width: 80px;
-          height: 80px;
-          margin-right: 32px;
-        }
-
-        .right {
-          flex: 1;
-        }
-
-        p {
-          color: #999999;
-          font-size: 26px;
-        }
-
-        h2 {
-          margin-bottom: 10px;
-          color: #333333;
-          font-size: 32px;
-        }
+      image {
+        width: 80px;
+        height: 80px;
+        margin-right: 32px;
       }
 
-      .search {
-        margin: 20px 0;
-        padding: 0 32px;
+      .right {
+        flex: 1;
       }
 
-      .tab {
-        display: flex;
-        align-items: center;
-        width: 100%;
-        height: 96px;
-        padding: 0 60px;
-        background: #FFFFFF;
-        border-bottom: 1px solid #D4D4D4;
-        box-sizing: border-box;
+      p {
+        color: #999999;
+        font-size: 26px;
+      }
 
-        * {
-          box-sizing: border-box;
-        }
-
-        span {
-          position: relative;
-          flex: 1;
-          height: 96rpx;
-          line-height: 96rpx;
-          color: #000000;
-          text-align: center;
-          font-size: 32px;
-
-          &::after {
-            position: absolute;
-            bottom: 0;
-            left: 50%;
-            width: 192px;
-            height: 6px;
-            background: transparent;
-            transform: translateX(-50%);
-            content: ' ';
-          }
-
-          &.active {
-            color: #1365DD;
-
-            &::after {
-              background: #1365DD;
-            }
-          }
-        }
+      h2 {
+        margin-bottom: 10px;
+        color: #333333;
+        font-size: 32px;
       }
     }
 
-    .area {
-      display: flex;
-      position: fixed;
-      align-items: center;
-      top: 0;
-      left: 0;
-      z-index: 11;
-      width: 100%;
+    .search {
+      margin: 20px 0;
       padding: 0 32px;
-      height: 112px;
-      color: #333333;
-      font-size: 30px;
-      background: #fff;
+    }
 
-      .separat {
-        padding: 0 8px;
-      }
+    .tab {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      height: 96px;
+      padding: 0 60px;
+      background: #FFFFFF;
+      border-bottom: 1px solid #D4D4D4;
+      box-sizing: border-box;
 
-      i {
-        color: #3F8DF5;
-        font-size: 30px;
-        font-style: normal;
+      * {
+        box-sizing: border-box;
       }
 
       span {
-        color: #333333;
-        font-size: 30px;
+        position: relative;
+        flex: 1;
+        height: 96 rpx;
+        line-height: 96 rpx;
+        color: #000000;
+        text-align: center;
+        font-size: 32px;
+
+        &::after {
+          position: absolute;
+          bottom: 0;
+          left: 50%;
+          width: 192px;
+          height: 6px;
+          background: transparent;
+          transform: translateX(-50%);
+          content: ' ';
+        }
+
+        &.active {
+          color: #1365DD;
+
+          &::after {
+            background: #1365DD;
+          }
+        }
       }
     }
   }
+
+  .area {
+    display: flex;
+    position: fixed;
+    align-items: center;
+    top: 0;
+    left: 0;
+    z-index: 11;
+    width: 100%;
+    padding: 0 32px;
+    height: 112px;
+    color: #333333;
+    font-size: 30px;
+    background: #fff;
+
+    .separat {
+      padding: 0 8px;
+    }
+
+    i {
+      color: #3F8DF5;
+      font-size: 30px;
+      font-style: normal;
+    }
+
+    span {
+      color: #333333;
+      font-size: 30px;
+    }
+  }
+}
 </style>
diff --git a/src/pages/Monitor/components/Statistics.vue b/src/pages/Monitor/components/Statistics.vue
index b16e8f3e..c009c438 100644
--- a/src/pages/Monitor/components/Statistics.vue
+++ b/src/pages/Monitor/components/Statistics.vue
@@ -3,7 +3,8 @@
     <div class="area">
       <i>可选范围</i>
       <span class="separat">/</span>
-      <AiAreaPicker ref="area" class="aiArea" :areaId="areaId" :name.sync="addressArea" mode="custom" @select="onChange">
+      <AiAreaPicker ref="area" class="aiArea" :areaId="areaId" :name.sync="addressArea" mode="custom"
+                    @select="onChange">
         <span class="label" v-if="addressArea">{{ addressArea }}</span>
         <i v-else>请选择</i>
       </AiAreaPicker>
@@ -54,386 +55,385 @@
 </template>
 
 <script>
-  import echarts from 'echarts'
-  import AiArea from '@/components/AiArea'
-  import AiAreaPicker from '@/components/AiAreaPicker'
+import echarts from 'echarts'
+import AiArea from '@/components/AiArea'
+import AiAreaPicker from '@/components/AiAreaPicker'
 
-  export default {
-    name: 'statistics',
+export default {
+  name: 'statistics',
 
-    data () {
-      return {
-        addressAreaId: '',
-        addressArea: '',
-        chart1: null,
-        chart2: null,
-        chart3: null,
-        chart4: null,
-        areaId: '',
-        info: {},
-        pageShow: false
-      }
-    },
+  data() {
+    return {
+      addressAreaId: '',
+      addressArea: '',
+      chart1: null,
+      chart2: null,
+      chart3: null,
+      chart4: null,
+      areaId: '',
+      info: {},
+      pageShow: false
+    }
+  },
 
-    components: {
-      AiArea,
-      AiAreaPicker
-    },
+  components: {
+    AiArea,
+    AiAreaPicker
+  },
 
-    created () {
-      this.areaId = this.$store.state.user.areaId
-      this.addressAreaId = this.$store.state.user.areaId
-      this.addressArea = this.$store.state.user.areaName
-    },
+  created() {
+    this.areaId = this.$store.state.user.areaId
+    this.addressAreaId = this.$store.state.user.areaId
+    this.addressArea = this.$store.state.user.areaName
+  },
 
-    mounted () {
-      window.scrollTo(0,0)
-      this.chart1 = echarts.init(document.getElementById('chart1'))
-      this.chart4 = echarts.init(document.getElementById('chart4'))
-      this.chart3 = echarts.init(document.getElementById('chart3'))
+  mounted() {
+    window.scrollTo(0, 0)
+    this.chart1 = echarts.init(document.getElementById('chart1'))
+    this.chart4 = echarts.init(document.getElementById('chart4'))
+    this.chart3 = echarts.init(document.getElementById('chart3'))
 
-      this.$dict.load(['fpRiskType', 'fpRiskEliminationMethod']).then(() => {
+    this.$dict.load(['fpRiskType', 'fpRiskEliminationMethod']).then(() => {
+      this.getInfo()
+    })
+  },
+
+  methods: {
+    reload() {
+      this.$nextTick(() => {
         this.getInfo()
       })
     },
 
-    methods: {
-      reload () {
-        this.$nextTick(() => {
-          this.getInfo()
-        })
-      },
+    onChange(e) {
+      this.addressAreaId = e.id
 
-      onChange (e) {
-        this.addressAreaId = e.id
+      this.$nextTick(() => {
+        this.reload()
+      })
+    },
 
-        this.$nextTick(() => {
-          this.reload()
-        })
-      },
-
-      initChart1 (data) {
-        const x = data.map(v => v.m)
-        const v = data.map(v => v.c)
-        const option =  {
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          xAxis: {
-            type: 'category',
-            data: x,
-            splitLine: {
-              show: true,
-              lineStyle:{
-                width: 1,
-                type: 'solid',
-                color: '#f5f5f5'
-              }
-            },
-            axisLabel: {
-              align: 'center',
-              padding: [2, 0, 0, 0],
-              interval: 0,
-              fontSize: 14,
-              color: '#999'
-            },
-            axisTick: {
-              length: 1,
-              show: true
-            },
-            boundaryGap: true,
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: '#aaa'
-              }
+    initChart1(data) {
+      const x = data.map(v => v.m)
+      const v = data.map(v => v.c)
+      const option = {
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        xAxis: {
+          type: 'category',
+          data: x,
+          splitLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: '#f5f5f5'
             }
           },
-          grid: {
-            top: '4%',
-            left: '4%',
-            right: '6%',
-            bottom: '0%',
-            containLabel: true
+          axisLabel: {
+            align: 'center',
+            padding: [2, 0, 0, 0],
+            interval: 0,
+            fontSize: 14,
+            color: '#999'
           },
-          yAxis: {
-            type: 'value',
-            boundaryGap: true,
-            axisTick: {
-              length: 1,
-              show: true
-            },
-            splitLine: {
-              show: true,
-              lineStyle:{
-                width: 1,
-                type: 'solid',
-                color: '#f5f5f5'
-              }
-            },
-            nameTextStyle: {
-              color: '#f5f5f5',
-              align: 'left'
-            },
-            axisLine: {
-              show: true,
-              lineStyle:{
-                width: 1,
-                type: 'solid',
-                color: '#aaa'
-              }
-            },
-            axisLabel: {
-              color: '#999'
+          axisTick: {
+            length: 1,
+            show: true
+          },
+          boundaryGap: true,
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: '#aaa'
             }
-          },
-          series: [
-            {
-              data: v,
-              type: 'line'
-            }
-          ]
-        }
-
-        this.chart1.setOption(option)
-      },
-
-      initChart3 (data) {
-        const y = data.map(v => this.$dict.getLabel('fpRiskType', v.risk_type) || '其他')
-        const v = data.map(v => v.c)
-        const option = {
-          tooltip: {
-          },
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          grid: {
-            top: '4%',
-            left: '4%',
-            right: '6%',
-            bottom: '0%',
-            containLabel: true
-          },
-          xAxis: {
-            type: 'value',
-            splitLine: {
-              show: true,
-              lineStyle:{
-                width: 1,
-                type: 'solid',
-                color: '#f5f5f5'
-              }
-            },
-            axisTick: {
-              length: 1,
-              show: true
-            },
-            axisLabel: {
-              align: 'center',
-              padding: [2, 0, 0, 0],
-              interval: 0,
-              fontSize: 14,
-              color: '#999'
-            },
-            boundaryGap: true,
-            axisLine: {
-              show: true,
-              lineStyle:{
-                width: 1,
-                type: 'solid',
-                color: '#aaa'
-              }
-            },
-          },
-          yAxis: {
-            type: 'category',
-            data: y,
-            boundaryGap: true,
-            axisTick: {
-              length: 0,
-              show: false
-            },
-            splitLine: {
-              show: true,
-              lineStyle:{
-                color: ['#e9e9e9'],
-                width: 1,
-                type: 'solid'
-              }
-            },
-            nameTextStyle: {
-              color: '#999',
-              align: 'left'
-            },
-            axisLine: {
-              show: true,
-              lineStyle:{
-                width: 1,
-                type: 'solid',
-                color: '#aaa'
-              }
-            },
-            axisLabel: {
-              color: '#999'
-            }
-          },
-          series: [
-            {
-              name: '2011',
-              type: 'bar',
-              data: v
-            }
-          ]
-        }
-
-        this.chart3.setOption(option)
-      },
-
-      initChart4 (data) {
-        const values = data.map(v => {
-          return {
-            value: v.c,
-            name: this.$dict.getLabel('fpRiskEliminationMethod', v.risk_elimination_method) || '其他'
           }
-        })
-        const option = {
-          tooltip: {
-            trigger: 'item'
+        },
+        grid: {
+          top: '4%',
+          left: '4%',
+          right: '6%',
+          bottom: '0%',
+          containLabel: true
+        },
+        yAxis: {
+          type: 'value',
+          boundaryGap: true,
+          axisTick: {
+            length: 1,
+            show: true
           },
-          grid: {
-            left: '0%',
-            right: '0%',
-            bottom: '0%',
-            top: '40px',
-            containLabel: true
-          },
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          series: [
-            {
-              name: '本月纳入监测人群属性分析',
-              type: 'pie',
-              radius: ['40%', '70%'],
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '40',
-                  fontWeight: 'bold'
-                }
-              },
-              data: values
+          splitLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: '#f5f5f5'
             }
-          ]
-        }
-
-        this.chart4.setOption(option)
-      },
-
-      getInfo () {
-        this.$http.post(`/app/apppreventionreturntopoverty/statistics-prtp?areaId=${this.addressAreaId}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.initChart1(res.data['近半年趋势'])
-            this.initChart3(res.data['风险类型排行'])
-            this.initChart4(res.data['风险消除方式'])
+          },
+          nameTextStyle: {
+            color: '#f5f5f5',
+            align: 'left'
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: '#aaa'
+            }
+          },
+          axisLabel: {
+            color: '#999'
           }
-        })
+        },
+        series: [
+          {
+            data: v,
+            type: 'line'
+          }
+        ]
       }
+
+      this.chart1.setOption(option)
+    },
+
+    initChart3(data) {
+      const y = data.map(v => this.$dict.getLabel('fpRiskType', v.risk_type) || '其他')
+      const v = data.map(v => v.c)
+      const option = {
+        tooltip: {},
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        grid: {
+          top: '4%',
+          left: '4%',
+          right: '6%',
+          bottom: '0%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'value',
+          splitLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: '#f5f5f5'
+            }
+          },
+          axisTick: {
+            length: 1,
+            show: true
+          },
+          axisLabel: {
+            align: 'center',
+            padding: [2, 0, 0, 0],
+            interval: 0,
+            fontSize: 14,
+            color: '#999'
+          },
+          boundaryGap: true,
+          axisLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: '#aaa'
+            }
+          },
+        },
+        yAxis: {
+          type: 'category',
+          data: y,
+          boundaryGap: true,
+          axisTick: {
+            length: 0,
+            show: false
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: ['#e9e9e9'],
+              width: 1,
+              type: 'solid'
+            }
+          },
+          nameTextStyle: {
+            color: '#999',
+            align: 'left'
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              width: 1,
+              type: 'solid',
+              color: '#aaa'
+            }
+          },
+          axisLabel: {
+            color: '#999'
+          }
+        },
+        series: [
+          {
+            name: '2011',
+            type: 'bar',
+            data: v
+          }
+        ]
+      }
+
+      this.chart3.setOption(option)
+    },
+
+    initChart4(data) {
+      const values = data.map(v => {
+        return {
+          value: v.c,
+          name: this.$dict.getLabel('fpRiskEliminationMethod', v.risk_elimination_method) || '其他'
+        }
+      })
+      const option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        grid: {
+          left: '0%',
+          right: '0%',
+          bottom: '0%',
+          top: '40px',
+          containLabel: true
+        },
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        series: [
+          {
+            name: '本月纳入监测人群属性分析',
+            type: 'pie',
+            radius: ['40%', '70%'],
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '40',
+                fontWeight: 'bold'
+              }
+            },
+            data: values
+          }
+        ]
+      }
+
+      this.chart4.setOption(option)
+    },
+
+    getInfo() {
+      this.$http.post(`/app/apppreventionreturntopoverty/statistics-prtp?areaId=${this.addressAreaId}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.initChart1(res.data['近半年趋势'])
+          this.initChart3(res.data['风险类型排行'])
+          this.initChart4(res.data['风险消除方式'])
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .statistics {
-    padding: 112px 0 120px;
+.statistics {
+  padding: 112px 0 120px;
 
-    .area {
-      display: flex;
-      position: fixed;
-      align-items: center;
-      top: 0;
-      left: 0;
-      z-index: 11;
-      width: 100%;
-      padding: 0 32px;
-      height: 112px;
-      color: #333333;
-      font-size: 30px;
-      background: #fff;
+  .area {
+    display: flex;
+    position: fixed;
+    align-items: center;
+    top: 0;
+    left: 0;
+    z-index: 11;
+    width: 100%;
+    padding: 0 32px;
+    height: 112px;
+    color: #333333;
+    font-size: 30px;
+    background: #fff;
 
-      .separat {
-        padding: 0 8px;
-      }
-
-      i {
-        color: #3F8DF5;
-        font-size: 30px;
-        font-style: normal;
-      }
-
-      span {
-        color: #333333;
-        font-size: 30px;
-      }
+    .separat {
+      padding: 0 8px;
     }
 
-    .charts-wrapper {
-      position: relative;
-      z-index: 1;
-      padding: 0 32px;
+    i {
+      color: #3F8DF5;
+      font-size: 30px;
+      font-style: normal;
+    }
 
-      .total {
-        display: flex;
-        align-items: center;
-        height: 200px;
-        margin-top: 32px;
-        background: #FFFFFF;
-        border-radius: 8px;
+    span {
+      color: #333333;
+      font-size: 30px;
+    }
+  }
 
-        .total-item {
-          flex: 1;
-          text-align: center;
+  .charts-wrapper {
+    position: relative;
+    z-index: 1;
+    padding: 0 32px;
 
-          h2 {
-            font-size: 64px;
-            color: #3192F4;
-          }
+    .total {
+      display: flex;
+      align-items: center;
+      height: 200px;
+      margin-top: 32px;
+      background: #FFFFFF;
+      border-radius: 8px;
 
-          p {
-            margin-top: 10px;
-            color: #999999;
-            font-size: 28px;
-          }
-        }
-      }
-
-      .middle-total {
-        height: 160px;
+      .total-item {
+        flex: 1;
+        text-align: center;
 
         h2 {
-          font-size: 48px!important;
+          font-size: 64px;
+          color: #3192F4;
         }
 
         p {
-          margin-top: 8px!important;
-        }
-      }
-
-      .charts {
-        margin-top: 32px;
-        background: #FFFFFF;
-        border-radius: 8px;
-
-        & > h2 {
-          height: 96px;
-          line-height: 96px;
-          padding: 0 32px;
-          color: #333333;
-          font-size: 32px;
-          border-bottom: 1px solid #DDDDDD;
-        }
-
-        & > div {
-          width: 686px;
-          margin: 0 auto;
-          padding: 32px 0;
+          margin-top: 10px;
+          color: #999999;
+          font-size: 28px;
         }
       }
     }
+
+    .middle-total {
+      height: 160px;
+
+      h2 {
+        font-size: 48px !important;
+      }
+
+      p {
+        margin-top: 8px !important;
+      }
+    }
+
+    .charts {
+      margin-top: 32px;
+      background: #FFFFFF;
+      border-radius: 8px;
+
+      & > h2 {
+        height: 96px;
+        line-height: 96px;
+        padding: 0 32px;
+        color: #333333;
+        font-size: 32px;
+        border-bottom: 1px solid #DDDDDD;
+      }
+
+      & > div {
+        width: 686px;
+        margin: 0 auto;
+        padding: 32px 0;
+      }
+    }
   }
+}
 </style>
diff --git a/src/pages/PovertyAlleviation/News.vue b/src/pages/PovertyAlleviation/News.vue
index ffbaec59..b657c990 100644
--- a/src/pages/PovertyAlleviation/News.vue
+++ b/src/pages/PovertyAlleviation/News.vue
@@ -2,15 +2,16 @@
   <div class="news">
     <div class="tab">
       <span
-        @click="changeTab(index, item.dictValue)"
-        v-for="(item, index) in tabList"
-        :key="index"
-        :class="[currIndex === index ? 'active' : '']">
+          @click="changeTab(index, item.dictValue)"
+          v-for="(item, index) in tabList"
+          :key="index"
+          :class="[currIndex === index ? 'active' : '']">
         {{ item.dictName }}
       </span>
     </div>
     <div class="list">
-      <div class="item" v-for="(item, index) in list" :key="index" @click="linkTo('/pages/PovertyAlleviation/NewsDetail?id=' + item.id)">
+      <div class="item" v-for="(item, index) in list" :key="index"
+           @click="linkTo('/pages/PovertyAlleviation/NewsDetail?id=' + item.id)">
         <div class="left">
           <h2>{{ item.title }}</h2>
           <div class="item-bottom">
@@ -18,7 +19,7 @@
             <span>{{ item.createTime }}</span>
           </div>
         </div>
-        <image v-if="item.coverFile" :src="item.coverFile ? item.coverFile.url : ''" />
+        <image v-if="item.coverFile" :src="item.coverFile ? item.coverFile.url : ''"/>
       </div>
       <ai-empty v-if="!list.length && isMore" style="padding-bottom: 20px;"></ai-empty>
     </div>
@@ -26,203 +27,204 @@
 </template>
 
 <script>
-  import AiEmpty from '@/components/AiEmpty/AiEmpty'
-  export default {
-    data () {
-      return {
-        currIndex: 0,
-        list: [],
-        current: 1,
-        size: 15,
-        type: '',
-        tabList: [],
-        isMore: false
-      }
-    },
+import AiEmpty from '@/components/AiEmpty/AiEmpty'
 
-    components: {
-      AiEmpty
-    },
+export default {
+  data() {
+    return {
+      currIndex: 0,
+      list: [],
+      current: 1,
+      size: 15,
+      type: '',
+      tabList: [],
+      isMore: false
+    }
+  },
+
+  components: {
+    AiEmpty
+  },
+
+  onLoad() {
+    uni.showLoading()
+    this.$dict.load(['newsCenterPolicyType']).then(() => {
+      this.tabList = this.$dict.getDict('newsCenterPolicyType')
+      this.type = this.$dict.getDict('newsCenterPolicyType')[0].dictValue
+      this.getList()
+    })
+  },
+
+  methods: {
+    changeTab(index, type) {
+      this.type = type
+      this.currIndex = index
+
+      this.current = 1
+      this.isMore = false
 
-    onLoad() {
       uni.showLoading()
-      this.$dict.load(['newsCenterPolicyType']).then(() => {
-        this.tabList = this.$dict.getDict('newsCenterPolicyType')
-        this.type = this.$dict.getDict('newsCenterPolicyType')[0].dictValue
+      this.$nextTick(() => {
         this.getList()
       })
     },
 
-    methods: {
-      changeTab (index, type) {
-        this.type = type
-        this.currIndex = index
-
-        this.current = 1
-        this.isMore = false
-
-        uni.showLoading()
-        this.$nextTick(() => {
-          this.getList()
-        })
-      },
-
-      linkTo (url) {
-        uni.navigateTo({
-          url
-        })
-      },
-
-      getList() {
-        if (this.isMore) return
-
-        this.$http.post(`/app/appnewscenterinfo/listForWx`, null, {
-          params: {
-            current: this.current,
-            size: this.size,
-            status: 1,
-            policyType: this.type
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            uni.hideLoading()
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
-          } else {
-            uni.hideLoading()
-          }
-        }).catch(() => {
-          uni.hideLoading()
-        })
-      }
+    linkTo(url) {
+      uni.navigateTo({
+        url
+      })
     },
 
-    onReachBottom() {
-      this.getList()
+    getList() {
+      if (this.isMore) return
+
+      this.$http.post(`/app/appnewscenterinfo/listForWx`, null, {
+        params: {
+          current: this.current,
+          size: this.size,
+          status: 1,
+          policyType: this.type
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+
+          uni.hideLoading()
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
     }
+  },
+
+  onReachBottom() {
+    this.getList()
   }
+}
 </script>
 
 <style lang="scss">
-  .news {
-    padding: 96px 0 40px;
+.news {
+  padding: 96px 0 40px;
 
-    .list {
-      padding: 0 30px;
-      background: #fff;
+  .list {
+    padding: 0 30px;
+    background: #fff;
 
-      .item {
+    .item {
+      display: flex;
+      align-items: center;
+      padding: 32px 0;
+      border-bottom: 1px solid #DDDDDD;
+
+      &:active {
+        background: #ddd;
+      }
+
+      &:last-child {
+        border-bottom: none;
+      }
+
+      .left {
+        flex: 1;
+        margin-right: 20px;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+      }
+
+      & > image {
+        width: 200px;
+        height: 140px;
+      }
+
+      h2 {
+        margin-bottom: 32px;
+        color: #333333;
+        font-size: 30px;
+        font-weight: 600;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+      }
+
+      .item-bottom {
         display: flex;
         align-items: center;
-        padding: 32px 0;
-        border-bottom: 1px solid #DDDDDD;
 
-        &:active {
-          background: #ddd;
-        }
+        span {
+          color: #999999;
+          font-size: 24px;
 
-        &:last-child {
-          border-bottom: none;
-        }
-
-        .left {
-          flex: 1;
-          margin-right: 20px;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          overflow: hidden;
-        }
-
-        & > image {
-          width: 200px;
-          height: 140px;
-        }
-
-        h2 {
-          margin-bottom: 32px;
-          color: #333333;
-          font-size: 30px;
-          font-weight: 600;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          overflow: hidden;
-        }
-
-        .item-bottom {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #999999;
-            font-size: 24px;
-
-            &:first-child {
-              margin-right: 32px;
-            }
-          }
-        }
-      }
-    }
-
-    .tab {
-      display: flex;
-      position: fixed;
-      align-items: center;
-      top: 0;
-      left: 0;
-      z-index: 1;
-      width: 100%;
-      height: 96px;
-      background: #FFFFFF;
-      border-bottom: 1px solid #D4D4D4;
-      box-sizing: border-box;
-
-      * {
-        box-sizing: border-box;
-      }
-
-      span {
-        position: relative;
-        flex: 1;
-        height: 96rpx;
-        line-height: 96rpx;
-        color: #999999;
-        text-align: center;
-        font-size: 28px;
-
-        &::after {
-          position: absolute;
-          bottom: 0;
-          left: 50%;
-          width: 88px;
-          height: 6px;
-          background: transparent;
-          transform: translateX(-50%);
-          content: ' ';
-        }
-
-        &.active {
-          color: #1365DD;
-
-          &::after {
-            background: #1365DD;
+          &:first-child {
+            margin-right: 32px;
           }
         }
       }
     }
   }
-</style>
\ No newline at end of file
+
+  .tab {
+    display: flex;
+    position: fixed;
+    align-items: center;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    width: 100%;
+    height: 96px;
+    background: #FFFFFF;
+    border-bottom: 1px solid #D4D4D4;
+    box-sizing: border-box;
+
+    * {
+      box-sizing: border-box;
+    }
+
+    span {
+      position: relative;
+      flex: 1;
+      height: 96 rpx;
+      line-height: 96 rpx;
+      color: #999999;
+      text-align: center;
+      font-size: 28px;
+
+      &::after {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        width: 88px;
+        height: 6px;
+        background: transparent;
+        transform: translateX(-50%);
+        content: ' ';
+      }
+
+      &.active {
+        color: #1365DD;
+
+        &::after {
+          background: #1365DD;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/PovertyAlleviation/NewsDetail.vue b/src/pages/PovertyAlleviation/NewsDetail.vue
index a46638f5..bdd82fa1 100644
--- a/src/pages/PovertyAlleviation/NewsDetail.vue
+++ b/src/pages/PovertyAlleviation/NewsDetail.vue
@@ -10,89 +10,89 @@
 </template>
 
 <script>
-  export default {
-    data () {
-      return {
-        pageShow: false,
-        info: {},
-        content: `
+export default {
+  data() {
+    return {
+      pageShow: false,
+      info: {},
+      content: `
 					<p>露从今夜白，月是故乡明</p>
 					<img src="https://cdn.uviewui.com/uview/swiper/2.jpg" />
 				`
-      }
-    },
+    }
+  },
 
-    onLoad (query) {
-      uni.showLoading()
-      this.getInfo(query.id)
-    },
+  onLoad(query) {
+    uni.showLoading()
+    this.getInfo(query.id)
+  },
 
-    methods: {
-      getInfo (id) {
-        this.$http.post(`/app/appnewscenterinfo/queryDetailById?id=${id}`).then(res => {
-          if (res.code == 0) {
-            this.info = res.data
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/appnewscenterinfo/queryDetailById?id=${id}`).then(res => {
+        if (res.code == 0) {
+          this.info = res.data
 
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
-          }
-          uni.hideLoading()
-        })
-      }
+          this.$nextTick(() => {
+            this.pageShow = true
+          })
+        }
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .detail {
-    min-height: 100vh;
-    padding: 40px 32px 40px;
-    box-sizing: border-box;
-    background: #fff;
+.detail {
+  min-height: 100vh;
+  padding: 40px 32px 40px;
+  box-sizing: border-box;
+  background: #fff;
 
-    & > h2 {
-      margin-bottom: 16px;
-      line-height: 1.3;
-      font-size: 40px;
-      color: #333;
-      font-weight: 600;
+  & > h2 {
+    margin-bottom: 16px;
+    line-height: 1.3;
+    font-size: 40px;
+    color: #333;
+    font-weight: 600;
+  }
+
+  & > span {
+    font-size: 28px;
+    color: #999;
+  }
+
+  .content {
+    width: 100%;
+    margin-top: 40px;
+
+    ::v-deep * {
+      box-sizing: border-box;
     }
 
-    & > span {
+    ::v-deep p {
+      margin: 20px 0;
+      line-height: 1.4;
+      color: #666;
       font-size: 28px;
-      color: #999;
+      text-align: justify;
     }
 
-    .content {
+    ::v-deep img {
       width: 100%;
-      margin-top: 40px;
+    }
 
-      ::v-deep * {
-        box-sizing: border-box;
-      }
+    ::v-deep br {
+      display: block;
+      margin: 20px 0;
+    }
 
-      ::v-deep p {
-        margin: 20px 0;
-        line-height: 1.4;
-        color: #666;
-        font-size: 28px;
-        text-align: justify;
-      }
-
-      ::v-deep img {
-        width: 100%;
-      }
-
-      ::v-deep br {
-        display: block;
-        margin: 20px 0;
-      }
-
-      .video {
-        width: 100%;
-        height: 600px;
-      }
+    .video {
+      width: 100%;
+      height: 600px;
     }
   }
+}
 </style>
diff --git a/src/pages/PovertyAlleviation/PovertyAlleviation.vue b/src/pages/PovertyAlleviation/PovertyAlleviation.vue
index 3c42b646..26988ac6 100644
--- a/src/pages/PovertyAlleviation/PovertyAlleviation.vue
+++ b/src/pages/PovertyAlleviation/PovertyAlleviation.vue
@@ -2,22 +2,23 @@
   <div class="info">
     <div class="info-top">
       <div class="info-top__item" @click="linkTo('/pages/Monitor/Monitor')">
-        <image src="/static/images/wdbf.png" />
+        <image src="/static/images/wdbf.png"/>
         <h2>监测对象</h2>
       </div>
       <div class="info-top__item" @click="linkTo('/pages/povertyMonitor/povertyMonitor')">
-        <image src="/static/images/yjjk.png" />
+        <image src="/static/images/yjjk.png"/>
         <h2>预警监控</h2>
       </div>
       <div class="info-top__item" @click="linkTo('/pages/PovertyAlleviation/News')">
-        <image src="/static/images/news.png" />
+        <image src="/static/images/news.png"/>
         <h2>政策动态</h2>
       </div>
     </div>
     <div class="news">
       <h2>最新动态</h2>
       <div class="news-list">
-        <div class="news-item" v-for="(item, index) in list" :key="index" @click="linkTo(`/pages/PovertyAlleviation/NewsDetail?id=${item.id}`)">
+        <div class="news-item" v-for="(item, index) in list" :key="index"
+             @click="linkTo(`/pages/PovertyAlleviation/NewsDetail?id=${item.id}`)">
           <div class="left">
             <h2>{{ item.title }}</h2>
             <div class="item-bottom">
@@ -25,7 +26,7 @@
               <span>{{ item.createTime }}</span>
             </div>
           </div>
-          <image v-if="item.coverFile" :src="item.coverFile ? item.coverFile.url : ''" />
+          <image v-if="item.coverFile" :src="item.coverFile ? item.coverFile.url : ''"/>
         </div>
       </div>
     </div>
@@ -33,137 +34,137 @@
 </template>
 
 <script>
-  export default {
-    data () {
-      return {
-        list: []
-      }
-    },
+export default {
+  data() {
+    return {
+      list: []
+    }
+  },
 
-    onLoad () {
-      this.$dict.load(['newsCenterPolicyType']).then(() => {
-        this.getList()
+  onLoad() {
+    this.$dict.load(['newsCenterPolicyType']).then(() => {
+      this.getList()
+    })
+  },
+
+  methods: {
+    linkTo(url) {
+      uni.navigateTo({
+        url
       })
     },
 
-    methods: {
-      linkTo (url) {
-        uni.navigateTo({
-          url
-        })
-      },
-
-      getList () {
-        this.$http.post(`/app/appnewscenterinfo/listForWx`, null, {
-          params: {
-            current: 1,
-            size: 10,
-            status: 1
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.list = res.data.records
-          }
-        })
-      }
+    getList() {
+      this.$http.post(`/app/appnewscenterinfo/listForWx`, null, {
+        params: {
+          current: 1,
+          size: 10,
+          status: 1
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .info {
-    padding: 32px 30px;
-    
-    .info-top {
-      display: flex;
-      align-items: center;
-      margin-bottom: 32px;
-      background: #FFFFFF;
-      border-radius: 16px;
+.info {
+  padding: 32px 30px;
 
-      div {
-        flex: 1;
-        padding: 32px 0;
-        text-align: center;
+  .info-top {
+    display: flex;
+    align-items: center;
+    margin-bottom: 32px;
+    background: #FFFFFF;
+    border-radius: 16px;
 
-        image {
-          width: 80px;
-          height: 80px;
-        }
+    div {
+      flex: 1;
+      padding: 32px 0;
+      text-align: center;
 
-        h2 {
-          margin-top: 4px;
-          color: #3D434A;
-          font-size: 28px;
-          font-weight: normal;
-        }
+      image {
+        width: 80px;
+        height: 80px;
+      }
+
+      h2 {
+        margin-top: 4px;
+        color: #3D434A;
+        font-size: 28px;
+        font-weight: normal;
       }
     }
+  }
 
-    .news {
-      & > h2 {
-        margin-bottom: 32px;
-        color: #333333;
-        font-weight: 600;
-        font-size: 32px;
+  .news {
+    & > h2 {
+      margin-bottom: 32px;
+      color: #333333;
+      font-weight: 600;
+      font-size: 32px;
+    }
+
+    .news-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20px;
+      padding: 32px 24px;
+      background: #fff;
+      border-radius: 14px;
+
+      &:active {
+        background: #eee;
       }
 
-      .news-item {
+      &:last-child {
+        border-bottom: none;
+      }
+
+      .left {
+        flex: 1;
+        margin-right: 20px;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+      }
+
+      & > image {
+        width: 200px;
+        height: 140px;
+      }
+
+      h2 {
+        width: 100%;
+        margin-bottom: 32px;
+        color: #333333;
+        font-size: 30px;
+        font-weight: 600;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+      }
+
+      .item-bottom {
         display: flex;
         align-items: center;
-        margin-bottom: 20px;
-        padding: 32px 24px;
-        background: #fff;
-        border-radius: 14px;
 
-        &:active {
-          background: #eee;
-        }
+        span {
+          color: #999999;
+          font-size: 24px;
 
-        &:last-child {
-          border-bottom: none;
-        }
-
-        .left {
-          flex: 1;
-          margin-right: 20px;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          overflow: hidden;
-        }
-
-        & > image {
-          width: 200px;
-          height: 140px;
-        }
-
-        h2 {
-          width: 100%;
-          margin-bottom: 32px;
-          color: #333333;
-          font-size: 30px;
-          font-weight: 600;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          overflow: hidden;
-        }
-
-        .item-bottom {
-          display: flex;
-          align-items: center;
-
-          span {
-            color: #999999;
-            font-size: 24px;
-
-            &:first-child {
-              margin-right: 32px;
-            }
+          &:first-child {
+            margin-right: 32px;
           }
         }
       }
     }
   }
+}
 </style>
diff --git a/src/pages/bigHorn/addPlay.vue b/src/pages/bigHorn/addPlay.vue
index 2dfb2e85..e26d459e 100644
--- a/src/pages/bigHorn/addPlay.vue
+++ b/src/pages/bigHorn/addPlay.vue
@@ -4,48 +4,54 @@
       <div class="item">
         <div class="label">播发内容</div>
         <div class="value" @click="linkTo('/pages/resourcesManage/resourcesManage?isChoose=1')">
-          <span :class="formData.mediaName == '请选择' ? 'color-999' : ''">{{formData.mediaName}}</span>
+          <span :class="formData.mediaName == '请选择' ? 'color-999' : ''">{{ formData.mediaName }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">播放设备</div>
         <div class="value" @click="selectClick('showEquipment', equipmentList)">
-          <span :class="formData.serialName == '请选择' ? 'color-999' : ''">{{formData.serialName}}</span>
+          <span :class="formData.serialName == '请选择' ? 'color-999' : ''">{{ formData.serialName }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">播发级别</div>
         <div class="value" @click="selectClick('showMessageLevel', messageLevelList)">
-          <span :class="formData.messageLevelName == '请选择' ? 'color-999' : ''">{{formData.messageLevelName}}</span>
+          <span :class="formData.messageLevelName == '请选择' ? 'color-999' : ''">{{ formData.messageLevelName }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
     </div>
     <div class="radio-content">
       <div class="title">播放方式</div>
-      <div class="item mar-r50" :class="formData.taskType == 0 ? 'active' : ''"  @click="formData.taskType = 0">立即播放<img src="./img/bigHorn-xz.png" alt=""></div>
-      <div class="item" :class="formData.taskType == 1 ? 'active' : ''" @click="formData.taskType = 1"><img src="./img/bigHorn-xz.png" alt="">定时播放</div>
+      <div class="item mar-r50" :class="formData.taskType == 0 ? 'active' : ''" @click="formData.taskType = 0">立即播放<img
+          src="./img/bigHorn-xz.png" alt=""></div>
+      <div class="item" :class="formData.taskType == 1 ? 'active' : ''" @click="formData.taskType = 1"><img
+          src="./img/bigHorn-xz.png" alt="">定时播放
+      </div>
     </div>
     <div class="content" v-if="formData.taskType != 0">
       <div class="item">
         <div class="label">定时策略</div>
         <div class="value" @click="selectClick('showCyclingType', cyclingTypeList)">
-          <span :class="formData.cyclingTypeName == '请选择' ? 'color-999' : ''">{{formData.cyclingTypeName}}</span>
+          <span :class="formData.cyclingTypeName == '请选择' ? 'color-999' : ''">{{ formData.cyclingTypeName }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
     </div>
     <div class="radio-content" v-if="formData.taskType != 0 && formData.cyclingType == 2">
       <div class="title">播放天数</div>
-      <div class="mini-item" :class="item.isCheck ? 'mini-active' : ''" v-for="(item, index) in dayList" :key="index" @click="checkClick(index)">{{item.label}}</div>
+      <div class="mini-item" :class="item.isCheck ? 'mini-active' : ''" v-for="(item, index) in dayList" :key="index"
+           @click="checkClick(index)">{{ item.label }}
+      </div>
     </div>
     <div class="content" v-if="formData.taskType != 0 && formData.cyclingType == 3">
       <div class="item">
         <div class="label">播放天数</div>
         <div class="value">
-          <u-input type="text" placeholder="请输入" height="18" input-align="right" v-model="formData.broadcastDay" maxlength="4" />
+          <u-input type="text" placeholder="请输入" height="18" input-align="right" v-model="formData.broadcastDay"
+                   maxlength="4"/>
         </div>
       </div>
     </div>
@@ -53,33 +59,35 @@
       <div class="item">
         <div class="label">开始日期</div>
         <div class="value" @click="timeClick(true, 'showDate')">
-          <span :class="formData.startDate ? 'color-999' : ''">{{formData.startDate || '请选择'}}</span>
+          <span :class="formData.startDate ? 'color-999' : ''">{{ formData.startDate || '请选择' }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">开始时间</div>
         <div class="value" @click="timeClick(false, 'showSatrt')">
-          <span :class="formData.startTime ? 'color-999' : ''">{{formData.startTime || '请选择'}}</span>
+          <span :class="formData.startTime ? 'color-999' : ''">{{ formData.startTime || '请选择' }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">结束时间</div>
         <div class="value" @click="timeClick(false, 'showEnd')">
-          <span :class="formData.endTime ? 'color-999' : ''">{{formData.endTime || '请选择'}}</span>
+          <span :class="formData.endTime ? 'color-999' : ''">{{ formData.endTime || '请选择' }}</span>
           <img src="./img/right-icon.png" alt="">
         </div>
       </div>
     </div>
     <div class="btn" @click="addConfirm">确认</div>
-    <u-select v-model="showSelect" :list="selectList" @confirm="confirm" label-name="dictName" value-name="dictValue"></u-select>
+    <u-select v-model="showSelect" :list="selectList" @confirm="confirm" label-name="dictName"
+              value-name="dictValue"></u-select>
     <u-picker v-model="showDateTime" mode="time" :params="params" @confirm="confirm"></u-picker>
     <AiBack></AiBack>
   </div>
 </template>
-<script> 
-  import AiBack from "@/components/AiBack";
+<script>
+import AiBack from "@/components/AiBack";
+
 export default {
   name: "addPlay",
   data() {
@@ -166,7 +174,7 @@ export default {
     AiBack
   },
 
-  onLoad () {
+  onLoad() {
     uni.$on('choose', e => {
       console.log(e)
       this.formData.mediaId = e.mediaId
@@ -178,41 +186,41 @@ export default {
     addConfirm() {
       var cyclingDateList = []
       this.dayList.map((item) => {
-        if(item.isCheck) {
+        if (item.isCheck) {
           cyclingDateList.push(item.value)
         }
       })
 
-      if(!this.formData.mediaId) {
+      if (!this.formData.mediaId) {
         return this.$u.toast('请选择播发内容')
       }
-      if(!this.formData.serialNo) {
+      if (!this.formData.serialNo) {
         return this.$u.toast('请选择播放设备')
       }
-      if(!this.formData.messageLevel) {
+      if (!this.formData.messageLevel) {
         return this.$u.toast('播发级别')
       }
 
       //播放方式（定时播放）
-      if(this.formData.taskType != 0 && this.formData.startDate == '请选择') {
+      if (this.formData.taskType != 0 && this.formData.startDate == '请选择') {
         return this.$u.toast('请选择开始日期')
       }
-      if(this.formData.taskType != 0 && this.formData.startTime == '请选择') {
+      if (this.formData.taskType != 0 && this.formData.startTime == '请选择') {
         return this.$u.toast('请选择开始时间')
       }
-      if(this.formData.taskType != 0 && this.formData.endTime == '请选择') {
+      if (this.formData.taskType != 0 && this.formData.endTime == '请选择') {
         return this.$u.toast('请选择结束时间')
       }
       //播放方式（定时播放）定时策略（时长）
-      if(this.formData.taskType != 0 && this.formData.cyclingType == 3 && !this.formData.broadcastDay) {
+      if (this.formData.taskType != 0 && this.formData.cyclingType == 3 && !this.formData.broadcastDay) {
         return this.$u.toast('请输入播放天数')
       }
       //播放方式（定时播放）定时策略（自定义）
-      if(this.formData.taskType != 0 && this.formData.cyclingType == 2 && !cyclingDateList.length) {
+      if (this.formData.taskType != 0 && this.formData.cyclingType == 2 && !cyclingDateList.length) {
         return this.$u.toast('请选择播放天数')
       }
-      
-      if(this.formData.taskType != 0 && this.formData.cyclingType == 2) {
+
+      if (this.formData.taskType != 0 && this.formData.cyclingType == 2) {
         this.formData.cyclingDate = cyclingDateList.join(',')
       }
       this.formData.coverageType = '4'
@@ -223,46 +231,46 @@ export default {
             uni.navigateBack()
           }, 1000)
         }
-      }) 
+      })
     },
 
-    linkTo (path) {
+    linkTo(path) {
       uni.navigateTo({
         url: path
       })
     },
 
     confirm(e) {
-      if(this.showMedia) {
+      if (this.showMedia) {
         this.formData.mediaId = e[0].value
         this.formData.mediaName = e[0].label
       }
-      if(this.showEquipment) {
+      if (this.showEquipment) {
         this.formData.serialNo = e[0].value
         this.formData.serialName = e[0].label
       }
-      if(this.showMessageLevel) {
+      if (this.showMessageLevel) {
         this.formData.messageLevel = e[0].value
         this.formData.messageLevelName = e[0].label
       }
-      if(this.showCyclingType) {
+      if (this.showCyclingType) {
         this.formData.cyclingType = e[0].value
         this.formData.cyclingTypeName = e[0].label
       }
-      if(this.showDate) {
+      if (this.showDate) {
         this.formData.startDate = e.year + '-' + e.month + '-' + e.day
       }
-      if(this.showSatrt) {
+      if (this.showSatrt) {
         var startTime = e.hour + ':' + e.minute + ':' + e.second
         var myDate = new Date();
-        var time = myDate.getHours() + ':' +  myDate.getMinutes() + ':' + myDate.getSeconds()
+        var time = myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
         if (this.timeToSec(startTime) - this.timeToSec(time) > 0) {
           this.formData.startTime = startTime
-        }else {
+        } else {
           this.$u.toast('开始时间要大于当前时间')
         }
       }
-      if(this.showEnd) {
+      if (this.showEnd) {
         var endTime = e.hour + ':' + e.minute + ':' + e.second
         console.log(this.timeToSec(endTime), this.timeToSec(this.formData.startTime))
         if (this.timeToSec(endTime) - this.timeToSec(this.formData.startTime) > 0) {
@@ -291,7 +299,7 @@ export default {
       this.$http.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => {
         if (res.code == 0) {
           this.mediaList = []
-          if(res.data && res.data.records.length) {
+          if (res.data && res.data.records.length) {
             res.data.records.map((item) => {
               let info = {
                 dictName: item.name,
@@ -307,7 +315,7 @@ export default {
       this.$http.post(`/app/appdlbquipment/getDlbDeviceList?current=1&size=10000&devStatus=5&keyword=`).then((res) => {
         if (res.code == 0) {
           this.equipmentList = []
-          if(res.data && res.data.records.length) {
+          if (res.data && res.data.records.length) {
             res.data.records.map((item) => {
               let info = {
                 dictName: item.deviceName,
@@ -325,7 +333,7 @@ export default {
     timeClick(showYear, showType) {
       this[showType] = true
       this.showDateTime = true
-      if(showYear) {
+      if (showYear) {
         this.params = {
           year: true,
           month: true,
@@ -334,7 +342,7 @@ export default {
           minute: false,
           second: false
         }
-      }else {
+      } else {
         this.params = {
           year: false,
           month: false,
@@ -349,10 +357,10 @@ export default {
       var s = "";
       var hour = time.split(":")[0];
       var min = time.split(":")[1];
-      var second =  time.split(":")[2];
+      var second = time.split(":")[2];
       s = Number(hour * 3600) + Number(min * 60) + Number(second)
       return s;
-    }, 
+    },
   },
   created() {
     this.$dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType').then(() => {
@@ -367,10 +375,12 @@ export default {
 <style lang="scss" scoped>
 .addPlay {
   padding-bottom: 128px;
-  .content{
+
+  .content {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       padding: 34px 0;
       font-size: 32px;
@@ -381,11 +391,13 @@ export default {
       display: flex;
       color: #333;
       justify-content: space-between;
-      .label{
+
+      .label {
         width: 198px;
         font-size: 32px;
       }
-      .value{
+
+      .value {
         display: flex;
         align-items: center;
         justify-content: flex-end;
@@ -401,35 +413,41 @@ export default {
           text-overflow: ellipsis;
           white-space: nowrap;
         }
-        img{
+
+        img {
           width: 32px;
           height: 32px;
           vertical-align: middle;
           margin-left: 6px;
         }
       }
-      .color-999{
+
+      .color-999 {
         color: #999;
       }
     }
   }
-  .radio-content{
+
+  .radio-content {
     padding: 34px 32px 38px;
     border-bottom: 1px solid #ddd;
     background-color: #fff;
-    .title{
+
+    .title {
       font-size: 32px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #333;
       line-height: 44px;
       margin-bottom: 54px;
-      span{
+
+      span {
         font-size: 24px;
         font-weight: 400;
       }
     }
-    .item{
+
+    .item {
       display: inline-block;
       width: 320px;
       height: 112px;
@@ -441,15 +459,18 @@ export default {
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #333;
-      img{
+
+      img {
         display: none;
       }
     }
-    .active{
+
+    .active {
       background: #E7F1FE;
       color: #1174FE;
       position: relative;
-      img{
+
+      img {
         display: inline-block;
         position: absolute;
         bottom: 0;
@@ -458,10 +479,12 @@ export default {
         height: 46px;
       }
     }
+
     .mar-r50 {
       margin-right: 50px;
     }
-    .mini-item{
+
+    .mini-item {
       display: inline-block;
       width: 128px;
       height: 72px;
@@ -474,16 +497,19 @@ export default {
       margin-right: 58px;
       margin-bottom: 32px;
     }
+
     .mini-item:nth-of-type(5) {
       margin-right: 0;
     }
-    .mini-active{
+
+    .mini-active {
       background: #F2F8FE;
       border: 1px solid #89B2EE;
       box-sizing: border-box;
     }
   }
-  .btn{
+
+  .btn {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -498,4 +524,4 @@ export default {
     color: #FFFFFF;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/bigHorn/bigHorn.vue b/src/pages/bigHorn/bigHorn.vue
index d6dd6287..2163f2a3 100644
--- a/src/pages/bigHorn/bigHorn.vue
+++ b/src/pages/bigHorn/bigHorn.vue
@@ -19,15 +19,16 @@
       </div>
     </div>
     <div class="banner">
-      <div class="item" :class="item.bgClass" v-for="(item, index) in bannerList" :key="index" @click="linkTo(item.path)">
-        <h2>{{item.title}}</h2>
-        <div>{{item.text}}</div>
+      <div class="item" :class="item.bgClass" v-for="(item, index) in bannerList" :key="index"
+           @click="linkTo(item.path)">
+        <h2>{{ item.title }}</h2>
+        <div>{{ item.text }}</div>
         <img :src="item.imgUrl" alt="">
       </div>
     </div>
   </div>
 </template>
-<script> 
+<script>
 export default {
   name: "bigHorn",
   data() {
@@ -75,13 +76,15 @@ export default {
 </script>
 <style lang="scss" scoped>
 .bigHorn {
-  .header{
+  .header {
     position: relative;
-    img{
+
+    img {
       width: 100%;
       height: 306px;
     }
-    .content{
+
+    .content {
       width: 686px;
       padding: 40px 0;
       background: #FFFFFF;
@@ -92,15 +95,18 @@ export default {
       left: 50%;
       transform: translateX(-50%);
       display: flex;
-      .item{
+
+      .item {
         text-align: center;
         flex: 1;
-        img{
+
+        img {
           width: 64px;
           height: 64px;
           margin-bottom: 18px;
         }
-        div{
+
+        div {
           font-size: 30px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
@@ -108,7 +114,8 @@ export default {
           line-height: 42px;
           margin-bottom: 10px;
         }
-        h2{
+
+        h2 {
           font-size: 40px;
           font-family: DINAlternate-Bold, DINAlternate;
           font-weight: bold;
@@ -118,9 +125,11 @@ export default {
       }
     }
   }
-  .banner{
+
+  .banner {
     margin-top: 150px;
-    .item{
+
+    .item {
       width: 686px;
       height: 190px;
       border-radius: 12px;
@@ -129,37 +138,44 @@ export default {
       box-sizing: border-box;
       color: #FFF;
       position: relative;
-      h2{
+
+      h2 {
         font-size: 42px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         line-height: 60px;
         margin-bottom: 16px;
       }
-      div{
+
+      div {
         font-size: 26px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
         color: #FFF;
         line-height: 32px;
       }
-      img{
+
+      img {
         width: 160px;
         position: absolute;
         top: 10px;
         right: 30px;
       }
     }
-    .bg-67A3F4{
+
+    .bg-67A3F4 {
       background: #67A3F4;
     }
-    .bg-4ED5BB{
+
+    .bg-4ED5BB {
       background: #4ED5BB;
     }
-    .bg-E5B565{
+
+    .bg-E5B565 {
       background: #E5B565;
     }
-    .bg-F19661{
+
+    .bg-F19661 {
       background: #F19661;
     }
   }
diff --git a/src/pages/bigHorn/onlineList.vue b/src/pages/bigHorn/onlineList.vue
index f4e204e0..898598eb 100644
--- a/src/pages/bigHorn/onlineList.vue
+++ b/src/pages/bigHorn/onlineList.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="onlineList">
     <div class="record">
-      <div class="item"  v-for="(item, index) in list" :key="index">
+      <div class="item" v-for="(item, index) in list" :key="index">
         <img src="./img/bigHorn-lb@2x.png" alt="">
         <div class="info">
-          <p>{{item.deviceName}}</p>
-          <span>{{item.areaName}}</span>
+          <p>{{ item.deviceName }}</p>
+          <span>{{ item.areaName }}</span>
         </div>
       </div>
     </div>
@@ -13,9 +13,10 @@
     <AiBack></AiBack>
   </div>
 </template>
-<script> 
+<script>
 import AiEmpty from '@/components/AiEmpty/AiEmpty'
 import AiBack from "@/components/AiBack";
+
 export default {
   name: "onlineList",
   data() {
@@ -56,22 +57,26 @@ export default {
 </script>
 <style lang="scss" scoped>
 .onlineList {
-  .record{
+  .record {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       border-bottom: 1px solid #ddd;
       display: flex;
       padding: 12px 40px 16px 0;
-      img{
+
+      img {
         width: 48px;
         height: 48px;
         margin: 12px 16px 0 0;
       }
-      .info{
+
+      .info {
         width: calc(100% - 100px);
-        p{
+
+        p {
           font-size: 34px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
@@ -79,7 +84,8 @@ export default {
           line-height: 48px;
           margin-bottom: 12px;
         }
-        span{
+
+        span {
           font-size: 22px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
diff --git a/src/pages/bigHorn/onlinePlayList.vue b/src/pages/bigHorn/onlinePlayList.vue
index 4cae2896..569b53eb 100644
--- a/src/pages/bigHorn/onlinePlayList.vue
+++ b/src/pages/bigHorn/onlinePlayList.vue
@@ -4,9 +4,9 @@
       <div class="item" v-for="(item, index) in list" :key="index">
         <img src="./img/bigHorn-lb@2x.png" alt="">
         <div class="info">
-          <p>{{item.deviceName}}</p>
-          <span>{{item.createTime}}</span><br />
-          <span>{{item.name}}</span>
+          <p>{{ item.deviceName }}</p>
+          <span>{{ item.createTime }}</span><br/>
+          <span>{{ item.name }}</span>
         </div>
       </div>
     </div>
@@ -14,9 +14,10 @@
     <AiBack></AiBack>
   </div>
 </template>
-<script> 
+<script>
 import AiEmpty from '@/components/AiEmpty/AiEmpty'
 import AiBack from "@/components/AiBack";
+
 export default {
   name: "onlinePlayList",
   data() {
@@ -58,22 +59,26 @@ export default {
 </script>
 <style lang="scss" scoped>
 .onlinePlayList {
-  .record{
+  .record {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       border-bottom: 1px solid #ddd;
       display: flex;
       padding: 12px 40px 16px 0;
-      img{
+
+      img {
         width: 48px;
         height: 48px;
         margin: 12px 16px 0 0;
       }
-      .info{
+
+      .info {
         width: calc(100% - 100px);
-        p{
+
+        p {
           font-size: 34px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
@@ -81,7 +86,8 @@ export default {
           line-height: 48px;
           margin-bottom: 12px;
         }
-        span{
+
+        span {
           font-size: 22px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
diff --git a/src/pages/bigHorn/playList.vue b/src/pages/bigHorn/playList.vue
index e811b79e..3334bf3c 100644
--- a/src/pages/bigHorn/playList.vue
+++ b/src/pages/bigHorn/playList.vue
@@ -5,21 +5,25 @@
       <span>操作</span>
     </div>
     <div class="record">
-      <div class="item" v-for="(item, index) in list" :key="index"> 
+      <div class="item" v-for="(item, index) in list" :key="index">
         <div class="info">
-          <p>{{item.messageName}}</p>
-          <span>{{item.createTime}}</span><br />
-          <span>{{item.deviceName}}</span>
+          <p>{{ item.messageName }}</p>
+          <span>{{ item.createTime }}</span><br/>
+          <span>{{ item.deviceName }}</span>
+        </div>
+        <div class="btn bg-3975C6"
+             v-if="item.broadcastStatus == 0 || item.broadcastStatus == 1 || item.broadcastStatus == 2"
+             @click="cancel(item.broadcastId)">撤销
         </div>
-        <div class="btn bg-3975C6" v-if="item.broadcastStatus == 0 || item.broadcastStatus == 1 || item.broadcastStatus == 2" @click="cancel(item.broadcastId)">撤销</div>
         <div class="btn bg-AFD0FC" v-if="item.broadcastStatus == 6">已取消</div>
       </div>
     </div>
     <AiBack></AiBack>
   </div>
 </template>
-<script> 
-  import AiBack from "@/components/AiBack";
+<script>
+import AiBack from "@/components/AiBack";
+
 export default {
   name: "playList",
   data() {
@@ -71,7 +75,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .playList {
-  .title{
+  .title {
     width: 100%;
     height: 88px;
     line-height: 88px;
@@ -84,21 +88,25 @@ export default {
     box-sizing: border-box;
     border-bottom: 1px solid #ddd;
   }
-  .record{
+
+  .record {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       border-bottom: 1px solid #ddd;
       display: flex;
       justify-content: space-between;
       padding: 12px 40px 16px 0;
       box-sizing: border-box;
-      .info{
+
+      .info {
         width: 480px;
         margin-right: 40px;
         word-break: break-all;
-        p{
+
+        p {
           font-size: 34px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
@@ -106,7 +114,8 @@ export default {
           line-height: 48px;
           margin-bottom: 12px;
         }
-        span{
+
+        span {
           font-size: 22px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
@@ -114,7 +123,8 @@ export default {
           line-height: 32px;
         }
       }
-      .btn{
+
+      .btn {
         width: 154px;
         height: 60px;
         border-radius: 8px;
@@ -126,10 +136,12 @@ export default {
         color: #FFF;
         margin-top: 18px;
       }
-      .bg-3975C6{
+
+      .bg-3975C6 {
         background: #3975C6;
       }
-      .bg-AFD0FC{
+
+      .bg-AFD0FC {
         background: #AFD0FC;
       }
     }
diff --git a/src/pages/bigHorn/selectEquipment.vue b/src/pages/bigHorn/selectEquipment.vue
index 3b3bc7ab..b56a69e8 100644
--- a/src/pages/bigHorn/selectEquipment.vue
+++ b/src/pages/bigHorn/selectEquipment.vue
@@ -3,7 +3,7 @@
     <div class="search">
       <div class="search-bg">
         <img src="./img/search-icon.png" alt="">
-        <u-input v-model="value" type="text" placeholder="搜索设备名称" class="search-input" height="18" />
+        <u-input v-model="value" type="text" placeholder="搜索设备名称" class="search-input" height="18"/>
       </div>
     </div>
     <div class="record">
@@ -35,7 +35,7 @@
     </div>
   </div>
 </template>
-<script> 
+<script>
 export default {
   name: "selectEquipment",
   data() {
@@ -43,9 +43,7 @@ export default {
       value: ''
     }
   },
-  methods: {
-    
-  },
+  methods: {},
   mounted() {
 
   }
@@ -54,14 +52,16 @@ export default {
 <style lang="scss" scoped>
 .selectEquipment {
   padding-bottom: 128px;
-  .search{
+
+  .search {
     width: 100%;
     height: 104px;
     background: #FFF;
     margin-bottom: 4px;
     padding: 20px 32px;
     box-sizing: border-box;
-    .search-bg{
+
+    .search-bg {
       width: 686px;
       height: 64px;
       padding: 14px 0;
@@ -69,14 +69,16 @@ export default {
       background: #F5F5F5;
       border-radius: 32px;
       position: relative;
-      img{
+
+      img {
         width: 32px;
         height: 32px;
         position: absolute;
         top: 16px;
         left: 32px;
       }
-      .search-input{
+
+      .search-input {
         width: 590px;
         height: 36px;
         line-height: 36px;
@@ -85,38 +87,45 @@ export default {
       }
     }
   }
-  .record{
+
+  .record {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       display: flex;
       border-bottom: 1px solid #ddd;
-      .check-img{
+
+      .check-img {
         width: 32px;
         height: 32px;
         margin: 32px 32px 0 0;
       }
-      .voice-img{
+
+      .voice-img {
         width: 48px;
         height: 48px;
         margin: 28px 16px 0 0;
       }
-      .info{
+
+      .info {
         width: calc(100% - 148px);
         padding: 18px 0;
         line-height: 44px;
         font-size: 34px;
         display: flex;
         justify-content: space-between;
-        .text{
-          p{
+
+        .text {
+          p {
             font-family: PingFang-SC-Medium, PingFang-SC;
             font-weight: 500;
             color: #333;
             margin-bottom: 8px;
           }
-          span{
+
+          span {
             font-size: 26px;
             font-family: PingFang-SC-Medium, PingFang-SC;
             font-weight: 500;
@@ -124,7 +133,8 @@ export default {
             line-height: 36px;
           }
         }
-        .status{
+
+        .status {
           font-size: 34px;
           font-family: PingFang-SC-Medium, PingFang-SC;
           font-weight: 500;
@@ -134,7 +144,8 @@ export default {
       }
     }
   }
-  .btn{
+
+  .btn {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -144,7 +155,8 @@ export default {
     border-top: 1px solid #ddd;
     padding: 24px 32px 24px 0;
     box-sizing: border-box;
-    div{
+
+    div {
       width: 192px;
       height: 80px;
       line-height: 80px;
@@ -154,7 +166,7 @@ export default {
       color: #fff;
       font-size: 32px;
       float: right;
-    } 
+    }
   }
 }
 </style>
diff --git a/src/pages/bigHorn/selectMp3.vue b/src/pages/bigHorn/selectMp3.vue
index e413ba07..dd5d85a6 100644
--- a/src/pages/bigHorn/selectMp3.vue
+++ b/src/pages/bigHorn/selectMp3.vue
@@ -13,17 +13,13 @@
     </div>
   </div>
 </template>
-<script> 
+<script>
 export default {
   name: "selectMp3",
   data() {
-    return {
-      
-    }
-  },
-  methods: {
-    
+    return {}
   },
+  methods: {},
   mounted() {
 
   }
@@ -32,18 +28,22 @@ export default {
 <style lang="scss" scoped>
 .selectMp3 {
   padding-bottom: 128px;
-  .record{
+
+  .record {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       display: flex;
-      img{
+
+      img {
         width: 32px;
         height: 32px;
         margin: 40px 16px 0 0;
       }
-      .info{
+
+      .info {
         width: calc(100% - 60px);
         padding-bottom: 16px;
         padding: 34px 0;
@@ -57,7 +57,8 @@ export default {
       }
     }
   }
-  .btn{
+
+  .btn {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -67,7 +68,8 @@ export default {
     border-top: 1px solid #ddd;
     padding: 24px 32px 24px 0;
     box-sizing: border-box;
-    div{
+
+    div {
       width: 192px;
       height: 80px;
       line-height: 80px;
@@ -77,7 +79,7 @@ export default {
       color: #fff;
       font-size: 32px;
       float: right;
-    } 
+    }
   }
 }
 </style>
diff --git a/src/pages/casuallyask/closemsg.vue b/src/pages/casuallyask/closemsg.vue
index aa668535..3ce34567 100644
--- a/src/pages/casuallyask/closemsg.vue
+++ b/src/pages/casuallyask/closemsg.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="closemsg">
-    <img :src="imgSrc" alt="" />
+    <img :src="imgSrc" alt=""/>
     <text>{{ text }}</text>
     <u-button
-      type="primary"
-      :custom-style="{ width: '100%', borderRadius: '4px', marginTop: '48px' }"
-      @click="goBack"
-      >{{ btnText }}</u-button
+        type="primary"
+        :custom-style="{ width: '100%', borderRadius: '4px', marginTop: '48px' }"
+        @click="goBack"
+    >{{ btnText }}
+    </u-button
     >
     <back></back>
   </div>
@@ -17,7 +18,7 @@ import back from '../../components/AiBack'
 
 export default {
   name: 'CloseMsg',
-  components: { back },
+  components: {back},
   data() {
     return {
       flag: true
@@ -44,7 +45,7 @@ export default {
       return this.flag ? '确定' : '查看详情'
     },
     imgSrc() {
-      return   this.$cdn+'other/'+(this.flag?'kztcg.png':'kztsb.png')
+      return this.$cdn + 'other/' + (this.flag ? 'kztcg.png' : 'kztsb.png')
     }
   }
 }
diff --git a/src/pages/documentFlow/components/approval.vue b/src/pages/documentFlow/components/approval.vue
index 1009a97f..75b56428 100644
--- a/src/pages/documentFlow/components/approval.vue
+++ b/src/pages/documentFlow/components/approval.vue
@@ -5,7 +5,7 @@
       <textarea placeholder="请输入批示意见" v-model.trim="description" maxlength="200"></textarea>
       <u-row justify="between">
         <span @click="description=''">清空内容</span>
-        <span>{{description.length || 0}}/200</span>
+        <span>{{ description.length || 0 }}/200</span>
       </u-row>
     </div>
     <ai-back/>
@@ -14,78 +14,78 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
+import AiBack from "../../../components/AiBack";
 
-  export default {
-    name: "approval",
-    components: {AiBack},
-    data() {
-      return {
-        id: null,
-        description: ""
-      }
-    },
-    onLoad(opt) {
-      this.id = opt.id
-    },
-    methods: {
-      submit() {
-        this.$http.post("/app/appofficialdocumentinfo/instructionById", null, {
-          params: {
-            id: this.id,
-            description: this.description
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast("批示成功")
-            uni.navigateBack()
-          }
-        })
-      }
+export default {
+  name: "approval",
+  components: {AiBack},
+  data() {
+    return {
+      id: null,
+      description: ""
+    }
+  },
+  onLoad(opt) {
+    this.id = opt.id
+  },
+  methods: {
+    submit() {
+      this.$http.post("/app/appofficialdocumentinfo/instructionById", null, {
+        params: {
+          id: this.id,
+          description: this.description
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("批示成功")
+          uni.navigateBack()
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .approval {
-    background: #F5F5F5;
+.approval {
+  background: #F5F5F5;
 
-    .card {
-      background-color: #FFFFFF;
-      box-sizing: border-box;
-      padding: 32px;
+  .card {
+    background-color: #FFFFFF;
+    box-sizing: border-box;
+    padding: 32px;
 
-      header {
-        font-size: 32px;
-        color: #333333;
-        margin-bottom: 16px;
-        font-weight: bold;
-      }
-
-      textarea {
-        width: 100%;
-      }
-
-      span:first-child {
-        font-size: 28px;
-        color: #1365DD;
-      }
-
-      span:last-child {
-        font-size: 24px;
-        color: #999999;
-      }
+    header {
+      font-size: 32px;
+      color: #333333;
+      margin-bottom: 16px;
+      font-weight: bold;
     }
 
-    .u-btn {
+    textarea {
       width: 100%;
-      height: 112px !important;
-      font-size: 32px;
-      color: #FFFFFF;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background: #197DF0 !important;
+    }
+
+    span:first-child {
+      font-size: 28px;
+      color: #1365DD;
+    }
+
+    span:last-child {
+      font-size: 24px;
+      color: #999999;
     }
   }
+
+  .u-btn {
+    width: 100%;
+    height: 112px !important;
+    font-size: 32px;
+    color: #FFFFFF;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background: #197DF0 !important;
+  }
+}
 </style>
diff --git a/src/pages/documentFlow/components/detail.vue b/src/pages/documentFlow/components/detail.vue
index ab175ca4..141dd0d4 100644
--- a/src/pages/documentFlow/components/detail.vue
+++ b/src/pages/documentFlow/components/detail.vue
@@ -2,43 +2,44 @@
   <div class="detail">
     <template v-if="!userSelect">
       <div class="card">
-        <header>{{detail.documentName}}</header>
+        <header>{{ detail.documentName }}</header>
         <u-gap height="16"></u-gap>
         <u-row>
           <span>公文编号：</span>
-          <span>{{detail.documentCode}}</span>
+          <span>{{ detail.documentCode }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>公文类型：</span>
-          <span>{{$dict.getLabel("officialDocumentName",detail.documentType)}}</span>
+          <span>{{ $dict.getLabel("officialDocumentName", detail.documentType) }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>紧急程度：</span>
-          <span :style="{color:$dict.getColor('documentEmergencyLevel',detail.emergencyLevel)}">{{$dict.getLabel("documentEmergencyLevel",detail.emergencyLevel)}}</span>
+          <span
+              :style="{color:$dict.getColor('documentEmergencyLevel',detail.emergencyLevel)}">{{ $dict.getLabel("documentEmergencyLevel", detail.emergencyLevel) }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>发文机关：</span>
-          <span>{{detail.issuingUnit}}</span>
+          <span>{{ detail.issuingUnit }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>发文字号：</span>
-          <span>{{detail.issuingFont}}</span>
+          <span>{{ detail.issuingFont }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>签发人：</span>
-          <span>{{detail.signer}}</span>
+          <span>{{ detail.signer }}</span>
         </u-row>
         <u-gap height="16"></u-gap>
         <img v-if="detail.confidentialityLevel" :src="$cdn + tag(detail.confidentialityLevel)" alt="">
       </div>
       <div class="card" style="margin-bottom: 0;padding-top: 0">
         <div class="label">备注</div>
-        <span>{{detail.remark}}</span>
+        <span>{{ detail.remark }}</span>
       </div>
       <div class="card" style="padding-top: 0" v-if="detail.files && detail.files.length">
         <div class="label">相关附件</div>
@@ -46,30 +47,32 @@
           <u-row justify="between">
             <label class="left">
               <img :src="$cdn + 'common/appendix.png'" alt="">
-              <span>{{item.fileName}}.{{item.postfix}}</span>
+              <span>{{ item.fileName }}.{{ item.postfix }}</span>
             </label>
-            <span>{{(item.size/1024).toFixed(2)}}KB</span>
+            <span>{{ (item.size / 1024).toFixed(2) }}KB</span>
           </u-row>
         </div>
       </div>
       <div class="card">
-        <div class="label" style="96px;">{{detail.readType ==0 ? "流转信息" : "传阅情况"}}
-          <em>({{$dict.getLabel("documentStatus",detail.status)}})</em></div>
+        <div class="label" style="96px;">{{ detail.readType == 0 ? "流转信息" : "传阅情况" }}
+          <em>({{ $dict.getLabel("documentStatus", detail.status) }})</em></div>
         <div class="progress">
           <div class="item" v-for="(item,index) in detail.flowUsers" :key="index">
-            <div class="avatar">{{item.flowUserName && item.flowUserName.substr(-2)}}</div>
+            <div class="avatar">{{ item.flowUserName && item.flowUserName.substr(-2) }}</div>
             <div class="right">
               <u-row justify="between">
-                <text class="status" :style="{color:item.readStatus==1?'#FF8822':'#1365DD'}">{{$dict.getLabel(detail.readType ==1 ? "readingStatus" :
-                  "documentFlowStatus",detail.readType ==0 ? item.flowStatus : item.readStatus)}}
+                <text class="status" :style="{color:item.readStatus==1?'#FF8822':'#1365DD'}">{{
+                    $dict.getLabel(detail.readType == 1 ? "readingStatus" :
+                        "documentFlowStatus", detail.readType == 0 ? item.flowStatus : item.readStatus)
+                  }}
                 </text>
-                <text class="date">{{item.flowTime}}</text>
+                <text class="date">{{ item.flowTime }}</text>
               </u-row>
               <u-row justify="between">
-                <text class="name">{{item.flowUserName}}</text>
+                <text class="name">{{ item.flowUserName }}</text>
               </u-row>
               <u-row justify="between">
-                <text class="note">{{item.description}}</text>
+                <text class="note">{{ item.description }}</text>
               </u-row>
             </div>
           </div>
@@ -81,7 +84,9 @@
         <div @click="handleClick(1)">流转</div>
       </div>
 
-      <div class="footer" v-if="detail.readType==1 && detail.flowRight==1" @click="read" style="background-color: #1365DD;color: #FFFFFF">我已阅完</div>
+      <div class="footer" v-if="detail.readType==1 && detail.flowRight==1" @click="read"
+           style="background-color: #1365DD;color: #FFFFFF">我已阅完
+      </div>
 
     </template>
 
@@ -93,340 +98,340 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
-  import {mapActions} from "vuex";
+import AiBack from "../../../components/AiBack";
+import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
+import {mapActions} from "vuex";
 
-  export default {
-    name: "detail",
-    components: {AiBack, AiSelectEnterprise},
-    data() {
-      return {
-        id: null,
-        detail: {},
-        userSelect: false,
-      }
-    },
-
-    onLoad(opt) {
-      this.$dict.load("officialDocumentName", "documentEmergencyLevel", "documentStatus", "readingStatus", "documentFlowStatus")
-      this.id = opt.id
-    },
-
-    methods: {
-      ...mapActions(['previewFile', 'injectJWeixin']),
-      read() {
-        this.$http.post("/app/appofficialdocumentinfo/readById", null, {
-          params: {
-            id: this.id
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast("已阅读")
-            this.getDetail()
-          }
-        })
-      },
-      preFile(e) {
-        if([".jpg",".png",".gif"].includes(e.postfix.toLowerCase())){
-          uni.previewImage({
-            current: e.url,
-            urls: [e.url]
-          })
-        }else {
-          this.previewFile({...e})
-        }
-      },
-      change(e) {
-        this.$http.post("/app/appofficialdocumentinfo/flowById", null, {
-          params: {
-            flowUserId: e[0].id,
-            flowUserName: e[0].name,
-            id: this.id,
-            avatar: e[0].avatar,
-            flag: 0
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast("流转成功")
-            this.getDetail()
-          }
-        })
-      },
-
-      tag(status) {
-        return {
-          "0": "common/mm.png",
-          "1": "common/jm.png",
-          "2": "common/tm.png"
-        }[status]
-      },
-      getDetail() {
-        this.$http.post("/app/appofficialdocumentinfo/queryDetailById", null, {
-          params: {
-            id: this.id,
-            flag: 1
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.detail = res.data
-          }
-        })
-      },
-      handleClick(status) {
-        if (status == 0) {
-          uni.navigateTo({
-            url: "/pages/documentFlow/components/approval?id=" + this.id
-          })
-        } else {
-          this.userSelect = true
-        }
-      }
-    },
-    onShow() {
-      this.getDetail()
+export default {
+  name: "detail",
+  components: {AiBack, AiSelectEnterprise},
+  data() {
+    return {
+      id: null,
+      detail: {},
+      userSelect: false,
     }
+  },
+
+  onLoad(opt) {
+    this.$dict.load("officialDocumentName", "documentEmergencyLevel", "documentStatus", "readingStatus", "documentFlowStatus")
+    this.id = opt.id
+  },
+
+  methods: {
+    ...mapActions(['previewFile', 'injectJWeixin']),
+    read() {
+      this.$http.post("/app/appofficialdocumentinfo/readById", null, {
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("已阅读")
+          this.getDetail()
+        }
+      })
+    },
+    preFile(e) {
+      if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
+        uni.previewImage({
+          current: e.url,
+          urls: [e.url]
+        })
+      } else {
+        this.previewFile({...e})
+      }
+    },
+    change(e) {
+      this.$http.post("/app/appofficialdocumentinfo/flowById", null, {
+        params: {
+          flowUserId: e[0].id,
+          flowUserName: e[0].name,
+          id: this.id,
+          avatar: e[0].avatar,
+          flag: 0
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("流转成功")
+          this.getDetail()
+        }
+      })
+    },
+
+    tag(status) {
+      return {
+        "0": "common/mm.png",
+        "1": "common/jm.png",
+        "2": "common/tm.png"
+      }[status]
+    },
+    getDetail() {
+      this.$http.post("/app/appofficialdocumentinfo/queryDetailById", null, {
+        params: {
+          id: this.id,
+          flag: 1
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.detail = res.data
+        }
+      })
+    },
+    handleClick(status) {
+      if (status == 0) {
+        uni.navigateTo({
+          url: "/pages/documentFlow/components/approval?id=" + this.id
+        })
+      } else {
+        this.userSelect = true
+      }
+    }
+  },
+  onShow() {
+    this.getDetail()
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .detail {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 140px;
+.detail {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 140px;
+  position: relative;
+
+  .card {
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    box-sizing: border-box;
+    padding: 16px 32px;
     position: relative;
 
-    .card {
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
-      box-sizing: border-box;
-      padding: 16px 32px;
-      position: relative;
-
-      header {
-        font-size: 40px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 64px;
-        letter-spacing: 1px;
-      }
-
-      .u-row {
-        & > div {
-          background-color: #2266FF;
-          border-radius: 50%;
-          text-align: center;
-          font-size: 22px;
-          font-weight: bold;
-          color: #FFFFFF;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-
-        & > span:first-child {
-          font-size: 30px;
-          color: #999999;;
-          line-height: 48px;
-        }
-
-        & > span:last-child {
-          font-size: 30px;
-          color: #343D65;
-          margin-left: 16px;
-          line-height: 48px;
-        }
-      }
-
-      & > img {
-        width: 190px;
-        height: 190px;
-        position: absolute;
-        right: 0;
-        top: 74px;
-      }
-
-      & > span {
-        font-size: 32px;
-        color: #333333;
-        line-height: 48px;
-        letter-spacing: 1px;
-        display: inline-block;
-      }
-
-      .label {
-        height: 80px;
-        font-size: 32px;
-        color: #333333;
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-
-        & > em {
-          font-style: normal;
-          font-size: 32px;
-          color: #1365DD;
-        }
-      }
-
-      .file {
-        height: 128px;
-        background: #FFFFFF;
-        border-radius: 8px;
-        border: 1px solid #CCCCCC;
-        box-sizing: border-box;
-        padding: 0 16px;
-        margin-bottom: 32px;
-
-        & > .u-row {
-          height: 100%;
-
-          .left {
-            width: 500px;
-            display: flex;
-            align-items: center;
-
-            & > img {
-              flex-shrink: 0;
-              width: 96px;
-              height: 96px;
-            }
-
-            & > span {
-              font-size: 32px;
-              color: #333333;
-              display: inline-block;
-              line-height: 44px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display:-webkit-box;
-              -webkit-box-orient:vertical;
-              -webkit-line-clamp:2;
-            }
-          }
-
-          & > span {
-            font-size: 28px;
-            color: #999999;
-          }
-        }
-      }
-
-      .active {
-        background-color: #F3F6F9;
-      }
-
-      .progress {
-        margin-top: 8px;
-
-        .item {
-          display: flex;
-          align-items: center;
-          position: relative;
-          min-height: 136px;
-          margin-bottom: 80px;
-
-          .avatar {
-            width: 80px;
-            height: 80px;
-            border-radius: 50%;
-            background-color: #2266FF;
-            font-size: 28px;
-            color: #FFFFFF;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-shrink: 0;
-          }
-
-          .right {
-            width: 100%;
-            display: flex;
-            flex-direction: column;
-
-            & > .u-row {
-              margin-left: 40px;
-
-              .status {
-                font-size: 32px;
-                color: #333333;
-              }
-
-              .date {
-                font-size: 28px;
-                color: #999999;
-              }
-
-              .name {
-                font-size: 28px;
-                color: #666666;
-                margin: 8px 0;
-              }
-
-              .note {
-                font-size: 28px;
-                color: #343D65;
-              }
-            }
-          }
-
-          &:after {
-            content: "";
-            width: 4px;
-            height: 100%;
-            background-color: #EEEEEE;
-            position: absolute;
-            left: 40px;
-            top: 112px;
-          }
-
-          &:last-child:after {
-            display: none;
-          }
-        }
-      }
+    header {
+      font-size: 40px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 64px;
+      letter-spacing: 1px;
     }
 
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background-color: #FFFFFF;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 36px;
-
+    .u-row {
       & > div {
-        color: #333333;
-      }
-
-      & > div:first-child {
-        width: 50%;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      & > div:last-child {
-        width: 50%;
-        height: 100%;
+        background-color: #2266FF;
+        border-radius: 50%;
+        text-align: center;
+        font-size: 22px;
+        font-weight: bold;
         color: #FFFFFF;
         display: flex;
         align-items: center;
         justify-content: center;
-        background-color: #1365DD;
       }
 
-      & > label {
+      & > span:first-child {
+        font-size: 30px;
+        color: #999999;;
+        line-height: 48px;
+      }
+
+      & > span:last-child {
+        font-size: 30px;
+        color: #343D65;
+        margin-left: 16px;
+        line-height: 48px;
+      }
+    }
+
+    & > img {
+      width: 190px;
+      height: 190px;
+      position: absolute;
+      right: 0;
+      top: 74px;
+    }
+
+    & > span {
+      font-size: 32px;
+      color: #333333;
+      line-height: 48px;
+      letter-spacing: 1px;
+      display: inline-block;
+    }
+
+    .label {
+      height: 80px;
+      font-size: 32px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+
+      & > em {
+        font-style: normal;
+        font-size: 32px;
+        color: #1365DD;
+      }
+    }
+
+    .file {
+      height: 128px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      padding: 0 16px;
+      margin-bottom: 32px;
+
+      & > .u-row {
+        height: 100%;
+
+        .left {
+          width: 500px;
+          display: flex;
+          align-items: center;
+
+          & > img {
+            flex-shrink: 0;
+            width: 96px;
+            height: 96px;
+          }
+
+          & > span {
+            font-size: 32px;
+            color: #333333;
+            display: inline-block;
+            line-height: 44px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+          }
+        }
+
+        & > span {
+          font-size: 28px;
+          color: #999999;
+        }
+      }
+    }
+
+    .active {
+      background-color: #F3F6F9;
+    }
+
+    .progress {
+      margin-top: 8px;
+
+      .item {
         display: flex;
         align-items: center;
-        justify-content: center;
-        background-color: #1365DD;
+        position: relative;
+        min-height: 136px;
+        margin-bottom: 80px;
+
+        .avatar {
+          width: 80px;
+          height: 80px;
+          border-radius: 50%;
+          background-color: #2266FF;
+          font-size: 28px;
+          color: #FFFFFF;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+        }
+
+        .right {
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+
+          & > .u-row {
+            margin-left: 40px;
+
+            .status {
+              font-size: 32px;
+              color: #333333;
+            }
+
+            .date {
+              font-size: 28px;
+              color: #999999;
+            }
+
+            .name {
+              font-size: 28px;
+              color: #666666;
+              margin: 8px 0;
+            }
+
+            .note {
+              font-size: 28px;
+              color: #343D65;
+            }
+          }
+        }
+
+        &:after {
+          content: "";
+          width: 4px;
+          height: 100%;
+          background-color: #EEEEEE;
+          position: absolute;
+          left: 40px;
+          top: 112px;
+        }
+
+        &:last-child:after {
+          display: none;
+        }
       }
     }
   }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36px;
+
+    & > div {
+      color: #333333;
+    }
+
+    & > div:first-child {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > div:last-child {
+      width: 50%;
+      height: 100%;
+      color: #FFFFFF;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #1365DD;
+    }
+
+    & > label {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #1365DD;
+    }
+  }
+}
 </style>
diff --git a/src/pages/documentFlow/documentFlow.vue b/src/pages/documentFlow/documentFlow.vue
index 5b382a7a..d17de953 100644
--- a/src/pages/documentFlow/documentFlow.vue
+++ b/src/pages/documentFlow/documentFlow.vue
@@ -2,29 +2,30 @@
   <div class="document-flow">
     <ai-top-fixed>
       <header class="pad">
-        <u-search placeholder="请输入公文名称" v-model="documentName" @clear="documentName='',getList()" @search="getList" clearabled :show-action="false" height="64"></u-search>
+        <u-search placeholder="请输入公文名称" v-model="documentName" @clear="documentName='',getList()" @search="getList"
+                  clearabled :show-action="false" height="64"></u-search>
       </header>
     </ai-top-fixed>
     <div class="list pad" v-if="list.length">
       <div class="card" v-for="(item,index) in list" :key="index" @click="handleClick(item)">
         <u-row>
           <em v-if="item.redStatus==0"></em>
-          <span>{{item.documentName}}</span>
+          <span>{{ item.documentName }}</span>
         </u-row>
         <u-gap height="16"></u-gap>
         <u-row>
           <label>公文类型：</label>
-          <text style="color: #1365DD;">{{$dict.getLabel("officialDocumentName",item.documentType)}}</text>
+          <text style="color: #1365DD;">{{ $dict.getLabel("officialDocumentName", item.documentType) }}</text>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <label>登记人：</label>
-          <text>{{item.createUserName}}</text>
+          <text>{{ item.createUserName }}</text>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <label>登记日期：</label>
-          <text>{{item.createTime}}</text>
+          <text>{{ item.createTime }}</text>
         </u-row>
         <img :src=" $cdn + tag(item.readType)" alt="">
       </div>
@@ -35,132 +36,132 @@
 </template>
 
 <script>
-  import AiTopFixed from "../../components/AiTopFixed";
-  import AiEmpty from "../../components/AiEmpty";
+import AiTopFixed from "../../components/AiTopFixed";
+import AiEmpty from "../../components/AiEmpty";
 
-  export default {
-    name: "documentFlow",
-    components: {AiTopFixed,AiEmpty},
-    data() {
+export default {
+  name: "documentFlow",
+  components: {AiTopFixed, AiEmpty},
+  data() {
+    return {
+      documentName: "",
+      current: 1,
+      list: [],
+      status: "加载更多"
+    }
+  },
+  onLoad() {
+    this.$dict.load("officialDocumentName")
+  },
+  methods: {
+    tag(status) {
       return {
-        documentName: "",
-        current: 1,
-        list: [],
-        status: "加载更多"
-      }
+        "0": 'common/1ps.png',
+        "1": 'common/2cy.png'
+      }[status]
     },
-    onLoad(){
-      this.$dict.load("officialDocumentName")
-    },
-    methods: {
-      tag(status){
-        return {
-          "0": 'common/1ps.png',
-          "1": 'common/2cy.png'
-        }[status]
-      },
-      getList() {
-        this.$http.post("/app/appofficialdocumentinfo/appList", null, {
-          params:{
-            documentName: this.documentName,
-            size: 10,
-            current: this.current
+    getList() {
+      this.$http.post("/app/appofficialdocumentinfo/appList", null, {
+        params: {
+          documentName: this.documentName,
+          size: 10,
+          current: this.current
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
           }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          }
-        })
-      },
-      handleClick({id}) {
-        uni.navigateTo({
-          url: "/pages/documentFlow/components/detail?id=" + id
-        })
-      }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
     },
-    onShow(){
-      this.getList()
-    },
-    onReachBottom() {
-      this.current = this.current + 1;
-      this.getList()
-    },
-  }
+    handleClick({id}) {
+      uni.navigateTo({
+        url: "/pages/documentFlow/components/detail?id=" + id
+      })
+    }
+  },
+  onShow() {
+    this.getList()
+  },
+  onReachBottom() {
+    this.current = this.current + 1;
+    this.getList()
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .document-flow {
-    min-height: 100%;
-    background: #F5F5F5;
+.document-flow {
+  min-height: 100%;
+  background: #F5F5F5;
 
-    ::v-deep .content {
-      padding: 0;
-    }
+  ::v-deep .content {
+    padding: 0;
+  }
 
-    header {
-      height: 112px;
-      background-color: #FFFFFF;
-      display: flex;
-      align-items: center;
-    }
+  header {
+    height: 112px;
+    background-color: #FFFFFF;
+    display: flex;
+    align-items: center;
+  }
 
-    .list {
-      margin: 32px 0;
+  .list {
+    margin: 32px 0;
 
-      .card {
-        background: #FFFFFF;
-        border-radius: 8px;
-        box-sizing: border-box;
-        padding: 32px;
-        position: relative;
-        margin-bottom: 32px;
+    .card {
+      background: #FFFFFF;
+      border-radius: 8px;
+      box-sizing: border-box;
+      padding: 32px;
+      position: relative;
+      margin-bottom: 32px;
 
-        .u-row{
-          flex-wrap: nowrap !important;
-        }
+      .u-row {
+        flex-wrap: nowrap !important;
+      }
 
-        em {
-          width: 16px;
-          height: 16px;
-          border-radius: 50%;
-          background-color: #FF4466;
-          font-style: normal;
-          margin-right: 8px;
-          flex-shrink: 0;
-        }
+      em {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background-color: #FF4466;
+        font-style: normal;
+        margin-right: 8px;
+        flex-shrink: 0;
+      }
 
-        span {
-          font-size: 32px;
-          font-weight: 600;
-          color: #333333;
-        }
+      span {
+        font-size: 32px;
+        font-weight: 600;
+        color: #333333;
+      }
 
-        label {
-          font-size: 30px;
-          color: #999999;
-        }
+      label {
+        font-size: 30px;
+        color: #999999;
+      }
 
-        text {
-          font-size: 30px;
-          color: #343D65;
-        }
+      text {
+        font-size: 30px;
+        color: #343D65;
+      }
 
-        img {
-          width: 160px;
-          height: 160px;
-          position: absolute;
-          right: 0;
-          bottom: 0;
-        }
+      img {
+        width: 160px;
+        height: 160px;
+        position: absolute;
+        right: 0;
+        bottom: 0;
       }
     }
-
-    .pad {
-      box-sizing: border-box;
-      padding: 32px 32px 0 32px;
-    }
   }
+
+  .pad {
+    box-sizing: border-box;
+    padding: 32px 32px 0 32px;
+  }
+}
 </style>
diff --git a/src/pages/guardianship/component/areaSelector.vue b/src/pages/guardianship/component/areaSelector.vue
index fc259c5c..38225555 100644
--- a/src/pages/guardianship/component/areaSelector.vue
+++ b/src/pages/guardianship/component/areaSelector.vue
@@ -4,7 +4,7 @@
       <template #btn>
         <div class="areaSelector">
           <span v-for="area in fullArea" :key="area.id" v-text="area.name"
-                :class="{current:area.id==areaId}"  @tap="index=area.id,getChildAreas(area.id)"/>
+                :class="{current:area.id==areaId}" @tap="index=area.id,getChildAreas(area.id)"/>
         </div>
       </template>
       <div class="areaSelector">
diff --git a/src/pages/guardianship/component/makeCalls.vue b/src/pages/guardianship/component/makeCalls.vue
index 9a8fb036..125b2c6b 100644
--- a/src/pages/guardianship/component/makeCalls.vue
+++ b/src/pages/guardianship/component/makeCalls.vue
@@ -55,9 +55,11 @@ export default {
 
   ::v-deep .u-drawer {
     text-align: center;
-    .uni-scroll-view-content{
+
+    .uni-scroll-view-content {
       max-height: 672px;
     }
+
     .option {
       font-size: 32px;
       cursor: pointer;
diff --git a/src/pages/guardianship/historyList.vue b/src/pages/guardianship/historyList.vue
index dc725a60..2bf48302 100644
--- a/src/pages/guardianship/historyList.vue
+++ b/src/pages/guardianship/historyList.vue
@@ -13,12 +13,13 @@
 
 <script>
 import AiBack from "../../components/AiBack";
+
 export default {
   name: "historyList",
   components: {AiBack},
   computed: {
     itemLabel() {
-      return '历史'+this.$dict.getLabel('intelligentGuardianshipItem', this.$route.query.type)+`(${this.$dict.getLabel('intelligentGuardianshipItemUnit',this.$route.query.type)})`
+      return '历史' + this.$dict.getLabel('intelligentGuardianshipItem', this.$route.query.type) + `(${this.$dict.getLabel('intelligentGuardianshipItemUnit', this.$route.query.type)})`
     }
   },
   data() {
@@ -39,7 +40,7 @@ export default {
     }
   },
   created() {
-    this.$dict.load("intelligentGuardianshipItem",'intelligentGuardianshipItemUnit')
+    this.$dict.load("intelligentGuardianshipItem", 'intelligentGuardianshipItemUnit')
     this.getHistory()
   }
 }
diff --git a/src/pages/guardianship/warningDetail.vue b/src/pages/guardianship/warningDetail.vue
index b328a379..1af8797d 100644
--- a/src/pages/guardianship/warningDetail.vue
+++ b/src/pages/guardianship/warningDetail.vue
@@ -75,7 +75,7 @@ export default {
     }
   },
   created() {
-    this.$dict.load("intelligentGuardianshipItem",'intelligentGuardianshipItem2', 'sex')
+    this.$dict.load("intelligentGuardianshipItem", 'intelligentGuardianshipItem2', 'sex')
   },
   mounted() {
     this.getDetail(this.$route.query.id).then(() => this.initMap())
diff --git a/src/pages/meetingNotice/components/addMeeting.vue b/src/pages/meetingNotice/components/addMeeting.vue
index 488ca20f..6371c28b 100644
--- a/src/pages/meetingNotice/components/addMeeting.vue
+++ b/src/pages/meetingNotice/components/addMeeting.vue
@@ -9,13 +9,13 @@
         <header><em>*</em>起止时间</header>
         <u-row justify="between">
           <div class="time" @click="pick(0)">
-            <span>{{form.startTime.time}}</span>
-            <span>{{form.startTime.year}}年{{form.startTime.month}}月{{form.startTime.day}}日 周{{form.startTime.weekday}}</span>
+            <span>{{ form.startTime.time }}</span>
+            <span>{{ form.startTime.year }}年{{ form.startTime.month }}月{{ form.startTime.day }}日 周{{ form.startTime.weekday }}</span>
           </div>
           <div class="arrow"></div>
           <div class="time" @click="pick(1)">
-            <span>{{form.endTime.time}}</span>
-            <span>{{form.endTime.year}}年{{form.endTime.month}}月{{form.endTime.day}}日 周{{form.endTime.weekday}}</span>
+            <span>{{ form.endTime.time }}</span>
+            <span>{{ form.endTime.year }}年{{ form.endTime.month }}月{{ form.endTime.day }}日 周{{ form.endTime.weekday }}</span>
           </div>
         </u-row>
       </div>
@@ -29,7 +29,8 @@
       </div>
 
       <div class="card">
-        <AiUploader :multiple="true" type="file" :limit="9" placeholder="上传附件" @list="fileList" :def="form.files"></AiUploader>
+        <AiUploader :multiple="true" type="file" :limit="9" placeholder="上传附件" @list="fileList"
+                    :def="form.files"></AiUploader>
       </div>
 
       <div class="card item-wrap" @click="select">
@@ -40,7 +41,7 @@
               <span>请选择</span>
             </template>
             <template v-else>
-              已选择<em>{{form.attendees.map(e=>e.name).slice(0,2).join("、")}}</em>等<em>{{form.attendees.length}}</em>人
+              已选择<em>{{ form.attendees.map(e => e.name).slice(0, 2).join("、") }}</em>等<em>{{ form.attendees.length }}</em>人
             </template>
             <div class="right-arrow"></div>
           </div>
@@ -51,7 +52,7 @@
           <header>参会提醒</header>
           <picker class="right" @change="beforeNoticeChange" :value="form.noticeBefore" range-key="dictName"
                   :range="$dict.getDict('meetingNoticeBefore')">
-            <span>{{ form.noticeBefore !=null ? $dict.getDict('meetingNoticeBefore')[form.noticeBefore]["dictName"] : "请选择"}}</span>
+            <span>{{ form.noticeBefore != null ? $dict.getDict('meetingNoticeBefore')[form.noticeBefore]["dictName"] : "请选择" }}</span>
             <div class="right-arrow"></div>
           </picker>
         </u-row>
@@ -61,7 +62,7 @@
           <header>确认提醒</header>
           <picker class="right" @change="afterNoticeChange" :value="form.noticeAfter" range-key="dictName"
                   :range="$dict.getDict('meetingNoticeAfter')">
-            <span>{{form.noticeAfter !=null ? $dict.getDict('meetingNoticeAfter')[form.noticeAfter]["dictName"] : "请选择"}}</span>
+            <span>{{ form.noticeAfter != null ? $dict.getDict('meetingNoticeAfter')[form.noticeAfter]["dictName"] : "请选择" }}</span>
             <div class="right-arrow"></div>
           </picker>
         </u-row>
@@ -73,326 +74,327 @@
     </div>
     <u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
     <AiBack ref="aiBack" v-if="!userSelect"/>
-    <AiSelectEnterprise :visible.sync="userSelect" :value="form.attendees" v-if="userSelect" @change="change"></AiSelectEnterprise>
+    <AiSelectEnterprise :visible.sync="userSelect" :value="form.attendees" v-if="userSelect"
+                        @change="change"></AiSelectEnterprise>
   </div>
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
-  import AiUploader from "../../../components/AiUploader";
+import AiBack from "../../../components/AiBack";
+import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
+import AiUploader from "../../../components/AiUploader";
 
-  export default {
-    name: "addMeeting",
-    components: {AiBack,AiSelectEnterprise,AiUploader},
-    data() {
-      const initTime = {
-        time: "",
-        year: "",
-        month: "",
-        day: "",
-        weekday: "",
-        timestamp: "",
-      }
+export default {
+  name: "addMeeting",
+  components: {AiBack, AiSelectEnterprise, AiUploader},
+  data() {
+    const initTime = {
+      time: "",
+      year: "",
+      month: "",
+      day: "",
+      weekday: "",
+      timestamp: "",
+    }
+    return {
+      show: false,
+      index: 0,
+      list: [],
+      form: {
+        id: null,
+        title: "",
+        startTime: {...initTime},
+        endTime: {...initTime},
+        address: "",
+        content: "",
+        attendees: [],
+        noticeBefore: 4,
+        noticeAfter: 0,
+        files: [],
+      },
+      userSelect: false,
+    }
+  },
+  onLoad(opt) {
+    if (opt.id) {
+      this.form.id = opt.id
+      this.getDetail()
+    }
+    this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
+    this.$nextTick(() => {
+      let date = new Date();
+      this.form.startTime.time = date.getHours()?.toString()?.padStart(2, "0") + ":" + date.getMinutes()?.toString()?.padStart(2, "0")
+      this.form.startTime.year = date.getFullYear()
+      this.form.startTime.month = (date.getMonth() + 1)?.toString()?.padStart(2, "0")
+      this.form.startTime.day = date.getDate()
+      this.form.startTime.weekday = '日一二三四五六'.charAt(date.getDay())
+      this.form.endTime = {...this.form.startTime}
+    })
+  },
+  computed: {
+    params() {
       return {
-        show: false,
-        index: 0,
-        list: [],
-        form: {
-          id: null,
-          title: "",
-          startTime: {...initTime},
-          endTime: {...initTime},
-          address: "",
-          content: "",
-          attendees: [],
-          noticeBefore: 4,
-          noticeAfter: 0,
-          files: [],
-        },
-        userSelect: false,
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        timestamp: true,
       }
+    }
+  },
+  methods: {
+    fileList(e) {
+      this.form.files = e
     },
-    onLoad(opt) {
-      if(opt.id) {
-        this.form.id = opt.id
-        this.getDetail()
-      }
-      this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
-      this.$nextTick(()=>{
-        let date = new Date();
-        this.form.startTime.time = date.getHours()?.toString()?.padStart(2, "0") + ":" + date.getMinutes()?.toString()?.padStart(2, "0")
-        this.form.startTime.year = date.getFullYear()
-        this.form.startTime.month = (date.getMonth()+1)?.toString()?.padStart(2, "0")
-        this.form.startTime.day = date.getDate()
-        this.form.startTime.weekday = '日一二三四五六'.charAt(date.getDay())
-        this.form.endTime = {...this.form.startTime}
+    change(e) {
+      this.form.attendees = e
+    },
+    beforeNoticeChange(e) {
+      this.form.noticeBefore = e.detail.value
+    },
+    afterNoticeChange(e) {
+      this.form.noticeAfter = e.detail.value
+    },
+
+    getDetail() {
+      this.$http.post("/app/appmeetinginfo/info-id", null, {
+        params: {
+          id: this.form.id
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.form.title = res.data.title
+          this.form.address = res.data.address
+          this.form.content = res.data.content
+          this.form.attendees = res.data.attendees
+          this.form.noticeBefore = res.data.noticeBefore
+          this.form.noticeAfter = res.data.noticeAfter
+          this.form.files = res.data.files
+          this.form.startTime.time = res.data.startTime.split(" ")[1].substr(0, 5)
+          this.form.startTime.year = res.data.startTime.split(" ")[0].split("-")[0]
+          this.form.startTime.month = res.data.startTime.split(" ")[0].split("-")[1]
+          this.form.startTime.day = res.data.startTime.split(" ")[0].split("-")[2]
+          this.form.startTime.weekday = '日一二三四五六'.charAt(new Date(res.data.startTime.split(" ")[0]).getDay())
+          this.form.startTime.timestamp = new Date(res.data.startTime).getTime()
+
+          this.form.endTime.time = res.data.endTime.split(" ")[1].substr(0, 5)
+          this.form.endTime.year = res.data.endTime.split(" ")[0].split("-")[0]
+          this.form.endTime.month = res.data.endTime.split(" ")[0].split("-")[1]
+          this.form.endTime.day = res.data.endTime.split(" ")[0].split("-")[2]
+          this.form.endTime.weekday = '日一二三四五六'.charAt(new Date(res.data.endTime.split(" ")[0]).getDay())
+          this.form.endTime.timestamp = new Date(res.data.endTime).getTime()
+        }
       })
     },
-    computed: {
-      params() {
-        return {
-          year: true,
-          month: true,
-          day: true,
-          hour: true,
-          minute: true,
-          timestamp: true,
+    confirm(e) {
+      if (new Date().getTime() / 1000 > e.timestamp) return this.$u.toast("选择时间不能小于当前时间")
+      if (this.index == 0) {
+        this.form.startTime = {...e}
+        this.form.startTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
+        this.form.startTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
+      } else {
+        if (this.form.startTime.timestamp >= e.timestamp) {
+          return this.$u.toast("结束时间不能小于开始时间");
         }
+        this.form.endTime = {...e}
+        this.form.endTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
+        this.form.endTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
       }
     },
-    methods: {
-      fileList(e){
-        this.form.files = e
-      },
-      change(e){
-        this.form.attendees = e
-      },
-      beforeNoticeChange(e) {
-        this.form.noticeBefore = e.detail.value
-      },
-      afterNoticeChange(e) {
-        this.form.noticeAfter = e.detail.value
-      },
 
-      getDetail(){
-        this.$http.post("/app/appmeetinginfo/info-id",null,{
-          params:{
-            id:this.form.id
-          }
-        }).then(res=>{
-          if (res && res.data) {
-            this.form.title = res.data.title
-            this.form.address = res.data.address
-            this.form.content = res.data.content
-            this.form.attendees = res.data.attendees
-            this.form.noticeBefore = res.data.noticeBefore
-            this.form.noticeAfter = res.data.noticeAfter
-            this.form.files = res.data.files
-            this.form.startTime.time = res.data.startTime.split(" ")[1].substr(0, 5)
-            this.form.startTime.year = res.data.startTime.split(" ")[0].split("-")[0]
-            this.form.startTime.month = res.data.startTime.split(" ")[0].split("-")[1]
-            this.form.startTime.day = res.data.startTime.split(" ")[0].split("-")[2]
-            this.form.startTime.weekday = '日一二三四五六'.charAt(new Date(res.data.startTime.split(" ")[0]).getDay())
-            this.form.startTime.timestamp = new Date(res.data.startTime).getTime()
+    add(status) {
+      if (status == 1) {
+        if (!this.form.title) return this.$u.toast("请输入会议标题")
 
-            this.form.endTime.time = res.data.endTime.split(" ")[1].substr(0, 5)
-            this.form.endTime.year = res.data.endTime.split(" ")[0].split("-")[0]
-            this.form.endTime.month = res.data.endTime.split(" ")[0].split("-")[1]
-            this.form.endTime.day = res.data.endTime.split(" ")[0].split("-")[2]
-            this.form.endTime.weekday = '日一二三四五六'.charAt(new Date(res.data.endTime.split(" ")[0]).getDay())
-            this.form.endTime.timestamp = new Date(res.data.endTime).getTime()
-          }
-        })
-      },
-      confirm(e) {
-        if (new Date().getTime() / 1000 > e.timestamp) return this.$u.toast("选择时间不能小于当前时间")
-        if (this.index == 0) {
-          this.form.startTime = {...e}
-          this.form.startTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
-          this.form.startTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
-        } else {
-          if (this.form.startTime.timestamp >= e.timestamp) {
-            return this.$u.toast("结束时间不能小于开始时间");
-          }
-          this.form.endTime = {...e}
-          this.form.endTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
-          this.form.endTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
-        }
-      },
+        if (this.form.startTime.timestamp >= this.form.endTime.timestamp) return this.$u.toast("结束时间不能小于开始时间")
 
-      add(status) {
-        if(status==1){
-          if (!this.form.title) return this.$u.toast("请输入会议标题")
+        if (!this.form.address) return this.$u.toast("请输入会议地点")
 
-          if (this.form.startTime.timestamp >= this.form.endTime.timestamp) return this.$u.toast("结束时间不能小于开始时间")
+        if (!this.form.content) return this.$u.toast("请输入会议内容")
 
-          if (!this.form.address) return this.$u.toast("请输入会议地点")
-
-          if (!this.form.content) return this.$u.toast("请输入会议内容")
-
-          if(!this.form.attendees.length) return this.$u.toast("请选择参会人")
-        }
-
-        this.$http.post("/app/appmeetinginfo/add-update", {
-          ...this.form,
-          files:this.form.files.map(e=>e.id),
-          status,
-          startTime: this.form.startTime.year + "-" + this.form.startTime.month + "-" + this.form.startTime.day + " " + this.form.startTime.time + ":00",
-          endTime: this.form.endTime.year + "-" + this.form.endTime.month + "-" + this.form.endTime.day + " " + this.form.endTime.time + ":00",
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast(status == 1 ? "发布成功" : "保存成功")
-            this.$refs["aiBack"].back()
-          }
-        })
-      },
-
-      pick(index) {
-        this.index = index
-        this.show = true
-      },
-      select() {
-        uni.navigateTo({
-          url: "/pages/meetingNotice/components/notice"
-        })
+        if (!this.form.attendees.length) return this.$u.toast("请选择参会人")
       }
+
+      this.$http.post("/app/appmeetinginfo/add-update", {
+        ...this.form,
+        files: this.form.files.map(e => e.id),
+        status,
+        startTime: this.form.startTime.year + "-" + this.form.startTime.month + "-" + this.form.startTime.day + " " + this.form.startTime.time + ":00",
+        endTime: this.form.endTime.year + "-" + this.form.endTime.month + "-" + this.form.endTime.day + " " + this.form.endTime.time + ":00",
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast(status == 1 ? "发布成功" : "保存成功")
+          this.$refs["aiBack"].back()
+        }
+      })
     },
-  }
+
+    pick(index) {
+      this.index = index
+      this.show = true
+    },
+    select() {
+      uni.navigateTo({
+        url: "/pages/meetingNotice/components/notice"
+      })
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .add-meeting {
-    min-height: 100%;
-    background: #F5F5F5;
-    padding-bottom: 140px;
+.add-meeting {
+  min-height: 100%;
+  background: #F5F5F5;
+  padding-bottom: 140px;
 
-    .card {
-      background-color: #FFFFFF;
-      box-sizing: border-box;
-      padding: 32px;
-      margin-top: 16px;
+  .card {
+    background-color: #FFFFFF;
+    box-sizing: border-box;
+    padding: 32px;
+    margin-top: 16px;
 
-      header {
+    header {
+      font-size: 32px;
+      font-weight: 400;
+      color: #333333;
+
+      em {
+        font-style: normal;
         font-size: 32px;
-        font-weight: 400;
-        color: #333333;
+        color: #FF4466;
+        margin-right: 8px;
+        vertical-align: middle;
+      }
+    }
+
+    input {
+      margin: 32px 0 16px;
+      box-sizing: border-box;
+      padding: 0 16px;
+    }
+
+    textarea {
+      width: 100%;
+      height: 160px;
+      margin: 32px 0 16px;
+      box-sizing: border-box;
+      padding: 0 16px;
+    }
+
+    .u-row {
+      margin-top: 34px;
+
+      .time {
+        display: flex;
+        flex-direction: column;
+
+        & > span:first-child {
+          font-size: 60px;
+          font-weight: 600;
+          color: #333333;
+          line-height: 84px;
+        }
+
+        & > span:last-child {
+          font-size: 22px;
+          color: #333333;
+        }
+      }
+
+      .arrow {
+        width: 28px;
+        height: 68px;
+        overflow: hidden;
+        position: relative;
+        transform: rotate(180deg);
+
+        &:before, &:after {
+          content: "";
+          width: 50px;
+          height: 50px;
+          position: absolute;
+          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
+        }
+
+        &:before {
+          top: 59px;
+          background-color: #CCCCCC;
+        }
+
+        &:after {
+          left: 7px;
+          top: 59px;
+          background-color: #FFFFFF;
+        }
+      }
+    }
+
+    .item {
+      height: 112px;
+      box-shadow: 0px -1px 0px 0px #D8DDE6;
+      margin-top: 0;
+
+      .right {
+        font-size: 28px;
+        color: #999999;
+        display: flex;
+        align-items: center;
 
         em {
           font-style: normal;
-          font-size: 32px;
-          color: #FF4466;
-          margin-right: 8px;
-          vertical-align: middle;
+          color: #1365DD;
         }
       }
 
-      input {
-        margin: 32px 0 16px;
-        box-sizing: border-box;
-        padding: 0 16px;
-      }
-
-      textarea {
-        width: 100%;
-        height: 160px;
-        margin: 32px 0 16px;
-        box-sizing: border-box;
-        padding: 0 16px;
-      }
-
-      .u-row {
-        margin-top: 34px;
-
-        .time {
-          display: flex;
-          flex-direction: column;
-
-          & > span:first-child {
-            font-size: 60px;
-            font-weight: 600;
-            color: #333333;
-            line-height: 84px;
-          }
-
-          & > span:last-child {
-            font-size: 22px;
-            color: #333333;
-          }
-        }
-
-        .arrow {
-          width: 28px;
-          height: 68px;
-          overflow: hidden;
-          position: relative;
-          transform: rotate(180deg);
-
-          &:before, &:after {
-            content: "";
-            width: 50px;
-            height: 50px;
-            position: absolute;
-            transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-          }
-
-          &:before {
-            top: 59px;
-            background-color: #CCCCCC;
-          }
-
-          &:after {
-            left: 7px;
-            top: 59px;
-            background-color: #FFFFFF;
-          }
-        }
-      }
-
-      .item {
-        height: 112px;
-        box-shadow: 0px -1px 0px 0px #D8DDE6;
-        margin-top: 0;
-
-        .right {
-          font-size: 28px;
-          color: #999999;
-          display: flex;
-          align-items: center;
-
-          em {
-            font-style: normal;
-            color: #1365DD;
-          }
-        }
-
-        .right-arrow {
-          width: 16px;
-          height: 16px;
-          display: inline-block;
-          border-top: 5px solid #CCCCCC;
-          border-right: 5px solid #CCCCCC;
-          transform: rotate(45deg);
-        }
-      }
-    }
-
-    .item-wrap {
-      padding: 0 32px;
-    }
-
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background-color: #FFFFFF;
-      display: flex;
-      align-items: center;
-
-      & > div {
-        font-size: 36px;
-        color: #333333;
-      }
-
-      & > div:first-child {
-        width: 270px;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      & > div:last-child {
-        width: calc(100% - 270px);
-        height: 100%;
-        color: #FFFFFF;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-color: #1365DD;
+      .right-arrow {
+        width: 16px;
+        height: 16px;
+        display: inline-block;
+        border-top: 5px solid #CCCCCC;
+        border-right: 5px solid #CCCCCC;
+        transform: rotate(45deg);
       }
     }
   }
+
+  .item-wrap {
+    padding: 0 32px;
+  }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #FFFFFF;
+    display: flex;
+    align-items: center;
+
+    & > div {
+      font-size: 36px;
+      color: #333333;
+    }
+
+    & > div:first-child {
+      width: 270px;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > div:last-child {
+      width: calc(100% - 270px);
+      height: 100%;
+      color: #FFFFFF;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #1365DD;
+    }
+  }
+}
 </style>
diff --git a/src/pages/meetingNotice/components/belongToMe.vue b/src/pages/meetingNotice/components/belongToMe.vue
index 4c52b5e2..2ab2257d 100644
--- a/src/pages/meetingNotice/components/belongToMe.vue
+++ b/src/pages/meetingNotice/components/belongToMe.vue
@@ -6,26 +6,26 @@
     <div class="body">
       <template v-if="list.length">
         <div class="card" v-for="(item,index) in list" :key="index" @click="handleClick(item)">
-          <header>{{item.title}}</header>
+          <header>{{ item.title }}</header>
           <u-row justify="between">
             <div class="time">
-              <span>{{item.startTime|formatTime}}</span>
-              <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+              <span>{{ item.startTime|formatTime }}</span>
+              <span>{{ item.startTime|formatDate(0) }}年{{ item.startTime|formatDate(1) }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
             </div>
             <div class="arrow"></div>
             <div class="time">
-              <span>{{item.endTime|formatTime}}</span>
-              <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+              <span>{{ item.endTime|formatTime }}</span>
+              <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{ item.endTime|formatWeek }}</span>
             </div>
           </u-row>
           <u-row class="info">
             <span>发起单位：</span>
-            <span>{{item.unitName}}</span>
+            <span>{{ item.unitName }}</span>
           </u-row>
           <u-gap height="20"></u-gap>
           <u-row class="info">
             <span>会议地点：</span>
-            <span>{{item.address}}</span>
+            <span>{{ item.address }}</span>
           </u-row>
           <div class="tag" :style="{background:'url(' + tag(item.status) + ')'}"></div>
         </div>
@@ -39,193 +39,193 @@
 </template>
 
 <script>
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty";
+import AiTopFixed from "../../../components/AiTopFixed";
+import AiBack from "../../../components/AiBack";
+import AiEmpty from "../../../components/AiEmpty";
 
-  export default {
-    name: "belongToMe",
-    components: {AiTopFixed, AiBack, AiEmpty},
-    data() {
-      return {
-        index: 0,
-        current: 1,
-        list: [],
-        status: "加载更多",
-      }
-    },
-    onLoad() {
-      this.getList()
-    },
-    computed: {
-      tabs() {
-        return [
-          {name: "全部"},
-          {name: "未开始"},
-          {name: "进行中"},
-          {name: "已取消"},
-          {name: "已结束"},
-        ]
-      }
-    },
-    methods: {
-      tag(status) {
-        return {
-          "1": this.$cdn + 'common/1wks.png',
-          "2": this.$cdn + 'common/1jxz.png',
-          "3": this.$cdn + 'common/1yqx.png',
-          "4": this.$cdn + 'common/1yjs.png'
-        }[status]
-      },
-      getList() {
-        this.$http.post("/app/appmeetinginfo/list", null, {
-          params: {
-            listType: 0,
-            meetingStatus: this.index == 0 ? "-1" : this.index,
-            size: 10,
-            current: this.current
-          }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          }
-        })
-      },
-      handleClick({id}) {
-        uni.navigateTo({
-          url: "/pages/meetingNotice/components/detail?id=" + id
-        })
-      },
-      change(e) {
-        this.index = e
-        this.current = 1
-        this.getList()
-      },
-    },
-
-    onReachBottom() {
-      this.current = this.current + 1;
-      this.getList()
-    },
-
-    filters: {
-      formatTime(date) {
-        return date.split(" ")[1]?.substr(0, 5)
-      },
-      formatDate(date, i) {
-        return date.split(" ")[0]?.split("-")[i]
-      },
-      formatWeek(date) {
-        return "日一二三四五六".charAt(new Date(date.split(" ")[0]).getDay())
-      },
+export default {
+  name: "belongToMe",
+  components: {AiTopFixed, AiBack, AiEmpty},
+  data() {
+    return {
+      index: 0,
+      current: 1,
+      list: [],
+      status: "加载更多",
     }
+  },
+  onLoad() {
+    this.getList()
+  },
+  computed: {
+    tabs() {
+      return [
+        {name: "全部"},
+        {name: "未开始"},
+        {name: "进行中"},
+        {name: "已取消"},
+        {name: "已结束"},
+      ]
+    }
+  },
+  methods: {
+    tag(status) {
+      return {
+        "1": this.$cdn + 'common/1wks.png',
+        "2": this.$cdn + 'common/1jxz.png',
+        "3": this.$cdn + 'common/1yqx.png',
+        "4": this.$cdn + 'common/1yjs.png'
+      }[status]
+    },
+    getList() {
+      this.$http.post("/app/appmeetinginfo/list", null, {
+        params: {
+          listType: 0,
+          meetingStatus: this.index == 0 ? "-1" : this.index,
+          size: 10,
+          current: this.current
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+    handleClick({id}) {
+      uni.navigateTo({
+        url: "/pages/meetingNotice/components/detail?id=" + id
+      })
+    },
+    change(e) {
+      this.index = e
+      this.current = 1
+      this.getList()
+    },
+  },
+
+  onReachBottom() {
+    this.current = this.current + 1;
+    this.getList()
+  },
+
+  filters: {
+    formatTime(date) {
+      return date.split(" ")[1]?.substr(0, 5)
+    },
+    formatDate(date, i) {
+      return date.split(" ")[0]?.split("-")[i]
+    },
+    formatWeek(date) {
+      return "日一二三四五六".charAt(new Date(date.split(" ")[0]).getDay())
+    },
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .belong-to-me {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.belong-to-me {
+  min-height: 100%;
+  background-color: #F5F5F5;
 
-    ::v-deep .content {
-      padding: 0 !important;
-    }
+  ::v-deep .content {
+    padding: 0 !important;
+  }
 
-    .body {
+  .body {
+    box-sizing: border-box;
+    padding: 40px 32px;
+
+    .card {
+      background-color: #FFFFFF;
       box-sizing: border-box;
-      padding: 40px 32px;
+      padding: 32px;
+      border-radius: 8px;
+      margin-bottom: 32px;
+      position: relative;
 
-      .card {
-        background-color: #FFFFFF;
-        box-sizing: border-box;
-        padding: 32px;
-        border-radius: 8px;
-        margin-bottom: 32px;
-        position: relative;
+      &:last-child {
+        margin-bottom: 0;
+      }
 
-        &:last-child {
-          margin-bottom: 0;
-        }
+      & > header {
+        font-size: 32px;
+        font-weight: 600;
+        color: #333333;
+      }
 
-        & > header {
-          font-size: 32px;
+      .time {
+        display: flex;
+        flex-direction: column;
+        margin: 46px 0;
+
+        & > span:first-child {
+          font-size: 60px;
           font-weight: 600;
           color: #333333;
+          line-height: 84px;
         }
 
-        .time {
-          display: flex;
-          flex-direction: column;
-          margin: 46px 0;
-
-          & > span:first-child {
-            font-size: 60px;
-            font-weight: 600;
-            color: #333333;
-            line-height: 84px;
-          }
-
-          & > span:last-child {
-            font-size: 22px;
-            color: #333333;
-          }
+        & > span:last-child {
+          font-size: 22px;
+          color: #333333;
         }
+      }
 
-        .arrow {
-          width: 28px;
-          height: 68px;
-          overflow: hidden;
-          position: relative;
-          transform: rotate(180deg);
+      .arrow {
+        width: 28px;
+        height: 68px;
+        overflow: hidden;
+        position: relative;
+        transform: rotate(180deg);
 
-          &:before, &:after {
-            content: "";
-            width: 50px;
-            height: 50px;
-            position: absolute;
-            transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-          }
-
-          &:before {
-            top: 59px;
-            background-color: #CCCCCC;
-          }
-
-          &:after {
-            left: 7px;
-            top: 59px;
-            background-color: #FFFFFF;
-          }
-        }
-
-        .info {
-          flex-wrap: nowrap;
-
-          & > span:first-child {
-            font-size: 30px;
-            color: #999999;
-            flex-shrink: 0;
-          }
-
-          & > span:last-child {
-            font-size: 30px;
-            color: #343D65;
-          }
-        }
-
-        .tag {
-          width: 112px;
-          height: 112px;
-          background-repeat: no-repeat;
-          background-size: 100% 100% !important;
+        &:before, &:after {
+          content: "";
+          width: 50px;
+          height: 50px;
           position: absolute;
-          top: 0;
-          right: 0;
+          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
         }
+
+        &:before {
+          top: 59px;
+          background-color: #CCCCCC;
+        }
+
+        &:after {
+          left: 7px;
+          top: 59px;
+          background-color: #FFFFFF;
+        }
+      }
+
+      .info {
+        flex-wrap: nowrap;
+
+        & > span:first-child {
+          font-size: 30px;
+          color: #999999;
+          flex-shrink: 0;
+        }
+
+        & > span:last-child {
+          font-size: 30px;
+          color: #343D65;
+        }
+      }
+
+      .tag {
+        width: 112px;
+        height: 112px;
+        background-repeat: no-repeat;
+        background-size: 100% 100% !important;
+        position: absolute;
+        top: 0;
+        right: 0;
       }
     }
   }
+}
 </style>
diff --git a/src/pages/meetingNotice/components/detail.vue b/src/pages/meetingNotice/components/detail.vue
index d044bae9..70425e6d 100644
--- a/src/pages/meetingNotice/components/detail.vue
+++ b/src/pages/meetingNotice/components/detail.vue
@@ -17,7 +17,9 @@
         <u-gap height="8"></u-gap>
         <u-row>
           <img :src="$cdn + 'common/date.png'" alt="">
-          <span>{{ detail.startTime && detail.startTime.substr(0, 16) }} 至 {{ detail.endTime && detail.endTime.substr(0, 16) }}</span>
+          <span>{{
+              detail.startTime && detail.startTime.substr(0, 16)
+            }} 至 {{ detail.endTime && detail.endTime.substr(0, 16) }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
diff --git a/src/pages/meetingNotice/components/meetingList.vue b/src/pages/meetingNotice/components/meetingList.vue
index a1ed7543..2cd36f70 100644
--- a/src/pages/meetingNotice/components/meetingList.vue
+++ b/src/pages/meetingNotice/components/meetingList.vue
@@ -2,32 +2,32 @@
   <div class="meeting-list">
     <div class="card" v-for="(item,index) in list" :key="index" @click="detail(item)">
       <header>
-        <span>{{item.title}}</span>
+        <span>{{ item.title }}</span>
         <span>
           <span v-if="index==2">保存于</span>
-          {{item.createTime}}</span>
+          {{ item.createTime }}</span>
       </header>
       <u-row justify="between">
         <div class="time">
-          <span>{{item.startTime|format}}</span>
-          <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+          <span>{{ item.startTime|format }}</span>
+          <span>{{ item.startTime|formatDate(0) }}年{{ item.startTime|formatDate(1) }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
         </div>
         <div class="arrow"></div>
         <div class="time">
-          <span>{{item.endTime|format}}</span>
-          <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+          <span>{{ item.endTime|format }}</span>
+          <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{ item.endTime|formatWeek }}</span>
         </div>
       </u-row>
       <u-row class="info">
         <span>发起人员：</span>
-        <span>{{item.userName}}</span>
+        <span>{{ item.userName }}</span>
       </u-row>
       <u-gap height="20"></u-gap>
       <u-row class="info">
         <span>会议地点：</span>
-        <span>{{item.address}}</span>
+        <span>{{ item.address }}</span>
       </u-row>
-        <div class="tag" v-if="item.status!=0" :style="{background:'url(' + $cdn + tag(item.status) +')'}"></div>
+      <div class="tag" v-if="item.status!=0" :style="{background:'url(' + $cdn + tag(item.status) +')'}"></div>
     </div>
     <u-loadmore :status="status" v-if="list.length"/>
     <AiEmpty v-if="!list.length"></AiEmpty>
@@ -36,190 +36,191 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty";
+import AiBack from "../../../components/AiBack";
+import AiEmpty from "../../../components/AiEmpty";
 
-  export default {
-    name: "meetingList",
-    components: {AiBack, AiEmpty},
-    data() {
+export default {
+  name: "meetingList",
+  components: {AiBack, AiEmpty},
+  data() {
+    return {
+      index: null,
+      list: [],
+      current: 1,
+      status: "加载更多",
+    }
+  },
+
+  onLoad(opt) {
+    this.index = opt.index
+    uni.setNavigationBarTitle({
+      title: opt.index == 0 ? "历史会议" : "草稿箱"
+    });
+  },
+
+  methods: {
+    detail({id}) {
+      let url
+      if (this.index == 2) {
+        url = "/pages/meetingNotice/components/addMeeting?id=" + id
+      } else {
+        url = "/pages/meetingNotice/components/detail?id=" + id
+      }
+      uni.navigateTo({url})
+    },
+    tag(status) {
       return {
-        index: null,
-        list: [],
-        current: 1,
-        status: "加载更多",
-      }
+        "1": 'common/1wks.png',
+        "2": 'common/1jxz.png',
+        "3": 'common/1yqx.png',
+        "4": 'common/1yjs.png'
+      }[status]
     },
-
-    onLoad(opt) {
-      this.index = opt.index
-      uni.setNavigationBarTitle({
-        title: opt.index == 0 ? "历史会议" : "草稿箱"
-      });
-    },
-
-    methods: {
-      detail({id}) {
-        let url
-        if (this.index == 2) {
-          url = "/pages/meetingNotice/components/addMeeting?id=" + id
-        } else {
-          url = "/pages/meetingNotice/components/detail?id=" + id
+    getData() {
+      this.$http.post("/app/appmeetinginfo/list", null, {
+        params: {
+          listType: this.index == 0 ? "2" : '0',
+          meetingStatus: this.index == 0 ? "4" : "0",
+          size: 10,
+          current: this.current,
         }
-        uni.navigateTo({url})
-      },
-      tag(status) {
-        return {
-          "1": 'common/1wks.png',
-          "2": 'common/1jxz.png',
-          "3": 'common/1yqx.png',
-          "4": 'common/1yjs.png'
-        }[status]
-      },
-      getData() {
-        this.$http.post("/app/appmeetinginfo/list", null, {
-          params: {
-            listType: this.index == 0 ? "2" : '0',
-            meetingStatus: this.index == 0 ? "4" : "0",
-            size: 10,
-            current: this.current,
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
           }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          }
-        })
-      },
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
     },
+  },
 
-    filters: {
-      format(date) {
-        return date.split(" ")[1].substr(0, 5)
-      },
-      formatDate(date, index) {
-        return date.split(" ")[0].split("-")[index]
-      },
-      formatWeek(date) {
-        return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
-      }
+  filters: {
+    format(date) {
+      return date.split(" ")[1].substr(0, 5)
     },
+    formatDate(date, index) {
+      return date.split(" ")[0].split("-")[index]
+    },
+    formatWeek(date) {
+      return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
+    }
+  },
 
-    onShow(){
-      this.getData()
-    },
+  onShow() {
+    this.getData()
+  },
 
-    onReachBottom() {
-      this.current = this.current + 1;
-      this.getData()
-    },
-  }
+  onReachBottom() {
+    this.current = this.current + 1;
+    this.getData()
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .meeting-list {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.meeting-list {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  box-sizing: border-box;
+  padding: 32px;
+
+  .card {
+    background-color: #FFFFFF;
     box-sizing: border-box;
     padding: 32px;
+    border-radius: 8px;
+    margin-bottom: 32px;
+    position: relative;
 
-    .card {
-      background-color: #FFFFFF;
-      box-sizing: border-box;
-      padding: 32px;
-      border-radius: 8px;
-      margin-bottom: 32px;
-      position: relative;
+    &:last-child {
+      margin-bottom: 0;
+    }
 
-      &:last-child {
-        margin-bottom: 0;
-      }
+    & > header {
+      font-size: 32px;
+      font-weight: 600;
+      color: #333333;
+      display: flex;
+      flex-direction: column;
 
-      & > header {
-        font-size: 32px;
-        font-weight: 600;
-        color: #333333;
-        display: flex;
-        flex-direction: column;
-
-        & > span:last-child {
-          font-size: 28px;
-          font-weight: 400;
-          color: #999999;
-          margin-top: 10px;
-        }
-      }
-
-      .time {
-        display: flex;
-        flex-direction: column;
-        margin: 46px 0;
-
-        & > span:first-child {
-          font-size: 60px;
-          font-weight: 600;
-          color: #333333;
-          line-height: 84px;
-        }
-
-        & > span:last-child {
-          font-size: 22px;
-          color: #333333;
-        }
-      }
-
-      .arrow {
-        width: 28px;
-        height: 68px;
-        overflow: hidden;
-        position: relative;
-        transform: rotate(180deg);
-
-        &:before, &:after {
-          content: "";
-          width: 50px;
-          height: 50px;
-          position: absolute;
-          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-        }
-
-        &:before {
-          top: 59px;
-          background-color: #CCCCCC;
-        }
-
-        &:after {
-          left: 7px;
-          top: 59px;
-          background-color: #FFFFFF;
-        }
-      }
-
-      .info {
-        flex-wrap: nowrap;
-        & > span:first-child {
-          flex-shrink: 0;
-          font-size: 30px;
-          color: #999999;
-        }
-
-        & > span:last-child {
-          font-size: 30px;
-          color: #343D65;
-        }
-      }
-
-      .tag {
-        width: 112px;
-        height: 112px;
-        background-repeat: no-repeat !important;
-        background-size: 100% 100% !important;
-        position: absolute;
-        top: 0;
-        right: 0;
+      & > span:last-child {
+        font-size: 28px;
+        font-weight: 400;
+        color: #999999;
+        margin-top: 10px;
       }
     }
+
+    .time {
+      display: flex;
+      flex-direction: column;
+      margin: 46px 0;
+
+      & > span:first-child {
+        font-size: 60px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 84px;
+      }
+
+      & > span:last-child {
+        font-size: 22px;
+        color: #333333;
+      }
+    }
+
+    .arrow {
+      width: 28px;
+      height: 68px;
+      overflow: hidden;
+      position: relative;
+      transform: rotate(180deg);
+
+      &:before, &:after {
+        content: "";
+        width: 50px;
+        height: 50px;
+        position: absolute;
+        transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
+      }
+
+      &:before {
+        top: 59px;
+        background-color: #CCCCCC;
+      }
+
+      &:after {
+        left: 7px;
+        top: 59px;
+        background-color: #FFFFFF;
+      }
+    }
+
+    .info {
+      flex-wrap: nowrap;
+
+      & > span:first-child {
+        flex-shrink: 0;
+        font-size: 30px;
+        color: #999999;
+      }
+
+      & > span:last-child {
+        font-size: 30px;
+        color: #343D65;
+      }
+    }
+
+    .tag {
+      width: 112px;
+      height: 112px;
+      background-repeat: no-repeat !important;
+      background-size: 100% 100% !important;
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
   }
+}
 </style>
diff --git a/src/pages/meetingNotice/meetingNotice.vue b/src/pages/meetingNotice/meetingNotice.vue
index 2ad795f3..1a2a12f3 100644
--- a/src/pages/meetingNotice/meetingNotice.vue
+++ b/src/pages/meetingNotice/meetingNotice.vue
@@ -2,9 +2,10 @@
   <div class="meeting">
     <ai-top-fixed>
       <u-grid :col="3" :border="false">
-        <u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}" @click="handleClick(index)">
+        <u-grid-item v-for="(item,index) in grid" :key="index" :custom-style="{padding:'14px 0'}"
+                     @click="handleClick(index)">
           <u-icon :name="item.icon" :size="64"></u-icon>
-          <view class="label">{{item.label}}</view>
+          <view class="label">{{ item.label }}</view>
         </u-grid-item>
       </u-grid>
     </ai-top-fixed>
@@ -12,26 +13,26 @@
       <header>待参加的会议</header>
       <template v-if="meetingList.length">
         <div class="card" v-for="(item,index) in meetingList" :key="index" @click="detail(item)">
-          <header>{{item.title}}</header>
+          <header>{{ item.title }}</header>
           <u-row justify="between">
             <div class="time">
-              <span>{{item.startTime|format}}</span>
-              <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+              <span>{{ item.startTime|format }}</span>
+              <span>{{ item.startTime|formatDate(0) }}年{{ item.startTime|formatDate(1) }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
             </div>
             <div class="arrow"></div>
             <div class="time">
-              <span>{{item.endTime|format}}</span>
-              <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+              <span>{{ item.endTime|format }}</span>
+              <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{ item.endTime|formatWeek }}</span>
             </div>
           </u-row>
           <u-row class="info">
             <span>发起人员：</span>
-            <span>{{item.userName}}</span>
+            <span>{{ item.userName }}</span>
           </u-row>
           <u-gap height="20"></u-gap>
           <u-row class="info">
             <span>会议地点：</span>
-            <span>{{item.address}}</span>
+            <span>{{ item.address }}</span>
           </u-row>
           <div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div>
         </div>
@@ -46,209 +47,210 @@
 </template>
 
 <script>
-  import AiEmpty from "../../components/AiEmpty";
-  import AiTopFixed from "../../components/AiTopFixed";
-  import AiAdd from "../../components/AiAdd";
+import AiEmpty from "../../components/AiEmpty";
+import AiTopFixed from "../../components/AiTopFixed";
+import AiAdd from "../../components/AiAdd";
 
-  export default {
-    name: "meetingNotice",
-    components: {AiEmpty, AiTopFixed, AiAdd},
-    data() {
-      return {
-        meetingList:[]
-      }
-    },
-    computed: {
-      grid() {
-        return [
-          {
-            icon: this.$cdn + "/common/iconlshy.png",
-            label: "历史会议"
-          },
-          {
-            icon: this.$cdn + "/common/iconwfqd.png",
-            label: "我发起的"
-          },
-          {
-            icon: this.$cdn + "/common/iconcgx.png",
-            label: "草稿箱"
-          }
-        ]
-      }
-    },
-    methods: {
-      tag(status){
-        return {
-          "0":"common/1wqr.png",
-          "1":"common/1yqr.png",
-          "2":"common/1yqj.png",
-        }[status]
-      },
-      detail({id}){
-        uni.navigateTo({
-          url:"/pages/meetingNotice/components/detail?id=" + id
-        })
-      },
-      getData() {
-        this.$http.post("/app/appmeetinginfo/list", null, {
-          params: {
-            listType: "1",
-            meetingStatus: "1|2",
-            size: 999
-          }
-        }).then(res=>{
-          if(res && res.data){
-            this.meetingList = res.data.records
-          }
-        })
-      },
-      handleClick(index){
-        let url
-        if(index==0 || index==2){
-          url="/pages/meetingNotice/components/meetingList?index=" + index
-        }else if(index==1){
-          url="/pages/meetingNotice/components/belongToMe"
-        }
-        uni.navigateTo({url})
-      },
-      add() {
-        uni.navigateTo({
-          url:"/pages/meetingNotice/components/addMeeting"
-        })
-      }
-    },
-
-    filters:{
-      format(date){
-        return date.split(" ")[1].substr(0,5)
-      },
-      formatDate(date,index){
-        return date.split(" ")[0].split("-")[index]
-      },
-      formatWeek(date){
-        return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
-      }
-    },
-
-    onShow(){
-     this.getData()
+export default {
+  name: "meetingNotice",
+  components: {AiEmpty, AiTopFixed, AiAdd},
+  data() {
+    return {
+      meetingList: []
     }
+  },
+  computed: {
+    grid() {
+      return [
+        {
+          icon: this.$cdn + "/common/iconlshy.png",
+          label: "历史会议"
+        },
+        {
+          icon: this.$cdn + "/common/iconwfqd.png",
+          label: "我发起的"
+        },
+        {
+          icon: this.$cdn + "/common/iconcgx.png",
+          label: "草稿箱"
+        }
+      ]
+    }
+  },
+  methods: {
+    tag(status) {
+      return {
+        "0": "common/1wqr.png",
+        "1": "common/1yqr.png",
+        "2": "common/1yqj.png",
+      }[status]
+    },
+    detail({id}) {
+      uni.navigateTo({
+        url: "/pages/meetingNotice/components/detail?id=" + id
+      })
+    },
+    getData() {
+      this.$http.post("/app/appmeetinginfo/list", null, {
+        params: {
+          listType: "1",
+          meetingStatus: "1|2",
+          size: 999
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.meetingList = res.data.records
+        }
+      })
+    },
+    handleClick(index) {
+      let url
+      if (index == 0 || index == 2) {
+        url = "/pages/meetingNotice/components/meetingList?index=" + index
+      } else if (index == 1) {
+        url = "/pages/meetingNotice/components/belongToMe"
+      }
+      uni.navigateTo({url})
+    },
+    add() {
+      uni.navigateTo({
+        url: "/pages/meetingNotice/components/addMeeting"
+      })
+    }
+  },
+
+  filters: {
+    format(date) {
+      return date.split(" ")[1].substr(0, 5)
+    },
+    formatDate(date, index) {
+      return date.split(" ")[0].split("-")[index]
+    },
+    formatWeek(date) {
+      return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
+    }
+  },
+
+  onShow() {
+    this.getData()
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .meeting {
-    min-height: 100%;
-    background: #F5F5F5;
-    padding-bottom: 48px;
+.meeting {
+  min-height: 100%;
+  background: #F5F5F5;
+  padding-bottom: 48px;
 
-    .label {
-      font-size: 28px;
-      font-weight: 400;
+  .label {
+    font-size: 28px;
+    font-weight: 400;
+    color: #333333;
+    line-height: 48px;
+    margin-top: 8px;
+  }
+
+  .body {
+    box-sizing: border-box;
+    padding: 40px 32px;
+
+    & > header {
+      font-size: 36px;
+      font-weight: 600;
       color: #333333;
-      line-height: 48px;
-      margin-top: 8px;
+      margin-bottom: 38px;
     }
 
-    .body {
+    .card {
+      background-color: #FFFFFF;
       box-sizing: border-box;
-      padding: 40px 32px;
+      padding: 32px;
+      border-radius: 8px;
+      margin-bottom: 32px;
+      position: relative;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
 
       & > header {
-        font-size: 36px;
+        font-size: 32px;
         font-weight: 600;
         color: #333333;
-        margin-bottom: 38px;
       }
 
-      .card {
-        background-color: #FFFFFF;
-        box-sizing: border-box;
-        padding: 32px;
-        border-radius: 8px;
-        margin-bottom: 32px;
-        position: relative;
+      .time {
+        display: flex;
+        flex-direction: column;
+        margin: 46px 0;
 
-        &:last-child {
-          margin-bottom: 0;
-        }
-
-        & > header {
-          font-size: 32px;
+        & > span:first-child {
+          font-size: 60px;
           font-weight: 600;
           color: #333333;
+          line-height: 84px;
         }
 
-        .time {
-          display: flex;
-          flex-direction: column;
-          margin: 46px 0;
-
-          & > span:first-child {
-            font-size: 60px;
-            font-weight: 600;
-            color: #333333;
-            line-height: 84px;
-          }
-
-          & > span:last-child {
-            font-size: 22px;
-            color: #333333;
-          }
-        }
-
-        .arrow {
-          width: 28px;
-          height: 68px;
-          overflow: hidden;
-          position: relative;
-          transform: rotate(180deg);
-
-          &:before, &:after {
-            content: "";
-            width: 50px;
-            height: 50px;
-            position: absolute;
-            transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-          }
-          &:before {
-            top: 59px;
-            background-color: #CCCCCC;
-          }
-
-          &:after {
-            left: 7px;
-            top: 59px;
-            background-color: #FFFFFF;
-          }
-        }
-
-        .info {
-          & > span:first-child {
-            font-size: 30px;
-            color: #999999;
-          }
-
-          & > span:last-child {
-            font-size: 30px;
-            color: #343D65;
-          }
-        }
-
-        .tag{
-          width: 112px;
-          height: 112px;
-          background-repeat: no-repeat !important;
-          background-size: 100% 100% !important;
-          position: absolute;
-          top: 0;
-          right: 0;
+        & > span:last-child {
+          font-size: 22px;
+          color: #333333;
         }
       }
-    }
 
-    ::v-deep .content{
-      padding: 0 !important;
+      .arrow {
+        width: 28px;
+        height: 68px;
+        overflow: hidden;
+        position: relative;
+        transform: rotate(180deg);
+
+        &:before, &:after {
+          content: "";
+          width: 50px;
+          height: 50px;
+          position: absolute;
+          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
+        }
+
+        &:before {
+          top: 59px;
+          background-color: #CCCCCC;
+        }
+
+        &:after {
+          left: 7px;
+          top: 59px;
+          background-color: #FFFFFF;
+        }
+      }
+
+      .info {
+        & > span:first-child {
+          font-size: 30px;
+          color: #999999;
+        }
+
+        & > span:last-child {
+          font-size: 30px;
+          color: #343D65;
+        }
+      }
+
+      .tag {
+        width: 112px;
+        height: 112px;
+        background-repeat: no-repeat !important;
+        background-size: 100% 100% !important;
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
     }
   }
+
+  ::v-deep .content {
+    padding: 0 !important;
+  }
+}
 </style>
diff --git a/src/pages/notification/components/add.vue b/src/pages/notification/components/add.vue
index 943b1c61..ac5693e3 100644
--- a/src/pages/notification/components/add.vue
+++ b/src/pages/notification/components/add.vue
@@ -12,7 +12,8 @@
       </div>
 
       <div class="card">
-        <AiUploader :multiple="true" type="image" :limit="9" placeholder="上传图片" @list="fileList" :def="form.files"></AiUploader>
+        <AiUploader :multiple="true" type="image" :limit="9" placeholder="上传图片" @list="fileList"
+                    :def="form.files"></AiUploader>
       </div>
 
       <div class="card item-wrap" @click="select">
@@ -23,7 +24,7 @@
               <span>请选择</span>
             </template>
             <template v-else>
-              已选择<em>{{form.persons.map(e=>e.name).slice(0,2).join("、")}}</em>等<em>{{form.persons.length}}</em>人
+              已选择<em>{{ form.persons.map(e => e.name).slice(0, 2).join("、") }}</em>等<em>{{ form.persons.length }}</em>人
             </template>
             <div class="right-arrow"></div>
           </div>
@@ -36,7 +37,7 @@
           <div class="type" :class="[index==0 && 'active']" @click="index=0,form.releaseTime=null">立即发送
             <img :src="$cdn + 'notice/jiaobiao.png'" alt="" v-show="index==0">
           </div>
-          <div class="type" :class="[index==1 && 'active']"  @click="index=1">定时发送
+          <div class="type" :class="[index==1 && 'active']" @click="index=1">定时发送
             <img :src="$cdn + 'notice/jiaobiao.png'" alt="" v-show="index==1">
           </div>
         </u-row>
@@ -48,7 +49,7 @@
               <span>请选择</span>
             </template>
             <template v-else>
-              <span>{{form.releaseTime}}</span>
+              <span>{{ form.releaseTime }}</span>
             </template>
             <div class="right-arrow"></div>
           </div>
@@ -62,297 +63,299 @@
     </div>
     <AiBack ref="aiBack" v-if="!userSelect"/>
     <u-picker v-model="show" mode="time" :params="params" @confirm="confirm"></u-picker>
-    <AiSelectEnterprise :visible.sync="userSelect" :value="form.persons" v-if="userSelect" @change="change"></AiSelectEnterprise>
+    <AiSelectEnterprise :visible.sync="userSelect" :value="form.persons" v-if="userSelect"
+                        @change="change"></AiSelectEnterprise>
   </div>
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
-  import AiUploader from "../../../components/AiUploader";
+import AiBack from "../../../components/AiBack";
+import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
+import AiUploader from "../../../components/AiUploader";
 
-  export default {
-    name: "add",
-    components: {AiBack,AiSelectEnterprise,AiUploader},
-    data() {
-      return {
-        show: false,
-        index: 0,
-        list: [],
-        form: {
-          id: null,
-          title: "",
-          content: "",
-          persons: [],
-          releaseTime:null,
-          files: [],
-        },
-        userSelect: false,
-        params: {
-          year: true,
-          month: true,
-          day: true,
-          hour: true,
-          minute: true,
-          second: true,
-          timestamp: true,
-        },
-        flag: null,
-      }
-    },
-    onLoad(opt) {
-      if(opt.id) {
-        this.form.id = opt.id;
-        this.flag = opt.flag;
-        this.getDetail();
-      }
-    },
-    methods: {
-      confirm(e){
-        if(e.timestamp< (Date.now()/1000)|0){
-          return this.$u.toast("发送时间不能小于当前时间");
-        }
-        this.form.releaseTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+export default {
+  name: "add",
+  components: {AiBack, AiSelectEnterprise, AiUploader},
+  data() {
+    return {
+      show: false,
+      index: 0,
+      list: [],
+      form: {
+        id: null,
+        title: "",
+        content: "",
+        persons: [],
+        releaseTime: null,
+        files: [],
       },
-      fileList(e){
-        this.form.files = e
-      },
-      change(e){
-        this.form.persons = e
-      },
-      getDetail(){
-        this.$http.post("/app/appannouncement/detail",null,{
-          params:{
-            id:this.form.id,
-            detail: this.flag
-          }
-        }).then(res=>{
-          if (res && res.data) {
-            this.form.releaseTime = res.data.releaseTime;
-            Object.keys(this.form).map(e=>{
-              this.form[e] =  res.data[e];
-            })
-            this.index = res.data.releaseTime ? 1 : 0;
-          }
-        })
-      },
-
-      add(status) {
-        if(status==1){
-          if (!this.form.title) return this.$u.toast("请输入会议标题")
-
-          if (!this.form.content) return this.$u.toast("请输入会议内容")
-
-          if(!this.form.persons.length) return this.$u.toast("请选择发送对象")
-
-          if(this.index==1 && !this.form.releaseTime) return this.$u.toast("请选择定时发送时间")
-
-          if(this.form.releaseTime && new Date(this.form.releaseTime).getTime() < Date.now()) return this.$u.toast("发送时间不能小于当前时间");
-        }
-
-        this.$http.post("/app/appannouncement/addOrUpdate", {
-          ...this.form,
-          status,
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast(status == 1 ? "发布成功" : "保存成功")
-            this.$refs["aiBack"].back()
-          }
-        })
-      },
-      select() {
-        uni.navigateTo({
-          url: "/pages/meetingNotice/components/notice"
-        })
-      }
-    },
-    computed:{
-      background(){
-        return `url(${this.$cdn}/notice/jiaobiao.png) no-repeat; background-size: 46px 48px;position: absolute;bottom: 0;right: 0;`
+      userSelect: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+        timestamp: true,
       },
+      flag: null,
     }
+  },
+  onLoad(opt) {
+    if (opt.id) {
+      this.form.id = opt.id;
+      this.flag = opt.flag;
+      this.getDetail();
+    }
+  },
+  methods: {
+    confirm(e) {
+      if (e.timestamp < (Date.now() / 1000) | 0) {
+        return this.$u.toast("发送时间不能小于当前时间");
+      }
+      this.form.releaseTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+    },
+    fileList(e) {
+      this.form.files = e
+    },
+    change(e) {
+      this.form.persons = e
+    },
+    getDetail() {
+      this.$http.post("/app/appannouncement/detail", null, {
+        params: {
+          id: this.form.id,
+          detail: this.flag
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.form.releaseTime = res.data.releaseTime;
+          Object.keys(this.form).map(e => {
+            this.form[e] = res.data[e];
+          })
+          this.index = res.data.releaseTime ? 1 : 0;
+        }
+      })
+    },
+
+    add(status) {
+      if (status == 1) {
+        if (!this.form.title) return this.$u.toast("请输入会议标题")
+
+        if (!this.form.content) return this.$u.toast("请输入会议内容")
+
+        if (!this.form.persons.length) return this.$u.toast("请选择发送对象")
+
+        if (this.index == 1 && !this.form.releaseTime) return this.$u.toast("请选择定时发送时间")
+
+        if (this.form.releaseTime && new Date(this.form.releaseTime).getTime() < Date.now()) return this.$u.toast("发送时间不能小于当前时间");
+      }
+
+      this.$http.post("/app/appannouncement/addOrUpdate", {
+        ...this.form,
+        status,
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast(status == 1 ? "发布成功" : "保存成功")
+          this.$refs["aiBack"].back()
+        }
+      })
+    },
+    select() {
+      uni.navigateTo({
+        url: "/pages/meetingNotice/components/notice"
+      })
+    }
+  },
+  computed: {
+    background() {
+      return `url(${this.$cdn}/notice/jiaobiao.png) no-repeat; background-size: 46px 48px;position: absolute;bottom: 0;right: 0;`
+    },
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .add-meeting {
-    min-height: 100%;
-    background: #F5F5F5;
-    padding-bottom: 140px;
+.add-meeting {
+  min-height: 100%;
+  background: #F5F5F5;
+  padding-bottom: 140px;
 
-    .card {
-      background-color: #FFFFFF;
-      box-sizing: border-box;
-      padding: 32px;
-      margin-top: 16px;
+  .card {
+    background-color: #FFFFFF;
+    box-sizing: border-box;
+    padding: 32px;
+    margin-top: 16px;
 
-      header {
+    header {
+      font-size: 32px;
+      font-weight: 400;
+      color: #333333;
+
+      em {
+        font-style: normal;
         font-size: 32px;
-        font-weight: 400;
+        color: #FF4466;
+        margin-right: 8px;
+        vertical-align: middle;
+      }
+    }
+
+    input {
+      margin: 32px 0 16px;
+      box-sizing: border-box;
+      padding: 0 16px;
+    }
+
+    textarea {
+      width: 100%;
+      height: 160px;
+      margin: 32px 0 16px;
+      box-sizing: border-box;
+      padding: 0 16px;
+    }
+
+    .u-row {
+      margin-top: 34px;
+
+      .time {
+        display: flex;
+        flex-direction: column;
+
+        & > span:first-child {
+          font-size: 60px;
+          font-weight: 600;
+          color: #333333;
+          line-height: 84px;
+        }
+
+        & > span:last-child {
+          font-size: 22px;
+          color: #333333;
+        }
+      }
+
+      .arrow {
+        width: 28px;
+        height: 68px;
+        overflow: hidden;
+        position: relative;
+        transform: rotate(180deg);
+
+        &:before, &:after {
+          content: "";
+          width: 50px;
+          height: 50px;
+          position: absolute;
+          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
+        }
+
+        &:before {
+          top: 59px;
+          background-color: #CCCCCC;
+        }
+
+        &:after {
+          left: 7px;
+          top: 59px;
+          background-color: #FFFFFF;
+        }
+      }
+
+      .type {
+        width: 320px;
+        height: 112px;
+        background: #F5F5F5;
         color: #333333;
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 30px;
+        font-weight: 500;
+        letter-spacing: 1px;
+        position: relative;
+
+        & > img {
+          width: 46px;
+          height: 48px;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+        }
+      }
+
+      .active {
+        background-color: #E7F1FE;
+        color: #1174FE;
+      }
+    }
+
+    .item {
+      height: 112px;
+      box-shadow: 0px -1px 0px 0px #D8DDE6;
+      margin-top: 0;
+
+      .right {
+        font-size: 28px;
+        color: #999999;
+        display: flex;
+        align-items: center;
 
         em {
           font-style: normal;
-          font-size: 32px;
-          color: #FF4466;
-          margin-right: 8px;
-          vertical-align: middle;
+          color: #1365DD;
         }
       }
 
-      input {
-        margin: 32px 0 16px;
-        box-sizing: border-box;
-        padding: 0 16px;
-      }
-
-      textarea {
-        width: 100%;
-        height: 160px;
-        margin: 32px 0 16px;
-        box-sizing: border-box;
-        padding: 0 16px;
-      }
-
-      .u-row {
-        margin-top: 34px;
-
-        .time {
-          display: flex;
-          flex-direction: column;
-
-          & > span:first-child {
-            font-size: 60px;
-            font-weight: 600;
-            color: #333333;
-            line-height: 84px;
-          }
-
-          & > span:last-child {
-            font-size: 22px;
-            color: #333333;
-          }
-        }
-
-        .arrow {
-          width: 28px;
-          height: 68px;
-          overflow: hidden;
-          position: relative;
-          transform: rotate(180deg);
-
-          &:before, &:after {
-            content: "";
-            width: 50px;
-            height: 50px;
-            position: absolute;
-            transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-          }
-
-          &:before {
-            top: 59px;
-            background-color: #CCCCCC;
-          }
-
-          &:after {
-            left: 7px;
-            top: 59px;
-            background-color: #FFFFFF;
-          }
-        }
-
-        .type{
-          width: 320px;
-          height: 112px;
-          background: #F5F5F5;
-          color: #333333;
-          border-radius: 4px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 30px;
-          font-weight: 500;
-          letter-spacing: 1px;
-          position: relative;
-
-          & > img{
-            width: 46px;
-            height: 48px;
-            position: absolute;
-            right: 0;
-            bottom: 0;
-          }
-        }
-        .active{
-          background-color: #E7F1FE;
-          color: #1174FE;
-        }
-      }
-
-      .item {
-        height: 112px;
-        box-shadow: 0px -1px 0px 0px #D8DDE6;
-        margin-top: 0;
-
-        .right {
-          font-size: 28px;
-          color: #999999;
-          display: flex;
-          align-items: center;
-
-          em {
-            font-style: normal;
-            color: #1365DD;
-          }
-        }
-
-        .right-arrow {
-          width: 16px;
-          height: 16px;
-          display: inline-block;
-          border-top: 5px solid #CCCCCC;
-          border-right: 5px solid #CCCCCC;
-          transform: rotate(45deg);
-        }
-      }
-    }
-
-    .item-wrap {
-      padding: 0 32px;
-    }
-
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background-color: #FFFFFF;
-      display: flex;
-      align-items: center;
-
-      & > div {
-        font-size: 36px;
-        color: #333333;
-      }
-
-      & > div:first-child {
-        width: 270px;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      & > div:last-child {
-        width: calc(100% - 270px);
-        height: 100%;
-        color: #FFFFFF;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-color: #1365DD;
+      .right-arrow {
+        width: 16px;
+        height: 16px;
+        display: inline-block;
+        border-top: 5px solid #CCCCCC;
+        border-right: 5px solid #CCCCCC;
+        transform: rotate(45deg);
       }
     }
   }
+
+  .item-wrap {
+    padding: 0 32px;
+  }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #FFFFFF;
+    display: flex;
+    align-items: center;
+
+    & > div {
+      font-size: 36px;
+      color: #333333;
+    }
+
+    & > div:first-child {
+      width: 270px;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > div:last-child {
+      width: calc(100% - 270px);
+      height: 100%;
+      color: #FFFFFF;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #1365DD;
+    }
+  }
+}
 </style>
diff --git a/src/pages/notification/components/detail.vue b/src/pages/notification/components/detail.vue
index a7983ea2..0db56bd8 100644
--- a/src/pages/notification/components/detail.vue
+++ b/src/pages/notification/components/detail.vue
@@ -2,21 +2,21 @@
   <div class="detail">
     <template v-if="detailObj">
       <div class="card">
-        <header>{{detailObj.title}}</header>
+        <header>{{ detailObj.title }}</header>
         <u-gap height="16"></u-gap>
         <u-row>
           <span>发布人：</span>
-          <span>{{detailObj.releaseUserName}}</span>
+          <span>{{ detailObj.releaseUserName }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>发布部门：</span>
-          <span>{{detailObj.unitName}}</span>
+          <span>{{ detailObj.unitName }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>发布日期：</span>
-          <span>{{detailObj.releaseTime}}</span>
+          <span>{{ detailObj.releaseTime }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
       </div>
@@ -32,9 +32,9 @@
           <u-row justify="between">
             <label class="left">
               <img :src="$cdn + 'common/appendix.png'" alt="">
-              <span>{{item.name}}.{{item.postfix}}</span>
+              <span>{{ item.name }}.{{ item.postfix }}</span>
             </label>
-            <span>{{(item.size/1024).toFixed(2)}}KB</span>
+            <span>{{ (item.size / 1024).toFixed(2) }}KB</span>
           </u-row>
         </div>
       </div>
@@ -43,303 +43,303 @@
         <u-row justify="between" class="item">
           <span>接收对象</span>
           <div class="right">
-            <em>{{detailObj.readNum}}人</em>已读
-            <em>{{detailObj.unReadNum}}人</em>未读
+            <em>{{ detailObj.readNum }}人</em>已读
+            <em>{{ detailObj.unReadNum }}人</em>未读
             <div class="arrow"></div>
           </div>
         </u-row>
       </div>
     </template>
     <AiEmpty description="该通知已撤回" v-else/>
-    <AiBack />
+    <AiBack/>
   </div>
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import {mapActions} from "vuex";
-  import AiEmpty from "../../../components/AiEmpty";
+import AiBack from "../../../components/AiBack";
+import {mapActions} from "vuex";
+import AiEmpty from "../../../components/AiEmpty";
 
-  export default {
-    name: "detail",
-    components:{AiBack,AiEmpty},
-    data() {
-      return {
-        detailObj: null,
-        id: null,
-        flag: null,
+export default {
+  name: "detail",
+  components: {AiBack, AiEmpty},
+  data() {
+    return {
+      detailObj: null,
+      id: null,
+      flag: null,
+    }
+  },
+  onLoad(opt) {
+    this.id = opt.id;
+    this.flag = opt.flag;
+    this.getDetail();
+  },
+  methods: {
+    ...mapActions(['previewFile', 'injectJWeixin']),
+    preFile(e) {
+      if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
+        uni.previewImage({
+          current: e.url,
+          urls: [e.url]
+        })
+      } else {
+        this.previewFile({...e})
       }
     },
-    onLoad(opt){
-      this.id = opt.id;
-      this.flag = opt.flag;
-      this.getDetail();
-    },
-    methods: {
-      ...mapActions(['previewFile', 'injectJWeixin']),
-      preFile(e) {
-        if([".jpg",".png",".gif"].includes(e.postfix.toLowerCase())){
-          uni.previewImage({
-            current: e.url,
-            urls: [e.url]
-          })
-        }else {
-          this.previewFile({...e})
+    getDetail() {
+      this.$http.post("/app/appannouncement/detail", null, {
+        params: {
+          id: this.id,
+          detail: this.flag
         }
-      },
-      getDetail() {
-        this.$http.post("/app/appannouncement/detail", null, {
-          params: {
-            id: this.id,
-            detail: this.flag
-          }
-        }).then(res=>{
-          if(res && res.data){
-            this.detailObj = res.data;
-          }
-        })
-      },
-      handleClick() {
-        uni.navigateTo({
-          url:"/pages/notification/components/read?id=" + this.id,
-        })
-      }
+      }).then(res => {
+        if (res && res.data) {
+          this.detailObj = res.data;
+        }
+      })
     },
-  }
+    handleClick() {
+      uni.navigateTo({
+        url: "/pages/notification/components/read?id=" + this.id,
+      })
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .detail {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 140px;
+.detail {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 140px;
 
-    ::v-deep .content {
-      padding: 0;
+  ::v-deep .content {
+    padding: 0;
+  }
+
+  .card {
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    box-sizing: border-box;
+    padding: 16px 32px;
+
+    header {
+      font-size: 40px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 64px;
+      letter-spacing: 1px;
     }
 
-    .card {
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
-      box-sizing: border-box;
-      padding: 16px 32px;
-
-      header {
-        font-size: 40px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 64px;
-        letter-spacing: 1px;
+    .u-row {
+      & > div {
+        border-radius: 50%;
+        text-align: center;
+        font-size: 22px;
+        font-weight: bold;
+        color: #FFFFFF;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
 
-      .u-row {
-        & > div {
-          border-radius: 50%;
-          text-align: center;
-          font-size: 22px;
-          font-weight: bold;
-          color: #FFFFFF;
+      & > span:first-child {
+        font-size: 30px;
+        color: #999999;;
+        line-height: 48px;
+      }
+
+      & > span:last-child {
+        font-size: 30px;
+        color: #343D65;
+        margin-left: 16px;
+        line-height: 48px;
+      }
+
+      .title {
+        width: 490px;
+        height: 112px;
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .right {
+        font-size: 28px;
+        display: flex;
+        align-items: center;
+        color: #666666;
+
+        .arrow {
+          width: 16px;
+          height: 16px;
+          border-top: 3px solid #CCCCCC;
+          border-right: 3px solid #CCCCCC;
+          transform: rotate(45deg);
+        }
+      }
+    }
+
+    .item {
+      position: relative;
+      height: 80px;
+
+      &:after {
+        width: 100%;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        content: "";
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+    }
+
+    & > span {
+      font-size: 32px;
+      color: #333333;
+      line-height: 48px;
+      letter-spacing: 1px;
+      display: inline-block;
+    }
+
+    .label {
+      height: 80px;
+      font-size: 32px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+
+      & > em {
+        font-style: normal;
+        font-size: 32px;
+        color: #1365DD;
+      }
+    }
+
+    .file {
+      height: 128px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      padding: 0 16px;
+      margin-bottom: 32px;
+
+      & > .u-row {
+        height: 100%;
+
+        .left {
+          width: 476px;
           display: flex;
           align-items: center;
-          justify-content: center;
-        }
 
-        & > span:first-child {
-          font-size: 30px;
-          color: #999999;;
-          line-height: 48px;
-        }
+          & > img {
+            flex-shrink: 0;
+            width: 96px;
+            height: 96px;
+          }
 
-        & > span:last-child {
-          font-size: 30px;
-          color: #343D65;
-          margin-left: 16px;
-          line-height: 48px;
-        }
-
-        .title {
-          width: 490px;
-          height: 112px;
-          display: flex;
-          align-items: center;
-          font-size: 32px;
-          color: #333333;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-
-        .right {
-          font-size: 28px;
-          display: flex;
-          align-items: center;
-          color: #666666;
-
-          .arrow {
-            width: 16px;
-            height: 16px;
-            border-top: 3px solid #CCCCCC;
-            border-right: 3px solid #CCCCCC;
-            transform: rotate(45deg);
+          & > span {
+            font-size: 32px;
+            color: #333333;
+            display: inline-block;
+            line-height: 44px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
           }
         }
-      }
 
-      .item {
-        position: relative;
-        height: 80px;
-
-        &:after {
-          width: 100%;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          content: "";
-          position: absolute;
-          left: 0;
-          bottom: 0;
+        & > span {
+          font-size: 28px;
+          color: #999999;
         }
       }
+    }
 
-      & > span {
+    .active {
+      background-color: #F3F6F9;
+    }
+
+    & > text {
+      width: 100%;
+      display: inline-block;
+      font-size: 30px;
+      color: #649EFD;
+      text-align: center;
+    }
+
+    .progress {
+      height: 12px;
+      background: #F2F4FC;
+      border-radius: 12px;
+      position: relative;
+      margin: 16px 0 64px 0;
+
+      .pro-active {
+        height: 12px;
+        background: #639EFD;
+        border-radius: 12px;
+        position: absolute;
+        left: 0;
+        top: 0;
+      }
+
+    }
+
+    em {
+      font-style: normal;
+      font-size: 28px;
+      color: #1365DD;
+    }
+
+    ::v-deep .u-collapse {
+      position: relative;
+
+      &:after {
+        content: "";
+        width: 718px;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+
+      .u-collapse-head {
+        padding: 40px 0;
+      }
+
+      .u-collapse-content {
         font-size: 32px;
         color: #333333;
         line-height: 48px;
         letter-spacing: 1px;
-        display: inline-block;
       }
-
-      .label {
-        height: 80px;
-        font-size: 32px;
-        color: #333333;
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-
-        & > em {
-          font-style: normal;
-          font-size: 32px;
-          color: #1365DD;
-        }
-      }
-
-      .file {
-        height: 128px;
-        background: #FFFFFF;
-        border-radius: 8px;
-        border: 1px solid #CCCCCC;
-        box-sizing: border-box;
-        padding: 0 16px;
-        margin-bottom: 32px;
-
-        & > .u-row {
-          height: 100%;
-
-          .left {
-            width: 476px;
-            display: flex;
-            align-items: center;
-
-            & > img {
-              flex-shrink: 0;
-              width: 96px;
-              height: 96px;
-            }
-
-            & > span {
-              font-size: 32px;
-              color: #333333;
-              display: inline-block;
-              line-height: 44px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 2;
-            }
-          }
-
-          & > span {
-            font-size: 28px;
-            color: #999999;
-          }
-        }
-      }
-
-      .active {
-        background-color: #F3F6F9;
-      }
-
-      & > text {
-        width: 100%;
-        display: inline-block;
-        font-size: 30px;
-        color: #649EFD;
-        text-align: center;
-      }
-
-      .progress {
-        height: 12px;
-        background: #F2F4FC;
-        border-radius: 12px;
-        position: relative;
-        margin: 16px 0 64px 0;
-
-        .pro-active {
-          height: 12px;
-          background: #639EFD;
-          border-radius: 12px;
-          position: absolute;
-          left: 0;
-          top: 0;
-        }
-
-      }
-
-      em {
-        font-style: normal;
-        font-size: 28px;
-        color: #1365DD;
-      }
-
-      ::v-deep .u-collapse {
-        position: relative;
-
-        &:after {
-          content: "";
-          width: 718px;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          position: absolute;
-          left: 0;
-          bottom: 0;
-        }
-
-        .u-collapse-head {
-          padding: 40px 0;
-        }
-
-        .u-collapse-content {
-          font-size: 32px;
-          color: #333333;
-          line-height: 48px;
-          letter-spacing: 1px;
-        }
-      }
-    }
-
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background: #1365DD;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 36px;
-      color: #FFFFFF;
     }
   }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background: #1365DD;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36px;
+    color: #FFFFFF;
+  }
+}
 </style>
diff --git a/src/pages/notification/components/read.vue b/src/pages/notification/components/read.vue
index 0dd891e4..9ec917c3 100644
--- a/src/pages/notification/components/read.vue
+++ b/src/pages/notification/components/read.vue
@@ -6,7 +6,7 @@
     <div class="body">
       <div class="item" v-for="(item,index) in (current==0 ? list.read : list.unRead)" :key="index">
         <u-avatar :src="item.avatar" mode="square" size="76"></u-avatar>
-        <span class="name">{{item.name}}</span>
+        <span class="name">{{ item.name }}</span>
       </div>
     </div>
     <AiBack/>
@@ -14,80 +14,80 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiTopFixed from "../../../components/AiTopFixed";
+import AiBack from "../../../components/AiBack";
+import AiTopFixed from "../../../components/AiTopFixed";
 
-  export default {
-    name: "read",
-    components: {AiBack, AiTopFixed},
-    data() {
-      return {
-        current: 0,
-        id: null,
-        list: [],
-      }
+export default {
+  name: "read",
+  components: {AiBack, AiTopFixed},
+  data() {
+    return {
+      current: 0,
+      id: null,
+      list: [],
+    }
+  },
+  onLoad(opt) {
+    this.id = opt.id;
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$http.post("/app/appannouncementreader/list-unread", null, {
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.list = res.data;
+        }
+      })
     },
-    onLoad(opt) {
-      this.id = opt.id;
+    change(val) {
+      this.current = val;
       this.getList();
-    },
-    methods: {
-      getList() {
-        this.$http.post("/app/appannouncementreader/list-unread",null,{
-          params:{
-            id:this.id
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.list = res.data;
-          }
-        })
-      },
-      change(val) {
-        this.current = val;
-        this.getList();
-      }
-    },
-    computed: {
-      tabs() {
-        return [
-          {name: this.list?.read?.length + "人已读"},
-          {name: this.list?.unRead?.length + "人未读"},
-        ];
-      }
-    },
-  }
+    }
+  },
+  computed: {
+    tabs() {
+      return [
+        {name: this.list?.read?.length + "人已读"},
+        {name: this.list?.unRead?.length + "人未读"},
+      ];
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .read {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.read {
+  min-height: 100%;
+  background-color: #F5F5F5;
 
-    ::v-deep .content{
-      padding: 0 !important;
-    }
+  ::v-deep .content {
+    padding: 0 !important;
+  }
 
-    .body {
-      padding: 16px 0;
+  .body {
+    padding: 16px 0;
 
-     .item {
-        height: 120px;
-        display: flex;
-       align-items: center;
-        box-sizing: border-box;
-        padding: 0 50px;
-        background-color: #ffffff;
-        border-bottom: 1px solid #eeeeee;
+    .item {
+      height: 120px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      padding: 0 50px;
+      background-color: #ffffff;
+      border-bottom: 1px solid #eeeeee;
 
-        & > .name{
-          font-size: 36px;
-          font-weight: 600;
-          color: #333333;
-          line-height: 50px;
-          margin-left: 32px;
-        }
+      & > .name {
+        font-size: 36px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 50px;
+        margin-left: 32px;
       }
     }
   }
+}
 </style>
diff --git a/src/pages/notification/notification.vue b/src/pages/notification/notification.vue
index 80acfdff..6f41efe4 100644
--- a/src/pages/notification/notification.vue
+++ b/src/pages/notification/notification.vue
@@ -8,13 +8,15 @@
         <template v-if="!item.imgUrl">
           <label>
             <b v-if="index==0 && item.readStatus==0"></b>
-            <div class="tag" v-if="index==1" :style="color(item.status)">{{$dict.getLabel("announcementStatus",item.status)}}</div>
-            {{item.title}}
+            <div class="tag" v-if="index==1" :style="color(item.status)">
+              {{ $dict.getLabel("announcementStatus", item.status) }}
+            </div>
+            {{ item.title }}
           </label>
           <u-gap height="16"></u-gap>
           <span class="info">
-            <text>{{item.releaseUserName}}</text>
-            <text>{{item.releaseTime}}</text>
+            <text>{{ item.releaseUserName }}</text>
+            <text>{{ item.releaseTime }}</text>
           </span>
         </template>
         <template v-else>
@@ -22,13 +24,15 @@
             <div class="left">
               <label>
                 <b v-if="index==0 && item.readStatus==0"></b>
-                <div class="tag" v-if="index==1" :style="color(item.status)">{{$dict.getLabel("announcementStatus",item.status)}}</div>
-                {{item.title}}
+                <div class="tag" v-if="index==1" :style="color(item.status)">
+                  {{ $dict.getLabel("announcementStatus", item.status) }}
+                </div>
+                {{ item.title }}
               </label>
               <u-gap height="16"></u-gap>
               <span class="info">
-                <text>{{item.releaseUserName}}</text>
-                <text>{{item.releaseTime}}</text>
+                <text>{{ item.releaseUserName }}</text>
+                <text>{{ item.releaseTime }}</text>
               </span>
             </div>
             <img :src="item.imgUrl" alt="">
@@ -46,7 +50,7 @@
           <div class="colum" v-for="(item,index) in optList" :key="index" @click="handleOpt(item)">
             <u-icon :name="item.icon" size="100" :custom-style="{backgroundColor:'#fff',borderRadius:'16px'}"></u-icon>
             <u-gap height="16"></u-gap>
-            {{item.name}}
+            {{ item.name }}
           </div>
         </u-row>
         <div class="btn" @click="show=false">关闭</div>
@@ -59,296 +63,297 @@
 </template>
 
 <script>
-  import AiAdd from "../../components/AiAdd";
-  import AiEmpty from "../../components/AiEmpty";
-  import AiTopFixed from "../../components/AiTopFixed";
+import AiAdd from "../../components/AiAdd";
+import AiEmpty from "../../components/AiEmpty";
+import AiTopFixed from "../../components/AiTopFixed";
 
-  export default {
-    name: "notification",
-    components: {AiAdd, AiEmpty,AiTopFixed},
-    data() {
-      return {
-        index: 0,
-        show: false,
-        modal: false,
-        content: "",
-        current: 1,
-        dataList: [],
-        detail: {},
-        status: "加载更多",
-      }
+export default {
+  name: "notification",
+  components: {AiAdd, AiEmpty, AiTopFixed},
+  data() {
+    return {
+      index: 0,
+      show: false,
+      modal: false,
+      content: "",
+      current: 1,
+      dataList: [],
+      detail: {},
+      status: "加载更多",
+    }
+  },
+
+  onLoad() {
+    this.$dict.load("announcementStatus");
+  },
+
+  computed: {
+    tabs() {
+      return [{name: "最新公告"}, {name: "公告管理"}];
     },
+    optList() {
+      return [
+        {
+          name: "详情",
+          icon: this.$cdn + "notice/yl.png",
+          val: 0,
+          show: true,
+        },
+        {
+          name: "撤回",
+          icon: this.$cdn + "notice/ch.png",
+          val: 1,
+          show: this.detail?.status == 1,
+        },
+        {
+          name: "发布",
+          icon: this.$cdn + "notice/fb.png",
+          val: 2,
+          show: this.detail?.status == 0,
+        },
+        {
+          name: "编辑",
+          icon: this.$cdn + "notice/bj.png",
+          val: 3,
+          show: this.detail?.status == 0 || this.detail?.status == 3,
+        }, {
+          name: "删除",
+          icon: this.$cdn + "notice/sc.png",
+          val: 4,
+          show: true,
+        }
+      ].filter(e => e.show)
+    }
+  },
 
-    onLoad(){
-      this.$dict.load("announcementStatus");
+  methods: {
+    changeState() {
+      this.$http.post(this.content == '删除' ? '/app/appannouncement/delete' : "/app/appannouncement/update-status", null, {
+        params: {
+          [this.content == '删除' ? 'ids' : 'id']: this.detail.id
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast(this.content + "成功");
+          this.getList();
+        }
+      })
     },
-
-    computed: {
-      tabs() {
-        return [{name: "最新公告"},{name: "公告管理"}];
-      },
-      optList(){
-        return [
-          {
-            name: "详情",
-            icon: this.$cdn + "notice/yl.png",
-            val: 0,
-            show: true,
-          },
-          {
-            name: "撤回",
-            icon: this.$cdn + "notice/ch.png",
-            val: 1,
-            show: this.detail?.status == 1,
-          },
-          {
-            name: "发布",
-            icon: this.$cdn + "notice/fb.png",
-            val: 2,
-            show: this.detail?.status == 0,
-          },
-          {
-            name: "编辑",
-            icon: this.$cdn + "notice/bj.png",
-            val: 3,
-            show: this.detail?.status == 0 || this.detail?.status == 3,
-          }, {
-            name: "删除",
-            icon: this.$cdn + "notice/sc.png",
-            val: 4,
-            show: true,
-          }
-        ].filter(e=>e.show)
-      }
+    confirm() {
+      this.show = false;
+      this.changeState();
     },
+    handleOpt(item) {
+      this.content = {
+        1: "撤回",
+        2: "发布",
+        4: "删除",
+      }[item.val];
 
-    methods: {
-      changeState(){
-        this.$http.post(this.content =='删除' ? '/app/appannouncement/delete' : "/app/appannouncement/update-status",null,{
-          params: {
-            [this.content =='删除' ? 'ids' : 'id']:this.detail.id
-          }
-        }).then(res=>{
-          if(res.code==0){
-            this.$u.toast(this.content + "成功");
-            this.getList();
-          }
-        })
-      },
-      confirm(){
+      if (item.val == 0) {
         this.show = false;
-        this.changeState();
-      },
-      handleOpt(item){
-        this.content = {
-          1: "撤回",
-          2: "发布",
-          4: "删除",
-        }[item.val];
+        return uni.navigateTo({
+          url: "/pages/notification/components/detail?id=" + this.detail.id
+        });
+      }
 
-        if (item.val == 0) {
-          this.show = false;
-          return uni.navigateTo({
-            url: "/pages/notification/components/detail?id=" + this.detail.id
-          });
-        }
+      if ([1, 2, 4].includes(item.val)) {
+        return this.modal = true;
+      }
 
-        if ([1,2,4].includes(item.val)) {
-          return this.modal = true;
-        }
-
-        if(item.val==3){
-          this.show = false;
-          return uni.navigateTo({
-            url:"/pages/notification/components/add?id=" + this.detail.id + "&flag=" + false
-          });
-        }
-      },
-      color(status){
-        return [
-          {backgroundColor:"rgba(255,136,34,0.1)",color:"#FF8822"},
-          {backgroundColor:"rgba(34,102,255,0.1)",color:"#2266FF"},
-          {backgroundColor:"rgba(102,102,102,0.1)",color:"#666666"},
-          {backgroundColor:"rgba(255,136,34,0.1)",color:"#FF8822"}
-          ][status];
-      },
-      handeClick(item) {
-        this.detail = item;
-        if (this.index == 1) {
-          this.show = true;
-        }else {
-          uni.navigateTo({
-            url: "/pages/notification/components/detail?id=" + this.detail.id + "&flag=" + true
-          })
-        }
-      },
-      add(){
+      if (item.val == 3) {
+        this.show = false;
+        return uni.navigateTo({
+          url: "/pages/notification/components/add?id=" + this.detail.id + "&flag=" + false
+        });
+      }
+    },
+    color(status) {
+      return [
+        {backgroundColor: "rgba(255,136,34,0.1)", color: "#FF8822"},
+        {backgroundColor: "rgba(34,102,255,0.1)", color: "#2266FF"},
+        {backgroundColor: "rgba(102,102,102,0.1)", color: "#666666"},
+        {backgroundColor: "rgba(255,136,34,0.1)", color: "#FF8822"}
+      ][status];
+    },
+    handeClick(item) {
+      this.detail = item;
+      if (this.index == 1) {
+        this.show = true;
+      } else {
         uni.navigateTo({
-          url: "/pages/notification/components/add"
-        })
-      },
-      change(val) {
-        this.index = val;
-        this.current = 1;
-        this.getList()
-      },
-      getList() {
-        this.$http.post(this.index ==0 ? "/app/appannouncement/list-latest" : "/app/appannouncement/list-mgr", null, {
-          params: {
-            size: 10,
-            current: this.current
-          }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
-          }
+          url: "/pages/notification/components/detail?id=" + this.detail.id + "&flag=" + true
         })
       }
     },
-
-    onShow() {
-      this.current = 1;
-      this.getList();
+    add() {
+      uni.navigateTo({
+        url: "/pages/notification/components/add"
+      })
     },
-
-    onReachBottom() {
-      this.current = this.current + 1;
+    change(val) {
+      this.index = val;
+      this.current = 1;
       this.getList()
     },
-  }
+    getList() {
+      this.$http.post(this.index == 0 ? "/app/appannouncement/list-latest" : "/app/appannouncement/list-mgr", null, {
+        params: {
+          size: 10,
+          current: this.current
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
+          }
+          this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
+        }
+      })
+    }
+  },
+
+  onShow() {
+    this.current = 1;
+    this.getList();
+  },
+
+  onReachBottom() {
+    this.current = this.current + 1;
+    this.getList()
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .notification {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 32px;
+.notification {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 32px;
 
-    ::v-deep .content{
-      padding: 0 !important;
-    }
+  ::v-deep .content {
+    padding: 0 !important;
+  }
 
-    .body {
+  .body {
+    box-sizing: border-box;
+    padding: 32px;
+
+    .card {
+      height: 208px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
       box-sizing: border-box;
       padding: 32px;
+      border-radius: 8px;
+      background-color: #ffffff;
+      margin-bottom: 32px;
 
-      .card {
-        height: 208px;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        box-sizing: border-box;
-        padding: 32px;
-        border-radius: 8px;
-        background-color: #ffffff;
-        margin-bottom: 32px;
-
-        &:last-child{
-          margin-bottom: 0;
-        }
-
-        & > label {
-          font-size: 32px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
-          color: #333333;
-          line-height: 44px;
-        }
-
-        b {
-          display: inline-block;
-          font-style: normal;
-          width: 16px;
-          height: 16px;
-          border-radius: 50%;
-          background: #FF4466;
-          margin-right: 8px;
-        }
-
-        .tag{
-          width: 96px;
-          height: 44px;
-          display: inline-block;
-          border-radius: 8px;
-          margin-right: 16px;
-          font-size: 26px;
-          font-weight: 400;
-          line-height: 46px;
-          text-align: center;
-        }
-
-        .info {
-          font-size: 28px;
-          color: #999999;
-          line-height: 40px;
-
-          & > text:first-child {
-            margin-right: 32px;
-          }
-        }
-
-        & > .has-pic {
-          display: flex;
-          justify-content: space-between;
-
-          & > .left {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-
-            & > label {
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 2;
-            }
-          }
-          & > img{
-            width: 192px;
-            height: 144px;
-            flex-shrink: 0;
-            margin-left: 32px;
-          }
-        }
+      &:last-child {
+        margin-bottom: 0;
       }
-    }
 
-    .popup-wrap {
-      height: 368px;
-      background-color: #F7F7F7;
-
-      .btn{
-        height: 96px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 30px;
-        font-weight: 500;
+      & > label {
+        font-size: 32px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
         color: #333333;
-        background-color: #ffffff;
+        line-height: 44px;
       }
 
-      & > .u-row {
-        height: 272px;
-        box-sizing: border-box;
-        padding: 0 46px;
+      b {
+        display: inline-block;
+        font-style: normal;
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background: #FF4466;
+        margin-right: 8px;
+      }
 
-        & > .colum {
+      .tag {
+        width: 96px;
+        height: 44px;
+        display: inline-block;
+        border-radius: 8px;
+        margin-right: 16px;
+        font-size: 26px;
+        font-weight: 400;
+        line-height: 46px;
+        text-align: center;
+      }
+
+      .info {
+        font-size: 28px;
+        color: #999999;
+        line-height: 40px;
+
+        & > text:first-child {
+          margin-right: 32px;
+        }
+      }
+
+      & > .has-pic {
+        display: flex;
+        justify-content: space-between;
+
+        & > .left {
           display: flex;
           flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          font-size: 26px;
-          color: #666666;
+          justify-content: space-between;
+
+          & > label {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+          }
+        }
+
+        & > img {
+          width: 192px;
+          height: 144px;
+          flex-shrink: 0;
+          margin-left: 32px;
         }
       }
     }
   }
+
+  .popup-wrap {
+    height: 368px;
+    background-color: #F7F7F7;
+
+    .btn {
+      height: 96px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 30px;
+      font-weight: 500;
+      color: #333333;
+      background-color: #ffffff;
+    }
+
+    & > .u-row {
+      height: 272px;
+      box-sizing: border-box;
+      padding: 0 46px;
+
+      & > .colum {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        font-size: 26px;
+        color: #666666;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/pages/povertyMonitor/Detail.vue b/src/pages/povertyMonitor/Detail.vue
index fc44b4c4..ac539eca 100644
--- a/src/pages/povertyMonitor/Detail.vue
+++ b/src/pages/povertyMonitor/Detail.vue
@@ -3,11 +3,11 @@
     <div class="info">
       <div class="info-top">
         <div class="left">
-          <image src="/static/images/avatar.png" />
+          <image src="/static/images/avatar.png"/>
           <h2>{{ info.name || info.phone }}</h2>
         </div>
         <div class="right">
-          <image src="/static/images/phone.png" />
+          <image src="/static/images/phone.png"/>
           <p>拨打电话</p>
         </div>
       </div>
@@ -55,7 +55,7 @@
         <div class="info-item">
           <label>图片：</label>
           <div class="imgs">
-            <image v-for="(item, index) in 6" :key="index" src="/static/images/avatar.png" />
+            <image v-for="(item, index) in 6" :key="index" src="/static/images/avatar.png"/>
           </div>
         </div>
       </div>
@@ -68,183 +68,184 @@
 </template>
 
 <script>
-  export default {
-    name: 'detail',
+export default {
+  name: 'detail',
 
-    data () {
-      return {
-        info: {},
-        id: '',
-        pageShow: false
-      }
+  data() {
+    return {
+      info: {},
+      id: '',
+      pageShow: false
+    }
+  },
+
+  onLoad(query) {
+    uni.showLoading()
+    this.id = query.id
+
+    this.getInfo(query.id)
+  },
+
+  methods: {
+    linkTo() {
+      uni.navigateTo({
+        url: '/pages/povertyMonitor/Form'
+      })
     },
 
-    onLoad (query) {
-      uni.showLoading()
-      this.id = query.id
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
 
-      this.getInfo(query.id)
-    },
+          this.pageShow = true
+        }
 
-    methods: {
-      linkTo () {
-        uni.navigateTo({
-          url: '/pages/povertyMonitor/Form'
-        })
-      },
-
-      getInfo (id) {
-        this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-
-            this.pageShow = true
-          }
-
-          uni.hideLoading()
-        })
-      }
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .detail {
-    padding-bottom: 122rpx;
+.detail {
+  padding-bottom: 122 rpx;
 
-    * {
-      box-sizing: border-box;
-    }
+  * {
+    box-sizing: border-box;
+  }
 
-    .footer {
-      display: flex;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 1;
-      width: 100%;
+  .footer {
+    display: flex;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 1;
+    width: 100%;
+    height: 112px;
+
+    span {
+      flex: 1;
       height: 112px;
+      line-height: 112px;
+      text-align: center;
+      color: #FF4466;
+      font-size: 32px;
+      background: #fff;
+
+      &:last-child {
+        color: #fff;
+        background: #3192F4;
+      }
+    }
+  }
+
+  .info {
+    background: #fff;
+
+    .info-top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 136px;
+      padding: 0 32px;
+      background: #FFFFFF;
+      border-bottom: 1px solid #D8DDE6;
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        image {
+          width: 80px;
+          height: 80px;
+          margin-right: 16px;
+        }
+
+        h2 {
+          color: #333333;
+          font-size: 36px;
+          font-weight: 600;
+        }
+      }
+
+      .right {
+        text-align: center;
+
+        image {
+          width: 64px;
+          height: 64px;
+        }
+
+        p {
+          color: #3D94FB;
+          font-size: 24px;
+        }
+      }
+    }
+  }
+
+  .result {
+    margin-top: 20px;
+    background: #fff;
+
+    .result-top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 96px;
+      padding: 0 32px;
+      border-bottom: 1px solid #DDDDDD;
+
+      h2 {
+        font-size: 32px;
+        color: #333;
+        font-weight: 600;
+      }
+
+      span {
+        color: #2EA222;
+        font-size: 30px;
+      }
+    }
+  }
+
+  .info-item__wrapper {
+    padding: 32px;
+
+    .info-item {
+      display: flex;
+      margin-bottom: 12px;
+
+      label {
+        flex-shrink: 0;
+        width: 150px;
+        line-height: 1.3;
+        text-align: right;
+        color: #999999;
+        font-size: 30 rpx;
+      }
 
       span {
         flex: 1;
-        height: 112px;
-        line-height: 112px;
-        text-align: center;
-        color: #FF4466;
-        font-size: 32px;
-        background: #fff;
+        line-height: 1.3;
+        text-align: justify;
+        color: #343D65;
+      }
 
-        &:last-child {
-          color: #fff;
-          background: #3192F4;
+      .imgs {
+        flex: 1;
+
+        image {
+          width: 160px;
+          height: 160px;
+          margin-right: 16px;
+          margin-bottom: 16px;
+          border-radius: 4px;
         }
       }
     }
-
-    .info {
-      background: #fff;
-
-      .info-top {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 136px;
-        padding: 0 32px;
-        background: #FFFFFF;
-        border-bottom: 1px solid #D8DDE6;
-
-        .left {
-          display: flex;
-          align-items: center;
-
-          image {
-            width: 80px;
-            height: 80px;
-            margin-right: 16px;
-          }
-
-          h2 {
-            color: #333333;
-            font-size: 36px;
-            font-weight: 600;
-          }
-        }
-
-        .right {
-          text-align: center;
-          image {
-            width: 64px;
-            height: 64px;
-          }
-
-          p {
-            color: #3D94FB;
-            font-size: 24px;
-          }
-        }
-      }
-    }
-
-    .result {
-      margin-top: 20px;
-      background: #fff;
-
-      .result-top {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 96px;
-        padding: 0 32px;
-        border-bottom: 1px solid #DDDDDD;
-
-        h2 {
-          font-size: 32px;
-          color: #333;
-          font-weight: 600;
-        }
-
-        span {
-          color: #2EA222;
-          font-size: 30px;
-        }
-      }
-    }
-    
-    .info-item__wrapper {
-      padding: 32px;
-
-      .info-item {
-        display: flex;
-        margin-bottom: 12px;
-
-        label {
-          flex-shrink: 0;
-          width: 150px;
-          line-height: 1.3;
-          text-align: right;
-          color: #999999;
-          font-size: 30rpx;
-        }
-
-        span {
-          flex: 1;
-          line-height: 1.3;
-          text-align: justify;
-          color: #343D65;
-        }
-
-        .imgs {
-          flex: 1;
-
-          image {
-            width: 160px;
-            height: 160px;
-            margin-right: 16px;
-            margin-bottom: 16px;
-            border-radius: 4px;
-          }
-        }
-      } 
-    }
   }
+}
 </style>
diff --git a/src/pages/povertyMonitor/Form.vue b/src/pages/povertyMonitor/Form.vue
index 841f000c..c63c546d 100644
--- a/src/pages/povertyMonitor/Form.vue
+++ b/src/pages/povertyMonitor/Form.vue
@@ -24,89 +24,89 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader'
+import AiUploader from '@/components/AiUploader'
 
-  export default {
-    data () {
-      return {
-        result: '',
+export default {
+  data() {
+    return {
+      result: '',
 
-      }
-    },
-
-    components: {
-      AiUploader
     }
+  },
+
+  components: {
+    AiUploader
   }
+}
 </script>
 
 <style lang="scss">
-  .form {
-    padding-bottom: 120px;
+.form {
+  padding-bottom: 120px;
 
-    div {
-      margin-bottom: 16px;
-      background: #fff;
-    }
+  div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
 
-    .form-item {
-      padding: 32px;
+  .form-item {
+    padding: 32px;
 
-      .form-item__title {
-        display: flex;
-        align-items: center;
-        margin-bottom: 34px;
-
-        h2 {
-          color: #333333;
-          font-weight: normal;
-          font-size: 32px;
-        }
-
-        i {
-          color: #999999;
-          font-size: 28px;
-          font-style: normal;
-        }
-      }
-
-      textarea {
-        width: 100%;
-      }
-    }
-
-    .form-type {
+    .form-item__title {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      height: 112px;
-      padding: 0 32px;
+      margin-bottom: 34px;
 
       h2 {
-        font-weight: normal;
         color: #333333;
+        font-weight: normal;
         font-size: 32px;
       }
 
-      span {
+      i {
         color: #999999;
         font-size: 28px;
+        font-style: normal;
       }
     }
 
-    .btn {
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
+    textarea {
       width: 100%;
-      height: 112px;
-      line-height: 112px;
-      margin: 0;
-      text-align: center;
-      color: #FFFFFF;
-      font-size: 32px;
-      background: #3192F4;
     }
   }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
 </style>
diff --git a/src/pages/povertyMonitor/components/List.vue b/src/pages/povertyMonitor/components/List.vue
index 85967ec8..bd8d1e23 100644
--- a/src/pages/povertyMonitor/components/List.vue
+++ b/src/pages/povertyMonitor/components/List.vue
@@ -8,7 +8,9 @@
       <div class="item" v-for="(item, index) in list" :key="index" hover-class="bg-hover" @click="toDetail(item.id)">
         <div class="item-top">
           <h2>{{ item.name || item.phone }}</h2>
-          <span :style="{color: item.riskEliminationMethod ? '#2EA222' : '#FF4466'}">{{ item.riskEliminationMethod ? '已解除' : '未解除' }}</span>
+          <span :style="{color: item.riskEliminationMethod ? '#2EA222' : '#FF4466'}">{{
+              item.riskEliminationMethod ? '已解除' : '未解除'
+            }}</span>
         </div>
         <p>{{ item.addressArea }} {{ item.address }}</p>
         <div class="item-bottom">家庭收入</div>
@@ -19,191 +21,192 @@
 </template>
 
 <script>
-  import AiEmpty from '@/components/AiEmpty/AiEmpty'
-  export default {
-    name: 'list',
+import AiEmpty from '@/components/AiEmpty/AiEmpty'
 
-    data () {
-      return {
-        list: [],
-        isMore: false,
-        current: 1,
-        currIndex: 0
-      }
+export default {
+  name: 'list',
+
+  data() {
+    return {
+      list: [],
+      isMore: false,
+      current: 1,
+      currIndex: 0
+    }
+  },
+
+  components: {
+    AiEmpty
+  },
+
+  created() {
+    uni.showLoading()
+    this.$nextTick(() => {
+      this.getList()
+    })
+    uni.$on('reload', () => {
+      this.reload()
+    })
+  },
+
+  methods: {
+    changeTab(index) {
+      this.currIndex = index
     },
 
-    components: {
-      AiEmpty
+    toDetail(id) {
+      uni.navigateTo({
+        url: `/pages/Monitor/Detail?id=${id}&isFrom=1`
+      })
     },
 
-    created () {
+    reload() {
+      this.isMore = false
+      this.current = 1
+
+      this.getList()
       uni.showLoading()
-      this.$nextTick(() => {
-        this.getList()
-      })
-      uni.$on('reload', () => {
-        this.reload()
-      })
     },
 
-    methods: {
-      changeTab (index) {
-        this.currIndex = index
-      },
+    getList() {
+      if (this.isMore) return
 
-      toDetail (id) {
-        uni.navigateTo({
-          url: `/pages/Monitor/Detail?id=${id}&isFrom=1`
-        })
-      },
-
-      reload() {
-        this.isMore = false
-        this.current = 1
-
-        this.getList()
-        uni.showLoading()
-      },
-
-      getList() {
-        if (this.isMore) return
-
-        this.$http.post(`/app/apppreventionreturntopoverty/list`, null, {
-          params: {
-            current: this.current,
-            size: 15,
-            status: 2
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            uni.hideLoading()
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
+      this.$http.post(`/app/apppreventionreturntopoverty/list`, null, {
+        params: {
+          current: this.current,
+          size: 15,
+          status: 2
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
           } else {
-            uni.hideLoading()
+            this.list = res.data.records
           }
-        }).catch(() => {
+
           uni.hideLoading()
-        })
-      }
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .list {
-    padding: 30px 0 120px;
+.list {
+  padding: 30px 0 120px;
 
-    .tab {
-      display: flex;
-      position: fixed;
-      top: 0;
-      left: 0;
-      z-index: 1;
-      align-items: center;
-      width: 100%;
-      height: 96px;
-      padding: 0 60px;
-      background: #FFFFFF;
-      border-bottom: 1px solid #D4D4D4;
+  .tab {
+    display: flex;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    align-items: center;
+    width: 100%;
+    height: 96px;
+    padding: 0 60px;
+    background: #FFFFFF;
+    border-bottom: 1px solid #D4D4D4;
+    box-sizing: border-box;
+
+    * {
       box-sizing: border-box;
-
-      * {
-        box-sizing: border-box;
-      }
-
-      span {
-        position: relative;
-        flex: 1;
-        height: 96rpx;
-        line-height: 96rpx;
-        color: #000000;
-        text-align: center;
-        font-size: 32px;
-
-        &::after {
-          position: absolute;
-          bottom: 0;
-          left: 50%;
-          width: 192px;
-          height: 6px;
-          background: transparent;
-          transform: translateX(-50%);
-          content: ' ';
-        }
-
-        &.active {
-          color: #1365DD;
-
-          &::after {
-            background: #1365DD;
-          }
-        }
-      }
     }
 
-    .list-wrapper {
-      .item {
-        margin: 0 32px 32px;
-        padding-bottom: 10px;
-        background: #FFFFFF;
-        border-radius: 16px;
+    span {
+      position: relative;
+      flex: 1;
+      height: 96 rpx;
+      line-height: 96 rpx;
+      color: #000000;
+      text-align: center;
+      font-size: 32px;
 
-        .item-bottom {
-          height: 94px;
-          line-height: 94px;
-          padding: 0 32px;
-          border-top: 1px solid #DDDDDD;
-          color: #3975C6;
-          font-size: 26px;
-        }
+      &::after {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        width: 192px;
+        height: 6px;
+        background: transparent;
+        transform: translateX(-50%);
+        content: ' ';
+      }
 
-        .item-top {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          margin-bottom: 16px;
-          padding: 32px 32px 0;
+      &.active {
+        color: #1365DD;
 
-          h2 {
-            color: #333333;
-            font-size: 32px;
-            font-weight: 700;
-          }
-
-          span {
-            color: #FFBB00;
-
-            &.status0 {
-              color: #FF4466;
-            }
-
-            &.status1 {
-              color: 已解除风险;
-            }
-          }
-        }
-
-        p {
-          line-height: 1.4;
-          margin-bottom: 32rpx;
-          padding: 0 32px;
-          color: #999999;
-          font-size: 26px;
+        &::after {
+          background: #1365DD;
         }
       }
     }
   }
+
+  .list-wrapper {
+    .item {
+      margin: 0 32px 32px;
+      padding-bottom: 10px;
+      background: #FFFFFF;
+      border-radius: 16px;
+
+      .item-bottom {
+        height: 94px;
+        line-height: 94px;
+        padding: 0 32px;
+        border-top: 1px solid #DDDDDD;
+        color: #3975C6;
+        font-size: 26px;
+      }
+
+      .item-top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 16px;
+        padding: 32px 32px 0;
+
+        h2 {
+          color: #333333;
+          font-size: 32px;
+          font-weight: 700;
+        }
+
+        span {
+          color: #FFBB00;
+
+          &.status0 {
+            color: #FF4466;
+          }
+
+          &.status1 {
+            color: 已解除风险;
+          }
+        }
+      }
+
+      p {
+        line-height: 1.4;
+        margin-bottom: 32 rpx;
+        padding: 0 32px;
+        color: #999999;
+        font-size: 26px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/pages/povertyMonitor/components/Statistics.vue b/src/pages/povertyMonitor/components/Statistics.vue
index da8e574f..4f6d7aa9 100644
--- a/src/pages/povertyMonitor/components/Statistics.vue
+++ b/src/pages/povertyMonitor/components/Statistics.vue
@@ -33,297 +33,297 @@
 </template>
 
 <script>
-  import echarts from 'echarts'
+import echarts from 'echarts'
 
-  export default {
-    name: 'statistics',
+export default {
+  name: 'statistics',
 
-    data () {
-      return {
-        chart1: null,
-        chart2: null,
-        chart3: null,
-        chart4: null,
-        info: {}
-      }
+  data() {
+    return {
+      chart1: null,
+      chart2: null,
+      chart3: null,
+      chart4: null,
+      info: {}
+    }
+  },
+
+  mounted() {
+    window.scrollTo(0, 0)
+    // this.chart1 = echarts.init(document.getElementById('chart1'))
+    this.chart4 = echarts.init(document.getElementById('chart4'))
+    this.chart2 = echarts.init(document.getElementById('chart2'))
+    this.chart3 = echarts.init(document.getElementById('chart3'))
+    this.$dict.load(['fpType', 'fpRiskEliminationMethod'])
+    this.getInfo()
+  },
+
+  methods: {
+    getInfo() {
+      this.$http.post(`/app/apppreventionreturntopoverty/statistics-h5`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.initChart2(res.data.byxzMap)
+          this.initChart3(res.data.byxcMap)
+          this.initChart4(res.data.fxxcCount, res.data.fxyjCount)
+        }
+      })
     },
 
-    mounted () {
-      window.scrollTo(0,0)
-      // this.chart1 = echarts.init(document.getElementById('chart1'))
-      this.chart4 = echarts.init(document.getElementById('chart4'))
-      this.chart2 = echarts.init(document.getElementById('chart2'))
-      this.chart3 = echarts.init(document.getElementById('chart3'))
-      this.$dict.load(['fpType', 'fpRiskEliminationMethod'])
-      this.getInfo()
+    initChart1() {
+      const option = {
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c}%'
+        },
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        series: [
+          {
+            name: 'Funnel',
+            type: 'funnel',
+            left: '0%',
+            top: 0,
+            bottom: 0,
+            width: '100%',
+            min: 0,
+            max: 100,
+            minSize: '0%',
+            maxSize: '100%',
+            sort: 'descending',
+            gap: 2,
+            label: {
+              show: true,
+              position: 'inside'
+            },
+            labelLine: {
+              length: 10,
+              lineStyle: {
+                width: 1,
+                type: 'solid'
+              }
+            },
+            itemStyle: {
+              borderColor: '#fff',
+              borderWidth: 1
+            },
+            emphasis: {
+              label: {
+                fontSize: 20
+              }
+            },
+            data: [
+              {value: 60, name: '总上报'},
+              {value: 40, name: '纳入监测'},
+              {value: 20, name: '已处理'}
+            ]
+          }
+        ]
+      }
+
+      this.chart1.setOption(option)
     },
 
-    methods: {
-      getInfo () {
-        this.$http.post(`/app/apppreventionreturntopoverty/statistics-h5`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.initChart2(res.data.byxzMap)
-            this.initChart3(res.data.byxcMap)
-            this.initChart4(res.data.fxxcCount, res.data.fxyjCount)
-          }
-        })
-      },
-
-      initChart1 () {
-        const option = {
-          tooltip: {
-            trigger: 'item',
-            formatter: '{a} <br/>{b} : {c}%'
-          },
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          series: [
-            {
-              name: 'Funnel',
-              type: 'funnel',
-              left: '0%',
-              top: 0,
-              bottom: 0,
-              width: '100%',
-              min: 0,
-              max: 100,
-              minSize: '0%',
-              maxSize: '100%',
-              sort: 'descending',
-              gap: 2,
+    initChart2(data) {
+      const values = data.map(item => {
+        return {
+          value: item.typeCount,
+          name: this.$dict.getLabel('fpType', item.type)
+        }
+      })
+      const option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        grid: {
+          left: '0%',
+          right: '0%',
+          bottom: '0%',
+          top: '40px',
+          containLabel: true
+        },
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        series: [
+          {
+            name: '本月纳入监测人群属性分析',
+            type: 'pie',
+            radius: ['40%', '70%'],
+            emphasis: {
               label: {
                 show: true,
-                position: 'inside'
-              },
-              labelLine: {
-                length: 10,
-                lineStyle: {
-                  width: 1,
-                  type: 'solid'
-                }
-              },
-              itemStyle: {
-                borderColor: '#fff',
-                borderWidth: 1
-              },
-              emphasis: {
-                label: {
-                  fontSize: 20
-                }
-              },
-              data: [
-                { value: 60, name: '总上报' },
-                { value: 40, name: '纳入监测' },
-                { value: 20, name: '已处理' }
-              ]
-            }
-          ]
-        }
-
-        this.chart1.setOption(option)
-      },
-
-      initChart2 (data) {
-        const values = data.map(item => {
-          return {
-            value: item.typeCount,
-            name: this.$dict.getLabel('fpType', item.type)
+                fontSize: '40',
+                fontWeight: 'bold'
+              }
+            },
+            data: values
           }
-        })
-        const option = {
-          tooltip: {
-            trigger: 'item'
-          },
-          grid: {
-            left: '0%',
-            right: '0%',
-            bottom: '0%',
-            top: '40px',
-            containLabel: true
-          },
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          series: [
-            {
-              name: '本月纳入监测人群属性分析',
-              type: 'pie',
-              radius: ['40%', '70%'],
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '40',
-                  fontWeight: 'bold'
-                }
-              },
-              data: values
-            }
-          ]
-        }
-
-        this.chart2.setOption(option)
-      },
-
-      initChart3 (data) {
-        const values = data.map(item => {
-          return {
-            value: item.typeCount,
-            name: this.$dict.getLabel('fpRiskEliminationMethod', item.risk_elimination_method)
-          }
-        })
-        const option = {
-          tooltip: {
-            trigger: 'item'
-          },
-          grid: {
-            left: '0%',
-            right: '0%',
-            bottom: '0%',
-            top: '40px',
-            containLabel: true
-          },
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          series: [
-            {
-              name: '本月纳入监测人群属性分析',
-              type: 'pie',
-              radius: ['40%', '70%'],
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '40',
-                  fontWeight: 'bold'
-                }
-              },
-              data: values
-            }
-          ]
-        }
-
-        this.chart3.setOption(option)
-      },
-
-      initChart4 (x, y) {
-        const option = {
-          tooltip: {
-            trigger: 'item'
-          },
-          color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
-          series: [
-            {
-              name: '',
-              type: 'funnel',
-              left: '0%',
-              top: 0,
-              bottom: 0,
-              width: '100%',
-              min: 0,
-              max: 100,
-              minSize: '0%',
-              maxSize: '100%',
-              sort: 'descending',
-              gap: 2,
-              label: {
-                show: true,
-                position: 'inside'
-              },
-              labelLine: {
-                length: 10,
-                lineStyle: {
-                  width: 1,
-                  type: 'solid'
-                }
-              },
-              itemStyle: {
-                borderColor: '#fff',
-                borderWidth: 1
-              },
-              emphasis: {
-                label: {
-                  fontSize: 20
-                }
-              },
-              data: [
-                { value: y, name: '纳入监测' },
-                { value: x, name: '消除监测' }
-              ]
-            }
-          ]
-        }
-
-        this.chart4.setOption(option)
+        ]
       }
+
+      this.chart2.setOption(option)
+    },
+
+    initChart3(data) {
+      const values = data.map(item => {
+        return {
+          value: item.typeCount,
+          name: this.$dict.getLabel('fpRiskEliminationMethod', item.risk_elimination_method)
+        }
+      })
+      const option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        grid: {
+          left: '0%',
+          right: '0%',
+          bottom: '0%',
+          top: '40px',
+          containLabel: true
+        },
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        series: [
+          {
+            name: '本月纳入监测人群属性分析',
+            type: 'pie',
+            radius: ['40%', '70%'],
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: '40',
+                fontWeight: 'bold'
+              }
+            },
+            data: values
+          }
+        ]
+      }
+
+      this.chart3.setOption(option)
+    },
+
+    initChart4(x, y) {
+      const option = {
+        tooltip: {
+          trigger: 'item'
+        },
+        color: ['#2896FF', '#09DBFE', '#61FDB9', '#FFBB69', '#8429FF', '#ea7ccc'],
+        series: [
+          {
+            name: '',
+            type: 'funnel',
+            left: '0%',
+            top: 0,
+            bottom: 0,
+            width: '100%',
+            min: 0,
+            max: 100,
+            minSize: '0%',
+            maxSize: '100%',
+            sort: 'descending',
+            gap: 2,
+            label: {
+              show: true,
+              position: 'inside'
+            },
+            labelLine: {
+              length: 10,
+              lineStyle: {
+                width: 1,
+                type: 'solid'
+              }
+            },
+            itemStyle: {
+              borderColor: '#fff',
+              borderWidth: 1
+            },
+            emphasis: {
+              label: {
+                fontSize: 20
+              }
+            },
+            data: [
+              {value: y, name: '纳入监测'},
+              {value: x, name: '消除监测'}
+            ]
+          }
+        ]
+      }
+
+      this.chart4.setOption(option)
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .statistics {
-    padding: 40px 0 120px;
+.statistics {
+  padding: 40px 0 120px;
 
-    .block {
-      position: absolute;
-      top: 0;
-      left: 0;
-      z-index: 1;
-      width: 100%;
-      height: 140px;
-      background: #3975C6;
-    }
+  .block {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    width: 100%;
+    height: 140px;
+    background: #3975C6;
+  }
 
-    .charts-wrapper {
-      position: relative;
-      z-index: 1;
-      padding: 0 32px;
+  .charts-wrapper {
+    position: relative;
+    z-index: 1;
+    padding: 0 32px;
 
-      .total {
-        display: flex;
-        align-items: center;
-        height: 200px;
-        background: #FFFFFF;
-        border-radius: 8px;
+    .total {
+      display: flex;
+      align-items: center;
+      height: 200px;
+      background: #FFFFFF;
+      border-radius: 8px;
 
-        .total-item {
-          flex: 1;
-          text-align: center;
+      .total-item {
+        flex: 1;
+        text-align: center;
 
+        h2 {
+          font-size: 64px;
+          color: #3192F4;
+        }
+
+        p {
+          margin-top: 10px;
+          color: #999999;
+          font-size: 28px;
+        }
+
+        &:last-child {
           h2 {
-            font-size: 64px;
-            color: #3192F4;
-          }
-
-          p {
-            margin-top: 10px;
-            color: #999999;
-            font-size: 28px;
-          }
-
-          &:last-child {
-            h2 {
-              color: #F09535;
-            }
+            color: #F09535;
           }
         }
       }
+    }
 
-      .charts {
-        margin-top: 32px;
-        background: #FFFFFF;
-        border-radius: 8px;
+    .charts {
+      margin-top: 32px;
+      background: #FFFFFF;
+      border-radius: 8px;
 
-        & > h2 {
-          height: 96px;
-          line-height: 96px;
-          padding: 0 32px;
-          color: #333333;
-          font-size: 32px;
-          border-bottom: 1px solid #DDDDDD;
-        }
+      & > h2 {
+        height: 96px;
+        line-height: 96px;
+        padding: 0 32px;
+        color: #333333;
+        font-size: 32px;
+        border-bottom: 1px solid #DDDDDD;
+      }
 
-        & > div {
-          width: 686px;
-          margin: 0 auto;
-          padding: 32px 0;
-        }
+      & > div {
+        width: 686px;
+        margin: 0 auto;
+        padding: 32px 0;
       }
     }
   }
+}
 </style>
diff --git a/src/pages/povertyMonitor/povertyMonitor.vue b/src/pages/povertyMonitor/povertyMonitor.vue
index d3e19b52..c0d2c6f5 100644
--- a/src/pages/povertyMonitor/povertyMonitor.vue
+++ b/src/pages/povertyMonitor/povertyMonitor.vue
@@ -12,78 +12,78 @@
 </template>
 
 <script>
-  import Statistics from './components/Statistics.vue'
-  import List from './components/List.vue'
+import Statistics from './components/Statistics.vue'
+import List from './components/List.vue'
 
-  export default {
-    data () {
-      return {
-        currIndex: 0
-      }
-    },
+export default {
+  data() {
+    return {
+      currIndex: 0
+    }
+  },
 
-    components: {
-      List,
-      Statistics
-    },
+  components: {
+    List,
+    Statistics
+  },
 
-    computed: {
-      tabBar () {
-        const link = icon => `${this.$cdn}askform/${icon}.png`
-        return [
-          {text: "预警监控", iconPath: "bdlb1", selectedIconPath: "bdlb2" },
-          {text: "数据统计", iconPath: "xjxm1", selectedIconPath: "xjxm2" }
-        ].map(e => ({
-          ...e,
-          iconPath: link(e.iconPath),
-          selectedIconPath: link(e.selectedIconPath)
-        }))
-      }
-    },
+  computed: {
+    tabBar() {
+      const link = icon => `${this.$cdn}askform/${icon}.png`
+      return [
+        {text: "预警监控", iconPath: "bdlb1", selectedIconPath: "bdlb2"},
+        {text: "数据统计", iconPath: "xjxm1", selectedIconPath: "xjxm2"}
+      ].map(e => ({
+        ...e,
+        iconPath: link(e.iconPath),
+        selectedIconPath: link(e.selectedIconPath)
+      }))
+    }
+  },
 
-    onLoad () {
-      uni.$on('reload', () => {
-        if (this.currIndex === 0) {
-          this.$refs.list.reload()
-        } else {
-          this.$refs.addList.getList()
-        }
-      })
-    },
-
-    onReachBottom() {
+  onLoad() {
+    uni.$on('reload', () => {
       if (this.currIndex === 0) {
-        this.$refs.list.getList()
+        this.$refs.list.reload()
+      } else {
+        this.$refs.addList.getList()
       }
+    })
+  },
+
+  onReachBottom() {
+    if (this.currIndex === 0) {
+      this.$refs.list.getList()
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .povertyMonitor {
-    .footer {
-      display: flex;
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      z-index: 11;
-      width: 100%;
+.povertyMonitor {
+  .footer {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 11;
+    width: 100%;
+    height: 98px;
+
+    div {
+      flex: 1;
       height: 98px;
+      line-height: 98px;
+      text-align: center;
+      color: #333333;
+      font-size: 32px;
+      background: #fff;
 
-      div {
-        flex: 1;
-        height: 98px;
-        line-height: 98px;
-        text-align: center;
-        color: #333333;
-        font-size: 32px;
-        background: #fff;
-
-        &.active {
-          color: #fff;
-          background: #3192F4;
-        }
+      &.active {
+        color: #fff;
+        background: #3192F4;
       }
     }
   }
+}
 </style>
diff --git a/src/pages/resident/groupResident.vue b/src/pages/resident/groupResident.vue
index 175f7a89..4a0db45f 100644
--- a/src/pages/resident/groupResident.vue
+++ b/src/pages/resident/groupResident.vue
@@ -142,8 +142,8 @@ export default {
         }
       })
     },
-    handleWechat({userId,type}) {
-      this.injectJWeixin('openUserProfile').then(()=>{
+    handleWechat({userId, type}) {
+      this.injectJWeixin('openUserProfile').then(() => {
         this.wxInvoke(['openUserProfile', {
           type,
           userid: userId
diff --git a/src/pages/resident/info.vue b/src/pages/resident/info.vue
index 524749a7..cd728a66 100644
--- a/src/pages/resident/info.vue
+++ b/src/pages/resident/info.vue
@@ -194,6 +194,7 @@ export default {
 <style lang="scss" scoped>
 .info {
   padding-bottom: 130px;
+
   .certBtn {
     cursor: pointer;
     background: $uni-color-primary;
diff --git a/src/pages/resourcesManage/addPlay.vue b/src/pages/resourcesManage/addPlay.vue
index 42dbef14..7d80cadb 100644
--- a/src/pages/resourcesManage/addPlay.vue
+++ b/src/pages/resourcesManage/addPlay.vue
@@ -12,17 +12,20 @@
       </div>
       <div class="radio-content">
         <div class="title">素材标题</div>
-        <textarea rows="2" placeholder="请输入（30字以内）" v-model="name" style="width:100%;height:80px;" maxlength="30"></textarea>
+        <textarea rows="2" placeholder="请输入（30字以内）" v-model="name" style="width:100%;height:80px;"
+                  maxlength="30"></textarea>
       </div>
     </div>
     <div v-else>
       <div class="radio-content mar-b16">
         <div class="title">素材标题</div>
-        <textarea rows="2" placeholder="请输入（30字以内）" v-model="name" style="width:100%;height:80px;" maxlength="30"></textarea>
+        <textarea rows="2" placeholder="请输入（30字以内）" v-model="name" style="width:100%;height:80px;"
+                  maxlength="30"></textarea>
       </div>
       <div class="radio-content">
         <div class="title">文本内容</div>
-        <textarea rows="8" placeholder="请输入文本内容（12000字以内）" v-model="content" style="width:100%;height:300px;" maxlength="12000"></textarea>
+        <textarea rows="8" placeholder="请输入文本内容（12000字以内）" v-model="content" style="width:100%;height:300px;"
+                  maxlength="12000"></textarea>
       </div>
     </div>
     <div class="btn" @click="confirm">确认</div>
@@ -31,97 +34,100 @@
 </template>
 
 <script>
-  import AiBack from "@/components/AiBack";
-  export default {
-    name: "addPlay",
-    data() {
-      return {
-        type: '1',
-        file: null,
-        name: '',
-        content: ''
-      }
-    },
+import AiBack from "@/components/AiBack";
 
-    components: {
-      AiBack
-    },
+export default {
+  name: "addPlay",
+  data() {
+    return {
+      type: '1',
+      file: null,
+      name: '',
+      content: ''
+    }
+  },
 
-    onLoad (query) {
-      this.type = query.type
-      uni.$on('record', e => {
-        this.file = e
+  components: {
+    AiBack
+  },
+
+  onLoad(query) {
+    this.type = query.type
+    uni.$on('record', e => {
+      this.file = e
+    })
+  },
+
+  methods: {
+    toRecord() {
+      uni.navigateTo({
+        url: `/pages/resourcesManage/recording`
       })
     },
 
-    methods: {
-      toRecord () {
-        uni.navigateTo({
-          url: `/pages/resourcesManage/recording`
-        })
-      },
+    dataURLtoFile(dataurl, filename) {
+      var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1]
+      var bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n)
 
-      dataURLtoFile (dataurl, filename) {
-        var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1]
-        var bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n)
-
-        while (n--){
-          u8arr[n] = bstr.charCodeAt(n)
-        }
-
-        return new File([u8arr], filename, {type:mime})
-      },
-
-      confirm () {
-        if (!this.file && this.type === '1') {
-          return this.$u.toast('请选择音频文件')
-        }
-
-        if (!this.name) {
-          return this.$u.toast('请输入素材标题')
-        }
-
-        if (!this.content && this.type === '3') {
-          return this.$u.toast('请输入文本内容')
-        }
-
-        uni.showLoading()
-        let formData = {}
-        formData = new FormData()
-        if (this.type === '1') {
-          formData.append('file', this.dataURLtoFile(this.file, this.name + '.mp3'))
-          formData.append('type', this.type)
-          formData.append('content', this.content)
-          formData.append('name', this.name)
-        } else {
-          formData.append('type', this.type)
-          formData.append('content', this.content)
-          formData.append('name', this.name)
-        }
-        this.$http.post(`/app/appdlbresource/addResourceWithFile`, formData).then((res) => {
-          uni.hideLoading()
-          if (res.code === 0) {
-            this.$u.toast('添加成功')
-            uni.$emit('getList')
-            uni.navigateBack({
-              delta: 1
-            })
-          }
-        }).catch(res => {
-          this.$u.toast(res)
-          uni.hideLoading()
-        })
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
       }
+
+      return new File([u8arr], filename, {type: mime})
+    },
+
+    confirm() {
+      if (!this.file && this.type === '1') {
+        return this.$u.toast('请选择音频文件')
+      }
+
+      if (!this.name) {
+        return this.$u.toast('请输入素材标题')
+      }
+
+      if (!this.content && this.type === '3') {
+        return this.$u.toast('请输入文本内容')
+      }
+
+      uni.showLoading()
+      let formData = {}
+      formData = new FormData()
+      if (this.type === '1') {
+        formData.append('file', this.dataURLtoFile(this.file, this.name + '.mp3'))
+        formData.append('type', this.type)
+        formData.append('content', this.content)
+        formData.append('name', this.name)
+      } else {
+        formData.append('type', this.type)
+        formData.append('content', this.content)
+        formData.append('name', this.name)
+      }
+      this.$http.post(`/app/appdlbresource/addResourceWithFile`, formData).then((res) => {
+        uni.hideLoading()
+        if (res.code === 0) {
+          this.$u.toast('添加成功')
+          uni.$emit('getList')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      }).catch(res => {
+        this.$u.toast(res)
+        uni.hideLoading()
+      })
     }
   }
+}
 </script>
 <style lang="scss" scoped>
 .addPlay {
   padding-bottom: 128px;
-  .content{
+
+  .content {
     padding-left: 32px;
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       padding: 34px 0;
       font-size: 32px;
@@ -132,49 +138,57 @@
       display: flex;
       color: #333;
       justify-content: space-between;
-      .label{
+
+      .label {
         width: 198px;
         font-size: 32px;
       }
-      .value{
+
+      .value {
         font-size: 28px;
         width: calc(100% - 198px);
         padding-right: 32px;
         box-sizing: border-box;
         text-align: right;
 
-        img{
+        img {
           width: 32px;
           height: 32px;
           vertical-align: middle;
           margin-left: 6px;
         }
       }
-      .color-999{
+
+      .color-999 {
         color: #999;
       }
     }
   }
-  .radio-content{
+
+  .radio-content {
     padding: 34px 32px 38px;
     background-color: #fff;
-    .title{
+
+    .title {
       font-size: 32px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #333;
       line-height: 44px;
       margin-bottom: 32px;
-      span{
+
+      span {
         font-size: 24px;
         font-weight: 400;
       }
     }
   }
-  .mar-b16{
+
+  .mar-b16 {
     margin-bottom: 16px;
   }
-  .btn{
+
+  .btn {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -189,4 +203,4 @@
     color: #FFFFFF;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/resourcesManage/recording.vue b/src/pages/resourcesManage/recording.vue
index 2f024a6a..6746304f 100644
--- a/src/pages/resourcesManage/recording.vue
+++ b/src/pages/resourcesManage/recording.vue
@@ -118,423 +118,432 @@
   </div>
 </template>
 
-<script> 
-  import AiBack from "@/components/AiBack";
-  import Recorder from 'recorder-core'
-  import 'recorder-core/src/engine/mp3'
-  import 'recorder-core/src/engine/mp3-engine'
-  import stopImg from './img/stop-img.png'
-  import microphone from './img/microphone.png'
-  import playImg from './img/play-icon.png'
+<script>
+import AiBack from "@/components/AiBack";
+import Recorder from 'recorder-core'
+import 'recorder-core/src/engine/mp3'
+import 'recorder-core/src/engine/mp3-engine'
+import stopImg from './img/stop-img.png'
+import microphone from './img/microphone.png'
+import playImg from './img/play-icon.png'
 
-  export default {
-    name: 'recording',
-    data () {
-      return {
-        isRecording: false,
-        progress: 0,
-        microphone,
-        playImg,
-        stopImg,
-        isPlay: false,
-        isStop: false,
-        blobFile: null,
-        time: '00:00:00',
-        counterDownTime: 0,
-        recorder: null,
-        counterDownTimeout: null,
-        timingTimeout: null,
-        audioSrc: '',
-        audio: null,
-        duration: 0
+export default {
+  name: 'recording',
+  data() {
+    return {
+      isRecording: false,
+      progress: 0,
+      microphone,
+      playImg,
+      stopImg,
+      isPlay: false,
+      isStop: false,
+      blobFile: null,
+      time: '00:00:00',
+      counterDownTime: 0,
+      recorder: null,
+      counterDownTimeout: null,
+      timingTimeout: null,
+      audioSrc: '',
+      audio: null,
+      duration: 0
+    }
+  },
+
+  components: {
+    AiBack
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.audio = document.querySelector('audio')
+    })
+  },
+
+  methods: {
+    record() {
+      if (!this.isRecording) {
+        this.duration = 0
+        this.recorder = Recorder({
+          type: 'mp3',
+          sampleRate: 16000,
+          bitRate: 16,
+          onProcess(buffers, powerLevel, bufferDuration, bufferSampleRate, newBufferIdx, asyncEnd) {
+            //可利用extensions/waveview.js扩展实时绘制波形
+          }
+        })
+
+        this.recorder.open(() => {
+          this.recorder.start()
+          this.isRecording = true
+          this.timing()
+        }, (msg, isUserNotAllow) => {
+          // this.$u.toast(`${isUserNotAllow ? '请同意授权' : msg}`)
+        })
+      } else {
+        this.stop()
       }
     },
 
-    components: {
-      AiBack
-    },
-
-    mounted () {
-      this.$nextTick(() => {
-        this.audio = document.querySelector('audio')
+    blobToDataURI(blob) {
+      return new Promise((resolve) => {
+        var reader = new FileReader()
+        reader.readAsDataURL(blob)
+        reader.onload = function (e) {
+          resolve(e.target.result)
+        }
       })
     },
 
-    methods: {
-      record () {
-        if (!this.isRecording) {
-          this.duration = 0
-          this.recorder = Recorder({
-            type: 'mp3',
-            sampleRate: 16000,
-            bitRate: 16,
-            onProcess (buffers, powerLevel, bufferDuration, bufferSampleRate, newBufferIdx, asyncEnd) {
-              //可利用extensions/waveview.js扩展实时绘制波形
-            }
-          })
-
-          this.recorder.open(() => {
-            this.recorder.start()
-            this.isRecording = true
-            this.timing()
-          }, (msg, isUserNotAllow) => {
-            // this.$u.toast(`${isUserNotAllow ? '请同意授权' : msg}`)
-          })
-        } else {
-          this.stop()
-        }
-      },
-
-      blobToDataURI (blob) {
-        return new Promise((resolve) => {
-          var reader = new FileReader()
-          reader.readAsDataURL(blob)
-          reader.onload = function (e) {
-            resolve(e.target.result)
-          }
-        })
-      },
-
-      save () {
-        if (!this.blobFile) {
-          return this.$u.toast(`请录音`)
-        }
-
-        this.blobToDataURI(this.blobFile).then(res => {
-          uni.$emit('record', res)
-          uni.navigateBack({
-            delta: 1
-          })
-        })
-      },
-
-      onAudioEnd () {
-        this.isPlay = false
-      },
-
-      stop () {
-        this.isRecording = false
-        this.isStop = true
-        clearTimeout(this.timingTimeout)
-        this.recorder.stop((blob, duration) => {
-          this.blobFile = blob
-          
-          var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
-          this.duration = this.counterDownTime
-          var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
-          var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
-          var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
-
-          this.time = hours + ':' + min + ':' + seconds
-          console.log(blob, (window.URL|| webkitURL).createObjectURL(blob), '时长:' + duration + 'ms')
-          this.recorder.close()
-          this.recorder = null
-        }, msg => {
-          console.log('录音失败:' + msg)
-          this.recorder.close()
-          this.recorder = null
-        })
-      },
-
-      play () {
-        if (!this.isPlay) {
-          this.playAudio()
-          this.counterDown()
-        } else {
-          this.isPlay = false
-          clearTimeout(this.counterDownTimeout)
-          this.audio.pause()
-        }
-      },
-
-      playAudio () {
-        this.isPlay = true
-        if (!this.audioSrc) {
-          this.audioSrc = (window.URL||webkitURL).createObjectURL(this.blobFile)
-        }
-
-        this.$nextTick(() => {
-          this.audio.play()
-        })
-      },
-
-      recodeStop () {
-        this.recorder.stop((blob, duration) => {
-          this.restart()
-          this.blobFile = blob
-          console.log(blob, (window.URL|| webkitURL).createObjectURL(blob), '时长:' + duration + 'ms')
-          this.recorder.close()
-          this.recorder = null
-        }, msg => {
-          console.log('录音失败:' + msg)
-          this.recorder.close()
-          this.recorder = null
-        })
-      },
-
-      restart () {
-        this.time = '00:00:00'
-        this.progress = 0
-        this.blobFile = null
-        this.isPlay = false
-        this.isRecording = false
-        clearTimeout(this.counterDownTimeout)
-        clearTimeout(this.timingTimeout)
-        this.counterDownTime = 0
-        this.audioSrc = ''
-        this.isStop = false
-      },
-
-      counterDown () {
-        if (this.counterDownTime === -1) {
-          clearTimeout(this.counterDownTimeout)
-          this.counterDownTime = this.duration
-
-          return false
-        }
-
-        var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
-        var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
-        var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
-        var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
-
-        this.time = hours + ':' + min + ':' + seconds
-        this.counterDownTime --
-        this.counterDownTimeout = setTimeout(() => {
-          this.counterDown()
-        }, 1000)
-      },
-
-      timing () {
-        this.progress = ((this.counterDownTime / 120) * 100).toFixed(2) > 100 ? 101 : ((this.counterDownTime / 120) * 100).toFixed(2)
-        var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
-        var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
-        var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
-        var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
-
-        this.time = hours + ':' + min + ':' + seconds
-        this.counterDownTime ++
-        this.timingTimeout = setTimeout(() => {
-          this.timing()
-        }, 1000)
+    save() {
+      if (!this.blobFile) {
+        return this.$u.toast(`请录音`)
       }
+
+      this.blobToDataURI(this.blobFile).then(res => {
+        uni.$emit('record', res)
+        uni.navigateBack({
+          delta: 1
+        })
+      })
+    },
+
+    onAudioEnd() {
+      this.isPlay = false
+    },
+
+    stop() {
+      this.isRecording = false
+      this.isStop = true
+      clearTimeout(this.timingTimeout)
+      this.recorder.stop((blob, duration) => {
+        this.blobFile = blob
+
+        var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
+        this.duration = this.counterDownTime
+        var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
+        var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
+        var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
+
+        this.time = hours + ':' + min + ':' + seconds
+        console.log(blob, (window.URL || webkitURL).createObjectURL(blob), '时长:' + duration + 'ms')
+        this.recorder.close()
+        this.recorder = null
+      }, msg => {
+        console.log('录音失败:' + msg)
+        this.recorder.close()
+        this.recorder = null
+      })
+    },
+
+    play() {
+      if (!this.isPlay) {
+        this.playAudio()
+        this.counterDown()
+      } else {
+        this.isPlay = false
+        clearTimeout(this.counterDownTimeout)
+        this.audio.pause()
+      }
+    },
+
+    playAudio() {
+      this.isPlay = true
+      if (!this.audioSrc) {
+        this.audioSrc = (window.URL || webkitURL).createObjectURL(this.blobFile)
+      }
+
+      this.$nextTick(() => {
+        this.audio.play()
+      })
+    },
+
+    recodeStop() {
+      this.recorder.stop((blob, duration) => {
+        this.restart()
+        this.blobFile = blob
+        console.log(blob, (window.URL || webkitURL).createObjectURL(blob), '时长:' + duration + 'ms')
+        this.recorder.close()
+        this.recorder = null
+      }, msg => {
+        console.log('录音失败:' + msg)
+        this.recorder.close()
+        this.recorder = null
+      })
+    },
+
+    restart() {
+      this.time = '00:00:00'
+      this.progress = 0
+      this.blobFile = null
+      this.isPlay = false
+      this.isRecording = false
+      clearTimeout(this.counterDownTimeout)
+      clearTimeout(this.timingTimeout)
+      this.counterDownTime = 0
+      this.audioSrc = ''
+      this.isStop = false
+    },
+
+    counterDown() {
+      if (this.counterDownTime === -1) {
+        clearTimeout(this.counterDownTimeout)
+        this.counterDownTime = this.duration
+
+        return false
+      }
+
+      var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
+      var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
+      var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
+      var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
+
+      this.time = hours + ':' + min + ':' + seconds
+      this.counterDownTime--
+      this.counterDownTimeout = setTimeout(() => {
+        this.counterDown()
+      }, 1000)
+    },
+
+    timing() {
+      this.progress = ((this.counterDownTime / 120) * 100).toFixed(2) > 100 ? 101 : ((this.counterDownTime / 120) * 100).toFixed(2)
+      var durationObj = this.$dayjs.duration(this.counterDownTime * 1000)
+      var hours = durationObj.hours() > 9 ? durationObj.hours() : '0' + durationObj.hours()
+      var min = durationObj.minutes() > 9 ? durationObj.minutes() : '0' + durationObj.minutes()
+      var seconds = durationObj.seconds() > 9 ? durationObj.seconds() : '0' + durationObj.seconds()
+
+      this.time = hours + ':' + min + ':' + seconds
+      this.counterDownTime++
+      this.timingTimeout = setTimeout(() => {
+        this.timing()
+      }, 1000)
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  uni-page-body{
-    background-color: #fff;
+uni-page-body {
+  background-color: #fff;
+}
+
+.recording {
+  height: 100vh;
+  overflow-y: hidden;
+
+  .content {
+    padding-top: 310px;
+    text-align: center;
+
+    img {
+      width: 406px;
+      height: 306px;
+      margin-bottom: 48px;
+    }
+
+    .text {
+      font-size: 30px;
+      color: #999;
+      line-height: 42px;
+      text-align: center;
+    }
   }
-  .recording {
-    height: 100vh;
-    overflow-y: hidden;
 
-    .content{
-      padding-top: 310px;
+  .footer {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 168px;
+    background: #F6F8FC;
+    padding: 20px 86px;
+    box-sizing: border-box;
+
+    span {
+      display: inline-block;
+      width: 160px;
+      height: 64px;
+      background: #4E8EEE;
+      border-radius: 32px;
+      font-size: 30px;
+      color: #fff;
       text-align: center;
-      img{
-        width: 406px;
-        height: 306px;
-        margin-bottom: 48px;
-      }
-      .text{
-        font-size: 30px;
-        color: #999;
-        line-height: 42px;
-        text-align: center;
-      }
-    }
-    .footer{
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      width: 100%;
-      height: 168px;
-      background: #F6F8FC;
-      padding: 20px 86px;
-      box-sizing: border-box;
-      span{
-        display: inline-block;
-        width: 160px;
-        height: 64px;
-        background: #4E8EEE;
-        border-radius: 32px;
-        font-size: 30px;
-        color: #fff;
-        text-align: center;
-        line-height: 64px;
-        vertical-align: top;
-        margin-top: 30px;
-      }
-      img{
-        width: 128px;
-        height: 128px;
-        margin: 0 64px;
-      }
+      line-height: 64px;
+      vertical-align: top;
+      margin-top: 30px;
     }
 
-    .recording-content {
-      position: relative;
-      overflow: hidden;
-    }
-
-    .stop-content {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-      height: calc(100% - 168px);
-
-      .header-line {
-        width: 380px;
-      }
-
-      .time {
-        margin-top: 0;
-        margin-bottom: 32px;
-      }
-    }
-
-    .header-top {
-      position: absolute;
-      top: 16px;
-      left: 0;
-      height: 6px;
-      background: url(./img/top.png) repeat-x;
-      background-size: auto 6px;
-    }
-    .time{
-      width: 100%;
-      margin-top: 208px;
-      text-align: center;
-      font-size: 96px;
-      color: #000000;
-      line-height: 134px;
-    }
-
-    .progress {
-      position: absolute;
-      top: 16px;
-      left: 0;
-      width: 2px;
+    img {
+      width: 128px;
       height: 128px;
-      background: #3477EE;
+      margin: 0 64px;
     }
+  }
+
+  .recording-content {
+    position: relative;
+    overflow: hidden;
+  }
+
+  .stop-content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    height: calc(100% - 168px);
 
     .header-line {
-      width: 100%;
-      max-width: 100%;
-      height: 128px;
-      line-height: 128px;
-      margin-top: 16px;
-      overflow: hidden;
+      width: 380px;
     }
 
-    .animation {
-      animation: note 0.24s ease-in-out;
-      animation-iteration-count: infinite;
-      animation-direction: alternate;
-    }
-
-    .header-line span {
-      display: inline-block;
-      width: 6px;
-      height: 16px;
-      margin: 0 6px;
-      border: none;
-      border-radius: 4px;
-      background-color: #3476EE;
-    }
-    .header-line span.line1 {
-      animation-delay: -1s;
-    }
-
-    .header-line span.line2 {
-      animation-delay: -0.9s;
-    }
-
-    .header-line span.line3 {
-      animation-delay: -0.8s;
-    }
-
-    .header-line span.line4 {
-      animation-delay: -0.7s;
-    }
-
-    .header-line span.line5 {
-      animation-delay: -0.6s;
-    }
-
-    .header-line span.line6 {
-      animation-delay: -0.5s;
-    }
-
-    .header-line span.line7 {
-      animation-delay: -0.4s;
-    }
-
-    .header-line span.line8 {
-      animation-delay: -0.4s;
-    }
-
-    .header-line span.line9 {
-      animation-delay: -0.2s;
-    }
-
-    .header-line span.line10 {
-      animation-delay: -0.1s;
-    }
-    .header-line span.line11 {
-      animation-delay: -1s;
-    }
-
-    .header-line span.line12 {
-      animation-delay: -0.9s;
-    }
-
-    .header-line span.line13 {
-      animation-delay: -0.8s;
-    }
-
-    .header-line span.line14 {
-      animation-delay: -0.7s;
-    }
-
-    .header-line span.line15 {
-      animation-delay: -0.6s;
-    }
-
-    .header-line span.line16 {
-      animation-delay: -0.5s;
-    }
-
-    .header-line span.line17 {
-      animation-delay: -0.4s;
-    }
-
-    .header-line span.line18 {
-      animation-delay: -0.3s;
-    }
-
-    .header-line span.line19 {
-      animation-delay: -0.2s;
-    }
-
-    .header-line span.line20 {
-      animation-delay: -0.1s;
-    }
-
-    @keyframes note {
-      from {
-        transform: scaleY(1);
-      }
-      to {
-        transform: scaleY(4);
-      }
+    .time {
+      margin-top: 0;
+      margin-bottom: 32px;
     }
   }
+
+  .header-top {
+    position: absolute;
+    top: 16px;
+    left: 0;
+    height: 6px;
+    background: url(./img/top.png) repeat-x;
+    background-size: auto 6px;
+  }
+
+  .time {
+    width: 100%;
+    margin-top: 208px;
+    text-align: center;
+    font-size: 96px;
+    color: #000000;
+    line-height: 134px;
+  }
+
+  .progress {
+    position: absolute;
+    top: 16px;
+    left: 0;
+    width: 2px;
+    height: 128px;
+    background: #3477EE;
+  }
+
+  .header-line {
+    width: 100%;
+    max-width: 100%;
+    height: 128px;
+    line-height: 128px;
+    margin-top: 16px;
+    overflow: hidden;
+  }
+
+  .animation {
+    animation: note 0.24s ease-in-out;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+  }
+
+  .header-line span {
+    display: inline-block;
+    width: 6px;
+    height: 16px;
+    margin: 0 6px;
+    border: none;
+    border-radius: 4px;
+    background-color: #3476EE;
+  }
+
+  .header-line span.line1 {
+    animation-delay: -1s;
+  }
+
+  .header-line span.line2 {
+    animation-delay: -0.9s;
+  }
+
+  .header-line span.line3 {
+    animation-delay: -0.8s;
+  }
+
+  .header-line span.line4 {
+    animation-delay: -0.7s;
+  }
+
+  .header-line span.line5 {
+    animation-delay: -0.6s;
+  }
+
+  .header-line span.line6 {
+    animation-delay: -0.5s;
+  }
+
+  .header-line span.line7 {
+    animation-delay: -0.4s;
+  }
+
+  .header-line span.line8 {
+    animation-delay: -0.4s;
+  }
+
+  .header-line span.line9 {
+    animation-delay: -0.2s;
+  }
+
+  .header-line span.line10 {
+    animation-delay: -0.1s;
+  }
+
+  .header-line span.line11 {
+    animation-delay: -1s;
+  }
+
+  .header-line span.line12 {
+    animation-delay: -0.9s;
+  }
+
+  .header-line span.line13 {
+    animation-delay: -0.8s;
+  }
+
+  .header-line span.line14 {
+    animation-delay: -0.7s;
+  }
+
+  .header-line span.line15 {
+    animation-delay: -0.6s;
+  }
+
+  .header-line span.line16 {
+    animation-delay: -0.5s;
+  }
+
+  .header-line span.line17 {
+    animation-delay: -0.4s;
+  }
+
+  .header-line span.line18 {
+    animation-delay: -0.3s;
+  }
+
+  .header-line span.line19 {
+    animation-delay: -0.2s;
+  }
+
+  .header-line span.line20 {
+    animation-delay: -0.1s;
+  }
+
+  @keyframes note {
+    from {
+      transform: scaleY(1);
+    }
+    to {
+      transform: scaleY(4);
+    }
+  }
+}
 </style>
diff --git a/src/pages/resourcesManage/resourcesManage.vue b/src/pages/resourcesManage/resourcesManage.vue
index b02d67f1..d57e3358 100644
--- a/src/pages/resourcesManage/resourcesManage.vue
+++ b/src/pages/resourcesManage/resourcesManage.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="resourcesManage">
     <div class="tab">
-      <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96"
+              :bar-style="barStyle"></u-tabs>
     </div>
     <div class="record" v-if="currIndex == 0">
       <div class="item" v-for="(item, index) in list" :key="index" @click="choose(item)">
@@ -21,161 +22,167 @@
     <u-popup v-model="isShow" mode="bottom">
       <div class="audio">
         <AiVideo :src="url" autoplay></AiVideo>
-			  <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
+        <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
       </div>
-		</u-popup>
+    </u-popup>
     <AiBack></AiBack>
   </div>
 </template>
-<script> 
-  import AiVideo from '@/components/AiVideo'
-  import AiBack from "@/components/AiBack";
-  export default {
-    name: "resourcesManage",
-    data() {
-      return {
-        tab: [{ name: '音频素材' }, { name: '文本素材' }],
-        list: [],
-        currIndex: 0,
-        current: 1,
-        isChoose: false,
-        isMore: false,
-        isShow: false,
-        url: '',
-        autioName: '',
-        audio: null,
-        barStyle: {width:'98px', bottom: '-3px', left: '-38px'}
-      }
-    },
+<script>
+import AiVideo from '@/components/AiVideo'
+import AiBack from "@/components/AiBack";
 
-    components: {
-      AiBack,
-      AiVideo
-    },
+export default {
+  name: "resourcesManage",
+  data() {
+    return {
+      tab: [{name: '音频素材'}, {name: '文本素材'}],
+      list: [],
+      currIndex: 0,
+      current: 1,
+      isChoose: false,
+      isMore: false,
+      isShow: false,
+      url: '',
+      autioName: '',
+      audio: null,
+      barStyle: {width: '98px', bottom: '-3px', left: '-38px'}
+    }
+  },
 
-    onLoad (query) {
-      this.isChoose = query.isChoose ? true : false
-      this.getList()
-      uni.$on('getList', e => {
-        this.isMore = false
-        this.list = []
-        this.current = 1
+  components: {
+    AiBack,
+    AiVideo
+  },
 
-        this.$nextTick(() => {
-          this.getList()
-        })
+  onLoad(query) {
+    this.isChoose = query.isChoose ? true : false
+    this.getList()
+    uni.$on('getList', e => {
+      this.isMore = false
+      this.list = []
+      this.current = 1
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    })
+  },
+
+  methods: {
+    change(index) {
+      this.isMore = false
+      this.list = []
+      this.current = 1
+      this.currIndex = index
+
+      this.$nextTick(() => {
+        this.getList()
       })
     },
 
-    methods: {
-      change(index) {
-        this.isMore = false
-        this.list = []
-        this.current = 1
-        this.currIndex = index
-
-        this.$nextTick(() => {
-          this.getList()
-        })
-      },
-
-      add () {
-        uni.navigateTo({
-          url: `/pages/resourcesManage/addPlay?type=${this.currIndex === 0 ? 1 : 3}`
-        })
-      },
-
-      choose (item) {
-        if (!this.isChoose) {
-          console.log(item.url)
-          this.url = item.url
-          this.isShow = true
-
-          return false
-        }
-
-        uni.$emit('choose', {
-          mediaId: item.id,
-          mediaName: item.name
-        })
-        uni.navigateBack({
-          delta: 1
-        })
-      },
-
-      getList () {
-        if (this.isMore) return
-
-        this.$http.post(`/app/appdlbresource/list`, null, {
-          params: {
-            ...this.search,
-            type: this.currIndex === 0 ? 1 : 3,
-            current: this.current,
-            size: 10
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            uni.hideLoading()
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
-          } else {
-            uni.hideLoading()
-          }
-        }).catch(() => {
-          uni.hideLoading()
-        })
-      }
+    add() {
+      uni.navigateTo({
+        url: `/pages/resourcesManage/addPlay?type=${this.currIndex === 0 ? 1 : 3}`
+      })
     },
 
-    onReachBottom() {
-      this.getList()
+    choose(item) {
+      if (!this.isChoose) {
+        console.log(item.url)
+        this.url = item.url
+        this.isShow = true
+
+        return false
+      }
+
+      uni.$emit('choose', {
+        mediaId: item.id,
+        mediaName: item.name
+      })
+      uni.navigateBack({
+        delta: 1
+      })
+    },
+
+    getList() {
+      if (this.isMore) return
+
+      this.$http.post(`/app/appdlbresource/list`, null, {
+        params: {
+          ...this.search,
+          type: this.currIndex === 0 ? 1 : 3,
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+
+          uni.hideLoading()
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
     }
+  },
+
+  onReachBottom() {
+    this.getList()
   }
+}
 </script>
 <style lang="scss" scoped>
 .resourcesManage {
   padding-bottom: 128px;
-  .tab{
+
+  .tab {
     border-bottom: 1px solid #ddd;
     margin-bottom: 4px;
   }
 
   .audio {
     width: 100%;
-    height: 400rpx;
+    height: 400 rpx;
     box-sizing: border-box;
-    padding: 104rpx 0 46rpx;
+    padding: 104 rpx 0 46 rpx;
+
     audio {
 
     }
   }
 
-  .record{
+  .record {
     background-color: #fff;
-    .item{
+
+    .item {
       width: 100%;
       display: flex;
       border-bottom: 1px solid #ddd;
       padding: 32px 30px;
       box-sizing: border-box;
-      img{
+
+      img {
         width: 56px;
         height: 56px;
         margin-right: 14px;
       }
-      .info{
+
+      .info {
         width: calc(100% - 70px);
         line-height: 44px;
         font-size: 34px;
@@ -192,34 +199,41 @@
       }
     }
   }
-  .record-text{
-     background-color: #fff;
-    .item{
+
+  .record-text {
+    background-color: #fff;
+
+    .item {
       width: 100%;
       border-bottom: 1px solid #ddd;
       padding: 32px 30px;
       box-sizing: border-box;
       font-size: 30px;
-      div{
+
+      div {
         font-size: 30px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #333;
-        overflow: hidden; 
-        text-overflow:ellipsis; 
+        overflow: hidden;
+        text-overflow: ellipsis;
         white-space: nowrap;
         margin-bottom: 12px;
-        .color-0063E5{
+
+        .color-0063E5 {
           color: #0063E5;
         }
-        .color-FF8100{
+
+        .color-FF8100 {
           color: #FF8100;
         }
-        .color-FF4466{
+
+        .color-FF4466 {
           color: #FF4466;
         }
       }
-      p{
+
+      p {
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
         color: #666;
@@ -235,7 +249,8 @@
       }
     }
   }
-  .add-img{
+
+  .add-img {
     width: 120px;
     position: fixed;
     bottom: 120px;
diff --git a/src/pages/resourcesManage/talking.vue b/src/pages/resourcesManage/talking.vue
index ec5ad764..1d5e7002 100644
--- a/src/pages/resourcesManage/talking.vue
+++ b/src/pages/resourcesManage/talking.vue
@@ -15,28 +15,25 @@
     </div>
   </div>
 </template>
-<script> 
+<script>
 export default {
   name: "talking",
   data() {
-    return {
-      
-    }
-  },
-  methods: {
-    
+    return {}
   },
+  methods: {},
   mounted() {
 
   }
 }
 </script>
 <style lang="scss" scoped>
-uni-page-body{
+uni-page-body {
   background-color: #fff;
 }
+
 .talking {
-  .header{
+  .header {
     width: 100%;
     height: 128px;
     background: #F6F8FC;
@@ -44,41 +41,49 @@ uni-page-body{
     box-sizing: border-box;
     display: flex;
     justify-content: space-between;
-    p{
+
+    p {
       font-size: 32px;
       color: #333;
       line-height: 44px;
-      span{
+
+      span {
         color: #1174FE;
       }
     }
-    img{
+
+    img {
       width: 32px;
       height: 32px;
     }
   }
-  .content{
+
+  .content {
     margin-top: 224px;
-    .time{
+
+    .time {
       width: 100%;
       text-align: center;
       font-size: 96px;
       color: #000000;
       line-height: 134px;
     }
-    img{
+
+    img {
       width: 406px;
       height: 306px;
       margin: 0 0 48px 172px;
     }
-    .text{
+
+    .text {
       font-size: 30px;
       color: #999;
       line-height: 42px;
       text-align: center;
     }
   }
-  .footer{
+
+  .footer {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -87,10 +92,11 @@ uni-page-body{
     background: #F6F8FC;
     padding: 20px 310px;
     box-sizing: border-box;
-    img{
+
+    img {
       width: 128px;
       height: 128px;
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/snapshot/snapshot.vue b/src/pages/snapshot/snapshot.vue
index 0972853f..788e7500 100644
--- a/src/pages/snapshot/snapshot.vue
+++ b/src/pages/snapshot/snapshot.vue
@@ -38,9 +38,9 @@
         <u-row justify="between">
           <u-row>
             <img
-              class="avatar"
-              :src="item.portrait ? item.portrait : $cdn + 'other/tx.png'"
-              alt=""/>
+                class="avatar"
+                :src="item.portrait ? item.portrait : $cdn + 'other/tx.png'"
+                alt=""/>
             <div class="wrap">
               <span class="name">{{ item.nickName }}</span>
               <span class="date">{{ item.createTime }}</span>
@@ -48,7 +48,7 @@
           </u-row>
           <u-row>
             <u-icon :name="$cdn + 'Location2@2x.png'" :custom-style="{width:'20px',height:'20px'}"></u-icon>
-            <span class="date">{{item.areaName}}</span>
+            <span class="date">{{ item.areaName }}</span>
           </u-row>
         </u-row>
         <div class="content">
@@ -141,7 +141,7 @@ export default {
           status: this.currentType,
           reportType: this.reportIndex == 6 ? null : this.reportIndex,
           address: this.keyword,
-          areaId:this.user?.areaId
+          areaId: this.user?.areaId
         }
       }).then(res => {
         if (res?.code == 0) {
diff --git a/src/pages/snapshot/snapshotDetail.vue b/src/pages/snapshot/snapshotDetail.vue
index f6722b37..88da5129 100644
--- a/src/pages/snapshot/snapshotDetail.vue
+++ b/src/pages/snapshot/snapshotDetail.vue
@@ -30,12 +30,13 @@
       <text class="title">事件描述</text>
       <div class="content">{{ detail.explain }}</div>
       <div class="photos">
-        <img :src="item.url" alt="" v-for="(item,index) in detail.files" :key="index" @click.stop="previewImage(detail.files,index)">
+        <img :src="item.url" alt="" v-for="(item,index) in detail.files" :key="index"
+             @click.stop="previewImage(detail.files,index)">
       </div>
       <template v-if="detail.handleResult">
         <u-row justify="space-between" class="result">
           <text class="title">处理结果</text>
-          <text>{{detail.integral|formt}}</text>
+          <text>{{ detail.integral|formt }}</text>
         </u-row>
         <div class="content">{{ detail.handleResult }}</div>
         <div class="photos">
@@ -93,7 +94,7 @@ export default {
     }
   },
   methods: {
-    previewImage(data,index) {
+    previewImage(data, index) {
       uni.previewImage({
         urls: data.map(e => e.url),
         current: data[index].url
@@ -117,8 +118,8 @@ export default {
     }
   },
 
-  filters:{
-    formt(val){
+  filters: {
+    formt(val) {
       return +val > 0 ? `+${val}` : val
     }
   }
diff --git a/src/pages/supermarket/balance.vue b/src/pages/supermarket/balance.vue
index b443151f..8c30d9eb 100644
--- a/src/pages/supermarket/balance.vue
+++ b/src/pages/supermarket/balance.vue
@@ -5,8 +5,8 @@
       <div class="select" @click="handleSelect">
         {{
           selected
-            ? `${selected.familyName}家 剩余积分:${selected.familyIntegral}分`
-            : '请选择'
+              ? `${selected.familyName}家 剩余积分:${selected.familyIntegral}分`
+              : '请选择'
         }}
         <u-icon name="arrow-right" color="#E2E2E2" size="28"></u-icon>
       </div>
@@ -16,15 +16,15 @@
 
     <scroll-view scroll-y class="category-wrap">
       <div
-        class="category-item"
-        v-for="(item, index) in categoryList"
-        :key="index"
+          class="category-item"
+          v-for="(item, index) in categoryList"
+          :key="index"
       >
-        <img class="category-img" :src="parseObj(item.photo)" alt="" />
+        <img class="category-img" :src="parseObj(item.photo)" alt=""/>
         <div class="category-info">
           <label class="hidden">{{ item.merchandiseName }}</label>
           <span class="score"
-            >{{ item.costIntegral }}
+          >{{ item.costIntegral }}
             <span>积分</span>
           </span>
           <div class="wrap">×{{ item.merchandiseNumber }}</div>
@@ -35,13 +35,13 @@
       <div class="sum">
         <span>共{{ totalCount }}件商品</span>
         <span
-          >合计：{{ totalScore }}
+        >合计：{{ totalScore }}
           <span>积分</span>
         </span>
       </div>
       <div class="btn" @click="hanldeSubmit">确认领取</div>
     </div>
-    <back />
+    <back/>
   </div>
 </template>
 
@@ -50,7 +50,7 @@ import Back from '../../components/AiBack'
 
 export default {
   name: 'balance',
-  components: { Back },
+  components: {Back},
   data() {
     return {
       selected: null,
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     uri() {
-      return this.$cdn+'other/' + 'line.png'
+      return this.$cdn + 'other/' + 'line.png'
     }
   },
 
@@ -95,39 +95,39 @@ export default {
           title: '请选择结算对象',
           icon: 'none'
         })
-      let { memberId, familyId } = this.selected
+      let {memberId, familyId} = this.selected
       this.$http
-        .post(`/app/appvillagerintegralshoporder/addOrder`, {
-          shopId: this.categoryList[0].shopId,
-          memberId,
-          familyId,
-          orderIntegral: this.totalScore,
-          merchandiseList: this.categoryList.map(e => {
-            return {
-              ...e,
-              merchandiseId: e.id
-            }
-          })
-        })
-        .then(res => {
-          if (res.code == 0) {
-            uni.navigateTo({
-              url: '/pages/supermarket/components/resultPage/resultPage'
-            })
-          } else {
-            uni.navigateTo({
-              url:
-                '/pages/supermarket/components/resultPage/resultPage?flag=' +
-                false
-            })
+      .post(`/app/appvillagerintegralshoporder/addOrder`, {
+        shopId: this.categoryList[0].shopId,
+        memberId,
+        familyId,
+        orderIntegral: this.totalScore,
+        merchandiseList: this.categoryList.map(e => {
+          return {
+            ...e,
+            merchandiseId: e.id
           }
         })
-        .catch(e => {
-          uni.showToast({
-            title: e || '网络异常',
-            icon: 'none'
+      })
+      .then(res => {
+        if (res.code == 0) {
+          uni.navigateTo({
+            url: '/pages/supermarket/components/resultPage/resultPage'
           })
+        } else {
+          uni.navigateTo({
+            url:
+                '/pages/supermarket/components/resultPage/resultPage?flag=' +
+                false
+          })
+        }
+      })
+      .catch(e => {
+        uni.showToast({
+          title: e || '网络异常',
+          icon: 'none'
         })
+      })
     },
     handleSelect() {
       uni.navigateTo({
@@ -142,6 +142,7 @@ export default {
 .balance {
   min-height: 100%;
   background-color: #ffffff;
+
   .operate {
     height: 120px;
     display: flex;
diff --git a/src/pages/supermarket/components/resultPage/resultPage.vue b/src/pages/supermarket/components/resultPage/resultPage.vue
index 812dce09..d8d0e7d4 100644
--- a/src/pages/supermarket/components/resultPage/resultPage.vue
+++ b/src/pages/supermarket/components/resultPage/resultPage.vue
@@ -1,69 +1,72 @@
 <template>
   <div class="result-page">
     <img :src="imgSrc" alt="">
-    <text>{{text}}</text>
-    <u-button type="primary" :custom-style="{width:'100%',borderRadius:'4px',marginTop:'48px'}" @click="goBack">{{btnText}}</u-button>
+    <text>{{ text }}</text>
+    <u-button type="primary" :custom-style="{width:'100%',borderRadius:'4px',marginTop:'48px'}" @click="goBack">
+      {{ btnText }}
+    </u-button>
     <back></back>
   </div>
 </template>
 
 <script>
-  import Back from "../../../../components/AiBack";
-  export default {
-    name: "result-page",
-    components: {Back},
-    data() {
-      return {
-        flag: true
-      }
+import Back from "../../../../components/AiBack";
+
+export default {
+  name: "result-page",
+  components: {Back},
+  data() {
+    return {
+      flag: true
+    }
+  },
+  onLoad(val) {
+    if (val.flag) {
+      this.flag = val.flag
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack({
+        delta: 3
+      })
+    }
+  },
+  computed: {
+    text() {
+      return this.flag ? '领取成功！' : '领取失败！请联系管理员处理'
     },
-    onLoad(val) {
-      if (val.flag) {
-        this.flag = val.flag
-      }
+    btnText() {
+      return this.flag ? '确定' : '我知道了'
     },
-    methods: {
-      goBack() {
-        uni.navigateBack({
-          delta:3
-        })
-      }
-    },
-    computed: {
-      text(){
-        return this.flag ? '领取成功！' : '领取失败！请联系管理员处理'
-      },
-      btnText(){
-        return this.flag ? '确定' : '我知道了'
-      },
-      imgSrc(){
-        return this.flag ? (this.$cdn+'other/' + 'kztcg.png') : (this.$cdn+'other/' + 'kztsb.png')
-      }
+    imgSrc() {
+      return this.flag ? (this.$cdn + 'other/' + 'kztcg.png') : (this.$cdn + 'other/' + 'kztsb.png')
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .result-page {
-    min-height: 100%;
-    background-color: #ffffff;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 96px ;
+.result-page {
+  min-height: 100%;
+  background-color: #ffffff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 96px;
 
-    img {
-      width: 192px;
-      height: 192px;
-    }
-
-    text{
-      font-size: 36px;
-      font-weight: 800;
-      color: #333333;
-      line-height: 50px;
-      display: flex;
-      justify-content: center;
-    }
+  img {
+    width: 192px;
+    height: 192px;
   }
+
+  text {
+    font-size: 36px;
+    font-weight: 800;
+    color: #333333;
+    line-height: 50px;
+    display: flex;
+    justify-content: center;
+  }
+}
 </style>
diff --git a/src/pages/supermarket/search.vue b/src/pages/supermarket/search.vue
index 8a4d8f44..412b68ec 100644
--- a/src/pages/supermarket/search.vue
+++ b/src/pages/supermarket/search.vue
@@ -5,8 +5,8 @@
     </div>
     <div class="result-body">
       <div class="res-item" v-if="result" @click="selected">
-        <span>{{result.familyName}}家</span>
-        <span>剩余积分:{{result.familyIntegral}}分</span>
+        <span>{{ result.familyName }}家</span>
+        <span>剩余积分:{{ result.familyIntegral }}分</span>
       </div>
       <span class="placeholder" v-else>请通过搜索“
         <strong>手机号或身份证号</strong>
@@ -20,101 +20,101 @@
 </template>
 
 <script>
-  import back from "../../components/AiBack";
+import back from "../../components/AiBack";
 
-  export default {
-    name: "search",
-    components: {back},
-    data() {
-      return {
-        keyword: "",
-        show: false,
-        result: null,
-      }
-    },
-    methods: {
-      selected() {
-        uni.navigateBack({
-          delta: 1,
-          success: () => {
-            uni.$emit('selected',this.result)
-          },
-          fail: (err) => {
-            console.error(err)
-          }
-        })
-      },
-      search() {
-        if (this.keyword == "") {
-          return uni.showToast({
-            title: "请输入搜索关键字",
-            icon: 'none'
-          })
+export default {
+  name: "search",
+  components: {back},
+  data() {
+    return {
+      keyword: "",
+      show: false,
+      result: null,
+    }
+  },
+  methods: {
+    selected() {
+      uni.navigateBack({
+        delta: 1,
+        success: () => {
+          uni.$emit('selected', this.result)
+        },
+        fail: (err) => {
+          console.error(err)
         }
-
-        this.$http.post(`/app/appresident/queryFamilyByPhone`, null, {
-          params: {
-            phone: this.keyword
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.result = res.data
-          }
-        }).catch(e => {
-          this.result = null
-          uni.showToast({
-            title: e,
-            icon: 'none'
-          })
+      })
+    },
+    search() {
+      if (this.keyword == "") {
+        return uni.showToast({
+          title: "请输入搜索关键字",
+          icon: 'none'
         })
-      },
-      confirm() {
-        this.show = false
       }
+
+      this.$http.post(`/app/appresident/queryFamilyByPhone`, null, {
+        params: {
+          phone: this.keyword
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.result = res.data
+        }
+      }).catch(e => {
+        this.result = null
+        uni.showToast({
+          title: e,
+          icon: 'none'
+        })
+      })
+    },
+    confirm() {
+      this.show = false
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .search {
-    min-height: 100%;
-    background-color: #ffffff;
-
-    .search-wrap {
-      width: 100%;
-      box-sizing: border-box;
-      padding: 24px 32px;
-    }
-
-    .result-body {
-
-      .res-item {
-        height: 112px;
-        border-bottom: 1px solid #F5F5F5;
-        box-sizing: border-box;
-        padding: 0 56px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        & > span {
-          font-size: 32px;
-          color: #333333;
-        }
-      }
-
-      .placeholder {
-        display: flex;
-        justify-content: center;
-        margin-top: 144px;
-        font-size: 28px;
-        color: #999999;
-
-        & > strong {
-          color: #135AB8;
-        }
-      }
-    }
+.search {
+  min-height: 100%;
+  background-color: #ffffff;
 
+  .search-wrap {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 24px 32px;
   }
+
+  .result-body {
+
+    .res-item {
+      height: 112px;
+      border-bottom: 1px solid #F5F5F5;
+      box-sizing: border-box;
+      padding: 0 56px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      & > span {
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+    .placeholder {
+      display: flex;
+      justify-content: center;
+      margin-top: 144px;
+      font-size: 28px;
+      color: #999999;
+
+      & > strong {
+        color: #135AB8;
+      }
+    }
+  }
+
+}
 </style>
diff --git a/src/pages/supermarket/supermarket.vue b/src/pages/supermarket/supermarket.vue
index 6f16d478..18a98b50 100644
--- a/src/pages/supermarket/supermarket.vue
+++ b/src/pages/supermarket/supermarket.vue
@@ -5,7 +5,7 @@
         <scroll-view scroll-y style="height: 100%;">
           <div class="nav-left-item" v-for="(val, key, index) in list" :style="active(key)" :key="index"
                @click="clickSort(key,index)">
-            {{key}}分区
+            {{ key }}分区
             <u-badge size="mini" :count="sortCountList[index]" absolute :offset="[5,5]"></u-badge>
           </div>
         </scroll-view>
@@ -14,17 +14,17 @@
         <scroll-view scroll-y style="height: 100%;">
           <div class="category-item" v-for="(item,index) in categoryList" :key="index">
             <img
-              :src="parseObj(item.photo)"
-              class="category-img" alt="">
+                :src="parseObj(item.photo)"
+                class="category-img" alt="">
             <div class="category-info">
-              <label class="hidden">{{item.merchandiseName}}</label>
-              <span class="score">{{item.costIntegral}}
+              <label class="hidden">{{ item.merchandiseName }}</label>
+              <span class="score">{{ item.costIntegral }}
                 <span>积分</span>
               </span>
               <div class="wrap">
                 <div class="lxc-count">
                   <div class="less" @click="less(item,index)">-</div>
-                  <div class="num">{{item.merchandiseNumber}}</div>
+                  <div class="num">{{ item.merchandiseNumber }}</div>
                   <div class="less" @click="add(item,index)">+</div>
                 </div>
               </div>
@@ -34,8 +34,8 @@
       </div>
       <div class="footer">
         <div class="sum">
-          <span>共{{totalCount}}件商品</span>
-          <span>合计：{{totalScore}}
+          <span>共{{ totalCount }}件商品</span>
+          <span>合计：{{ totalScore }}
           <span>积分</span>
         </span>
         </div>
@@ -47,291 +47,294 @@
 </template>
 
 <script>
-  import AiEmpty from "../../components/AiEmpty";
-  import {mapState} from "vuex";
-  export default {
-    name: "supermarket",
-    components: {AiEmpty},
-    data() {
-      return {
-        list: {},
-        idx: 0,
-        totalScore: 0,
-        sortCountList: [],
-        mark: 0,
-      }
-    },
+import AiEmpty from "../../components/AiEmpty";
+import {mapState} from "vuex";
 
-    onLoad() {
-      this.getList()
-    },
+export default {
+  name: "supermarket",
+  components: {AiEmpty},
+  data() {
+    return {
+      list: {},
+      idx: 0,
+      totalScore: 0,
+      sortCountList: [],
+      mark: 0,
+    }
+  },
 
-    watch: {
-      list: {
-        handler(val) {
-          let sum = 0
-          Object.keys(val).map(e=>{
-            val[e].map(p=>{
-              if (p.merchandiseNumber != 0) {
-                sum += (p.merchandiseNumber) * (p.costIntegral)
-              }
-            })
-          })
-          this.totalScore = sum
-        },
-        immediate: true,
-        deep: true
-      }
-    },
+  onLoad() {
+    this.getList()
+  },
 
-    computed: {
-      ...mapState(['user']),
-      totalCount() {
-        return this.sortCountList.reduce((pre, cur) => (pre + cur), 0)
-      },
-
-      categoryList() {
-        return this.idx == 0 ? this.list[Object.keys(this.list)[0]] : this.list[this.idx]
-      },
-    },
-
-    methods: {
-      handleSubmit() {
-        if (this.totalCount == 0) {
-          return uni.showToast({
-            title: "您还没有选择商品",
-            icon: 'none'
-          })
-        }
-        let filter = []
-        Object.keys(this.list).map(e => {
-          this.list[e].map(p => {
-            if (p.merchandiseNumber > 0) {
-              filter.push(p)
+  watch: {
+    list: {
+      handler(val) {
+        let sum = 0
+        Object.keys(val).map(e => {
+          val[e].map(p => {
+            if (p.merchandiseNumber != 0) {
+              sum += (p.merchandiseNumber) * (p.costIntegral)
             }
           })
         })
-        uni.navigateTo({
-          url: "/pages/supermarket/balance?category=" + JSON.stringify(filter)
-        })
+        this.totalScore = sum
       },
-      active(key) {
-        const flag = key == this.idx
-        return {
-          borderLeft: flag ? '3px solid #1D58FE' : '',
-          background: flag ? 'linear-gradient(270deg, #FFFFFF 0%, #FFFFFF 77%, #E7EAFA 100%)' : ''
-        }
-      },
-      add(item, index) {
-        this.list[this.idx][index]["merchandiseNumber"] = this.list[this.idx][index]["merchandiseNumber"] + 1
-        this.$set(this.sortCountList, this.mark, this.list[this.idx]?.reduce((pre,curr)=>{
-          return (pre + curr.merchandiseNumber)
-        },0))
-      },
-      less(item, index) {
-        if (item.merchandiseNumber > 0) {
-          this.list[this.idx][index]["merchandiseNumber"] = this.list[this.idx][index]["merchandiseNumber"] - 1
-          this.$set(this.sortCountList, this.mark, this.list[this.idx]?.reduce((pre,curr)=>{
-            return (pre + curr.merchandiseNumber)
-          },0))
-        }
-      },
-      clickSort(key, index) {
-        this.mark = index
-        this.idx = key.toString()
-      },
-      parseObj(json) {
-        return JSON.parse(json || '[]')[0]?.url
-      },
-      getList() {
-        this.$http.post(`/app/appvillagerintegralmerchandise/listByIntegral`, null, {
-          params: {
-            areaId: this.user?.areaId
-          }
-        }).then(res => {
-          if (res && res.data) {
-            Object.keys(res.data).map(e => {
-              res.data[e].map(p => {
-                p.merchandiseNumber = 0
-              })
-            })
-            this.list = res.data
-            this.idx = Object.keys(res.data)[0]
-            this.sortCountList = Array(Object.keys(res.data).length).fill(0)
-          }
-        })
-      }
+      immediate: true,
+      deep: true
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+    totalCount() {
+      return this.sortCountList.reduce((pre, cur) => (pre + cur), 0)
     },
 
-  }
+    categoryList() {
+      return this.idx == 0 ? this.list[Object.keys(this.list)[0]] : this.list[this.idx]
+    },
+  },
+
+  methods: {
+    handleSubmit() {
+      if (this.totalCount == 0) {
+        return uni.showToast({
+          title: "您还没有选择商品",
+          icon: 'none'
+        })
+      }
+      let filter = []
+      Object.keys(this.list).map(e => {
+        this.list[e].map(p => {
+          if (p.merchandiseNumber > 0) {
+            filter.push(p)
+          }
+        })
+      })
+      uni.navigateTo({
+        url: "/pages/supermarket/balance?category=" + JSON.stringify(filter)
+      })
+    },
+    active(key) {
+      const flag = key == this.idx
+      return {
+        borderLeft: flag ? '3px solid #1D58FE' : '',
+        background: flag ? 'linear-gradient(270deg, #FFFFFF 0%, #FFFFFF 77%, #E7EAFA 100%)' : ''
+      }
+    },
+    add(item, index) {
+      this.list[this.idx][index]["merchandiseNumber"] = this.list[this.idx][index]["merchandiseNumber"] + 1
+      this.$set(this.sortCountList, this.mark, this.list[this.idx]?.reduce((pre, curr) => {
+        return (pre + curr.merchandiseNumber)
+      }, 0))
+    },
+    less(item, index) {
+      if (item.merchandiseNumber > 0) {
+        this.list[this.idx][index]["merchandiseNumber"] = this.list[this.idx][index]["merchandiseNumber"] - 1
+        this.$set(this.sortCountList, this.mark, this.list[this.idx]?.reduce((pre, curr) => {
+          return (pre + curr.merchandiseNumber)
+        }, 0))
+      }
+    },
+    clickSort(key, index) {
+      this.mark = index
+      this.idx = key.toString()
+    },
+    parseObj(json) {
+      return JSON.parse(json || '[]')[0]?.url
+    },
+    getList() {
+      this.$http.post(`/app/appvillagerintegralmerchandise/listByIntegral`, null, {
+        params: {
+          areaId: this.user?.areaId
+        }
+      }).then(res => {
+        if (res && res.data) {
+          Object.keys(res.data).map(e => {
+            res.data[e].map(p => {
+              p.merchandiseNumber = 0
+            })
+          })
+          this.list = res.data
+          this.idx = Object.keys(res.data)[0]
+          this.sortCountList = Array(Object.keys(res.data).length).fill(0)
+        }
+      })
+    }
+  },
+
+}
 </script>
 
 <style lang="scss" scoped>
-  uni-page-body{
-    background-color: #ffffff;
-  }
+uni-page-body {
+  background-color: #ffffff;
+}
 
-  .supermarket {
-    background-color: #ffffff;
-    display: flex;
-    justify-content: space-between;
-    padding-bottom: 104px;
+.supermarket {
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 104px;
 
-    .nav-left {
-      width: 168px;
-      height: 100%;
+  .nav-left {
+    width: 168px;
+    height: 100%;
 
-      .nav-left-item {
-        height: 104px;
-        background: #FAF9FB;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 28px;
-        color: #333333;
-        border-top: 1px solid #D8E5FF;
-        border-left: 2px solid transparent;
-        position: relative;
-
-        &:nth-last-child {
-          border-bottom: 1px solid #D8E5FF;
-        }
-      }
-    }
-
-    .nav-right {
-      width: calc(100% - 168px - 24px);
-      height: 100%;
-
-      .category-item {
-        height: 264px;
-        box-sizing: border-box;
-        padding: 28px 32px 44px 30px;
-        display: flex;
-
-        .category-img {
-          width: 192px;
-          height: 192px;
-          border: 1px solid #F6F6F6;
-          flex-shrink: 0;
-          margin-right: 30px;
-        }
-
-        .category-info {
-          width: 100%;
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-
-          & > label {
-            font-size: 30px;
-            font-weight: 800;
-            color: #333333;
-            line-height: 42px;
-          }
-
-          .score {
-            font-size: 40px;
-            font-weight: 600;
-            color: #FA4A51;
-            line-height: 40px;
-
-            & > span {
-              font-size: 24px;
-              color: #FA4A51;
-              margin-left: 8px;
-            }
-          }
-
-          .wrap {
-            display: flex;
-            justify-content: flex-end;
-            .lxc-count{
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              .less{
-                width: 40px;
-                height: 40px;
-                font-size: 20px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                font-size: 36px;
-                font-weight: 500;
-                color: #333333;
-              }
-
-              .num{
-                width: 89px;
-                height: 61px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                background: #F6F6F6;
-                border-radius: 10px;
-                font-size: 28px;
-                font-weight: 400;
-                color: #333333;
-                margin: 0 16px;
-              }
-            }
-
-          }
-        }
-      }
-    }
-
-    .footer {
+    .nav-left-item {
+      height: 104px;
+      background: #FAF9FB;
       display: flex;
       align-items: center;
-      width: 100%;
-      background-color: #ffffff;
-      z-index: 100;
-      height: 104px;
-      box-shadow: 0px -2px 8px 0px rgba(214, 214, 214, 0.5);
-      position: fixed;
-      left: 0;
-      bottom: 0;
+      justify-content: center;
+      font-size: 28px;
+      color: #333333;
+      border-top: 1px solid #D8E5FF;
+      border-left: 2px solid transparent;
+      position: relative;
 
-      .sum {
-        width: calc(100% - 212px);
-        box-sizing: border-box;
-        padding: 30px;
+      &:nth-last-child {
+        border-bottom: 1px solid #D8E5FF;
+      }
+    }
+  }
+
+  .nav-right {
+    width: calc(100% - 168px - 24px);
+    height: 100%;
+
+    .category-item {
+      height: 264px;
+      box-sizing: border-box;
+      padding: 28px 32px 44px 30px;
+      display: flex;
+
+      .category-img {
+        width: 192px;
+        height: 192px;
+        border: 1px solid #F6F6F6;
+        flex-shrink: 0;
+        margin-right: 30px;
+      }
+
+      .category-info {
+        width: 100%;
         display: flex;
+        flex-direction: column;
         justify-content: space-between;
 
-        & > span:nth-child(1), span:nth-child(2) {
-          font-size: 32px;
-          font-weight: 400;
-          color: #F94246;
+        & > label {
+          font-size: 30px;
+          font-weight: 800;
+          color: #333333;
+          line-height: 42px;
+        }
+
+        .score {
+          font-size: 40px;
+          font-weight: 600;
+          color: #FA4A51;
+          line-height: 40px;
 
           & > span {
             font-size: 24px;
-            margin-left: 12px;
+            color: #FA4A51;
+            margin-left: 8px;
           }
         }
-      }
 
-      .btn {
-        width: 212px;
-        height: 100%;
-        background-color: #1365DD;
-        font-size: 36px;
-        font-weight: 500;
-        color: #FFFFFF;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
+        .wrap {
+          display: flex;
+          justify-content: flex-end;
 
-    .hidden {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      -webkit-line-clamp: 2;
+          .lxc-count {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            .less {
+              width: 40px;
+              height: 40px;
+              font-size: 20px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 36px;
+              font-weight: 500;
+              color: #333333;
+            }
+
+            .num {
+              width: 89px;
+              height: 61px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              background: #F6F6F6;
+              border-radius: 10px;
+              font-size: 28px;
+              font-weight: 400;
+              color: #333333;
+              margin: 0 16px;
+            }
+          }
+
+        }
+      }
     }
   }
+
+  .footer {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    background-color: #ffffff;
+    z-index: 100;
+    height: 104px;
+    box-shadow: 0px -2px 8px 0px rgba(214, 214, 214, 0.5);
+    position: fixed;
+    left: 0;
+    bottom: 0;
+
+    .sum {
+      width: calc(100% - 212px);
+      box-sizing: border-box;
+      padding: 30px;
+      display: flex;
+      justify-content: space-between;
+
+      & > span:nth-child(1), span:nth-child(2) {
+        font-size: 32px;
+        font-weight: 400;
+        color: #F94246;
+
+        & > span {
+          font-size: 24px;
+          margin-left: 12px;
+        }
+      }
+    }
+
+    .btn {
+      width: 212px;
+      height: 100%;
+      background-color: #1365DD;
+      font-size: 36px;
+      font-weight: 500;
+      color: #FFFFFF;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .hidden {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
+}
 </style>
diff --git a/src/pages/workTask/components/create.vue b/src/pages/workTask/components/create.vue
index bdb1c073..c10b2183 100644
--- a/src/pages/workTask/components/create.vue
+++ b/src/pages/workTask/components/create.vue
@@ -8,7 +8,7 @@
           </div>
           <picker @change="change" :value="form.type" range-key="dictName" :range="$dict.getDict('workTaskType')">
             <u-row>
-              <div v-if="form.type!=null" class="value">{{$dict.getDict('workTaskType')[form.type]["dictName"]}}</div>
+              <div v-if="form.type!=null" class="value">{{ $dict.getDict('workTaskType')[form.type]["dictName"] }}</div>
               <div v-else class="placeholder">请选择</div>
               <div class="arrow"></div>
             </u-row>
@@ -41,7 +41,7 @@
           </div>
           <picker @change="dateChange" mode="date" :value="form.lastTime" :start="startDate" :end="endDate">
             <u-row>
-              <div v-if="form.lastTime!=null" class="value">{{form.lastTime}}</div>
+              <div v-if="form.lastTime!=null" class="value">{{ form.lastTime }}</div>
               <div v-else class="placeholder">请选择</div>
               <div class="arrow" v-if="form.lastTime==null"></div>
               <div class="clear" v-else @click.stop="form.lastTime = null"></div>
@@ -56,8 +56,8 @@
           </div>
           <u-row @click="handleSelectUser(0)" style="justify-content: flex-end">
             <div v-if="form.userInfoList.length" class="value">
-              已选择<em>{{form.userInfoList.slice(0,2).map(e=>e.name).join("、")}}</em>等
-              <em>{{form.userInfoList.length}}</em>人
+              已选择<em>{{ form.userInfoList.slice(0, 2).map(e => e.name).join("、") }}</em>等
+              <em>{{ form.userInfoList.length }}</em>人
             </div>
             <div v-else class="placeholder">请选择</div>
             <div class="arrow"></div>
@@ -69,8 +69,8 @@
           <div class="left" style="line-height: 22px;">督办人</div>
           <u-row @click="handleSelectUser(1)" style="justify-content: flex-end">
             <div v-if="form.checkUserList.length" class="value">
-              已选择<em>{{form.checkUserList.slice(0,2).map(e=>e.name).join("、")}}</em>等
-              <em>{{form.checkUserList.length}}</em>人
+              已选择<em>{{ form.checkUserList.slice(0, 2).map(e => e.name).join("、") }}</em>等
+              <em>{{ form.checkUserList.length }}</em>人
             </div>
             <div v-else class="placeholder">请选择</div>
             <div class="arrow"></div>
@@ -82,8 +82,8 @@
           <div class="left" style="line-height: 22px;">抄送人</div>
           <u-row @click="handleSelectUser(2)" style="justify-content: flex-end">
             <div v-if="form.sendUserList.length" class="value">
-              已选择<em>{{form.sendUserList.slice(0,2).map(e=>e.name).join("、")}}</em>等
-              <em>{{form.sendUserList.length}}</em>人
+              已选择<em>{{ form.sendUserList.slice(0, 2).map(e => e.name).join("、") }}</em>等
+              <em>{{ form.sendUserList.length }}</em>人
             </div>
             <div v-else class="placeholder">请选择</div>
             <div class="arrow"></div>
@@ -106,220 +106,220 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
+import AiBack from "../../../components/AiBack";
+import AiSelectEnterprise from "../../../components/AiSelectEnterprise";
 
-  export default {
-    name: "create",
-    components: {AiBack, AiSelectEnterprise},
-    data() {
-      return {
-        index: null,
-        userSelect: false,
-        selectList: [],
-        form: {
-          parentTaskCode: null,
-          type: null,
-          taskTitle: "",
-          taskDescription: "",
-          lastTime: null,
-          userInfoList: [],
-          checkUserList: [],
-          sendUserList: [],
-          isNofity: 0
-        },
-        currentClick: null,
-      }
-    },
-    onLoad(opt) {
-      if (opt.taskCode) {
-        this.form.parentTaskCode = opt.taskCode
-      }
-      this.$dict.load("workTaskType")
-    },
-    computed: {
-      startDate() {
-        return this.getDate('start');
+export default {
+  name: "create",
+  components: {AiBack, AiSelectEnterprise},
+  data() {
+    return {
+      index: null,
+      userSelect: false,
+      selectList: [],
+      form: {
+        parentTaskCode: null,
+        type: null,
+        taskTitle: "",
+        taskDescription: "",
+        lastTime: null,
+        userInfoList: [],
+        checkUserList: [],
+        sendUserList: [],
+        isNofity: 0
       },
-      endDate() {
-        return this.getDate('end');
-      }
+      currentClick: null,
+    }
+  },
+  onLoad(opt) {
+    if (opt.taskCode) {
+      this.form.parentTaskCode = opt.taskCode
+    }
+    this.$dict.load("workTaskType")
+  },
+  computed: {
+    startDate() {
+      return this.getDate('start');
     },
-    methods: {
-      handleCreate() {
-        if (this.form.type==null) return this.$u.toast("请选择任务类型")
-        if (!this.form.taskTitle) return this.$u.toast("请输入任务标题")
-        if (!this.form.taskDescription) return this.$u.toast("请输入任务说明")
-        if (this.form.lastTime==null) return this.$u.toast("请选择截止日期")
-        if (!this.form.userInfoList.length) return this.$u.toast("请选择执行人")
+    endDate() {
+      return this.getDate('end');
+    }
+  },
+  methods: {
+    handleCreate() {
+      if (this.form.type == null) return this.$u.toast("请选择任务类型")
+      if (!this.form.taskTitle) return this.$u.toast("请输入任务标题")
+      if (!this.form.taskDescription) return this.$u.toast("请输入任务说明")
+      if (this.form.lastTime == null) return this.$u.toast("请选择截止日期")
+      if (!this.form.userInfoList.length) return this.$u.toast("请选择执行人")
 
-        this.$http.post("/app/appworktaskinfo/addOrUpdate", {
-          ...this.form,
-          lastTime:this.form.lastTime + " 23:59:59"
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast("创建成功")
-            this.$refs["aiBack"].back()
-          }
-        })
-      },
-      handleSelectUser(status) {
-        this.currentClick = status
-        if (this.currentClick == 0 && this.form.userInfoList.length) {
-          this.selectList = this.form.userInfoList
-        } else if (this.currentClick == 1 && this.form.checkUserList.length) {
-          this.selectList = this.form.checkUserList
-        } else if (this.currentClick == 2 && this.form.sendUserList.length) {
-          this.selectList = this.form.sendUserList
+      this.$http.post("/app/appworktaskinfo/addOrUpdate", {
+        ...this.form,
+        lastTime: this.form.lastTime + " 23:59:59"
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("创建成功")
+          this.$refs["aiBack"].back()
         }
-        this.userSelect = true
-      },
-      dateChange(e) {
-        let date = this.getDate({format: true});
-        if (new Date(date).getTime() > new Date(e.target.value).getTime()) {
-          this.form.lastTime = null
-          return this.$u.toast("截止时间不能小于当前时间")
-        }
-        this.form.lastTime = e.target.value
-      },
-      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}-${day}`;
-      },
-      change(e) {
-        this.form.type = e.detail.value
-      },
-      userChange(e) {
-        if (this.currentClick == 0) {
-          this.form.userInfoList = e
-        } else if (this.currentClick == 1) {
-          this.form.checkUserList = e
-        } else if (this.currentClick == 2) {
-          this.form.sendUserList = e
-        }
-        this.selectList = []
-      }
+      })
     },
-  }
+    handleSelectUser(status) {
+      this.currentClick = status
+      if (this.currentClick == 0 && this.form.userInfoList.length) {
+        this.selectList = this.form.userInfoList
+      } else if (this.currentClick == 1 && this.form.checkUserList.length) {
+        this.selectList = this.form.checkUserList
+      } else if (this.currentClick == 2 && this.form.sendUserList.length) {
+        this.selectList = this.form.sendUserList
+      }
+      this.userSelect = true
+    },
+    dateChange(e) {
+      let date = this.getDate({format: true});
+      if (new Date(date).getTime() > new Date(e.target.value).getTime()) {
+        this.form.lastTime = null
+        return this.$u.toast("截止时间不能小于当前时间")
+      }
+      this.form.lastTime = e.target.value
+    },
+    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}-${day}`;
+    },
+    change(e) {
+      this.form.type = e.detail.value
+    },
+    userChange(e) {
+      if (this.currentClick == 0) {
+        this.form.userInfoList = e
+      } else if (this.currentClick == 1) {
+        this.form.checkUserList = e
+      } else if (this.currentClick == 2) {
+        this.form.sendUserList = e
+      }
+      this.selectList = []
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .create-sub-task {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.create-sub-task {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  box-sizing: border-box;
+  padding: 16px 0 140px 0;
+
+  .card {
+    background-color: #FFFFFF;
     box-sizing: border-box;
-    padding: 16px 0 140px 0;
+    padding: 32px 34px;
+    margin-bottom: 16px;
 
-    .card {
-      background-color: #FFFFFF;
-      box-sizing: border-box;
-      padding: 32px 34px;
-      margin-bottom: 16px;
+    .left {
+      font-size: 32px;
+      color: #333333;
+      font-weight: 400;
+      line-height: 48px;
 
-      .left {
+      & > em {
+        font-style: normal;
         font-size: 32px;
-        color: #333333;
-        font-weight: 400;
-        line-height: 48px;
-
-        & > em {
-          font-style: normal;
-          font-size: 32px;
-          color: #FF4466;
-        }
+        color: #FF4466;
       }
+    }
 
-      .value {
-        font-size: 32px;
-        color: #333333;
+    .value {
+      font-size: 32px;
+      color: #333333;
 
-        & > em {
-          font-style: normal;
-          font-size: 28px;
-          color: #1365DD;
-        }
-      }
-
-      .placeholder {
+      & > em {
+        font-style: normal;
         font-size: 28px;
-        color: #999999;
-      }
-
-      .arrow {
-        width: 16px;
-        height: 16px;
-        border-top: 5px solid #CCCCCC;
-        border-right: 5px solid #CCCCCC;
-        transform: rotate(45deg);
-        margin-left: 8px;
-      }
-
-      .clear {
-        width: 32px;
-        height: 32px;
-        border-radius: 50%;
-        background-color: #CCCCCC;
-        margin-left: 8px;
-        position: relative;
-
-        &:before {
-          content: "";
-          width: 4px;
-          height: 24px;
-          position: absolute;
-          left: 50%;
-          top: 50%;
-          transform: translate(-50%, -50%) rotate(-45deg);
-          background-color: #FFFFFF;
-          border-radius: 4px;
-        }
-
-        &:after {
-          content: "";
-          width: 4px;
-          height: 24px;
-          position: absolute;
-          left: 50%;
-          top: 50%;
-          transform: translate(-50%, -50%) rotate(45deg);
-          background-color: #FFFFFF;
-          border-radius: 4px;
-        }
-      }
-
-      textarea {
-        width: 100%;
+        color: #1365DD;
       }
     }
 
-    .border {
-      border-top: 1px solid rgba(216, 221, 230, 0.5);
-      border-bottom: 1px solid rgba(216, 221, 230, 0.5);
+    .placeholder {
+      font-size: 28px;
+      color: #999999;
     }
 
-    .footer {
-      height: 112px;
+    .arrow {
+      width: 16px;
+      height: 16px;
+      border-top: 5px solid #CCCCCC;
+      border-right: 5px solid #CCCCCC;
+      transform: rotate(45deg);
+      margin-left: 8px;
+    }
+
+    .clear {
+      width: 32px;
+      height: 32px;
+      border-radius: 50%;
+      background-color: #CCCCCC;
+      margin-left: 8px;
+      position: relative;
+
+      &:before {
+        content: "";
+        width: 4px;
+        height: 24px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%) rotate(-45deg);
+        background-color: #FFFFFF;
+        border-radius: 4px;
+      }
+
+      &:after {
+        content: "";
+        width: 4px;
+        height: 24px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%) rotate(45deg);
+        background-color: #FFFFFF;
+        border-radius: 4px;
+      }
+    }
+
+    textarea {
       width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background: #1365DD;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 36px;
-      color: #FFFFFF;
     }
   }
+
+  .border {
+    border-top: 1px solid rgba(216, 221, 230, 0.5);
+    border-bottom: 1px solid rgba(216, 221, 230, 0.5);
+  }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background: #1365DD;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36px;
+    color: #FFFFFF;
+  }
+}
 </style>
diff --git a/src/pages/workTask/components/detail.vue b/src/pages/workTask/components/detail.vue
index 0a59cb5f..0ddac921 100644
--- a/src/pages/workTask/components/detail.vue
+++ b/src/pages/workTask/components/detail.vue
@@ -6,43 +6,43 @@
     </ai-top-fixed>
     <template v-if="index==0">
       <div class="card">
-        <header>{{detail.taskTitle}}</header>
+        <header>{{ detail.taskTitle }}</header>
         <u-gap height="16"></u-gap>
         <u-row>
           <span>任务类型：</span>
-          <span>{{$dict.getLabel("workTaskType",detail.type)}}</span>
+          <span>{{ $dict.getLabel("workTaskType", detail.type) }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>开始时间：</span>
-          <span>{{detail.createTime}}</span>
+          <span>{{ detail.createTime }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>截止时间：</span>
-          <span style="color:#1365DD">{{detail.lastTime}}</span>
+          <span style="color:#1365DD">{{ detail.lastTime }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>剩余时间：</span>
-          <span style="color:#1365DD">{{detail.overTimeStatus}}</span>
+          <span style="color:#1365DD">{{ detail.overTimeStatus }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>任务状态：</span>
-          <span>{{$dict.getLabel("workTaskDoStatus",detail.status)}}</span>
+          <span>{{ $dict.getLabel("workTaskDoStatus", detail.status) }}</span>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>执行说明：</span>
-          <span>{{detail.doDescription}}</span>
+          <span>{{ detail.doDescription }}</span>
         </u-row>
         <u-gap height="16"></u-gap>
       </div>
       <div class="card" style="padding-top: 0">
         <div class="label">任务说明</div>
         <u-read-more close-text="展开" color="#999999" show-height="300">
-          <span>{{detail.taskDescription}}</span>
+          <span>{{ detail.taskDescription }}</span>
         </u-read-more>
       </div>
       <div class="card" style="padding-top: 0" v-if="detail.fileList && detail.fileList.length">
@@ -51,9 +51,9 @@
           <u-row justify="between">
             <label class="left">
               <img :src="$cdn + 'common/appendix.png'" alt="">
-              <span>{{item.name}}.{{item.postfix}}</span>
+              <span>{{ item.name }}.{{ item.postfix }}</span>
             </label>
-            <span>{{(item.size/1024).toFixed(2)}}KB</span>
+            <span>{{ (item.size / 1024).toFixed(2) }}KB</span>
           </u-row>
         </div>
       </div>
@@ -63,26 +63,27 @@
       <template v-if="['0','1'].includes(isMine)">
         <div class="card">
           <div class="label">我的进度</div>
-          <text>已完成{{detail.myUserInfo.percent}}%</text>
+          <text>已完成{{ detail.myUserInfo.percent }}%</text>
           <div class="progress">
             <div class="pro-active" :style="{width:detail.myUserInfo.percent + '%'}"></div>
           </div>
         </div>
         <div class="card" v-if="detail.processList.length">
           <u-collapse>
-            <u-collapse-item :title="item.createDate && item.createDate.split(' ')[0]" v-for="(item, index) in detail.processList" :key="index">
+            <u-collapse-item :title="item.createDate && item.createDate.split(' ')[0]"
+                             v-for="(item, index) in detail.processList" :key="index">
               <template slot="info">
-                完成到<em>{{item.percent}}%</em>
+                完成到<em>{{ item.percent }}%</em>
               </template>
-              {{item.remarks}}
+              {{ item.remarks }}
             </u-collapse-item>
           </u-collapse>
         </div>
       </template>
       <template v-else>
         <div class="card" v-for="(item,index) in detail.userInfoList" :key="index">
-          <div class="label">{{item.userName}}</div>
-          <text>已完成{{item.percent}}%</text>
+          <div class="label">{{ item.userName }}</div>
+          <text>已完成{{ item.percent }}%</text>
           <div class="progress">
             <div class="pro-active" :style="{width:item.percent + '%'}"></div>
           </div>
@@ -93,8 +94,8 @@
     <template v-if="index==2">
       <div class="card" v-if="list.length">
         <u-row justify="between" v-for="(item,index) in list" :key="index" class="item" @click="subDetail(item)">
-          <label class="title">{{item.taskTitle}}</label>
-          <label class="right">{{item.percent}}%
+          <label class="title">{{ item.taskTitle }}</label>
+          <label class="right">{{ item.percent }}%
             <div class="arrow"></div>
           </label>
         </u-row>
@@ -103,342 +104,344 @@
     </template>
 
     <ai-back></ai-back>
-    <div class="footer" v-if="index==1 && detail.myUserInfo.taskRole == 1 &&  detail.myUserInfo.doStatus==0" @click="handleClick">去完成</div>
+    <div class="footer" v-if="index==1 && detail.myUserInfo.taskRole == 1 &&  detail.myUserInfo.doStatus==0"
+         @click="handleClick">去完成
+    </div>
     <div class="footer" v-if="index==2" @click="createSubTask">创建子任务</div>
   </div>
 </template>
 
 <script>
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty";
-  import {mapActions} from "vuex";
+import AiTopFixed from "../../../components/AiTopFixed";
+import AiBack from "../../../components/AiBack";
+import AiEmpty from "../../../components/AiEmpty";
+import {mapActions} from "vuex";
 
-  export default {
-    name: "detail",
-    components: {AiTopFixed, AiBack,AiEmpty},
-    data() {
-      return {
-        current: 1,
-        index: 0,
-        id: null,
-        taskCode: null,
-        isMine: null,
-        detail: {},
-        list: [],
-      }
-    },
-    onLoad(opt) {
-      this.id = opt.id
-      this.taskCode = opt.taskCode
-      this.isMine = opt.isMine
-      this.$dict.load("workTaskType", "workTaskDoStatus")
-    },
-    computed: {
-      tabs() {
-        return [
-          {name: "信息"},
-          {name: "进度"},
-          {name: "子任务"},
-        ]
-      }
-    },
-    methods: {
-      ...mapActions(['previewFile', 'injectJWeixin']),
-      preFile(e) {
-        if([".jpg",".png",".gif"].includes(e.postfix.toLowerCase())){
-          uni.previewImage({
-            current: e.url,
-            urls: [e.url]
-          })
-        }else {
-          this.previewFile({ ...e})
-        }
-      },
-      getDetail() {
-        this.$http.post("/app/appworktaskinfo/queryDetailById", null, {
-          params: {
-            id: this.id
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.detail = res.data
-          }
-        })
-      },
-      getList(){
-        this.$http.post("/app/appworktaskinfo/list", null, {
-          params: {
-            parentTaskCode: this.detail.taskCode,
-            size: 999,
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.list = res.data.records
-          }
-        })
-      },
-      createSubTask() {
-        uni.navigateTo({
-          url: "/pages/workTask/components/create?taskCode=" + this.taskCode
-        })
-      },
-      subDetail({id}) {
-        uni.navigateTo({
-          url: "/pages/workTask/components/subDetail?id=" + id
-        })
-      },
-      handleClick() {
-        uni.navigateTo({
-          url: "/pages/workTask/components/finish?taskCode=" + this.detail.taskCode + "&percent=" + this.detail.myUserInfo.percent
-        })
-      },
-      change(e) {
-        this.index = e
-        if (e == 2) {
-          this.getList()
-        }
-      }
-    },
-    onShow(){
-      this.getDetail()
-      this.getList()
+export default {
+  name: "detail",
+  components: {AiTopFixed, AiBack, AiEmpty},
+  data() {
+    return {
+      current: 1,
+      index: 0,
+      id: null,
+      taskCode: null,
+      isMine: null,
+      detail: {},
+      list: [],
     }
+  },
+  onLoad(opt) {
+    this.id = opt.id
+    this.taskCode = opt.taskCode
+    this.isMine = opt.isMine
+    this.$dict.load("workTaskType", "workTaskDoStatus")
+  },
+  computed: {
+    tabs() {
+      return [
+        {name: "信息"},
+        {name: "进度"},
+        {name: "子任务"},
+      ]
+    }
+  },
+  methods: {
+    ...mapActions(['previewFile', 'injectJWeixin']),
+    preFile(e) {
+      if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
+        uni.previewImage({
+          current: e.url,
+          urls: [e.url]
+        })
+      } else {
+        this.previewFile({...e})
+      }
+    },
+    getDetail() {
+      this.$http.post("/app/appworktaskinfo/queryDetailById", null, {
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.detail = res.data
+        }
+      })
+    },
+    getList() {
+      this.$http.post("/app/appworktaskinfo/list", null, {
+        params: {
+          parentTaskCode: this.detail.taskCode,
+          size: 999,
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.list = res.data.records
+        }
+      })
+    },
+    createSubTask() {
+      uni.navigateTo({
+        url: "/pages/workTask/components/create?taskCode=" + this.taskCode
+      })
+    },
+    subDetail({id}) {
+      uni.navigateTo({
+        url: "/pages/workTask/components/subDetail?id=" + id
+      })
+    },
+    handleClick() {
+      uni.navigateTo({
+        url: "/pages/workTask/components/finish?taskCode=" + this.detail.taskCode + "&percent=" + this.detail.myUserInfo.percent
+      })
+    },
+    change(e) {
+      this.index = e
+      if (e == 2) {
+        this.getList()
+      }
+    }
+  },
+  onShow() {
+    this.getDetail()
+    this.getList()
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .detail {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 140px;
+.detail {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 140px;
 
-    ::v-deep .content {
-      padding: 0;
+  ::v-deep .content {
+    padding: 0;
+  }
+
+  .card {
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    box-sizing: border-box;
+    padding: 16px 32px;
+
+    header {
+      font-size: 40px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 64px;
+      letter-spacing: 1px;
     }
 
-    .card {
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
-      box-sizing: border-box;
-      padding: 16px 32px;
-
-      header {
-        font-size: 40px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 64px;
-        letter-spacing: 1px;
+    .u-row {
+      & > div {
+        background-color: #2266FF;
+        border-radius: 50%;
+        text-align: center;
+        font-size: 22px;
+        font-weight: bold;
+        color: #FFFFFF;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
 
-      .u-row {
-        & > div {
-          background-color: #2266FF;
-          border-radius: 50%;
-          text-align: center;
-          font-size: 22px;
-          font-weight: bold;
-          color: #FFFFFF;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
+      & > span:first-child {
+        font-size: 30px;
+        color: #999999;;
+        line-height: 48px;
+      }
 
-        & > span:first-child {
-          font-size: 30px;
-          color: #999999;;
-          line-height: 48px;
-        }
+      & > span:last-child {
+        font-size: 30px;
+        color: #343D65;
+        margin-left: 16px;
+        line-height: 48px;
+      }
 
-        & > span:last-child {
-          font-size: 30px;
-          color: #343D65;
-          margin-left: 16px;
-          line-height: 48px;
-        }
+      .title {
+        width: 490px;
+        height: 112px;
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
 
-        .title {
-          width: 490px;
-          height: 112px;
-          display: flex;
-          align-items: center;
-          font-size: 32px;
-          color: #333333;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
+      .right {
+        font-size: 28px;
+        color: #1365DD;
+        display: flex;
+        align-items: center;
 
-        .right {
-          font-size: 28px;
-          color: #1365DD;
+        .arrow {
+          width: 16px;
+          height: 16px;
+          border-top: 3px solid #CCCCCC;
+          border-right: 3px solid #CCCCCC;
+          transform: rotate(45deg);
+        }
+      }
+    }
+
+    .item {
+      position: relative;
+
+      &:after {
+        width: 100%;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        content: "";
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+    }
+
+    & > span {
+      font-size: 32px;
+      color: #333333;
+      line-height: 48px;
+      letter-spacing: 1px;
+      display: inline-block;
+    }
+
+    .label {
+      height: 80px;
+      font-size: 32px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+
+      & > em {
+        font-style: normal;
+        font-size: 32px;
+        color: #1365DD;
+      }
+    }
+
+    .file {
+      height: 128px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      padding: 0 16px;
+      margin-bottom: 32px;
+
+      & > .u-row {
+        height: 100%;
+
+        .left {
+          width: 476px;
           display: flex;
           align-items: center;
 
-          .arrow {
-            width: 16px;
-            height: 16px;
-            border-top: 3px solid #CCCCCC;
-            border-right: 3px solid #CCCCCC;
-            transform: rotate(45deg);
+          & > img {
+            flex-shrink: 0;
+            width: 96px;
+            height: 96px;
+          }
+
+          & > span {
+            font-size: 32px;
+            color: #333333;
+            display: inline-block;
+            line-height: 44px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
           }
         }
-      }
 
-      .item {
-        position: relative;
-
-        &:after {
-          width: 100%;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          content: "";
-          position: absolute;
-          left: 0;
-          bottom: 0;
+        & > span {
+          font-size: 28px;
+          color: #999999;
         }
       }
+    }
 
-      & > span {
+    .active {
+      background-color: #F3F6F9;
+    }
+
+    & > text {
+      width: 100%;
+      display: inline-block;
+      font-size: 30px;
+      color: #649EFD;
+      text-align: center;
+    }
+
+    .progress {
+      height: 12px;
+      background: #F2F4FC;
+      border-radius: 12px;
+      position: relative;
+      margin: 16px 0 64px 0;
+
+      .pro-active {
+        height: 12px;
+        background: #639EFD;
+        border-radius: 12px;
+        position: absolute;
+        left: 0;
+        top: 0;
+      }
+
+    }
+
+    em {
+      font-style: normal;
+      font-size: 28px;
+      color: #1365DD;
+    }
+
+    ::v-deep .u-collapse {
+      position: relative;
+
+      &:after {
+        content: "";
+        width: 718px;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+
+      .u-collapse-head {
+        padding: 40px 0;
+      }
+
+      .u-collapse-content {
         font-size: 32px;
         color: #333333;
         line-height: 48px;
         letter-spacing: 1px;
-        display: inline-block;
       }
-
-      .label {
-        height: 80px;
-        font-size: 32px;
-        color: #333333;
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-
-        & > em {
-          font-style: normal;
-          font-size: 32px;
-          color: #1365DD;
-        }
-      }
-
-      .file {
-        height: 128px;
-        background: #FFFFFF;
-        border-radius: 8px;
-        border: 1px solid #CCCCCC;
-        box-sizing: border-box;
-        padding: 0 16px;
-        margin-bottom: 32px;
-
-        & > .u-row {
-          height: 100%;
-
-          .left {
-            width: 476px;
-            display: flex;
-            align-items: center;
-
-            & > img {
-              flex-shrink: 0;
-              width: 96px;
-              height: 96px;
-            }
-
-            & > span {
-              font-size: 32px;
-              color: #333333;
-              display: inline-block;
-              line-height: 44px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display:-webkit-box;
-              -webkit-box-orient:vertical;
-              -webkit-line-clamp:2;
-            }
-          }
-
-          & > span {
-            font-size: 28px;
-            color: #999999;
-          }
-        }
-      }
-
-      .active {
-        background-color: #F3F6F9;
-      }
-
-      & > text {
-        width: 100%;
-        display: inline-block;
-        font-size: 30px;
-        color: #649EFD;
-        text-align: center;
-      }
-
-      .progress {
-        height: 12px;
-        background: #F2F4FC;
-        border-radius: 12px;
-        position: relative;
-        margin: 16px 0 64px 0;
-
-        .pro-active {
-          height: 12px;
-          background: #639EFD;
-          border-radius: 12px;
-          position: absolute;
-          left: 0;
-          top: 0;
-        }
-
-      }
-
-      em {
-        font-style: normal;
-        font-size: 28px;
-        color: #1365DD;
-      }
-
-      ::v-deep .u-collapse {
-        position: relative;
-
-        &:after {
-          content: "";
-          width: 718px;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          position: absolute;
-          left: 0;
-          bottom: 0;
-        }
-
-        .u-collapse-head {
-          padding: 40px 0;
-        }
-
-        .u-collapse-content {
-          font-size: 32px;
-          color: #333333;
-          line-height: 48px;
-          letter-spacing: 1px;
-        }
-      }
-    }
-
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background: #1365DD;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 36px;
-      color: #FFFFFF;
     }
   }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background: #1365DD;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36px;
+    color: #FFFFFF;
+  }
+}
 </style>
diff --git a/src/pages/workTask/components/finishDetail.vue b/src/pages/workTask/components/finishDetail.vue
index 30b005d8..360c2ff4 100644
--- a/src/pages/workTask/components/finishDetail.vue
+++ b/src/pages/workTask/components/finishDetail.vue
@@ -4,25 +4,25 @@
       <u-row justify="between">
         <div class="left">
           <u-avatar :src="detail.avatar" v-if="detail.avatar"></u-avatar>
-          <div class="avatar" v-else>{{detail.name && detail.name.substr(-2)}}</div>
+          <div class="avatar" v-else>{{ detail.name && detail.name.substr(-2) }}</div>
           <div class="info">
-            <div class="name">{{detail.name}}</div>
-            <div class="status">{{$dict.getLabel("workTaskRole",detail.taskRole)}}</div>
+            <div class="name">{{ detail.name }}</div>
+            <div class="status">{{ $dict.getLabel("workTaskRole", detail.taskRole) }}</div>
           </div>
         </div>
-<!--        <div class="btn">-->
-<!--          <img src="../static/tx.png" alt="">催办提醒-->
-<!--        </div>-->
+        <!--        <div class="btn">-->
+        <!--          <img src="../static/tx.png" alt="">催办提醒-->
+        <!--        </div>-->
       </u-row>
       <u-gap height="32"></u-gap>
       <u-row>
         <div class="label">完成时间：</div>
-        <div class="value">{{detail.finishTime}}</div>
+        <div class="value">{{ detail.finishTime }}</div>
       </u-row>
       <u-gap height="16"></u-gap>
       <u-row>
         <div class="label">逾期时间：</div>
-        <div class="value" style="color: #FF4466">{{detail.overTimeStatus}}</div>
+        <div class="value" style="color: #FF4466">{{ detail.overTimeStatus }}</div>
       </u-row>
       <u-gap height="30"></u-gap>
     </div>
@@ -31,9 +31,9 @@
       <u-collapse v-for="(item,index) in detail.processList" :key="index">
         <u-collapse-item :title="item.createDate && item.createDate.split(' ')[0]">
           <template slot="info">
-            完成到<em>{{item.percent}}%</em>
+            完成到<em>{{ item.percent }}%</em>
           </template>
-          {{item.remarks}}
+          {{ item.remarks }}
         </u-collapse-item>
       </u-collapse>
     </div>
@@ -42,145 +42,145 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
+import AiBack from "../../../components/AiBack";
 
-  export default {
-    name: "finishDetail",
-    components: {AiBack},
-    data() {
-      return {
-        id: null,
-        detail: {},
-      }
-    },
-    onLoad(opt) {
-      this.id = opt.id
-      this.$dict.load("workTaskRole").then(_=>this.getDetail())
-    },
-    methods: {
-      getDetail() {
-        this.$http.post("/app/appworktaskuserinfo/queryDetailById", null, {
-          params: {
-            id: this.id
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.detail = res.data;
-          }
-        })
-      }
-    },
-  }
+export default {
+  name: "finishDetail",
+  components: {AiBack},
+  data() {
+    return {
+      id: null,
+      detail: {},
+    }
+  },
+  onLoad(opt) {
+    this.id = opt.id
+    this.$dict.load("workTaskRole").then(_ => this.getDetail())
+  },
+  methods: {
+    getDetail() {
+      this.$http.post("/app/appworktaskuserinfo/queryDetailById", null, {
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.detail = res.data;
+        }
+      })
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .finish-detail {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.finish-detail {
+  min-height: 100%;
+  background-color: #F5F5F5;
 
-    .card {
-      box-sizing: border-box;
-      padding: 18px 32px;
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
+  .card {
+    box-sizing: border-box;
+    padding: 18px 32px;
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
 
-      .left {
-        display: flex;
-        align-items: center;
+    .left {
+      display: flex;
+      align-items: center;
 
-        .avatar {
-          width: 80px;
-          height: 80px;
-          border-radius: 50%;
-          font-size: 28px;
-          font-weight: 500;
-          color: #FFFFFF;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background: #2266FF;
-        }
-
-        .info {
-          display: flex;
-          flex-direction: column;
-          margin-left: 16px;
-
-          .name {
-            font-size: 32px;
-            font-weight: 400;
-            color: #333333;
-            line-height: 44px;
-          }
-
-          .status {
-            font-size: 24px;
-            font-weight: 400;
-            color: #999999;
-            line-height: 34px;
-          }
-        }
-      }
-
-      .btn {
+      .avatar {
+        width: 80px;
+        height: 80px;
+        border-radius: 50%;
+        font-size: 28px;
+        font-weight: 500;
+        color: #FFFFFF;
         display: flex;
         align-items: center;
         justify-content: center;
-        font-size: 28px;
-        font-weight: 400;
-        color: #1365DD;
-
-        & > img {
-          width: 40px;
-          height: 40px;
-        }
+        background: #2266FF;
       }
 
-      .label {
-        font-size: 30px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        color: #999999;
-        line-height: 42px;
-      }
+      .info {
+        display: flex;
+        flex-direction: column;
+        margin-left: 16px;
 
-      .value {
-        font-size: 30px;
-        font-weight: 400;
-        color: #343D65;
-        line-height: 48px;
-      }
-
-      em {
-        font-style: normal;
-        font-size: 28px;
-        color: #1365DD;
-      }
-
-      ::v-deep .u-collapse {
-        position: relative;
-
-        &:after {
-          content: "";
-          width: 718px;
-          height: 1px;
-          background-color: rgba(216, 221, 230, 0.5);
-          position: absolute;
-          left: 0;
-          bottom: 0;
-        }
-
-        .u-collapse-head {
-          padding: 40px 0;
-        }
-
-        .u-collapse-content {
+        .name {
           font-size: 32px;
+          font-weight: 400;
           color: #333333;
-          line-height: 48px;
-          letter-spacing: 1px;
+          line-height: 44px;
+        }
+
+        .status {
+          font-size: 24px;
+          font-weight: 400;
+          color: #999999;
+          line-height: 34px;
         }
       }
-
     }
+
+    .btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 28px;
+      font-weight: 400;
+      color: #1365DD;
+
+      & > img {
+        width: 40px;
+        height: 40px;
+      }
+    }
+
+    .label {
+      font-size: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999999;
+      line-height: 42px;
+    }
+
+    .value {
+      font-size: 30px;
+      font-weight: 400;
+      color: #343D65;
+      line-height: 48px;
+    }
+
+    em {
+      font-style: normal;
+      font-size: 28px;
+      color: #1365DD;
+    }
+
+    ::v-deep .u-collapse {
+      position: relative;
+
+      &:after {
+        content: "";
+        width: 718px;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+
+      .u-collapse-head {
+        padding: 40px 0;
+      }
+
+      .u-collapse-content {
+        font-size: 32px;
+        color: #333333;
+        line-height: 48px;
+        letter-spacing: 1px;
+      }
+    }
+
   }
+}
 </style>
diff --git a/src/pages/workTask/components/subDetail.vue b/src/pages/workTask/components/subDetail.vue
index 8a8e77d5..3a18aebc 100644
--- a/src/pages/workTask/components/subDetail.vue
+++ b/src/pages/workTask/components/subDetail.vue
@@ -3,58 +3,58 @@
     <div class="card">
       <header>
         <em>[子任务]</em>
-        {{detail.taskTitle}}
+        {{ detail.taskTitle }}
       </header>
       <u-gap height="16"></u-gap>
       <u-row>
         <span>任务类型：</span>
-        <span>{{$dict.getLabel("workTaskType",detail.type)}}</span>
+        <span>{{ $dict.getLabel("workTaskType", detail.type) }}</span>
       </u-row>
       <u-gap height="8"></u-gap>
       <u-row>
         <span>开始时间：</span>
-        <span>{{detail.createTime}}</span>
+        <span>{{ detail.createTime }}</span>
       </u-row>
       <u-gap height="8"></u-gap>
       <u-row>
         <span>截止时间：</span>
-        <span>{{detail.lastTime}}</span>
+        <span>{{ detail.lastTime }}</span>
       </u-row>
       <u-gap height="8"></u-gap>
       <u-row>
         <span>剩余时间：</span>
-        <span style="color:#1365DD">{{detail.overTimeStatus}}</span>
+        <span style="color:#1365DD">{{ detail.overTimeStatus }}</span>
       </u-row>
       <u-gap height="8"></u-gap>
       <u-row>
         <span>任务状态：</span>
-        <span style="color:#1365DD">{{$dict.getLabel("workTaskDoStatus",detail.status)}}</span>
+        <span style="color:#1365DD">{{ $dict.getLabel("workTaskDoStatus", detail.status) }}</span>
       </u-row>
       <u-gap height="16"></u-gap>
     </div>
     <div class="card" style="padding-top: 0">
       <div class="label">任务说明</div>
       <u-read-more close-text="展开" color="#999999" show-height="300">
-        <span>{{detail.taskDescription}}</span>
+        <span>{{ detail.taskDescription }}</span>
       </u-read-more>
     </div>
 
     <div class="card">
       <div class="label">当前进度</div>
-      <text>已完成{{detail.percent}}%</text>
+      <text>已完成{{ detail.percent }}%</text>
       <div class="progress">
         <div class="pro-active" :style="{width:detail.percent + '%'}"></div>
       </div>
     </div>
 
     <div class="card" style="padding-top: 0" v-if="detail.userInfoList && detail.userInfoList.length">
-      <div class="label title">任务完成进度(<i>{{count}}</i>/{{detail.userInfoList.length}})</div>
+      <div class="label title">任务完成进度(<i>{{ count }}</i>/{{ detail.userInfoList.length }})</div>
       <u-row justify="between" v-for="(item,index) in detail.userInfoList" :key="index" @click="finishDetail(item)">
-        <div>{{item.userName && item.userName.substr(-2)}}</div>
+        <div>{{ item.userName && item.userName.substr(-2) }}</div>
         <u-row justify="between" class="item">
-          <text class="name">{{item.userName}}</text>
+          <text class="name">{{ item.userName }}</text>
           <label class="right">
-            <span>已完成{{item.percent}}%</span>
+            <span>已完成{{ item.percent }}%</span>
             <label class="arrow"></label>
           </label>
         </u-row>
@@ -75,267 +75,267 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
+import AiBack from "../../../components/AiBack";
 
-  export default {
-    name: "subDetail",
-    components: {AiBack},
-    data() {
-      return {
-        id: null,
-        detail: {},
-        show: false,
-        content: "",
-        idx: null,
-        count: 0,
-      }
+export default {
+  name: "subDetail",
+  components: {AiBack},
+  data() {
+    return {
+      id: null,
+      detail: {},
+      show: false,
+      content: "",
+      idx: null,
+      count: 0,
+    }
+  },
+  onLoad(opt) {
+    this.id = opt.id
+    this.$dict.load("workTaskType", "workTaskDoStatus").then(_ => this.getDetail())
+  },
+  methods: {
+    finishDetail({id}) {
+      uni.navigateTo({
+        url: "/pages/workTask/components/finishDetail?id=" + id
+      })
     },
-    onLoad(opt) {
-      this.id = opt.id
-      this.$dict.load("workTaskType", "workTaskDoStatus").then(_ => this.getDetail())
+    confirm() {
+      this.$http.post(this.idx == 0 ? "/app/appworktaskinfo/stopOrFinish" : "/app/appworktaskuserinfo/sendMesage", null, {
+        params: {
+          id: this.id,
+          status: this.idx == 0 ? 2 : null
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast(this.idx == 0 ? "关闭成功" : "催办成功")
+          this.getDetail()
+        }
+      })
     },
-    methods: {
-      finishDetail({id}){
-        uni.navigateTo({
-          url:"/pages/workTask/components/finishDetail?id=" + id
-        })
-      },
-      confirm() {
-        this.$http.post(this.idx == 0 ? "/app/appworktaskinfo/stopOrFinish" : "/app/appworktaskuserinfo/sendMesage", null, {
-          params: {
-            id: this.id,
-            status: this.idx == 0 ? 2 : null
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$u.toast(this.idx == 0 ? "关闭成功" : "催办成功")
-            this.getDetail()
-          }
-        })
-      },
-      getDetail() {
-        this.$http.post("/app/appworktaskinfo/queryDetailById", null, {
-          params: {
-            id: this.id
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.detail = res.data
-            this.count = res.data?.userInfoList?.reduce((pre,cur)=>{
-              return pre + (cur.percent==100 ? 1 : 0)
-            },0)
-          }
-        })
-      }
-    },
-  }
+    getDetail() {
+      this.$http.post("/app/appworktaskinfo/queryDetailById", null, {
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.detail = res.data
+          this.count = res.data?.userInfoList?.reduce((pre, cur) => {
+            return pre + (cur.percent == 100 ? 1 : 0)
+          }, 0)
+        }
+      })
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .sub-detail {
-    min-height: 100%;
-    overflow-x: hidden;
-    background-color: #F5F5F5;
-    padding-bottom: 140px;
+.sub-detail {
+  min-height: 100%;
+  overflow-x: hidden;
+  background-color: #F5F5F5;
+  padding-bottom: 140px;
 
-    .card {
-      background-color: #FFFFFF;
-      margin-bottom: 8px;
-      box-sizing: border-box;
-      padding: 16px 32px;
+  .card {
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    box-sizing: border-box;
+    padding: 16px 32px;
 
-      header {
+    header {
+      font-size: 40px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 64px;
+      letter-spacing: 1px;
+
+      & > em {
+        font-style: normal;
+        color: #1365DD;
         font-size: 40px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 64px;
-        letter-spacing: 1px;
-
-        & > em {
-          font-style: normal;
-          color: #1365DD;
-          font-size: 40px;
-        }
       }
-
-      .u-row {
-        flex: 1;
-        margin-left: 16px;
-        position: relative;
-
-
-        .item {
-          height: 112px;
-
-          &:after {
-            width: 622px;
-            height: 2px;
-            content: "";
-            position: absolute;
-            left: 0;
-            bottom: 0;
-            background-color: rgba(216, 221, 230, 0.5);
-          }
-        }
-
-        & > div {
-          width: 80px;
-          height: 80px;
-          background-color: #4E8EEE;
-          border-radius: 50%;
-          text-align: center;
-          font-size: 28px;
-          font-weight: bold;
-          color: #FFFFFF;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-
-        & > span:first-child {
-          font-size: 30px;
-          color: #999999;;
-          line-height: 48px;
-        }
-
-        & > span:last-child {
-          font-size: 30px;
-          color: #343D65;
-          margin-left: 16px;
-          line-height: 48px;
-        }
-
-        .name {
-          font-size: 32px;
-          font-weight: 400;
-          color: #333333;
-        }
-
-        .title {
-          width: 490px;
-          height: 112px;
-          display: flex;
-          align-items: center;
-          font-size: 32px;
-          color: #333333;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-
-        .right {
-          font-size: 28px;
-          color: #1365DD;
-          display: flex;
-          align-items: center;
-
-          .arrow {
-            width: 16px;
-            height: 16px;
-            border-top: 3px solid #CCCCCC;
-            border-right: 3px solid #CCCCCC;
-            transform: rotate(45deg);
-          }
-        }
-      }
-
-      & > text {
-        width: 100%;
-        display: inline-block;
-        font-size: 30px;
-        color: #649EFD;
-        text-align: center;
-      }
-
-      .progress {
-        height: 12px;
-        background: #F2F4FC;
-        border-radius: 12px;
-        position: relative;
-        margin: 16px 0 80px 0;
-
-        .pro-active {
-          height: 12px;
-          background: #639EFD;
-          border-radius: 12px;
-          position: absolute;
-          left: 0;
-          top: 0;
-        }
-
-      }
-
-      & > span {
-        font-size: 32px;
-        color: #333333;
-        line-height: 48px;
-        letter-spacing: 1px;
-        display: inline-block;
-      }
-
-      .label {
-        height: 80px;
-        font-size: 32px;
-        color: #333333;
-        display: flex;
-        align-items: center;
-        margin-bottom: 16px;
-
-        & > em {
-          font-style: normal;
-          font-size: 32px;
-          color: #1365DD;
-        }
-
-        & > i {
-          font-style: normal;
-          font-size: 32px;
-          color: #2EA222;
-        }
-      }
-
-      .title {
-        font-weight: bold;
-        height: 96px;
-        border-bottom: 1px solid rgba(216, 221, 230, 0.5);
-      }
-
     }
 
-    .footer {
-      height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background: #FFFFFF;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 36px;
-      color: #FFFFFF;
+    .u-row {
+      flex: 1;
+      margin-left: 16px;
+      position: relative;
 
-      img {
-        width: 48px;
-        height: 48px;
-        margin-right: 8px;
+
+      .item {
+        height: 112px;
+
+        &:after {
+          width: 622px;
+          height: 2px;
+          content: "";
+          position: absolute;
+          left: 0;
+          bottom: 0;
+          background-color: rgba(216, 221, 230, 0.5);
+        }
       }
 
-      & > div:first-child, div:last-child {
-        width: 50%;
-        height: 100%;
+      & > div {
+        width: 80px;
+        height: 80px;
+        background-color: #4E8EEE;
+        border-radius: 50%;
+        text-align: center;
+        font-size: 28px;
+        font-weight: bold;
+        color: #FFFFFF;
         display: flex;
         align-items: center;
         justify-content: center;
       }
 
-      & > div:first-child {
-        color: #666666;
+      & > span:first-child {
+        font-size: 30px;
+        color: #999999;;
+        line-height: 48px;
       }
 
-      & > div:last-child {
-        background: #1365DD;
+      & > span:last-child {
+        font-size: 30px;
+        color: #343D65;
+        margin-left: 16px;
+        line-height: 48px;
+      }
+
+      .name {
+        font-size: 32px;
+        font-weight: 400;
+        color: #333333;
+      }
+
+      .title {
+        width: 490px;
+        height: 112px;
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .right {
+        font-size: 28px;
+        color: #1365DD;
+        display: flex;
+        align-items: center;
+
+        .arrow {
+          width: 16px;
+          height: 16px;
+          border-top: 3px solid #CCCCCC;
+          border-right: 3px solid #CCCCCC;
+          transform: rotate(45deg);
+        }
       }
     }
+
+    & > text {
+      width: 100%;
+      display: inline-block;
+      font-size: 30px;
+      color: #649EFD;
+      text-align: center;
+    }
+
+    .progress {
+      height: 12px;
+      background: #F2F4FC;
+      border-radius: 12px;
+      position: relative;
+      margin: 16px 0 80px 0;
+
+      .pro-active {
+        height: 12px;
+        background: #639EFD;
+        border-radius: 12px;
+        position: absolute;
+        left: 0;
+        top: 0;
+      }
+
+    }
+
+    & > span {
+      font-size: 32px;
+      color: #333333;
+      line-height: 48px;
+      letter-spacing: 1px;
+      display: inline-block;
+    }
+
+    .label {
+      height: 80px;
+      font-size: 32px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+
+      & > em {
+        font-style: normal;
+        font-size: 32px;
+        color: #1365DD;
+      }
+
+      & > i {
+        font-style: normal;
+        font-size: 32px;
+        color: #2EA222;
+      }
+    }
+
+    .title {
+      font-weight: bold;
+      height: 96px;
+      border-bottom: 1px solid rgba(216, 221, 230, 0.5);
+    }
+
   }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36px;
+    color: #FFFFFF;
+
+    img {
+      width: 48px;
+      height: 48px;
+      margin-right: 8px;
+    }
+
+    & > div:first-child, div:last-child {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > div:first-child {
+      color: #666666;
+    }
+
+    & > div:last-child {
+      background: #1365DD;
+    }
+  }
+}
 </style>
diff --git a/src/pages/workTask/workTask.vue b/src/pages/workTask/workTask.vue
index 0285d597..3f2a2d62 100644
--- a/src/pages/workTask/workTask.vue
+++ b/src/pages/workTask/workTask.vue
@@ -5,24 +5,24 @@
     </ai-top-fixed>
     <div class="list" v-if="list.length">
       <div class="card" v-for="(item,index) in list" :key="index" @click="handleClick(item)">
-        <header>{{item.taskTitle}}</header>
+        <header>{{ item.taskTitle }}</header>
         <u-gap height="24"></u-gap>
         <u-row>
           <text>任务类型：</text>
-          <text>{{$dict.getLabel("workTaskType",item.type)}}</text>
+          <text>{{ $dict.getLabel("workTaskType", item.type) }}</text>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <text>截止时间：</text>
-          <text>{{item.lastTime}}</text>
+          <text>{{ item.lastTime }}</text>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <text>剩余时间：</text>
-          <text :style="{color:item.isOverTime==1?'#FF4466':'#1365DD'}">{{item.overTimeStatus}}</text>
+          <text :style="{color:item.isOverTime==1?'#FF4466':'#1365DD'}">{{ item.overTimeStatus }}</text>
         </u-row>
         <u-gap height="24"></u-gap>
-        <span>已完成{{item.percent}}%</span>
+        <span>已完成{{ item.percent }}%</span>
         <u-gap height="16"></u-gap>
         <div class="progress">
           <div class="active" :style="{width: item.percent + '%'}"></div>
@@ -37,186 +37,186 @@
 </template>
 
 <script>
-  import AiTopFixed from "../../components/AiTopFixed";
-  import AiAdd from "../../components/AiAdd";
-  import AiEmpty from "../../components/AiEmpty";
+import AiTopFixed from "../../components/AiTopFixed";
+import AiAdd from "../../components/AiAdd";
+import AiEmpty from "../../components/AiEmpty";
 
-  export default {
-    name: "workTask",
-    components: {AiTopFixed, AiAdd, AiEmpty},
-    data() {
+export default {
+  name: "workTask",
+  components: {AiTopFixed, AiAdd, AiEmpty},
+  data() {
+    return {
+      index: 0,
+      current: 1,
+      list: [],
+      status: "加载更多",
+      userSelect: false,
+    }
+  },
+  computed: {
+    tabs() {
+      return [
+        {name: "我执行的"},
+        {name: "我完成的"},
+        {name: "我发起的"},
+        {name: "我督办的"},
+        {name: "抄送我的"},
+      ]
+    },
+  },
+
+  onLoad() {
+    this.$dict.load("workTaskType")
+  },
+
+  methods: {
+    tag(status) {
       return {
-        index: 0,
-        current: 1,
-        list: [],
-        status: "加载更多",
-        userSelect: false,
-      }
+        "0": "common/1jxz.png",
+        "1": "common/1ywc.png",
+        "2": "common/1ygb.png"
+      }[status]
     },
-    computed: {
-      tabs() {
-        return [
-          {name: "我执行的"},
-          {name: "我完成的"},
-          {name: "我发起的"},
-          {name: "我督办的"},
-          {name: "抄送我的"},
-        ]
-      },
-    },
-
-    onLoad() {
-      this.$dict.load("workTaskType")
-    },
-
-    methods: {
-      tag(status) {
-        return {
-          "0": "common/1jxz.png",
-          "1": "common/1ywc.png",
-          "2": "common/1ygb.png"
-        }[status]
-      },
-      handleClick(item) {
-        uni.navigateTo({
-          url: "/pages/workTask/components/detail?id=" + item.id + "&taskCode=" + item.taskCode + "&isMine=" + this.index
-        })
-      },
-      add() {
-        uni.navigateTo({
-          url: "/pages/workTask/components/create"
-        })
-      },
-
-      change(e) {
-        this.index = e
-        this.current = 1
-        this.getList()
-
-      },
-
-      map(index) {
-        return {
-          "0": {
-            taskRole: 1,
-            status: 0,
-          },
-          "1": {
-            taskRole: 1,
-            status: 1,
-          },
-          "2": {
-            taskRole: 0,
-          },
-          "3": {
-            taskRole: 2,
-          },
-          "4": {
-            taskRole: 3,
-          }
-        }[index]
-      },
-
-      getList() {
-        this.$http.post("/app/appworktaskinfo/list", null, {
-          params: {
-            ...this.map(this.index),
-            size: 10,
-            current: this.current
-          }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          }
-        })
-      }
-    },
-
-    onReachBottom() {
-      this.current = this.current + 1;
-      this.getList()
-    },
-
-    onShow() {
-      uni.pageScrollTo({
-        duration: 0,
-        scrollTop: 0
+    handleClick(item) {
+      uni.navigateTo({
+        url: "/pages/workTask/components/detail?id=" + item.id + "&taskCode=" + item.taskCode + "&isMine=" + this.index
       })
+    },
+    add() {
+      uni.navigateTo({
+        url: "/pages/workTask/components/create"
+      })
+    },
+
+    change(e) {
+      this.index = e
       this.current = 1
       this.getList()
+
+    },
+
+    map(index) {
+      return {
+        "0": {
+          taskRole: 1,
+          status: 0,
+        },
+        "1": {
+          taskRole: 1,
+          status: 1,
+        },
+        "2": {
+          taskRole: 0,
+        },
+        "3": {
+          taskRole: 2,
+        },
+        "4": {
+          taskRole: 3,
+        }
+      }[index]
+    },
+
+    getList() {
+      this.$http.post("/app/appworktaskinfo/list", null, {
+        params: {
+          ...this.map(this.index),
+          size: 10,
+          current: this.current
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
     }
+  },
+
+  onReachBottom() {
+    this.current = this.current + 1;
+    this.getList()
+  },
+
+  onShow() {
+    uni.pageScrollTo({
+      duration: 0,
+      scrollTop: 0
+    })
+    this.current = 1
+    this.getList()
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .work-task {
-    min-height: 100%;
-    background-color: #F5F5F5;
-    padding-bottom: 32px;
+.work-task {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 32px;
 
-    ::v-deep .content {
-      padding: 0;
-    }
+  ::v-deep .content {
+    padding: 0;
+  }
 
-    .list {
+  .list {
+    box-sizing: border-box;
+    padding: 32px 32px 0 32px;
+
+    .card {
+      background: #FFFFFF;
+      border-radius: 8px;
       box-sizing: border-box;
-      padding: 32px 32px 0 32px;
+      padding: 32px;
+      position: relative;
+      margin-bottom: 32px;
 
-      .card {
-        background: #FFFFFF;
-        border-radius: 8px;
-        box-sizing: border-box;
-        padding: 32px;
+      & > header {
+        font-size: 32px;
+        font-weight: 600;
+        color: #333333;
+      }
+
+      & > .u-row {
+        text {
+          font-size: 30px;
+          color: #999999;
+          line-height: 42px;
+        }
+      }
+
+      & > span {
+        font-size: 26px;
+        color: #649EFD;
+      }
+
+      .progress {
+        width: 100%;
+        height: 4px;
+        background: #F0F1F2;
+        border-radius: 2px;
         position: relative;
-        margin-bottom: 32px;
 
-        & > header {
-          font-size: 32px;
-          font-weight: 600;
-          color: #333333;
-        }
-
-        & > .u-row {
-          text {
-            font-size: 30px;
-            color: #999999;
-            line-height: 42px;
-          }
-        }
-
-        & > span {
-          font-size: 26px;
-          color: #649EFD;
-        }
-
-        .progress {
-          width: 100%;
-          height: 4px;
-          background: #F0F1F2;
-          border-radius: 2px;
-          position: relative;
-
-          .active {
-            position: absolute;
-            left: 0;
-            top: 0;
-            height: 4px;
-            background: #639EFD;
-            border-radius: 2px;
-          }
-        }
-
-        & > img {
-          width: 112px;
-          height: 112px;
+        .active {
           position: absolute;
+          left: 0;
           top: 0;
-          right: 0;
+          height: 4px;
+          background: #639EFD;
+          border-radius: 2px;
         }
       }
+
+      & > img {
+        width: 112px;
+        height: 112px;
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
     }
   }
+}
 </style>
diff --git a/src/pages/workonline/approvalopinion.vue b/src/pages/workonline/approvalopinion.vue
index 077ce476..3db99fb3 100644
--- a/src/pages/workonline/approvalopinion.vue
+++ b/src/pages/workonline/approvalopinion.vue
@@ -9,7 +9,8 @@
               <span class="icon">*</span>
               <span> 审批意见:</span>
             </span>
-            <textarea :maxlength="150" placeholder="请输入审批意见" v-model="opinion" class="textarea" clearable="false"> </textarea>
+            <textarea :maxlength="150" placeholder="请输入审批意见" v-model="opinion" class="textarea"
+                      clearable="false"> </textarea>
             <div class="clearn" @click="clearn">清空内容</div>
             <div class="msg_length">
               <span class="font">{{ opinion.length }}</span>
@@ -26,7 +27,8 @@
                 <span class="icon" v-if="item.mustFill == 1">*</span>
                 <span> {{ item.fieldName }}:</span>
               </span>
-              <textarea :maxlength="150" placeholder="请输入审批意见" v-model="item.fieldValue" class="textarea" clearable="false"> </textarea>
+              <textarea :maxlength="150" placeholder="请输入审批意见" v-model="item.fieldValue" class="textarea"
+                        clearable="false"> </textarea>
               <div class="clearn" @click="clearn">清空内容</div>
               <div class="msg_length">
                 <span class="font">{{ item.fieldValue.length }}</span>
@@ -42,7 +44,8 @@
                 <span> {{ item.fieldName }}:</span>
               </div>
               <div class="left">
-                <u-input type="text" @click="timeSelect(index)" class="right" placeholder="请选择" disabled v-model="item.fieldValue"></u-input>
+                <u-input type="text" @click="timeSelect(index)" class="right" placeholder="请选择" disabled
+                         v-model="item.fieldValue"></u-input>
               </div>
             </div>
           </div>
@@ -56,7 +59,8 @@
         <!-- 单个文件最大10MB.zip、.rar、.doc、.docx、.xls、.xlsx、.ppt、.pptx、.pdf、.txt、.jpg、.png格式 -->
         <div class="upload">
           <div class="info">
-            <ai-uploader multiple @list="(v) => (annex = v)" :limit="9" action="/admin/file/add2" type="file" placeholder="添加文件" preview />
+            <ai-uploader multiple @list="(v) => (annex = v)" :limit="9" action="/admin/file/add2" type="file"
+                         placeholder="添加文件" preview/>
           </div>
         </div>
       </div>
@@ -67,7 +71,7 @@
         <text class="img_text">(最多9张)</text>
         <div class="upload">
           <div class="info">
-            <ai-uploader multiple @list="(v) => (picture = v)" :limit="9" :size="2097152" preview />
+            <ai-uploader multiple @list="(v) => (picture = v)" :limit="9" :size="2097152" preview/>
           </div>
         </div>
       </div>
@@ -76,8 +80,8 @@
     <div class="btn" @click="btn">确定</div>
 
     <!-- 日期选择器 -->
-    <u-calendar v-model="show" :mode="mode" @change="calendar" />
-    <back />
+    <u-calendar v-model="show" :mode="mode" @change="calendar"/>
+    <back/>
   </div>
 </template>
 
@@ -119,9 +123,11 @@ export default {
   // 监听
   watch: {},
   // 实例创建后
-  onShow() {},
+  onShow() {
+  },
   // 实例渲染后
-  mounted() {},
+  mounted() {
+  },
   // 方法
   methods: {
     timeSelect(index) {
@@ -139,23 +145,23 @@ export default {
     },
     getList() {
       this.$http
-        .post(`/app/approv-alapply-info/approval-popup?type=${this.type}&id=${this.objid}`)
-        .then((res) => {
-          if (res.code == 0) {
-            res.data.fieldInfos.map((item) => {
-              if (item.fieldDataType == 1) {
-                item.fieldValue = ''
-              }
+      .post(`/app/approv-alapply-info/approval-popup?type=${this.type}&id=${this.objid}`)
+      .then((res) => {
+        if (res.code == 0) {
+          res.data.fieldInfos.map((item) => {
+            if (item.fieldDataType == 1) {
+              item.fieldValue = ''
+            }
 
-              if (item.fieldType == 3) {
-                this.list.push(item)
-              }
-            })
-          }
-        })
-        .catch(() => {
-          // this.$u.toast(err)
-        })
+            if (item.fieldType == 3) {
+              this.list.push(item)
+            }
+          })
+        }
+      })
+      .catch(() => {
+        // this.$u.toast(err)
+      })
     },
     // 提交确定
     btn() {
@@ -169,15 +175,15 @@ export default {
       // var isConfirm = true
 
       if (
-        this.list.some((item) => {
-          if (item.mustFill == 1 && !item.fieldValue) {
-            uni.showToast({
-              title: item.fieldName + '为必填',
-              icon: 'none',
-            })
-            return true
-          }
-        })
+          this.list.some((item) => {
+            if (item.mustFill == 1 && !item.fieldValue) {
+              uni.showToast({
+                title: item.fieldName + '为必填',
+                icon: 'none',
+              })
+              return true
+            }
+          })
       )
         return
 
@@ -208,27 +214,27 @@ export default {
       })
 
       this.$http
-        .post(`/app/approv-alapply-info/approval`, params)
-        .then((res) => {
-          if (res.code == 0) {
-            uni.navigateTo({
-              url: `/pages/workonline/truemsg?flag=1`,
-            })
-            this.getList()
-          }
-        })
-        .catch((e) => {
+      .post(`/app/approv-alapply-info/approval`, params)
+      .then((res) => {
+        if (res.code == 0) {
           uni.navigateTo({
-            url: `/pages/workonline/truemsg?flag=0`,
+            url: `/pages/workonline/truemsg?flag=1`,
           })
-          //  this.$u.toast(err)
-          uni.showToast({
-            title: e,
-            icon: 'none',
-          })
-          // this.$u.toast(err || '网络异常')
           this.getList()
+        }
+      })
+      .catch((e) => {
+        uni.navigateTo({
+          url: `/pages/workonline/truemsg?flag=0`,
         })
+        //  this.$u.toast(err)
+        uni.showToast({
+          title: e,
+          icon: 'none',
+        })
+        // this.$u.toast(err || '网络异常')
+        this.getList()
+      })
     },
     data(e) {
       this.files.push(e)
diff --git a/src/pages/workonline/detail.vue b/src/pages/workonline/detail.vue
index 40e76142..7ab3b28d 100644
--- a/src/pages/workonline/detail.vue
+++ b/src/pages/workonline/detail.vue
@@ -6,7 +6,8 @@
         <p>审批通过:</p>
         <div class="save">
           <div style="display:inline">[{{ this.list.tableInfo.tableName }}]已签署完成,</div>
-          <ai-image preview :file="list.pdfFile" style="display:inline-block;margin-left:4px ;"><span class="clicksave">点击查看和保存</span> </ai-image>
+          <ai-image preview :file="list.pdfFile" style="display:inline-block;margin-left:4px ;"><span class="clicksave">点击查看和保存</span>
+          </ai-image>
         </div>
       </div>
 
@@ -19,7 +20,8 @@
           <div class="people_msg">
             <!-- 圆形头像 -->
             <div class="avatar">
-              <span v-if="list.createUserAvatar"><img :src="list.createUserAvatar" alt="" style="width: 100%;height: 100%;border-radius:50%"/></span>
+              <span v-if="list.createUserAvatar"><img :src="list.createUserAvatar" alt=""
+                                                      style="width: 100%;height: 100%;border-radius:50%"/></span>
               <span v-else> {{ $formatName(list.createUserName) }}</span>
             </div>
 
@@ -40,7 +42,7 @@
 
           <!-- 已通过 -->
           <div class="people_status_agree" v-if="list.approvalStatus == 1">
-            <img src="./components/people_status_agree.png" alt="" />
+            <img src="./components/people_status_agree.png" alt=""/>
           </div>
 
           <!-- 被驳回 -->
@@ -72,7 +74,7 @@
             <div class="item_info">
               <span class="annexs">附件资料：</span>
               <div class="img_text" v-for="(item, indexs) in list.annexs" :key="indexs">
-                <ai-image :src="item.annexFile.url" preview />
+                <ai-image :src="item.annexFile.url" preview/>
                 <span class="text">{{ item.annexName }}</span>
               </div>
             </div>
@@ -81,23 +83,27 @@
       </div>
 
       <!-- tabs栏 -->
-      <u-tabs class="tabs" :list="list_tabs" height="96" active-color="#1365dd" inactive-color="#999" bar-width="374" font-size="30" :is-scroll="false" :current="current" @change="change"></u-tabs>
+      <u-tabs class="tabs" :list="list_tabs" height="96" active-color="#1365dd" inactive-color="#999" bar-width="374"
+              font-size="30" :is-scroll="false" :current="current" @change="change"></u-tabs>
 
       <!-- 表单申请的折叠窗 -->
       <div style="background-color:#fff">
         <div v-if="current == 0" class="collapse">
           <u-collapse event-type="close" :arrow="true" :accordion="true">
-            <u-collapse-item v-if="item.length > 0" v-for="(item, index) in inforlist" :title="item[0].groupName" :key="index">
+            <u-collapse-item v-if="item.length > 0" v-for="(item, index) in inforlist" :title="item[0].groupName"
+                             :key="index">
               <div v-for="(items, indexs) in item" :key="indexs">
                 <div class="item_msg">
                   <!-- 左 -->
                   <span class="msg_lef">{{ items.fieldName }}</span>
                   <!-- 右 -->
                   <!-- 字典值 items.dictionaryCode -->
-                  <span class="msg_lright" v-if="items.fieldDataType != 5">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
+                  <span class="msg_lright" v-if="items.fieldDataType != 5">{{
+                      $dict.getLabel(items.dictionaryCode, items.fieldValue)
+                    }}</span>
                   <span class="msg_lright" v-else>
                     <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL"
-                      >{{ $dict.getLabel(items.dictionaryCode, itemL) }}
+                    >{{ $dict.getLabel(items.dictionaryCode, itemL) }}
                       <span v-if="indexL < items.fieldValue.length - 1">,</span>
                     </span>
                   </span>
@@ -120,12 +126,13 @@
               <div class="item-left-ava-icon">
                 <!-- 头像 -->
                 <div class="avatar" v-if="item.userName">
-                  <span v-if="item.stepAvatar"><img :src="item.stepAvatar" alt="" style="width: 100%;height: 100%;border-radius:50%"/></span>
+                  <span v-if="item.stepAvatar"><img :src="item.stepAvatar" alt=""
+                                                    style="width: 100%;height: 100%;border-radius:50%"/></span>
                   <span v-else> {{ $formatName(item.userName) }}</span>
                 </div>
 
                 <div class="avatar" v-else-if="item.title == '抄送'">
-                  <img src="./components/Profile_Picture.png" alt="" />
+                  <img src="./components/Profile_Picture.png" alt=""/>
                 </div>
 
                 <div class="avatar" v-else>
@@ -134,14 +141,14 @@
 
                 <!-- 图标 发起 抄送和审批通过图标 -->
                 <div class="icon-yes" v-if="item.stepType == 1 || item.stepType == 0 || item.stepType == 3">
-                  <img src="./components/agree.png" alt="" />
+                  <img src="./components/agree.png" alt=""/>
                 </div>
 
                 <!-- 审批拒绝图标 -->
                 <div class="" v-else-if="item.stepType == 2"></div>
 
                 <div class="icon-no" v-else>
-                  <img src="./components/clearn.png" />
+                  <img src="./components/clearn.png"/>
                 </div>
               </div>
 
@@ -191,7 +198,8 @@
                   <div class="examine_docx1">
                     <!-- 图片 -->
                     <div class="examine_img" v-if="item.pictureFiles && item.pictureFiles.length > 0" style="">
-                      <ai-image preview :src="pic.url" v-for="pic in item.pictureFiles" :key="pic.id" style="width: 65px;height: 75px;float: left;margin-left: 6px;margin-bottom: 4px;overflow: hidden;" />
+                      <ai-image preview :src="pic.url" v-for="pic in item.pictureFiles" :key="pic.id"
+                                style="width: 65px;height: 75px;float: left;margin-left: 6px;margin-bottom: 4px;overflow: hidden;"/>
                     </div>
 
                     <!-- 附件资料 -->
@@ -214,7 +222,8 @@
                   <div class="examine_docx1">
                     <!-- 图片 -->
                     <div class="examine_img" v-if="item.pictureFiles && item.pictureFiles.length > 0" style="">
-                      <ai-image preview :src="pic.url" v-for="pic in item.pictureFiles" :key="pic.id" style="width: 69px;height: 75px;float: left;margin-left: 4px;margin-bottom: 4px;overflow: hidden;" />
+                      <ai-image preview :src="pic.url" v-for="pic in item.pictureFiles" :key="pic.id"
+                                style="width: 69px;height: 75px;float: left;margin-left: 4px;margin-bottom: 4px;overflow: hidden;"/>
                     </div>
 
                     <!-- 附件资料 -->
@@ -244,18 +253,18 @@
       <div class="agree" @click="agree(1)">同意</div>
     </div>
 
-    <back />
+    <back/>
   </div>
 </template>
 
 <script>
 import back from '../../components/AiBack'
 import AiImage from '../../components/AiImage'
-import { mapActions } from 'vuex'
+import {mapActions} from 'vuex'
 
 export default {
   name: 'workonlineDetail',
-  components: { AiImage, back },
+  components: {AiImage, back},
   computed: {
     canApproval() {
       return this.listType == 0
@@ -345,20 +354,20 @@ export default {
     },
     agree(type) {
       this.$http
-        .post(`/app/approv-alapply-info/approval-popup?type=${type}&id=${this.objid}`)
-        .then((res) => {
-          if (res.code == 0) {
-            uni.navigateTo({
-              url: `/pages/workonline/approvalopinion?id=${this.objid}&type=${type}`,
-            })
-          }
-        })
-        .catch((e) => {
-          uni.showToast({
-            title: e,
-            icon: 'none',
+      .post(`/app/approv-alapply-info/approval-popup?type=${type}&id=${this.objid}`)
+      .then((res) => {
+        if (res.code == 0) {
+          uni.navigateTo({
+            url: `/pages/workonline/approvalopinion?id=${this.objid}&type=${type}`,
           })
+        }
+      })
+      .catch((e) => {
+        uni.showToast({
+          title: e,
+          icon: 'none',
         })
+      })
     },
   },
 }
diff --git a/src/pages/workonline/truemsg.vue b/src/pages/workonline/truemsg.vue
index bd135f3a..7ba0312e 100644
--- a/src/pages/workonline/truemsg.vue
+++ b/src/pages/workonline/truemsg.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="closemsg">
-    <img :src="imgSrc" alt="" />
+    <img :src="imgSrc" alt=""/>
     <text>{{ text }}</text>
-    <u-button type="primary" :custom-style="{ width: '100%', borderRadius: '4px', marginTop: '48px' }" @click="goBack">{{ btnText }} </u-button>
+    <u-button type="primary" :custom-style="{ width: '100%', borderRadius: '4px', marginTop: '48px' }" @click="goBack">
+      {{ btnText }}
+    </u-button>
     <back></back>
   </div>
 </template>
@@ -12,7 +14,7 @@ import back from '../../components/AiBack'
 
 export default {
   name: 'CloseMsg',
-  components: { back },
+  components: {back},
   data() {
     return {
       flag: true,
@@ -38,7 +40,7 @@ export default {
       return this.flag ? '确定' : '我知道了'
     },
     imgSrc() {
-      return this.flag ? this.$cdn+'other/' + 'kztcg.png' : this.$cdn+'other/' + 'kztsb.png'
+      return this.flag ? this.$cdn + 'other/' + 'kztcg.png' : this.$cdn + 'other/' + 'kztsb.png'
     },
   },
 }
diff --git a/src/pages/workonline/workonline.vue b/src/pages/workonline/workonline.vue
index ca4aa45f..9f1d92ed 100644
--- a/src/pages/workonline/workonline.vue
+++ b/src/pages/workonline/workonline.vue
@@ -2,7 +2,8 @@
   <div class="workonline">
     <!-- 顶部搜索 -->
     <div class="search">
-      <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="search" @search="search"></u-search>
+      <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="search"
+                @search="search"></u-search>
     </div>
 
     <u-tabs :list="list" :is-scroll="false" :current="currentType" @change="change"></u-tabs>
@@ -22,10 +23,14 @@
               <span class="item_info">审批进度：</span>
 
               <!-- 申请类型 ing -->
-              <span class="business_status" v-if="item.approvalStatus == 0"> {{ $dict.getLabel('listApprovalStatusHb', item.approvalStatus) }}</span>
+              <span class="business_status" v-if="item.approvalStatus == 0"> {{
+                  $dict.getLabel('listApprovalStatusHb', item.approvalStatus)
+                }}</span>
 
               <!-- end -->
-              <span class="business_status_blue" v-if="item.approvalStatus == 1"> {{ $dict.getLabel('listApprovalStatusHb', item.approvalStatus) }}</span>
+              <span class="business_status_blue" v-if="item.approvalStatus == 1"> {{
+                  $dict.getLabel('listApprovalStatusHb', item.approvalStatus)
+                }}</span>
 
               <!-- false -->
               <span class="business_status_gray" v-if="item.approvalStatus == 2">
@@ -49,11 +54,11 @@
 
         <span class="icon">
           <!-- ing -->
-          <img src="./components/ing.png" alt="" v-if="item.approvalStatus == 0" />
+          <img src="./components/ing.png" alt="" v-if="item.approvalStatus == 0"/>
           <!-- end -->
-          <img src="./components/end.png" alt="" v-if="item.approvalStatus == 1" />
+          <img src="./components/end.png" alt="" v-if="item.approvalStatus == 1"/>
           <!-- false -->
-          <img src="./components/reject.png" alt="" v-if="item.approvalStatus == 2" />
+          <img src="./components/reject.png" alt="" v-if="item.approvalStatus == 2"/>
         </span>
       </div>
     </div>
@@ -69,10 +74,10 @@ export default {
   data() {
     return {
       list: [
-        { name: '待我审批', type: 0 },
-        { name: '我已审批', type: 1 },
-        { name: '抄送我的', type: 3 },
-        { name: '超时督办', type: 4 },
+        {name: '待我审批', type: 0},
+        {name: '我已审批', type: 1},
+        {name: '抄送我的', type: 3},
+        {name: '超时督办', type: 4},
       ],
       currentType: 0, // 0待我审批 1已审批 2抄送我的 3超时
       keyword: '',
@@ -95,7 +100,8 @@ export default {
     })
   },
   // 实例渲染后
-  mounted() {},
+  mounted() {
+  },
   // 方法
   methods: {
     getList() {
diff --git a/src/apps/AppAskForm/AppAskForm.vue b/src/sass/AppAskForm/AppAskForm.vue
similarity index 100%
rename from src/apps/AppAskForm/AppAskForm.vue
rename to src/sass/AppAskForm/AppAskForm.vue
diff --git a/src/apps/AppAskForm/AppForm.vue b/src/sass/AppAskForm/AppForm.vue
similarity index 100%
rename from src/apps/AppAskForm/AppForm.vue
rename to src/sass/AppAskForm/AppForm.vue
diff --git a/src/apps/AppAskForm/components/AddForm.vue b/src/sass/AppAskForm/components/AddForm.vue
similarity index 99%
rename from src/apps/AppAskForm/components/AddForm.vue
rename to src/sass/AppAskForm/components/AddForm.vue
index 42012fe6..546ef94a 100644
--- a/src/apps/AppAskForm/components/AddForm.vue
+++ b/src/sass/AppAskForm/components/AddForm.vue
@@ -94,11 +94,11 @@
         <div class="add-form__footer--item-wrapper">
           <div class="add-form__footer--item" @click="toPreview">
             <image :src="`${$cdn}sass/preview.png`"/>
-              <span>预览</span>
+            <span>预览</span>
           </div>
           <div class="add-form__footer--item" @click="toSetting">
             <image :src="`${$cdn}sass/setting.png`"/>
-              <span>设置</span>
+            <span>设置</span>
           </div>
         </div>
         <div @click="onConfirm">立即发布</div>
@@ -469,7 +469,7 @@ export default {
 
         .u-checkbox__icon-wrap, .u-radio__icon-wrap {
           position: absolute;
-          top: 4 rpx;
+          top: 4px;
         }
 
         .u-radio__label, .u-checkbox__label {
diff --git a/src/sass/AppAskForm/components/AddList.vue b/src/sass/AppAskForm/components/AddList.vue
new file mode 100644
index 00000000..240e4dc4
--- /dev/null
+++ b/src/sass/AppAskForm/components/AddList.vue
@@ -0,0 +1,194 @@
+<template>
+  <div class="template-wrapper">
+    <div class="form-list">
+      <div
+          class="form-list__item"
+          @click="toAdd(index)"
+          :style="{'background-image': `url(${$cdn}askform/${index + 1}.png)`}"
+          v-for="(item, index) in itemList"
+          :key="index">
+        <h2>{{ item.name }}</h2>
+        <div>立即创建</div>
+      </div>
+    </div>
+    <div class="template" v-if="list.length">
+      <h2>共享模板</h2>
+      <div class="template-list">
+        <div class="template-item" v-for="(item, index) in list" :key="index" hover-class="bg-hover"
+             @click="quote(item.id)">
+          <image :src="`${$cdn}askform/6.png`"/>
+          <h2>{{ item.title }}</h2>
+          <u-icon name="arrow-right" color="#E1E2E3"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'addList',
+  label: '新建项目',
+
+  data() {
+    return {
+      itemList: [{
+        name: '问卷调查'
+      }, {
+        name: '考试测评'
+      }, {
+        name: '报名登记'
+      }, {
+        name: '满意调查'
+      }, {
+        name: '投票评选'
+      }],
+      list: []
+    }
+  },
+
+  mounted() {
+    this.getList()
+  },
+
+  methods: {
+    toAdd(type) {
+      this.$emit('change', {
+        type: 'AddForm',
+        params: {
+          type
+        }
+      })
+    },
+
+    quote(id) {
+      this.$emit('change', {
+        type: 'AddForm',
+        params: {
+          id,
+          isQuote: 1
+        }
+      })
+    },
+
+    getList() {
+      this.$http.post(`/app/appquestionnairetemplate/list`, null, {
+        params: {
+          current: 1,
+          templateType: 1,
+          size: 10000
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.template-wrapper {
+  padding-bottom: 120 rpx;
+
+  .template {
+    margin: 32px 32px 0;
+    background: #fff;
+    border-radius: 8px;
+    overflow: hidden;
+
+    & > h2 {
+      height: 88px;
+      line-height: 88px;
+      padding: 0 24px;
+      color: #333333;
+      font-size: 30px;
+    }
+
+    .template-item {
+      display: flex;
+      align-items: center;
+      height: 104px;
+      padding: 0 24px;
+      border-bottom: 1px solid #D8DDE6;
+
+      &:active {
+        background-color: #eee;
+      }
+
+      &:last-child {
+        border: none;
+      }
+
+      image {
+        width: 36px;
+        height: 42px;
+      }
+
+      i {
+        font-size: 30px;
+        color: #E1E2E3;
+      }
+
+      h2 {
+        flex: 1;
+        padding: 0 18px;
+        color: #333333;
+        font-size: 28px;
+        font-weight: normal;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+
+  .form-list {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 32px 0;
+
+    div {
+      box-sizing: border-box;
+    }
+
+    .form-list__item {
+      width: calc(50% - 13px);
+      height: 216px;
+      margin: 32px 24px 0 0;
+      padding: 40px 20px 52px;
+      background-color: #FFFFFF;
+      border-radius: 8px;
+      background-size: 100% 100%;
+
+      &:active {
+        background-color: #eee;
+      }
+
+      &:nth-of-type(2n) {
+        margin-right: 0;
+      }
+
+      div {
+        width: 148px;
+        height: 48px;
+        line-height: 48px;
+        text-align: center;
+        color: #fff;
+        font-size: 28px;
+        background: #6BA1F9;
+        border-radius: 24px;
+      }
+
+      h2 {
+        margin-bottom: 32px;
+        padding-left: 10px;
+        color: #333333;
+        font-weight: 700;
+        font-size: 32px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppAskForm/components/FiledConfig.vue b/src/sass/AppAskForm/components/FiledConfig.vue
similarity index 61%
rename from src/apps/AppAskForm/components/FiledConfig.vue
rename to src/sass/AppAskForm/components/FiledConfig.vue
index e47619c1..be9dd3a0 100644
--- a/src/apps/AppAskForm/components/FiledConfig.vue
+++ b/src/sass/AppAskForm/components/FiledConfig.vue
@@ -2,21 +2,24 @@
   <div class="form-config">
     <div class="config-group">
       <div class="config-item">
-        <u-input class="form-maintitle" :maxlength="200" v-model="config.label" :placeholder="`请输入${config.fixedLabel||''}标题 ${config.required ? '(必填）' : ''}`"  placeholder-style="color: #999999; font-weight: 600" />
+        <u-input class="form-maintitle" :maxlength="200" v-model="config.label"
+                 :placeholder="`请输入${config.fixedLabel||''}标题 ${config.required ? '(必填）' : ''}`"
+                 placeholder-style="color: #999999; font-weight: 600"/>
       </div>
       <div class="config-item__select--wrapper" v-if="['radio', 'select', 'checkbox'].includes(config.type)">
         <div class="config-item__select" v-for="(item, index) in config.options" :key="index">
-          <image class="config-icon" :src="`${$cdn}askform/del.png`" @click="removeOptions(index)" />
+          <image class="config-icon" :src="`${$cdn}askform/del.png`" @click="removeOptions(index)"/>
           <div class="config-item__upload" v-if="config.type !== 'select'" @click="upload(index)">
             <u-icon color="#8c9dc3" name="plus" v-if="!item.img.length"></u-icon>
-            <image v-else :src="item.img[0].url" />
+            <image v-else :src="item.img[0].url"/>
           </div>
           <div class="textarea">
-           <textarea type="textarea" placeholder-style="color: #CDCDCF" :auto-height="true" v-model="item.label" :maxlength="100" placeholder="请输入选项" />
+            <textarea type="textarea" placeholder-style="color: #CDCDCF" :auto-height="true" v-model="item.label"
+                      :maxlength="100" placeholder="请输入选项"/>
           </div>
         </div>
         <div class="config-item__select config-item__select--add" @click="addOptions">
-          <image class="config-icon" :src="`${$cdn}askform/zj.png`" />
+          <image class="config-icon" :src="`${$cdn}askform/zj.png`"/>
           <span>添加选项</span>
         </div>
       </div>
@@ -27,7 +30,7 @@
           <span>说明文字</span>
         </div>
         <div class="config-item__right">
-          <u-input v-model="config.placeholder" placeholder="请输入说明文字" input-align="right" />
+          <u-input v-model="config.placeholder" placeholder="请输入说明文字" input-align="right"/>
         </div>
       </div>
       <div class="config-item">
@@ -35,7 +38,8 @@
           <span>是否必填</span>
         </div>
         <div class="config-item__right">
-          <u-switch v-model="config.required" active-value="1" inactive-value="0" :size="40" active-color="#1088F9"></u-switch>
+          <u-switch v-model="config.required" active-value="1" inactive-value="0" :size="40"
+                    active-color="#1088F9"></u-switch>
         </div>
       </div>
       <div class="config-item" v-if="!['upload'].includes(config.type)">
@@ -51,10 +55,11 @@
           <span>正确答案</span>
         </div>
         <div class="config-item__right">
-          <u-input v-model="config.answer" placeholder="请输入正确答案" input-align="right" />
+          <u-input v-model="config.answer" placeholder="请输入正确答案" input-align="right"/>
         </div>
       </div>
-      <div class="config-item" v-if="['radio', 'select'].includes(config.type) && config.isShowPoints && config.pointType === '0'">
+      <div class="config-item"
+           v-if="['radio', 'select'].includes(config.type) && config.isShowPoints && config.pointType === '0'">
         <div class="config-item__left">
           <span>正确答案</span>
         </div>
@@ -63,22 +68,25 @@
           <u-icon name="arrow-down-fill" color="#c0c4cc" size="24"></u-icon>
         </div>
       </div>
-      <div class="config-item config-item__checkbox" v-if="config.isShowPoints && ['radio', 'select', 'checkbox'].includes(config.type)">
+      <div class="config-item config-item__checkbox"
+           v-if="config.isShowPoints && ['radio', 'select', 'checkbox'].includes(config.type)">
         <div class="config-item__left">
           <span>计分方式</span>
         </div>
         <div class="config-item__right" @click="isShowType = true">
           <span>{{ pointTypeName ? pointTypeName : '请选择' }}</span>
-          <u-icon name="arrow-right" color="#E1E2E3" />
+          <u-icon name="arrow-right" color="#E1E2E3"/>
         </div>
       </div>
-      <div class="config-item config-item__answer config-item__checkbox" v-if="['checkbox'].includes(config.type) && config.isShowPoints && config.pointType === '0'">
+      <div class="config-item config-item__answer config-item__checkbox"
+           v-if="['checkbox'].includes(config.type) && config.isShowPoints && config.pointType === '0'">
         <div class="config-item__left">
           <span>正确答案</span>
         </div>
         <div class="config-item__right">
           <u-checkbox-group wrap @change="onCheckboxChange">
-            <u-checkbox v-model="field.checked" :name="field.label"  v-if="field.label" v-for="(field, i) in config.options" :key="i">
+            <u-checkbox v-model="field.checked" :name="field.label" v-if="field.label"
+                        v-for="(field, i) in config.options" :key="i">
               <span>{{ field.label }}</span>
             </u-checkbox>
           </u-checkbox-group>
@@ -89,7 +97,7 @@
           <span>本题分值</span>
         </div>
         <div class="config-item__right">
-          <u-input v-model="config.points" type="number" placeholder="请输入本题分值" input-align="right" />
+          <u-input v-model="config.points" type="number" placeholder="请输入本题分值" input-align="right"/>
         </div>
       </div>
       <div v-if="config.isShowPoints && config.pointType === '1'">
@@ -98,15 +106,16 @@
             <span>{{ item.label }}</span>
           </div>
           <div class="config-item__right">
-            <u-input v-model="item.point" placeholder="请输入分值" input-align="right" />
+            <u-input v-model="item.point" placeholder="请输入分值" input-align="right"/>
           </div>
         </div>
       </div>
       <div class="config-item config-item__point" v-if="config.isShowPoints && config.pointType === '2'">
         <u-checkbox-group wrap @change="onCheckboxChange">
-          <u-checkbox v-model="field.checked" :name="field.label" v-if="field.label" v-for="(field, i) in config.options" :key="i">
+          <u-checkbox v-model="field.checked" :name="field.label" v-if="field.label"
+                      v-for="(field, i) in config.options" :key="i">
             <span>{{ field.label }}</span>
-            <u-input v-model="field.point" type="number" placeholder="请输入分值" input-align="right" />
+            <u-input v-model="field.point" type="number" placeholder="请输入分值" input-align="right"/>
           </u-checkbox>
         </u-checkbox-group>
       </div>
@@ -115,12 +124,14 @@
           <span>全部答对</span>
         </div>
         <div class="config-item__right">
-          <u-input v-model="config.points" type="number" placeholder="请输入全部答对分值" input-align="right" />
+          <u-input v-model="config.points" type="number" placeholder="请输入全部答对分值" input-align="right"/>
         </div>
       </div>
     </div>
-    <u-select :list="config.options" :default-value="defaultAnswer" value-name="value" label-name="label" v-model="isShowAnswer" @confirm="answerChange"></u-select>
-    <u-select :list="config.pointDict" :default-value="defaultType" value-name="dictValue" label-name="dictName" v-model="isShowType" @confirm="pointTypeChange"></u-select>
+    <u-select :list="config.options" :default-value="defaultAnswer" value-name="value" label-name="label"
+              v-model="isShowAnswer" @confirm="answerChange"></u-select>
+    <u-select :list="config.pointDict" :default-value="defaultType" value-name="dictValue" label-name="dictName"
+              v-model="isShowType" @confirm="pointTypeChange"></u-select>
     <div class="add-form__footer">
       <div @click="back">
         <span>取消</span>
@@ -131,20 +142,20 @@
 </template>
 
 <script>
-import { components } from './config'
+import {components} from './config'
+
 export default {
   props: ['filed', 'index', 'filedType'],
 
-  data () {
+  data() {
     return {
       isShowType: false,
       isShowAnswer: false,
-      config: {
-      }
+      config: {}
     }
   },
 
-  mounted () {
+  mounted() {
     if (this.index !== '') {
       this.config = this.filed
       return false
@@ -155,19 +166,19 @@ export default {
   },
 
   computed: {
-    pointTypeName () {
+    pointTypeName() {
       if (!this.config.pointDict) return ''
 
       return this.config.pointDict.filter(v => v.dictValue === this.config.pointType)[0].dictName
     },
 
-    defaultType () {
+    defaultType() {
       if (!this.config.pointType) return [0]
 
       return [Number(this.config.pointType)]
     },
 
-    defaultAnswer () {
+    defaultAnswer() {
       if (!this.config.answer) return [0]
 
       let index = 0
@@ -184,20 +195,20 @@ export default {
   },
 
   methods: {
-    answerChange (e) {
+    answerChange(e) {
       this.config.answer = e[0].label
     },
 
-    pointTypeChange (e) {
+    pointTypeChange(e) {
       console.log(e)
       this.config.pointType = e[0].value
     },
 
-    onCheckboxChange (e) {
+    onCheckboxChange(e) {
       this.config.answer = e
     },
 
-    upload (index) {
+    upload(index) {
       let params = {
         count: 1,
         sizeType: ['compressed'],
@@ -217,7 +228,7 @@ export default {
       uni.chooseImage(params)
     },
 
-    uploadFile (img, index) {
+    uploadFile(img, index) {
       uni.showLoading({title: '上传中'})
       let formData = new FormData()
       formData.append('file', img)
@@ -233,7 +244,7 @@ export default {
       })
     },
 
-    removeOptions (index) {
+    removeOptions(index) {
       const len = this.config.options.length
       const label = this.config.options[index].label
       if (len === 2) {
@@ -254,11 +265,11 @@ export default {
       this.config.options.splice(index, 1)
     },
 
-    back () {
+    back() {
       this.$emit('back')
     },
 
-    confirm () {
+    confirm() {
       uni.$emit('filedConfig', {
         config: this.config,
         index: this.index === '' ? '-1' : this.index
@@ -267,11 +278,11 @@ export default {
       this.back()
     },
 
-    addOptions () {
+    addOptions() {
       const len = this.config.options.length
       let label = `选项${len + 1}`
 
-      const index= this.config.options.findIndex(v => label === v.label)
+      const index = this.config.options.findIndex(v => label === v.label)
       if (index > -1) {
         label = `新选项${len + 1}`
       }
@@ -289,246 +300,248 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .form-config {
-    box-sizing: border-box;
-    padding-bottom: 130px;
+.form-config {
+  box-sizing: border-box;
+  padding-bottom: 130px;
 
-    .form-maintitle {
-      ::v-deep .uni-input-input {
-        font-size: 36px;
-        font-weight: 600;
+  .form-maintitle {
+    ::v-deep .uni-input-input {
+      font-size: 36px;
+      font-weight: 600;
+    }
+  }
+
+  .config-item__select--wrapper {
+    .config-item__select {
+      display: flex;
+      align-items: center;
+
+      ::v-deep .u-input__input {
+        height: 100%;
+      }
+
+      .textarea {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        min-height: 104px;
+        padding: 16px 0;
+        font-size: 28px;
+        border-bottom: 1px solid #dfe8f8;
+      }
+
+      textarea {
+        width: 100%;
+        font-size: 28px;
+      }
+
+      .config-icon {
+        width: 36px;
+        height: 36px;
+        margin-right: 12px;
       }
     }
 
-    .config-item__select--wrapper {
-      .config-item__select {
-        display: flex;
-        align-items: center;
+    .config-item__select--add {
+      height: 120px;
 
-        ::v-deep .u-input__input {
-          height: 100%;
-        }
-
-        .textarea {
-          flex: 1;
-          display: flex;
-          align-items: center;
-          min-height: 104px;
-          padding: 16px 0;
-          font-size: 28px;
-          border-bottom: 1px solid #dfe8f8;
-        }
-
-        textarea {
-          width: 100%;
-          font-size: 28px;
-        }
-
-        .config-icon {
-          width: 36px;
-          height: 36px;
-          margin-right: 12px;
-        }
+      .config-icon {
+        margin-right: 18px;
       }
 
-      .config-item__select--add {
-        height: 120px;
+      span {
+        color: #1D74F4;
+        font-size: 30px;
+      }
+    }
+  }
 
-        .config-icon {
-          margin-right: 18px;
-        }
+  .config-group {
+    margin-bottom: 32px;
+    padding: 0 32px;
+    background: #fff;
+
+    .config-item__upload {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 60px;
+      height: 60px;
+      margin-right: 20px;
+      border: 1px solid rgb(208, 212, 220);
+      background-color: #fbfdff;
+
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .config-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      min-height: 100px;
+      padding: 16px 0;
+      border-bottom: 1px solid #dfe8f8;
+
+      &:last-child {
+        border: none;
+      }
+
+      ::v-deep .u-radio__label, ::v-deep .u-checkbox__label {
+        margin-right: 0;
+        font-size: 28px;
 
         span {
-          color: #1D74F4;
-          font-size: 30px;
+          max-width: 400 rpx;
+          line-height: 1.2;
+        }
+      }
+
+      .config-item__left {
+        max-width: 400px;
+      }
+
+      .config-item__right {
+        flex: 1;
+        text-align: right;
+        padding-left: 30px;
+
+        &.config-item__text {
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+
+          span {
+            max-width: 400px;
+            margin-right: 10px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            word-break: keep-all;
+          }
+        }
+
+        .text {
+        }
+      }
+
+      &.config-item__answer {
+        display: block;
+        padding: 20px 0;
+
+        .config-item__left {
+          margin-bottom: 32 rpx;
+
+          span {
+            word-break: break-all;
+            color: #333;
+            font-size: 30px;
+          }
+        }
+
+        .config-item__right {
+          width: 100%;
+          padding-left: 0;
+          text-align: left;
         }
       }
     }
 
-    .config-group {
-      margin-bottom: 32px;
-      padding: 0 32px;
-      background: #fff;
+    ::v-deep .u-checkbox {
+      align-items: baseline;
+    }
 
-      .config-item__upload {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 60px;
-        height: 60px;
-        margin-right: 20px;
-        border: 1px solid rgb(208, 212, 220);
-        background-color: #fbfdff;
+    .config-item__checkbox {
+      height: auto;
+      padding: 14px 0;
 
-        image {
-          width: 100%;
-          height: 100%;
-        }
+      ::v-deep .u-checkbox, ::v-deep .u-radio {
+        // justify-content: flex-end;
       }
+    }
 
-      .config-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+    .config-item__point {
+      height: auto;
+      padding: 0;
+
+      ::v-deep .u-checkbox {
+        justify-content: inherit;
         min-height: 100px;
-        padding: 16px 0;
-        border-bottom: 1px solid #dfe8f8;
+        padding: 14px 0;
+        border-bottom: 1px solid #eee;
 
         &:last-child {
           border: none;
         }
 
-        ::v-deep .u-radio__label, ::v-deep .u-checkbox__label {
+        .u-checkbox__label {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          flex: 1;
           margin-right: 0;
-          font-size: 28px;
 
-          span {
-            max-width: 400rpx;
-            line-height: 1.2;
-          }
-        }
-
-        .config-item__left {
-          max-width: 400px;
-        }
-
-        .config-item__right {
-          flex: 1;
-          text-align: right;
-          padding-left: 30px;
-
-          &.config-item__text {
-            display: flex;
-            align-items: center;
-            justify-content: flex-end;
-
-            span {
-              max-width: 400px;
-              margin-right: 10px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              word-break: keep-all;
-            }
-          }
-
-          .text {
-          }
-        }
-
-        &.config-item__answer {
-          display: block;
-          padding: 20px 0;
-
-          .config-item__left {
-            margin-bottom: 32rpx;
-            span {
-              word-break: break-all;
-              color: #333;
-              font-size: 30px;
-            }
-          }
-
-          .config-item__right {
-            width: 100%;
-            padding-left: 0;
-            text-align: left;
-          }
-        }
-      }
-
-      ::v-deep .u-checkbox {
-        align-items: baseline;
-      }
-
-      .config-item__checkbox {
-        height: auto;
-        padding: 14px 0;
-
-        ::v-deep .u-checkbox, ::v-deep .u-radio {
-          // justify-content: flex-end;
-        }
-      }
-      .config-item__point {
-        height: auto;
-        padding: 0;
-
-        ::v-deep .u-checkbox {
-          justify-content: inherit;
-          min-height: 100px;
-          padding: 14px 0;
-          border-bottom: 1px solid #eee;
-
-          &:last-child {
-            border: none;
-          }
-
-          .u-checkbox__label {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
+          .u-input {
             flex: 1;
-            margin-right: 0;
-
-            .u-input {
-              flex: 1;
-              max-width: 400px;
-            }
-          }
-        }
-      }
-    }
-
-    * {
-      box-sizing: border-box;
-    }
-
-    .add-form__footer {
-      display: flex;
-      align-items: center;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 1;
-      width: 100%;
-      height: 112px;
-      text-align: center;
-
-      div {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex: 1;
-        height: 100%;
-        text-align: center;
-        background: #fff;
-
-        &:first-child:active {
-          background: #eee;
-        }
-
-        &:last-child {
-          color: #fff;
-          font-size: 36px;
-          background: #3192F4;
-
-          &:active {
-            opacity: 0.8;
-          }
-        }
-
-        span {
-          flex: 1;
-          height: 100%;
-          line-height: 112px;
-          color: #333333;
-          font-size: 32px;
-
-          &:active {
-            background: #eee;
+            max-width: 400px;
           }
         }
       }
     }
   }
+
+  * {
+    box-sizing: border-box;
+  }
+
+  .add-form__footer {
+    display: flex;
+    align-items: center;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 1;
+    width: 100%;
+    height: 112px;
+    text-align: center;
+
+    div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: 1;
+      height: 100%;
+      text-align: center;
+      background: #fff;
+
+      &:first-child:active {
+        background: #eee;
+      }
+
+      &:last-child {
+        color: #fff;
+        font-size: 36px;
+        background: #3192F4;
+
+        &:active {
+          opacity: 0.8;
+        }
+      }
+
+      span {
+        flex: 1;
+        height: 100%;
+        line-height: 112px;
+        color: #333333;
+        font-size: 32px;
+
+        &:active {
+          background: #eee;
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/src/apps/AppAskForm/components/FormSetting.vue b/src/sass/AppAskForm/components/FormSetting.vue
similarity index 75%
rename from src/apps/AppAskForm/components/FormSetting.vue
rename to src/sass/AppAskForm/components/FormSetting.vue
index 553119fc..749f8e02 100644
--- a/src/apps/AppAskForm/components/FormSetting.vue
+++ b/src/sass/AppAskForm/components/FormSetting.vue
@@ -5,14 +5,14 @@
       <div class="setting-item">
         <div class="setting-item__left">
           <span>截止时间</span>
-          <image :src="`${$cdn}askform/bz.png`" @click="tips = '表单截止后，用户打开表单会提示此表单已结束' , isShowModal = true" />
+          <image :src="`${$cdn}askform/bz.png`" @click="tips = '表单截止后，用户打开表单会提示此表单已结束' , isShowModal = true"/>
         </div>
         <div class="setting-item__right">
           <u-radio-group v-model="periodValidityType" active-color="#1088F9">
             <u-radio name="0" label="永久有效" style="padding-right: 20rpx;">永久有效</u-radio>
             <u-radio name="1" label="自定义时间">自定义时间</u-radio>
           </u-radio-group>
-          <u-icon name="arrow-right" color="#E1E2E3" />
+          <u-icon name="arrow-right" color="#E1E2E3"/>
         </div>
       </div>
       <div class="setting-item" v-if="periodValidityType === '1'" @click="isShowTime = true">
@@ -21,13 +21,13 @@
         </div>
         <div class="setting-item__right">
           <span>{{ periodValidityEndTime }}</span>
-          <u-icon name="arrow-right" color="#E1E2E3" />
+          <u-icon name="arrow-right" color="#E1E2E3"/>
         </div>
       </div>
       <div class="setting-item">
         <div class="setting-item__left">
           <span>匹配客户方式</span>
-          <image :src="`${$cdn}askform/bz.png`" @click="tips = '将参与活动的微信客户和企业微信客户匹配' , isShowModal = true" />
+          <image :src="`${$cdn}askform/bz.png`" @click="tips = '将参与活动的微信客户和企业微信客户匹配' , isShowModal = true"/>
         </div>
         <div class="setting-item__right">
           <span>客户微信ID匹配</span>
@@ -36,7 +36,7 @@
       <div class="setting-item">
         <div class="setting-item__left">
           <span>提交次数</span>
-          <image :src="`${$cdn}askform/bz.png`" @click="tips = '此功能发布后不可修改' , isShowModal = true" />
+          <image :src="`${$cdn}askform/bz.png`" @click="tips = '此功能发布后不可修改' , isShowModal = true"/>
         </div>
         <div class="setting-item__right">
           <u-radio-group v-model="commitType" active-color="#1088F9">
@@ -71,7 +71,8 @@
       <div @click="confirm">{{ type === 'edit' ? '发布' : '确定' }}</div>
     </div>
     <u-modal v-model="isShowModal" :content="tips"></u-modal>
-    <u-picker mode="time" v-model="isShowTime" :show-time-tag="true"  @close="isShowTime = false" @confirm="onTimeChange" :params="params"></u-picker>
+    <u-picker mode="time" v-model="isShowTime" :show-time-tag="true" @close="isShowTime = false" @confirm="onTimeChange"
+              :params="params"></u-picker>
   </div>
 </template>
 
@@ -79,7 +80,7 @@
 export default {
   props: ['id', 'formConfig', 'type'],
 
-  data () {
+  data() {
     return {
       params: {
         year: true,
@@ -101,7 +102,7 @@ export default {
     }
   },
 
-  mounted () {
+  mounted() {
     if (this.id) {
       this.id = this.id
       this.getInfo(this.id)
@@ -120,15 +121,15 @@ export default {
   },
 
   methods: {
-    onTimeChange (e) {
+    onTimeChange(e) {
       this.periodValidityEndTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`
     },
 
-    back () {
+    back() {
       this.$emit('back')
     },
 
-    getInfo (id) {
+    getInfo(id) {
       this.$http.post(`/app/appquestionnairetemplate/queryDetailById?id=${id}`).then(res => {
         if (res.code == 0) {
           this.periodValidityType = res.data.periodValidityType
@@ -145,7 +146,7 @@ export default {
       })
     },
 
-    publish () {
+    publish() {
       this.$http.post(`/app/appquestionnairetemplate/release`, null, {
         params: {
           commitType: this.commitType,
@@ -169,7 +170,7 @@ export default {
       })
     },
 
-    confirm () {
+    confirm() {
       if (this.type === 'edit') {
         this.publish()
 
@@ -191,122 +192,122 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .form-setting {
-    padding: 0 20px;
+.form-setting {
+  padding: 0 20px;
 
-    .add-form__footer {
+  .add-form__footer {
+    display: flex;
+    align-items: center;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 1;
+    width: 100%;
+    height: 112px;
+    text-align: center;
+
+    div {
       display: flex;
       align-items: center;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 1;
-      width: 100%;
-      height: 112px;
+      justify-content: center;
+      flex: 1;
+      height: 100%;
       text-align: center;
+      background: #fff;
 
-      div {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex: 1;
-        height: 100%;
-        text-align: center;
-        background: #fff;
+      &:first-child:active {
+        background: #eee;
+      }
 
-        &:first-child:active {
-          background: #eee;
-        }
+      &:last-child {
+        color: #fff;
+        font-size: 36px;
+        background: #3192F4;
 
-        &:last-child {
-          color: #fff;
-          font-size: 36px;
-          background: #3192F4;
-
-          &:active {
-            opacity: 0.8;
-          }
-        }
-
-        span {
-          flex: 1;
-          height: 100%;
-          line-height: 112px;
-          color: #333333;
-          font-size: 32px;
-
-          &:active {
-            background: #eee;
-          }
+        &:active {
+          opacity: 0.8;
         }
       }
-    }
 
-    * {
-      box-sizing: border-box;
-    }
+      span {
+        flex: 1;
+        height: 100%;
+        line-height: 112px;
+        color: #333333;
+        font-size: 32px;
 
-    & > h2 {
-      height: 80px;
-      padding-top: 24px;
-      font-size: 28px;
-      color: #999999;
-    }
-
-    .form-setting__list {
-      padding: 0 20px;
-      background: #fff;
-      border-radius: 8px;
-
-      .setting-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 104px;
-        border-bottom: 1px solid #D8DDE6;
-
-        .setting-item__right {
-          color: #999;
-          font-size: 28px;
-
-          span {
-            margin-right: 6px;
-          }
-
-          ::v-deep .u-radio__label {
-            color: #999;
-            font-size: 28px;
-          }
-
-          ::v-deep .u-radio {
-            &:last-child {
-              .u-radio__label {
-                margin-right: 6px;
-              }
-            }
-          }
-        }
-
-        &:last-child {
-          border: none;
-        }
-
-        & > div {
-          display: flex;
-          align-items: center;
-        }
-
-        .setting-item__left {
-          color: #666666;
-          font-size: 30px;
-
-          image {
-            width: 30px;
-            height: 30px;
-            margin-left: 16px;
-          }
+        &:active {
+          background: #eee;
         }
       }
     }
   }
+
+  * {
+    box-sizing: border-box;
+  }
+
+  & > h2 {
+    height: 80px;
+    padding-top: 24px;
+    font-size: 28px;
+    color: #999999;
+  }
+
+  .form-setting__list {
+    padding: 0 20px;
+    background: #fff;
+    border-radius: 8px;
+
+    .setting-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 104px;
+      border-bottom: 1px solid #D8DDE6;
+
+      .setting-item__right {
+        color: #999;
+        font-size: 28px;
+
+        span {
+          margin-right: 6px;
+        }
+
+        ::v-deep .u-radio__label {
+          color: #999;
+          font-size: 28px;
+        }
+
+        ::v-deep .u-radio {
+          &:last-child {
+            .u-radio__label {
+              margin-right: 6px;
+            }
+          }
+        }
+      }
+
+      &:last-child {
+        border: none;
+      }
+
+      & > div {
+        display: flex;
+        align-items: center;
+      }
+
+      .setting-item__left {
+        color: #666666;
+        font-size: 30px;
+
+        image {
+          width: 30px;
+          height: 30px;
+          margin-left: 16px;
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/src/apps/AppAskForm/components/List.vue b/src/sass/AppAskForm/components/List.vue
similarity index 99%
rename from src/apps/AppAskForm/components/List.vue
rename to src/sass/AppAskForm/components/List.vue
index 0a04c0d7..23350ceb 100644
--- a/src/apps/AppAskForm/components/List.vue
+++ b/src/sass/AppAskForm/components/List.vue
@@ -27,7 +27,7 @@
           <span>{{ $dict.getLabel('questionnaireStatus', item.status) }}</span>
         </div>
       </div>
-      <div style="height: 30rpx"></div>
+      <u-gap/>
       <AiEmpty v-if="!list.length && isMore"></AiEmpty>
     </scroll-view>
     <u-popup v-model="isShow" :closeable="false" mode="bottom" :z-index="11">
diff --git a/src/apps/AppAskForm/components/PreviewForm.vue b/src/sass/AppAskForm/components/PreviewForm.vue
similarity index 100%
rename from src/apps/AppAskForm/components/PreviewForm.vue
rename to src/sass/AppAskForm/components/PreviewForm.vue
diff --git a/src/apps/AppAskForm/components/Result.vue b/src/sass/AppAskForm/components/Result.vue
similarity index 100%
rename from src/apps/AppAskForm/components/Result.vue
rename to src/sass/AppAskForm/components/Result.vue
diff --git a/src/apps/AppAskForm/components/Tabbar.vue b/src/sass/AppAskForm/components/Tabbar.vue
similarity index 100%
rename from src/apps/AppAskForm/components/Tabbar.vue
rename to src/sass/AppAskForm/components/Tabbar.vue
diff --git a/src/sass/AppAskForm/components/config.js b/src/sass/AppAskForm/components/config.js
new file mode 100644
index 00000000..07076f81
--- /dev/null
+++ b/src/sass/AppAskForm/components/config.js
@@ -0,0 +1,163 @@
+export const components = [
+  {
+    type: 'radio',
+    label: '单选',
+    fixedLabel: '单选',
+    value: '',
+    points: '',
+    icon: 'iconradio',
+    isShowPoints: false,
+    required: true,
+    hasAnswer: false,
+    answer: '',
+    pointType: '0',
+    pointDict: [
+      {
+        dictName: '此题有唯一答案和分值',
+        dictValue: '0'
+      },
+      {
+        dictName: '每个选项都有对应分值',
+        dictValue: '1'
+      }
+    ],
+    options: [
+      {
+        label: '选项1',
+        value: '',
+        point: '',
+        img: []
+      },
+      {
+        label: '选项2',
+        value: '',
+        point: '',
+        img: []
+      }
+    ],
+    title: ''
+  },
+  {
+    type: 'checkbox',
+    label: '多选',
+    fixedLabel: '多选',
+    points: '',
+    icon: 'iconcheck_box',
+    isShowPoints: false,
+    required: true,
+    hasAnswer: false,
+    answer: [],
+    value: [],
+    pointType: '0',
+    pointDict: [
+      {
+        dictName: '此题有唯一答案和分值',
+        dictValue: '0'
+      },
+      {
+        dictName: '每个选项都有对应分值',
+        dictValue: '1'
+      },
+      {
+        dictName: '答对几项得几分，答错不得分',
+        dictValue: '2'
+      }
+    ],
+    options: [
+      {
+        label: '选项1',
+        value: '',
+        point: '',
+        img: [],
+        checked: false
+      },
+      {
+        label: '选项2',
+        point: '',
+        value: '',
+        img: [],
+        checked: false
+      }
+    ],
+    title: ''
+  },
+  {
+    type: 'select',
+    label: '单下拉框',
+    fixedLabel: '单下拉框',
+    value: '',
+    points: '',
+    icon: 'iconSelect',
+    isShowPoints: false,
+    required: true,
+    hasAnswer: false,
+    answer: '',
+    pointType: '0',
+    placeholder: '请选择',
+    pointDict: [
+      {
+        dictName: '此题有唯一答案和分值',
+        dictValue: '0'
+      },
+      {
+        dictName: '每个选项都有对应分值',
+        dictValue: '1'
+      }
+    ],
+    options: [
+      {
+        label: '选项1',
+        value: '',
+        point: '',
+        img: []
+      },
+      {
+        label: '选项2',
+        value: '',
+        point: '',
+        img: []
+      }
+    ],
+    title: ''
+  },
+  {
+    type: 'input',
+    label: '单行填空',
+    fixedLabel: '单行填空',
+    value: '',
+    pointType: '0',
+    icon: 'icontext_box',
+    isShowPoints: false,
+    points: '',
+    required: true,
+    hasAnswer: false,
+    placeholder: '请输入...',
+    answer: ''
+  },
+  {
+    type: 'textarea',
+    label: '多行填空',
+    fixedLabel: '多行填空',
+    pointType: '0',
+    icon: 'icontext_area',
+    points: '',
+    isShowPoints: false,
+    required: true,
+    hasAnswer: false,
+    answer: '',
+    placeholder: '请输入...',
+    value: ''
+  },
+  {
+    type: 'upload',
+    label: '上传图片',
+    fixedLabel: '上传图片',
+    value: '',
+    icon: 'iconpic',
+    isShowPoints: false,
+    points: '',
+    required: true,
+    hasAnswer: false,
+    answer: ''
+  }
+];
diff --git a/src/apps/AppAskForm/components/formDetail.vue b/src/sass/AppAskForm/components/formDetail.vue
similarity index 100%
rename from src/apps/AppAskForm/components/formDetail.vue
rename to src/sass/AppAskForm/components/formDetail.vue
diff --git a/src/apps/AppInterview/AppInterview.vue b/src/sass/AppInterview/AppInterview.vue
similarity index 100%
rename from src/apps/AppInterview/AppInterview.vue
rename to src/sass/AppInterview/AppInterview.vue
diff --git a/src/apps/AppInterview/interviewDetail.vue b/src/sass/AppInterview/interviewDetail.vue
similarity index 100%
rename from src/apps/AppInterview/interviewDetail.vue
rename to src/sass/AppInterview/interviewDetail.vue
diff --git a/src/apps/AppMeetingNotice/AppMeetingNotice.vue b/src/sass/AppMeetingNotice/AppMeetingNotice.vue
similarity index 90%
rename from src/apps/AppMeetingNotice/AppMeetingNotice.vue
rename to src/sass/AppMeetingNotice/AppMeetingNotice.vue
index ce4651df..bf618101 100644
--- a/src/apps/AppMeetingNotice/AppMeetingNotice.vue
+++ b/src/sass/AppMeetingNotice/AppMeetingNotice.vue
@@ -18,15 +18,15 @@
             <div class="time">
               <span>{{ item.startTime|format }}</span>
               <span>{{ item.startTime|formatDate(0) }}年{{
-                    item.startTime|formatDate(1)
-                  }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
+                  item.startTime|formatDate(1)
+                }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
             </div>
             <div class="arrow"></div>
             <div class="time">
               <span>{{ item.endTime|format }}</span>
               <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{
-                    item.endTime|formatDate(2)
-                  }}日 周{{ item.endTime|formatWeek }}</span>
+                  item.endTime|formatDate(2)
+                }}日 周{{ item.endTime|formatWeek }}</span>
             </div>
           </u-row>
           <u-row class="info">
@@ -59,7 +59,7 @@ import meetingList from './meetingList';
 export default {
   name: "AppMeetingNotice",
   appName: "会议通知",
-  components: { addMeeting, belongToMe, detail, meetingList},
+  components: {addMeeting, belongToMe, detail, meetingList},
   data() {
     return {
       meetingList: [],
@@ -96,9 +96,9 @@ export default {
         "3": "common/toDo.png",
       }[status]
     },
-    handleDetail({id}){
+    handleDetail({id}) {
       uni.navigateTo({
-        url:"/apps/AppMeetingNotice/detail?id=" + id
+        url: "/apps/AppMeetingNotice/detail?id=" + id
       })
     },
     getData() {
@@ -114,12 +114,12 @@ export default {
         }
       })
     },
-    handleClick(index){
+    handleClick(index) {
       let url
-      if(index==0 || index==2){
-        url="/apps/AppMeetingNotice/meetingList?index=" + index
-      }else if(index==1){
-        url="/apps/AppMeetingNotice/belongToMe"
+      if (index == 0 || index == 2) {
+        url = "/apps/AppMeetingNotice/meetingList?index=" + index
+      } else if (index == 1) {
+        url = "/apps/AppMeetingNotice/belongToMe"
       }
       uni.navigateTo({url})
     },
diff --git a/src/apps/AppMeetingNotice/addMeeting.vue b/src/sass/AppMeetingNotice/addMeeting.vue
similarity index 98%
rename from src/apps/AppMeetingNotice/addMeeting.vue
rename to src/sass/AppMeetingNotice/addMeeting.vue
index e78a6ee4..b53785a7 100644
--- a/src/apps/AppMeetingNotice/addMeeting.vue
+++ b/src/sass/AppMeetingNotice/addMeeting.vue
@@ -128,23 +128,23 @@ export default {
   },
 
   onLoad(opt) {
-    if(opt.id) {
+    if (opt.id) {
       this.form.id = opt.id
       this.getDetail()
     }
 
-    this.$nextTick(()=>{
+    this.$nextTick(() => {
       let date = new Date();
       this.form.startTime.time = date.getHours()?.toString()?.padStart(2, "0") + ":" + date.getMinutes()?.toString()?.padStart(2, "0")
       this.form.startTime.year = date.getFullYear()
-      this.form.startTime.month = (date.getMonth()+1)?.toString()?.padStart(2, "0")
+      this.form.startTime.month = (date.getMonth() + 1)?.toString()?.padStart(2, "0")
       this.form.startTime.day = date.getDate()
       this.form.startTime.weekday = '日一二三四五六'.charAt(date.getDay())
       this.form.endTime = {...this.form.startTime}
     })
   },
 
-  onShow(){
+  onShow() {
     document.title = "新增会议";
     this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
   },
diff --git a/src/apps/AppMeetingNotice/belongToMe.vue b/src/sass/AppMeetingNotice/belongToMe.vue
similarity index 93%
rename from src/apps/AppMeetingNotice/belongToMe.vue
rename to src/sass/AppMeetingNotice/belongToMe.vue
index 8b51ff7d..dd8cbf3d 100644
--- a/src/apps/AppMeetingNotice/belongToMe.vue
+++ b/src/sass/AppMeetingNotice/belongToMe.vue
@@ -10,12 +10,16 @@
           <u-row justify="between">
             <div class="time">
               <span>{{ item.startTime|formatTime }}</span>
-              <span>{{ item.startTime|formatDate(0) }}年{{ item.startTime|formatDate(1) }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
+              <span>{{ item.startTime|formatDate(0) }}年{{
+                  item.startTime|formatDate(1)
+                }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
             </div>
             <div class="arrow"></div>
             <div class="time">
               <span>{{ item.endTime|formatTime }}</span>
-              <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{ item.endTime|formatWeek }}</span>
+              <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{
+                  item.endTime|formatWeek
+                }}</span>
             </div>
           </u-row>
           <u-row class="info">
@@ -63,7 +67,7 @@ export default {
     }
   },
   onShow() {
-    document.title="我发起的";
+    document.title = "我发起的";
   },
   created() {
     this.injectJWeixin(['sendChatMessage']).then(() => {
@@ -75,7 +79,7 @@ export default {
     this.getList()
   },
   methods: {
-      ...mapActions(['injectJWeixin']),
+    ...mapActions(['injectJWeixin']),
     tag(status) {
       return {
         "1": this.$cdn + 'common/1wks.png',
diff --git a/src/sass/AppMeetingNotice/detail.vue b/src/sass/AppMeetingNotice/detail.vue
new file mode 100644
index 00000000..630f55b0
--- /dev/null
+++ b/src/sass/AppMeetingNotice/detail.vue
@@ -0,0 +1,561 @@
+<template>
+  <div class="detail" v-if="pageShow">
+    <template v-if="!list">
+      <div class="card">
+        <header>{{ detail.title }}</header>
+        <u-gap height="16"></u-gap>
+        <u-row v-if="detail.createUserId">
+          <!--          <u-avatar :src="$cdn + 'common/xzh.png'" v-if="false"></u-avatar>-->
+          <div class="u-avatar__img">
+            <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
+          </div>
+          <span class="user-name">
+            <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
+          </span>
+        </u-row>
+        <u-gap height="32"></u-gap>
+        <u-row>
+          <img :src="$cdn + 'common/meeting.png'" alt="">
+          <span :style="{color:color(detail.status)}">{{ $dict.getLabel('meetStatus', detail.status) }}</span>
+        </u-row>
+        <u-gap height="8"></u-gap>
+        <u-row>
+          <img :src="$cdn + 'common/date.png'" alt="">
+          <span>{{
+              detail.startTime && detail.startTime.substr(0, 16)
+            }} 至 {{ detail.endTime && detail.endTime.substr(0, 16) }}</span>
+        </u-row>
+        <u-gap height="8"></u-gap>
+        <u-row style="align-items: start;flex-wrap: nowrap;">
+          <img :src="$cdn + 'common/location.png'" alt="">
+          <span>{{ detail.address }}</span>
+        </u-row>
+      </div>
+      <div class="card">
+        <span>{{ detail.content }}</span>
+      </div>
+      <div class="card" v-if="detail.files && detail.files.length">
+        <div class="label">相关附件</div>
+        <div class="file" v-for="(item,index) in detail.files" @click="preFile(item)" :key="index">
+          <u-row justify="between">
+            <label class="left">
+              <img :src="$cdn + 'common/appendix.png'" alt="">
+              <span>{{ item.fileName }}.{{ item.postfix }}</span>
+            </label>
+            <span>{{ item.fileSizeStr }}</span>
+          </u-row>
+        </div>
+      </div>
+      <div class="card item-wrap">
+        <u-row justify="between">
+          <span>参会人</span>
+          <label class="right" @click="list=true">
+            查看全部<em>{{ detail.attendees && detail.attendees.length }}</em>人
+            <div class="right-arrow"></div>
+          </label>
+        </u-row>
+      </div>
+
+      <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议
+      </div>
+
+      <template v-else>
+        <div class="footer" v-if="['1','2'].includes(detail.status) && ['0','3'].includes(detail.joinStatus)">
+          <div class="leave" @click="updateStatus(0)">
+            <img :src="$cdn + 'sass/leave.png'" alt="">请假
+          </div>
+          <div @click="toDo" class="leave">
+            <img :src="$cdn + 'sass/toBe.png'" alt="">待定
+          </div>
+          <div @click="updateStatus(1)">确认会议</div>
+        </div>
+
+        <!--        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
+        <!--          <label>{{ detail.joinStatus|transform }}</label>-->
+        <!--          <img :src="$cdn + tag(detail.joinStatus)" alt="">-->
+        <!--        </div>-->
+      </template>
+
+    </template>
+    <template v-else>
+      <div class="att-list">
+        <AiTopFixed>
+          <u-tabs :list="tabs" :current="current" height="96" :is-scroll="false" bar-width="192"
+                  @change="change"></u-tabs>
+        </AiTopFixed>
+        <div v-for="(item,index) in detail.attendees && detail.attendees.filter(e=>e.joinStatus==current)" :key="index"
+             class="att-wrap">
+          <div class="left">
+            <u-avatar :src="item.avatar || (($cdn + 'common/xztx.png'))" size="74" mode="square"
+                      style="margin-right: 8px"></u-avatar>
+            <AiOpenData type="userName" :openid="item.name"></AiOpenData>
+          </div>
+          <!--          <img :src="$cdn + 'common/phone.png'" alt="" @click="call(item)">-->
+        </div>
+      </div>
+    </template>
+    <u-modal v-model="show" title="提示" show-cancel-button content='是否要取消该会议？' @confirm="onConfirm"></u-modal>
+    <AiBack/>
+  </div>
+</template>
+
+<script>
+import {mapActions, mapState} from "vuex";
+
+export default {
+  name: "detail",
+  data() {
+    return {
+      detail: {},
+      list: false,
+      current: 0,
+      pageShow: false,
+      show: false,
+      id: null,
+    }
+  },
+  onLoad(opt) {
+    this.id = opt.id;
+  },
+  computed: {
+    ...mapState(["user"]),
+    tabs() {
+      return [
+        {name: this.count(0) + "人未确认"},
+        {name: this.count(1) + "人已确认"},
+        {name: this.count(2) + "人已请假"},
+        {name: this.count(3) + "人待定"},
+      ]
+    },
+  },
+  methods: {
+    onConfirm() {
+      this.$http.post("/app/appmeetinginfo/cancel", null, {
+        params: {
+          meetingId: this.id,
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("取消成功");
+          this.getDetail();
+        }
+      })
+    },
+    handleCancel() {
+      this.show = true;
+    },
+    toDo() {
+      this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
+        params: {
+          meetingId: this.id,
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("会议待定");
+          setTimeout(_ => {
+            uni.navigateBack();
+          }, 800)
+        }
+      })
+    },
+    count(sta) {
+      return this.detail.attendees ? this.detail.attendees?.filter(e => e.joinStatus == sta)?.length : 0;
+    },
+    change(index) {
+      this.current = index;
+      this.detail = {};
+      this.getDetail();
+    },
+    call(item) {
+      if (item.phone) {
+        uni.makePhoneCall({
+          phoneNumber: item.phone
+        });
+      }
+    },
+    ...mapActions(['previewFile', 'injectJWeixin']),
+    preFile(e) {
+      if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
+        uni.previewImage({
+          current: e.url,
+          urls: [e.url]
+        })
+      } else {
+        this.previewFile({...e})
+      }
+    },
+    tag(status) {
+      return {
+        "1": "common/2confirmed2.png",
+        "2": "common/2absent2.png"
+      }[status]
+    },
+    updateStatus(status) {
+      this.$http.post(status == 0 ? "/app/appmeetinginfo/absent" : "/app/appmeetinginfo/confirm", null, {
+        params: {
+          meetingId: this.id,
+          reason: status == 0 ? "" : null
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast(status == 0 ? "请假成功" : "确认成功")
+          this.getDetail()
+        }
+      })
+    },
+    color(status) {
+      if (status == 1) {
+        return "#FF8822"
+      }
+
+      if (status == 2) {
+        return "#1365DD"
+      }
+
+      if (status == 3) {
+        return "#FF4466"
+      }
+
+      return "#343D65"
+    },
+    getDetail() {
+      this.$http.post("/app/appmeetinginfo/info-id", null, {
+        params: {id: this.id}
+      }).then(res => {
+        if (res && res.data) {
+          this.detail = res.data
+          this.pageShow = true
+        }
+      })
+    }
+  },
+  created() {
+    this.injectJWeixin(['sendChatMessage']).then(() => {
+      this.getDetail()
+    })
+  },
+
+  onShow() {
+    document.title = "会议详情";
+    this.$dict.load("meetStatus");
+    wx.hideOptionMenu();
+  },
+  filters: {
+    transform(status) {
+      if (status == 1) {
+        return "已确认"
+      }
+      if (status == 2) {
+        return "已请假"
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 140px;
+
+
+  ::v-deep .AiTopFixed {
+    margin-bottom: 16px;
+
+    .content {
+      padding: 0 !important;
+    }
+  }
+
+
+  .att-list {
+    min-height: 100%;
+
+    .att-wrap {
+      display: flex;
+      height: 112px;
+      align-items: center;
+      justify-content: space-between;
+      background-color: #ffffff;
+      box-sizing: border-box;
+      padding: 0 50px;
+      border-bottom: 1px solid #E4E5E6;
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        &:after {
+          content: "";
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          width: 622px;
+          height: 2px;
+          background-color: rgba(216, 221, 230, 0.5);
+        }
+
+        .name {
+          font-size: 30px;
+          font-weight: 600;
+          color: #333333;
+        }
+      }
+
+      & > img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+  }
+
+  .card {
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    box-sizing: border-box;
+    padding: 16px 32px;
+
+    header {
+      font-size: 40px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 64px;
+      letter-spacing: 1px;
+    }
+
+    .u-row {
+      & > div {
+        border-radius: 50%;
+        text-align: center;
+        font-size: 30px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        /*margin-left: 8px;*/
+      }
+
+      & > span {
+        font-size: 30px;
+        color: #343D65;
+        margin-left: 16px;
+      }
+
+      ::v-deep .u-avatar__img {
+        width: 56px;
+        height: 56px;
+        vertical-align: middle;
+        color: #ffffff;
+        background-color: #2266FF;
+        font-size: 16px;
+      }
+
+      .user-name {
+        font-size: 30px;
+        color: #343D65;
+      }
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+
+    & > span {
+      font-size: 32px;
+      color: #333333;
+      line-height: 48px;
+      letter-spacing: 1px;
+      display: inline-block;
+      box-sizing: border-box;
+      padding: 16px 0;
+    }
+
+    .label {
+      height: 96px;
+      font-size: 32px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+    }
+
+    .file {
+      height: 128px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      padding: 0 16px;
+      margin-bottom: 32px;
+
+      & > .u-row {
+        height: 100%;
+
+        .left {
+          width: 522px;
+          display: flex;
+          align-items: center;
+
+          & > img {
+            width: 96px;
+            height: 96px;
+          }
+
+          & > span {
+            font-size: 32px;
+            color: #333333;
+            display: inline-block;
+            line-height: 44px;
+            text-overflow: ellipsis;
+            overflow-x: hidden;
+            white-space: nowrap;
+          }
+        }
+
+        & > span {
+          font-size: 28px;
+          color: #999999;
+        }
+      }
+    }
+
+    .active {
+      background-color: #F3F6F9;
+    }
+
+    .name {
+      font-size: 32px;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .wrap {
+      height: 112px;
+      display: flex;
+      align-items: center;
+      position: relative;
+
+      &:after {
+        content: "";
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        width: 622px;
+        height: 2px;
+        background-color: rgba(216, 221, 230, 0.5);
+      }
+
+      & > label {
+        width: 80px;
+        height: 80px;
+        border-radius: 50%;
+        background-color: #4E8EEE;
+        font-size: 28px;
+        font-weight: 600;
+        color: #FFFFFF;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
+
+  .item-wrap {
+    height: 112px;
+    padding: 0 32px;
+
+    .u-row {
+      height: 100%;
+
+      & > span {
+        font-size: 32px;
+        font-weight: 400;
+        color: #333333;
+      }
+    }
+
+    .right {
+      font-size: 28px;
+      color: #999999;
+      display: flex;
+      align-items: center;
+
+      em {
+        font-style: normal;
+        color: #1365DD;
+      }
+
+      .right-arrow {
+        width: 16px;
+        height: 16px;
+        border-top: 5px solid #CCCCCC;
+        border-right: 5px solid #CCCCCC;
+        transform: rotate(45deg);
+      }
+    }
+  }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    & > div {
+      font-size: 28px;
+      color: #666666;
+      display: flex;
+      flex-direction: column;
+
+      & > img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+
+    & > div:nth-child(1), & > div:nth-child(2) {
+      width: 135px;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    & > div:last-child {
+      width: calc(100% - 270px);
+      height: 100%;
+      color: #FFFFFF;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #1365DD;
+    }
+
+    & > label {
+      font-size: 36px;
+      font-weight: 400;
+      color: #999999;
+    }
+
+    /*img {*/
+    /*  width: 158px;*/
+    /*  height: 104px;*/
+    /*  position: absolute;*/
+    /*  right: 0;*/
+    /*  top: 0;*/
+    /*}*/
+  }
+
+  .cancel {
+    color: #ffffff;
+    font-size: 36px;
+    background-color: #005DFF
+  }
+}
+</style>
diff --git a/src/sass/AppMeetingNotice/meetingList.vue b/src/sass/AppMeetingNotice/meetingList.vue
new file mode 100644
index 00000000..0f6fcd52
--- /dev/null
+++ b/src/sass/AppMeetingNotice/meetingList.vue
@@ -0,0 +1,226 @@
+<template>
+  <div class="meeting-list">
+    <div class="card" v-for="(item,index) in list" :key="index" @click="detail(item)">
+      <header>
+        <span>{{ item.title }}</span>
+        <span>
+          <span v-if="index==2">保存于</span>
+          {{ item.createTime }}</span>
+      </header>
+      <u-row justify="between">
+        <div class="time">
+          <span>{{ item.startTime|format }}</span>
+          <span>{{ item.startTime|formatDate(0) }}年{{ item.startTime|formatDate(1) }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
+        </div>
+        <div class="arrow"></div>
+        <div class="time">
+          <span>{{ item.endTime|format }}</span>
+          <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{ item.endTime|formatWeek }}</span>
+        </div>
+      </u-row>
+      <u-row class="info">
+        <span>发起人员：</span>
+        <AiOpenData type="userName" :openid="item.createUserId"/>
+      </u-row>
+      <u-gap height="20"></u-gap>
+      <u-row class="info">
+        <span>会议地点：</span>
+        <span>{{ item.address }}</span>
+      </u-row>
+      <div class="tag" v-if="item.status!=0" :style="{background:'url(' + $cdn + tag(item.status) +')'}"></div>
+    </div>
+    <u-loadmore :status="status" v-if="list.length"/>
+    <AiEmpty v-if="!list.length"></AiEmpty>
+    <AiBack/>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "meetingList",
+  props: {
+    params: {
+      type: [String, Number, Object],
+    }
+  },
+  data() {
+    return {
+      list: [],
+      current: 1,
+      index: null,
+      status: "加载更多",
+    }
+  },
+
+  onLoad(opt) {
+    this.index = opt.index
+    uni.setNavigationBarTitle({
+      title: opt.index == 0 ? "历史会议" : "草稿箱"
+    });
+    this.getData();
+  },
+
+  methods: {
+    detail({id}) {
+      let url
+      if (this.index == 2) {
+        url = "/apps/AppMeetingNotice/addMeeting?id=" + id
+      } else {
+        url = "/apps/AppMeetingNotice/detail?id=" + id
+      }
+      uni.navigateTo({url})
+    },
+    tag(status) {
+      return {
+        "1": 'common/1wks.png',
+        "2": 'common/1jxz.png',
+        "3": 'common/1yqx.png',
+        "4": 'common/1yjs.png'
+      }[status]
+    },
+    getData() {
+      this.$http.post("/app/appmeetinginfo/list", null, {
+        params: {
+          listType: this.index == 0 ? "2" : '0',
+          meetingStatus: this.index == 0 ? "4" : "0",
+          size: 10,
+          current: this.current,
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+  },
+
+  onReachBottom() {
+    this.current++;
+    this.getData();
+  },
+
+  filters: {
+    format(date) {
+      return date.split(" ")[1].substr(0, 5)
+    },
+    formatDate(date, index) {
+      return date.split(" ")[0].split("-")[index]
+    },
+    formatWeek(date) {
+      return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.meeting-list {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  box-sizing: border-box;
+  padding: 32px;
+
+  .card {
+    background-color: #FFFFFF;
+    box-sizing: border-box;
+    padding: 32px;
+    border-radius: 8px;
+    margin-bottom: 32px;
+    position: relative;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    & > header {
+      width: 95%;
+      font-size: 32px;
+      font-weight: 600;
+      color: #333333;
+      display: flex;
+      flex-direction: column;
+
+      & > span:last-child {
+        font-size: 28px;
+        font-weight: 400;
+        color: #999999;
+        margin-top: 10px;
+      }
+    }
+
+    .time {
+      display: flex;
+      flex-direction: column;
+      margin: 46px 0;
+
+      & > span:first-child {
+        font-size: 60px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 84px;
+      }
+
+      & > span:last-child {
+        font-size: 22px;
+        color: #333333;
+      }
+    }
+
+    .arrow {
+      width: 28px;
+      height: 68px;
+      overflow: hidden;
+      position: relative;
+      transform: rotate(180deg);
+
+      &:before, &:after {
+        content: "";
+        width: 50px;
+        height: 50px;
+        position: absolute;
+        transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
+      }
+
+      &:before {
+        top: 59px;
+        background-color: #CCCCCC;
+      }
+
+      &:after {
+        left: 7px;
+        top: 59px;
+        background-color: #FFFFFF;
+      }
+    }
+
+    .info {
+      flex-wrap: nowrap;
+
+      & > span:first-child {
+        flex-shrink: 0;
+        font-size: 30px;
+        color: #999999;
+      }
+
+      & > span:last-child {
+        font-size: 30px;
+        color: #343D65;
+      }
+    }
+
+    .tag {
+      width: 112px;
+      height: 112px;
+      background-repeat: no-repeat !important;
+      background-size: 100% 100% !important;
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppNotification/AppNotification.vue b/src/sass/AppNotification/AppNotification.vue
similarity index 97%
rename from src/apps/AppNotification/AppNotification.vue
rename to src/sass/AppNotification/AppNotification.vue
index 1f934c45..66db9e81 100644
--- a/src/apps/AppNotification/AppNotification.vue
+++ b/src/sass/AppNotification/AppNotification.vue
@@ -165,7 +165,7 @@ export default {
       this.show = false;
       this.changeState();
     },
-    handleOpt(item){
+    handleOpt(item) {
       this.content = {
         1: "撤回",
         2: "发布",
@@ -179,14 +179,14 @@ export default {
         });
       }
 
-      if ([1,2,4].includes(item.val)) {
+      if ([1, 2, 4].includes(item.val)) {
         return this.modal = true;
       }
 
-      if(item.val==3){
+      if (item.val == 3) {
         this.show = false;
         return uni.navigateTo({
-          url:"/apps/AppNotification/add?id=" + this.detail.id + "&flag=" + false
+          url: "/apps/AppNotification/add?id=" + this.detail.id + "&flag=" + false
         });
       }
     },
@@ -202,13 +202,13 @@ export default {
       this.detail = item;
       if (this.index == 1) {
         this.show = true;
-      }else {
+      } else {
         uni.navigateTo({
           url: "/apps/AppNotification/detail?id=" + this.detail.id + "&flag=" + true
         })
       }
     },
-    handleAdd(){
+    handleAdd() {
       uni.navigateTo({
         url: "/apps/AppNotification/add"
       })
diff --git a/src/apps/AppNotification/add.vue b/src/sass/AppNotification/add.vue
similarity index 99%
rename from src/apps/AppNotification/add.vue
rename to src/sass/AppNotification/add.vue
index 9011ca69..6abbca61 100644
--- a/src/apps/AppNotification/add.vue
+++ b/src/sass/AppNotification/add.vue
@@ -99,7 +99,7 @@ export default {
   },
 
   onLoad(opt) {
-    if(opt.id) {
+    if (opt.id) {
       this.form.id = opt.id;
       this.flag = opt.flag;
       this.getDetail();
diff --git a/src/sass/AppNotification/detail.vue b/src/sass/AppNotification/detail.vue
new file mode 100644
index 00000000..163d2319
--- /dev/null
+++ b/src/sass/AppNotification/detail.vue
@@ -0,0 +1,360 @@
+<template>
+  <div class="detail" v-if="pageShow">
+    <template v-if="detailObj.status!=2">
+      <div class="card">
+        <header>{{ detailObj.title }}</header>
+        <u-gap height="16"></u-gap>
+        <u-row>
+          <span>发布人：</span>
+          <span v-if="detailObj.createUserId">
+            <AiOpenData type="userName" :openid="detailObj.createUserId"></AiOpenData>
+          </span>
+        </u-row>
+        <u-gap height="8"></u-gap>
+        <u-row>
+          <span>发布部门：</span>
+          <span v-if="detailObj.unitName">
+            <AiOpenData type="departmentName" :openid="detailObj.unitName"></AiOpenData>
+          </span>
+        </u-row>
+        <u-gap height="8"></u-gap>
+        <u-row>
+          <span>发布日期：</span>
+          <span>{{ detailObj.releaseTime }}</span>
+        </u-row>
+        <u-gap height="8"></u-gap>
+      </div>
+
+      <div class="card">
+        <div class="label">公告内容</div>
+        <u-parse :html="detailObj.content"></u-parse>
+      </div>
+
+      <div class="card" style="padding-top: 0" v-if="detailObj.files && detailObj.files.length">
+        <div class="label">相关附件</div>
+        <div class="file" v-for="(item,index) in detailObj.files" :key="index" @click="preFile(item)">
+          <u-row justify="between">
+            <label class="left">
+              <img :src="$cdn + 'common/appendix.png'" alt="">
+              <span>{{ item.name }}.{{ item.postfix }}</span>
+            </label>
+            <span>{{ (item.size / 1024).toFixed(2) }}KB</span>
+          </u-row>
+        </div>
+      </div>
+
+      <div class="card" @click="handleClick">
+        <u-row justify="between" class="item">
+          <span>接收对象</span>
+          <div class="right">
+            <em>{{ detailObj.readNum }}人</em>已读
+            <em>{{ detailObj.unReadNum }}人</em>未读
+            <div class="arrow"></div>
+          </div>
+        </u-row>
+      </div>
+    </template>
+    <AiEmpty description="该通知已撤回" v-else/>
+    <AiBack/>
+  </div>
+</template>
+
+<script>
+import {mapActions} from "vuex";
+
+export default {
+  name: "detail",
+  data() {
+    return {
+      detailObj: {},
+      id: null,
+      pageShow: false,
+      flag: false,
+    }
+  },
+
+  onLoad(opt) {
+    this.id = opt.id;
+    this.flag = opt.flag;
+  },
+
+  created() {
+    this.injectJWeixin(['sendChatMessage']).then(() => {
+      this.getDetail()
+    })
+  },
+
+  onShow() {
+    document.title = "公告详情";
+    wx.hideOptionMenu();
+  },
+
+  methods: {
+    ...mapActions(['previewFile', 'injectJWeixin']),
+    preFile(e) {
+      if ([".jpg", ".png", ".gif"].includes(e.postfix.toLowerCase())) {
+        uni.previewImage({
+          current: e.url,
+          urls: [e.url]
+        })
+      } else {
+        this.previewFile({...e})
+      }
+    },
+    getDetail() {
+      this.$http.post("/app/appannouncement/detail", null, {
+        params: {
+          id: this.id,
+          detail: this.flag
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.detailObj = res.data;
+          this.pageShow = true
+        }
+      })
+    },
+    handleClick() {
+      uni.navigateTo({
+        url: "/apps/AppNotification/read?id=" + this.id,
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  min-height: 100%;
+  background-color: #F5F5F5;
+  padding-bottom: 140px;
+
+  ::v-deep .content {
+    padding: 0;
+  }
+
+  .card {
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    box-sizing: border-box;
+    padding: 16px 32px;
+
+    header {
+      font-size: 40px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 64px;
+      letter-spacing: 1px;
+    }
+
+    .u-row {
+      & > div {
+        border-radius: 50%;
+        text-align: center;
+        font-size: 22px;
+        font-weight: bold;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      & > span {
+        font-size: 30px;
+        color: #343D65;
+        line-height: 48px;
+      }
+
+      & > span:last-child {
+        font-size: 30px;
+        /*color: #343D65;*/
+        /*margin-left: 16px;*/
+        line-height: 48px;
+      }
+
+      .title {
+        width: 490px;
+        height: 112px;
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .right {
+        font-size: 28px;
+        display: flex;
+        align-items: center;
+        color: #666666;
+
+        .arrow {
+          width: 16px;
+          height: 16px;
+          border-top: 3px solid #CCCCCC;
+          border-right: 3px solid #CCCCCC;
+          transform: rotate(45deg);
+        }
+      }
+    }
+
+    .item {
+      position: relative;
+      height: 80px;
+
+      &:after {
+        width: 100%;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        content: "";
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+    }
+
+    & > span {
+      font-size: 32px;
+      color: #333333;
+      line-height: 48px;
+      letter-spacing: 1px;
+      display: inline-block;
+    }
+
+    .label {
+      height: 80px;
+      font-size: 32px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+
+      & > em {
+        font-style: normal;
+        font-size: 32px;
+        color: #1365DD;
+      }
+    }
+
+    .file {
+      height: 128px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      padding: 0 16px;
+      margin-bottom: 32px;
+
+      & > .u-row {
+        height: 100%;
+
+        .left {
+          width: 476px;
+          display: flex;
+          align-items: center;
+          word-break: break-all;
+
+          & > img {
+            flex-shrink: 0;
+            width: 96px;
+            height: 96px;
+          }
+
+          & > span {
+            font-size: 32px;
+            color: #333333;
+            display: inline-block;
+            line-height: 44px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+          }
+        }
+
+        & > span {
+          font-size: 28px;
+          color: #999999;
+        }
+      }
+    }
+
+    .active {
+      background-color: #F3F6F9;
+    }
+
+    & > text {
+      width: 100%;
+      display: inline-block;
+      font-size: 30px;
+      color: #649EFD;
+      text-align: center;
+    }
+
+    .progress {
+      height: 12px;
+      background: #F2F4FC;
+      border-radius: 12px;
+      position: relative;
+      margin: 16px 0 64px 0;
+
+      .pro-active {
+        height: 12px;
+        background: #639EFD;
+        border-radius: 12px;
+        position: absolute;
+        left: 0;
+        top: 0;
+      }
+
+    }
+
+    em {
+      font-style: normal;
+      font-size: 28px;
+      color: #1365DD;
+    }
+
+    ::v-deep .u-collapse {
+      position: relative;
+
+      &:after {
+        content: "";
+        width: 718px;
+        height: 1px;
+        background-color: rgba(216, 221, 230, 0.5);
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+
+      .u-collapse-head {
+        padding: 40px 0;
+      }
+
+      .u-collapse-content {
+        font-size: 32px;
+        color: #333333;
+        line-height: 48px;
+        letter-spacing: 1px;
+      }
+    }
+  }
+
+  .footer {
+    height: 112px;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background: #1365DD;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36px;
+    color: #FFFFFF;
+  }
+}
+</style>
diff --git a/src/apps/AppNotification/read.vue b/src/sass/AppNotification/read.vue
similarity index 99%
rename from src/apps/AppNotification/read.vue
rename to src/sass/AppNotification/read.vue
index ec99853b..e34178d0 100644
--- a/src/apps/AppNotification/read.vue
+++ b/src/sass/AppNotification/read.vue
@@ -22,7 +22,7 @@ export default {
     return {
       current: 0,
       list: [],
-      id:null,
+      id: null,
     }
   },
   onLoad(opt) {
diff --git a/src/utils/crypto-js.js b/src/utils/crypto-js.js
index be5c2ea0..e4ed5182 100644
--- a/src/utils/crypto-js.js
+++ b/src/utils/crypto-js.js
@@ -1,6059 +1,6045 @@
 ;(function (root, factory) {
-	if (typeof exports === "object") {
-		// CommonJS
-		module.exports = exports = factory();
-	}
-	else if (typeof define === "function" && define.amd) {
-		// AMD
-		define([], factory);
-	}
-	else {
-		// Global (browser)
-		root.CryptoJS = factory();
-	}
+  if (typeof exports === "object") {
+    // CommonJS
+    module.exports = exports = factory();
+  } else if (typeof define === "function" && define.amd) {
+    // AMD
+    define([], factory);
+  } else {
+    // Global (browser)
+    root.CryptoJS = factory();
+  }
 }(this, function () {
 
-	/*globals window, global, require*/
+  /*globals window, global, require*/
 
-	/**
-	 * CryptoJS core components.
-	 */
-	var CryptoJS = CryptoJS || (function (Math, undefined) {
+  /**
+   * CryptoJS core components.
+   */
+  var CryptoJS = CryptoJS || (function (Math, undefined) {
 
-	    var crypto;
+    var crypto;
 
-	    // Native crypto from window (Browser)
-	    if (typeof window !== 'undefined' && window.crypto) {
-	        crypto = window.crypto;
-	    }
+    // Native crypto from window (Browser)
+    if (typeof window !== 'undefined' && window.crypto) {
+      crypto = window.crypto;
+    }
 
-	    // Native (experimental IE 11) crypto from window (Browser)
-	    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
-	        crypto = window.msCrypto;
-	    }
+    // Native (experimental IE 11) crypto from window (Browser)
+    if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+      crypto = window.msCrypto;
+    }
 
-	    // Native crypto from global (NodeJS)
-	    if (!crypto && typeof global !== 'undefined' && global.crypto) {
-	        crypto = global.crypto;
-	    }
+    // Native crypto from global (NodeJS)
+    if (!crypto && typeof global !== 'undefined' && global.crypto) {
+      crypto = global.crypto;
+    }
 
-	    // Native crypto import via require (NodeJS)
-	    if (!crypto && typeof require === 'function') {
-	        try {
-	            crypto = require('crypto');
-	        } catch (err) {}
-	    }
+    // Native crypto import via require (NodeJS)
+    if (!crypto && typeof require === 'function') {
+      try {
+        crypto = require('crypto');
+      } catch (err) {
+      }
+    }
 
-	    /*
+    /*
 	     * Cryptographically secure pseudorandom number generator
 	     *
 	     * As Math.random() is cryptographically not safe to use
 	     */
-	    var cryptoSecureRandomInt = function () {
-	        if (crypto) {
-	            // Use getRandomValues method (Browser)
-	            if (typeof crypto.getRandomValues === 'function') {
-	                try {
-	                    return crypto.getRandomValues(new Uint32Array(1))[0];
-	                } catch (err) {}
-	            }
+    var cryptoSecureRandomInt = function () {
+      if (crypto) {
+        // Use getRandomValues method (Browser)
+        if (typeof crypto.getRandomValues === 'function') {
+          try {
+            return crypto.getRandomValues(new Uint32Array(1))[0];
+          } catch (err) {
+          }
+        }
 
-	            // Use randomBytes method (NodeJS)
-	            if (typeof crypto.randomBytes === 'function') {
-	                try {
-	                    return crypto.randomBytes(4).readInt32LE();
-	                } catch (err) {}
-	            }
-	        }
+        // Use randomBytes method (NodeJS)
+        if (typeof crypto.randomBytes === 'function') {
+          try {
+            return crypto.randomBytes(4).readInt32LE();
+          } catch (err) {
+          }
+        }
+      }
 
-	        throw new Error('Native crypto module could not be used to get secure random number.');
-	    };
+      throw new Error('Native crypto module could not be used to get secure random number.');
+    };
 
-	    /*
+    /*
 	     * Local polyfill of Object.create
 
 	     */
-	    var create = Object.create || (function () {
-	        function F() {}
-
-	        return function (obj) {
-	            var subtype;
-
-	            F.prototype = obj;
-
-	            subtype = new F();
-
-	            F.prototype = null;
-
-	            return subtype;
-	        };
-	    }())
-
-	    /**
-	     * CryptoJS namespace.
-	     */
-	    var C = {};
-
-	    /**
-	     * Library namespace.
-	     */
-	    var C_lib = C.lib = {};
-
-	    /**
-	     * Base object for prototypal inheritance.
-	     */
-	    var Base = C_lib.Base = (function () {
-
-
-	        return {
-	            /**
-	             * Creates a new object that inherits from this object.
-	             *
-	             * @param {Object} overrides Properties to copy into the new object.
-	             *
-	             * @return {Object} The new object.
-	             *
-	             * @static
-	             *
-	             * @example
-	             *
-	             *     var MyType = CryptoJS.lib.Base.extend({
-	             *         field: 'value',
-	             *
-	             *         method: function () {
-	             *         }
-	             *     });
-	             */
-	            extend: function (overrides) {
-	                // Spawn
-	                var subtype = create(this);
-
-	                // Augment
-	                if (overrides) {
-	                    subtype.mixIn(overrides);
-	                }
-
-	                // Create default initializer
-	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
-	                    subtype.init = function () {
-	                        subtype.$super.init.apply(this, arguments);
-	                    };
-	                }
-
-	                // Initializer's prototype is the subtype object
-	                subtype.init.prototype = subtype;
-
-	                // Reference supertype
-	                subtype.$super = this;
-
-	                return subtype;
-	            },
-
-	            /**
-	             * Extends this object and runs the init method.
-	             * Arguments to create() will be passed to init().
-	             *
-	             * @return {Object} The new object.
-	             *
-	             * @static
-	             *
-	             * @example
-	             *
-	             *     var instance = MyType.create();
-	             */
-	            create: function () {
-	                var instance = this.extend();
-	                instance.init.apply(instance, arguments);
-
-	                return instance;
-	            },
-
-	            /**
-	             * Initializes a newly created object.
-	             * Override this method to add some logic when your objects are created.
-	             *
-	             * @example
-	             *
-	             *     var MyType = CryptoJS.lib.Base.extend({
-	             *         init: function () {
-	             *             // ...
-	             *         }
-	             *     });
-	             */
-	            init: function () {
-	            },
-
-	            /**
-	             * Copies properties into this object.
-	             *
-	             * @param {Object} properties The properties to mix in.
-	             *
-	             * @example
-	             *
-	             *     MyType.mixIn({
-	             *         field: 'value'
-	             *     });
-	             */
-	            mixIn: function (properties) {
-	                for (var propertyName in properties) {
-	                    if (properties.hasOwnProperty(propertyName)) {
-	                        this[propertyName] = properties[propertyName];
-	                    }
-	                }
-
-	                // IE won't copy toString using the loop above
-	                if (properties.hasOwnProperty('toString')) {
-	                    this.toString = properties.toString;
-	                }
-	            },
-
-	            /**
-	             * Creates a copy of this object.
-	             *
-	             * @return {Object} The clone.
-	             *
-	             * @example
-	             *
-	             *     var clone = instance.clone();
-	             */
-	            clone: function () {
-	                return this.init.prototype.extend(this);
-	            }
-	        };
-	    }());
-
-	    /**
-	     * An array of 32-bit words.
-	     *
-	     * @property {Array} words The array of 32-bit words.
-	     * @property {number} sigBytes The number of significant bytes in this word array.
-	     */
-	    var WordArray = C_lib.WordArray = Base.extend({
-	        /**
-	         * Initializes a newly created word array.
-	         *
-	         * @param {Array} words (Optional) An array of 32-bit words.
-	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.lib.WordArray.create();
-	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
-	         *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
-	         */
-	        init: function (words, sigBytes) {
-	            words = this.words = words || [];
-
-	            if (sigBytes != undefined) {
-	                this.sigBytes = sigBytes;
-	            } else {
-	                this.sigBytes = words.length * 4;
-	            }
-	        },
-
-	        /**
-	         * Converts this word array to a string.
-	         *
-	         * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
-	         *
-	         * @return {string} The stringified word array.
-	         *
-	         * @example
-	         *
-	         *     var string = wordArray + '';
-	         *     var string = wordArray.toString();
-	         *     var string = wordArray.toString(CryptoJS.enc.Utf8);
-	         */
-	        toString: function (encoder) {
-	            return (encoder || Hex).stringify(this);
-	        },
-
-	        /**
-	         * Concatenates a word array to this word array.
-	         *
-	         * @param {WordArray} wordArray The word array to append.
-	         *
-	         * @return {WordArray} This word array.
-	         *
-	         * @example
-	         *
-	         *     wordArray1.concat(wordArray2);
-	         */
-	        concat: function (wordArray) {
-	            // Shortcuts
-	            var thisWords = this.words;
-	            var thatWords = wordArray.words;
-	            var thisSigBytes = this.sigBytes;
-	            var thatSigBytes = wordArray.sigBytes;
-
-	            // Clamp excess bits
-	            this.clamp();
-
-	            // Concat
-	            if (thisSigBytes % 4) {
-	                // Copy one byte at a time
-	                for (var i = 0; i < thatSigBytes; i++) {
-	                    var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                    thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
-	                }
-	            } else {
-	                // Copy one word at a time
-	                for (var i = 0; i < thatSigBytes; i += 4) {
-	                    thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];
-	                }
-	            }
-	            this.sigBytes += thatSigBytes;
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Removes insignificant bits.
-	         *
-	         * @example
-	         *
-	         *     wordArray.clamp();
-	         */
-	        clamp: function () {
-	            // Shortcuts
-	            var words = this.words;
-	            var sigBytes = this.sigBytes;
-
-	            // Clamp
-	            words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
-	            words.length = Math.ceil(sigBytes / 4);
-	        },
-
-	        /**
-	         * Creates a copy of this word array.
-	         *
-	         * @return {WordArray} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = wordArray.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-	            clone.words = this.words.slice(0);
-
-	            return clone;
-	        },
-
-	        /**
-	         * Creates a word array filled with random bytes.
-	         *
-	         * @param {number} nBytes The number of random bytes to generate.
-	         *
-	         * @return {WordArray} The random word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.lib.WordArray.random(16);
-	         */
-	        random: function (nBytes) {
-	            var words = [];
-
-	            for (var i = 0; i < nBytes; i += 4) {
-	                words.push(cryptoSecureRandomInt());
-	            }
-
-	            return new WordArray.init(words, nBytes);
-	        }
-	    });
-
-	    /**
-	     * Encoder namespace.
-	     */
-	    var C_enc = C.enc = {};
-
-	    /**
-	     * Hex encoding strategy.
-	     */
-	    var Hex = C_enc.Hex = {
-	        /**
-	         * Converts a word array to a hex string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The hex string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var hexChars = [];
-	            for (var i = 0; i < sigBytes; i++) {
-	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                hexChars.push((bite >>> 4).toString(16));
-	                hexChars.push((bite & 0x0f).toString(16));
-	            }
-
-	            return hexChars.join('');
-	        },
-
-	        /**
-	         * Converts a hex string to a word array.
-	         *
-	         * @param {string} hexStr The hex string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
-	         */
-	        parse: function (hexStr) {
-	            // Shortcut
-	            var hexStrLength = hexStr.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < hexStrLength; i += 2) {
-	                words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
-	            }
-
-	            return new WordArray.init(words, hexStrLength / 2);
-	        }
-	    };
-
-	    /**
-	     * Latin1 encoding strategy.
-	     */
-	    var Latin1 = C_enc.Latin1 = {
-	        /**
-	         * Converts a word array to a Latin1 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The Latin1 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var latin1Chars = [];
-	            for (var i = 0; i < sigBytes; i++) {
-	                var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-	                latin1Chars.push(String.fromCharCode(bite));
-	            }
-
-	            return latin1Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Latin1 string to a word array.
-	         *
-	         * @param {string} latin1Str The Latin1 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
-	         */
-	        parse: function (latin1Str) {
-	            // Shortcut
-	            var latin1StrLength = latin1Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < latin1StrLength; i++) {
-	                words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
-	            }
-
-	            return new WordArray.init(words, latin1StrLength);
-	        }
-	    };
-
-	    /**
-	     * UTF-8 encoding strategy.
-	     */
-	    var Utf8 = C_enc.Utf8 = {
-	        /**
-	         * Converts a word array to a UTF-8 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-8 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            try {
-	                return decodeURIComponent(escape(Latin1.stringify(wordArray)));
-	            } catch (e) {
-	                throw new Error('Malformed UTF-8 data');
-	            }
-	        },
-
-	        /**
-	         * Converts a UTF-8 string to a word array.
-	         *
-	         * @param {string} utf8Str The UTF-8 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
-	         */
-	        parse: function (utf8Str) {
-	            return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
-	        }
-	    };
-
-	    /**
-	     * Abstract buffered block algorithm template.
-	     *
-	     * The property blockSize must be implemented in a concrete subtype.
-	     *
-	     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
-	     */
-	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
-	        /**
-	         * Resets this block algorithm's data buffer to its initial state.
-	         *
-	         * @example
-	         *
-	         *     bufferedBlockAlgorithm.reset();
-	         */
-	        reset: function () {
-	            // Initial values
-	            this._data = new WordArray.init();
-	            this._nDataBytes = 0;
-	        },
-
-	        /**
-	         * Adds new data to this block algorithm's buffer.
-	         *
-	         * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
-	         *
-	         * @example
-	         *
-	         *     bufferedBlockAlgorithm._append('data');
-	         *     bufferedBlockAlgorithm._append(wordArray);
-	         */
-	        _append: function (data) {
-	            // Convert string to WordArray, else assume WordArray already
-	            if (typeof data == 'string') {
-	                data = Utf8.parse(data);
-	            }
-
-	            // Append
-	            this._data.concat(data);
-	            this._nDataBytes += data.sigBytes;
-	        },
-
-	        /**
-	         * Processes available data blocks.
-	         *
-	         * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
-	         *
-	         * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
-	         *
-	         * @return {WordArray} The processed data.
-	         *
-	         * @example
-	         *
-	         *     var processedData = bufferedBlockAlgorithm._process();
-	         *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
-	         */
-	        _process: function (doFlush) {
-	            var processedWords;
-
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-	            var dataSigBytes = data.sigBytes;
-	            var blockSize = this.blockSize;
-	            var blockSizeBytes = blockSize * 4;
-
-	            // Count blocks ready
-	            var nBlocksReady = dataSigBytes / blockSizeBytes;
-	            if (doFlush) {
-	                // Round up to include partial blocks
-	                nBlocksReady = Math.ceil(nBlocksReady);
-	            } else {
-	                // Round down to include only full blocks,
-	                // less the number of blocks that must remain in the buffer
-	                nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
-	            }
-
-	            // Count words ready
-	            var nWordsReady = nBlocksReady * blockSize;
-
-	            // Count bytes ready
-	            var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
-
-	            // Process blocks
-	            if (nWordsReady) {
-	                for (var offset = 0; offset < nWordsReady; offset += blockSize) {
-	                    // Perform concrete-algorithm logic
-	                    this._doProcessBlock(dataWords, offset);
-	                }
-
-	                // Remove processed words
-	                processedWords = dataWords.splice(0, nWordsReady);
-	                data.sigBytes -= nBytesReady;
-	            }
-
-	            // Return processed words
-	            return new WordArray.init(processedWords, nBytesReady);
-	        },
-
-	        /**
-	         * Creates a copy of this object.
-	         *
-	         * @return {Object} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = bufferedBlockAlgorithm.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-	            clone._data = this._data.clone();
-
-	            return clone;
-	        },
-
-	        _minBufferSize: 0
-	    });
-
-	    /**
-	     * Abstract hasher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
-	     */
-	    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
-	        /**
-	         * Configuration options.
-	         */
-	        cfg: Base.extend(),
-
-	        /**
-	         * Initializes a newly created hasher.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
-	         *
-	         * @example
-	         *
-	         *     var hasher = CryptoJS.algo.SHA256.create();
-	         */
-	        init: function (cfg) {
-	            // Apply config defaults
-	            this.cfg = this.cfg.extend(cfg);
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this hasher to its initial state.
-	         *
-	         * @example
-	         *
-	         *     hasher.reset();
-	         */
-	        reset: function () {
-	            // Reset data buffer
-	            BufferedBlockAlgorithm.reset.call(this);
-
-	            // Perform concrete-hasher logic
-	            this._doReset();
-	        },
-
-	        /**
-	         * Updates this hasher with a message.
-	         *
-	         * @param {WordArray|string} messageUpdate The message to append.
-	         *
-	         * @return {Hasher} This hasher.
-	         *
-	         * @example
-	         *
-	         *     hasher.update('message');
-	         *     hasher.update(wordArray);
-	         */
-	        update: function (messageUpdate) {
-	            // Append
-	            this._append(messageUpdate);
-
-	            // Update the hash
-	            this._process();
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Finalizes the hash computation.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
-	         *
-	         * @return {WordArray} The hash.
-	         *
-	         * @example
-	         *
-	         *     var hash = hasher.finalize();
-	         *     var hash = hasher.finalize('message');
-	         *     var hash = hasher.finalize(wordArray);
-	         */
-	        finalize: function (messageUpdate) {
-	            // Final message update
-	            if (messageUpdate) {
-	                this._append(messageUpdate);
-	            }
-
-	            // Perform concrete-hasher logic
-	            var hash = this._doFinalize();
-
-	            return hash;
-	        },
-
-	        blockSize: 512/32,
-
-	        /**
-	         * Creates a shortcut function to a hasher's object interface.
-	         *
-	         * @param {Hasher} hasher The hasher to create a helper for.
-	         *
-	         * @return {Function} The shortcut function.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
-	         */
-	        _createHelper: function (hasher) {
-	            return function (message, cfg) {
-	                return new hasher.init(cfg).finalize(message);
-	            };
-	        },
-
-	        /**
-	         * Creates a shortcut function to the HMAC's object interface.
-	         *
-	         * @param {Hasher} hasher The hasher to use in this HMAC helper.
-	         *
-	         * @return {Function} The shortcut function.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
-	         */
-	        _createHmacHelper: function (hasher) {
-	            return function (message, key) {
-	                return new C_algo.HMAC.init(hasher, key).finalize(message);
-	            };
-	        }
-	    });
-
-	    /**
-	     * Algorithm namespace.
-	     */
-	    var C_algo = C.algo = {};
-
-	    return C;
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * Base64 encoding strategy.
-	     */
-	    var Base64 = C_enc.Base64 = {
-	        /**
-	         * Converts a word array to a Base64 string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The Base64 string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-	            var map = this._map;
-
-	            // Clamp excess bits
-	            wordArray.clamp();
-
-	            // Convert
-	            var base64Chars = [];
-	            for (var i = 0; i < sigBytes; i += 3) {
-	                var byte1 = (words[i >>> 2]       >>> (24 - (i % 4) * 8))       & 0xff;
-	                var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
-	                var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
-
-	                var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
-
-	                for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
-	                    base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
-	                }
-	            }
-
-	            // Add padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                while (base64Chars.length % 4) {
-	                    base64Chars.push(paddingChar);
-	                }
-	            }
-
-	            return base64Chars.join('');
-	        },
-
-	        /**
-	         * Converts a Base64 string to a word array.
-	         *
-	         * @param {string} base64Str The Base64 string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
-	         */
-	        parse: function (base64Str) {
-	            // Shortcuts
-	            var base64StrLength = base64Str.length;
-	            var map = this._map;
-	            var reverseMap = this._reverseMap;
-
-	            if (!reverseMap) {
-	                    reverseMap = this._reverseMap = [];
-	                    for (var j = 0; j < map.length; j++) {
-	                        reverseMap[map.charCodeAt(j)] = j;
-	                    }
-	            }
-
-	            // Ignore padding
-	            var paddingChar = map.charAt(64);
-	            if (paddingChar) {
-	                var paddingIndex = base64Str.indexOf(paddingChar);
-	                if (paddingIndex !== -1) {
-	                    base64StrLength = paddingIndex;
-	                }
-	            }
-
-	            // Convert
-	            return parseLoop(base64Str, base64StrLength, reverseMap);
-
-	        },
-
-	        _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
-	    };
-
-	    function parseLoop(base64Str, base64StrLength, reverseMap) {
-	      var words = [];
-	      var nBytes = 0;
-	      for (var i = 0; i < base64StrLength; i++) {
-	          if (i % 4) {
-	              var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
-	              var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
-	              var bitsCombined = bits1 | bits2;
-	              words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
-	              nBytes++;
-	          }
-	      }
-	      return WordArray.create(words, nBytes);
-	    }
-	}());
-
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Constants table
-	    var T = [];
-
-	    // Compute constants
-	    (function () {
-	        for (var i = 0; i < 64; i++) {
-	            T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
-	        }
-	    }());
-
-	    /**
-	     * MD5 hash algorithm.
-	     */
-	    var MD5 = C_algo.MD5 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0x67452301, 0xefcdab89,
-	                0x98badcfe, 0x10325476
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Swap endian
-	            for (var i = 0; i < 16; i++) {
-	                // Shortcuts
-	                var offset_i = offset + i;
-	                var M_offset_i = M[offset_i];
-
-	                M[offset_i] = (
-	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
-	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-	                );
-	            }
-
-	            // Shortcuts
-	            var H = this._hash.words;
-
-	            var M_offset_0  = M[offset + 0];
-	            var M_offset_1  = M[offset + 1];
-	            var M_offset_2  = M[offset + 2];
-	            var M_offset_3  = M[offset + 3];
-	            var M_offset_4  = M[offset + 4];
-	            var M_offset_5  = M[offset + 5];
-	            var M_offset_6  = M[offset + 6];
-	            var M_offset_7  = M[offset + 7];
-	            var M_offset_8  = M[offset + 8];
-	            var M_offset_9  = M[offset + 9];
-	            var M_offset_10 = M[offset + 10];
-	            var M_offset_11 = M[offset + 11];
-	            var M_offset_12 = M[offset + 12];
-	            var M_offset_13 = M[offset + 13];
-	            var M_offset_14 = M[offset + 14];
-	            var M_offset_15 = M[offset + 15];
-
-	            // Working varialbes
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-
-	            // Computation
-	            a = FF(a, b, c, d, M_offset_0,  7,  T[0]);
-	            d = FF(d, a, b, c, M_offset_1,  12, T[1]);
-	            c = FF(c, d, a, b, M_offset_2,  17, T[2]);
-	            b = FF(b, c, d, a, M_offset_3,  22, T[3]);
-	            a = FF(a, b, c, d, M_offset_4,  7,  T[4]);
-	            d = FF(d, a, b, c, M_offset_5,  12, T[5]);
-	            c = FF(c, d, a, b, M_offset_6,  17, T[6]);
-	            b = FF(b, c, d, a, M_offset_7,  22, T[7]);
-	            a = FF(a, b, c, d, M_offset_8,  7,  T[8]);
-	            d = FF(d, a, b, c, M_offset_9,  12, T[9]);
-	            c = FF(c, d, a, b, M_offset_10, 17, T[10]);
-	            b = FF(b, c, d, a, M_offset_11, 22, T[11]);
-	            a = FF(a, b, c, d, M_offset_12, 7,  T[12]);
-	            d = FF(d, a, b, c, M_offset_13, 12, T[13]);
-	            c = FF(c, d, a, b, M_offset_14, 17, T[14]);
-	            b = FF(b, c, d, a, M_offset_15, 22, T[15]);
-
-	            a = GG(a, b, c, d, M_offset_1,  5,  T[16]);
-	            d = GG(d, a, b, c, M_offset_6,  9,  T[17]);
-	            c = GG(c, d, a, b, M_offset_11, 14, T[18]);
-	            b = GG(b, c, d, a, M_offset_0,  20, T[19]);
-	            a = GG(a, b, c, d, M_offset_5,  5,  T[20]);
-	            d = GG(d, a, b, c, M_offset_10, 9,  T[21]);
-	            c = GG(c, d, a, b, M_offset_15, 14, T[22]);
-	            b = GG(b, c, d, a, M_offset_4,  20, T[23]);
-	            a = GG(a, b, c, d, M_offset_9,  5,  T[24]);
-	            d = GG(d, a, b, c, M_offset_14, 9,  T[25]);
-	            c = GG(c, d, a, b, M_offset_3,  14, T[26]);
-	            b = GG(b, c, d, a, M_offset_8,  20, T[27]);
-	            a = GG(a, b, c, d, M_offset_13, 5,  T[28]);
-	            d = GG(d, a, b, c, M_offset_2,  9,  T[29]);
-	            c = GG(c, d, a, b, M_offset_7,  14, T[30]);
-	            b = GG(b, c, d, a, M_offset_12, 20, T[31]);
-
-	            a = HH(a, b, c, d, M_offset_5,  4,  T[32]);
-	            d = HH(d, a, b, c, M_offset_8,  11, T[33]);
-	            c = HH(c, d, a, b, M_offset_11, 16, T[34]);
-	            b = HH(b, c, d, a, M_offset_14, 23, T[35]);
-	            a = HH(a, b, c, d, M_offset_1,  4,  T[36]);
-	            d = HH(d, a, b, c, M_offset_4,  11, T[37]);
-	            c = HH(c, d, a, b, M_offset_7,  16, T[38]);
-	            b = HH(b, c, d, a, M_offset_10, 23, T[39]);
-	            a = HH(a, b, c, d, M_offset_13, 4,  T[40]);
-	            d = HH(d, a, b, c, M_offset_0,  11, T[41]);
-	            c = HH(c, d, a, b, M_offset_3,  16, T[42]);
-	            b = HH(b, c, d, a, M_offset_6,  23, T[43]);
-	            a = HH(a, b, c, d, M_offset_9,  4,  T[44]);
-	            d = HH(d, a, b, c, M_offset_12, 11, T[45]);
-	            c = HH(c, d, a, b, M_offset_15, 16, T[46]);
-	            b = HH(b, c, d, a, M_offset_2,  23, T[47]);
-
-	            a = II(a, b, c, d, M_offset_0,  6,  T[48]);
-	            d = II(d, a, b, c, M_offset_7,  10, T[49]);
-	            c = II(c, d, a, b, M_offset_14, 15, T[50]);
-	            b = II(b, c, d, a, M_offset_5,  21, T[51]);
-	            a = II(a, b, c, d, M_offset_12, 6,  T[52]);
-	            d = II(d, a, b, c, M_offset_3,  10, T[53]);
-	            c = II(c, d, a, b, M_offset_10, 15, T[54]);
-	            b = II(b, c, d, a, M_offset_1,  21, T[55]);
-	            a = II(a, b, c, d, M_offset_8,  6,  T[56]);
-	            d = II(d, a, b, c, M_offset_15, 10, T[57]);
-	            c = II(c, d, a, b, M_offset_6,  15, T[58]);
-	            b = II(b, c, d, a, M_offset_13, 21, T[59]);
-	            a = II(a, b, c, d, M_offset_4,  6,  T[60]);
-	            d = II(d, a, b, c, M_offset_11, 10, T[61]);
-	            c = II(c, d, a, b, M_offset_2,  15, T[62]);
-	            b = II(b, c, d, a, M_offset_9,  21, T[63]);
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-
-	            var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
-	            var nBitsTotalL = nBitsTotal;
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
-	                (((nBitsTotalH << 8)  | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotalH << 24) | (nBitsTotalH >>> 8))  & 0xff00ff00)
-	            );
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
-	                (((nBitsTotalL << 8)  | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotalL << 24) | (nBitsTotalL >>> 8))  & 0xff00ff00)
-	            );
-
-	            data.sigBytes = (dataWords.length + 1) * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var hash = this._hash;
-	            var H = hash.words;
-
-	            // Swap endian
-	            for (var i = 0; i < 4; i++) {
-	                // Shortcut
-	                var H_i = H[i];
-
-	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    function FF(a, b, c, d, x, s, t) {
-	        var n = a + ((b & c) | (~b & d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function GG(a, b, c, d, x, s, t) {
-	        var n = a + ((b & d) | (c & ~d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function HH(a, b, c, d, x, s, t) {
-	        var n = a + (b ^ c ^ d) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    function II(a, b, c, d, x, s, t) {
-	        var n = a + (c ^ (b | ~d)) + x + t;
-	        return ((n << s) | (n >>> (32 - s))) + b;
-	    }
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.MD5('message');
-	     *     var hash = CryptoJS.MD5(wordArray);
-	     */
-	    C.MD5 = Hasher._createHelper(MD5);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacMD5(message, key);
-	     */
-	    C.HmacMD5 = Hasher._createHmacHelper(MD5);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Reusable object
-	    var W = [];
-
-	    /**
-	     * SHA-1 hash algorithm.
-	     */
-	    var SHA1 = C_algo.SHA1 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0x67452301, 0xefcdab89,
-	                0x98badcfe, 0x10325476,
-	                0xc3d2e1f0
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var H = this._hash.words;
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-	            var e = H[4];
-
-	            // Computation
-	            for (var i = 0; i < 80; i++) {
-	                if (i < 16) {
-	                    W[i] = M[offset + i] | 0;
-	                } else {
-	                    var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
-	                    W[i] = (n << 1) | (n >>> 31);
-	                }
-
-	                var t = ((a << 5) | (a >>> 27)) + e + W[i];
-	                if (i < 20) {
-	                    t += ((b & c) | (~b & d)) + 0x5a827999;
-	                } else if (i < 40) {
-	                    t += (b ^ c ^ d) + 0x6ed9eba1;
-	                } else if (i < 60) {
-	                    t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
-	                } else /* if (i < 80) */ {
-	                    t += (b ^ c ^ d) - 0x359d3e2a;
-	                }
-
-	                e = d;
-	                d = c;
-	                c = (b << 30) | (b >>> 2);
-	                b = a;
-	                a = t;
-	            }
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	            H[4] = (H[4] + e) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Return final computed hash
-	            return this._hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA1('message');
-	     *     var hash = CryptoJS.SHA1(wordArray);
-	     */
-	    C.SHA1 = Hasher._createHelper(SHA1);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA1(message, key);
-	     */
-	    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
-	}());
-
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Initialization and round constants tables
-	    var H = [];
-	    var K = [];
-
-	    // Compute constants
-	    (function () {
-	        function isPrime(n) {
-	            var sqrtN = Math.sqrt(n);
-	            for (var factor = 2; factor <= sqrtN; factor++) {
-	                if (!(n % factor)) {
-	                    return false;
-	                }
-	            }
-
-	            return true;
-	        }
-
-	        function getFractionalBits(n) {
-	            return ((n - (n | 0)) * 0x100000000) | 0;
-	        }
-
-	        var n = 2;
-	        var nPrime = 0;
-	        while (nPrime < 64) {
-	            if (isPrime(n)) {
-	                if (nPrime < 8) {
-	                    H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
-	                }
-	                K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
-
-	                nPrime++;
-	            }
-
-	            n++;
-	        }
-	    }());
-
-	    // Reusable object
-	    var W = [];
-
-	    /**
-	     * SHA-256 hash algorithm.
-	     */
-	    var SHA256 = C_algo.SHA256 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init(H.slice(0));
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var H = this._hash.words;
-
-	            // Working variables
-	            var a = H[0];
-	            var b = H[1];
-	            var c = H[2];
-	            var d = H[3];
-	            var e = H[4];
-	            var f = H[5];
-	            var g = H[6];
-	            var h = H[7];
-
-	            // Computation
-	            for (var i = 0; i < 64; i++) {
-	                if (i < 16) {
-	                    W[i] = M[offset + i] | 0;
-	                } else {
-	                    var gamma0x = W[i - 15];
-	                    var gamma0  = ((gamma0x << 25) | (gamma0x >>> 7))  ^
-	                                  ((gamma0x << 14) | (gamma0x >>> 18)) ^
-	                                   (gamma0x >>> 3);
-
-	                    var gamma1x = W[i - 2];
-	                    var gamma1  = ((gamma1x << 15) | (gamma1x >>> 17)) ^
-	                                  ((gamma1x << 13) | (gamma1x >>> 19)) ^
-	                                   (gamma1x >>> 10);
-
-	                    W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
-	                }
-
-	                var ch  = (e & f) ^ (~e & g);
-	                var maj = (a & b) ^ (a & c) ^ (b & c);
-
-	                var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
-	                var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7)  | (e >>> 25));
-
-	                var t1 = h + sigma1 + ch + K[i] + W[i];
-	                var t2 = sigma0 + maj;
-
-	                h = g;
-	                g = f;
-	                f = e;
-	                e = (d + t1) | 0;
-	                d = c;
-	                c = b;
-	                b = a;
-	                a = (t1 + t2) | 0;
-	            }
-
-	            // Intermediate hash value
-	            H[0] = (H[0] + a) | 0;
-	            H[1] = (H[1] + b) | 0;
-	            H[2] = (H[2] + c) | 0;
-	            H[3] = (H[3] + d) | 0;
-	            H[4] = (H[4] + e) | 0;
-	            H[5] = (H[5] + f) | 0;
-	            H[6] = (H[6] + g) | 0;
-	            H[7] = (H[7] + h) | 0;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Return final computed hash
-	            return this._hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA256('message');
-	     *     var hash = CryptoJS.SHA256(wordArray);
-	     */
-	    C.SHA256 = Hasher._createHelper(SHA256);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA256(message, key);
-	     */
-	    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_enc = C.enc;
-
-	    /**
-	     * UTF-16 BE encoding strategy.
-	     */
-	    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
-	        /**
-	         * Converts a word array to a UTF-16 BE string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-16 BE string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var utf16Chars = [];
-	            for (var i = 0; i < sigBytes; i += 2) {
-	                var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
-	                utf16Chars.push(String.fromCharCode(codePoint));
-	            }
-
-	            return utf16Chars.join('');
-	        },
-
-	        /**
-	         * Converts a UTF-16 BE string to a word array.
-	         *
-	         * @param {string} utf16Str The UTF-16 BE string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
-	         */
-	        parse: function (utf16Str) {
-	            // Shortcut
-	            var utf16StrLength = utf16Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < utf16StrLength; i++) {
-	                words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
-	            }
-
-	            return WordArray.create(words, utf16StrLength * 2);
-	        }
-	    };
-
-	    /**
-	     * UTF-16 LE encoding strategy.
-	     */
-	    C_enc.Utf16LE = {
-	        /**
-	         * Converts a word array to a UTF-16 LE string.
-	         *
-	         * @param {WordArray} wordArray The word array.
-	         *
-	         * @return {string} The UTF-16 LE string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
-	         */
-	        stringify: function (wordArray) {
-	            // Shortcuts
-	            var words = wordArray.words;
-	            var sigBytes = wordArray.sigBytes;
-
-	            // Convert
-	            var utf16Chars = [];
-	            for (var i = 0; i < sigBytes; i += 2) {
-	                var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
-	                utf16Chars.push(String.fromCharCode(codePoint));
-	            }
-
-	            return utf16Chars.join('');
-	        },
-
-	        /**
-	         * Converts a UTF-16 LE string to a word array.
-	         *
-	         * @param {string} utf16Str The UTF-16 LE string.
-	         *
-	         * @return {WordArray} The word array.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
-	         */
-	        parse: function (utf16Str) {
-	            // Shortcut
-	            var utf16StrLength = utf16Str.length;
-
-	            // Convert
-	            var words = [];
-	            for (var i = 0; i < utf16StrLength; i++) {
-	                words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
-	            }
-
-	            return WordArray.create(words, utf16StrLength * 2);
-	        }
-	    };
-
-	    function swapEndian(word) {
-	        return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
-	    }
-	}());
-
-
-	(function () {
-	    // Check if typed arrays are supported
-	    if (typeof ArrayBuffer != 'function') {
-	        return;
-	    }
-
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-
-	    // Reference original init
-	    var superInit = WordArray.init;
-
-	    // Augment WordArray.init to handle typed arrays
-	    var subInit = WordArray.init = function (typedArray) {
-	        // Convert buffers to uint8
-	        if (typedArray instanceof ArrayBuffer) {
-	            typedArray = new Uint8Array(typedArray);
-	        }
-
-	        // Convert other array views to uint8
-	        if (
-	            typedArray instanceof Int8Array ||
-	            (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
-	            typedArray instanceof Int16Array ||
-	            typedArray instanceof Uint16Array ||
-	            typedArray instanceof Int32Array ||
-	            typedArray instanceof Uint32Array ||
-	            typedArray instanceof Float32Array ||
-	            typedArray instanceof Float64Array
-	        ) {
-	            typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
-	        }
-
-	        // Handle Uint8Array
-	        if (typedArray instanceof Uint8Array) {
-	            // Shortcut
-	            var typedArrayByteLength = typedArray.byteLength;
-
-	            // Extract bytes
-	            var words = [];
-	            for (var i = 0; i < typedArrayByteLength; i++) {
-	                words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
-	            }
-
-	            // Initialize this word array
-	            superInit.call(this, words, typedArrayByteLength);
-	        } else {
-	            // Else call normal init
-	            superInit.apply(this, arguments);
-	        }
-	    };
-
-	    subInit.prototype = WordArray;
-	}());
-
-
-	/** @preserve
-	(c) 2012 by Cédric Mesnil. All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	*/
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_algo = C.algo;
-
-	    // Constants table
-	    var _zl = WordArray.create([
-	        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-	        7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
-	        3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
-	        1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
-	        4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13]);
-	    var _zr = WordArray.create([
-	        5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
-	        6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
-	        15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
-	        8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
-	        12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11]);
-	    var _sl = WordArray.create([
-	         11, 14, 15, 12,  5,  8,  7,  9, 11, 13, 14, 15,  6,  7,  9,  8,
-	        7, 6,   8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
-	        11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
-	          11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
-	        9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6 ]);
-	    var _sr = WordArray.create([
-	        8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
-	        9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
-	        9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
-	        15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
-	        8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11 ]);
-
-	    var _hl =  WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
-	    var _hr =  WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
-
-	    /**
-	     * RIPEMD160 hash algorithm.
-	     */
-	    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash  = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-
-	            // Swap endian
-	            for (var i = 0; i < 16; i++) {
-	                // Shortcuts
-	                var offset_i = offset + i;
-	                var M_offset_i = M[offset_i];
-
-	                // Swap
-	                M[offset_i] = (
-	                    (((M_offset_i << 8)  | (M_offset_i >>> 24)) & 0x00ff00ff) |
-	                    (((M_offset_i << 24) | (M_offset_i >>> 8))  & 0xff00ff00)
-	                );
-	            }
-	            // Shortcut
-	            var H  = this._hash.words;
-	            var hl = _hl.words;
-	            var hr = _hr.words;
-	            var zl = _zl.words;
-	            var zr = _zr.words;
-	            var sl = _sl.words;
-	            var sr = _sr.words;
-
-	            // Working variables
-	            var al, bl, cl, dl, el;
-	            var ar, br, cr, dr, er;
-
-	            ar = al = H[0];
-	            br = bl = H[1];
-	            cr = cl = H[2];
-	            dr = dl = H[3];
-	            er = el = H[4];
-	            // Computation
-	            var t;
-	            for (var i = 0; i < 80; i += 1) {
-	                t = (al +  M[offset+zl[i]])|0;
-	                if (i<16){
-		            t +=  f1(bl,cl,dl) + hl[0];
-	                } else if (i<32) {
-		            t +=  f2(bl,cl,dl) + hl[1];
-	                } else if (i<48) {
-		            t +=  f3(bl,cl,dl) + hl[2];
-	                } else if (i<64) {
-		            t +=  f4(bl,cl,dl) + hl[3];
-	                } else {// if (i<80) {
-		            t +=  f5(bl,cl,dl) + hl[4];
-	                }
-	                t = t|0;
-	                t =  rotl(t,sl[i]);
-	                t = (t+el)|0;
-	                al = el;
-	                el = dl;
-	                dl = rotl(cl, 10);
-	                cl = bl;
-	                bl = t;
-
-	                t = (ar + M[offset+zr[i]])|0;
-	                if (i<16){
-		            t +=  f5(br,cr,dr) + hr[0];
-	                } else if (i<32) {
-		            t +=  f4(br,cr,dr) + hr[1];
-	                } else if (i<48) {
-		            t +=  f3(br,cr,dr) + hr[2];
-	                } else if (i<64) {
-		            t +=  f2(br,cr,dr) + hr[3];
-	                } else {// if (i<80) {
-		            t +=  f1(br,cr,dr) + hr[4];
-	                }
-	                t = t|0;
-	                t =  rotl(t,sr[i]) ;
-	                t = (t+er)|0;
-	                ar = er;
-	                er = dr;
-	                dr = rotl(cr, 10);
-	                cr = br;
-	                br = t;
-	            }
-	            // Intermediate hash value
-	            t    = (H[1] + cl + dr)|0;
-	            H[1] = (H[2] + dl + er)|0;
-	            H[2] = (H[3] + el + ar)|0;
-	            H[3] = (H[4] + al + br)|0;
-	            H[4] = (H[0] + bl + cr)|0;
-	            H[0] =  t;
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
-	                (((nBitsTotal << 8)  | (nBitsTotal >>> 24)) & 0x00ff00ff) |
-	                (((nBitsTotal << 24) | (nBitsTotal >>> 8))  & 0xff00ff00)
-	            );
-	            data.sigBytes = (dataWords.length + 1) * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var hash = this._hash;
-	            var H = hash.words;
-
-	            // Swap endian
-	            for (var i = 0; i < 5; i++) {
-	                // Shortcut
-	                var H_i = H[i];
-
-	                // Swap
-	                H[i] = (((H_i << 8)  | (H_i >>> 24)) & 0x00ff00ff) |
-	                       (((H_i << 24) | (H_i >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        }
-	    });
-
-
-	    function f1(x, y, z) {
-	        return ((x) ^ (y) ^ (z));
-
-	    }
-
-	    function f2(x, y, z) {
-	        return (((x)&(y)) | ((~x)&(z)));
-	    }
-
-	    function f3(x, y, z) {
-	        return (((x) | (~(y))) ^ (z));
-	    }
-
-	    function f4(x, y, z) {
-	        return (((x) & (z)) | ((y)&(~(z))));
-	    }
-
-	    function f5(x, y, z) {
-	        return ((x) ^ ((y) |(~(z))));
-
-	    }
-
-	    function rotl(x,n) {
-	        return (x<<n) | (x>>>(32-n));
-	    }
-
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.RIPEMD160('message');
-	     *     var hash = CryptoJS.RIPEMD160(wordArray);
-	     */
-	    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
-	     */
-	    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var C_enc = C.enc;
-	    var Utf8 = C_enc.Utf8;
-	    var C_algo = C.algo;
-
-	    /**
-	     * HMAC algorithm.
-	     */
-	    var HMAC = C_algo.HMAC = Base.extend({
-	        /**
-	         * Initializes a newly created HMAC.
-	         *
-	         * @param {Hasher} hasher The hash algorithm to use.
-	         * @param {WordArray|string} key The secret key.
-	         *
-	         * @example
-	         *
-	         *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
-	         */
-	        init: function (hasher, key) {
-	            // Init hasher
-	            hasher = this._hasher = new hasher.init();
-
-	            // Convert string to WordArray, else assume WordArray already
-	            if (typeof key == 'string') {
-	                key = Utf8.parse(key);
-	            }
-
-	            // Shortcuts
-	            var hasherBlockSize = hasher.blockSize;
-	            var hasherBlockSizeBytes = hasherBlockSize * 4;
-
-	            // Allow arbitrary length keys
-	            if (key.sigBytes > hasherBlockSizeBytes) {
-	                key = hasher.finalize(key);
-	            }
-
-	            // Clamp excess bits
-	            key.clamp();
-
-	            // Clone key for inner and outer pads
-	            var oKey = this._oKey = key.clone();
-	            var iKey = this._iKey = key.clone();
-
-	            // Shortcuts
-	            var oKeyWords = oKey.words;
-	            var iKeyWords = iKey.words;
-
-	            // XOR keys with pad constants
-	            for (var i = 0; i < hasherBlockSize; i++) {
-	                oKeyWords[i] ^= 0x5c5c5c5c;
-	                iKeyWords[i] ^= 0x36363636;
-	            }
-	            oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this HMAC to its initial state.
-	         *
-	         * @example
-	         *
-	         *     hmacHasher.reset();
-	         */
-	        reset: function () {
-	            // Shortcut
-	            var hasher = this._hasher;
-
-	            // Reset
-	            hasher.reset();
-	            hasher.update(this._iKey);
-	        },
-
-	        /**
-	         * Updates this HMAC with a message.
-	         *
-	         * @param {WordArray|string} messageUpdate The message to append.
-	         *
-	         * @return {HMAC} This HMAC instance.
-	         *
-	         * @example
-	         *
-	         *     hmacHasher.update('message');
-	         *     hmacHasher.update(wordArray);
-	         */
-	        update: function (messageUpdate) {
-	            this._hasher.update(messageUpdate);
-
-	            // Chainable
-	            return this;
-	        },
-
-	        /**
-	         * Finalizes the HMAC computation.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} messageUpdate (Optional) A final message update.
-	         *
-	         * @return {WordArray} The HMAC.
-	         *
-	         * @example
-	         *
-	         *     var hmac = hmacHasher.finalize();
-	         *     var hmac = hmacHasher.finalize('message');
-	         *     var hmac = hmacHasher.finalize(wordArray);
-	         */
-	        finalize: function (messageUpdate) {
-	            // Shortcut
-	            var hasher = this._hasher;
-
-	            // Compute HMAC
-	            var innerHash = hasher.finalize(messageUpdate);
-	            hasher.reset();
-	            var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
-
-	            return hmac;
-	        }
-	    });
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var SHA1 = C_algo.SHA1;
-	    var HMAC = C_algo.HMAC;
-
-	    /**
-	     * Password-Based Key Derivation Function 2 algorithm.
-	     */
-	    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
-	         * @property {Hasher} hasher The hasher to use. Default: SHA1
-	         * @property {number} iterations The number of iterations to perform. Default: 1
-	         */
-	        cfg: Base.extend({
-	            keySize: 128/32,
-	            hasher: SHA1,
-	            iterations: 1
-	        }),
-
-	        /**
-	         * Initializes a newly created key derivation function.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
-	         *
-	         * @example
-	         *
-	         *     var kdf = CryptoJS.algo.PBKDF2.create();
-	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
-	         *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
-	         */
-	        init: function (cfg) {
-	            this.cfg = this.cfg.extend(cfg);
-	        },
-
-	        /**
-	         * Computes the Password-Based Key Derivation Function 2.
-	         *
-	         * @param {WordArray|string} password The password.
-	         * @param {WordArray|string} salt A salt.
-	         *
-	         * @return {WordArray} The derived key.
-	         *
-	         * @example
-	         *
-	         *     var key = kdf.compute(password, salt);
-	         */
-	        compute: function (password, salt) {
-	            // Shortcut
-	            var cfg = this.cfg;
-
-	            // Init HMAC
-	            var hmac = HMAC.create(cfg.hasher, password);
-
-	            // Initial values
-	            var derivedKey = WordArray.create();
-	            var blockIndex = WordArray.create([0x00000001]);
-
-	            // Shortcuts
-	            var derivedKeyWords = derivedKey.words;
-	            var blockIndexWords = blockIndex.words;
-	            var keySize = cfg.keySize;
-	            var iterations = cfg.iterations;
-
-	            // Generate key
-	            while (derivedKeyWords.length < keySize) {
-	                var block = hmac.update(salt).finalize(blockIndex);
-	                hmac.reset();
-
-	                // Shortcuts
-	                var blockWords = block.words;
-	                var blockWordsLength = blockWords.length;
-
-	                // Iterations
-	                var intermediate = block;
-	                for (var i = 1; i < iterations; i++) {
-	                    intermediate = hmac.finalize(intermediate);
-	                    hmac.reset();
-
-	                    // Shortcut
-	                    var intermediateWords = intermediate.words;
-
-	                    // XOR intermediate with block
-	                    for (var j = 0; j < blockWordsLength; j++) {
-	                        blockWords[j] ^= intermediateWords[j];
-	                    }
-	                }
-
-	                derivedKey.concat(block);
-	                blockIndexWords[0]++;
-	            }
-	            derivedKey.sigBytes = keySize * 4;
-
-	            return derivedKey;
-	        }
-	    });
-
-	    /**
-	     * Computes the Password-Based Key Derivation Function 2.
-	     *
-	     * @param {WordArray|string} password The password.
-	     * @param {WordArray|string} salt A salt.
-	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
-	     *
-	     * @return {WordArray} The derived key.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var key = CryptoJS.PBKDF2(password, salt);
-	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
-	     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
-	     */
-	    C.PBKDF2 = function (password, salt, cfg) {
-	        return PBKDF2.create(cfg).compute(password, salt);
-	    };
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var MD5 = C_algo.MD5;
-
-	    /**
-	     * This key derivation function is meant to conform with EVP_BytesToKey.
-	     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
-	     */
-	    var EvpKDF = C_algo.EvpKDF = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
-	         * @property {Hasher} hasher The hash algorithm to use. Default: MD5
-	         * @property {number} iterations The number of iterations to perform. Default: 1
-	         */
-	        cfg: Base.extend({
-	            keySize: 128/32,
-	            hasher: MD5,
-	            iterations: 1
-	        }),
-
-	        /**
-	         * Initializes a newly created key derivation function.
-	         *
-	         * @param {Object} cfg (Optional) The configuration options to use for the derivation.
-	         *
-	         * @example
-	         *
-	         *     var kdf = CryptoJS.algo.EvpKDF.create();
-	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
-	         *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
-	         */
-	        init: function (cfg) {
-	            this.cfg = this.cfg.extend(cfg);
-	        },
-
-	        /**
-	         * Derives a key from a password.
-	         *
-	         * @param {WordArray|string} password The password.
-	         * @param {WordArray|string} salt A salt.
-	         *
-	         * @return {WordArray} The derived key.
-	         *
-	         * @example
-	         *
-	         *     var key = kdf.compute(password, salt);
-	         */
-	        compute: function (password, salt) {
-	            var block;
-
-	            // Shortcut
-	            var cfg = this.cfg;
-
-	            // Init hasher
-	            var hasher = cfg.hasher.create();
-
-	            // Initial values
-	            var derivedKey = WordArray.create();
-
-	            // Shortcuts
-	            var derivedKeyWords = derivedKey.words;
-	            var keySize = cfg.keySize;
-	            var iterations = cfg.iterations;
-
-	            // Generate key
-	            while (derivedKeyWords.length < keySize) {
-	                if (block) {
-	                    hasher.update(block);
-	                }
-	                block = hasher.update(password).finalize(salt);
-	                hasher.reset();
-
-	                // Iterations
-	                for (var i = 1; i < iterations; i++) {
-	                    block = hasher.finalize(block);
-	                    hasher.reset();
-	                }
-
-	                derivedKey.concat(block);
-	            }
-	            derivedKey.sigBytes = keySize * 4;
-
-	            return derivedKey;
-	        }
-	    });
-
-	    /**
-	     * Derives a key from a password.
-	     *
-	     * @param {WordArray|string} password The password.
-	     * @param {WordArray|string} salt A salt.
-	     * @param {Object} cfg (Optional) The configuration options to use for this computation.
-	     *
-	     * @return {WordArray} The derived key.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var key = CryptoJS.EvpKDF(password, salt);
-	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
-	     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
-	     */
-	    C.EvpKDF = function (password, salt, cfg) {
-	        return EvpKDF.create(cfg).compute(password, salt);
-	    };
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var C_algo = C.algo;
-	    var SHA256 = C_algo.SHA256;
-
-	    /**
-	     * SHA-224 hash algorithm.
-	     */
-	    var SHA224 = C_algo.SHA224 = SHA256.extend({
-	        _doReset: function () {
-	            this._hash = new WordArray.init([
-	                0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
-	                0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
-	            ]);
-	        },
-
-	        _doFinalize: function () {
-	            var hash = SHA256._doFinalize.call(this);
-
-	            hash.sigBytes -= 4;
-
-	            return hash;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA224('message');
-	     *     var hash = CryptoJS.SHA224(wordArray);
-	     */
-	    C.SHA224 = SHA256._createHelper(SHA224);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA224(message, key);
-	     */
-	    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
-	}());
-
-
-	(function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var X32WordArray = C_lib.WordArray;
-
-	    /**
-	     * x64 namespace.
-	     */
-	    var C_x64 = C.x64 = {};
-
-	    /**
-	     * A 64-bit word.
-	     */
-	    var X64Word = C_x64.Word = Base.extend({
-	        /**
-	         * Initializes a newly created 64-bit word.
-	         *
-	         * @param {number} high The high 32 bits.
-	         * @param {number} low The low 32 bits.
-	         *
-	         * @example
-	         *
-	         *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
-	         */
-	        init: function (high, low) {
-	            this.high = high;
-	            this.low = low;
-	        }
-
-	        /**
-	         * Bitwise NOTs this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after negating.
-	         *
-	         * @example
-	         *
-	         *     var negated = x64Word.not();
-	         */
-	        // not: function () {
-	            // var high = ~this.high;
-	            // var low = ~this.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise ANDs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to AND with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after ANDing.
-	         *
-	         * @example
-	         *
-	         *     var anded = x64Word.and(anotherX64Word);
-	         */
-	        // and: function (word) {
-	            // var high = this.high & word.high;
-	            // var low = this.low & word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise ORs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to OR with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after ORing.
-	         *
-	         * @example
-	         *
-	         *     var ored = x64Word.or(anotherX64Word);
-	         */
-	        // or: function (word) {
-	            // var high = this.high | word.high;
-	            // var low = this.low | word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Bitwise XORs this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to XOR with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after XORing.
-	         *
-	         * @example
-	         *
-	         *     var xored = x64Word.xor(anotherX64Word);
-	         */
-	        // xor: function (word) {
-	            // var high = this.high ^ word.high;
-	            // var low = this.low ^ word.low;
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Shifts this word n bits to the left.
-	         *
-	         * @param {number} n The number of bits to shift.
-	         *
-	         * @return {X64Word} A new x64-Word object after shifting.
-	         *
-	         * @example
-	         *
-	         *     var shifted = x64Word.shiftL(25);
-	         */
-	        // shiftL: function (n) {
-	            // if (n < 32) {
-	                // var high = (this.high << n) | (this.low >>> (32 - n));
-	                // var low = this.low << n;
-	            // } else {
-	                // var high = this.low << (n - 32);
-	                // var low = 0;
-	            // }
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Shifts this word n bits to the right.
-	         *
-	         * @param {number} n The number of bits to shift.
-	         *
-	         * @return {X64Word} A new x64-Word object after shifting.
-	         *
-	         * @example
-	         *
-	         *     var shifted = x64Word.shiftR(7);
-	         */
-	        // shiftR: function (n) {
-	            // if (n < 32) {
-	                // var low = (this.low >>> n) | (this.high << (32 - n));
-	                // var high = this.high >>> n;
-	            // } else {
-	                // var low = this.high >>> (n - 32);
-	                // var high = 0;
-	            // }
-
-	            // return X64Word.create(high, low);
-	        // },
-
-	        /**
-	         * Rotates this word n bits to the left.
-	         *
-	         * @param {number} n The number of bits to rotate.
-	         *
-	         * @return {X64Word} A new x64-Word object after rotating.
-	         *
-	         * @example
-	         *
-	         *     var rotated = x64Word.rotL(25);
-	         */
-	        // rotL: function (n) {
-	            // return this.shiftL(n).or(this.shiftR(64 - n));
-	        // },
-
-	        /**
-	         * Rotates this word n bits to the right.
-	         *
-	         * @param {number} n The number of bits to rotate.
-	         *
-	         * @return {X64Word} A new x64-Word object after rotating.
-	         *
-	         * @example
-	         *
-	         *     var rotated = x64Word.rotR(7);
-	         */
-	        // rotR: function (n) {
-	            // return this.shiftR(n).or(this.shiftL(64 - n));
-	        // },
-
-	        /**
-	         * Adds this word with the passed word.
-	         *
-	         * @param {X64Word} word The x64-Word to add with this word.
-	         *
-	         * @return {X64Word} A new x64-Word object after adding.
-	         *
-	         * @example
-	         *
-	         *     var added = x64Word.add(anotherX64Word);
-	         */
-	        // add: function (word) {
-	            // var low = (this.low + word.low) | 0;
-	            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
-	            // var high = (this.high + word.high + carry) | 0;
-
-	            // return X64Word.create(high, low);
-	        // }
-	    });
-
-	    /**
-	     * An array of 64-bit words.
-	     *
-	     * @property {Array} words The array of CryptoJS.x64.Word objects.
-	     * @property {number} sigBytes The number of significant bytes in this word array.
-	     */
-	    var X64WordArray = C_x64.WordArray = Base.extend({
-	        /**
-	         * Initializes a newly created word array.
-	         *
-	         * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
-	         * @param {number} sigBytes (Optional) The number of significant bytes in the words.
-	         *
-	         * @example
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create();
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create([
-	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
-	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
-	         *     ]);
-	         *
-	         *     var wordArray = CryptoJS.x64.WordArray.create([
-	         *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
-	         *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
-	         *     ], 10);
-	         */
-	        init: function (words, sigBytes) {
-	            words = this.words = words || [];
-
-	            if (sigBytes != undefined) {
-	                this.sigBytes = sigBytes;
-	            } else {
-	                this.sigBytes = words.length * 8;
-	            }
-	        },
-
-	        /**
-	         * Converts this 64-bit word array to a 32-bit word array.
-	         *
-	         * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
-	         *
-	         * @example
-	         *
-	         *     var x32WordArray = x64WordArray.toX32();
-	         */
-	        toX32: function () {
-	            // Shortcuts
-	            var x64Words = this.words;
-	            var x64WordsLength = x64Words.length;
-
-	            // Convert
-	            var x32Words = [];
-	            for (var i = 0; i < x64WordsLength; i++) {
-	                var x64Word = x64Words[i];
-	                x32Words.push(x64Word.high);
-	                x32Words.push(x64Word.low);
-	            }
-
-	            return X32WordArray.create(x32Words, this.sigBytes);
-	        },
-
-	        /**
-	         * Creates a copy of this word array.
-	         *
-	         * @return {X64WordArray} The clone.
-	         *
-	         * @example
-	         *
-	         *     var clone = x64WordArray.clone();
-	         */
-	        clone: function () {
-	            var clone = Base.clone.call(this);
-
-	            // Clone "words" array
-	            var words = clone.words = this.words.slice(0);
-
-	            // Clone each X64Word object
-	            var wordsLength = words.length;
-	            for (var i = 0; i < wordsLength; i++) {
-	                words[i] = words[i].clone();
-	            }
-
-	            return clone;
-	        }
-	    });
-	}());
-
-
-	(function (Math) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var Hasher = C_lib.Hasher;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var C_algo = C.algo;
-
-	    // Constants tables
-	    var RHO_OFFSETS = [];
-	    var PI_INDEXES  = [];
-	    var ROUND_CONSTANTS = [];
-
-	    // Compute Constants
-	    (function () {
-	        // Compute rho offset constants
-	        var x = 1, y = 0;
-	        for (var t = 0; t < 24; t++) {
-	            RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
-
-	            var newX = y % 5;
-	            var newY = (2 * x + 3 * y) % 5;
-	            x = newX;
-	            y = newY;
-	        }
-
-	        // Compute pi index constants
-	        for (var x = 0; x < 5; x++) {
-	            for (var y = 0; y < 5; y++) {
-	                PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
-	            }
-	        }
-
-	        // Compute round constants
-	        var LFSR = 0x01;
-	        for (var i = 0; i < 24; i++) {
-	            var roundConstantMsw = 0;
-	            var roundConstantLsw = 0;
-
-	            for (var j = 0; j < 7; j++) {
-	                if (LFSR & 0x01) {
-	                    var bitPosition = (1 << j) - 1;
-	                    if (bitPosition < 32) {
-	                        roundConstantLsw ^= 1 << bitPosition;
-	                    } else /* if (bitPosition >= 32) */ {
-	                        roundConstantMsw ^= 1 << (bitPosition - 32);
-	                    }
-	                }
-
-	                // Compute next LFSR
-	                if (LFSR & 0x80) {
-	                    // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
-	                    LFSR = (LFSR << 1) ^ 0x71;
-	                } else {
-	                    LFSR <<= 1;
-	                }
-	            }
-
-	            ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
-	        }
-	    }());
-
-	    // Reusable objects for temporary values
-	    var T = [];
-	    (function () {
-	        for (var i = 0; i < 25; i++) {
-	            T[i] = X64Word.create();
-	        }
-	    }());
-
-	    /**
-	     * SHA-3 hash algorithm.
-	     */
-	    var SHA3 = C_algo.SHA3 = Hasher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} outputLength
-	         *   The desired number of bits in the output hash.
-	         *   Only values permitted are: 224, 256, 384, 512.
-	         *   Default: 512
-	         */
-	        cfg: Hasher.cfg.extend({
-	            outputLength: 512
-	        }),
-
-	        _doReset: function () {
-	            var state = this._state = []
-	            for (var i = 0; i < 25; i++) {
-	                state[i] = new X64Word.init();
-	            }
-
-	            this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcuts
-	            var state = this._state;
-	            var nBlockSizeLanes = this.blockSize / 2;
-
-	            // Absorb
-	            for (var i = 0; i < nBlockSizeLanes; i++) {
-	                // Shortcuts
-	                var M2i  = M[offset + 2 * i];
-	                var M2i1 = M[offset + 2 * i + 1];
-
-	                // Swap endian
-	                M2i = (
-	                    (((M2i << 8)  | (M2i >>> 24)) & 0x00ff00ff) |
-	                    (((M2i << 24) | (M2i >>> 8))  & 0xff00ff00)
-	                );
-	                M2i1 = (
-	                    (((M2i1 << 8)  | (M2i1 >>> 24)) & 0x00ff00ff) |
-	                    (((M2i1 << 24) | (M2i1 >>> 8))  & 0xff00ff00)
-	                );
-
-	                // Absorb message into state
-	                var lane = state[i];
-	                lane.high ^= M2i1;
-	                lane.low  ^= M2i;
-	            }
-
-	            // Rounds
-	            for (var round = 0; round < 24; round++) {
-	                // Theta
-	                for (var x = 0; x < 5; x++) {
-	                    // Mix column lanes
-	                    var tMsw = 0, tLsw = 0;
-	                    for (var y = 0; y < 5; y++) {
-	                        var lane = state[x + 5 * y];
-	                        tMsw ^= lane.high;
-	                        tLsw ^= lane.low;
-	                    }
-
-	                    // Temporary values
-	                    var Tx = T[x];
-	                    Tx.high = tMsw;
-	                    Tx.low  = tLsw;
-	                }
-	                for (var x = 0; x < 5; x++) {
-	                    // Shortcuts
-	                    var Tx4 = T[(x + 4) % 5];
-	                    var Tx1 = T[(x + 1) % 5];
-	                    var Tx1Msw = Tx1.high;
-	                    var Tx1Lsw = Tx1.low;
-
-	                    // Mix surrounding columns
-	                    var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
-	                    var tLsw = Tx4.low  ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
-	                    for (var y = 0; y < 5; y++) {
-	                        var lane = state[x + 5 * y];
-	                        lane.high ^= tMsw;
-	                        lane.low  ^= tLsw;
-	                    }
-	                }
-
-	                // Rho Pi
-	                for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
-	                    var tMsw;
-	                    var tLsw;
-
-	                    // Shortcuts
-	                    var lane = state[laneIndex];
-	                    var laneMsw = lane.high;
-	                    var laneLsw = lane.low;
-	                    var rhoOffset = RHO_OFFSETS[laneIndex];
-
-	                    // Rotate lanes
-	                    if (rhoOffset < 32) {
-	                        tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
-	                        tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
-	                    } else /* if (rhoOffset >= 32) */ {
-	                        tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
-	                        tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
-	                    }
-
-	                    // Transpose lanes
-	                    var TPiLane = T[PI_INDEXES[laneIndex]];
-	                    TPiLane.high = tMsw;
-	                    TPiLane.low  = tLsw;
-	                }
-
-	                // Rho pi at x = y = 0
-	                var T0 = T[0];
-	                var state0 = state[0];
-	                T0.high = state0.high;
-	                T0.low  = state0.low;
-
-	                // Chi
-	                for (var x = 0; x < 5; x++) {
-	                    for (var y = 0; y < 5; y++) {
-	                        // Shortcuts
-	                        var laneIndex = x + 5 * y;
-	                        var lane = state[laneIndex];
-	                        var TLane = T[laneIndex];
-	                        var Tx1Lane = T[((x + 1) % 5) + 5 * y];
-	                        var Tx2Lane = T[((x + 2) % 5) + 5 * y];
-
-	                        // Mix rows
-	                        lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
-	                        lane.low  = TLane.low  ^ (~Tx1Lane.low  & Tx2Lane.low);
-	                    }
-	                }
-
-	                // Iota
-	                var lane = state[0];
-	                var roundConstant = ROUND_CONSTANTS[round];
-	                lane.high ^= roundConstant.high;
-	                lane.low  ^= roundConstant.low;
-	            }
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-	            var blockSizeBits = this.blockSize * 32;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
-	            dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Shortcuts
-	            var state = this._state;
-	            var outputLengthBytes = this.cfg.outputLength / 8;
-	            var outputLengthLanes = outputLengthBytes / 8;
-
-	            // Squeeze
-	            var hashWords = [];
-	            for (var i = 0; i < outputLengthLanes; i++) {
-	                // Shortcuts
-	                var lane = state[i];
-	                var laneMsw = lane.high;
-	                var laneLsw = lane.low;
-
-	                // Swap endian
-	                laneMsw = (
-	                    (((laneMsw << 8)  | (laneMsw >>> 24)) & 0x00ff00ff) |
-	                    (((laneMsw << 24) | (laneMsw >>> 8))  & 0xff00ff00)
-	                );
-	                laneLsw = (
-	                    (((laneLsw << 8)  | (laneLsw >>> 24)) & 0x00ff00ff) |
-	                    (((laneLsw << 24) | (laneLsw >>> 8))  & 0xff00ff00)
-	                );
-
-	                // Squeeze state to retrieve hash
-	                hashWords.push(laneLsw);
-	                hashWords.push(laneMsw);
-	            }
-
-	            // Return final computed hash
-	            return new WordArray.init(hashWords, outputLengthBytes);
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-
-	            var state = clone._state = this._state.slice(0);
-	            for (var i = 0; i < 25; i++) {
-	                state[i] = state[i].clone();
-	            }
-
-	            return clone;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA3('message');
-	     *     var hash = CryptoJS.SHA3(wordArray);
-	     */
-	    C.SHA3 = Hasher._createHelper(SHA3);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA3(message, key);
-	     */
-	    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
-	}(Math));
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Hasher = C_lib.Hasher;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var X64WordArray = C_x64.WordArray;
-	    var C_algo = C.algo;
-
-	    function X64Word_create() {
-	        return X64Word.create.apply(X64Word, arguments);
-	    }
-
-	    // Constants
-	    var K = [
-	        X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
-	        X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
-	        X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
-	        X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
-	        X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
-	        X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
-	        X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
-	        X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
-	        X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
-	        X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
-	        X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
-	        X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
-	        X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
-	        X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
-	        X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
-	        X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
-	        X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
-	        X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
-	        X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
-	        X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
-	        X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
-	        X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
-	        X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
-	        X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
-	        X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
-	        X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
-	        X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
-	        X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
-	        X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
-	        X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
-	        X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
-	        X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
-	        X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
-	        X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
-	        X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
-	        X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
-	        X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
-	        X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
-	        X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
-	        X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
-	    ];
-
-	    // Reusable objects
-	    var W = [];
-	    (function () {
-	        for (var i = 0; i < 80; i++) {
-	            W[i] = X64Word_create();
-	        }
-	    }());
-
-	    /**
-	     * SHA-512 hash algorithm.
-	     */
-	    var SHA512 = C_algo.SHA512 = Hasher.extend({
-	        _doReset: function () {
-	            this._hash = new X64WordArray.init([
-	                new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
-	                new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
-	                new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
-	                new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
-	            ]);
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcuts
-	            var H = this._hash.words;
-
-	            var H0 = H[0];
-	            var H1 = H[1];
-	            var H2 = H[2];
-	            var H3 = H[3];
-	            var H4 = H[4];
-	            var H5 = H[5];
-	            var H6 = H[6];
-	            var H7 = H[7];
-
-	            var H0h = H0.high;
-	            var H0l = H0.low;
-	            var H1h = H1.high;
-	            var H1l = H1.low;
-	            var H2h = H2.high;
-	            var H2l = H2.low;
-	            var H3h = H3.high;
-	            var H3l = H3.low;
-	            var H4h = H4.high;
-	            var H4l = H4.low;
-	            var H5h = H5.high;
-	            var H5l = H5.low;
-	            var H6h = H6.high;
-	            var H6l = H6.low;
-	            var H7h = H7.high;
-	            var H7l = H7.low;
-
-	            // Working variables
-	            var ah = H0h;
-	            var al = H0l;
-	            var bh = H1h;
-	            var bl = H1l;
-	            var ch = H2h;
-	            var cl = H2l;
-	            var dh = H3h;
-	            var dl = H3l;
-	            var eh = H4h;
-	            var el = H4l;
-	            var fh = H5h;
-	            var fl = H5l;
-	            var gh = H6h;
-	            var gl = H6l;
-	            var hh = H7h;
-	            var hl = H7l;
-
-	            // Rounds
-	            for (var i = 0; i < 80; i++) {
-	                var Wil;
-	                var Wih;
-
-	                // Shortcut
-	                var Wi = W[i];
-
-	                // Extend message
-	                if (i < 16) {
-	                    Wih = Wi.high = M[offset + i * 2]     | 0;
-	                    Wil = Wi.low  = M[offset + i * 2 + 1] | 0;
-	                } else {
-	                    // Gamma0
-	                    var gamma0x  = W[i - 15];
-	                    var gamma0xh = gamma0x.high;
-	                    var gamma0xl = gamma0x.low;
-	                    var gamma0h  = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
-	                    var gamma0l  = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
-
-	                    // Gamma1
-	                    var gamma1x  = W[i - 2];
-	                    var gamma1xh = gamma1x.high;
-	                    var gamma1xl = gamma1x.low;
-	                    var gamma1h  = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
-	                    var gamma1l  = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
-
-	                    // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
-	                    var Wi7  = W[i - 7];
-	                    var Wi7h = Wi7.high;
-	                    var Wi7l = Wi7.low;
-
-	                    var Wi16  = W[i - 16];
-	                    var Wi16h = Wi16.high;
-	                    var Wi16l = Wi16.low;
-
-	                    Wil = gamma0l + Wi7l;
-	                    Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
-	                    Wil = Wil + gamma1l;
-	                    Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
-	                    Wil = Wil + Wi16l;
-	                    Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
-
-	                    Wi.high = Wih;
-	                    Wi.low  = Wil;
-	                }
-
-	                var chh  = (eh & fh) ^ (~eh & gh);
-	                var chl  = (el & fl) ^ (~el & gl);
-	                var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
-	                var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
-
-	                var sigma0h = ((ah >>> 28) | (al << 4))  ^ ((ah << 30)  | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
-	                var sigma0l = ((al >>> 28) | (ah << 4))  ^ ((al << 30)  | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
-	                var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
-	                var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
-
-	                // t1 = h + sigma1 + ch + K[i] + W[i]
-	                var Ki  = K[i];
-	                var Kih = Ki.high;
-	                var Kil = Ki.low;
-
-	                var t1l = hl + sigma1l;
-	                var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
-	                var t1l = t1l + chl;
-	                var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
-	                var t1l = t1l + Kil;
-	                var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
-	                var t1l = t1l + Wil;
-	                var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
-
-	                // t2 = sigma0 + maj
-	                var t2l = sigma0l + majl;
-	                var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
-
-	                // Update working variables
-	                hh = gh;
-	                hl = gl;
-	                gh = fh;
-	                gl = fl;
-	                fh = eh;
-	                fl = el;
-	                el = (dl + t1l) | 0;
-	                eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
-	                dh = ch;
-	                dl = cl;
-	                ch = bh;
-	                cl = bl;
-	                bh = ah;
-	                bl = al;
-	                al = (t1l + t2l) | 0;
-	                ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
-	            }
-
-	            // Intermediate hash value
-	            H0l = H0.low  = (H0l + al);
-	            H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
-	            H1l = H1.low  = (H1l + bl);
-	            H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
-	            H2l = H2.low  = (H2l + cl);
-	            H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
-	            H3l = H3.low  = (H3l + dl);
-	            H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
-	            H4l = H4.low  = (H4l + el);
-	            H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
-	            H5l = H5.low  = (H5l + fl);
-	            H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
-	            H6l = H6.low  = (H6l + gl);
-	            H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
-	            H7l = H7.low  = (H7l + hl);
-	            H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
-	        },
-
-	        _doFinalize: function () {
-	            // Shortcuts
-	            var data = this._data;
-	            var dataWords = data.words;
-
-	            var nBitsTotal = this._nDataBytes * 8;
-	            var nBitsLeft = data.sigBytes * 8;
-
-	            // Add padding
-	            dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
-	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
-	            dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
-	            data.sigBytes = dataWords.length * 4;
-
-	            // Hash final blocks
-	            this._process();
-
-	            // Convert hash to 32-bit word array before returning
-	            var hash = this._hash.toX32();
-
-	            // Return final computed hash
-	            return hash;
-	        },
-
-	        clone: function () {
-	            var clone = Hasher.clone.call(this);
-	            clone._hash = this._hash.clone();
-
-	            return clone;
-	        },
-
-	        blockSize: 1024/32
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA512('message');
-	     *     var hash = CryptoJS.SHA512(wordArray);
-	     */
-	    C.SHA512 = Hasher._createHelper(SHA512);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA512(message, key);
-	     */
-	    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_x64 = C.x64;
-	    var X64Word = C_x64.Word;
-	    var X64WordArray = C_x64.WordArray;
-	    var C_algo = C.algo;
-	    var SHA512 = C_algo.SHA512;
-
-	    /**
-	     * SHA-384 hash algorithm.
-	     */
-	    var SHA384 = C_algo.SHA384 = SHA512.extend({
-	        _doReset: function () {
-	            this._hash = new X64WordArray.init([
-	                new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
-	                new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
-	                new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
-	                new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
-	            ]);
-	        },
-
-	        _doFinalize: function () {
-	            var hash = SHA512._doFinalize.call(this);
-
-	            hash.sigBytes -= 16;
-
-	            return hash;
-	        }
-	    });
-
-	    /**
-	     * Shortcut function to the hasher's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     *
-	     * @return {WordArray} The hash.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hash = CryptoJS.SHA384('message');
-	     *     var hash = CryptoJS.SHA384(wordArray);
-	     */
-	    C.SHA384 = SHA512._createHelper(SHA384);
-
-	    /**
-	     * Shortcut function to the HMAC's object interface.
-	     *
-	     * @param {WordArray|string} message The message to hash.
-	     * @param {WordArray|string} key The secret key.
-	     *
-	     * @return {WordArray} The HMAC.
-	     *
-	     * @static
-	     *
-	     * @example
-	     *
-	     *     var hmac = CryptoJS.HmacSHA384(message, key);
-	     */
-	    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
-	}());
-
-
-	/**
-	 * Cipher core components.
-	 */
-	CryptoJS.lib.Cipher || (function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var Base = C_lib.Base;
-	    var WordArray = C_lib.WordArray;
-	    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
-	    var C_enc = C.enc;
-	    var Utf8 = C_enc.Utf8;
-	    var Base64 = C_enc.Base64;
-	    var C_algo = C.algo;
-	    var EvpKDF = C_algo.EvpKDF;
-
-	    /**
-	     * Abstract base cipher template.
-	     *
-	     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
-	     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
-	     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
-	     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
-	     */
-	    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {WordArray} iv The IV to use for this operation.
-	         */
-	        cfg: Base.extend(),
-
-	        /**
-	         * Creates this cipher in encryption mode.
-	         *
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {Cipher} A cipher instance.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
-	         */
-	        createEncryptor: function (key, cfg) {
-	            return this.create(this._ENC_XFORM_MODE, key, cfg);
-	        },
-
-	        /**
-	         * Creates this cipher in decryption mode.
-	         *
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {Cipher} A cipher instance.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
-	         */
-	        createDecryptor: function (key, cfg) {
-	            return this.create(this._DEC_XFORM_MODE, key, cfg);
-	        },
-
-	        /**
-	         * Initializes a newly created cipher.
-	         *
-	         * @param {number} xformMode Either the encryption or decryption transormation mode constant.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @example
-	         *
-	         *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
-	         */
-	        init: function (xformMode, key, cfg) {
-	            // Apply config defaults
-	            this.cfg = this.cfg.extend(cfg);
-
-	            // Store transform mode and key
-	            this._xformMode = xformMode;
-	            this._key = key;
-
-	            // Set initial values
-	            this.reset();
-	        },
-
-	        /**
-	         * Resets this cipher to its initial state.
-	         *
-	         * @example
-	         *
-	         *     cipher.reset();
-	         */
-	        reset: function () {
-	            // Reset data buffer
-	            BufferedBlockAlgorithm.reset.call(this);
-
-	            // Perform concrete-cipher logic
-	            this._doReset();
-	        },
-
-	        /**
-	         * Adds data to be encrypted or decrypted.
-	         *
-	         * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
-	         *
-	         * @return {WordArray} The data after processing.
-	         *
-	         * @example
-	         *
-	         *     var encrypted = cipher.process('data');
-	         *     var encrypted = cipher.process(wordArray);
-	         */
-	        process: function (dataUpdate) {
-	            // Append
-	            this._append(dataUpdate);
-
-	            // Process available blocks
-	            return this._process();
-	        },
-
-	        /**
-	         * Finalizes the encryption or decryption process.
-	         * Note that the finalize operation is effectively a destructive, read-once operation.
-	         *
-	         * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
-	         *
-	         * @return {WordArray} The data after final processing.
-	         *
-	         * @example
-	         *
-	         *     var encrypted = cipher.finalize();
-	         *     var encrypted = cipher.finalize('data');
-	         *     var encrypted = cipher.finalize(wordArray);
-	         */
-	        finalize: function (dataUpdate) {
-	            // Final data update
-	            if (dataUpdate) {
-	                this._append(dataUpdate);
-	            }
-
-	            // Perform concrete-cipher logic
-	            var finalProcessedData = this._doFinalize();
-
-	            return finalProcessedData;
-	        },
-
-	        keySize: 128/32,
-
-	        ivSize: 128/32,
-
-	        _ENC_XFORM_MODE: 1,
-
-	        _DEC_XFORM_MODE: 2,
-
-	        /**
-	         * Creates shortcut functions to a cipher's object interface.
-	         *
-	         * @param {Cipher} cipher The cipher to create a helper for.
-	         *
-	         * @return {Object} An object with encrypt and decrypt shortcut functions.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
-	         */
-	        _createHelper: (function () {
-	            function selectCipherStrategy(key) {
-	                if (typeof key == 'string') {
-	                    return PasswordBasedCipher;
-	                } else {
-	                    return SerializableCipher;
-	                }
-	            }
-
-	            return function (cipher) {
-	                return {
-	                    encrypt: function (message, key, cfg) {
-	                        return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
-	                    },
-
-	                    decrypt: function (ciphertext, key, cfg) {
-	                        return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
-	                    }
-	                };
-	            };
-	        }())
-	    });
-
-	    /**
-	     * Abstract base stream cipher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
-	     */
-	    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
-	        _doFinalize: function () {
-	            // Process partial blocks
-	            var finalProcessedBlocks = this._process(!!'flush');
-
-	            return finalProcessedBlocks;
-	        },
-
-	        blockSize: 1
-	    });
-
-	    /**
-	     * Mode namespace.
-	     */
-	    var C_mode = C.mode = {};
-
-	    /**
-	     * Abstract base block cipher mode template.
-	     */
-	    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
-	        /**
-	         * Creates this mode for encryption.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
-	         */
-	        createEncryptor: function (cipher, iv) {
-	            return this.Encryptor.create(cipher, iv);
-	        },
-
-	        /**
-	         * Creates this mode for decryption.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
-	         */
-	        createDecryptor: function (cipher, iv) {
-	            return this.Decryptor.create(cipher, iv);
-	        },
-
-	        /**
-	         * Initializes a newly created mode.
-	         *
-	         * @param {Cipher} cipher A block cipher instance.
-	         * @param {Array} iv The IV words.
-	         *
-	         * @example
-	         *
-	         *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
-	         */
-	        init: function (cipher, iv) {
-	            this._cipher = cipher;
-	            this._iv = iv;
-	        }
-	    });
-
-	    /**
-	     * Cipher Block Chaining mode.
-	     */
-	    var CBC = C_mode.CBC = (function () {
-	        /**
-	         * Abstract base CBC mode.
-	         */
-	        var CBC = BlockCipherMode.extend();
-
-	        /**
-	         * CBC encryptor.
-	         */
-	        CBC.Encryptor = CBC.extend({
-	            /**
-	             * Processes the data block at offset.
-	             *
-	             * @param {Array} words The data words to operate on.
-	             * @param {number} offset The offset where the block starts.
-	             *
-	             * @example
-	             *
-	             *     mode.processBlock(data.words, offset);
-	             */
-	            processBlock: function (words, offset) {
-	                // Shortcuts
-	                var cipher = this._cipher;
-	                var blockSize = cipher.blockSize;
-
-	                // XOR and encrypt
-	                xorBlock.call(this, words, offset, blockSize);
-	                cipher.encryptBlock(words, offset);
-
-	                // Remember this block to use with next block
-	                this._prevBlock = words.slice(offset, offset + blockSize);
-	            }
-	        });
-
-	        /**
-	         * CBC decryptor.
-	         */
-	        CBC.Decryptor = CBC.extend({
-	            /**
-	             * Processes the data block at offset.
-	             *
-	             * @param {Array} words The data words to operate on.
-	             * @param {number} offset The offset where the block starts.
-	             *
-	             * @example
-	             *
-	             *     mode.processBlock(data.words, offset);
-	             */
-	            processBlock: function (words, offset) {
-	                // Shortcuts
-	                var cipher = this._cipher;
-	                var blockSize = cipher.blockSize;
-
-	                // Remember this block to use with next block
-	                var thisBlock = words.slice(offset, offset + blockSize);
-
-	                // Decrypt and XOR
-	                cipher.decryptBlock(words, offset);
-	                xorBlock.call(this, words, offset, blockSize);
-
-	                // This block becomes the previous block
-	                this._prevBlock = thisBlock;
-	            }
-	        });
-
-	        function xorBlock(words, offset, blockSize) {
-	            var block;
-
-	            // Shortcut
-	            var iv = this._iv;
-
-	            // Choose mixing block
-	            if (iv) {
-	                block = iv;
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            } else {
-	                block = this._prevBlock;
-	            }
-
-	            // XOR blocks
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= block[i];
-	            }
-	        }
-
-	        return CBC;
-	    }());
-
-	    /**
-	     * Padding namespace.
-	     */
-	    var C_pad = C.pad = {};
-
-	    /**
-	     * PKCS #5/7 padding strategy.
-	     */
-	    var Pkcs7 = C_pad.Pkcs7 = {
-	        /**
-	         * Pads data using the algorithm defined in PKCS #5/7.
-	         *
-	         * @param {WordArray} data The data to pad.
-	         * @param {number} blockSize The multiple that the data should be padded to.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
-	         */
-	        pad: function (data, blockSize) {
-	            // Shortcut
-	            var blockSizeBytes = blockSize * 4;
-
-	            // Count padding bytes
-	            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
-
-	            // Create padding word
-	            var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
-
-	            // Create padding
-	            var paddingWords = [];
-	            for (var i = 0; i < nPaddingBytes; i += 4) {
-	                paddingWords.push(paddingWord);
-	            }
-	            var padding = WordArray.create(paddingWords, nPaddingBytes);
-
-	            // Add padding
-	            data.concat(padding);
-	        },
-
-	        /**
-	         * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
-	         *
-	         * @param {WordArray} data The data to unpad.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     CryptoJS.pad.Pkcs7.unpad(wordArray);
-	         */
-	        unpad: function (data) {
-	            // Get number of padding bytes from last byte
-	            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	            // Remove padding
-	            data.sigBytes -= nPaddingBytes;
-	        }
-	    };
-
-	    /**
-	     * Abstract base block cipher template.
-	     *
-	     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
-	     */
-	    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {Mode} mode The block mode to use. Default: CBC
-	         * @property {Padding} padding The padding strategy to use. Default: Pkcs7
-	         */
-	        cfg: Cipher.cfg.extend({
-	            mode: CBC,
-	            padding: Pkcs7
-	        }),
-
-	        reset: function () {
-	            var modeCreator;
-
-	            // Reset cipher
-	            Cipher.reset.call(this);
-
-	            // Shortcuts
-	            var cfg = this.cfg;
-	            var iv = cfg.iv;
-	            var mode = cfg.mode;
-
-	            // Reset block mode
-	            if (this._xformMode == this._ENC_XFORM_MODE) {
-	                modeCreator = mode.createEncryptor;
-	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-	                modeCreator = mode.createDecryptor;
-	                // Keep at least one block in the buffer for unpadding
-	                this._minBufferSize = 1;
-	            }
-
-	            if (this._mode && this._mode.__creator == modeCreator) {
-	                this._mode.init(this, iv && iv.words);
-	            } else {
-	                this._mode = modeCreator.call(mode, this, iv && iv.words);
-	                this._mode.__creator = modeCreator;
-	            }
-	        },
-
-	        _doProcessBlock: function (words, offset) {
-	            this._mode.processBlock(words, offset);
-	        },
-
-	        _doFinalize: function () {
-	            var finalProcessedBlocks;
-
-	            // Shortcut
-	            var padding = this.cfg.padding;
-
-	            // Finalize
-	            if (this._xformMode == this._ENC_XFORM_MODE) {
-	                // Pad data
-	                padding.pad(this._data, this.blockSize);
-
-	                // Process final blocks
-	                finalProcessedBlocks = this._process(!!'flush');
-	            } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
-	                // Process final blocks
-	                finalProcessedBlocks = this._process(!!'flush');
-
-	                // Unpad data
-	                padding.unpad(finalProcessedBlocks);
-	            }
-
-	            return finalProcessedBlocks;
-	        },
-
-	        blockSize: 128/32
-	    });
-
-	    /**
-	     * A collection of cipher parameters.
-	     *
-	     * @property {WordArray} ciphertext The raw ciphertext.
-	     * @property {WordArray} key The key to this ciphertext.
-	     * @property {WordArray} iv The IV used in the ciphering operation.
-	     * @property {WordArray} salt The salt used with a key derivation function.
-	     * @property {Cipher} algorithm The cipher algorithm.
-	     * @property {Mode} mode The block mode used in the ciphering operation.
-	     * @property {Padding} padding The padding scheme used in the ciphering operation.
-	     * @property {number} blockSize The block size of the cipher.
-	     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
-	     */
-	    var CipherParams = C_lib.CipherParams = Base.extend({
-	        /**
-	         * Initializes a newly created cipher params object.
-	         *
-	         * @param {Object} cipherParams An object with any of the possible cipher parameters.
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.lib.CipherParams.create({
-	         *         ciphertext: ciphertextWordArray,
-	         *         key: keyWordArray,
-	         *         iv: ivWordArray,
-	         *         salt: saltWordArray,
-	         *         algorithm: CryptoJS.algo.AES,
-	         *         mode: CryptoJS.mode.CBC,
-	         *         padding: CryptoJS.pad.PKCS7,
-	         *         blockSize: 4,
-	         *         formatter: CryptoJS.format.OpenSSL
-	         *     });
-	         */
-	        init: function (cipherParams) {
-	            this.mixIn(cipherParams);
-	        },
-
-	        /**
-	         * Converts this cipher params object to a string.
-	         *
-	         * @param {Format} formatter (Optional) The formatting strategy to use.
-	         *
-	         * @return {string} The stringified cipher params.
-	         *
-	         * @throws Error If neither the formatter nor the default formatter is set.
-	         *
-	         * @example
-	         *
-	         *     var string = cipherParams + '';
-	         *     var string = cipherParams.toString();
-	         *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
-	         */
-	        toString: function (formatter) {
-	            return (formatter || this.formatter).stringify(this);
-	        }
-	    });
-
-	    /**
-	     * Format namespace.
-	     */
-	    var C_format = C.format = {};
-
-	    /**
-	     * OpenSSL formatting strategy.
-	     */
-	    var OpenSSLFormatter = C_format.OpenSSL = {
-	        /**
-	         * Converts a cipher params object to an OpenSSL-compatible string.
-	         *
-	         * @param {CipherParams} cipherParams The cipher params object.
-	         *
-	         * @return {string} The OpenSSL-compatible string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
-	         */
-	        stringify: function (cipherParams) {
-	            var wordArray;
-
-	            // Shortcuts
-	            var ciphertext = cipherParams.ciphertext;
-	            var salt = cipherParams.salt;
-
-	            // Format
-	            if (salt) {
-	                wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
-	            } else {
-	                wordArray = ciphertext;
-	            }
-
-	            return wordArray.toString(Base64);
-	        },
-
-	        /**
-	         * Converts an OpenSSL-compatible string to a cipher params object.
-	         *
-	         * @param {string} openSSLStr The OpenSSL-compatible string.
-	         *
-	         * @return {CipherParams} The cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
-	         */
-	        parse: function (openSSLStr) {
-	            var salt;
-
-	            // Parse base64
-	            var ciphertext = Base64.parse(openSSLStr);
-
-	            // Shortcut
-	            var ciphertextWords = ciphertext.words;
-
-	            // Test for salt
-	            if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
-	                // Extract salt
-	                salt = WordArray.create(ciphertextWords.slice(2, 4));
-
-	                // Remove salt from ciphertext
-	                ciphertextWords.splice(0, 4);
-	                ciphertext.sigBytes -= 16;
-	            }
-
-	            return CipherParams.create({ ciphertext: ciphertext, salt: salt });
-	        }
-	    };
-
-	    /**
-	     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
-	     */
-	    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
-	         */
-	        cfg: Base.extend({
-	            format: OpenSSLFormatter
-	        }),
-
-	        /**
-	         * Encrypts a message.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {WordArray|string} message The message to encrypt.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {CipherParams} A cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         */
-	        encrypt: function (cipher, message, key, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Encrypt
-	            var encryptor = cipher.createEncryptor(key, cfg);
-	            var ciphertext = encryptor.finalize(message);
-
-	            // Shortcut
-	            var cipherCfg = encryptor.cfg;
-
-	            // Create and return serializable cipher params
-	            return CipherParams.create({
-	                ciphertext: ciphertext,
-	                key: key,
-	                iv: cipherCfg.iv,
-	                algorithm: cipher,
-	                mode: cipherCfg.mode,
-	                padding: cipherCfg.padding,
-	                blockSize: cipher.blockSize,
-	                formatter: cfg.format
-	            });
-	        },
-
-	        /**
-	         * Decrypts serialized ciphertext.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
-	         * @param {WordArray} key The key.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {WordArray} The plaintext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
-	         */
-	        decrypt: function (cipher, ciphertext, key, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Convert string to CipherParams
-	            ciphertext = this._parse(ciphertext, cfg.format);
-
-	            // Decrypt
-	            var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
-
-	            return plaintext;
-	        },
-
-	        /**
-	         * Converts serialized ciphertext to CipherParams,
-	         * else assumed CipherParams already and returns ciphertext unchanged.
-	         *
-	         * @param {CipherParams|string} ciphertext The ciphertext.
-	         * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
-	         *
-	         * @return {CipherParams} The unserialized ciphertext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
-	         */
-	        _parse: function (ciphertext, format) {
-	            if (typeof ciphertext == 'string') {
-	                return format.parse(ciphertext, this);
-	            } else {
-	                return ciphertext;
-	            }
-	        }
-	    });
-
-	    /**
-	     * Key derivation function namespace.
-	     */
-	    var C_kdf = C.kdf = {};
-
-	    /**
-	     * OpenSSL key derivation function.
-	     */
-	    var OpenSSLKdf = C_kdf.OpenSSL = {
-	        /**
-	         * Derives a key and IV from a password.
-	         *
-	         * @param {string} password The password to derive from.
-	         * @param {number} keySize The size in words of the key to generate.
-	         * @param {number} ivSize The size in words of the IV to generate.
-	         * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
-	         *
-	         * @return {CipherParams} A cipher params object with the key, IV, and salt.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
-	         *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
-	         */
-	        execute: function (password, keySize, ivSize, salt) {
-	            // Generate random salt
-	            if (!salt) {
-	                salt = WordArray.random(64/8);
-	            }
-
-	            // Derive key and IV
-	            var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
-
-	            // Separate key and IV
-	            var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
-	            key.sigBytes = keySize * 4;
-
-	            // Return params
-	            return CipherParams.create({ key: key, iv: iv, salt: salt });
-	        }
-	    };
-
-	    /**
-	     * A serializable cipher wrapper that derives the key from a password,
-	     * and returns ciphertext as a serializable cipher params object.
-	     */
-	    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
-	         */
-	        cfg: SerializableCipher.cfg.extend({
-	            kdf: OpenSSLKdf
-	        }),
-
-	        /**
-	         * Encrypts a message using a password.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {WordArray|string} message The message to encrypt.
-	         * @param {string} password The password.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {CipherParams} A cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
-	         *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
-	         */
-	        encrypt: function (cipher, message, password, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Derive key and other params
-	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize);
-
-	            // Add IV to config
-	            cfg.iv = derivedParams.iv;
-
-	            // Encrypt
-	            var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
-
-	            // Mix in derived params
-	            ciphertext.mixIn(derivedParams);
-
-	            return ciphertext;
-	        },
-
-	        /**
-	         * Decrypts serialized ciphertext using a password.
-	         *
-	         * @param {Cipher} cipher The cipher algorithm to use.
-	         * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
-	         * @param {string} password The password.
-	         * @param {Object} cfg (Optional) The configuration options to use for this operation.
-	         *
-	         * @return {WordArray} The plaintext.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
-	         *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
-	         */
-	        decrypt: function (cipher, ciphertext, password, cfg) {
-	            // Apply config defaults
-	            cfg = this.cfg.extend(cfg);
-
-	            // Convert string to CipherParams
-	            ciphertext = this._parse(ciphertext, cfg.format);
-
-	            // Derive key and other params
-	            var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt);
-
-	            // Add IV to config
-	            cfg.iv = derivedParams.iv;
-
-	            // Decrypt
-	            var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
-
-	            return plaintext;
-	        }
-	    });
-	}());
-
-
-	/**
-	 * Cipher Feedback block mode.
-	 */
-	CryptoJS.mode.CFB = (function () {
-	    var CFB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    CFB.Encryptor = CFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher;
-	            var blockSize = cipher.blockSize;
-
-	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
-
-	            // Remember this block to use with next block
-	            this._prevBlock = words.slice(offset, offset + blockSize);
-	        }
-	    });
-
-	    CFB.Decryptor = CFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher;
-	            var blockSize = cipher.blockSize;
-
-	            // Remember this block to use with next block
-	            var thisBlock = words.slice(offset, offset + blockSize);
-
-	            generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
-
-	            // This block becomes the previous block
-	            this._prevBlock = thisBlock;
-	        }
-	    });
-
-	    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
-	        var keystream;
-
-	        // Shortcut
-	        var iv = this._iv;
-
-	        // Generate keystream
-	        if (iv) {
-	            keystream = iv.slice(0);
-
-	            // Remove IV for subsequent blocks
-	            this._iv = undefined;
-	        } else {
-	            keystream = this._prevBlock;
-	        }
-	        cipher.encryptBlock(keystream, 0);
-
-	        // Encrypt
-	        for (var i = 0; i < blockSize; i++) {
-	            words[offset + i] ^= keystream[i];
-	        }
-	    }
-
-	    return CFB;
-	}());
-
-
-	/**
-	 * Electronic Codebook block mode.
-	 */
-	CryptoJS.mode.ECB = (function () {
-	    var ECB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    ECB.Encryptor = ECB.extend({
-	        processBlock: function (words, offset) {
-	            this._cipher.encryptBlock(words, offset);
-	        }
-	    });
-
-	    ECB.Decryptor = ECB.extend({
-	        processBlock: function (words, offset) {
-	            this._cipher.decryptBlock(words, offset);
-	        }
-	    });
-
-	    return ECB;
-	}());
-
-
-	/**
-	 * ANSI X.923 padding strategy.
-	 */
-	CryptoJS.pad.AnsiX923 = {
-	    pad: function (data, blockSize) {
-	        // Shortcuts
-	        var dataSigBytes = data.sigBytes;
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Count padding bytes
-	        var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
-
-	        // Compute last byte position
-	        var lastBytePos = dataSigBytes + nPaddingBytes - 1;
-
-	        // Pad
-	        data.clamp();
-	        data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
-	        data.sigBytes += nPaddingBytes;
-	    },
-
-	    unpad: function (data) {
-	        // Get number of padding bytes from last byte
-	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	        // Remove padding
-	        data.sigBytes -= nPaddingBytes;
-	    }
-	};
-
-
-	/**
-	 * ISO 10126 padding strategy.
-	 */
-	CryptoJS.pad.Iso10126 = {
-	    pad: function (data, blockSize) {
-	        // Shortcut
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Count padding bytes
-	        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
-
-	        // Pad
-	        data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
-	             concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
-	    },
-
-	    unpad: function (data) {
-	        // Get number of padding bytes from last byte
-	        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
-
-	        // Remove padding
-	        data.sigBytes -= nPaddingBytes;
-	    }
-	};
-
-
-	/**
-	 * ISO/IEC 9797-1 Padding Method 2.
-	 */
-	CryptoJS.pad.Iso97971 = {
-	    pad: function (data, blockSize) {
-	        // Add 0x80 byte
-	        data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
-
-	        // Zero pad the rest
-	        CryptoJS.pad.ZeroPadding.pad(data, blockSize);
-	    },
-
-	    unpad: function (data) {
-	        // Remove zero padding
-	        CryptoJS.pad.ZeroPadding.unpad(data);
-
-	        // Remove one more byte -- the 0x80 byte
-	        data.sigBytes--;
-	    }
-	};
-
-
-	/**
-	 * Output Feedback block mode.
-	 */
-	CryptoJS.mode.OFB = (function () {
-	    var OFB = CryptoJS.lib.BlockCipherMode.extend();
-
-	    var Encryptor = OFB.Encryptor = OFB.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var keystream = this._keystream;
-
-	            // Generate keystream
-	            if (iv) {
-	                keystream = this._keystream = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    OFB.Decryptor = Encryptor;
-
-	    return OFB;
-	}());
-
-
-	/**
-	 * A noop padding strategy.
-	 */
-	CryptoJS.pad.NoPadding = {
-	    pad: function () {
-	    },
-
-	    unpad: function () {
-	    }
-	};
-
-
-	(function (undefined) {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var CipherParams = C_lib.CipherParams;
-	    var C_enc = C.enc;
-	    var Hex = C_enc.Hex;
-	    var C_format = C.format;
-
-	    var HexFormatter = C_format.Hex = {
-	        /**
-	         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
-	         *
-	         * @param {CipherParams} cipherParams The cipher params object.
-	         *
-	         * @return {string} The hexadecimally encoded string.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
-	         */
-	        stringify: function (cipherParams) {
-	            return cipherParams.ciphertext.toString(Hex);
-	        },
-
-	        /**
-	         * Converts a hexadecimally encoded ciphertext string to a cipher params object.
-	         *
-	         * @param {string} input The hexadecimally encoded string.
-	         *
-	         * @return {CipherParams} The cipher params object.
-	         *
-	         * @static
-	         *
-	         * @example
-	         *
-	         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
-	         */
-	        parse: function (input) {
-	            var ciphertext = Hex.parse(input);
-	            return CipherParams.create({ ciphertext: ciphertext });
-	        }
-	    };
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    // Lookup tables
-	    var SBOX = [];
-	    var INV_SBOX = [];
-	    var SUB_MIX_0 = [];
-	    var SUB_MIX_1 = [];
-	    var SUB_MIX_2 = [];
-	    var SUB_MIX_3 = [];
-	    var INV_SUB_MIX_0 = [];
-	    var INV_SUB_MIX_1 = [];
-	    var INV_SUB_MIX_2 = [];
-	    var INV_SUB_MIX_3 = [];
-
-	    // Compute lookup tables
-	    (function () {
-	        // Compute double table
-	        var d = [];
-	        for (var i = 0; i < 256; i++) {
-	            if (i < 128) {
-	                d[i] = i << 1;
-	            } else {
-	                d[i] = (i << 1) ^ 0x11b;
-	            }
-	        }
-
-	        // Walk GF(2^8)
-	        var x = 0;
-	        var xi = 0;
-	        for (var i = 0; i < 256; i++) {
-	            // Compute sbox
-	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
-	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
-	            SBOX[x] = sx;
-	            INV_SBOX[sx] = x;
-
-	            // Compute multiplication
-	            var x2 = d[x];
-	            var x4 = d[x2];
-	            var x8 = d[x4];
-
-	            // Compute sub bytes, mix columns tables
-	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
-	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
-	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
-	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
-	            SUB_MIX_3[x] = t;
-
-	            // Compute inv sub bytes, inv mix columns tables
-	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
-	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
-	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
-	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
-	            INV_SUB_MIX_3[sx] = t;
-
-	            // Compute next counter
-	            if (!x) {
-	                x = xi = 1;
-	            } else {
-	                x = x2 ^ d[d[d[x8 ^ x2]]];
-	                xi ^= d[d[xi]];
-	            }
-	        }
-	    }());
-
-	    // Precomputed Rcon lookup
-	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-
-	    /**
-	     * AES block cipher algorithm.
-	     */
-	    var AES = C_algo.AES = BlockCipher.extend({
-	        _doReset: function () {
-	            var t;
-
-	            // Skip reset of nRounds has been set before and key did not change
-	            if (this._nRounds && this._keyPriorReset === this._key) {
-	                return;
-	            }
-
-	            // Shortcuts
-	            var key = this._keyPriorReset = this._key;
-	            var keyWords = key.words;
-	            var keySize = key.sigBytes / 4;
-
-	            // Compute number of rounds
-	            var nRounds = this._nRounds = keySize + 6;
-
-	            // Compute number of key schedule rows
-	            var ksRows = (nRounds + 1) * 4;
-
-	            // Compute key schedule
-	            var keySchedule = this._keySchedule = [];
-	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
-	                if (ksRow < keySize) {
-	                    keySchedule[ksRow] = keyWords[ksRow];
-	                } else {
-	                    t = keySchedule[ksRow - 1];
-
-	                    if (!(ksRow % keySize)) {
-	                        // Rot word
-	                        t = (t << 8) | (t >>> 24);
-
-	                        // Sub word
-	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
-
-	                        // Mix Rcon
-	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
-	                    } else if (keySize > 6 && ksRow % keySize == 4) {
-	                        // Sub word
-	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
-	                    }
-
-	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
-	                }
-	            }
-
-	            // Compute inv key schedule
-	            var invKeySchedule = this._invKeySchedule = [];
-	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
-	                var ksRow = ksRows - invKsRow;
-
-	                if (invKsRow % 4) {
-	                    var t = keySchedule[ksRow];
-	                } else {
-	                    var t = keySchedule[ksRow - 4];
-	                }
-
-	                if (invKsRow < 4 || ksRow <= 4) {
-	                    invKeySchedule[invKsRow] = t;
-	                } else {
-	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
-	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
-	                }
-	            }
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            // Swap 2nd and 4th rows
-	            var t = M[offset + 1];
-	            M[offset + 1] = M[offset + 3];
-	            M[offset + 3] = t;
-
-	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
-
-	            // Inv swap 2nd and 4th rows
-	            var t = M[offset + 1];
-	            M[offset + 1] = M[offset + 3];
-	            M[offset + 3] = t;
-	        },
-
-	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
-	            // Shortcut
-	            var nRounds = this._nRounds;
-
-	            // Get input, add round key
-	            var s0 = M[offset]     ^ keySchedule[0];
-	            var s1 = M[offset + 1] ^ keySchedule[1];
-	            var s2 = M[offset + 2] ^ keySchedule[2];
-	            var s3 = M[offset + 3] ^ keySchedule[3];
-
-	            // Key schedule row counter
-	            var ksRow = 4;
-
-	            // Rounds
-	            for (var round = 1; round < nRounds; round++) {
-	                // Shift rows, sub bytes, mix columns, add round key
-	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
-	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
-	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
-	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
-
-	                // Update state
-	                s0 = t0;
-	                s1 = t1;
-	                s2 = t2;
-	                s3 = t3;
-	            }
-
-	            // Shift rows, sub bytes, add round key
-	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
-	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
-	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
-	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
-
-	            // Set output
-	            M[offset]     = t0;
-	            M[offset + 1] = t1;
-	            M[offset + 2] = t2;
-	            M[offset + 3] = t3;
-	        },
-
-	        keySize: 256/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.AES = BlockCipher._createHelper(AES);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var WordArray = C_lib.WordArray;
-	    var BlockCipher = C_lib.BlockCipher;
-	    var C_algo = C.algo;
-
-	    // Permuted Choice 1 constants
-	    var PC1 = [
-	        57, 49, 41, 33, 25, 17, 9,  1,
-	        58, 50, 42, 34, 26, 18, 10, 2,
-	        59, 51, 43, 35, 27, 19, 11, 3,
-	        60, 52, 44, 36, 63, 55, 47, 39,
-	        31, 23, 15, 7,  62, 54, 46, 38,
-	        30, 22, 14, 6,  61, 53, 45, 37,
-	        29, 21, 13, 5,  28, 20, 12, 4
-	    ];
-
-	    // Permuted Choice 2 constants
-	    var PC2 = [
-	        14, 17, 11, 24, 1,  5,
-	        3,  28, 15, 6,  21, 10,
-	        23, 19, 12, 4,  26, 8,
-	        16, 7,  27, 20, 13, 2,
-	        41, 52, 31, 37, 47, 55,
-	        30, 40, 51, 45, 33, 48,
-	        44, 49, 39, 56, 34, 53,
-	        46, 42, 50, 36, 29, 32
-	    ];
-
-	    // Cumulative bit shift constants
-	    var BIT_SHIFTS = [1,  2,  4,  6,  8,  10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
-
-	    // SBOXes and round permutation constants
-	    var SBOX_P = [
-	        {
-	            0x0: 0x808200,
-	            0x10000000: 0x8000,
-	            0x20000000: 0x808002,
-	            0x30000000: 0x2,
-	            0x40000000: 0x200,
-	            0x50000000: 0x808202,
-	            0x60000000: 0x800202,
-	            0x70000000: 0x800000,
-	            0x80000000: 0x202,
-	            0x90000000: 0x800200,
-	            0xa0000000: 0x8200,
-	            0xb0000000: 0x808000,
-	            0xc0000000: 0x8002,
-	            0xd0000000: 0x800002,
-	            0xe0000000: 0x0,
-	            0xf0000000: 0x8202,
-	            0x8000000: 0x0,
-	            0x18000000: 0x808202,
-	            0x28000000: 0x8202,
-	            0x38000000: 0x8000,
-	            0x48000000: 0x808200,
-	            0x58000000: 0x200,
-	            0x68000000: 0x808002,
-	            0x78000000: 0x2,
-	            0x88000000: 0x800200,
-	            0x98000000: 0x8200,
-	            0xa8000000: 0x808000,
-	            0xb8000000: 0x800202,
-	            0xc8000000: 0x800002,
-	            0xd8000000: 0x8002,
-	            0xe8000000: 0x202,
-	            0xf8000000: 0x800000,
-	            0x1: 0x8000,
-	            0x10000001: 0x2,
-	            0x20000001: 0x808200,
-	            0x30000001: 0x800000,
-	            0x40000001: 0x808002,
-	            0x50000001: 0x8200,
-	            0x60000001: 0x200,
-	            0x70000001: 0x800202,
-	            0x80000001: 0x808202,
-	            0x90000001: 0x808000,
-	            0xa0000001: 0x800002,
-	            0xb0000001: 0x8202,
-	            0xc0000001: 0x202,
-	            0xd0000001: 0x800200,
-	            0xe0000001: 0x8002,
-	            0xf0000001: 0x0,
-	            0x8000001: 0x808202,
-	            0x18000001: 0x808000,
-	            0x28000001: 0x800000,
-	            0x38000001: 0x200,
-	            0x48000001: 0x8000,
-	            0x58000001: 0x800002,
-	            0x68000001: 0x2,
-	            0x78000001: 0x8202,
-	            0x88000001: 0x8002,
-	            0x98000001: 0x800202,
-	            0xa8000001: 0x202,
-	            0xb8000001: 0x808200,
-	            0xc8000001: 0x800200,
-	            0xd8000001: 0x0,
-	            0xe8000001: 0x8200,
-	            0xf8000001: 0x808002
-	        },
-	        {
-	            0x0: 0x40084010,
-	            0x1000000: 0x4000,
-	            0x2000000: 0x80000,
-	            0x3000000: 0x40080010,
-	            0x4000000: 0x40000010,
-	            0x5000000: 0x40084000,
-	            0x6000000: 0x40004000,
-	            0x7000000: 0x10,
-	            0x8000000: 0x84000,
-	            0x9000000: 0x40004010,
-	            0xa000000: 0x40000000,
-	            0xb000000: 0x84010,
-	            0xc000000: 0x80010,
-	            0xd000000: 0x0,
-	            0xe000000: 0x4010,
-	            0xf000000: 0x40080000,
-	            0x800000: 0x40004000,
-	            0x1800000: 0x84010,
-	            0x2800000: 0x10,
-	            0x3800000: 0x40004010,
-	            0x4800000: 0x40084010,
-	            0x5800000: 0x40000000,
-	            0x6800000: 0x80000,
-	            0x7800000: 0x40080010,
-	            0x8800000: 0x80010,
-	            0x9800000: 0x0,
-	            0xa800000: 0x4000,
-	            0xb800000: 0x40080000,
-	            0xc800000: 0x40000010,
-	            0xd800000: 0x84000,
-	            0xe800000: 0x40084000,
-	            0xf800000: 0x4010,
-	            0x10000000: 0x0,
-	            0x11000000: 0x40080010,
-	            0x12000000: 0x40004010,
-	            0x13000000: 0x40084000,
-	            0x14000000: 0x40080000,
-	            0x15000000: 0x10,
-	            0x16000000: 0x84010,
-	            0x17000000: 0x4000,
-	            0x18000000: 0x4010,
-	            0x19000000: 0x80000,
-	            0x1a000000: 0x80010,
-	            0x1b000000: 0x40000010,
-	            0x1c000000: 0x84000,
-	            0x1d000000: 0x40004000,
-	            0x1e000000: 0x40000000,
-	            0x1f000000: 0x40084010,
-	            0x10800000: 0x84010,
-	            0x11800000: 0x80000,
-	            0x12800000: 0x40080000,
-	            0x13800000: 0x4000,
-	            0x14800000: 0x40004000,
-	            0x15800000: 0x40084010,
-	            0x16800000: 0x10,
-	            0x17800000: 0x40000000,
-	            0x18800000: 0x40084000,
-	            0x19800000: 0x40000010,
-	            0x1a800000: 0x40004010,
-	            0x1b800000: 0x80010,
-	            0x1c800000: 0x0,
-	            0x1d800000: 0x4010,
-	            0x1e800000: 0x40080010,
-	            0x1f800000: 0x84000
-	        },
-	        {
-	            0x0: 0x104,
-	            0x100000: 0x0,
-	            0x200000: 0x4000100,
-	            0x300000: 0x10104,
-	            0x400000: 0x10004,
-	            0x500000: 0x4000004,
-	            0x600000: 0x4010104,
-	            0x700000: 0x4010000,
-	            0x800000: 0x4000000,
-	            0x900000: 0x4010100,
-	            0xa00000: 0x10100,
-	            0xb00000: 0x4010004,
-	            0xc00000: 0x4000104,
-	            0xd00000: 0x10000,
-	            0xe00000: 0x4,
-	            0xf00000: 0x100,
-	            0x80000: 0x4010100,
-	            0x180000: 0x4010004,
-	            0x280000: 0x0,
-	            0x380000: 0x4000100,
-	            0x480000: 0x4000004,
-	            0x580000: 0x10000,
-	            0x680000: 0x10004,
-	            0x780000: 0x104,
-	            0x880000: 0x4,
-	            0x980000: 0x100,
-	            0xa80000: 0x4010000,
-	            0xb80000: 0x10104,
-	            0xc80000: 0x10100,
-	            0xd80000: 0x4000104,
-	            0xe80000: 0x4010104,
-	            0xf80000: 0x4000000,
-	            0x1000000: 0x4010100,
-	            0x1100000: 0x10004,
-	            0x1200000: 0x10000,
-	            0x1300000: 0x4000100,
-	            0x1400000: 0x100,
-	            0x1500000: 0x4010104,
-	            0x1600000: 0x4000004,
-	            0x1700000: 0x0,
-	            0x1800000: 0x4000104,
-	            0x1900000: 0x4000000,
-	            0x1a00000: 0x4,
-	            0x1b00000: 0x10100,
-	            0x1c00000: 0x4010000,
-	            0x1d00000: 0x104,
-	            0x1e00000: 0x10104,
-	            0x1f00000: 0x4010004,
-	            0x1080000: 0x4000000,
-	            0x1180000: 0x104,
-	            0x1280000: 0x4010100,
-	            0x1380000: 0x0,
-	            0x1480000: 0x10004,
-	            0x1580000: 0x4000100,
-	            0x1680000: 0x100,
-	            0x1780000: 0x4010004,
-	            0x1880000: 0x10000,
-	            0x1980000: 0x4010104,
-	            0x1a80000: 0x10104,
-	            0x1b80000: 0x4000004,
-	            0x1c80000: 0x4000104,
-	            0x1d80000: 0x4010000,
-	            0x1e80000: 0x4,
-	            0x1f80000: 0x10100
-	        },
-	        {
-	            0x0: 0x80401000,
-	            0x10000: 0x80001040,
-	            0x20000: 0x401040,
-	            0x30000: 0x80400000,
-	            0x40000: 0x0,
-	            0x50000: 0x401000,
-	            0x60000: 0x80000040,
-	            0x70000: 0x400040,
-	            0x80000: 0x80000000,
-	            0x90000: 0x400000,
-	            0xa0000: 0x40,
-	            0xb0000: 0x80001000,
-	            0xc0000: 0x80400040,
-	            0xd0000: 0x1040,
-	            0xe0000: 0x1000,
-	            0xf0000: 0x80401040,
-	            0x8000: 0x80001040,
-	            0x18000: 0x40,
-	            0x28000: 0x80400040,
-	            0x38000: 0x80001000,
-	            0x48000: 0x401000,
-	            0x58000: 0x80401040,
-	            0x68000: 0x0,
-	            0x78000: 0x80400000,
-	            0x88000: 0x1000,
-	            0x98000: 0x80401000,
-	            0xa8000: 0x400000,
-	            0xb8000: 0x1040,
-	            0xc8000: 0x80000000,
-	            0xd8000: 0x400040,
-	            0xe8000: 0x401040,
-	            0xf8000: 0x80000040,
-	            0x100000: 0x400040,
-	            0x110000: 0x401000,
-	            0x120000: 0x80000040,
-	            0x130000: 0x0,
-	            0x140000: 0x1040,
-	            0x150000: 0x80400040,
-	            0x160000: 0x80401000,
-	            0x170000: 0x80001040,
-	            0x180000: 0x80401040,
-	            0x190000: 0x80000000,
-	            0x1a0000: 0x80400000,
-	            0x1b0000: 0x401040,
-	            0x1c0000: 0x80001000,
-	            0x1d0000: 0x400000,
-	            0x1e0000: 0x40,
-	            0x1f0000: 0x1000,
-	            0x108000: 0x80400000,
-	            0x118000: 0x80401040,
-	            0x128000: 0x0,
-	            0x138000: 0x401000,
-	            0x148000: 0x400040,
-	            0x158000: 0x80000000,
-	            0x168000: 0x80001040,
-	            0x178000: 0x40,
-	            0x188000: 0x80000040,
-	            0x198000: 0x1000,
-	            0x1a8000: 0x80001000,
-	            0x1b8000: 0x80400040,
-	            0x1c8000: 0x1040,
-	            0x1d8000: 0x80401000,
-	            0x1e8000: 0x400000,
-	            0x1f8000: 0x401040
-	        },
-	        {
-	            0x0: 0x80,
-	            0x1000: 0x1040000,
-	            0x2000: 0x40000,
-	            0x3000: 0x20000000,
-	            0x4000: 0x20040080,
-	            0x5000: 0x1000080,
-	            0x6000: 0x21000080,
-	            0x7000: 0x40080,
-	            0x8000: 0x1000000,
-	            0x9000: 0x20040000,
-	            0xa000: 0x20000080,
-	            0xb000: 0x21040080,
-	            0xc000: 0x21040000,
-	            0xd000: 0x0,
-	            0xe000: 0x1040080,
-	            0xf000: 0x21000000,
-	            0x800: 0x1040080,
-	            0x1800: 0x21000080,
-	            0x2800: 0x80,
-	            0x3800: 0x1040000,
-	            0x4800: 0x40000,
-	            0x5800: 0x20040080,
-	            0x6800: 0x21040000,
-	            0x7800: 0x20000000,
-	            0x8800: 0x20040000,
-	            0x9800: 0x0,
-	            0xa800: 0x21040080,
-	            0xb800: 0x1000080,
-	            0xc800: 0x20000080,
-	            0xd800: 0x21000000,
-	            0xe800: 0x1000000,
-	            0xf800: 0x40080,
-	            0x10000: 0x40000,
-	            0x11000: 0x80,
-	            0x12000: 0x20000000,
-	            0x13000: 0x21000080,
-	            0x14000: 0x1000080,
-	            0x15000: 0x21040000,
-	            0x16000: 0x20040080,
-	            0x17000: 0x1000000,
-	            0x18000: 0x21040080,
-	            0x19000: 0x21000000,
-	            0x1a000: 0x1040000,
-	            0x1b000: 0x20040000,
-	            0x1c000: 0x40080,
-	            0x1d000: 0x20000080,
-	            0x1e000: 0x0,
-	            0x1f000: 0x1040080,
-	            0x10800: 0x21000080,
-	            0x11800: 0x1000000,
-	            0x12800: 0x1040000,
-	            0x13800: 0x20040080,
-	            0x14800: 0x20000000,
-	            0x15800: 0x1040080,
-	            0x16800: 0x80,
-	            0x17800: 0x21040000,
-	            0x18800: 0x40080,
-	            0x19800: 0x21040080,
-	            0x1a800: 0x0,
-	            0x1b800: 0x21000000,
-	            0x1c800: 0x1000080,
-	            0x1d800: 0x40000,
-	            0x1e800: 0x20040000,
-	            0x1f800: 0x20000080
-	        },
-	        {
-	            0x0: 0x10000008,
-	            0x100: 0x2000,
-	            0x200: 0x10200000,
-	            0x300: 0x10202008,
-	            0x400: 0x10002000,
-	            0x500: 0x200000,
-	            0x600: 0x200008,
-	            0x700: 0x10000000,
-	            0x800: 0x0,
-	            0x900: 0x10002008,
-	            0xa00: 0x202000,
-	            0xb00: 0x8,
-	            0xc00: 0x10200008,
-	            0xd00: 0x202008,
-	            0xe00: 0x2008,
-	            0xf00: 0x10202000,
-	            0x80: 0x10200000,
-	            0x180: 0x10202008,
-	            0x280: 0x8,
-	            0x380: 0x200000,
-	            0x480: 0x202008,
-	            0x580: 0x10000008,
-	            0x680: 0x10002000,
-	            0x780: 0x2008,
-	            0x880: 0x200008,
-	            0x980: 0x2000,
-	            0xa80: 0x10002008,
-	            0xb80: 0x10200008,
-	            0xc80: 0x0,
-	            0xd80: 0x10202000,
-	            0xe80: 0x202000,
-	            0xf80: 0x10000000,
-	            0x1000: 0x10002000,
-	            0x1100: 0x10200008,
-	            0x1200: 0x10202008,
-	            0x1300: 0x2008,
-	            0x1400: 0x200000,
-	            0x1500: 0x10000000,
-	            0x1600: 0x10000008,
-	            0x1700: 0x202000,
-	            0x1800: 0x202008,
-	            0x1900: 0x0,
-	            0x1a00: 0x8,
-	            0x1b00: 0x10200000,
-	            0x1c00: 0x2000,
-	            0x1d00: 0x10002008,
-	            0x1e00: 0x10202000,
-	            0x1f00: 0x200008,
-	            0x1080: 0x8,
-	            0x1180: 0x202000,
-	            0x1280: 0x200000,
-	            0x1380: 0x10000008,
-	            0x1480: 0x10002000,
-	            0x1580: 0x2008,
-	            0x1680: 0x10202008,
-	            0x1780: 0x10200000,
-	            0x1880: 0x10202000,
-	            0x1980: 0x10200008,
-	            0x1a80: 0x2000,
-	            0x1b80: 0x202008,
-	            0x1c80: 0x200008,
-	            0x1d80: 0x0,
-	            0x1e80: 0x10000000,
-	            0x1f80: 0x10002008
-	        },
-	        {
-	            0x0: 0x100000,
-	            0x10: 0x2000401,
-	            0x20: 0x400,
-	            0x30: 0x100401,
-	            0x40: 0x2100401,
-	            0x50: 0x0,
-	            0x60: 0x1,
-	            0x70: 0x2100001,
-	            0x80: 0x2000400,
-	            0x90: 0x100001,
-	            0xa0: 0x2000001,
-	            0xb0: 0x2100400,
-	            0xc0: 0x2100000,
-	            0xd0: 0x401,
-	            0xe0: 0x100400,
-	            0xf0: 0x2000000,
-	            0x8: 0x2100001,
-	            0x18: 0x0,
-	            0x28: 0x2000401,
-	            0x38: 0x2100400,
-	            0x48: 0x100000,
-	            0x58: 0x2000001,
-	            0x68: 0x2000000,
-	            0x78: 0x401,
-	            0x88: 0x100401,
-	            0x98: 0x2000400,
-	            0xa8: 0x2100000,
-	            0xb8: 0x100001,
-	            0xc8: 0x400,
-	            0xd8: 0x2100401,
-	            0xe8: 0x1,
-	            0xf8: 0x100400,
-	            0x100: 0x2000000,
-	            0x110: 0x100000,
-	            0x120: 0x2000401,
-	            0x130: 0x2100001,
-	            0x140: 0x100001,
-	            0x150: 0x2000400,
-	            0x160: 0x2100400,
-	            0x170: 0x100401,
-	            0x180: 0x401,
-	            0x190: 0x2100401,
-	            0x1a0: 0x100400,
-	            0x1b0: 0x1,
-	            0x1c0: 0x0,
-	            0x1d0: 0x2100000,
-	            0x1e0: 0x2000001,
-	            0x1f0: 0x400,
-	            0x108: 0x100400,
-	            0x118: 0x2000401,
-	            0x128: 0x2100001,
-	            0x138: 0x1,
-	            0x148: 0x2000000,
-	            0x158: 0x100000,
-	            0x168: 0x401,
-	            0x178: 0x2100400,
-	            0x188: 0x2000001,
-	            0x198: 0x2100000,
-	            0x1a8: 0x0,
-	            0x1b8: 0x2100401,
-	            0x1c8: 0x100401,
-	            0x1d8: 0x400,
-	            0x1e8: 0x2000400,
-	            0x1f8: 0x100001
-	        },
-	        {
-	            0x0: 0x8000820,
-	            0x1: 0x20000,
-	            0x2: 0x8000000,
-	            0x3: 0x20,
-	            0x4: 0x20020,
-	            0x5: 0x8020820,
-	            0x6: 0x8020800,
-	            0x7: 0x800,
-	            0x8: 0x8020000,
-	            0x9: 0x8000800,
-	            0xa: 0x20800,
-	            0xb: 0x8020020,
-	            0xc: 0x820,
-	            0xd: 0x0,
-	            0xe: 0x8000020,
-	            0xf: 0x20820,
-	            0x80000000: 0x800,
-	            0x80000001: 0x8020820,
-	            0x80000002: 0x8000820,
-	            0x80000003: 0x8000000,
-	            0x80000004: 0x8020000,
-	            0x80000005: 0x20800,
-	            0x80000006: 0x20820,
-	            0x80000007: 0x20,
-	            0x80000008: 0x8000020,
-	            0x80000009: 0x820,
-	            0x8000000a: 0x20020,
-	            0x8000000b: 0x8020800,
-	            0x8000000c: 0x0,
-	            0x8000000d: 0x8020020,
-	            0x8000000e: 0x8000800,
-	            0x8000000f: 0x20000,
-	            0x10: 0x20820,
-	            0x11: 0x8020800,
-	            0x12: 0x20,
-	            0x13: 0x800,
-	            0x14: 0x8000800,
-	            0x15: 0x8000020,
-	            0x16: 0x8020020,
-	            0x17: 0x20000,
-	            0x18: 0x0,
-	            0x19: 0x20020,
-	            0x1a: 0x8020000,
-	            0x1b: 0x8000820,
-	            0x1c: 0x8020820,
-	            0x1d: 0x20800,
-	            0x1e: 0x820,
-	            0x1f: 0x8000000,
-	            0x80000010: 0x20000,
-	            0x80000011: 0x800,
-	            0x80000012: 0x8020020,
-	            0x80000013: 0x20820,
-	            0x80000014: 0x20,
-	            0x80000015: 0x8020000,
-	            0x80000016: 0x8000000,
-	            0x80000017: 0x8000820,
-	            0x80000018: 0x8020820,
-	            0x80000019: 0x8000020,
-	            0x8000001a: 0x8000800,
-	            0x8000001b: 0x0,
-	            0x8000001c: 0x20800,
-	            0x8000001d: 0x820,
-	            0x8000001e: 0x20020,
-	            0x8000001f: 0x8020800
-	        }
-	    ];
-
-	    // Masks that select the SBOX input
-	    var SBOX_MASK = [
-	        0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
-	        0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
-	    ];
-
-	    /**
-	     * DES block cipher algorithm.
-	     */
-	    var DES = C_algo.DES = BlockCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-
-	            // Select 56 bits according to PC1
-	            var keyBits = [];
-	            for (var i = 0; i < 56; i++) {
-	                var keyBitPos = PC1[i] - 1;
-	                keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
-	            }
-
-	            // Assemble 16 subkeys
-	            var subKeys = this._subKeys = [];
-	            for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
-	                // Create subkey
-	                var subKey = subKeys[nSubKey] = [];
-
-	                // Shortcut
-	                var bitShift = BIT_SHIFTS[nSubKey];
-
-	                // Select 48 bits according to PC2
-	                for (var i = 0; i < 24; i++) {
-	                    // Select from the left 28 key bits
-	                    subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
-
-	                    // Select from the right 28 key bits
-	                    subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
-	                }
-
-	                // Since each subkey is applied to an expanded 32-bit input,
-	                // the subkey can be broken into 8 values scaled to 32-bits,
-	                // which allows the key to be used without expansion
-	                subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
-	                for (var i = 1; i < 7; i++) {
-	                    subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
-	                }
-	                subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
-	            }
-
-	            // Compute inverse subkeys
-	            var invSubKeys = this._invSubKeys = [];
-	            for (var i = 0; i < 16; i++) {
-	                invSubKeys[i] = subKeys[15 - i];
-	            }
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._subKeys);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            this._doCryptBlock(M, offset, this._invSubKeys);
-	        },
-
-	        _doCryptBlock: function (M, offset, subKeys) {
-	            // Get input
-	            this._lBlock = M[offset];
-	            this._rBlock = M[offset + 1];
-
-	            // Initial permutation
-	            exchangeLR.call(this, 4,  0x0f0f0f0f);
-	            exchangeLR.call(this, 16, 0x0000ffff);
-	            exchangeRL.call(this, 2,  0x33333333);
-	            exchangeRL.call(this, 8,  0x00ff00ff);
-	            exchangeLR.call(this, 1,  0x55555555);
-
-	            // Rounds
-	            for (var round = 0; round < 16; round++) {
-	                // Shortcuts
-	                var subKey = subKeys[round];
-	                var lBlock = this._lBlock;
-	                var rBlock = this._rBlock;
-
-	                // Feistel function
-	                var f = 0;
-	                for (var i = 0; i < 8; i++) {
-	                    f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
-	                }
-	                this._lBlock = rBlock;
-	                this._rBlock = lBlock ^ f;
-	            }
-
-	            // Undo swap from last round
-	            var t = this._lBlock;
-	            this._lBlock = this._rBlock;
-	            this._rBlock = t;
-
-	            // Final permutation
-	            exchangeLR.call(this, 1,  0x55555555);
-	            exchangeRL.call(this, 8,  0x00ff00ff);
-	            exchangeRL.call(this, 2,  0x33333333);
-	            exchangeLR.call(this, 16, 0x0000ffff);
-	            exchangeLR.call(this, 4,  0x0f0f0f0f);
-
-	            // Set output
-	            M[offset] = this._lBlock;
-	            M[offset + 1] = this._rBlock;
-	        },
-
-	        keySize: 64/32,
-
-	        ivSize: 64/32,
-
-	        blockSize: 64/32
-	    });
-
-	    // Swap bits across the left and right words
-	    function exchangeLR(offset, mask) {
-	        var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
-	        this._rBlock ^= t;
-	        this._lBlock ^= t << offset;
-	    }
-
-	    function exchangeRL(offset, mask) {
-	        var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
-	        this._lBlock ^= t;
-	        this._rBlock ^= t << offset;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.DES = BlockCipher._createHelper(DES);
-
-	    /**
-	     * Triple-DES block cipher algorithm.
-	     */
-	    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-	            // Make sure the key length is valid (64, 128 or >= 192 bit)
-	            if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
-	                throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
-	            }
-
-	            // Extend the key according to the keying options defined in 3DES standard
-	            var key1 = keyWords.slice(0, 2);
-	            var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
-	            var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
-
-	            // Create DES instances
-	            this._des1 = DES.createEncryptor(WordArray.create(key1));
-	            this._des2 = DES.createEncryptor(WordArray.create(key2));
-	            this._des3 = DES.createEncryptor(WordArray.create(key3));
-	        },
-
-	        encryptBlock: function (M, offset) {
-	            this._des1.encryptBlock(M, offset);
-	            this._des2.decryptBlock(M, offset);
-	            this._des3.encryptBlock(M, offset);
-	        },
-
-	        decryptBlock: function (M, offset) {
-	            this._des3.decryptBlock(M, offset);
-	            this._des2.encryptBlock(M, offset);
-	            this._des1.decryptBlock(M, offset);
-	        },
-
-	        keySize: 192/32,
-
-	        ivSize: 64/32,
-
-	        blockSize: 64/32
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
-	     */
-	    C.TripleDES = BlockCipher._createHelper(TripleDES);
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    /**
-	     * RC4 stream cipher algorithm.
-	     */
-	    var RC4 = C_algo.RC4 = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var key = this._key;
-	            var keyWords = key.words;
-	            var keySigBytes = key.sigBytes;
-
-	            // Init sbox
-	            var S = this._S = [];
-	            for (var i = 0; i < 256; i++) {
-	                S[i] = i;
-	            }
-
-	            // Key setup
-	            for (var i = 0, j = 0; i < 256; i++) {
-	                var keyByteIndex = i % keySigBytes;
-	                var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
-
-	                j = (j + S[i] + keyByte) % 256;
-
-	                // Swap
-	                var t = S[i];
-	                S[i] = S[j];
-	                S[j] = t;
-	            }
-
-	            // Counters
-	            this._i = this._j = 0;
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            M[offset] ^= generateKeystreamWord.call(this);
-	        },
-
-	        keySize: 256/32,
-
-	        ivSize: 0
-	    });
-
-	    function generateKeystreamWord() {
-	        // Shortcuts
-	        var S = this._S;
-	        var i = this._i;
-	        var j = this._j;
-
-	        // Generate keystream word
-	        var keystreamWord = 0;
-	        for (var n = 0; n < 4; n++) {
-	            i = (i + 1) % 256;
-	            j = (j + S[i]) % 256;
-
-	            // Swap
-	            var t = S[i];
-	            S[i] = S[j];
-	            S[j] = t;
-
-	            keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
-	        }
-
-	        // Update counters
-	        this._i = i;
-	        this._j = j;
-
-	        return keystreamWord;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RC4 = StreamCipher._createHelper(RC4);
-
-	    /**
-	     * Modified RC4 stream cipher algorithm.
-	     */
-	    var RC4Drop = C_algo.RC4Drop = RC4.extend({
-	        /**
-	         * Configuration options.
-	         *
-	         * @property {number} drop The number of keystream words to drop. Default 192
-	         */
-	        cfg: RC4.cfg.extend({
-	            drop: 192
-	        }),
-
-	        _doReset: function () {
-	            RC4._doReset.call(this);
-
-	            // Drop
-	            for (var i = this.cfg.drop; i > 0; i--) {
-	                generateKeystreamWord.call(this);
-	            }
-	        }
-	    });
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
-	}());
-
-
-	/** @preserve
-	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
-	 * derived from CryptoJS.mode.CTR
-	 * Jan Hruby jhruby.web@gmail.com
-	 */
-	CryptoJS.mode.CTRGladman = (function () {
-	    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
-
-		function incWord(word)
-		{
-			if (((word >> 24) & 0xff) === 0xff) { //overflow
-			var b1 = (word >> 16)&0xff;
-			var b2 = (word >> 8)&0xff;
-			var b3 = word & 0xff;
-
-			if (b1 === 0xff) // overflow b1
-			{
-			b1 = 0;
-			if (b2 === 0xff)
-			{
-				b2 = 0;
-				if (b3 === 0xff)
-				{
-					b3 = 0;
-				}
-				else
-				{
-					++b3;
-				}
-			}
-			else
-			{
-				++b2;
-			}
-			}
-			else
-			{
-			++b1;
-			}
-
-			word = 0;
-			word += (b1 << 16);
-			word += (b2 << 8);
-			word += b3;
-			}
-			else
-			{
-			word += (0x01 << 24);
-			}
-			return word;
-		}
-
-		function incCounter(counter)
-		{
-			if ((counter[0] = incWord(counter[0])) === 0)
-			{
-				// encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
-				counter[1] = incWord(counter[1]);
-			}
-			return counter;
-		}
-
-	    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var counter = this._counter;
-
-	            // Generate keystream
-	            if (iv) {
-	                counter = this._counter = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-
-				incCounter(counter);
-
-				var keystream = counter.slice(0);
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    CTRGladman.Decryptor = Encryptor;
-
-	    return CTRGladman;
-	}());
-
-
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    // Reusable objects
-	    var S  = [];
-	    var C_ = [];
-	    var G  = [];
-
-	    /**
-	     * Rabbit stream cipher algorithm
-	     */
-	    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var K = this._key.words;
-	            var iv = this.cfg.iv;
-
-	            // Swap endian
-	            for (var i = 0; i < 4; i++) {
-	                K[i] = (((K[i] << 8)  | (K[i] >>> 24)) & 0x00ff00ff) |
-	                       (((K[i] << 24) | (K[i] >>> 8))  & 0xff00ff00);
-	            }
-
-	            // Generate initial state values
-	            var X = this._X = [
-	                K[0], (K[3] << 16) | (K[2] >>> 16),
-	                K[1], (K[0] << 16) | (K[3] >>> 16),
-	                K[2], (K[1] << 16) | (K[0] >>> 16),
-	                K[3], (K[2] << 16) | (K[1] >>> 16)
-	            ];
-
-	            // Generate initial counter values
-	            var C = this._C = [
-	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
-	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
-	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
-	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-	            ];
-
-	            // Carry bit
-	            this._b = 0;
-
-	            // Iterate the system four times
-	            for (var i = 0; i < 4; i++) {
-	                nextState.call(this);
-	            }
-
-	            // Modify the counters
-	            for (var i = 0; i < 8; i++) {
-	                C[i] ^= X[(i + 4) & 7];
-	            }
-
-	            // IV setup
-	            if (iv) {
-	                // Shortcuts
-	                var IV = iv.words;
-	                var IV_0 = IV[0];
-	                var IV_1 = IV[1];
-
-	                // Generate four subvectors
-	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
-
-	                // Modify counter values
-	                C[0] ^= i0;
-	                C[1] ^= i1;
-	                C[2] ^= i2;
-	                C[3] ^= i3;
-	                C[4] ^= i0;
-	                C[5] ^= i1;
-	                C[6] ^= i2;
-	                C[7] ^= i3;
-
-	                // Iterate the system four times
-	                for (var i = 0; i < 4; i++) {
-	                    nextState.call(this);
-	                }
-	            }
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var X = this._X;
-
-	            // Iterate the system
-	            nextState.call(this);
-
-	            // Generate four keystream words
-	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
-
-	            for (var i = 0; i < 4; i++) {
-	                // Swap endian
-	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
-
-	                // Encrypt
-	                M[offset + i] ^= S[i];
-	            }
-	        },
-
-	        blockSize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    function nextState() {
-	        // Shortcuts
-	        var X = this._X;
-	        var C = this._C;
-
-	        // Save old counter values
-	        for (var i = 0; i < 8; i++) {
-	            C_[i] = C[i];
-	        }
-
-	        // Calculate new counter values
-	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
-
-	        // Calculate the g-values
-	        for (var i = 0; i < 8; i++) {
-	            var gx = X[i] + C[i];
-
-	            // Construct high and low argument for squaring
-	            var ga = gx & 0xffff;
-	            var gb = gx >>> 16;
-
-	            // Calculate high and low result of squaring
-	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
-
-	            // High XOR low
-	            G[i] = gh ^ gl;
-	        }
-
-	        // Calculate new state values
-	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
-	     */
-	    C.Rabbit = StreamCipher._createHelper(Rabbit);
-	}());
-
-
-	/**
-	 * Counter block mode.
-	 */
-	CryptoJS.mode.CTR = (function () {
-	    var CTR = CryptoJS.lib.BlockCipherMode.extend();
-
-	    var Encryptor = CTR.Encryptor = CTR.extend({
-	        processBlock: function (words, offset) {
-	            // Shortcuts
-	            var cipher = this._cipher
-	            var blockSize = cipher.blockSize;
-	            var iv = this._iv;
-	            var counter = this._counter;
-
-	            // Generate keystream
-	            if (iv) {
-	                counter = this._counter = iv.slice(0);
-
-	                // Remove IV for subsequent blocks
-	                this._iv = undefined;
-	            }
-	            var keystream = counter.slice(0);
-	            cipher.encryptBlock(keystream, 0);
-
-	            // Increment counter
-	            counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
-
-	            // Encrypt
-	            for (var i = 0; i < blockSize; i++) {
-	                words[offset + i] ^= keystream[i];
-	            }
-	        }
-	    });
-
-	    CTR.Decryptor = Encryptor;
-
-	    return CTR;
-	}());
-
-
-	(function () {
-	    // Shortcuts
-	    var C = CryptoJS;
-	    var C_lib = C.lib;
-	    var StreamCipher = C_lib.StreamCipher;
-	    var C_algo = C.algo;
-
-	    // Reusable objects
-	    var S  = [];
-	    var C_ = [];
-	    var G  = [];
-
-	    /**
-	     * Rabbit stream cipher algorithm.
-	     *
-	     * This is a legacy version that neglected to convert the key to little-endian.
-	     * This error doesn't affect the cipher's security,
-	     * but it does affect its compatibility with other implementations.
-	     */
-	    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
-	        _doReset: function () {
-	            // Shortcuts
-	            var K = this._key.words;
-	            var iv = this.cfg.iv;
-
-	            // Generate initial state values
-	            var X = this._X = [
-	                K[0], (K[3] << 16) | (K[2] >>> 16),
-	                K[1], (K[0] << 16) | (K[3] >>> 16),
-	                K[2], (K[1] << 16) | (K[0] >>> 16),
-	                K[3], (K[2] << 16) | (K[1] >>> 16)
-	            ];
-
-	            // Generate initial counter values
-	            var C = this._C = [
-	                (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
-	                (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
-	                (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
-	                (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
-	            ];
-
-	            // Carry bit
-	            this._b = 0;
-
-	            // Iterate the system four times
-	            for (var i = 0; i < 4; i++) {
-	                nextState.call(this);
-	            }
-
-	            // Modify the counters
-	            for (var i = 0; i < 8; i++) {
-	                C[i] ^= X[(i + 4) & 7];
-	            }
-
-	            // IV setup
-	            if (iv) {
-	                // Shortcuts
-	                var IV = iv.words;
-	                var IV_0 = IV[0];
-	                var IV_1 = IV[1];
-
-	                // Generate four subvectors
-	                var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
-	                var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
-	                var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
-	                var i3 = (i2 << 16)  | (i0 & 0x0000ffff);
-
-	                // Modify counter values
-	                C[0] ^= i0;
-	                C[1] ^= i1;
-	                C[2] ^= i2;
-	                C[3] ^= i3;
-	                C[4] ^= i0;
-	                C[5] ^= i1;
-	                C[6] ^= i2;
-	                C[7] ^= i3;
-
-	                // Iterate the system four times
-	                for (var i = 0; i < 4; i++) {
-	                    nextState.call(this);
-	                }
-	            }
-	        },
-
-	        _doProcessBlock: function (M, offset) {
-	            // Shortcut
-	            var X = this._X;
-
-	            // Iterate the system
-	            nextState.call(this);
-
-	            // Generate four keystream words
-	            S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
-	            S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
-	            S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
-	            S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
-
-	            for (var i = 0; i < 4; i++) {
-	                // Swap endian
-	                S[i] = (((S[i] << 8)  | (S[i] >>> 24)) & 0x00ff00ff) |
-	                       (((S[i] << 24) | (S[i] >>> 8))  & 0xff00ff00);
-
-	                // Encrypt
-	                M[offset + i] ^= S[i];
-	            }
-	        },
-
-	        blockSize: 128/32,
-
-	        ivSize: 64/32
-	    });
-
-	    function nextState() {
-	        // Shortcuts
-	        var X = this._X;
-	        var C = this._C;
-
-	        // Save old counter values
-	        for (var i = 0; i < 8; i++) {
-	            C_[i] = C[i];
-	        }
-
-	        // Calculate new counter values
-	        C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
-	        C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
-	        C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
-	        C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
-	        C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
-	        C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
-	        C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
-	        C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
-	        this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
-
-	        // Calculate the g-values
-	        for (var i = 0; i < 8; i++) {
-	            var gx = X[i] + C[i];
-
-	            // Construct high and low argument for squaring
-	            var ga = gx & 0xffff;
-	            var gb = gx >>> 16;
-
-	            // Calculate high and low result of squaring
-	            var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
-	            var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
-
-	            // High XOR low
-	            G[i] = gh ^ gl;
-	        }
-
-	        // Calculate new state values
-	        X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
-	        X[1] = (G[1] + ((G[0] << 8)  | (G[0] >>> 24)) + G[7]) | 0;
-	        X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
-	        X[3] = (G[3] + ((G[2] << 8)  | (G[2] >>> 24)) + G[1]) | 0;
-	        X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
-	        X[5] = (G[5] + ((G[4] << 8)  | (G[4] >>> 24)) + G[3]) | 0;
-	        X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
-	        X[7] = (G[7] + ((G[6] << 8)  | (G[6] >>> 24)) + G[5]) | 0;
-	    }
-
-	    /**
-	     * Shortcut functions to the cipher's object interface.
-	     *
-	     * @example
-	     *
-	     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
-	     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
-	     */
-	    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
-	}());
-
-
-	/**
-	 * Zero padding strategy.
-	 */
-	CryptoJS.pad.ZeroPadding = {
-	    pad: function (data, blockSize) {
-	        // Shortcut
-	        var blockSizeBytes = blockSize * 4;
-
-	        // Pad
-	        data.clamp();
-	        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
-	    },
-
-	    unpad: function (data) {
-	        // Shortcut
-	        var dataWords = data.words;
-
-	        // Unpad
-	        var i = data.sigBytes - 1;
-	        for (var i = data.sigBytes - 1; i >= 0; i--) {
-	            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-	                data.sigBytes = i + 1;
-	                break;
-	            }
-	        }
-	    }
-	};
-
-
-	return CryptoJS;
-
-}));
\ No newline at end of file
+    var create = Object.create || (function () {
+      function F() {
+      }
+
+      return function (obj) {
+        var subtype;
+
+        F.prototype = obj;
+
+        subtype = new F();
+
+        F.prototype = null;
+
+        return subtype;
+      };
+    }())
+
+    /**
+     * CryptoJS namespace.
+     */
+    var C = {};
+
+    /**
+     * Library namespace.
+     */
+    var C_lib = C.lib = {};
+
+    /**
+     * Base object for prototypal inheritance.
+     */
+    var Base = C_lib.Base = (function () {
+
+
+      return {
+        /**
+         * Creates a new object that inherits from this object.
+         *
+         * @param {Object} overrides Properties to copy into the new object.
+         *
+         * @return {Object} The new object.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var MyType = CryptoJS.lib.Base.extend({
+         *         field: 'value',
+         *
+         *         method: function () {
+         *         }
+         *     });
+         */
+        extend: function (overrides) {
+          // Spawn
+          var subtype = create(this);
+
+          // Augment
+          if (overrides) {
+            subtype.mixIn(overrides);
+          }
+
+          // Create default initializer
+          if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+            subtype.init = function () {
+              subtype.$super.init.apply(this, arguments);
+            };
+          }
+
+          // Initializer's prototype is the subtype object
+          subtype.init.prototype = subtype;
+
+          // Reference supertype
+          subtype.$super = this;
+
+          return subtype;
+        },
+
+        /**
+         * Extends this object and runs the init method.
+         * Arguments to create() will be passed to init().
+         *
+         * @return {Object} The new object.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var instance = MyType.create();
+         */
+        create: function () {
+          var instance = this.extend();
+          instance.init.apply(instance, arguments);
+
+          return instance;
+        },
+
+        /**
+         * Initializes a newly created object.
+         * Override this method to add some logic when your objects are created.
+         *
+         * @example
+         *
+         *     var MyType = CryptoJS.lib.Base.extend({
+         *         init: function () {
+         *             // ...
+         *         }
+         *     });
+         */
+        init: function () {
+        },
+
+        /**
+         * Copies properties into this object.
+         *
+         * @param {Object} properties The properties to mix in.
+         *
+         * @example
+         *
+         *     MyType.mixIn({
+         *         field: 'value'
+         *     });
+         */
+        mixIn: function (properties) {
+          for (var propertyName in properties) {
+            if (properties.hasOwnProperty(propertyName)) {
+              this[propertyName] = properties[propertyName];
+            }
+          }
+
+          // IE won't copy toString using the loop above
+          if (properties.hasOwnProperty('toString')) {
+            this.toString = properties.toString;
+          }
+        },
+
+        /**
+         * Creates a copy of this object.
+         *
+         * @return {Object} The clone.
+         *
+         * @example
+         *
+         *     var clone = instance.clone();
+         */
+        clone: function () {
+          return this.init.prototype.extend(this);
+        }
+      };
+    }());
+
+    /**
+     * An array of 32-bit words.
+     *
+     * @property {Array} words The array of 32-bit words.
+     * @property {number} sigBytes The number of significant bytes in this word array.
+     */
+    var WordArray = C_lib.WordArray = Base.extend({
+      /**
+       * Initializes a newly created word array.
+       *
+       * @param {Array} words (Optional) An array of 32-bit words.
+       * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.lib.WordArray.create();
+       *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+       *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+       */
+      init: function (words, sigBytes) {
+        words = this.words = words || [];
+
+        if (sigBytes != undefined) {
+          this.sigBytes = sigBytes;
+        } else {
+          this.sigBytes = words.length * 4;
+        }
+      },
+
+      /**
+       * Converts this word array to a string.
+       *
+       * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+       *
+       * @return {string} The stringified word array.
+       *
+       * @example
+       *
+       *     var string = wordArray + '';
+       *     var string = wordArray.toString();
+       *     var string = wordArray.toString(CryptoJS.enc.Utf8);
+       */
+      toString: function (encoder) {
+        return (encoder || Hex).stringify(this);
+      },
+
+      /**
+       * Concatenates a word array to this word array.
+       *
+       * @param {WordArray} wordArray The word array to append.
+       *
+       * @return {WordArray} This word array.
+       *
+       * @example
+       *
+       *     wordArray1.concat(wordArray2);
+       */
+      concat: function (wordArray) {
+        // Shortcuts
+        var thisWords = this.words;
+        var thatWords = wordArray.words;
+        var thisSigBytes = this.sigBytes;
+        var thatSigBytes = wordArray.sigBytes;
+
+        // Clamp excess bits
+        this.clamp();
+
+        // Concat
+        if (thisSigBytes % 4) {
+          // Copy one byte at a time
+          for (var i = 0; i < thatSigBytes; i++) {
+            var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+            thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+          }
+        } else {
+          // Copy one word at a time
+          for (var i = 0; i < thatSigBytes; i += 4) {
+            thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];
+          }
+        }
+        this.sigBytes += thatSigBytes;
+
+        // Chainable
+        return this;
+      },
+
+      /**
+       * Removes insignificant bits.
+       *
+       * @example
+       *
+       *     wordArray.clamp();
+       */
+      clamp: function () {
+        // Shortcuts
+        var words = this.words;
+        var sigBytes = this.sigBytes;
+
+        // Clamp
+        words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+        words.length = Math.ceil(sigBytes / 4);
+      },
+
+      /**
+       * Creates a copy of this word array.
+       *
+       * @return {WordArray} The clone.
+       *
+       * @example
+       *
+       *     var clone = wordArray.clone();
+       */
+      clone: function () {
+        var clone = Base.clone.call(this);
+        clone.words = this.words.slice(0);
+
+        return clone;
+      },
+
+      /**
+       * Creates a word array filled with random bytes.
+       *
+       * @param {number} nBytes The number of random bytes to generate.
+       *
+       * @return {WordArray} The random word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.lib.WordArray.random(16);
+       */
+      random: function (nBytes) {
+        var words = [];
+
+        for (var i = 0; i < nBytes; i += 4) {
+          words.push(cryptoSecureRandomInt());
+        }
+
+        return new WordArray.init(words, nBytes);
+      }
+    });
+
+    /**
+     * Encoder namespace.
+     */
+    var C_enc = C.enc = {};
+
+    /**
+     * Hex encoding strategy.
+     */
+    var Hex = C_enc.Hex = {
+      /**
+       * Converts a word array to a hex string.
+       *
+       * @param {WordArray} wordArray The word array.
+       *
+       * @return {string} The hex string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+       */
+      stringify: function (wordArray) {
+        // Shortcuts
+        var words = wordArray.words;
+        var sigBytes = wordArray.sigBytes;
+
+        // Convert
+        var hexChars = [];
+        for (var i = 0; i < sigBytes; i++) {
+          var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+          hexChars.push((bite >>> 4).toString(16));
+          hexChars.push((bite & 0x0f).toString(16));
+        }
+
+        return hexChars.join('');
+      },
+
+      /**
+       * Converts a hex string to a word array.
+       *
+       * @param {string} hexStr The hex string.
+       *
+       * @return {WordArray} The word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
+       */
+      parse: function (hexStr) {
+        // Shortcut
+        var hexStrLength = hexStr.length;
+
+        // Convert
+        var words = [];
+        for (var i = 0; i < hexStrLength; i += 2) {
+          words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+        }
+
+        return new WordArray.init(words, hexStrLength / 2);
+      }
+    };
+
+    /**
+     * Latin1 encoding strategy.
+     */
+    var Latin1 = C_enc.Latin1 = {
+      /**
+       * Converts a word array to a Latin1 string.
+       *
+       * @param {WordArray} wordArray The word array.
+       *
+       * @return {string} The Latin1 string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+       */
+      stringify: function (wordArray) {
+        // Shortcuts
+        var words = wordArray.words;
+        var sigBytes = wordArray.sigBytes;
+
+        // Convert
+        var latin1Chars = [];
+        for (var i = 0; i < sigBytes; i++) {
+          var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+          latin1Chars.push(String.fromCharCode(bite));
+        }
+
+        return latin1Chars.join('');
+      },
+
+      /**
+       * Converts a Latin1 string to a word array.
+       *
+       * @param {string} latin1Str The Latin1 string.
+       *
+       * @return {WordArray} The word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+       */
+      parse: function (latin1Str) {
+        // Shortcut
+        var latin1StrLength = latin1Str.length;
+
+        // Convert
+        var words = [];
+        for (var i = 0; i < latin1StrLength; i++) {
+          words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+        }
+
+        return new WordArray.init(words, latin1StrLength);
+      }
+    };
+
+    /**
+     * UTF-8 encoding strategy.
+     */
+    var Utf8 = C_enc.Utf8 = {
+      /**
+       * Converts a word array to a UTF-8 string.
+       *
+       * @param {WordArray} wordArray The word array.
+       *
+       * @return {string} The UTF-8 string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+       */
+      stringify: function (wordArray) {
+        try {
+          return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+        } catch (e) {
+          throw new Error('Malformed UTF-8 data');
+        }
+      },
+
+      /**
+       * Converts a UTF-8 string to a word array.
+       *
+       * @param {string} utf8Str The UTF-8 string.
+       *
+       * @return {WordArray} The word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+       */
+      parse: function (utf8Str) {
+        return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+      }
+    };
+
+    /**
+     * Abstract buffered block algorithm template.
+     *
+     * The property blockSize must be implemented in a concrete subtype.
+     *
+     * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+     */
+    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+      /**
+       * Resets this block algorithm's data buffer to its initial state.
+       *
+       * @example
+       *
+       *     bufferedBlockAlgorithm.reset();
+       */
+      reset: function () {
+        // Initial values
+        this._data = new WordArray.init();
+        this._nDataBytes = 0;
+      },
+
+      /**
+       * Adds new data to this block algorithm's buffer.
+       *
+       * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+       *
+       * @example
+       *
+       *     bufferedBlockAlgorithm._append('data');
+       *     bufferedBlockAlgorithm._append(wordArray);
+       */
+      _append: function (data) {
+        // Convert string to WordArray, else assume WordArray already
+        if (typeof data == 'string') {
+          data = Utf8.parse(data);
+        }
+
+        // Append
+        this._data.concat(data);
+        this._nDataBytes += data.sigBytes;
+      },
+
+      /**
+       * Processes available data blocks.
+       *
+       * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+       *
+       * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+       *
+       * @return {WordArray} The processed data.
+       *
+       * @example
+       *
+       *     var processedData = bufferedBlockAlgorithm._process();
+       *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
+       */
+      _process: function (doFlush) {
+        var processedWords;
+
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+        var dataSigBytes = data.sigBytes;
+        var blockSize = this.blockSize;
+        var blockSizeBytes = blockSize * 4;
+
+        // Count blocks ready
+        var nBlocksReady = dataSigBytes / blockSizeBytes;
+        if (doFlush) {
+          // Round up to include partial blocks
+          nBlocksReady = Math.ceil(nBlocksReady);
+        } else {
+          // Round down to include only full blocks,
+          // less the number of blocks that must remain in the buffer
+          nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+        }
+
+        // Count words ready
+        var nWordsReady = nBlocksReady * blockSize;
+
+        // Count bytes ready
+        var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+        // Process blocks
+        if (nWordsReady) {
+          for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+            // Perform concrete-algorithm logic
+            this._doProcessBlock(dataWords, offset);
+          }
+
+          // Remove processed words
+          processedWords = dataWords.splice(0, nWordsReady);
+          data.sigBytes -= nBytesReady;
+        }
+
+        // Return processed words
+        return new WordArray.init(processedWords, nBytesReady);
+      },
+
+      /**
+       * Creates a copy of this object.
+       *
+       * @return {Object} The clone.
+       *
+       * @example
+       *
+       *     var clone = bufferedBlockAlgorithm.clone();
+       */
+      clone: function () {
+        var clone = Base.clone.call(this);
+        clone._data = this._data.clone();
+
+        return clone;
+      },
+
+      _minBufferSize: 0
+    });
+
+    /**
+     * Abstract hasher template.
+     *
+     * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+     */
+    var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+      /**
+       * Configuration options.
+       */
+      cfg: Base.extend(),
+
+      /**
+       * Initializes a newly created hasher.
+       *
+       * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+       *
+       * @example
+       *
+       *     var hasher = CryptoJS.algo.SHA256.create();
+       */
+      init: function (cfg) {
+        // Apply config defaults
+        this.cfg = this.cfg.extend(cfg);
+
+        // Set initial values
+        this.reset();
+      },
+
+      /**
+       * Resets this hasher to its initial state.
+       *
+       * @example
+       *
+       *     hasher.reset();
+       */
+      reset: function () {
+        // Reset data buffer
+        BufferedBlockAlgorithm.reset.call(this);
+
+        // Perform concrete-hasher logic
+        this._doReset();
+      },
+
+      /**
+       * Updates this hasher with a message.
+       *
+       * @param {WordArray|string} messageUpdate The message to append.
+       *
+       * @return {Hasher} This hasher.
+       *
+       * @example
+       *
+       *     hasher.update('message');
+       *     hasher.update(wordArray);
+       */
+      update: function (messageUpdate) {
+        // Append
+        this._append(messageUpdate);
+
+        // Update the hash
+        this._process();
+
+        // Chainable
+        return this;
+      },
+
+      /**
+       * Finalizes the hash computation.
+       * Note that the finalize operation is effectively a destructive, read-once operation.
+       *
+       * @param {WordArray|string} messageUpdate (Optional) A final message update.
+       *
+       * @return {WordArray} The hash.
+       *
+       * @example
+       *
+       *     var hash = hasher.finalize();
+       *     var hash = hasher.finalize('message');
+       *     var hash = hasher.finalize(wordArray);
+       */
+      finalize: function (messageUpdate) {
+        // Final message update
+        if (messageUpdate) {
+          this._append(messageUpdate);
+        }
+
+        // Perform concrete-hasher logic
+        var hash = this._doFinalize();
+
+        return hash;
+      },
+
+      blockSize: 512 / 32,
+
+      /**
+       * Creates a shortcut function to a hasher's object interface.
+       *
+       * @param {Hasher} hasher The hasher to create a helper for.
+       *
+       * @return {Function} The shortcut function.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+       */
+      _createHelper: function (hasher) {
+        return function (message, cfg) {
+          return new hasher.init(cfg).finalize(message);
+        };
+      },
+
+      /**
+       * Creates a shortcut function to the HMAC's object interface.
+       *
+       * @param {Hasher} hasher The hasher to use in this HMAC helper.
+       *
+       * @return {Function} The shortcut function.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+       */
+      _createHmacHelper: function (hasher) {
+        return function (message, key) {
+          return new C_algo.HMAC.init(hasher, key).finalize(message);
+        };
+      }
+    });
+
+    /**
+     * Algorithm namespace.
+     */
+    var C_algo = C.algo = {};
+
+    return C;
+  }(Math));
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var C_enc = C.enc;
+
+    /**
+     * Base64 encoding strategy.
+     */
+    var Base64 = C_enc.Base64 = {
+      /**
+       * Converts a word array to a Base64 string.
+       *
+       * @param {WordArray} wordArray The word array.
+       *
+       * @return {string} The Base64 string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+       */
+      stringify: function (wordArray) {
+        // Shortcuts
+        var words = wordArray.words;
+        var sigBytes = wordArray.sigBytes;
+        var map = this._map;
+
+        // Clamp excess bits
+        wordArray.clamp();
+
+        // Convert
+        var base64Chars = [];
+        for (var i = 0; i < sigBytes; i += 3) {
+          var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+          var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+          var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+          var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+          for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+            base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+          }
+        }
+
+        // Add padding
+        var paddingChar = map.charAt(64);
+        if (paddingChar) {
+          while (base64Chars.length % 4) {
+            base64Chars.push(paddingChar);
+          }
+        }
+
+        return base64Chars.join('');
+      },
+
+      /**
+       * Converts a Base64 string to a word array.
+       *
+       * @param {string} base64Str The Base64 string.
+       *
+       * @return {WordArray} The word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
+       */
+      parse: function (base64Str) {
+        // Shortcuts
+        var base64StrLength = base64Str.length;
+        var map = this._map;
+        var reverseMap = this._reverseMap;
+
+        if (!reverseMap) {
+          reverseMap = this._reverseMap = [];
+          for (var j = 0; j < map.length; j++) {
+            reverseMap[map.charCodeAt(j)] = j;
+          }
+        }
+
+        // Ignore padding
+        var paddingChar = map.charAt(64);
+        if (paddingChar) {
+          var paddingIndex = base64Str.indexOf(paddingChar);
+          if (paddingIndex !== -1) {
+            base64StrLength = paddingIndex;
+          }
+        }
+
+        // Convert
+        return parseLoop(base64Str, base64StrLength, reverseMap);
+
+      },
+
+      _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+    };
+
+    function parseLoop(base64Str, base64StrLength, reverseMap) {
+      var words = [];
+      var nBytes = 0;
+      for (var i = 0; i < base64StrLength; i++) {
+        if (i % 4) {
+          var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+          var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+          var bitsCombined = bits1 | bits2;
+          words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+          nBytes++;
+        }
+      }
+      return WordArray.create(words, nBytes);
+    }
+  }());
+
+
+  (function (Math) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var Hasher = C_lib.Hasher;
+    var C_algo = C.algo;
+
+    // Constants table
+    var T = [];
+
+    // Compute constants
+    (function () {
+      for (var i = 0; i < 64; i++) {
+        T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+      }
+    }());
+
+    /**
+     * MD5 hash algorithm.
+     */
+    var MD5 = C_algo.MD5 = Hasher.extend({
+      _doReset: function () {
+        this._hash = new WordArray.init([
+          0x67452301, 0xefcdab89,
+          0x98badcfe, 0x10325476
+        ]);
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Swap endian
+        for (var i = 0; i < 16; i++) {
+          // Shortcuts
+          var offset_i = offset + i;
+          var M_offset_i = M[offset_i];
+
+          M[offset_i] = (
+              (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+              (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+          );
+        }
+
+        // Shortcuts
+        var H = this._hash.words;
+
+        var M_offset_0 = M[offset + 0];
+        var M_offset_1 = M[offset + 1];
+        var M_offset_2 = M[offset + 2];
+        var M_offset_3 = M[offset + 3];
+        var M_offset_4 = M[offset + 4];
+        var M_offset_5 = M[offset + 5];
+        var M_offset_6 = M[offset + 6];
+        var M_offset_7 = M[offset + 7];
+        var M_offset_8 = M[offset + 8];
+        var M_offset_9 = M[offset + 9];
+        var M_offset_10 = M[offset + 10];
+        var M_offset_11 = M[offset + 11];
+        var M_offset_12 = M[offset + 12];
+        var M_offset_13 = M[offset + 13];
+        var M_offset_14 = M[offset + 14];
+        var M_offset_15 = M[offset + 15];
+
+        // Working varialbes
+        var a = H[0];
+        var b = H[1];
+        var c = H[2];
+        var d = H[3];
+
+        // Computation
+        a = FF(a, b, c, d, M_offset_0, 7, T[0]);
+        d = FF(d, a, b, c, M_offset_1, 12, T[1]);
+        c = FF(c, d, a, b, M_offset_2, 17, T[2]);
+        b = FF(b, c, d, a, M_offset_3, 22, T[3]);
+        a = FF(a, b, c, d, M_offset_4, 7, T[4]);
+        d = FF(d, a, b, c, M_offset_5, 12, T[5]);
+        c = FF(c, d, a, b, M_offset_6, 17, T[6]);
+        b = FF(b, c, d, a, M_offset_7, 22, T[7]);
+        a = FF(a, b, c, d, M_offset_8, 7, T[8]);
+        d = FF(d, a, b, c, M_offset_9, 12, T[9]);
+        c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+        b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+        a = FF(a, b, c, d, M_offset_12, 7, T[12]);
+        d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+        c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+        b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+        a = GG(a, b, c, d, M_offset_1, 5, T[16]);
+        d = GG(d, a, b, c, M_offset_6, 9, T[17]);
+        c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+        b = GG(b, c, d, a, M_offset_0, 20, T[19]);
+        a = GG(a, b, c, d, M_offset_5, 5, T[20]);
+        d = GG(d, a, b, c, M_offset_10, 9, T[21]);
+        c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+        b = GG(b, c, d, a, M_offset_4, 20, T[23]);
+        a = GG(a, b, c, d, M_offset_9, 5, T[24]);
+        d = GG(d, a, b, c, M_offset_14, 9, T[25]);
+        c = GG(c, d, a, b, M_offset_3, 14, T[26]);
+        b = GG(b, c, d, a, M_offset_8, 20, T[27]);
+        a = GG(a, b, c, d, M_offset_13, 5, T[28]);
+        d = GG(d, a, b, c, M_offset_2, 9, T[29]);
+        c = GG(c, d, a, b, M_offset_7, 14, T[30]);
+        b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+        a = HH(a, b, c, d, M_offset_5, 4, T[32]);
+        d = HH(d, a, b, c, M_offset_8, 11, T[33]);
+        c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+        b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+        a = HH(a, b, c, d, M_offset_1, 4, T[36]);
+        d = HH(d, a, b, c, M_offset_4, 11, T[37]);
+        c = HH(c, d, a, b, M_offset_7, 16, T[38]);
+        b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+        a = HH(a, b, c, d, M_offset_13, 4, T[40]);
+        d = HH(d, a, b, c, M_offset_0, 11, T[41]);
+        c = HH(c, d, a, b, M_offset_3, 16, T[42]);
+        b = HH(b, c, d, a, M_offset_6, 23, T[43]);
+        a = HH(a, b, c, d, M_offset_9, 4, T[44]);
+        d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+        c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+        b = HH(b, c, d, a, M_offset_2, 23, T[47]);
+
+        a = II(a, b, c, d, M_offset_0, 6, T[48]);
+        d = II(d, a, b, c, M_offset_7, 10, T[49]);
+        c = II(c, d, a, b, M_offset_14, 15, T[50]);
+        b = II(b, c, d, a, M_offset_5, 21, T[51]);
+        a = II(a, b, c, d, M_offset_12, 6, T[52]);
+        d = II(d, a, b, c, M_offset_3, 10, T[53]);
+        c = II(c, d, a, b, M_offset_10, 15, T[54]);
+        b = II(b, c, d, a, M_offset_1, 21, T[55]);
+        a = II(a, b, c, d, M_offset_8, 6, T[56]);
+        d = II(d, a, b, c, M_offset_15, 10, T[57]);
+        c = II(c, d, a, b, M_offset_6, 15, T[58]);
+        b = II(b, c, d, a, M_offset_13, 21, T[59]);
+        a = II(a, b, c, d, M_offset_4, 6, T[60]);
+        d = II(d, a, b, c, M_offset_11, 10, T[61]);
+        c = II(c, d, a, b, M_offset_2, 15, T[62]);
+        b = II(b, c, d, a, M_offset_9, 21, T[63]);
+
+        // Intermediate hash value
+        H[0] = (H[0] + a) | 0;
+        H[1] = (H[1] + b) | 0;
+        H[2] = (H[2] + c) | 0;
+        H[3] = (H[3] + d) | 0;
+      },
+
+      _doFinalize: function () {
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+
+        var nBitsTotal = this._nDataBytes * 8;
+        var nBitsLeft = data.sigBytes * 8;
+
+        // Add padding
+        dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+        var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+        var nBitsTotalL = nBitsTotal;
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+            (((nBitsTotalH << 8) | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+            (((nBitsTotalH << 24) | (nBitsTotalH >>> 8)) & 0xff00ff00)
+        );
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+            (((nBitsTotalL << 8) | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+            (((nBitsTotalL << 24) | (nBitsTotalL >>> 8)) & 0xff00ff00)
+        );
+
+        data.sigBytes = (dataWords.length + 1) * 4;
+
+        // Hash final blocks
+        this._process();
+
+        // Shortcuts
+        var hash = this._hash;
+        var H = hash.words;
+
+        // Swap endian
+        for (var i = 0; i < 4; i++) {
+          // Shortcut
+          var H_i = H[i];
+
+          H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+              (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+        }
+
+        // Return final computed hash
+        return hash;
+      },
+
+      clone: function () {
+        var clone = Hasher.clone.call(this);
+        clone._hash = this._hash.clone();
+
+        return clone;
+      }
+    });
+
+    function FF(a, b, c, d, x, s, t) {
+      var n = a + ((b & c) | (~b & d)) + x + t;
+      return ((n << s) | (n >>> (32 - s))) + b;
+    }
+
+    function GG(a, b, c, d, x, s, t) {
+      var n = a + ((b & d) | (c & ~d)) + x + t;
+      return ((n << s) | (n >>> (32 - s))) + b;
+    }
+
+    function HH(a, b, c, d, x, s, t) {
+      var n = a + (b ^ c ^ d) + x + t;
+      return ((n << s) | (n >>> (32 - s))) + b;
+    }
+
+    function II(a, b, c, d, x, s, t) {
+      var n = a + (c ^ (b | ~d)) + x + t;
+      return ((n << s) | (n >>> (32 - s))) + b;
+    }
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.MD5('message');
+     *     var hash = CryptoJS.MD5(wordArray);
+     */
+    C.MD5 = Hasher._createHelper(MD5);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacMD5(message, key);
+     */
+    C.HmacMD5 = Hasher._createHmacHelper(MD5);
+  }(Math));
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var Hasher = C_lib.Hasher;
+    var C_algo = C.algo;
+
+    // Reusable object
+    var W = [];
+
+    /**
+     * SHA-1 hash algorithm.
+     */
+    var SHA1 = C_algo.SHA1 = Hasher.extend({
+      _doReset: function () {
+        this._hash = new WordArray.init([
+          0x67452301, 0xefcdab89,
+          0x98badcfe, 0x10325476,
+          0xc3d2e1f0
+        ]);
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Shortcut
+        var H = this._hash.words;
+
+        // Working variables
+        var a = H[0];
+        var b = H[1];
+        var c = H[2];
+        var d = H[3];
+        var e = H[4];
+
+        // Computation
+        for (var i = 0; i < 80; i++) {
+          if (i < 16) {
+            W[i] = M[offset + i] | 0;
+          } else {
+            var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+            W[i] = (n << 1) | (n >>> 31);
+          }
+
+          var t = ((a << 5) | (a >>> 27)) + e + W[i];
+          if (i < 20) {
+            t += ((b & c) | (~b & d)) + 0x5a827999;
+          } else if (i < 40) {
+            t += (b ^ c ^ d) + 0x6ed9eba1;
+          } else if (i < 60) {
+            t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+          } else /* if (i < 80) */ {
+            t += (b ^ c ^ d) - 0x359d3e2a;
+          }
+
+          e = d;
+          d = c;
+          c = (b << 30) | (b >>> 2);
+          b = a;
+          a = t;
+        }
+
+        // Intermediate hash value
+        H[0] = (H[0] + a) | 0;
+        H[1] = (H[1] + b) | 0;
+        H[2] = (H[2] + c) | 0;
+        H[3] = (H[3] + d) | 0;
+        H[4] = (H[4] + e) | 0;
+      },
+
+      _doFinalize: function () {
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+
+        var nBitsTotal = this._nDataBytes * 8;
+        var nBitsLeft = data.sigBytes * 8;
+
+        // Add padding
+        dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+        data.sigBytes = dataWords.length * 4;
+
+        // Hash final blocks
+        this._process();
+
+        // Return final computed hash
+        return this._hash;
+      },
+
+      clone: function () {
+        var clone = Hasher.clone.call(this);
+        clone._hash = this._hash.clone();
+
+        return clone;
+      }
+    });
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.SHA1('message');
+     *     var hash = CryptoJS.SHA1(wordArray);
+     */
+    C.SHA1 = Hasher._createHelper(SHA1);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacSHA1(message, key);
+     */
+    C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+  }());
+
+
+  (function (Math) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var Hasher = C_lib.Hasher;
+    var C_algo = C.algo;
+
+    // Initialization and round constants tables
+    var H = [];
+    var K = [];
+
+    // Compute constants
+    (function () {
+      function isPrime(n) {
+        var sqrtN = Math.sqrt(n);
+        for (var factor = 2; factor <= sqrtN; factor++) {
+          if (!(n % factor)) {
+            return false;
+          }
+        }
+
+        return true;
+      }
+
+      function getFractionalBits(n) {
+        return ((n - (n | 0)) * 0x100000000) | 0;
+      }
+
+      var n = 2;
+      var nPrime = 0;
+      while (nPrime < 64) {
+        if (isPrime(n)) {
+          if (nPrime < 8) {
+            H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+          }
+          K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+          nPrime++;
+        }
+
+        n++;
+      }
+    }());
+
+    // Reusable object
+    var W = [];
+
+    /**
+     * SHA-256 hash algorithm.
+     */
+    var SHA256 = C_algo.SHA256 = Hasher.extend({
+      _doReset: function () {
+        this._hash = new WordArray.init(H.slice(0));
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Shortcut
+        var H = this._hash.words;
+
+        // Working variables
+        var a = H[0];
+        var b = H[1];
+        var c = H[2];
+        var d = H[3];
+        var e = H[4];
+        var f = H[5];
+        var g = H[6];
+        var h = H[7];
+
+        // Computation
+        for (var i = 0; i < 64; i++) {
+          if (i < 16) {
+            W[i] = M[offset + i] | 0;
+          } else {
+            var gamma0x = W[i - 15];
+            var gamma0 = ((gamma0x << 25) | (gamma0x >>> 7)) ^
+                ((gamma0x << 14) | (gamma0x >>> 18)) ^
+                (gamma0x >>> 3);
+
+            var gamma1x = W[i - 2];
+            var gamma1 = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+                ((gamma1x << 13) | (gamma1x >>> 19)) ^
+                (gamma1x >>> 10);
+
+            W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+          }
+
+          var ch = (e & f) ^ (~e & g);
+          var maj = (a & b) ^ (a & c) ^ (b & c);
+
+          var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+          var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7) | (e >>> 25));
+
+          var t1 = h + sigma1 + ch + K[i] + W[i];
+          var t2 = sigma0 + maj;
+
+          h = g;
+          g = f;
+          f = e;
+          e = (d + t1) | 0;
+          d = c;
+          c = b;
+          b = a;
+          a = (t1 + t2) | 0;
+        }
+
+        // Intermediate hash value
+        H[0] = (H[0] + a) | 0;
+        H[1] = (H[1] + b) | 0;
+        H[2] = (H[2] + c) | 0;
+        H[3] = (H[3] + d) | 0;
+        H[4] = (H[4] + e) | 0;
+        H[5] = (H[5] + f) | 0;
+        H[6] = (H[6] + g) | 0;
+        H[7] = (H[7] + h) | 0;
+      },
+
+      _doFinalize: function () {
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+
+        var nBitsTotal = this._nDataBytes * 8;
+        var nBitsLeft = data.sigBytes * 8;
+
+        // Add padding
+        dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+        data.sigBytes = dataWords.length * 4;
+
+        // Hash final blocks
+        this._process();
+
+        // Return final computed hash
+        return this._hash;
+      },
+
+      clone: function () {
+        var clone = Hasher.clone.call(this);
+        clone._hash = this._hash.clone();
+
+        return clone;
+      }
+    });
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.SHA256('message');
+     *     var hash = CryptoJS.SHA256(wordArray);
+     */
+    C.SHA256 = Hasher._createHelper(SHA256);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacSHA256(message, key);
+     */
+    C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+  }(Math));
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var C_enc = C.enc;
+
+    /**
+     * UTF-16 BE encoding strategy.
+     */
+    var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+      /**
+       * Converts a word array to a UTF-16 BE string.
+       *
+       * @param {WordArray} wordArray The word array.
+       *
+       * @return {string} The UTF-16 BE string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+       */
+      stringify: function (wordArray) {
+        // Shortcuts
+        var words = wordArray.words;
+        var sigBytes = wordArray.sigBytes;
+
+        // Convert
+        var utf16Chars = [];
+        for (var i = 0; i < sigBytes; i += 2) {
+          var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+          utf16Chars.push(String.fromCharCode(codePoint));
+        }
+
+        return utf16Chars.join('');
+      },
+
+      /**
+       * Converts a UTF-16 BE string to a word array.
+       *
+       * @param {string} utf16Str The UTF-16 BE string.
+       *
+       * @return {WordArray} The word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+       */
+      parse: function (utf16Str) {
+        // Shortcut
+        var utf16StrLength = utf16Str.length;
+
+        // Convert
+        var words = [];
+        for (var i = 0; i < utf16StrLength; i++) {
+          words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+        }
+
+        return WordArray.create(words, utf16StrLength * 2);
+      }
+    };
+
+    /**
+     * UTF-16 LE encoding strategy.
+     */
+    C_enc.Utf16LE = {
+      /**
+       * Converts a word array to a UTF-16 LE string.
+       *
+       * @param {WordArray} wordArray The word array.
+       *
+       * @return {string} The UTF-16 LE string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+       */
+      stringify: function (wordArray) {
+        // Shortcuts
+        var words = wordArray.words;
+        var sigBytes = wordArray.sigBytes;
+
+        // Convert
+        var utf16Chars = [];
+        for (var i = 0; i < sigBytes; i += 2) {
+          var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+          utf16Chars.push(String.fromCharCode(codePoint));
+        }
+
+        return utf16Chars.join('');
+      },
+
+      /**
+       * Converts a UTF-16 LE string to a word array.
+       *
+       * @param {string} utf16Str The UTF-16 LE string.
+       *
+       * @return {WordArray} The word array.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+       */
+      parse: function (utf16Str) {
+        // Shortcut
+        var utf16StrLength = utf16Str.length;
+
+        // Convert
+        var words = [];
+        for (var i = 0; i < utf16StrLength; i++) {
+          words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+        }
+
+        return WordArray.create(words, utf16StrLength * 2);
+      }
+    };
+
+    function swapEndian(word) {
+      return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+    }
+  }());
+
+
+  (function () {
+    // Check if typed arrays are supported
+    if (typeof ArrayBuffer != 'function') {
+      return;
+    }
+
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+
+    // Reference original init
+    var superInit = WordArray.init;
+
+    // Augment WordArray.init to handle typed arrays
+    var subInit = WordArray.init = function (typedArray) {
+      // Convert buffers to uint8
+      if (typedArray instanceof ArrayBuffer) {
+        typedArray = new Uint8Array(typedArray);
+      }
+
+      // Convert other array views to uint8
+      if (
+          typedArray instanceof Int8Array ||
+          (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+          typedArray instanceof Int16Array ||
+          typedArray instanceof Uint16Array ||
+          typedArray instanceof Int32Array ||
+          typedArray instanceof Uint32Array ||
+          typedArray instanceof Float32Array ||
+          typedArray instanceof Float64Array
+      ) {
+        typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+      }
+
+      // Handle Uint8Array
+      if (typedArray instanceof Uint8Array) {
+        // Shortcut
+        var typedArrayByteLength = typedArray.byteLength;
+
+        // Extract bytes
+        var words = [];
+        for (var i = 0; i < typedArrayByteLength; i++) {
+          words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+        }
+
+        // Initialize this word array
+        superInit.call(this, words, typedArrayByteLength);
+      } else {
+        // Else call normal init
+        superInit.apply(this, arguments);
+      }
+    };
+
+    subInit.prototype = WordArray;
+  }());
+
+
+  /** @preserve
+   (c) 2012 by Cédric Mesnil. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   */
+
+  (function (Math) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var Hasher = C_lib.Hasher;
+    var C_algo = C.algo;
+
+    // Constants table
+    var _zl = WordArray.create([
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+      7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8,
+      3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12,
+      1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2,
+      4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13]);
+    var _zr = WordArray.create([
+      5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12,
+      6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2,
+      15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13,
+      8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14,
+      12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11]);
+    var _sl = WordArray.create([
+      11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8,
+      7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12,
+      11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5,
+      11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12,
+      9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6]);
+    var _sr = WordArray.create([
+      8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6,
+      9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11,
+      9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5,
+      15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8,
+      8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11]);
+
+    var _hl = WordArray.create([0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+    var _hr = WordArray.create([0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+    /**
+     * RIPEMD160 hash algorithm.
+     */
+    var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+      _doReset: function () {
+        this._hash = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+      },
+
+      _doProcessBlock: function (M, offset) {
+
+        // Swap endian
+        for (var i = 0; i < 16; i++) {
+          // Shortcuts
+          var offset_i = offset + i;
+          var M_offset_i = M[offset_i];
+
+          // Swap
+          M[offset_i] = (
+              (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+              (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+          );
+        }
+        // Shortcut
+        var H = this._hash.words;
+        var hl = _hl.words;
+        var hr = _hr.words;
+        var zl = _zl.words;
+        var zr = _zr.words;
+        var sl = _sl.words;
+        var sr = _sr.words;
+
+        // Working variables
+        var al, bl, cl, dl, el;
+        var ar, br, cr, dr, er;
+
+        ar = al = H[0];
+        br = bl = H[1];
+        cr = cl = H[2];
+        dr = dl = H[3];
+        er = el = H[4];
+        // Computation
+        var t;
+        for (var i = 0; i < 80; i += 1) {
+          t = (al + M[offset + zl[i]]) | 0;
+          if (i < 16) {
+            t += f1(bl, cl, dl) + hl[0];
+          } else if (i < 32) {
+            t += f2(bl, cl, dl) + hl[1];
+          } else if (i < 48) {
+            t += f3(bl, cl, dl) + hl[2];
+          } else if (i < 64) {
+            t += f4(bl, cl, dl) + hl[3];
+          } else {// if (i<80) {
+            t += f5(bl, cl, dl) + hl[4];
+          }
+          t = t | 0;
+          t = rotl(t, sl[i]);
+          t = (t + el) | 0;
+          al = el;
+          el = dl;
+          dl = rotl(cl, 10);
+          cl = bl;
+          bl = t;
+
+          t = (ar + M[offset + zr[i]]) | 0;
+          if (i < 16) {
+            t += f5(br, cr, dr) + hr[0];
+          } else if (i < 32) {
+            t += f4(br, cr, dr) + hr[1];
+          } else if (i < 48) {
+            t += f3(br, cr, dr) + hr[2];
+          } else if (i < 64) {
+            t += f2(br, cr, dr) + hr[3];
+          } else {// if (i<80) {
+            t += f1(br, cr, dr) + hr[4];
+          }
+          t = t | 0;
+          t = rotl(t, sr[i]);
+          t = (t + er) | 0;
+          ar = er;
+          er = dr;
+          dr = rotl(cr, 10);
+          cr = br;
+          br = t;
+        }
+        // Intermediate hash value
+        t = (H[1] + cl + dr) | 0;
+        H[1] = (H[2] + dl + er) | 0;
+        H[2] = (H[3] + el + ar) | 0;
+        H[3] = (H[4] + al + br) | 0;
+        H[4] = (H[0] + bl + cr) | 0;
+        H[0] = t;
+      },
+
+      _doFinalize: function () {
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+
+        var nBitsTotal = this._nDataBytes * 8;
+        var nBitsLeft = data.sigBytes * 8;
+
+        // Add padding
+        dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+        dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+            (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+            (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00)
+        );
+        data.sigBytes = (dataWords.length + 1) * 4;
+
+        // Hash final blocks
+        this._process();
+
+        // Shortcuts
+        var hash = this._hash;
+        var H = hash.words;
+
+        // Swap endian
+        for (var i = 0; i < 5; i++) {
+          // Shortcut
+          var H_i = H[i];
+
+          // Swap
+          H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+              (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+        }
+
+        // Return final computed hash
+        return hash;
+      },
+
+      clone: function () {
+        var clone = Hasher.clone.call(this);
+        clone._hash = this._hash.clone();
+
+        return clone;
+      }
+    });
+
+
+    function f1(x, y, z) {
+      return ((x) ^ (y) ^ (z));
+
+    }
+
+    function f2(x, y, z) {
+      return (((x) & (y)) | ((~x) & (z)));
+    }
+
+    function f3(x, y, z) {
+      return (((x) | (~(y))) ^ (z));
+    }
+
+    function f4(x, y, z) {
+      return (((x) & (z)) | ((y) & (~(z))));
+    }
+
+    function f5(x, y, z) {
+      return ((x) ^ ((y) | (~(z))));
+
+    }
+
+    function rotl(x, n) {
+      return (x << n) | (x >>> (32 - n));
+    }
+
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.RIPEMD160('message');
+     *     var hash = CryptoJS.RIPEMD160(wordArray);
+     */
+    C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
+     */
+    C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+  }(Math));
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var Base = C_lib.Base;
+    var C_enc = C.enc;
+    var Utf8 = C_enc.Utf8;
+    var C_algo = C.algo;
+
+    /**
+     * HMAC algorithm.
+     */
+    var HMAC = C_algo.HMAC = Base.extend({
+      /**
+       * Initializes a newly created HMAC.
+       *
+       * @param {Hasher} hasher The hash algorithm to use.
+       * @param {WordArray|string} key The secret key.
+       *
+       * @example
+       *
+       *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+       */
+      init: function (hasher, key) {
+        // Init hasher
+        hasher = this._hasher = new hasher.init();
+
+        // Convert string to WordArray, else assume WordArray already
+        if (typeof key == 'string') {
+          key = Utf8.parse(key);
+        }
+
+        // Shortcuts
+        var hasherBlockSize = hasher.blockSize;
+        var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+        // Allow arbitrary length keys
+        if (key.sigBytes > hasherBlockSizeBytes) {
+          key = hasher.finalize(key);
+        }
+
+        // Clamp excess bits
+        key.clamp();
+
+        // Clone key for inner and outer pads
+        var oKey = this._oKey = key.clone();
+        var iKey = this._iKey = key.clone();
+
+        // Shortcuts
+        var oKeyWords = oKey.words;
+        var iKeyWords = iKey.words;
+
+        // XOR keys with pad constants
+        for (var i = 0; i < hasherBlockSize; i++) {
+          oKeyWords[i] ^= 0x5c5c5c5c;
+          iKeyWords[i] ^= 0x36363636;
+        }
+        oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+        // Set initial values
+        this.reset();
+      },
+
+      /**
+       * Resets this HMAC to its initial state.
+       *
+       * @example
+       *
+       *     hmacHasher.reset();
+       */
+      reset: function () {
+        // Shortcut
+        var hasher = this._hasher;
+
+        // Reset
+        hasher.reset();
+        hasher.update(this._iKey);
+      },
+
+      /**
+       * Updates this HMAC with a message.
+       *
+       * @param {WordArray|string} messageUpdate The message to append.
+       *
+       * @return {HMAC} This HMAC instance.
+       *
+       * @example
+       *
+       *     hmacHasher.update('message');
+       *     hmacHasher.update(wordArray);
+       */
+      update: function (messageUpdate) {
+        this._hasher.update(messageUpdate);
+
+        // Chainable
+        return this;
+      },
+
+      /**
+       * Finalizes the HMAC computation.
+       * Note that the finalize operation is effectively a destructive, read-once operation.
+       *
+       * @param {WordArray|string} messageUpdate (Optional) A final message update.
+       *
+       * @return {WordArray} The HMAC.
+       *
+       * @example
+       *
+       *     var hmac = hmacHasher.finalize();
+       *     var hmac = hmacHasher.finalize('message');
+       *     var hmac = hmacHasher.finalize(wordArray);
+       */
+      finalize: function (messageUpdate) {
+        // Shortcut
+        var hasher = this._hasher;
+
+        // Compute HMAC
+        var innerHash = hasher.finalize(messageUpdate);
+        hasher.reset();
+        var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+        return hmac;
+      }
+    });
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var Base = C_lib.Base;
+    var WordArray = C_lib.WordArray;
+    var C_algo = C.algo;
+    var SHA1 = C_algo.SHA1;
+    var HMAC = C_algo.HMAC;
+
+    /**
+     * Password-Based Key Derivation Function 2 algorithm.
+     */
+    var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+       * @property {Hasher} hasher The hasher to use. Default: SHA1
+       * @property {number} iterations The number of iterations to perform. Default: 1
+       */
+      cfg: Base.extend({
+        keySize: 128 / 32,
+        hasher: SHA1,
+        iterations: 1
+      }),
+
+      /**
+       * Initializes a newly created key derivation function.
+       *
+       * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+       *
+       * @example
+       *
+       *     var kdf = CryptoJS.algo.PBKDF2.create();
+       *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+       *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+       */
+      init: function (cfg) {
+        this.cfg = this.cfg.extend(cfg);
+      },
+
+      /**
+       * Computes the Password-Based Key Derivation Function 2.
+       *
+       * @param {WordArray|string} password The password.
+       * @param {WordArray|string} salt A salt.
+       *
+       * @return {WordArray} The derived key.
+       *
+       * @example
+       *
+       *     var key = kdf.compute(password, salt);
+       */
+      compute: function (password, salt) {
+        // Shortcut
+        var cfg = this.cfg;
+
+        // Init HMAC
+        var hmac = HMAC.create(cfg.hasher, password);
+
+        // Initial values
+        var derivedKey = WordArray.create();
+        var blockIndex = WordArray.create([0x00000001]);
+
+        // Shortcuts
+        var derivedKeyWords = derivedKey.words;
+        var blockIndexWords = blockIndex.words;
+        var keySize = cfg.keySize;
+        var iterations = cfg.iterations;
+
+        // Generate key
+        while (derivedKeyWords.length < keySize) {
+          var block = hmac.update(salt).finalize(blockIndex);
+          hmac.reset();
+
+          // Shortcuts
+          var blockWords = block.words;
+          var blockWordsLength = blockWords.length;
+
+          // Iterations
+          var intermediate = block;
+          for (var i = 1; i < iterations; i++) {
+            intermediate = hmac.finalize(intermediate);
+            hmac.reset();
+
+            // Shortcut
+            var intermediateWords = intermediate.words;
+
+            // XOR intermediate with block
+            for (var j = 0; j < blockWordsLength; j++) {
+              blockWords[j] ^= intermediateWords[j];
+            }
+          }
+
+          derivedKey.concat(block);
+          blockIndexWords[0]++;
+        }
+        derivedKey.sigBytes = keySize * 4;
+
+        return derivedKey;
+      }
+    });
+
+    /**
+     * Computes the Password-Based Key Derivation Function 2.
+     *
+     * @param {WordArray|string} password The password.
+     * @param {WordArray|string} salt A salt.
+     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+     *
+     * @return {WordArray} The derived key.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var key = CryptoJS.PBKDF2(password, salt);
+     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+     *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+     */
+    C.PBKDF2 = function (password, salt, cfg) {
+      return PBKDF2.create(cfg).compute(password, salt);
+    };
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var Base = C_lib.Base;
+    var WordArray = C_lib.WordArray;
+    var C_algo = C.algo;
+    var MD5 = C_algo.MD5;
+
+    /**
+     * This key derivation function is meant to conform with EVP_BytesToKey.
+     * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+     */
+    var EvpKDF = C_algo.EvpKDF = Base.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+       * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+       * @property {number} iterations The number of iterations to perform. Default: 1
+       */
+      cfg: Base.extend({
+        keySize: 128 / 32,
+        hasher: MD5,
+        iterations: 1
+      }),
+
+      /**
+       * Initializes a newly created key derivation function.
+       *
+       * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+       *
+       * @example
+       *
+       *     var kdf = CryptoJS.algo.EvpKDF.create();
+       *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+       *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+       */
+      init: function (cfg) {
+        this.cfg = this.cfg.extend(cfg);
+      },
+
+      /**
+       * Derives a key from a password.
+       *
+       * @param {WordArray|string} password The password.
+       * @param {WordArray|string} salt A salt.
+       *
+       * @return {WordArray} The derived key.
+       *
+       * @example
+       *
+       *     var key = kdf.compute(password, salt);
+       */
+      compute: function (password, salt) {
+        var block;
+
+        // Shortcut
+        var cfg = this.cfg;
+
+        // Init hasher
+        var hasher = cfg.hasher.create();
+
+        // Initial values
+        var derivedKey = WordArray.create();
+
+        // Shortcuts
+        var derivedKeyWords = derivedKey.words;
+        var keySize = cfg.keySize;
+        var iterations = cfg.iterations;
+
+        // Generate key
+        while (derivedKeyWords.length < keySize) {
+          if (block) {
+            hasher.update(block);
+          }
+          block = hasher.update(password).finalize(salt);
+          hasher.reset();
+
+          // Iterations
+          for (var i = 1; i < iterations; i++) {
+            block = hasher.finalize(block);
+            hasher.reset();
+          }
+
+          derivedKey.concat(block);
+        }
+        derivedKey.sigBytes = keySize * 4;
+
+        return derivedKey;
+      }
+    });
+
+    /**
+     * Derives a key from a password.
+     *
+     * @param {WordArray|string} password The password.
+     * @param {WordArray|string} salt A salt.
+     * @param {Object} cfg (Optional) The configuration options to use for this computation.
+     *
+     * @return {WordArray} The derived key.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var key = CryptoJS.EvpKDF(password, salt);
+     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+     *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+     */
+    C.EvpKDF = function (password, salt, cfg) {
+      return EvpKDF.create(cfg).compute(password, salt);
+    };
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var C_algo = C.algo;
+    var SHA256 = C_algo.SHA256;
+
+    /**
+     * SHA-224 hash algorithm.
+     */
+    var SHA224 = C_algo.SHA224 = SHA256.extend({
+      _doReset: function () {
+        this._hash = new WordArray.init([
+          0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+          0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+        ]);
+      },
+
+      _doFinalize: function () {
+        var hash = SHA256._doFinalize.call(this);
+
+        hash.sigBytes -= 4;
+
+        return hash;
+      }
+    });
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.SHA224('message');
+     *     var hash = CryptoJS.SHA224(wordArray);
+     */
+    C.SHA224 = SHA256._createHelper(SHA224);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacSHA224(message, key);
+     */
+    C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+  }());
+
+
+  (function (undefined) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var Base = C_lib.Base;
+    var X32WordArray = C_lib.WordArray;
+
+    /**
+     * x64 namespace.
+     */
+    var C_x64 = C.x64 = {};
+
+    /**
+     * A 64-bit word.
+     */
+    var X64Word = C_x64.Word = Base.extend({
+      /**
+       * Initializes a newly created 64-bit word.
+       *
+       * @param {number} high The high 32 bits.
+       * @param {number} low The low 32 bits.
+       *
+       * @example
+       *
+       *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+       */
+      init: function (high, low) {
+        this.high = high;
+        this.low = low;
+      }
+
+      /**
+       * Bitwise NOTs this word.
+       *
+       * @return {X64Word} A new x64-Word object after negating.
+       *
+       * @example
+       *
+       *     var negated = x64Word.not();
+       */
+      // not: function () {
+      // var high = ~this.high;
+      // var low = ~this.low;
+
+      // return X64Word.create(high, low);
+      // },
+
+      /**
+       * Bitwise ANDs this word with the passed word.
+       *
+       * @param {X64Word} word The x64-Word to AND with this word.
+       *
+       * @return {X64Word} A new x64-Word object after ANDing.
+       *
+       * @example
+       *
+       *     var anded = x64Word.and(anotherX64Word);
+       */
+      // and: function (word) {
+      // var high = this.high & word.high;
+      // var low = this.low & word.low;
+
+      // return X64Word.create(high, low);
+      // },
+
+      /**
+       * Bitwise ORs this word with the passed word.
+       *
+       * @param {X64Word} word The x64-Word to OR with this word.
+       *
+       * @return {X64Word} A new x64-Word object after ORing.
+       *
+       * @example
+       *
+       *     var ored = x64Word.or(anotherX64Word);
+       */
+      // or: function (word) {
+      // var high = this.high | word.high;
+      // var low = this.low | word.low;
+
+      // return X64Word.create(high, low);
+      // },
+
+      /**
+       * Bitwise XORs this word with the passed word.
+       *
+       * @param {X64Word} word The x64-Word to XOR with this word.
+       *
+       * @return {X64Word} A new x64-Word object after XORing.
+       *
+       * @example
+       *
+       *     var xored = x64Word.xor(anotherX64Word);
+       */
+      // xor: function (word) {
+      // var high = this.high ^ word.high;
+      // var low = this.low ^ word.low;
+
+      // return X64Word.create(high, low);
+      // },
+
+      /**
+       * Shifts this word n bits to the left.
+       *
+       * @param {number} n The number of bits to shift.
+       *
+       * @return {X64Word} A new x64-Word object after shifting.
+       *
+       * @example
+       *
+       *     var shifted = x64Word.shiftL(25);
+       */
+      // shiftL: function (n) {
+      // if (n < 32) {
+      // var high = (this.high << n) | (this.low >>> (32 - n));
+      // var low = this.low << n;
+      // } else {
+      // var high = this.low << (n - 32);
+      // var low = 0;
+      // }
+
+      // return X64Word.create(high, low);
+      // },
+
+      /**
+       * Shifts this word n bits to the right.
+       *
+       * @param {number} n The number of bits to shift.
+       *
+       * @return {X64Word} A new x64-Word object after shifting.
+       *
+       * @example
+       *
+       *     var shifted = x64Word.shiftR(7);
+       */
+      // shiftR: function (n) {
+      // if (n < 32) {
+      // var low = (this.low >>> n) | (this.high << (32 - n));
+      // var high = this.high >>> n;
+      // } else {
+      // var low = this.high >>> (n - 32);
+      // var high = 0;
+      // }
+
+      // return X64Word.create(high, low);
+      // },
+
+      /**
+       * Rotates this word n bits to the left.
+       *
+       * @param {number} n The number of bits to rotate.
+       *
+       * @return {X64Word} A new x64-Word object after rotating.
+       *
+       * @example
+       *
+       *     var rotated = x64Word.rotL(25);
+       */
+      // rotL: function (n) {
+      // return this.shiftL(n).or(this.shiftR(64 - n));
+      // },
+
+      /**
+       * Rotates this word n bits to the right.
+       *
+       * @param {number} n The number of bits to rotate.
+       *
+       * @return {X64Word} A new x64-Word object after rotating.
+       *
+       * @example
+       *
+       *     var rotated = x64Word.rotR(7);
+       */
+      // rotR: function (n) {
+      // return this.shiftR(n).or(this.shiftL(64 - n));
+      // },
+
+      /**
+       * Adds this word with the passed word.
+       *
+       * @param {X64Word} word The x64-Word to add with this word.
+       *
+       * @return {X64Word} A new x64-Word object after adding.
+       *
+       * @example
+       *
+       *     var added = x64Word.add(anotherX64Word);
+       */
+      // add: function (word) {
+      // var low = (this.low + word.low) | 0;
+      // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+      // var high = (this.high + word.high + carry) | 0;
+
+      // return X64Word.create(high, low);
+      // }
+    });
+
+    /**
+     * An array of 64-bit words.
+     *
+     * @property {Array} words The array of CryptoJS.x64.Word objects.
+     * @property {number} sigBytes The number of significant bytes in this word array.
+     */
+    var X64WordArray = C_x64.WordArray = Base.extend({
+      /**
+       * Initializes a newly created word array.
+       *
+       * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+       * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+       *
+       * @example
+       *
+       *     var wordArray = CryptoJS.x64.WordArray.create();
+       *
+       *     var wordArray = CryptoJS.x64.WordArray.create([
+       *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+       *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+       *     ]);
+       *
+       *     var wordArray = CryptoJS.x64.WordArray.create([
+       *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+       *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+       *     ], 10);
+       */
+      init: function (words, sigBytes) {
+        words = this.words = words || [];
+
+        if (sigBytes != undefined) {
+          this.sigBytes = sigBytes;
+        } else {
+          this.sigBytes = words.length * 8;
+        }
+      },
+
+      /**
+       * Converts this 64-bit word array to a 32-bit word array.
+       *
+       * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+       *
+       * @example
+       *
+       *     var x32WordArray = x64WordArray.toX32();
+       */
+      toX32: function () {
+        // Shortcuts
+        var x64Words = this.words;
+        var x64WordsLength = x64Words.length;
+
+        // Convert
+        var x32Words = [];
+        for (var i = 0; i < x64WordsLength; i++) {
+          var x64Word = x64Words[i];
+          x32Words.push(x64Word.high);
+          x32Words.push(x64Word.low);
+        }
+
+        return X32WordArray.create(x32Words, this.sigBytes);
+      },
+
+      /**
+       * Creates a copy of this word array.
+       *
+       * @return {X64WordArray} The clone.
+       *
+       * @example
+       *
+       *     var clone = x64WordArray.clone();
+       */
+      clone: function () {
+        var clone = Base.clone.call(this);
+
+        // Clone "words" array
+        var words = clone.words = this.words.slice(0);
+
+        // Clone each X64Word object
+        var wordsLength = words.length;
+        for (var i = 0; i < wordsLength; i++) {
+          words[i] = words[i].clone();
+        }
+
+        return clone;
+      }
+    });
+  }());
+
+
+  (function (Math) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var Hasher = C_lib.Hasher;
+    var C_x64 = C.x64;
+    var X64Word = C_x64.Word;
+    var C_algo = C.algo;
+
+    // Constants tables
+    var RHO_OFFSETS = [];
+    var PI_INDEXES = [];
+    var ROUND_CONSTANTS = [];
+
+    // Compute Constants
+    (function () {
+      // Compute rho offset constants
+      var x = 1, y = 0;
+      for (var t = 0; t < 24; t++) {
+        RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+        var newX = y % 5;
+        var newY = (2 * x + 3 * y) % 5;
+        x = newX;
+        y = newY;
+      }
+
+      // Compute pi index constants
+      for (var x = 0; x < 5; x++) {
+        for (var y = 0; y < 5; y++) {
+          PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+        }
+      }
+
+      // Compute round constants
+      var LFSR = 0x01;
+      for (var i = 0; i < 24; i++) {
+        var roundConstantMsw = 0;
+        var roundConstantLsw = 0;
+
+        for (var j = 0; j < 7; j++) {
+          if (LFSR & 0x01) {
+            var bitPosition = (1 << j) - 1;
+            if (bitPosition < 32) {
+              roundConstantLsw ^= 1 << bitPosition;
+            } else /* if (bitPosition >= 32) */ {
+              roundConstantMsw ^= 1 << (bitPosition - 32);
+            }
+          }
+
+          // Compute next LFSR
+          if (LFSR & 0x80) {
+            // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+            LFSR = (LFSR << 1) ^ 0x71;
+          } else {
+            LFSR <<= 1;
+          }
+        }
+
+        ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+      }
+    }());
+
+    // Reusable objects for temporary values
+    var T = [];
+    (function () {
+      for (var i = 0; i < 25; i++) {
+        T[i] = X64Word.create();
+      }
+    }());
+
+    /**
+     * SHA-3 hash algorithm.
+     */
+    var SHA3 = C_algo.SHA3 = Hasher.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {number} outputLength
+       *   The desired number of bits in the output hash.
+       *   Only values permitted are: 224, 256, 384, 512.
+       *   Default: 512
+       */
+      cfg: Hasher.cfg.extend({
+        outputLength: 512
+      }),
+
+      _doReset: function () {
+        var state = this._state = []
+        for (var i = 0; i < 25; i++) {
+          state[i] = new X64Word.init();
+        }
+
+        this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Shortcuts
+        var state = this._state;
+        var nBlockSizeLanes = this.blockSize / 2;
+
+        // Absorb
+        for (var i = 0; i < nBlockSizeLanes; i++) {
+          // Shortcuts
+          var M2i = M[offset + 2 * i];
+          var M2i1 = M[offset + 2 * i + 1];
+
+          // Swap endian
+          M2i = (
+              (((M2i << 8) | (M2i >>> 24)) & 0x00ff00ff) |
+              (((M2i << 24) | (M2i >>> 8)) & 0xff00ff00)
+          );
+          M2i1 = (
+              (((M2i1 << 8) | (M2i1 >>> 24)) & 0x00ff00ff) |
+              (((M2i1 << 24) | (M2i1 >>> 8)) & 0xff00ff00)
+          );
+
+          // Absorb message into state
+          var lane = state[i];
+          lane.high ^= M2i1;
+          lane.low ^= M2i;
+        }
+
+        // Rounds
+        for (var round = 0; round < 24; round++) {
+          // Theta
+          for (var x = 0; x < 5; x++) {
+            // Mix column lanes
+            var tMsw = 0, tLsw = 0;
+            for (var y = 0; y < 5; y++) {
+              var lane = state[x + 5 * y];
+              tMsw ^= lane.high;
+              tLsw ^= lane.low;
+            }
+
+            // Temporary values
+            var Tx = T[x];
+            Tx.high = tMsw;
+            Tx.low = tLsw;
+          }
+          for (var x = 0; x < 5; x++) {
+            // Shortcuts
+            var Tx4 = T[(x + 4) % 5];
+            var Tx1 = T[(x + 1) % 5];
+            var Tx1Msw = Tx1.high;
+            var Tx1Lsw = Tx1.low;
+
+            // Mix surrounding columns
+            var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+            var tLsw = Tx4.low ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+            for (var y = 0; y < 5; y++) {
+              var lane = state[x + 5 * y];
+              lane.high ^= tMsw;
+              lane.low ^= tLsw;
+            }
+          }
+
+          // Rho Pi
+          for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+            var tMsw;
+            var tLsw;
+
+            // Shortcuts
+            var lane = state[laneIndex];
+            var laneMsw = lane.high;
+            var laneLsw = lane.low;
+            var rhoOffset = RHO_OFFSETS[laneIndex];
+
+            // Rotate lanes
+            if (rhoOffset < 32) {
+              tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+              tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+            } else /* if (rhoOffset >= 32) */ {
+              tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+              tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+            }
+
+            // Transpose lanes
+            var TPiLane = T[PI_INDEXES[laneIndex]];
+            TPiLane.high = tMsw;
+            TPiLane.low = tLsw;
+          }
+
+          // Rho pi at x = y = 0
+          var T0 = T[0];
+          var state0 = state[0];
+          T0.high = state0.high;
+          T0.low = state0.low;
+
+          // Chi
+          for (var x = 0; x < 5; x++) {
+            for (var y = 0; y < 5; y++) {
+              // Shortcuts
+              var laneIndex = x + 5 * y;
+              var lane = state[laneIndex];
+              var TLane = T[laneIndex];
+              var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+              var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+              // Mix rows
+              lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+              lane.low = TLane.low ^ (~Tx1Lane.low & Tx2Lane.low);
+            }
+          }
+
+          // Iota
+          var lane = state[0];
+          var roundConstant = ROUND_CONSTANTS[round];
+          lane.high ^= roundConstant.high;
+          lane.low ^= roundConstant.low;
+        }
+      },
+
+      _doFinalize: function () {
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+        var nBitsTotal = this._nDataBytes * 8;
+        var nBitsLeft = data.sigBytes * 8;
+        var blockSizeBits = this.blockSize * 32;
+
+        // Add padding
+        dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+        dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+        data.sigBytes = dataWords.length * 4;
+
+        // Hash final blocks
+        this._process();
+
+        // Shortcuts
+        var state = this._state;
+        var outputLengthBytes = this.cfg.outputLength / 8;
+        var outputLengthLanes = outputLengthBytes / 8;
+
+        // Squeeze
+        var hashWords = [];
+        for (var i = 0; i < outputLengthLanes; i++) {
+          // Shortcuts
+          var lane = state[i];
+          var laneMsw = lane.high;
+          var laneLsw = lane.low;
+
+          // Swap endian
+          laneMsw = (
+              (((laneMsw << 8) | (laneMsw >>> 24)) & 0x00ff00ff) |
+              (((laneMsw << 24) | (laneMsw >>> 8)) & 0xff00ff00)
+          );
+          laneLsw = (
+              (((laneLsw << 8) | (laneLsw >>> 24)) & 0x00ff00ff) |
+              (((laneLsw << 24) | (laneLsw >>> 8)) & 0xff00ff00)
+          );
+
+          // Squeeze state to retrieve hash
+          hashWords.push(laneLsw);
+          hashWords.push(laneMsw);
+        }
+
+        // Return final computed hash
+        return new WordArray.init(hashWords, outputLengthBytes);
+      },
+
+      clone: function () {
+        var clone = Hasher.clone.call(this);
+
+        var state = clone._state = this._state.slice(0);
+        for (var i = 0; i < 25; i++) {
+          state[i] = state[i].clone();
+        }
+
+        return clone;
+      }
+    });
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.SHA3('message');
+     *     var hash = CryptoJS.SHA3(wordArray);
+     */
+    C.SHA3 = Hasher._createHelper(SHA3);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacSHA3(message, key);
+     */
+    C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+  }(Math));
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var Hasher = C_lib.Hasher;
+    var C_x64 = C.x64;
+    var X64Word = C_x64.Word;
+    var X64WordArray = C_x64.WordArray;
+    var C_algo = C.algo;
+
+    function X64Word_create() {
+      return X64Word.create.apply(X64Word, arguments);
+    }
+
+    // Constants
+    var K = [
+      X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+      X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+      X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+      X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+      X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+      X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+      X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+      X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+      X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+      X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+      X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+      X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+      X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+      X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+      X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+      X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+      X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+      X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+      X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+      X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+      X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+      X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+      X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+      X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+      X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+      X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+      X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+      X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+      X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+      X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+      X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+      X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+      X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+      X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+      X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+      X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+      X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+      X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+      X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+      X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+    ];
+
+    // Reusable objects
+    var W = [];
+    (function () {
+      for (var i = 0; i < 80; i++) {
+        W[i] = X64Word_create();
+      }
+    }());
+
+    /**
+     * SHA-512 hash algorithm.
+     */
+    var SHA512 = C_algo.SHA512 = Hasher.extend({
+      _doReset: function () {
+        this._hash = new X64WordArray.init([
+          new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+          new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+          new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+          new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+        ]);
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Shortcuts
+        var H = this._hash.words;
+
+        var H0 = H[0];
+        var H1 = H[1];
+        var H2 = H[2];
+        var H3 = H[3];
+        var H4 = H[4];
+        var H5 = H[5];
+        var H6 = H[6];
+        var H7 = H[7];
+
+        var H0h = H0.high;
+        var H0l = H0.low;
+        var H1h = H1.high;
+        var H1l = H1.low;
+        var H2h = H2.high;
+        var H2l = H2.low;
+        var H3h = H3.high;
+        var H3l = H3.low;
+        var H4h = H4.high;
+        var H4l = H4.low;
+        var H5h = H5.high;
+        var H5l = H5.low;
+        var H6h = H6.high;
+        var H6l = H6.low;
+        var H7h = H7.high;
+        var H7l = H7.low;
+
+        // Working variables
+        var ah = H0h;
+        var al = H0l;
+        var bh = H1h;
+        var bl = H1l;
+        var ch = H2h;
+        var cl = H2l;
+        var dh = H3h;
+        var dl = H3l;
+        var eh = H4h;
+        var el = H4l;
+        var fh = H5h;
+        var fl = H5l;
+        var gh = H6h;
+        var gl = H6l;
+        var hh = H7h;
+        var hl = H7l;
+
+        // Rounds
+        for (var i = 0; i < 80; i++) {
+          var Wil;
+          var Wih;
+
+          // Shortcut
+          var Wi = W[i];
+
+          // Extend message
+          if (i < 16) {
+            Wih = Wi.high = M[offset + i * 2] | 0;
+            Wil = Wi.low = M[offset + i * 2 + 1] | 0;
+          } else {
+            // Gamma0
+            var gamma0x = W[i - 15];
+            var gamma0xh = gamma0x.high;
+            var gamma0xl = gamma0x.low;
+            var gamma0h = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+            var gamma0l = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+            // Gamma1
+            var gamma1x = W[i - 2];
+            var gamma1xh = gamma1x.high;
+            var gamma1xl = gamma1x.low;
+            var gamma1h = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+            var gamma1l = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+            // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+            var Wi7 = W[i - 7];
+            var Wi7h = Wi7.high;
+            var Wi7l = Wi7.low;
+
+            var Wi16 = W[i - 16];
+            var Wi16h = Wi16.high;
+            var Wi16l = Wi16.low;
+
+            Wil = gamma0l + Wi7l;
+            Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+            Wil = Wil + gamma1l;
+            Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+            Wil = Wil + Wi16l;
+            Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+            Wi.high = Wih;
+            Wi.low = Wil;
+          }
+
+          var chh = (eh & fh) ^ (~eh & gh);
+          var chl = (el & fl) ^ (~el & gl);
+          var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+          var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+          var sigma0h = ((ah >>> 28) | (al << 4)) ^ ((ah << 30) | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+          var sigma0l = ((al >>> 28) | (ah << 4)) ^ ((al << 30) | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+          var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+          var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+          // t1 = h + sigma1 + ch + K[i] + W[i]
+          var Ki = K[i];
+          var Kih = Ki.high;
+          var Kil = Ki.low;
+
+          var t1l = hl + sigma1l;
+          var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+          var t1l = t1l + chl;
+          var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+          var t1l = t1l + Kil;
+          var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+          var t1l = t1l + Wil;
+          var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+          // t2 = sigma0 + maj
+          var t2l = sigma0l + majl;
+          var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+          // Update working variables
+          hh = gh;
+          hl = gl;
+          gh = fh;
+          gl = fl;
+          fh = eh;
+          fl = el;
+          el = (dl + t1l) | 0;
+          eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+          dh = ch;
+          dl = cl;
+          ch = bh;
+          cl = bl;
+          bh = ah;
+          bl = al;
+          al = (t1l + t2l) | 0;
+          ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+        }
+
+        // Intermediate hash value
+        H0l = H0.low = (H0l + al);
+        H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+        H1l = H1.low = (H1l + bl);
+        H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+        H2l = H2.low = (H2l + cl);
+        H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+        H3l = H3.low = (H3l + dl);
+        H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+        H4l = H4.low = (H4l + el);
+        H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+        H5l = H5.low = (H5l + fl);
+        H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+        H6l = H6.low = (H6l + gl);
+        H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+        H7l = H7.low = (H7l + hl);
+        H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+      },
+
+      _doFinalize: function () {
+        // Shortcuts
+        var data = this._data;
+        var dataWords = data.words;
+
+        var nBitsTotal = this._nDataBytes * 8;
+        var nBitsLeft = data.sigBytes * 8;
+
+        // Add padding
+        dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+        dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+        dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+        data.sigBytes = dataWords.length * 4;
+
+        // Hash final blocks
+        this._process();
+
+        // Convert hash to 32-bit word array before returning
+        var hash = this._hash.toX32();
+
+        // Return final computed hash
+        return hash;
+      },
+
+      clone: function () {
+        var clone = Hasher.clone.call(this);
+        clone._hash = this._hash.clone();
+
+        return clone;
+      },
+
+      blockSize: 1024 / 32
+    });
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.SHA512('message');
+     *     var hash = CryptoJS.SHA512(wordArray);
+     */
+    C.SHA512 = Hasher._createHelper(SHA512);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacSHA512(message, key);
+     */
+    C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_x64 = C.x64;
+    var X64Word = C_x64.Word;
+    var X64WordArray = C_x64.WordArray;
+    var C_algo = C.algo;
+    var SHA512 = C_algo.SHA512;
+
+    /**
+     * SHA-384 hash algorithm.
+     */
+    var SHA384 = C_algo.SHA384 = SHA512.extend({
+      _doReset: function () {
+        this._hash = new X64WordArray.init([
+          new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+          new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+          new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+          new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+        ]);
+      },
+
+      _doFinalize: function () {
+        var hash = SHA512._doFinalize.call(this);
+
+        hash.sigBytes -= 16;
+
+        return hash;
+      }
+    });
+
+    /**
+     * Shortcut function to the hasher's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     *
+     * @return {WordArray} The hash.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hash = CryptoJS.SHA384('message');
+     *     var hash = CryptoJS.SHA384(wordArray);
+     */
+    C.SHA384 = SHA512._createHelper(SHA384);
+
+    /**
+     * Shortcut function to the HMAC's object interface.
+     *
+     * @param {WordArray|string} message The message to hash.
+     * @param {WordArray|string} key The secret key.
+     *
+     * @return {WordArray} The HMAC.
+     *
+     * @static
+     *
+     * @example
+     *
+     *     var hmac = CryptoJS.HmacSHA384(message, key);
+     */
+    C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+  }());
+
+
+  /**
+   * Cipher core components.
+   */
+  CryptoJS.lib.Cipher || (function (undefined) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var Base = C_lib.Base;
+    var WordArray = C_lib.WordArray;
+    var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+    var C_enc = C.enc;
+    var Utf8 = C_enc.Utf8;
+    var Base64 = C_enc.Base64;
+    var C_algo = C.algo;
+    var EvpKDF = C_algo.EvpKDF;
+
+    /**
+     * Abstract base cipher template.
+     *
+     * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+     * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+     * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+     * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+     */
+    var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {WordArray} iv The IV to use for this operation.
+       */
+      cfg: Base.extend(),
+
+      /**
+       * Creates this cipher in encryption mode.
+       *
+       * @param {WordArray} key The key.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @return {Cipher} A cipher instance.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+       */
+      createEncryptor: function (key, cfg) {
+        return this.create(this._ENC_XFORM_MODE, key, cfg);
+      },
+
+      /**
+       * Creates this cipher in decryption mode.
+       *
+       * @param {WordArray} key The key.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @return {Cipher} A cipher instance.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+       */
+      createDecryptor: function (key, cfg) {
+        return this.create(this._DEC_XFORM_MODE, key, cfg);
+      },
+
+      /**
+       * Initializes a newly created cipher.
+       *
+       * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+       * @param {WordArray} key The key.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @example
+       *
+       *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+       */
+      init: function (xformMode, key, cfg) {
+        // Apply config defaults
+        this.cfg = this.cfg.extend(cfg);
+
+        // Store transform mode and key
+        this._xformMode = xformMode;
+        this._key = key;
+
+        // Set initial values
+        this.reset();
+      },
+
+      /**
+       * Resets this cipher to its initial state.
+       *
+       * @example
+       *
+       *     cipher.reset();
+       */
+      reset: function () {
+        // Reset data buffer
+        BufferedBlockAlgorithm.reset.call(this);
+
+        // Perform concrete-cipher logic
+        this._doReset();
+      },
+
+      /**
+       * Adds data to be encrypted or decrypted.
+       *
+       * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+       *
+       * @return {WordArray} The data after processing.
+       *
+       * @example
+       *
+       *     var encrypted = cipher.process('data');
+       *     var encrypted = cipher.process(wordArray);
+       */
+      process: function (dataUpdate) {
+        // Append
+        this._append(dataUpdate);
+
+        // Process available blocks
+        return this._process();
+      },
+
+      /**
+       * Finalizes the encryption or decryption process.
+       * Note that the finalize operation is effectively a destructive, read-once operation.
+       *
+       * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+       *
+       * @return {WordArray} The data after final processing.
+       *
+       * @example
+       *
+       *     var encrypted = cipher.finalize();
+       *     var encrypted = cipher.finalize('data');
+       *     var encrypted = cipher.finalize(wordArray);
+       */
+      finalize: function (dataUpdate) {
+        // Final data update
+        if (dataUpdate) {
+          this._append(dataUpdate);
+        }
+
+        // Perform concrete-cipher logic
+        var finalProcessedData = this._doFinalize();
+
+        return finalProcessedData;
+      },
+
+      keySize: 128 / 32,
+
+      ivSize: 128 / 32,
+
+      _ENC_XFORM_MODE: 1,
+
+      _DEC_XFORM_MODE: 2,
+
+      /**
+       * Creates shortcut functions to a cipher's object interface.
+       *
+       * @param {Cipher} cipher The cipher to create a helper for.
+       *
+       * @return {Object} An object with encrypt and decrypt shortcut functions.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+       */
+      _createHelper: (function () {
+        function selectCipherStrategy(key) {
+          if (typeof key == 'string') {
+            return PasswordBasedCipher;
+          } else {
+            return SerializableCipher;
+          }
+        }
+
+        return function (cipher) {
+          return {
+            encrypt: function (message, key, cfg) {
+              return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+            },
+
+            decrypt: function (ciphertext, key, cfg) {
+              return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+            }
+          };
+        };
+      }())
+    });
+
+    /**
+     * Abstract base stream cipher template.
+     *
+     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+     */
+    var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+      _doFinalize: function () {
+        // Process partial blocks
+        var finalProcessedBlocks = this._process(!!'flush');
+
+        return finalProcessedBlocks;
+      },
+
+      blockSize: 1
+    });
+
+    /**
+     * Mode namespace.
+     */
+    var C_mode = C.mode = {};
+
+    /**
+     * Abstract base block cipher mode template.
+     */
+    var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+      /**
+       * Creates this mode for encryption.
+       *
+       * @param {Cipher} cipher A block cipher instance.
+       * @param {Array} iv The IV words.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+       */
+      createEncryptor: function (cipher, iv) {
+        return this.Encryptor.create(cipher, iv);
+      },
+
+      /**
+       * Creates this mode for decryption.
+       *
+       * @param {Cipher} cipher A block cipher instance.
+       * @param {Array} iv The IV words.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+       */
+      createDecryptor: function (cipher, iv) {
+        return this.Decryptor.create(cipher, iv);
+      },
+
+      /**
+       * Initializes a newly created mode.
+       *
+       * @param {Cipher} cipher A block cipher instance.
+       * @param {Array} iv The IV words.
+       *
+       * @example
+       *
+       *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+       */
+      init: function (cipher, iv) {
+        this._cipher = cipher;
+        this._iv = iv;
+      }
+    });
+
+    /**
+     * Cipher Block Chaining mode.
+     */
+    var CBC = C_mode.CBC = (function () {
+      /**
+       * Abstract base CBC mode.
+       */
+      var CBC = BlockCipherMode.extend();
+
+      /**
+       * CBC encryptor.
+       */
+      CBC.Encryptor = CBC.extend({
+        /**
+         * Processes the data block at offset.
+         *
+         * @param {Array} words The data words to operate on.
+         * @param {number} offset The offset where the block starts.
+         *
+         * @example
+         *
+         *     mode.processBlock(data.words, offset);
+         */
+        processBlock: function (words, offset) {
+          // Shortcuts
+          var cipher = this._cipher;
+          var blockSize = cipher.blockSize;
+
+          // XOR and encrypt
+          xorBlock.call(this, words, offset, blockSize);
+          cipher.encryptBlock(words, offset);
+
+          // Remember this block to use with next block
+          this._prevBlock = words.slice(offset, offset + blockSize);
+        }
+      });
+
+      /**
+       * CBC decryptor.
+       */
+      CBC.Decryptor = CBC.extend({
+        /**
+         * Processes the data block at offset.
+         *
+         * @param {Array} words The data words to operate on.
+         * @param {number} offset The offset where the block starts.
+         *
+         * @example
+         *
+         *     mode.processBlock(data.words, offset);
+         */
+        processBlock: function (words, offset) {
+          // Shortcuts
+          var cipher = this._cipher;
+          var blockSize = cipher.blockSize;
+
+          // Remember this block to use with next block
+          var thisBlock = words.slice(offset, offset + blockSize);
+
+          // Decrypt and XOR
+          cipher.decryptBlock(words, offset);
+          xorBlock.call(this, words, offset, blockSize);
+
+          // This block becomes the previous block
+          this._prevBlock = thisBlock;
+        }
+      });
+
+      function xorBlock(words, offset, blockSize) {
+        var block;
+
+        // Shortcut
+        var iv = this._iv;
+
+        // Choose mixing block
+        if (iv) {
+          block = iv;
+
+          // Remove IV for subsequent blocks
+          this._iv = undefined;
+        } else {
+          block = this._prevBlock;
+        }
+
+        // XOR blocks
+        for (var i = 0; i < blockSize; i++) {
+          words[offset + i] ^= block[i];
+        }
+      }
+
+      return CBC;
+    }());
+
+    /**
+     * Padding namespace.
+     */
+    var C_pad = C.pad = {};
+
+    /**
+     * PKCS #5/7 padding strategy.
+     */
+    var Pkcs7 = C_pad.Pkcs7 = {
+      /**
+       * Pads data using the algorithm defined in PKCS #5/7.
+       *
+       * @param {WordArray} data The data to pad.
+       * @param {number} blockSize The multiple that the data should be padded to.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+       */
+      pad: function (data, blockSize) {
+        // Shortcut
+        var blockSizeBytes = blockSize * 4;
+
+        // Count padding bytes
+        var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+        // Create padding word
+        var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+        // Create padding
+        var paddingWords = [];
+        for (var i = 0; i < nPaddingBytes; i += 4) {
+          paddingWords.push(paddingWord);
+        }
+        var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+        // Add padding
+        data.concat(padding);
+      },
+
+      /**
+       * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+       *
+       * @param {WordArray} data The data to unpad.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+       */
+      unpad: function (data) {
+        // Get number of padding bytes from last byte
+        var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+        // Remove padding
+        data.sigBytes -= nPaddingBytes;
+      }
+    };
+
+    /**
+     * Abstract base block cipher template.
+     *
+     * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+     */
+    var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {Mode} mode The block mode to use. Default: CBC
+       * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+       */
+      cfg: Cipher.cfg.extend({
+        mode: CBC,
+        padding: Pkcs7
+      }),
+
+      reset: function () {
+        var modeCreator;
+
+        // Reset cipher
+        Cipher.reset.call(this);
+
+        // Shortcuts
+        var cfg = this.cfg;
+        var iv = cfg.iv;
+        var mode = cfg.mode;
+
+        // Reset block mode
+        if (this._xformMode == this._ENC_XFORM_MODE) {
+          modeCreator = mode.createEncryptor;
+        } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+          modeCreator = mode.createDecryptor;
+          // Keep at least one block in the buffer for unpadding
+          this._minBufferSize = 1;
+        }
+
+        if (this._mode && this._mode.__creator == modeCreator) {
+          this._mode.init(this, iv && iv.words);
+        } else {
+          this._mode = modeCreator.call(mode, this, iv && iv.words);
+          this._mode.__creator = modeCreator;
+        }
+      },
+
+      _doProcessBlock: function (words, offset) {
+        this._mode.processBlock(words, offset);
+      },
+
+      _doFinalize: function () {
+        var finalProcessedBlocks;
+
+        // Shortcut
+        var padding = this.cfg.padding;
+
+        // Finalize
+        if (this._xformMode == this._ENC_XFORM_MODE) {
+          // Pad data
+          padding.pad(this._data, this.blockSize);
+
+          // Process final blocks
+          finalProcessedBlocks = this._process(!!'flush');
+        } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+          // Process final blocks
+          finalProcessedBlocks = this._process(!!'flush');
+
+          // Unpad data
+          padding.unpad(finalProcessedBlocks);
+        }
+
+        return finalProcessedBlocks;
+      },
+
+      blockSize: 128 / 32
+    });
+
+    /**
+     * A collection of cipher parameters.
+     *
+     * @property {WordArray} ciphertext The raw ciphertext.
+     * @property {WordArray} key The key to this ciphertext.
+     * @property {WordArray} iv The IV used in the ciphering operation.
+     * @property {WordArray} salt The salt used with a key derivation function.
+     * @property {Cipher} algorithm The cipher algorithm.
+     * @property {Mode} mode The block mode used in the ciphering operation.
+     * @property {Padding} padding The padding scheme used in the ciphering operation.
+     * @property {number} blockSize The block size of the cipher.
+     * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+     */
+    var CipherParams = C_lib.CipherParams = Base.extend({
+      /**
+       * Initializes a newly created cipher params object.
+       *
+       * @param {Object} cipherParams An object with any of the possible cipher parameters.
+       *
+       * @example
+       *
+       *     var cipherParams = CryptoJS.lib.CipherParams.create({
+       *         ciphertext: ciphertextWordArray,
+       *         key: keyWordArray,
+       *         iv: ivWordArray,
+       *         salt: saltWordArray,
+       *         algorithm: CryptoJS.algo.AES,
+       *         mode: CryptoJS.mode.CBC,
+       *         padding: CryptoJS.pad.PKCS7,
+       *         blockSize: 4,
+       *         formatter: CryptoJS.format.OpenSSL
+       *     });
+       */
+      init: function (cipherParams) {
+        this.mixIn(cipherParams);
+      },
+
+      /**
+       * Converts this cipher params object to a string.
+       *
+       * @param {Format} formatter (Optional) The formatting strategy to use.
+       *
+       * @return {string} The stringified cipher params.
+       *
+       * @throws Error If neither the formatter nor the default formatter is set.
+       *
+       * @example
+       *
+       *     var string = cipherParams + '';
+       *     var string = cipherParams.toString();
+       *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+       */
+      toString: function (formatter) {
+        return (formatter || this.formatter).stringify(this);
+      }
+    });
+
+    /**
+     * Format namespace.
+     */
+    var C_format = C.format = {};
+
+    /**
+     * OpenSSL formatting strategy.
+     */
+    var OpenSSLFormatter = C_format.OpenSSL = {
+      /**
+       * Converts a cipher params object to an OpenSSL-compatible string.
+       *
+       * @param {CipherParams} cipherParams The cipher params object.
+       *
+       * @return {string} The OpenSSL-compatible string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+       */
+      stringify: function (cipherParams) {
+        var wordArray;
+
+        // Shortcuts
+        var ciphertext = cipherParams.ciphertext;
+        var salt = cipherParams.salt;
+
+        // Format
+        if (salt) {
+          wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+        } else {
+          wordArray = ciphertext;
+        }
+
+        return wordArray.toString(Base64);
+      },
+
+      /**
+       * Converts an OpenSSL-compatible string to a cipher params object.
+       *
+       * @param {string} openSSLStr The OpenSSL-compatible string.
+       *
+       * @return {CipherParams} The cipher params object.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+       */
+      parse: function (openSSLStr) {
+        var salt;
+
+        // Parse base64
+        var ciphertext = Base64.parse(openSSLStr);
+
+        // Shortcut
+        var ciphertextWords = ciphertext.words;
+
+        // Test for salt
+        if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+          // Extract salt
+          salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+          // Remove salt from ciphertext
+          ciphertextWords.splice(0, 4);
+          ciphertext.sigBytes -= 16;
+        }
+
+        return CipherParams.create({ciphertext: ciphertext, salt: salt});
+      }
+    };
+
+    /**
+     * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+     */
+    var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+       */
+      cfg: Base.extend({
+        format: OpenSSLFormatter
+      }),
+
+      /**
+       * Encrypts a message.
+       *
+       * @param {Cipher} cipher The cipher algorithm to use.
+       * @param {WordArray|string} message The message to encrypt.
+       * @param {WordArray} key The key.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @return {CipherParams} A cipher params object.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+       *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+       *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+       */
+      encrypt: function (cipher, message, key, cfg) {
+        // Apply config defaults
+        cfg = this.cfg.extend(cfg);
+
+        // Encrypt
+        var encryptor = cipher.createEncryptor(key, cfg);
+        var ciphertext = encryptor.finalize(message);
+
+        // Shortcut
+        var cipherCfg = encryptor.cfg;
+
+        // Create and return serializable cipher params
+        return CipherParams.create({
+          ciphertext: ciphertext,
+          key: key,
+          iv: cipherCfg.iv,
+          algorithm: cipher,
+          mode: cipherCfg.mode,
+          padding: cipherCfg.padding,
+          blockSize: cipher.blockSize,
+          formatter: cfg.format
+        });
+      },
+
+      /**
+       * Decrypts serialized ciphertext.
+       *
+       * @param {Cipher} cipher The cipher algorithm to use.
+       * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+       * @param {WordArray} key The key.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @return {WordArray} The plaintext.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+       *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+       */
+      decrypt: function (cipher, ciphertext, key, cfg) {
+        // Apply config defaults
+        cfg = this.cfg.extend(cfg);
+
+        // Convert string to CipherParams
+        ciphertext = this._parse(ciphertext, cfg.format);
+
+        // Decrypt
+        var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+        return plaintext;
+      },
+
+      /**
+       * Converts serialized ciphertext to CipherParams,
+       * else assumed CipherParams already and returns ciphertext unchanged.
+       *
+       * @param {CipherParams|string} ciphertext The ciphertext.
+       * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+       *
+       * @return {CipherParams} The unserialized ciphertext.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+       */
+      _parse: function (ciphertext, format) {
+        if (typeof ciphertext == 'string') {
+          return format.parse(ciphertext, this);
+        } else {
+          return ciphertext;
+        }
+      }
+    });
+
+    /**
+     * Key derivation function namespace.
+     */
+    var C_kdf = C.kdf = {};
+
+    /**
+     * OpenSSL key derivation function.
+     */
+    var OpenSSLKdf = C_kdf.OpenSSL = {
+      /**
+       * Derives a key and IV from a password.
+       *
+       * @param {string} password The password to derive from.
+       * @param {number} keySize The size in words of the key to generate.
+       * @param {number} ivSize The size in words of the IV to generate.
+       * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+       *
+       * @return {CipherParams} A cipher params object with the key, IV, and salt.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+       *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+       */
+      execute: function (password, keySize, ivSize, salt) {
+        // Generate random salt
+        if (!salt) {
+          salt = WordArray.random(64 / 8);
+        }
+
+        // Derive key and IV
+        var key = EvpKDF.create({keySize: keySize + ivSize}).compute(password, salt);
+
+        // Separate key and IV
+        var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+        key.sigBytes = keySize * 4;
+
+        // Return params
+        return CipherParams.create({key: key, iv: iv, salt: salt});
+      }
+    };
+
+    /**
+     * A serializable cipher wrapper that derives the key from a password,
+     * and returns ciphertext as a serializable cipher params object.
+     */
+    var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+       */
+      cfg: SerializableCipher.cfg.extend({
+        kdf: OpenSSLKdf
+      }),
+
+      /**
+       * Encrypts a message using a password.
+       *
+       * @param {Cipher} cipher The cipher algorithm to use.
+       * @param {WordArray|string} message The message to encrypt.
+       * @param {string} password The password.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @return {CipherParams} A cipher params object.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+       *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+       */
+      encrypt: function (cipher, message, password, cfg) {
+        // Apply config defaults
+        cfg = this.cfg.extend(cfg);
+
+        // Derive key and other params
+        var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize);
+
+        // Add IV to config
+        cfg.iv = derivedParams.iv;
+
+        // Encrypt
+        var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+        // Mix in derived params
+        ciphertext.mixIn(derivedParams);
+
+        return ciphertext;
+      },
+
+      /**
+       * Decrypts serialized ciphertext using a password.
+       *
+       * @param {Cipher} cipher The cipher algorithm to use.
+       * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+       * @param {string} password The password.
+       * @param {Object} cfg (Optional) The configuration options to use for this operation.
+       *
+       * @return {WordArray} The plaintext.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+       *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+       */
+      decrypt: function (cipher, ciphertext, password, cfg) {
+        // Apply config defaults
+        cfg = this.cfg.extend(cfg);
+
+        // Convert string to CipherParams
+        ciphertext = this._parse(ciphertext, cfg.format);
+
+        // Derive key and other params
+        var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt);
+
+        // Add IV to config
+        cfg.iv = derivedParams.iv;
+
+        // Decrypt
+        var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+        return plaintext;
+      }
+    });
+  }());
+
+
+  /**
+   * Cipher Feedback block mode.
+   */
+  CryptoJS.mode.CFB = (function () {
+    var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+    CFB.Encryptor = CFB.extend({
+      processBlock: function (words, offset) {
+        // Shortcuts
+        var cipher = this._cipher;
+        var blockSize = cipher.blockSize;
+
+        generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+        // Remember this block to use with next block
+        this._prevBlock = words.slice(offset, offset + blockSize);
+      }
+    });
+
+    CFB.Decryptor = CFB.extend({
+      processBlock: function (words, offset) {
+        // Shortcuts
+        var cipher = this._cipher;
+        var blockSize = cipher.blockSize;
+
+        // Remember this block to use with next block
+        var thisBlock = words.slice(offset, offset + blockSize);
+
+        generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+        // This block becomes the previous block
+        this._prevBlock = thisBlock;
+      }
+    });
+
+    function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+      var keystream;
+
+      // Shortcut
+      var iv = this._iv;
+
+      // Generate keystream
+      if (iv) {
+        keystream = iv.slice(0);
+
+        // Remove IV for subsequent blocks
+        this._iv = undefined;
+      } else {
+        keystream = this._prevBlock;
+      }
+      cipher.encryptBlock(keystream, 0);
+
+      // Encrypt
+      for (var i = 0; i < blockSize; i++) {
+        words[offset + i] ^= keystream[i];
+      }
+    }
+
+    return CFB;
+  }());
+
+
+  /**
+   * Electronic Codebook block mode.
+   */
+  CryptoJS.mode.ECB = (function () {
+    var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+    ECB.Encryptor = ECB.extend({
+      processBlock: function (words, offset) {
+        this._cipher.encryptBlock(words, offset);
+      }
+    });
+
+    ECB.Decryptor = ECB.extend({
+      processBlock: function (words, offset) {
+        this._cipher.decryptBlock(words, offset);
+      }
+    });
+
+    return ECB;
+  }());
+
+
+  /**
+   * ANSI X.923 padding strategy.
+   */
+  CryptoJS.pad.AnsiX923 = {
+    pad: function (data, blockSize) {
+      // Shortcuts
+      var dataSigBytes = data.sigBytes;
+      var blockSizeBytes = blockSize * 4;
+
+      // Count padding bytes
+      var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+      // Compute last byte position
+      var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+      // Pad
+      data.clamp();
+      data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+      data.sigBytes += nPaddingBytes;
+    },
+
+    unpad: function (data) {
+      // Get number of padding bytes from last byte
+      var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+      // Remove padding
+      data.sigBytes -= nPaddingBytes;
+    }
+  };
+
+
+  /**
+   * ISO 10126 padding strategy.
+   */
+  CryptoJS.pad.Iso10126 = {
+    pad: function (data, blockSize) {
+      // Shortcut
+      var blockSizeBytes = blockSize * 4;
+
+      // Count padding bytes
+      var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+      // Pad
+      data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+    },
+
+    unpad: function (data) {
+      // Get number of padding bytes from last byte
+      var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+      // Remove padding
+      data.sigBytes -= nPaddingBytes;
+    }
+  };
+
+
+  /**
+   * ISO/IEC 9797-1 Padding Method 2.
+   */
+  CryptoJS.pad.Iso97971 = {
+    pad: function (data, blockSize) {
+      // Add 0x80 byte
+      data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+      // Zero pad the rest
+      CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+    },
+
+    unpad: function (data) {
+      // Remove zero padding
+      CryptoJS.pad.ZeroPadding.unpad(data);
+
+      // Remove one more byte -- the 0x80 byte
+      data.sigBytes--;
+    }
+  };
+
+
+  /**
+   * Output Feedback block mode.
+   */
+  CryptoJS.mode.OFB = (function () {
+    var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+    var Encryptor = OFB.Encryptor = OFB.extend({
+      processBlock: function (words, offset) {
+        // Shortcuts
+        var cipher = this._cipher
+        var blockSize = cipher.blockSize;
+        var iv = this._iv;
+        var keystream = this._keystream;
+
+        // Generate keystream
+        if (iv) {
+          keystream = this._keystream = iv.slice(0);
+
+          // Remove IV for subsequent blocks
+          this._iv = undefined;
+        }
+        cipher.encryptBlock(keystream, 0);
+
+        // Encrypt
+        for (var i = 0; i < blockSize; i++) {
+          words[offset + i] ^= keystream[i];
+        }
+      }
+    });
+
+    OFB.Decryptor = Encryptor;
+
+    return OFB;
+  }());
+
+
+  /**
+   * A noop padding strategy.
+   */
+  CryptoJS.pad.NoPadding = {
+    pad: function () {
+    },
+
+    unpad: function () {
+    }
+  };
+
+
+  (function (undefined) {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var CipherParams = C_lib.CipherParams;
+    var C_enc = C.enc;
+    var Hex = C_enc.Hex;
+    var C_format = C.format;
+
+    var HexFormatter = C_format.Hex = {
+      /**
+       * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+       *
+       * @param {CipherParams} cipherParams The cipher params object.
+       *
+       * @return {string} The hexadecimally encoded string.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+       */
+      stringify: function (cipherParams) {
+        return cipherParams.ciphertext.toString(Hex);
+      },
+
+      /**
+       * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+       *
+       * @param {string} input The hexadecimally encoded string.
+       *
+       * @return {CipherParams} The cipher params object.
+       *
+       * @static
+       *
+       * @example
+       *
+       *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
+       */
+      parse: function (input) {
+        var ciphertext = Hex.parse(input);
+        return CipherParams.create({ciphertext: ciphertext});
+      }
+    };
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var BlockCipher = C_lib.BlockCipher;
+    var C_algo = C.algo;
+
+    // Lookup tables
+    var SBOX = [];
+    var INV_SBOX = [];
+    var SUB_MIX_0 = [];
+    var SUB_MIX_1 = [];
+    var SUB_MIX_2 = [];
+    var SUB_MIX_3 = [];
+    var INV_SUB_MIX_0 = [];
+    var INV_SUB_MIX_1 = [];
+    var INV_SUB_MIX_2 = [];
+    var INV_SUB_MIX_3 = [];
+
+    // Compute lookup tables
+    (function () {
+      // Compute double table
+      var d = [];
+      for (var i = 0; i < 256; i++) {
+        if (i < 128) {
+          d[i] = i << 1;
+        } else {
+          d[i] = (i << 1) ^ 0x11b;
+        }
+      }
+
+      // Walk GF(2^8)
+      var x = 0;
+      var xi = 0;
+      for (var i = 0; i < 256; i++) {
+        // Compute sbox
+        var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+        sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+        SBOX[x] = sx;
+        INV_SBOX[sx] = x;
+
+        // Compute multiplication
+        var x2 = d[x];
+        var x4 = d[x2];
+        var x8 = d[x4];
+
+        // Compute sub bytes, mix columns tables
+        var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+        SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+        SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+        SUB_MIX_2[x] = (t << 8) | (t >>> 24);
+        SUB_MIX_3[x] = t;
+
+        // Compute inv sub bytes, inv mix columns tables
+        var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+        INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+        INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+        INV_SUB_MIX_2[sx] = (t << 8) | (t >>> 24);
+        INV_SUB_MIX_3[sx] = t;
+
+        // Compute next counter
+        if (!x) {
+          x = xi = 1;
+        } else {
+          x = x2 ^ d[d[d[x8 ^ x2]]];
+          xi ^= d[d[xi]];
+        }
+      }
+    }());
+
+    // Precomputed Rcon lookup
+    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+    /**
+     * AES block cipher algorithm.
+     */
+    var AES = C_algo.AES = BlockCipher.extend({
+      _doReset: function () {
+        var t;
+
+        // Skip reset of nRounds has been set before and key did not change
+        if (this._nRounds && this._keyPriorReset === this._key) {
+          return;
+        }
+
+        // Shortcuts
+        var key = this._keyPriorReset = this._key;
+        var keyWords = key.words;
+        var keySize = key.sigBytes / 4;
+
+        // Compute number of rounds
+        var nRounds = this._nRounds = keySize + 6;
+
+        // Compute number of key schedule rows
+        var ksRows = (nRounds + 1) * 4;
+
+        // Compute key schedule
+        var keySchedule = this._keySchedule = [];
+        for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+          if (ksRow < keySize) {
+            keySchedule[ksRow] = keyWords[ksRow];
+          } else {
+            t = keySchedule[ksRow - 1];
+
+            if (!(ksRow % keySize)) {
+              // Rot word
+              t = (t << 8) | (t >>> 24);
+
+              // Sub word
+              t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+              // Mix Rcon
+              t ^= RCON[(ksRow / keySize) | 0] << 24;
+            } else if (keySize > 6 && ksRow % keySize == 4) {
+              // Sub word
+              t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+            }
+
+            keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+          }
+        }
+
+        // Compute inv key schedule
+        var invKeySchedule = this._invKeySchedule = [];
+        for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+          var ksRow = ksRows - invKsRow;
+
+          if (invKsRow % 4) {
+            var t = keySchedule[ksRow];
+          } else {
+            var t = keySchedule[ksRow - 4];
+          }
+
+          if (invKsRow < 4 || ksRow <= 4) {
+            invKeySchedule[invKsRow] = t;
+          } else {
+            invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+                INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+          }
+        }
+      },
+
+      encryptBlock: function (M, offset) {
+        this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+      },
+
+      decryptBlock: function (M, offset) {
+        // Swap 2nd and 4th rows
+        var t = M[offset + 1];
+        M[offset + 1] = M[offset + 3];
+        M[offset + 3] = t;
+
+        this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+        // Inv swap 2nd and 4th rows
+        var t = M[offset + 1];
+        M[offset + 1] = M[offset + 3];
+        M[offset + 3] = t;
+      },
+
+      _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+        // Shortcut
+        var nRounds = this._nRounds;
+
+        // Get input, add round key
+        var s0 = M[offset] ^ keySchedule[0];
+        var s1 = M[offset + 1] ^ keySchedule[1];
+        var s2 = M[offset + 2] ^ keySchedule[2];
+        var s3 = M[offset + 3] ^ keySchedule[3];
+
+        // Key schedule row counter
+        var ksRow = 4;
+
+        // Rounds
+        for (var round = 1; round < nRounds; round++) {
+          // Shift rows, sub bytes, mix columns, add round key
+          var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+          var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+          var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+          var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+          // Update state
+          s0 = t0;
+          s1 = t1;
+          s2 = t2;
+          s3 = t3;
+        }
+
+        // Shift rows, sub bytes, add round key
+        var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+        var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+        var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+        var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+        // Set output
+        M[offset] = t0;
+        M[offset + 1] = t1;
+        M[offset + 2] = t2;
+        M[offset + 3] = t3;
+      },
+
+      keySize: 256 / 32
+    });
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+     */
+    C.AES = BlockCipher._createHelper(AES);
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var WordArray = C_lib.WordArray;
+    var BlockCipher = C_lib.BlockCipher;
+    var C_algo = C.algo;
+
+    // Permuted Choice 1 constants
+    var PC1 = [
+      57, 49, 41, 33, 25, 17, 9, 1,
+      58, 50, 42, 34, 26, 18, 10, 2,
+      59, 51, 43, 35, 27, 19, 11, 3,
+      60, 52, 44, 36, 63, 55, 47, 39,
+      31, 23, 15, 7, 62, 54, 46, 38,
+      30, 22, 14, 6, 61, 53, 45, 37,
+      29, 21, 13, 5, 28, 20, 12, 4
+    ];
+
+    // Permuted Choice 2 constants
+    var PC2 = [
+      14, 17, 11, 24, 1, 5,
+      3, 28, 15, 6, 21, 10,
+      23, 19, 12, 4, 26, 8,
+      16, 7, 27, 20, 13, 2,
+      41, 52, 31, 37, 47, 55,
+      30, 40, 51, 45, 33, 48,
+      44, 49, 39, 56, 34, 53,
+      46, 42, 50, 36, 29, 32
+    ];
+
+    // Cumulative bit shift constants
+    var BIT_SHIFTS = [1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+    // SBOXes and round permutation constants
+    var SBOX_P = [
+      {
+        0x0: 0x808200,
+        0x10000000: 0x8000,
+        0x20000000: 0x808002,
+        0x30000000: 0x2,
+        0x40000000: 0x200,
+        0x50000000: 0x808202,
+        0x60000000: 0x800202,
+        0x70000000: 0x800000,
+        0x80000000: 0x202,
+        0x90000000: 0x800200,
+        0xa0000000: 0x8200,
+        0xb0000000: 0x808000,
+        0xc0000000: 0x8002,
+        0xd0000000: 0x800002,
+        0xe0000000: 0x0,
+        0xf0000000: 0x8202,
+        0x8000000: 0x0,
+        0x18000000: 0x808202,
+        0x28000000: 0x8202,
+        0x38000000: 0x8000,
+        0x48000000: 0x808200,
+        0x58000000: 0x200,
+        0x68000000: 0x808002,
+        0x78000000: 0x2,
+        0x88000000: 0x800200,
+        0x98000000: 0x8200,
+        0xa8000000: 0x808000,
+        0xb8000000: 0x800202,
+        0xc8000000: 0x800002,
+        0xd8000000: 0x8002,
+        0xe8000000: 0x202,
+        0xf8000000: 0x800000,
+        0x1: 0x8000,
+        0x10000001: 0x2,
+        0x20000001: 0x808200,
+        0x30000001: 0x800000,
+        0x40000001: 0x808002,
+        0x50000001: 0x8200,
+        0x60000001: 0x200,
+        0x70000001: 0x800202,
+        0x80000001: 0x808202,
+        0x90000001: 0x808000,
+        0xa0000001: 0x800002,
+        0xb0000001: 0x8202,
+        0xc0000001: 0x202,
+        0xd0000001: 0x800200,
+        0xe0000001: 0x8002,
+        0xf0000001: 0x0,
+        0x8000001: 0x808202,
+        0x18000001: 0x808000,
+        0x28000001: 0x800000,
+        0x38000001: 0x200,
+        0x48000001: 0x8000,
+        0x58000001: 0x800002,
+        0x68000001: 0x2,
+        0x78000001: 0x8202,
+        0x88000001: 0x8002,
+        0x98000001: 0x800202,
+        0xa8000001: 0x202,
+        0xb8000001: 0x808200,
+        0xc8000001: 0x800200,
+        0xd8000001: 0x0,
+        0xe8000001: 0x8200,
+        0xf8000001: 0x808002
+      },
+      {
+        0x0: 0x40084010,
+        0x1000000: 0x4000,
+        0x2000000: 0x80000,
+        0x3000000: 0x40080010,
+        0x4000000: 0x40000010,
+        0x5000000: 0x40084000,
+        0x6000000: 0x40004000,
+        0x7000000: 0x10,
+        0x8000000: 0x84000,
+        0x9000000: 0x40004010,
+        0xa000000: 0x40000000,
+        0xb000000: 0x84010,
+        0xc000000: 0x80010,
+        0xd000000: 0x0,
+        0xe000000: 0x4010,
+        0xf000000: 0x40080000,
+        0x800000: 0x40004000,
+        0x1800000: 0x84010,
+        0x2800000: 0x10,
+        0x3800000: 0x40004010,
+        0x4800000: 0x40084010,
+        0x5800000: 0x40000000,
+        0x6800000: 0x80000,
+        0x7800000: 0x40080010,
+        0x8800000: 0x80010,
+        0x9800000: 0x0,
+        0xa800000: 0x4000,
+        0xb800000: 0x40080000,
+        0xc800000: 0x40000010,
+        0xd800000: 0x84000,
+        0xe800000: 0x40084000,
+        0xf800000: 0x4010,
+        0x10000000: 0x0,
+        0x11000000: 0x40080010,
+        0x12000000: 0x40004010,
+        0x13000000: 0x40084000,
+        0x14000000: 0x40080000,
+        0x15000000: 0x10,
+        0x16000000: 0x84010,
+        0x17000000: 0x4000,
+        0x18000000: 0x4010,
+        0x19000000: 0x80000,
+        0x1a000000: 0x80010,
+        0x1b000000: 0x40000010,
+        0x1c000000: 0x84000,
+        0x1d000000: 0x40004000,
+        0x1e000000: 0x40000000,
+        0x1f000000: 0x40084010,
+        0x10800000: 0x84010,
+        0x11800000: 0x80000,
+        0x12800000: 0x40080000,
+        0x13800000: 0x4000,
+        0x14800000: 0x40004000,
+        0x15800000: 0x40084010,
+        0x16800000: 0x10,
+        0x17800000: 0x40000000,
+        0x18800000: 0x40084000,
+        0x19800000: 0x40000010,
+        0x1a800000: 0x40004010,
+        0x1b800000: 0x80010,
+        0x1c800000: 0x0,
+        0x1d800000: 0x4010,
+        0x1e800000: 0x40080010,
+        0x1f800000: 0x84000
+      },
+      {
+        0x0: 0x104,
+        0x100000: 0x0,
+        0x200000: 0x4000100,
+        0x300000: 0x10104,
+        0x400000: 0x10004,
+        0x500000: 0x4000004,
+        0x600000: 0x4010104,
+        0x700000: 0x4010000,
+        0x800000: 0x4000000,
+        0x900000: 0x4010100,
+        0xa00000: 0x10100,
+        0xb00000: 0x4010004,
+        0xc00000: 0x4000104,
+        0xd00000: 0x10000,
+        0xe00000: 0x4,
+        0xf00000: 0x100,
+        0x80000: 0x4010100,
+        0x180000: 0x4010004,
+        0x280000: 0x0,
+        0x380000: 0x4000100,
+        0x480000: 0x4000004,
+        0x580000: 0x10000,
+        0x680000: 0x10004,
+        0x780000: 0x104,
+        0x880000: 0x4,
+        0x980000: 0x100,
+        0xa80000: 0x4010000,
+        0xb80000: 0x10104,
+        0xc80000: 0x10100,
+        0xd80000: 0x4000104,
+        0xe80000: 0x4010104,
+        0xf80000: 0x4000000,
+        0x1000000: 0x4010100,
+        0x1100000: 0x10004,
+        0x1200000: 0x10000,
+        0x1300000: 0x4000100,
+        0x1400000: 0x100,
+        0x1500000: 0x4010104,
+        0x1600000: 0x4000004,
+        0x1700000: 0x0,
+        0x1800000: 0x4000104,
+        0x1900000: 0x4000000,
+        0x1a00000: 0x4,
+        0x1b00000: 0x10100,
+        0x1c00000: 0x4010000,
+        0x1d00000: 0x104,
+        0x1e00000: 0x10104,
+        0x1f00000: 0x4010004,
+        0x1080000: 0x4000000,
+        0x1180000: 0x104,
+        0x1280000: 0x4010100,
+        0x1380000: 0x0,
+        0x1480000: 0x10004,
+        0x1580000: 0x4000100,
+        0x1680000: 0x100,
+        0x1780000: 0x4010004,
+        0x1880000: 0x10000,
+        0x1980000: 0x4010104,
+        0x1a80000: 0x10104,
+        0x1b80000: 0x4000004,
+        0x1c80000: 0x4000104,
+        0x1d80000: 0x4010000,
+        0x1e80000: 0x4,
+        0x1f80000: 0x10100
+      },
+      {
+        0x0: 0x80401000,
+        0x10000: 0x80001040,
+        0x20000: 0x401040,
+        0x30000: 0x80400000,
+        0x40000: 0x0,
+        0x50000: 0x401000,
+        0x60000: 0x80000040,
+        0x70000: 0x400040,
+        0x80000: 0x80000000,
+        0x90000: 0x400000,
+        0xa0000: 0x40,
+        0xb0000: 0x80001000,
+        0xc0000: 0x80400040,
+        0xd0000: 0x1040,
+        0xe0000: 0x1000,
+        0xf0000: 0x80401040,
+        0x8000: 0x80001040,
+        0x18000: 0x40,
+        0x28000: 0x80400040,
+        0x38000: 0x80001000,
+        0x48000: 0x401000,
+        0x58000: 0x80401040,
+        0x68000: 0x0,
+        0x78000: 0x80400000,
+        0x88000: 0x1000,
+        0x98000: 0x80401000,
+        0xa8000: 0x400000,
+        0xb8000: 0x1040,
+        0xc8000: 0x80000000,
+        0xd8000: 0x400040,
+        0xe8000: 0x401040,
+        0xf8000: 0x80000040,
+        0x100000: 0x400040,
+        0x110000: 0x401000,
+        0x120000: 0x80000040,
+        0x130000: 0x0,
+        0x140000: 0x1040,
+        0x150000: 0x80400040,
+        0x160000: 0x80401000,
+        0x170000: 0x80001040,
+        0x180000: 0x80401040,
+        0x190000: 0x80000000,
+        0x1a0000: 0x80400000,
+        0x1b0000: 0x401040,
+        0x1c0000: 0x80001000,
+        0x1d0000: 0x400000,
+        0x1e0000: 0x40,
+        0x1f0000: 0x1000,
+        0x108000: 0x80400000,
+        0x118000: 0x80401040,
+        0x128000: 0x0,
+        0x138000: 0x401000,
+        0x148000: 0x400040,
+        0x158000: 0x80000000,
+        0x168000: 0x80001040,
+        0x178000: 0x40,
+        0x188000: 0x80000040,
+        0x198000: 0x1000,
+        0x1a8000: 0x80001000,
+        0x1b8000: 0x80400040,
+        0x1c8000: 0x1040,
+        0x1d8000: 0x80401000,
+        0x1e8000: 0x400000,
+        0x1f8000: 0x401040
+      },
+      {
+        0x0: 0x80,
+        0x1000: 0x1040000,
+        0x2000: 0x40000,
+        0x3000: 0x20000000,
+        0x4000: 0x20040080,
+        0x5000: 0x1000080,
+        0x6000: 0x21000080,
+        0x7000: 0x40080,
+        0x8000: 0x1000000,
+        0x9000: 0x20040000,
+        0xa000: 0x20000080,
+        0xb000: 0x21040080,
+        0xc000: 0x21040000,
+        0xd000: 0x0,
+        0xe000: 0x1040080,
+        0xf000: 0x21000000,
+        0x800: 0x1040080,
+        0x1800: 0x21000080,
+        0x2800: 0x80,
+        0x3800: 0x1040000,
+        0x4800: 0x40000,
+        0x5800: 0x20040080,
+        0x6800: 0x21040000,
+        0x7800: 0x20000000,
+        0x8800: 0x20040000,
+        0x9800: 0x0,
+        0xa800: 0x21040080,
+        0xb800: 0x1000080,
+        0xc800: 0x20000080,
+        0xd800: 0x21000000,
+        0xe800: 0x1000000,
+        0xf800: 0x40080,
+        0x10000: 0x40000,
+        0x11000: 0x80,
+        0x12000: 0x20000000,
+        0x13000: 0x21000080,
+        0x14000: 0x1000080,
+        0x15000: 0x21040000,
+        0x16000: 0x20040080,
+        0x17000: 0x1000000,
+        0x18000: 0x21040080,
+        0x19000: 0x21000000,
+        0x1a000: 0x1040000,
+        0x1b000: 0x20040000,
+        0x1c000: 0x40080,
+        0x1d000: 0x20000080,
+        0x1e000: 0x0,
+        0x1f000: 0x1040080,
+        0x10800: 0x21000080,
+        0x11800: 0x1000000,
+        0x12800: 0x1040000,
+        0x13800: 0x20040080,
+        0x14800: 0x20000000,
+        0x15800: 0x1040080,
+        0x16800: 0x80,
+        0x17800: 0x21040000,
+        0x18800: 0x40080,
+        0x19800: 0x21040080,
+        0x1a800: 0x0,
+        0x1b800: 0x21000000,
+        0x1c800: 0x1000080,
+        0x1d800: 0x40000,
+        0x1e800: 0x20040000,
+        0x1f800: 0x20000080
+      },
+      {
+        0x0: 0x10000008,
+        0x100: 0x2000,
+        0x200: 0x10200000,
+        0x300: 0x10202008,
+        0x400: 0x10002000,
+        0x500: 0x200000,
+        0x600: 0x200008,
+        0x700: 0x10000000,
+        0x800: 0x0,
+        0x900: 0x10002008,
+        0xa00: 0x202000,
+        0xb00: 0x8,
+        0xc00: 0x10200008,
+        0xd00: 0x202008,
+        0xe00: 0x2008,
+        0xf00: 0x10202000,
+        0x80: 0x10200000,
+        0x180: 0x10202008,
+        0x280: 0x8,
+        0x380: 0x200000,
+        0x480: 0x202008,
+        0x580: 0x10000008,
+        0x680: 0x10002000,
+        0x780: 0x2008,
+        0x880: 0x200008,
+        0x980: 0x2000,
+        0xa80: 0x10002008,
+        0xb80: 0x10200008,
+        0xc80: 0x0,
+        0xd80: 0x10202000,
+        0xe80: 0x202000,
+        0xf80: 0x10000000,
+        0x1000: 0x10002000,
+        0x1100: 0x10200008,
+        0x1200: 0x10202008,
+        0x1300: 0x2008,
+        0x1400: 0x200000,
+        0x1500: 0x10000000,
+        0x1600: 0x10000008,
+        0x1700: 0x202000,
+        0x1800: 0x202008,
+        0x1900: 0x0,
+        0x1a00: 0x8,
+        0x1b00: 0x10200000,
+        0x1c00: 0x2000,
+        0x1d00: 0x10002008,
+        0x1e00: 0x10202000,
+        0x1f00: 0x200008,
+        0x1080: 0x8,
+        0x1180: 0x202000,
+        0x1280: 0x200000,
+        0x1380: 0x10000008,
+        0x1480: 0x10002000,
+        0x1580: 0x2008,
+        0x1680: 0x10202008,
+        0x1780: 0x10200000,
+        0x1880: 0x10202000,
+        0x1980: 0x10200008,
+        0x1a80: 0x2000,
+        0x1b80: 0x202008,
+        0x1c80: 0x200008,
+        0x1d80: 0x0,
+        0x1e80: 0x10000000,
+        0x1f80: 0x10002008
+      },
+      {
+        0x0: 0x100000,
+        0x10: 0x2000401,
+        0x20: 0x400,
+        0x30: 0x100401,
+        0x40: 0x2100401,
+        0x50: 0x0,
+        0x60: 0x1,
+        0x70: 0x2100001,
+        0x80: 0x2000400,
+        0x90: 0x100001,
+        0xa0: 0x2000001,
+        0xb0: 0x2100400,
+        0xc0: 0x2100000,
+        0xd0: 0x401,
+        0xe0: 0x100400,
+        0xf0: 0x2000000,
+        0x8: 0x2100001,
+        0x18: 0x0,
+        0x28: 0x2000401,
+        0x38: 0x2100400,
+        0x48: 0x100000,
+        0x58: 0x2000001,
+        0x68: 0x2000000,
+        0x78: 0x401,
+        0x88: 0x100401,
+        0x98: 0x2000400,
+        0xa8: 0x2100000,
+        0xb8: 0x100001,
+        0xc8: 0x400,
+        0xd8: 0x2100401,
+        0xe8: 0x1,
+        0xf8: 0x100400,
+        0x100: 0x2000000,
+        0x110: 0x100000,
+        0x120: 0x2000401,
+        0x130: 0x2100001,
+        0x140: 0x100001,
+        0x150: 0x2000400,
+        0x160: 0x2100400,
+        0x170: 0x100401,
+        0x180: 0x401,
+        0x190: 0x2100401,
+        0x1a0: 0x100400,
+        0x1b0: 0x1,
+        0x1c0: 0x0,
+        0x1d0: 0x2100000,
+        0x1e0: 0x2000001,
+        0x1f0: 0x400,
+        0x108: 0x100400,
+        0x118: 0x2000401,
+        0x128: 0x2100001,
+        0x138: 0x1,
+        0x148: 0x2000000,
+        0x158: 0x100000,
+        0x168: 0x401,
+        0x178: 0x2100400,
+        0x188: 0x2000001,
+        0x198: 0x2100000,
+        0x1a8: 0x0,
+        0x1b8: 0x2100401,
+        0x1c8: 0x100401,
+        0x1d8: 0x400,
+        0x1e8: 0x2000400,
+        0x1f8: 0x100001
+      },
+      {
+        0x0: 0x8000820,
+        0x1: 0x20000,
+        0x2: 0x8000000,
+        0x3: 0x20,
+        0x4: 0x20020,
+        0x5: 0x8020820,
+        0x6: 0x8020800,
+        0x7: 0x800,
+        0x8: 0x8020000,
+        0x9: 0x8000800,
+        0xa: 0x20800,
+        0xb: 0x8020020,
+        0xc: 0x820,
+        0xd: 0x0,
+        0xe: 0x8000020,
+        0xf: 0x20820,
+        0x80000000: 0x800,
+        0x80000001: 0x8020820,
+        0x80000002: 0x8000820,
+        0x80000003: 0x8000000,
+        0x80000004: 0x8020000,
+        0x80000005: 0x20800,
+        0x80000006: 0x20820,
+        0x80000007: 0x20,
+        0x80000008: 0x8000020,
+        0x80000009: 0x820,
+        0x8000000a: 0x20020,
+        0x8000000b: 0x8020800,
+        0x8000000c: 0x0,
+        0x8000000d: 0x8020020,
+        0x8000000e: 0x8000800,
+        0x8000000f: 0x20000,
+        0x10: 0x20820,
+        0x11: 0x8020800,
+        0x12: 0x20,
+        0x13: 0x800,
+        0x14: 0x8000800,
+        0x15: 0x8000020,
+        0x16: 0x8020020,
+        0x17: 0x20000,
+        0x18: 0x0,
+        0x19: 0x20020,
+        0x1a: 0x8020000,
+        0x1b: 0x8000820,
+        0x1c: 0x8020820,
+        0x1d: 0x20800,
+        0x1e: 0x820,
+        0x1f: 0x8000000,
+        0x80000010: 0x20000,
+        0x80000011: 0x800,
+        0x80000012: 0x8020020,
+        0x80000013: 0x20820,
+        0x80000014: 0x20,
+        0x80000015: 0x8020000,
+        0x80000016: 0x8000000,
+        0x80000017: 0x8000820,
+        0x80000018: 0x8020820,
+        0x80000019: 0x8000020,
+        0x8000001a: 0x8000800,
+        0x8000001b: 0x0,
+        0x8000001c: 0x20800,
+        0x8000001d: 0x820,
+        0x8000001e: 0x20020,
+        0x8000001f: 0x8020800
+      }
+    ];
+
+    // Masks that select the SBOX input
+    var SBOX_MASK = [
+      0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+      0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+    ];
+
+    /**
+     * DES block cipher algorithm.
+     */
+    var DES = C_algo.DES = BlockCipher.extend({
+      _doReset: function () {
+        // Shortcuts
+        var key = this._key;
+        var keyWords = key.words;
+
+        // Select 56 bits according to PC1
+        var keyBits = [];
+        for (var i = 0; i < 56; i++) {
+          var keyBitPos = PC1[i] - 1;
+          keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+        }
+
+        // Assemble 16 subkeys
+        var subKeys = this._subKeys = [];
+        for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+          // Create subkey
+          var subKey = subKeys[nSubKey] = [];
+
+          // Shortcut
+          var bitShift = BIT_SHIFTS[nSubKey];
+
+          // Select 48 bits according to PC2
+          for (var i = 0; i < 24; i++) {
+            // Select from the left 28 key bits
+            subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+            // Select from the right 28 key bits
+            subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+          }
+
+          // Since each subkey is applied to an expanded 32-bit input,
+          // the subkey can be broken into 8 values scaled to 32-bits,
+          // which allows the key to be used without expansion
+          subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+          for (var i = 1; i < 7; i++) {
+            subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+          }
+          subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+        }
+
+        // Compute inverse subkeys
+        var invSubKeys = this._invSubKeys = [];
+        for (var i = 0; i < 16; i++) {
+          invSubKeys[i] = subKeys[15 - i];
+        }
+      },
+
+      encryptBlock: function (M, offset) {
+        this._doCryptBlock(M, offset, this._subKeys);
+      },
+
+      decryptBlock: function (M, offset) {
+        this._doCryptBlock(M, offset, this._invSubKeys);
+      },
+
+      _doCryptBlock: function (M, offset, subKeys) {
+        // Get input
+        this._lBlock = M[offset];
+        this._rBlock = M[offset + 1];
+
+        // Initial permutation
+        exchangeLR.call(this, 4, 0x0f0f0f0f);
+        exchangeLR.call(this, 16, 0x0000ffff);
+        exchangeRL.call(this, 2, 0x33333333);
+        exchangeRL.call(this, 8, 0x00ff00ff);
+        exchangeLR.call(this, 1, 0x55555555);
+
+        // Rounds
+        for (var round = 0; round < 16; round++) {
+          // Shortcuts
+          var subKey = subKeys[round];
+          var lBlock = this._lBlock;
+          var rBlock = this._rBlock;
+
+          // Feistel function
+          var f = 0;
+          for (var i = 0; i < 8; i++) {
+            f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+          }
+          this._lBlock = rBlock;
+          this._rBlock = lBlock ^ f;
+        }
+
+        // Undo swap from last round
+        var t = this._lBlock;
+        this._lBlock = this._rBlock;
+        this._rBlock = t;
+
+        // Final permutation
+        exchangeLR.call(this, 1, 0x55555555);
+        exchangeRL.call(this, 8, 0x00ff00ff);
+        exchangeRL.call(this, 2, 0x33333333);
+        exchangeLR.call(this, 16, 0x0000ffff);
+        exchangeLR.call(this, 4, 0x0f0f0f0f);
+
+        // Set output
+        M[offset] = this._lBlock;
+        M[offset + 1] = this._rBlock;
+      },
+
+      keySize: 64 / 32,
+
+      ivSize: 64 / 32,
+
+      blockSize: 64 / 32
+    });
+
+    // Swap bits across the left and right words
+    function exchangeLR(offset, mask) {
+      var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+      this._rBlock ^= t;
+      this._lBlock ^= t << offset;
+    }
+
+    function exchangeRL(offset, mask) {
+      var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+      this._lBlock ^= t;
+      this._rBlock ^= t << offset;
+    }
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+     */
+    C.DES = BlockCipher._createHelper(DES);
+
+    /**
+     * Triple-DES block cipher algorithm.
+     */
+    var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+      _doReset: function () {
+        // Shortcuts
+        var key = this._key;
+        var keyWords = key.words;
+        // Make sure the key length is valid (64, 128 or >= 192 bit)
+        if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+          throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+        }
+
+        // Extend the key according to the keying options defined in 3DES standard
+        var key1 = keyWords.slice(0, 2);
+        var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+        var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+        // Create DES instances
+        this._des1 = DES.createEncryptor(WordArray.create(key1));
+        this._des2 = DES.createEncryptor(WordArray.create(key2));
+        this._des3 = DES.createEncryptor(WordArray.create(key3));
+      },
+
+      encryptBlock: function (M, offset) {
+        this._des1.encryptBlock(M, offset);
+        this._des2.decryptBlock(M, offset);
+        this._des3.encryptBlock(M, offset);
+      },
+
+      decryptBlock: function (M, offset) {
+        this._des3.decryptBlock(M, offset);
+        this._des2.encryptBlock(M, offset);
+        this._des1.decryptBlock(M, offset);
+      },
+
+      keySize: 192 / 32,
+
+      ivSize: 64 / 32,
+
+      blockSize: 64 / 32
+    });
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+     */
+    C.TripleDES = BlockCipher._createHelper(TripleDES);
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var StreamCipher = C_lib.StreamCipher;
+    var C_algo = C.algo;
+
+    /**
+     * RC4 stream cipher algorithm.
+     */
+    var RC4 = C_algo.RC4 = StreamCipher.extend({
+      _doReset: function () {
+        // Shortcuts
+        var key = this._key;
+        var keyWords = key.words;
+        var keySigBytes = key.sigBytes;
+
+        // Init sbox
+        var S = this._S = [];
+        for (var i = 0; i < 256; i++) {
+          S[i] = i;
+        }
+
+        // Key setup
+        for (var i = 0, j = 0; i < 256; i++) {
+          var keyByteIndex = i % keySigBytes;
+          var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+          j = (j + S[i] + keyByte) % 256;
+
+          // Swap
+          var t = S[i];
+          S[i] = S[j];
+          S[j] = t;
+        }
+
+        // Counters
+        this._i = this._j = 0;
+      },
+
+      _doProcessBlock: function (M, offset) {
+        M[offset] ^= generateKeystreamWord.call(this);
+      },
+
+      keySize: 256 / 32,
+
+      ivSize: 0
+    });
+
+    function generateKeystreamWord() {
+      // Shortcuts
+      var S = this._S;
+      var i = this._i;
+      var j = this._j;
+
+      // Generate keystream word
+      var keystreamWord = 0;
+      for (var n = 0; n < 4; n++) {
+        i = (i + 1) % 256;
+        j = (j + S[i]) % 256;
+
+        // Swap
+        var t = S[i];
+        S[i] = S[j];
+        S[j] = t;
+
+        keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+      }
+
+      // Update counters
+      this._i = i;
+      this._j = j;
+
+      return keystreamWord;
+    }
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+     */
+    C.RC4 = StreamCipher._createHelper(RC4);
+
+    /**
+     * Modified RC4 stream cipher algorithm.
+     */
+    var RC4Drop = C_algo.RC4Drop = RC4.extend({
+      /**
+       * Configuration options.
+       *
+       * @property {number} drop The number of keystream words to drop. Default 192
+       */
+      cfg: RC4.cfg.extend({
+        drop: 192
+      }),
+
+      _doReset: function () {
+        RC4._doReset.call(this);
+
+        // Drop
+        for (var i = this.cfg.drop; i > 0; i--) {
+          generateKeystreamWord.call(this);
+        }
+      }
+    });
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+     */
+    C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+  }());
+
+
+  /** @preserve
+   * Counter block mode compatible with  Dr Brian Gladman fileenc.c
+   * derived from CryptoJS.mode.CTR
+   * Jan Hruby jhruby.web@gmail.com
+   */
+  CryptoJS.mode.CTRGladman = (function () {
+    var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+    function incWord(word) {
+      if (((word >> 24) & 0xff) === 0xff) { //overflow
+        var b1 = (word >> 16) & 0xff;
+        var b2 = (word >> 8) & 0xff;
+        var b3 = word & 0xff;
+
+        if (b1 === 0xff) // overflow b1
+        {
+          b1 = 0;
+          if (b2 === 0xff) {
+            b2 = 0;
+            if (b3 === 0xff) {
+              b3 = 0;
+            } else {
+              ++b3;
+            }
+          } else {
+            ++b2;
+          }
+        } else {
+          ++b1;
+        }
+
+        word = 0;
+        word += (b1 << 16);
+        word += (b2 << 8);
+        word += b3;
+      } else {
+        word += (0x01 << 24);
+      }
+      return word;
+    }
+
+    function incCounter(counter) {
+      if ((counter[0] = incWord(counter[0])) === 0) {
+        // encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
+        counter[1] = incWord(counter[1]);
+      }
+      return counter;
+    }
+
+    var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+      processBlock: function (words, offset) {
+        // Shortcuts
+        var cipher = this._cipher
+        var blockSize = cipher.blockSize;
+        var iv = this._iv;
+        var counter = this._counter;
+
+        // Generate keystream
+        if (iv) {
+          counter = this._counter = iv.slice(0);
+
+          // Remove IV for subsequent blocks
+          this._iv = undefined;
+        }
+
+        incCounter(counter);
+
+        var keystream = counter.slice(0);
+        cipher.encryptBlock(keystream, 0);
+
+        // Encrypt
+        for (var i = 0; i < blockSize; i++) {
+          words[offset + i] ^= keystream[i];
+        }
+      }
+    });
+
+    CTRGladman.Decryptor = Encryptor;
+
+    return CTRGladman;
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var StreamCipher = C_lib.StreamCipher;
+    var C_algo = C.algo;
+
+    // Reusable objects
+    var S = [];
+    var C_ = [];
+    var G = [];
+
+    /**
+     * Rabbit stream cipher algorithm
+     */
+    var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+      _doReset: function () {
+        // Shortcuts
+        var K = this._key.words;
+        var iv = this.cfg.iv;
+
+        // Swap endian
+        for (var i = 0; i < 4; i++) {
+          K[i] = (((K[i] << 8) | (K[i] >>> 24)) & 0x00ff00ff) |
+              (((K[i] << 24) | (K[i] >>> 8)) & 0xff00ff00);
+        }
+
+        // Generate initial state values
+        var X = this._X = [
+          K[0], (K[3] << 16) | (K[2] >>> 16),
+          K[1], (K[0] << 16) | (K[3] >>> 16),
+          K[2], (K[1] << 16) | (K[0] >>> 16),
+          K[3], (K[2] << 16) | (K[1] >>> 16)
+        ];
+
+        // Generate initial counter values
+        var C = this._C = [
+          (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+          (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+          (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+          (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+        ];
+
+        // Carry bit
+        this._b = 0;
+
+        // Iterate the system four times
+        for (var i = 0; i < 4; i++) {
+          nextState.call(this);
+        }
+
+        // Modify the counters
+        for (var i = 0; i < 8; i++) {
+          C[i] ^= X[(i + 4) & 7];
+        }
+
+        // IV setup
+        if (iv) {
+          // Shortcuts
+          var IV = iv.words;
+          var IV_0 = IV[0];
+          var IV_1 = IV[1];
+
+          // Generate four subvectors
+          var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+          var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+          var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+          var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+          // Modify counter values
+          C[0] ^= i0;
+          C[1] ^= i1;
+          C[2] ^= i2;
+          C[3] ^= i3;
+          C[4] ^= i0;
+          C[5] ^= i1;
+          C[6] ^= i2;
+          C[7] ^= i3;
+
+          // Iterate the system four times
+          for (var i = 0; i < 4; i++) {
+            nextState.call(this);
+          }
+        }
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Shortcut
+        var X = this._X;
+
+        // Iterate the system
+        nextState.call(this);
+
+        // Generate four keystream words
+        S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+        S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+        S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+        S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+        for (var i = 0; i < 4; i++) {
+          // Swap endian
+          S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+              (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+          // Encrypt
+          M[offset + i] ^= S[i];
+        }
+      },
+
+      blockSize: 128 / 32,
+
+      ivSize: 64 / 32
+    });
+
+    function nextState() {
+      // Shortcuts
+      var X = this._X;
+      var C = this._C;
+
+      // Save old counter values
+      for (var i = 0; i < 8; i++) {
+        C_[i] = C[i];
+      }
+
+      // Calculate new counter values
+      C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+      C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+      C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+      C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+      C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+      C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+      C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+      C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+      this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+      // Calculate the g-values
+      for (var i = 0; i < 8; i++) {
+        var gx = X[i] + C[i];
+
+        // Construct high and low argument for squaring
+        var ga = gx & 0xffff;
+        var gb = gx >>> 16;
+
+        // Calculate high and low result of squaring
+        var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+        var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+        // High XOR low
+        G[i] = gh ^ gl;
+      }
+
+      // Calculate new state values
+      X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+      X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+      X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+      X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+      X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+      X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+      X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+      X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+    }
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+     */
+    C.Rabbit = StreamCipher._createHelper(Rabbit);
+  }());
+
+
+  /**
+   * Counter block mode.
+   */
+  CryptoJS.mode.CTR = (function () {
+    var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+    var Encryptor = CTR.Encryptor = CTR.extend({
+      processBlock: function (words, offset) {
+        // Shortcuts
+        var cipher = this._cipher
+        var blockSize = cipher.blockSize;
+        var iv = this._iv;
+        var counter = this._counter;
+
+        // Generate keystream
+        if (iv) {
+          counter = this._counter = iv.slice(0);
+
+          // Remove IV for subsequent blocks
+          this._iv = undefined;
+        }
+        var keystream = counter.slice(0);
+        cipher.encryptBlock(keystream, 0);
+
+        // Increment counter
+        counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+        // Encrypt
+        for (var i = 0; i < blockSize; i++) {
+          words[offset + i] ^= keystream[i];
+        }
+      }
+    });
+
+    CTR.Decryptor = Encryptor;
+
+    return CTR;
+  }());
+
+
+  (function () {
+    // Shortcuts
+    var C = CryptoJS;
+    var C_lib = C.lib;
+    var StreamCipher = C_lib.StreamCipher;
+    var C_algo = C.algo;
+
+    // Reusable objects
+    var S = [];
+    var C_ = [];
+    var G = [];
+
+    /**
+     * Rabbit stream cipher algorithm.
+     *
+     * This is a legacy version that neglected to convert the key to little-endian.
+     * This error doesn't affect the cipher's security,
+     * but it does affect its compatibility with other implementations.
+     */
+    var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+      _doReset: function () {
+        // Shortcuts
+        var K = this._key.words;
+        var iv = this.cfg.iv;
+
+        // Generate initial state values
+        var X = this._X = [
+          K[0], (K[3] << 16) | (K[2] >>> 16),
+          K[1], (K[0] << 16) | (K[3] >>> 16),
+          K[2], (K[1] << 16) | (K[0] >>> 16),
+          K[3], (K[2] << 16) | (K[1] >>> 16)
+        ];
+
+        // Generate initial counter values
+        var C = this._C = [
+          (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+          (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+          (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+          (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+        ];
+
+        // Carry bit
+        this._b = 0;
+
+        // Iterate the system four times
+        for (var i = 0; i < 4; i++) {
+          nextState.call(this);
+        }
+
+        // Modify the counters
+        for (var i = 0; i < 8; i++) {
+          C[i] ^= X[(i + 4) & 7];
+        }
+
+        // IV setup
+        if (iv) {
+          // Shortcuts
+          var IV = iv.words;
+          var IV_0 = IV[0];
+          var IV_1 = IV[1];
+
+          // Generate four subvectors
+          var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+          var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+          var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+          var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+          // Modify counter values
+          C[0] ^= i0;
+          C[1] ^= i1;
+          C[2] ^= i2;
+          C[3] ^= i3;
+          C[4] ^= i0;
+          C[5] ^= i1;
+          C[6] ^= i2;
+          C[7] ^= i3;
+
+          // Iterate the system four times
+          for (var i = 0; i < 4; i++) {
+            nextState.call(this);
+          }
+        }
+      },
+
+      _doProcessBlock: function (M, offset) {
+        // Shortcut
+        var X = this._X;
+
+        // Iterate the system
+        nextState.call(this);
+
+        // Generate four keystream words
+        S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+        S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+        S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+        S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+        for (var i = 0; i < 4; i++) {
+          // Swap endian
+          S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+              (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+          // Encrypt
+          M[offset + i] ^= S[i];
+        }
+      },
+
+      blockSize: 128 / 32,
+
+      ivSize: 64 / 32
+    });
+
+    function nextState() {
+      // Shortcuts
+      var X = this._X;
+      var C = this._C;
+
+      // Save old counter values
+      for (var i = 0; i < 8; i++) {
+        C_[i] = C[i];
+      }
+
+      // Calculate new counter values
+      C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+      C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+      C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+      C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+      C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+      C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+      C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+      C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+      this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+      // Calculate the g-values
+      for (var i = 0; i < 8; i++) {
+        var gx = X[i] + C[i];
+
+        // Construct high and low argument for squaring
+        var ga = gx & 0xffff;
+        var gb = gx >>> 16;
+
+        // Calculate high and low result of squaring
+        var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+        var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+        // High XOR low
+        G[i] = gh ^ gl;
+      }
+
+      // Calculate new state values
+      X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+      X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+      X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+      X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+      X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+      X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+      X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+      X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+    }
+
+    /**
+     * Shortcut functions to the cipher's object interface.
+     *
+     * @example
+     *
+     *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+     *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+     */
+    C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+  }());
+
+
+  /**
+   * Zero padding strategy.
+   */
+  CryptoJS.pad.ZeroPadding = {
+    pad: function (data, blockSize) {
+      // Shortcut
+      var blockSizeBytes = blockSize * 4;
+
+      // Pad
+      data.clamp();
+      data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+    },
+
+    unpad: function (data) {
+      // Shortcut
+      var dataWords = data.words;
+
+      // Unpad
+      var i = data.sigBytes - 1;
+      for (var i = data.sigBytes - 1; i >= 0; i--) {
+        if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+          data.sigBytes = i + 1;
+          break;
+        }
+      }
+    }
+  };
+
+
+  return CryptoJS;
+
+}));