From ecec3a3deb645556a5108d57c00dbfeaa5a18774 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 13 Dec 2021 11:56:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B8=85=E7=90=86=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=AE=8B=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppInterview/interviewDetail.vue     |   2 +-
 src/apps/AppNotification/AppNotification.vue  |  14 +-
 src/apps/AppNotification/components/add.vue   | 589 +++++++++---------
 .../AppNotification/components/detail.vue     | 566 +++++++++--------
 src/apps/AppNotification/components/read.vue  | 143 +++--
 5 files changed, 651 insertions(+), 663 deletions(-)

diff --git a/src/apps/AppInterview/interviewDetail.vue b/src/apps/AppInterview/interviewDetail.vue
index 6ddc7261..8ede0453 100644
--- a/src/apps/AppInterview/interviewDetail.vue
+++ b/src/apps/AppInterview/interviewDetail.vue
@@ -9,7 +9,7 @@
           <ai-textarea v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
         </u-form-item>
         <u-form-item label="图片（最多9张）">
-          <ai-uploader multiple :limit="9" :def.sync="form.fileList" action="/admin/file/add2"/>
+          <AiUploader multiple :limit="9" :def.sync="form.fileList" action="/admin/file/add2"/>
         </u-form-item>
       </u-form>
       <div bottom>
diff --git a/src/apps/AppNotification/AppNotification.vue b/src/apps/AppNotification/AppNotification.vue
index c011173b..7c24ff20 100644
--- a/src/apps/AppNotification/AppNotification.vue
+++ b/src/apps/AppNotification/AppNotification.vue
@@ -68,17 +68,13 @@
 </template>
 
 <script>
-import AiAdd from "../../components/AiAdd";
-import AiEmpty from "../../components/AiEmpty";
-import AiTopFixed from "../../components/AiTopFixed";
 import {add, detail, read} from "./components";
-import AiOpenData from "../../components/AiOpenData";
-  import {mapActions} from "vuex";
+import {mapActions} from "vuex";
 
 export default {
   name: "AppNotification",
   appName: "通知公告",
-  components: {AiOpenData,AiAdd, AiEmpty, AiTopFixed, add, detail, read},
+  components: {add, detail, read},
   data() {
     return {
       index: 0,
@@ -364,14 +360,14 @@ export default {
       height: 36px;
       font-size: 26px;
       color: #FF8822;
-      background:rgba(255,136,34,.1);
+      background: rgba(255, 136, 34, .1);
       line-height: 36px;
       text-align: center;
       margin-right: 4px;
     }
 
-    .read{
-      background: rgba(102,102,102,.1);
+    .read {
+      background: rgba(102, 102, 102, .1);
       color: #666666;
     }
   }
diff --git a/src/apps/AppNotification/components/add.vue b/src/apps/AppNotification/components/add.vue
index 73b5709c..1283cdf4 100644
--- a/src/apps/AppNotification/components/add.vue
+++ b/src/apps/AppNotification/components/add.vue
@@ -12,7 +12,8 @@
       </div>
 
       <div class="card">
-        <AiUploader :multiple="true" type="image" :limit="9" placeholder="上传图片" @list="fileList" :def="form.files" action="/admin/file/add2"></AiUploader>
+        <AiUploader :multiple="true" type="image" :limit="9" placeholder="上传图片" @list="fileList" :def="form.files"
+                    action="/admin/file/add2"></AiUploader>
       </div>
 
       <div class="card item-wrap">
@@ -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>
@@ -66,316 +67,314 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiUploader from "../../../components/AiUploader";
-  import {mapActions} from "vuex";
+import {mapActions} from "vuex";
 
-  export default {
-    name: "add",
-    components: {AiBack,AiUploader},
-    props:{
-      params:Object
-    },
-    data() {
-      return {
-        show: false,
-        index: 0,
-        list: [],
-        form: {
-          id: null,
-          title: "",
-          content: "",
-          persons: [],
-          releaseTime:null,
-          files: [],
-        },
-        userSelect: false,
-        flag: null,
-        options: {
-          year: true,
-          month: true,
-          day: true,
-          hour: true,
-          minute: true,
-          second: true,
-          timestamp: true,
-        },
-      }
-    },
-    watch:{
-      params:{
-        handler:function (v) {
-          if(this.params?.id){
-            this.form.id = this.params?.id;
-            this.flag = this.params?.flag;
-          }
-        },
-        immediate:true
-      }
-    },
-    created() {
-      document.title = "新增公告";
-      if(this.params?.id){
-        this.getDetail();
-      }
-    },
-    methods: {
-      ...mapActions(['selectEnterpriseContact']),
-      handleSelectUser() {
-        this.selectEnterpriseContact({
-          fromDepartmentId:0,
-          type:["user"],
-          selectedUserIds: this.form.persons?.map(e=>e.id)
-        }).then(res => {
-          console.log(res);
-          this.form.persons = res?.userList || []
-        })
+export default {
+  name: "add",
+  props: {
+    params: Object
+  },
+  data() {
+    return {
+      show: false,
+      index: 0,
+      list: [],
+      form: {
+        id: null,
+        title: "",
+        content: "",
+        persons: [],
+        releaseTime: null,
+        files: [],
       },
-      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;`
+      userSelect: false,
+      flag: null,
+      options: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+        timestamp: true,
       },
     }
+  },
+  watch: {
+    params: {
+      handler: function () {
+        if (this.params?.id) {
+          this.form.id = this.params?.id;
+          this.flag = this.params?.flag;
+        }
+      },
+      immediate: true
+    }
+  },
+  created() {
+    document.title = "新增公告";
+    if (this.params?.id) {
+      this.getDetail();
+    }
+  },
+  methods: {
+    ...mapActions(['selectEnterpriseContact']),
+    handleSelectUser() {
+      this.selectEnterpriseContact({
+        fromDepartmentId: 0,
+        type: ["user"],
+        selectedUserIds: this.form.persons?.map(e => e.id)
+      }).then(res => {
+        console.log(res);
+        this.form.persons = res?.userList || []
+      })
+    },
+    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/apps/AppNotification/components/detail.vue b/src/apps/AppNotification/components/detail.vue
index 161acc20..7fc19362 100644
--- a/src/apps/AppNotification/components/detail.vue
+++ b/src/apps/AppNotification/components/detail.vue
@@ -2,7 +2,7 @@
   <div class="detail" v-if="pageShow">
     <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>
@@ -20,7 +20,7 @@
         <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>
@@ -36,9 +36,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>
@@ -47,316 +47,312 @@
         <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 AiOpenData from "../../../components/AiOpenData";
+import {mapActions} from "vuex";
 
-  export default {
-    name: "detail",
-    components:{AiOpenData,AiBack,AiEmpty},
-    props:{
-      params:Object
-    },
-    data() {
-      return {
-        detailObj: {},
-        pageShow: false
+export default {
+  name: "detail",
+  props: {
+    params: Object
+  },
+  data() {
+    return {
+      detailObj: {},
+      pageShow: false
+    }
+  },
+  created() {
+    this.$loading()
+    this.injectJWeixin(['sendChatMessage']).then(() => {
+      this.getDetail()
+    }).catch(() => {
+      this.getDetail()
+      this.$hideLoading()
+    })
+  },
+
+  mounted() {
+    document.title = "公告详情";
+  },
+  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})
       }
     },
-    created() {
-      this.$loading()
-      this.injectJWeixin(['sendChatMessage']).then(() => {
-        this.getDetail()
-      }).catch(() => {
-        this.getDetail()
-        this.$hideLoading()
+    getDetail() {
+      this.$http.post("/app/appannouncement/detail", null, {
+        params: {
+          id: this.params?.id,
+          detail: this.params?.flag
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.detailObj = res.data;
+          this.pageShow = true
+          this.$hideLoading()
+        }
       })
     },
-
-    mounted() {
-      document.title = "公告详情";
-    },
-    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.params?.id,
-            detail: this.params?.flag
-          }
-        }).then(res=>{
-          if(res && res.data){
-            this.detailObj = res.data;
-            this.pageShow = true
-            this.$hideLoading()
-          }
-        })
-      },
-      handleClick() {
-        this.$parent.params = this.params.id;
-        this.$parent.comp = "read";
-        this.$parent.showList = false;
-      }
-    },
-  }
+    handleClick() {
+      this.$parent.params = this.params.id;
+      this.$parent.comp = "read";
+      this.$parent.showList = false;
+    }
+  },
+}
 </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;
-          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;
-        }
+    .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;
-        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;
     }
   }
+
+  .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/components/read.vue b/src/apps/AppNotification/components/read.vue
index 4dc6bfd4..9f757d84 100644
--- a/src/apps/AppNotification/components/read.vue
+++ b/src/apps/AppNotification/components/read.vue
@@ -14,89 +14,86 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiOpenData from "../../../components/AiOpenData";
-  import {mapActions} from "vuex";
-  export default {
-    name: "read",
-    components: {AiBack, AiTopFixed, AiOpenData},
-    props:{
-      params:[String,Number]
-    },
-    data() {
-      return {
-        current: 0,
-        list: [],
-      }
-    },
-    created() {
-      document.title = "接收对象";
-      this.$loading()
-      this.injectJWeixin().then(() => {
-        this.getList();
+import {mapActions} from "vuex";
+
+export default {
+  name: "read",
+  props: {
+    params: [String, Number]
+  },
+  data() {
+    return {
+      current: 0,
+      list: [],
+    }
+  },
+  created() {
+    document.title = "接收对象";
+    this.$loading()
+    this.injectJWeixin().then(() => {
+      this.getList();
+    })
+  },
+  methods: {
+    ...mapActions(['previewFile', 'injectJWeixin']),
+    getList() {
+      this.$http.post("/app/appannouncementreader/list-unread", null, {
+        params: {
+          id: this.params
+        }
+      }).then(res => {
+        if (res && res.data) {
+          this.list = res.data;
+          this.$hideLoading()
+        }
       })
     },
-    methods: {
-      ...mapActions(['previewFile', 'injectJWeixin']),
-      getList() {
-        this.$http.post("/app/appannouncementreader/list-unread",null,{
-          params:{
-            id:this.params
-          }
-        }).then(res => {
-          if (res && res.data) {
-            this.list = res.data;
-            this.$hideLoading()
-          }
-        })
-      },
-      change(val) {
-        this.current = val;
-        this.list = [];
-        this.getList();
-      }
-    },
-    computed: {
-      tabs() {
-        return [
-          {name: (this.list?.read?.length || 0) + "人已读"},
-          {name: (this.list?.unRead?.length || 0) + "人未读"},
-        ];
-      }
-    },
-  }
+    change(val) {
+      this.current = val;
+      this.list = [];
+      this.getList();
+    }
+  },
+  computed: {
+    tabs() {
+      return [
+        {name: (this.list?.read?.length || 0) + "人已读"},
+        {name: (this.list?.unRead?.length || 0) + "人未读"},
+      ];
+    }
+  },
+}
 </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>

From 63b2d8b1c9030f13133489b892c68b75cfcdf4ac Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 13 Dec 2021 11:57:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B8=85=E7=90=86=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=AE=8B=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMeetingNotice/addMeeting.vue |   5 +-
 src/apps/AppMeetingNotice/belongToMe.vue |  15 +-
 src/apps/AppMeetingNotice/detail.vue     | 817 +++++++++++------------
 3 files changed, 416 insertions(+), 421 deletions(-)

diff --git a/src/apps/AppMeetingNotice/addMeeting.vue b/src/apps/AppMeetingNotice/addMeeting.vue
index 18156b17..8157ca96 100644
--- a/src/apps/AppMeetingNotice/addMeeting.vue
+++ b/src/apps/AppMeetingNotice/addMeeting.vue
@@ -88,13 +88,10 @@
 </template>
 
 <script>
-import AiBack from "../../components/AiBack";
-import AiUploader from "../../components/AiUploader";
 import {mapActions} from "vuex";
 
 export default {
   name: "addMeeting",
-  components: {AiBack, AiUploader},
   props: {
     params: {
       type: [Number, String]
@@ -169,7 +166,7 @@ export default {
       }).then(res => {
         this.change(res?.userList || [])
         this.clickedUserSelect = false
-      }).catch(()=>{
+      }).catch(() => {
         this.clickedUserSelect = false
       })
     },
diff --git a/src/apps/AppMeetingNotice/belongToMe.vue b/src/apps/AppMeetingNotice/belongToMe.vue
index 4539c9a1..1c637581 100644
--- a/src/apps/AppMeetingNotice/belongToMe.vue
+++ b/src/apps/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">
@@ -39,15 +43,10 @@
 </template>
 
 <script>
-import AiTopFixed from "../../components/AiTopFixed";
-import AiBack from "../../components/AiBack";
-import AiEmpty from "../../components/AiEmpty";
-import AiOpenData from "../../components/AiOpenData";
 import {mapActions} from "vuex";
 
 export default {
   name: "belongToMe",
-  components: {AiOpenData, AiTopFixed, AiBack, AiEmpty},
   data() {
     return {
       index: 0,
@@ -77,7 +76,7 @@ export default {
     })
   },
   methods: {
-      ...mapActions(['injectJWeixin']),
+    ...mapActions(['injectJWeixin']),
     emitReachBottom() {
       this.current = this.current + 1;
       this.getList()
diff --git a/src/apps/AppMeetingNotice/detail.vue b/src/apps/AppMeetingNotice/detail.vue
index 3d49a1c6..4d9e9e52 100644
--- a/src/apps/AppMeetingNotice/detail.vue
+++ b/src/apps/AppMeetingNotice/detail.vue
@@ -5,7 +5,7 @@
         <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>-->
+          <!--          <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>
@@ -21,7 +21,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 style="align-items: start;flex-wrap: nowrap;">
@@ -84,7 +86,8 @@
         <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>
+            <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)">-->
@@ -97,347 +100,193 @@
 </template>
 
 <script>
-  import AiBack from "../../components/AiBack";
-  import {mapActions, mapState} from "vuex";
-  import AiTopFixed from "../../components/AiTopFixed";
-  import AiOpenData from "../../components/AiOpenData";
+import {mapActions, mapState} from "vuex";
 
-  export default {
-    name: "detail",
-    components: {AiOpenData,AiBack, AiTopFixed},
-    props: {
-      params: {
-        type: [String, Number]
-      }
+export default {
+  name: "detail",
+  props: {
+    params: {
+      type: [String, Number]
+    }
+  },
+  data() {
+    return {
+      detail: {},
+      list: false,
+      current: 0,
+      pageShow: false,
+      show: false,
+    }
+  },
+  computed: {
+    ...mapState(["user"]),
+    tabs() {
+      return [
+        {name: this.count(0) + "人未确认"},
+        {name: this.count(1) + "人已确认"},
+        {name: this.count(2) + "人已请假"},
+        {name: this.count(3) + "人待定"},
+      ]
     },
-    data() {
-      return {
-        detail: {},
-        list: false,
-        current: 0,
-        pageShow: false,
-        show: false,
-      }
-    },
-    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.params,
-          }
-        }).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.params,
-          }
-        }).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
-          });
+  },
+  methods: {
+    onConfirm() {
+      this.$http.post("/app/appmeetinginfo/cancel", null, {
+        params: {
+          meetingId: this.params,
         }
-      },
-      ...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})
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast("取消成功");
+          this.getDetail();
         }
-      },
-      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.params,
-            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.params}
-        }).then(res => {
-          if (res && res.data) {
-            this.detail = res.data
-            this.pageShow = true
-            this.$hideLoading()
-          }
-        })
-      }
-    },
-    created() {
-      this.$loading()
-      this.injectJWeixin(['sendChatMessage']).then(() => {
-        this.getDetail()
-      }).catch(() => {
-        this.getDetail()
       })
     },
-    mounted() {
-      document.title = "会议详情"
+    handleCancel() {
+      this.show = true;
     },
-    filters: {
-      transform(status) {
-        if (status == 1) {
-          return "已确认"
+    toDo() {
+      this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
+        params: {
+          meetingId: this.params,
         }
-        if (status == 2) {
-          return "已请假"
+      }).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.params,
+          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.params}
+      }).then(res => {
+        if (res && res.data) {
+          this.detail = res.data
+          this.pageShow = true
+          this.$hideLoading()
+        }
+      })
+    }
+  },
+  created() {
+    this.$loading()
+    this.injectJWeixin(['sendChatMessage']).then(() => {
+      this.getDetail()
+    }).catch(() => {
+      this.getDetail()
+    })
+  },
+  mounted() {
+    document.title = "会议详情"
+  },
+  filters: {
+    transform(status) {
+      if (status == 1) {
+        return "已确认"
+      }
+      if (status == 2) {
+        return "已请假"
       }
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .detail {
+.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%;
-    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;
+    .att-wrap {
+      display: flex;
+      height: 112px;
+      align-items: center;
+      justify-content: space-between;
+      background-color: #ffffff;
       box-sizing: border-box;
-      padding: 16px 32px;
+      padding: 0 50px;
+      border-bottom: 1px solid #E4E5E6;
 
-      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;
+      .left {
         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: "";
@@ -449,116 +298,266 @@
           background-color: rgba(216, 221, 230, 0.5);
         }
 
-        & > label {
-          width: 80px;
-          height: 80px;
-          border-radius: 50%;
-          background-color: #4E8EEE;
-          font-size: 28px;
+        .name {
+          font-size: 30px;
           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;
+      & > 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;*/
+      }
 
-        em {
-          font-style: normal;
-          color: #1365DD;
+      & > 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;
+          }
         }
 
-        .right-arrow {
-          width: 16px;
-          height: 16px;
-          border-top: 5px solid #CCCCCC;
-          border-right: 5px solid #CCCCCC;
-          transform: rotate(45deg);
+        & > span {
+          font-size: 28px;
+          color: #999999;
         }
       }
     }
 
-    .footer {
+    .active {
+      background-color: #F3F6F9;
+    }
+
+    .name {
+      font-size: 32px;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .wrap {
       height: 112px;
-      width: 100%;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      background-color: #FFFFFF;
       display: flex;
       align-items: center;
-      justify-content: center;
+      position: relative;
 
-      & > div {
+      &: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;
-        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%;
+        font-weight: 600;
         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
     }
   }
+
+  .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>

From 02b4274497d4c626d0618285a9d41a087a9bd0c5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 13 Dec 2021 13:42:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=85=E7=90=86=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=AE=8B=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppInterview/interviewDetail.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppInterview/interviewDetail.vue b/src/apps/AppInterview/interviewDetail.vue
index 8ede0453..c0591b67 100644
--- a/src/apps/AppInterview/interviewDetail.vue
+++ b/src/apps/AppInterview/interviewDetail.vue
@@ -6,7 +6,7 @@
           <u-input v-model="form.title" placeholder="请输入，最多30字" maxlength="30"/>
         </u-form-item>
         <u-form-item label="调查走访内容" prop="content">
-          <ai-textarea v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
+          <AiTextarea v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
         </u-form-item>
         <u-form-item label="图片（最多9张）">
           <AiUploader multiple :limit="9" :def.sync="form.fileList" action="/admin/file/add2"/>
@@ -24,7 +24,7 @@
       <div class="contentPane">
         <div v-html="form.content"/>
         <div flex class="wrap">
-          <ai-image v-for="(op,i) in form.fileList" :src="op.accessUrl" preview :key="i"/>
+          <AiImage v-for="(op,i) in form.fileList" :src="op.accessUrl" preview :key="i"/>
         </div>
       </div>
     </template>
@@ -33,14 +33,9 @@
 </template>
 
 <script>
-import AiUploader from "../../components/AiUploader";
-import AiImage from "../../components/AiImage";
-import AiTextarea from "../../components/AiTextarea";
-import AiBack from "../../components/AiBack";
 
 export default {
   name: 'interviewDetail',
-  components: {AiBack, AiTextarea, AiImage, AiUploader},
   inject: {root: {}},
   computed: {
     isEdit() {
@@ -55,7 +50,7 @@ export default {
     }
   },
   mounted() {
-	},
+  },
   created() {
     this.searchDetail();
   },

From a696aab44aa3edf83512333655c14adfbc87dda7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 13 Dec 2021 13:45:35 +0800
Subject: [PATCH 4/4] BUG 25348

---
 src/apps/AppAskForm/AppForm.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/apps/AppAskForm/AppForm.vue b/src/apps/AppAskForm/AppForm.vue
index 5974ed30..79a37515 100644
--- a/src/apps/AppAskForm/AppForm.vue
+++ b/src/apps/AppAskForm/AppForm.vue
@@ -50,6 +50,8 @@ export default {
         }).then(res => {
           if (res?.code == 0) {
             this.access = true
+          } else {
+            this.err = "无法获取表单"
           }
         }).catch(err => {
           this.err = err