diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js index 7d4b2c34..c5612563 100644 --- a/src/api/phase2/note.js +++ b/src/api/phase2/note.js @@ -106,8 +106,8 @@ const ids=function (data){ * } * */ const exportExcel=function (data){ - // return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); - return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); + return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); + // return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); } /** diff --git a/src/api/phase2/userhobby.js b/src/api/phase2/userhobby.js index fea8d768..375c6787 100644 --- a/src/api/phase2/userhobby.js +++ b/src/api/phase2/userhobby.js @@ -20,8 +20,8 @@ const save=function (data){ * 同兴趣人匹配查询 * 参数：下面那个接口的返回值直接传 * */ -const list=function (data){ - return ajax.postJson(baseURL,'/xboe/subgroup/m/userhobby/list',data); +const list=function (aid){ + return ajax.get(baseURL,'/xboe/subgroup/m/userhobby/list?aid='+aid); } /** diff --git a/src/assets/styles/ellipsis.scss b/src/assets/styles/ellipsis.scss index e5f1dd3d..d1543f8a 100644 --- a/src/assets/styles/ellipsis.scss +++ b/src/assets/styles/ellipsis.scss @@ -48,6 +48,9 @@ p{ font-size: 20px; margin-top: 70px; color: #ccc; + img{ + text-align: center; + } } diff --git a/src/components/Article/editItems.vue b/src/components/Article/editItems.vue index 9d378067..3d08d0f2 100644 --- a/src/components/Article/editItems.vue +++ b/src/components/Article/editItems.vue @@ -3,7 +3,7 @@ - +
diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue index 3194625f..2ca0fae6 100644 --- a/src/components/Portal/comments.vue +++ b/src/components/Portal/comments.vue @@ -407,7 +407,6 @@ item.orgInfo=author.orgInfo; item.sex=author.sex; item.sign=author.sign - console.log(list,'评论信息') return true; }else{ return false; diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index c2a71051..dcf221ae 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -57,7 +57,7 @@ disableOnInteraction: false , delay: 2000, }, - speed: 1000, //切换速度，即slider自动滑动开始到结束的时间（单位ms） + speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms） loop:true, //循环切换 observe:true, peed: 300,//循环速度 diff --git a/src/components/Qa/addQuestion.vue b/src/components/Qa/addQuestion.vue index d424743b..c8ba149b 100644 --- a/src/components/Qa/addQuestion.vue +++ b/src/components/Qa/addQuestion.vue @@ -10,7 +10,7 @@ - + diff --git a/src/utils/tools.js b/src/utils/tools.js index 82c9c542..cef104af 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -148,6 +148,29 @@ export function formatDate(date){ return newTime; } + +/** + * 把日期格式化为显示时间，yyyy-MM-dd + * @param {Object} date + */ +export function formatDateShort(date){ + var year = date.getFullYear(), + month = date.getMonth() + 1,//月份是从0开始的 + day = date.getDate(), + hour = date.getHours(), + min = date.getMinutes(), + sec = date.getSeconds(); + if(month<10){month='0'+month} + if(day<10){day='0'+day} + if(hour<10){hour='0'+hour} + if(min<10){min='0'+min} + if(sec<10){sec='0'+sec} + var newTime = year + '-' + month + '-' + day; + return newTime; + +} + + export function numberToLetter(x){ //此方法和移到utils中去 let s = ""; while (x > 0) { diff --git a/src/views/Index.vue b/src/views/Index.vue index e352e617..9771b970 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -531,41 +531,38 @@ //检查兴趣爱好是否已填报, //先检查本地session和 local 15天, 这两个值是在组件中设置的 - // let sessionHobby=sessionStorage.getItem('user-hobby-'+this.userInfo.aid); - // let localHobbyTime=localStorage.getItem('notYet'+this.userInfo.aid); - // if(!sessionHobby){ //只有session中不存在，才会验证 - // //本地15天验证,localHobby,后续完善 - // let flag=true;//请求检查 - // if(localHobbyTime) { - // let day = (new Date() - new Date(localHobbyTime))/(1000*60*60*24); - // if(day< 15){ - // flag = false; - // } - // } - // if(flag){ - // apiUserhobby.has().then(res=>{ - // if(res.status == 200) { - // if(!res.result){ - // //设置需要显示兴趣爱好收集窗口 - // this.userHobby.needShow=true; - // } - // }else{ - // console.log('兴趣爱好检查失败'+res.message); - // } - // //检查引导页 - // this.checkAndShowGuide(); - // }); - // }else{ - // this.checkAndShowGuide(); - // } - // }else{ - // //不用检查引导页 - // //this.checkAndShowGuide(); - // } - - //测试环境中 - this.userHobby.needShow=true; - this.checkAndShowGuide(); + let sessionHobby=sessionStorage.getItem('user-hobby-'+this.userInfo.aid); + let localHobbyTime=localStorage.getItem('notYet'+this.userInfo.aid); + console.log("sessionHobby:"+sessionHobby); + if(!sessionHobby){ //只有session中不存在，才会验证 + //本地15天验证,localHobby,后续完善 + let flag=true;//请求检查 + if(localHobbyTime) { + let day = (new Date() - new Date(localHobbyTime))/(1000*60*60*24); + if(day< 15){ + flag = false; + } + } + if(flag){ + apiUserhobby.has().then(res=>{ + if(res.status == 200) { + if(!res.result){ + //设置需要显示兴趣爱好收集窗口 + this.userHobby.needShow=true; + } + }else{ + console.log('兴趣爱好检查失败'+res.message); + } + //检查引导页 + this.checkAndShowGuide(); + }); + }else{ + this.checkAndShowGuide(); + } + }else{ + //检查引导页 + this.checkAndShowGuide(); + } }, computed: { @@ -579,28 +576,29 @@ checkAndShowGuide(){ //引导页弹框是否显示 //检查本地,减少服务器请求的次数 - // let localGuide=localStorage.getItem('user-guide-'+this.userInfo.aid); - // if(!localGuide){ - // apiGuide.hasUser().then(res=>{ - // if(res.status==200){ - // if(!res.result){ - // this.$refs.guide.show(); - // }else{ - // if(this.userHobby.needShow){ this.$refs.userCollection.show();} - // } - // localStorage.setItem('user-guide-'+this.userInfo.aid,1); - // }else{ - // console.log('获取引导页检查失败'+res.message); - // //this.$message.error('') - // if(this.userHobby.needShow){this.$refs.userCollection.show();} - // } - // }); - // }else { - // if(this.userHobby.needShow){ this.$refs.userCollection.show();} - // } + let localGuide=localStorage.getItem('user-guide-'+this.userInfo.aid); + console.log("=== "+localGuide); + if(!localGuide){ + apiGuide.hasUser().then(res=>{ + if(res.status==200){ + if(!res.result){ + this.$refs.guide.show(); + }else{ + if(this.userHobby.needShow){ this.$refs.userCollection.show();} + } + localStorage.setItem('user-guide-'+this.userInfo.aid,1); + }else{ + console.log('获取引导页检查失败'+res.message); + //this.$message.error('') + if(this.userHobby.needShow){this.$refs.userCollection.show();} + } + }); + }else { + if(this.userHobby.needShow){ this.$refs.userCollection.show();} + } //测试情况下 - this.$refs.guide.show(); + // this.$refs.guide.show(); }, closeGuide(){ //关闭引导页 if(this.userHobby.needShow){ diff --git a/src/views/homepage/Index.vue b/src/views/homepage/Index.vue index cc45ebea..7596e1ef 100644 --- a/src/views/homepage/Index.vue +++ b/src/views/homepage/Index.vue @@ -109,7 +109,7 @@ userhobbyInfo() { let $this=this; $this.interestedList=[]; - apiUserhobby.list({aid:this.pageId}).then(res=>{ + apiUserhobby.list(this.pageId).then(res=>{ if(res.status == 200) { let ids = res.result.map(item=>item.aid); const noReapetIds = [...new Set(ids)]; diff --git a/src/views/share/MyList.vue b/src/views/share/MyList.vue index 6f13ca15..7c606c78 100644 --- a/src/views/share/MyList.vue +++ b/src/views/share/MyList.vue @@ -48,9 +48,13 @@
没有查询到相关内容
-
暂无数据
+
+ +
暂无数据
+
+ diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue index 041d6152..9c206570 100644 --- a/src/views/share/ToList.vue +++ b/src/views/share/ToList.vue @@ -42,7 +42,10 @@
没有查询到相关内容
-
暂无数据
+
+ +
暂无数据
+
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue index d2fc15b8..389d2afe 100644 --- a/src/views/user/Mynotes.vue +++ b/src/views/user/Mynotes.vue @@ -68,7 +68,7 @@ {{item.openType == 9?'公开':'私密'}}
{{ item.sysUpdateTime }}
-
+
{{ item.content }}