diff --git a/src/views/Index.vue b/src/views/Index.vue
index b8f83658..dd945efd 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -497,7 +497,7 @@
},
data() {
return {
- showLoginMedal:true,//是否显示登录勋章
+ showLoginMedal:false,//是否显示登录勋章
lastStudy:{},
overlayShow:false,
userData: { uvalue:0, totalStudyHour:0 },
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
index c00ba4b1..52595147 100644
--- a/src/views/portal/follow/index.vue
+++ b/src/views/portal/follow/index.vue
@@ -22,6 +22,10 @@
+
+
![]()
+
暂时没有动态
+
@@ -41,7 +45,7 @@
-
+
@@ -98,6 +102,7 @@
data(){
return{
input:'',
+ loading:0,//加载中
activeName:'first',
page:{
pageIndex:1,
@@ -169,8 +174,12 @@
aids:this.followIds // 数组
}
apiStat.userDynamicfollows(data).then(res=>{
+ this.loading=1;
if(res.status == 200) {
this.page.count = res.result.count;
+ if(res.result.count==0){
+ return;
+ }
let ids = res.result.list.map(item=>item.contentId);
let aids = [];
const noReapetIds = [...new Set(ids)];
@@ -276,7 +285,8 @@
this.getNote(noReapetNoteIds,notePageList);
}
this.allPageList.push(...casePageList,...articlePageList,...cousrePageList,...qaPageList,...answerPageList,...notePageList);
- this.allPageList.sort(this.pcompare("eventTime", false))
+ this.allPageList.sort(this.pcompare("eventTime", false));
+
},
pcompare(prop, rev) {
if (rev === undefined) {