Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppNotification/AppNotification.vue

@@ -171,7 +171,7 @@ export default {
       this.show = false;
       this.changeState();
     },
-    handleOpt(item) {
+    handleOpt(item){
       this.content = {
         1: "撤回",
         2: "发布",
@@ -180,27 +180,20 @@ export default {
 
       if (item.val == 0) {
         this.show = false;
-        this.comp = "detail";
+        return uni.navigateTo({
-        this.params = {
+          url: "/apps/notification/detail?id=" + this.detail.id
-          id: this.detail.id,
+        });
-          flag: true
-        };
-        this.showList = false;
-        return
       }
 
-      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;
-        this.comp = "add";
+        return uni.navigateTo({
-        this.params = {
+          url:"/apps/notification/add?id=" + this.detail.id + "&flag=" + false
-          id: this.detail.id,
+        });
-          flag: false
-        };
-        this.showList = false;
       }
     },
     color(status) {
@@ -215,22 +208,16 @@ export default {
       this.detail = item;
       if (this.index == 1) {
         this.show = true;
-      } else {
+      }else {
-        this.comp = "detail";
+        uni.navigateTo({
-        this.params = {
+          url: "/apps/notification/detail?id=" + this.detail.id + "&flag=" + true
-          id: this.detail.id,
+        })
-          flag: true
-        };
-        this.showList = false;
       }
     },
-    add() {
+    add(){
-      this.comp = "add";
+      uni.navigateTo({
-      this.params = {
+        url: "/apps/notification/add"
-        id: null,
+      })
-        flag: false
-      };
-      this.showList = false;
     },
     change(val) {
       this.index = val;

src/apps/AppNotification/add.vue

@@ -100,23 +100,16 @@ export default {
       },
     }
   },
-  watch: {
+
-    params: {
+  onLoad(opt) {
-      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) {
+    if(opt.id) {
+      this.form.id = opt.id;
+      this.flag = opt.flag;
       this.getDetail();
     }
   },
+
   methods: {
     ...mapActions(['selectEnterpriseContact']),
     handleSelectUser() {
@@ -125,7 +118,6 @@ export default {
         type: ["user"],
         selectedUserIds: this.form.persons?.map(e => e.id)
       }).then(res => {
-        console.log(res);
         this.form.persons = res?.userList || []
       })
     },

src/apps/AppNotification/detail.vue

@@ -60,299 +60,302 @@
 </template>
 
 <script>
-import {mapActions} from "vuex";
+  import {mapActions} from "vuex";
 
-export default {
+  export default {
-  name: "detail",
+    name: "detail",
-  props: {
+    data() {
-    params: Object
+      return {
-  },
+        detailObj: {},
-  data() {
+        id: null,
-    return {
+        pageShow: false,
-      detailObj: {},
+        flag: false,
-      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})
       }
     },
-    getDetail() {
+
-      this.$http.post("/app/appannouncement/detail", null, {
+    onLoad(opt) {
-        params: {
+      document.title = "公告详情";
-          id: this.params?.id,
+      this.id = opt.id;
-          detail: this.params?.flag
+      this.flag = opt.flag;
-        }
+    },
-      }).then(res => {
+
-        if (res && res.data) {
+    created() {
-          this.detailObj = res.data;
+      this.$loading()
-          this.pageShow = true
+      this.injectJWeixin(['sendChatMessage']).then(() => {
-          this.$hideLoading()
+        this.getDetail()
-        }
+      }).catch(() => {
+        this.getDetail()
+        this.$hideLoading()
       })
     },
-    handleClick() {
+
-      this.$parent.params = this.params.id;
+    methods: {
-      this.$parent.comp = "read";
+      ...mapActions(['previewFile', 'injectJWeixin']),
-      this.$parent.showList = false;
+      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
+            this.$hideLoading()
+          }
+        })
+      },
+      handleClick() {
+        uni.navigateTo({
+          url:"/apps/notification/read?id=" + this.id,
+        })
+      }
+    },
+  }
 </script>
 
 <style lang="scss" scoped>
-.detail {
+  .detail {
-  min-height: 100%;
+    min-height: 100%;
-  background-color: #F5F5F5;
+    background-color: #F5F5F5;
-  padding-bottom: 140px;
+    padding-bottom: 140px;
 
-  ::v-deep .content {
+    ::v-deep .content {
-    padding: 0;
+      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 {
+    .card {
-      & > div {
+      background-color: #FFFFFF;
-        border-radius: 50%;
+      margin-bottom: 8px;
-        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;
+      padding: 16px 32px;
-      margin-bottom: 32px;
 
-      & > .u-row {
+      header {
-        height: 100%;
+        font-size: 40px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 64px;
+        letter-spacing: 1px;
+      }
 
-        .left {
+      .u-row {
-          width: 476px;
+        & > div {
+          border-radius: 50%;
+          text-align: center;
+          font-size: 22px;
+          font-weight: bold;
           display: flex;
           align-items: center;
-          word-break: break-all;
+          justify-content: 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: 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;
-          color: #999999;
+          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);
+          }
         }
       }
-    }
 
-    .active {
+      .item {
-      background-color: #F3F6F9;
+        position: relative;
-    }
+        height: 80px;
 
-    & > text {
+        &:after {
-      width: 100%;
+          width: 100%;
-      display: inline-block;
+          height: 1px;
-      font-size: 30px;
+          background-color: rgba(216, 221, 230, 0.5);
-      color: #649EFD;
+          content: "";
-      text-align: center;
+          position: absolute;
-    }
+          left: 0;
-
+          bottom: 0;
-    .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;
       }
 
-    }
+      & > span {
-
-    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 {
+    .footer {
-    height: 112px;
+      height: 112px;
-    width: 100%;
+      width: 100%;
-    position: fixed;
+      position: fixed;
-    left: 0;
+      left: 0;
-    bottom: 0;
+      bottom: 0;
-    background: #1365DD;
+      background: #1365DD;
-    display: flex;
+      display: flex;
-    align-items: center;
+      align-items: center;
-    justify-content: center;
+      justify-content: center;
-    font-size: 36px;
+      font-size: 36px;
-    color: #FFFFFF;
+      color: #FFFFFF;
+    }
   }
-}
 </style>