From 356be29e53c15840e31cbdd18a250717c859e0f9 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Tue, 18 Oct 2022 12:34:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=85=B4=E8=B6=A3=E9=87=87=E9=9B=86=E5=BC=B9=E5=87=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/interestCollection.vue | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/components/Portal/interestCollection.vue b/src/components/Portal/interestCollection.vue
index 6dceb75c..ff16676f 100644
--- a/src/components/Portal/interestCollection.vue
+++ b/src/components/Portal/interestCollection.vue
@@ -34,7 +34,7 @@
     data(){
     	return {
             checkboxGroup:[],
-            interestCollection:false,// 兴趣采集
+            interestCollection:false,// 兴趣采集 false - 不显示弹框;  true - 显示弹框
             sysTypeListMap:[],
             btn_insterest_status:0,
             dialog_session_show:0
@@ -50,16 +50,17 @@
             }
             if(res.result == true){this.interestCollection = false;return;}
             // 2. 判断用户是否点击过"暂不选择"按钮，如果用户点击过"暂不选择"按钮则判断点击"暂不选择"按钮天数是否大于15天，如果大于则弹出兴趣偏好框，否则不弹
-            let time = localStorage.getItem('notYet');
-            if(time == '') {
-                this.interestCollection = true;
-            } else {
+            let time = localStorage.getItem('notYet'+this.userInfo.aid);
+            if(!time == '' || time != null) {
                 let day = (new Date() - new Date(time))/(1000*60*60*24);
-                if(day > 15){this.interestCollection = true;}
+                if(day > 15){
+                  this.interestCollection = true;
+                  return;
+                }
             }
             // 3. 判断用户是否点击"关闭"按钮，如果点击"关闭"按钮则在当前session不在弹窗
-            let dialog_session_show = localStorage.getItem('dialog_session_show');
-            if(dialog_session_show == 1){this.interestCollection = false;}
+            let current_session = sessionStorage.getItem('dialog_session_show'+this.userInfo.aid);
+            if(current_session == 1){this.interestCollection = false;}
           })
         },
     mounted() {
@@ -70,14 +71,16 @@
     methods:{
         notYet() {
             this.interestCollection = false;
-            localStorage.setItem('notYet',new Date());
+            localStorage.setItem('notYet'+this.userInfo.aid,new Date());
         },
         ...mapActions({
             getSysTypeTree: 'sysType/getSysTypeTree',
         }),
+
+        // 关闭兴趣偏好弹窗
         closeDialog() {
-                  localStorage.setItem('dialog_session_show',1);
-                },
+          sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,1);
+        },
         saveInterest() {
             let data = []
             if(this.checkboxGroup.length  < 3) {
@@ -110,7 +113,7 @@
 
     },
     computed:{
-
+        ...mapGetters(['userInfo','studyTaskCount']),
 		},
 
 	}

From b74e926c6476e9f63e4e683f548bb883c4e2196d Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Tue, 18 Oct 2022 12:35:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=80=E5=87=BA=E6=97=B6=E6=B8=85?=
 =?UTF-8?q?=E6=A5=9A=EF=BC=88=E5=85=B4=E8=B6=A3=E9=87=87=E9=9B=86=EF=BC=89?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 267c8964..43af4c85 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -283,6 +283,7 @@ export default {
         .then(() => {
           this.$store.dispatch('LogOut').then(() => {
             //location.href = this.webBaseUrl + '/login';
+			sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
             location.href = process.env.VUE_APP_LOGIN_URL;
           });
         })