diff --git a/src/api/phase2/stat.js b/src/api/phase2/stat.js index ce7ad835..69e7f37b 100644 --- a/src/api/phase2/stat.js +++ b/src/api/phase2/stat.js @@ -152,6 +152,12 @@ const getRanking = function(queryData) { return ajax.get(baseURL,'/xboe/m/stat/medal/login-medal'); } +/** + * 提取需要提示的勋章 + */ +const getUserMedalTips = function() { + return ajax.get(baseURL,'/xboe/m/stat/medal/tips'); +} export default { sendEvent, @@ -166,5 +172,6 @@ export default { getRanking, getUserStatTotalInfo, userDynamicfollows, - getUserLoginMedal + getUserLoginMedal, + getUserMedalTips } diff --git a/src/components/Portal/interestCollection.vue b/src/components/Portal/interestCollection.vue index be9874f5..f7097074 100644 --- a/src/components/Portal/interestCollection.vue +++ b/src/components/Portal/interestCollection.vue @@ -82,6 +82,7 @@ //15天控制 this.interestCollection = false; localStorage.setItem('notYet'+this.userInfo.aid,new Date()); + this.$emit('close'); }, ...mapActions({ getSysTypeTree: 'sysType/getSysTypeTree', @@ -90,6 +91,7 @@ closeDialog() { //本地登录的设置 sessionStorage.setItem('user-hobby-'+this.userInfo.aid,1); + this.$emit('close'); }, saveInterest() { let data = [] @@ -134,6 +136,7 @@ }); } }) + this.$emit('close'); } }, watch:{ diff --git a/src/views/Index.vue b/src/views/Index.vue index cc3a53cf..e94c07f2 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -427,7 +427,7 @@ - + @@ -494,28 +494,35 @@ }, created() { this.$store.dispatch('refrashStudyTaskCount'); + let $this=this; //判断是否弹出登录勋章,设置截止日期 var nowDate = new Date(); var endDate = new Date('2022-11-18');//先设置时间是11月18日 if(nowDate{ if(rs.status==200){ if(rs.result.show){ - //弹出勋章 - $this.showLoginMedal=true; + //设置是否需要显示纪念勋章 + $this.needLoginMedal=true; } } }) } + //提取需要提示勋章 + // apiStat.getUserMedalTips().then(res=>{ + // if(res.status==200){ + // $this.medalTips=res.result; + // } + // }) }, data() { return { showLoginMedal:false,//是否显示登录勋章 + needLoginMedal:false,//是否需要显示纪念勋章 medalTips:[ - {medalId:1,medalLevel:5}, - {medalId:3,medalLevel:4} + {medalId:1,medalLevel:5,isShow:false}, + {medalId:3,medalLevel:4,isShow:false} ], lastStudy:{}, overlayShow:false, @@ -695,6 +702,11 @@ this.$refs.userCollection.show(); } }, + closeCollection(){ + if(this.needLoginMedal){ + this.showLoginMedal=true; + } + }, jumstudy(){ this.$router.push({path:'../views/study/TaskList.vue'}); },