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

src/apps/AppNotification/AppNotification.vue

@@ -180,13 +180,9 @@ 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)) {
@@ -195,12 +191,9 @@ export default {
 
       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) {
@@ -216,21 +209,15 @@ export default {
       if (this.index == 1) {
         this.show = true;
       }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(){
-      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

@@ -64,15 +64,21 @@ import {mapActions} from "vuex";
 
   export default {
     name: "detail",
-  props: {
-    params: Object
-  },
     data() {
       return {
         detailObj: {},
-      pageShow: false
+        id: null,
+        pageShow: false,
+        flag: false,
       }
     },
+
+    onLoad(opt) {
+      document.title = "公告详情";
+      this.id = opt.id;
+      this.flag = opt.flag;
+    },
+
     created() {
       this.$loading()
       this.injectJWeixin(['sendChatMessage']).then(() => {
@@ -83,9 +89,6 @@ export default {
       })
     },
 
-  mounted() {
-    document.title = "公告详情";
-  },
     methods: {
       ...mapActions(['previewFile', 'injectJWeixin']),
       preFile(e) {
@@ -101,8 +104,8 @@ export default {
       getDetail() {
         this.$http.post("/app/appannouncement/detail", null, {
           params: {
-          id: this.params?.id,
+            id: this.id,
-          detail: this.params?.flag
+            detail: this.flag
           }
         }).then(res => {
           if (res && res.data) {
@@ -113,9 +116,9 @@ export default {
         })
       },
       handleClick() {
-      this.$parent.params = this.params.id;
+        uni.navigateTo({
-      this.$parent.comp = "read";
+          url:"/apps/notification/read?id=" + this.id,
-      this.$parent.showList = false;
+        })
       }
     },
   }