From b4b810b985a486d82b1322d2775ce0a024bf08c1 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 12 Oct 2022 17:08:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=85=B4=E8=B6=A3?=
 =?UTF-8?q?=E5=81=8F=E5=A5=BD=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 289f8486..c3197219 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -155,7 +155,8 @@ export default {
       default: 0,
     }
   },
-  components:{InterestCollection,GuideBox},
+  
+  // components:{InterestCollection,GuideBox},  // 注释兴趣爱好弹窗显示
   computed: {
     ...mapGetters(['userInfo', 'userMsg','identity']),
 

From 551a196ab5dc3b6d0979799ac22e32b008ca02e1 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 12 Oct 2022 17:29:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=95=E5=AF=BC?=
 =?UTF-8?q?=E9=A1=B5=E3=80=81=E5=85=B4=E8=B6=A3=E5=81=8F=E5=A5=BD=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index dc816832..dc456b51 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -20,7 +20,7 @@
         <p class="personal-name">{{userInfo.name}} {{userInfo.userNo}}
           <span class="grade">LV.1</span>
         </p>
-        
+
         <p class="personal-info">{{userInfo.departName}}</p>
         <!-- <a href="../study/task.vue"> -->
         <div  class="personal-box"><span>代办</span><span>3个待处理 <img src="/images/homeWu/Pending.png" alt=""> </span> <img class="personal-box-img"
@@ -142,7 +142,7 @@
                     <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
                   </div>
                 </div>
-              
+
               </li>
             </ul>
           </div>
@@ -374,13 +374,13 @@
     </div>
     <portal-footer></portal-footer>
     <portalFloatTools></portalFloatTools>
+    <interest-Collection></interest-Collection> <!-- 兴趣偏好 -->
+    <guide-box></guide-box> <!-- 引导页 -->
   </div>
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex';
+  import { mapGetters } from 'vuex';
   import portalHeader from '@/components/PortalHeader.vue';
   import portalFooter from '@/components/PortalFooter.vue';
   import portalFloatTools from '@/components/PortalFloatTools.vue';
@@ -396,6 +396,8 @@
   import interactRowBar from '@/components/Portal/interactRowBar.vue';
   import courseImage from '@/components/Course/courseImage.vue';
   import articleImage from '@/components/Article/articleImage.vue';
+  import InterestCollection from '@/components/Portal/interestCollection.vue'
+  import GuideBox from '@/components/Portal/guideBox.vue'
   import {
     toScore,
     cutFullName
@@ -409,6 +411,8 @@
   import apiStart from '@/api/phase2/stat.js'
   import apiIndex from '@/api/phase2/index.js'
 
+
+
   export default {
     name: 'index',
     components: {
@@ -421,7 +425,9 @@
       authorInfo,
       interactRowBar,
       interactBar,
-      courseImage
+      courseImage,
+      InterestCollection,
+      GuideBox
     },
     computed: {
       ...mapGetters(['userInfo'])
@@ -584,7 +590,7 @@
         window.open('https://m.qingxuetang.com/x/?appId=qxtcorp306130', '_blank');
       },
       toCourseDetail(item) {
-        
+
         if (item.type == 10) {
           return this.webBaseUrl + '/course/micro?id=' + item.id;
         } else if (item.type == 20) {

From 6e1b54ba0e3cdc1bddecb012045ae397aa0a49b9 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 12 Oct 2022 19:36:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B4=E8=B6=A3?=
 =?UTF-8?q?=E5=81=8F=E5=A5=BD=E5=BC=B9=E5=87=BA=E6=A1=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/interestCollection.vue | 55 ++++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/components/Portal/interestCollection.vue b/src/components/Portal/interestCollection.vue
index 889e2cb6..55da5f59 100644
--- a/src/components/Portal/interestCollection.vue
+++ b/src/components/Portal/interestCollection.vue
@@ -2,18 +2,18 @@
 	<el-dialog
       :close-on-click-modal="false"
       :visible.sync="interestCollection"
-      :append-to-body="true" 
-      width="967px">
+      :append-to-body="true"
+      width="967px" @close="closeDialog">
       <div style="margin-top:65px">
         <div class="interest" v-for="(sys,index) in sysTypeListMap" :key="sys.id">
            <p class="portal-title-tow interest-title">{{sys.name}}</p>
            <el-checkbox-group v-model="checkboxGroup" v-if="sys.children.length > 0">
             <el-checkbox size="medium" border v-for="ch in sys.children" :label="ch.id" :key="ch.id">{{ch.name}}</el-checkbox>
           </el-checkbox-group>
-         </div> 
+         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <div><el-button type="primary" class="btn-one" @click="saveInterest()">生成我的兴趣偏好</el-button></div>
+        <div><el-button v-disabled="500" type="primary" class="btn-one" :disabled="btn_insterest_status==1" @click="saveInterest()">生成我的兴趣偏好</el-button></div>
         <div><el-button @click="notYet()" class="btn-tow" type="text">暂不选择</el-button></div>
       </div>
     </el-dialog>
@@ -31,26 +31,31 @@
     data(){
     	return {
             checkboxGroup:[],
-            interestCollection:false,// 兴趣采集
-            sysTypeListMap:[]
+            interestCollection:false, // 兴趣采集弹窗默认不显示
+            sysTypeListMap:[],
+            btn_insterest_status:0,
+            dialog_session_show:0
     	}
     },
     created() {
       // this.userAvatar=require("@/assets/images/user/default.png");
       apiUserhobby.has().then(res=>{
-        if(res.status == 200) {
-            let time = localStorage.getItem('notYet');
-            if(time == '') {
-                this.interestCollection = true;
-            } else {
-                let time = localStorage.getItem('notYet');
-                let day = (new Date() - new Date(time))/(1000*60*60*24);
-                if(day > 15){
-                    this.interestCollection = true;
-                }
-            }
-          
+        if(res.status != 200) {return;}
+        // 1. 判断用户是否选择过兴趣偏好
+        if(res.data == false){
+          this.interestCollection = true;
         }
+        // 2. 判断用户是否点击过"暂不选择"按钮，如果用户点击过"暂不选择"按钮则判断点击"暂不选择"按钮天数是否大于15天，如果大于则弹出兴趣偏好框，否则不弹
+        let time = localStorage.getItem('notYet');
+        if(time == '') {
+            this.interestCollection = true;
+        } else {
+            let day = (new Date() - new Date(time))/(1000*60*60*24);
+            if(day > 15){this.interestCollection = true;}
+        }
+        // 3. 判断用户是否点击"关闭"按钮，如果点击"关闭"按钮则在当前session不在弹窗
+        let dialog_session_show = localStorage.getItem('dialog_session_show');
+        if(dialog_session_show == 1){this.interestCollection = false;}
       })
     },
     mounted() {
@@ -66,7 +71,13 @@
         ...mapActions({
             getSysTypeTree: 'sysType/getSysTypeTree',
         }),
+
+        closeDialog() {
+          localStorage.setItem('dialog_session_show',1);
+        },
+
         saveInterest() {
+            this.btn_insterest_status = 0; // 禁用按钮
             let data = []
             if(this.checkboxGroup.length  < 3) {
                 this.$message.error('至少选择三个兴趣偏好！')
@@ -95,10 +106,10 @@
         }
     },
     watch:{
-    
+
     },
     computed:{
-	
+
 		},
 
 	}
@@ -106,7 +117,7 @@
 
 <style scoped lang="scss">
 	::v-deep .el-dialog{
-        background: #fff url('/images/homeWu/interest.png') no-repeat; 
+        background: #fff url('/images/homeWu/interest.png') no-repeat;
         border-radius: 8px;
         // height: 840px;
     }
@@ -118,7 +129,7 @@
    margin-bottom: 20px;
    margin-left: 0px;
    margin-right: 23px;
-} 
+}
 .el-checkbox.is-bordered.is-checked{
     border-color: #4677F4;
 }

From 47aeaf8597b3e5f632714764e51d34ec7e02f14a Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Thu, 13 Oct 2022 14:36:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/Portal/interestCollection.vue b/src/components/Portal/interestCollection.vue
index 5af01410..f3f3bd50 100644
--- a/src/components/Portal/interestCollection.vue
+++ b/src/components/Portal/interestCollection.vue
@@ -35,27 +35,32 @@
     	return {
             checkboxGroup:[],
             interestCollection:false,// 兴趣采集
-            sysTypeListMap:[]
+            sysTypeListMap:[],
+            btn_insterest_status:0,
+            dialog_session_show:0
     	}
     },
     created() {
-      // this.userAvatar=require("@/assets/images/user/default.png");
-      apiUserhobby.has().then(res=>{
-        if(res.status == 200) {
+          // this.userAvatar=require("@/assets/images/user/default.png");
+          apiUserhobby.has().then(res=>{
+            if(res.status != 200) {return;}
+            // 1. 判断用户是否选择过兴趣偏好
+            if(res.data == false){
+              this.interestCollection = true;
+            }
+            // 2. 判断用户是否点击过"暂不选择"按钮，如果用户点击过"暂不选择"按钮则判断点击"暂不选择"按钮天数是否大于15天，如果大于则弹出兴趣偏好框，否则不弹
             let time = localStorage.getItem('notYet');
             if(time == '') {
                 this.interestCollection = true;
             } else {
-                let time = localStorage.getItem('notYet');
                 let day = (new Date() - new Date(time))/(1000*60*60*24);
-                if(day > 15){
-                    this.interestCollection = true;
-                }
+                if(day > 15){this.interestCollection = true;}
             }
-
-        }
-      })
-    },
+            // 3. 判断用户是否点击"关闭"按钮，如果点击"关闭"按钮则在当前session不在弹窗
+            let dialog_session_show = localStorage.getItem('dialog_session_show');
+            if(dialog_session_show == 1){this.interestCollection = false;}
+          })
+        },
     mounted() {
       this.getSysTypeTree().then(rs => {
         this.sysTypeListMap = rs;