解决冲突

src/components/Portal/interestCollection.vue

@@ -5,7 +5,7 @@
       :append-to-body="true"
       min-width="770px"
       max-width="950px"
-
+       @close="closeDialog"
       >
       <div style="margin-top:10px">
         <div class="interest" v-for="(sys,index) in sysTypeListMap" :key="sys.id">
@@ -43,9 +43,12 @@
     created() {
           // this.userAvatar=require("@/assets/images/user/default.png");
           apiUserhobby.has().then(res=>{
+            console.log("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
+            console.log(res);
+            console.log("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
             if(res.status != 200) {return;}
             // 1. 判断用户是否选择过兴趣偏好
-            if(res.data == false){
+            if(res.result == false){
               this.interestCollection = true;
             }
             // 2. 判断用户是否点击过"暂不选择"按钮，如果用户点击过"暂不选择"按钮则判断点击"暂不选择"按钮天数是否大于15天，如果大于则弹出兴趣偏好框，否则不弹
@@ -74,6 +77,9 @@
         ...mapActions({
             getSysTypeTree: 'sysType/getSysTypeTree',
         }),
+        closeDialog() {
+                  localStorage.setItem('dialog_session_show',1);
+                },
         saveInterest() {
             let data = []
             if(this.checkboxGroup.length  < 3) {