liyg 2 lat temu
rodzic
commit
fa084ddb5a
2 zmienionych plików z 18 dodań i 11 usunięć
  1. 16 11
      src/components/main.vue
  2. 2 0
      src/views/index/components/login.vue

+ 16 - 11
src/components/main.vue

@@ -2691,17 +2691,22 @@ export default {
             } else {
               console.log('进入了标记不为0')
               this.badgeshow = false
-              // if(this.$store.state.index==1){
-              //   let data={
-              //     noticetitle:this.noticedata[0].noticetitle,
-              //     noticecontent:this.noticedata[0].noticecontent,
-              //     insertusername:this.noticedata[0].insertusername,
-              //     inserttime:this.noticedata[0].inserttime,
-              //     noticeid:this.noticedata[0].noticeId
-              //   }
-              //   this.noticedata1=data
-              //   this.centerDialogVisible=true;
-              // }
+               let data={
+                  noticetitle:this.noticedata[0].noticetitle,
+                  noticecontent:this.noticedata[0].noticecontent,
+                  insertusername:this.noticedata[0].insertusername,
+                  inserttime:this.noticedata[0].inserttime,
+                  noticeid:this.noticedata[0].noticeId
+                }
+              //判断是否需要弹窗,右边的注释用于控制时间间隔 || window.top.localStorage.getItem("noticeTime")==null || new Date().getTime() - window.top.localStorage.getItem("noticeTime") > 1000*10
+              if(window.top.localStorage.getItem("noticeId")!=data.noticeid){
+                this.noticedata1=data;
+                this.centerDialogVisible=true;
+                window.top.localStorage.setItem('noticeId', data.noticeid)
+                // window.top.localStorage.setItem('noticeTime', new Date().getTime())
+              }else{
+                console.log("暂无新的通知,不展示");
+              }
             }
           } else {
             console.log('进入了标记值为null的值')

+ 2 - 0
src/views/index/components/login.vue

@@ -219,6 +219,8 @@ export default {
                     )
                   }
                 }
+                //清空通知id
+                 window.top.localStorage.setItem('noticeId', null)
               } else {
                 //  登录失败
                 // 提示