From c92b25fa8a3b5d177fbf1250cb0a5f45a4b4e40a Mon Sep 17 00:00:00 2001 From: pplokijuhyg <1162963624@qq.com> Date: Fri, 27 Dec 2019 15:13:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PersonalHomepage.vue | 51 +++++++++++++++++++++++---------- src/articledetail.vue | 4 +-- src/components/IndexList.vue | 23 +++++++++++++-- src/components/indexFollow.vue | 10 +++++-- src/components/indexFollow1.vue | 14 ++++++--- src/components/indexfindall.vue | 10 +++++-- 6 files changed, 85 insertions(+), 27 deletions(-) diff --git a/src/PersonalHomepage.vue b/src/PersonalHomepage.vue index c085d12..654c4c0 100644 --- a/src/PersonalHomepage.vue +++ b/src/PersonalHomepage.vue @@ -116,6 +116,12 @@ :type="item.type" > +
+ + {{text}} +
@@ -198,6 +204,7 @@ import follow from "./components/PersonafFollow"; // import follows from "./components/PersonafFollows" import answer from "./components/PersonalAnswer"; +import login from "./assets/login.gif"; import home from "./assets/home.png"; // import { log } from 'util'; export default { @@ -214,7 +221,9 @@ export default { type: ["", "我点赞", "我收藏", "我关注", "我评论", "我回答"], types: 4, page: 0, - lock: false + lock: false, + text: "加载中", + login // imgurl:"" }; }, @@ -240,6 +249,7 @@ export default { if (this.lock) { return; } + this.text = "加载中"; this.lock = true; this.page += 1; this.axios @@ -258,18 +268,23 @@ export default { return; } - window.console.log(this.page,261) + window.console.log(this.page, 261); if (this.page == 1) { this.dynamiclist = res.data.data; - window.console.log(1,res.data.data.length) + if (res.data.data.length < 20) { + this.text = "暂无更多数据"; + } + window.console.log(1, res.data.data.length); } else if (res.data.data.length > 0) { this.dynamiclist.push(...res.data.data); - window.console.log(2) - + window.console.log(2); + if (res.data.data.length < 20) { + this.text = "暂无更多数据"; + } } else { this.lock = true; - window.console.log(3,res.data.data.length > 0) - + window.console.log(3, res.data.data.length > 0); + this.text = "暂无更多数据"; } window.console.log(this.lock); } @@ -279,6 +294,7 @@ export default { if (this.lock) { return; } + this.text = "加载中"; this.lock = true; this.page += 1; this.axios @@ -296,19 +312,24 @@ export default { // return ; // } // alert(1) - window.console.log(this.page,299) + window.console.log(this.page, 299); - if (this.page == 1) { + if (this.page == 1) { this.dynamiclist = res.data.data; - window.console.log(1,res.data.data.length) + window.console.log(1, res.data.data.length); + if (res.data.data.length < 20) { + this.text = "暂无更多数据"; + } } else if (res.data.data.length > 0) { this.dynamiclist.push(...res.data.data); - window.console.log(2) - + if (res.data.data.length < 20) { + this.text = "暂无更多数据"; + } + window.console.log(2); } else { this.lock = true; - window.console.log(3) - + window.console.log(3); + this.text = "暂无更多数据"; } window.console.log(this.lock); } @@ -375,7 +396,7 @@ export default { // } this.page = 0; this.dynamiclist = []; - // this.lock = false; + this.lock = false; if (this.types == 5) { this.getlists(this.types); } else { diff --git a/src/articledetail.vue b/src/articledetail.vue index 5e7dd5d..4946d9c 100644 --- a/src/articledetail.vue +++ b/src/articledetail.vue @@ -336,9 +336,9 @@ window.$(window).scrollTop(window.$(window).scrollTop) width: 100%; color: #333333; font-size: 0.36rem; - text-indent: 0.3rem; + // text-indent: 0.3rem; line-height: 1rem; - font-weight: 500; + font-weight: 600; } .title { color: #333333; diff --git a/src/components/IndexList.vue b/src/components/IndexList.vue index 6738165..ccb3961 100644 --- a/src/components/IndexList.vue +++ b/src/components/IndexList.vue @@ -63,6 +63,19 @@ color: #000; line-height: 46px; font-weight: bold; + overflow: hidden; + +text-overflow: ellipsis; + +display: -webkit-box; + +-webkit-line-clamp: 2; + +overflow:hidden; + +/*! autoprefixer: off */ + +-webkit-box-orient: vertical; } .answer { .user { @@ -223,7 +236,10 @@ export default { type:this.type, click_id:this.id, status: 1 - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.islike){ this.like = parseInt(this.like) - 1 }else{ @@ -238,7 +254,10 @@ export default { token:localStorage.getItem("token"), type:this.type, id:this.id - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.iscllect){ this.collect = parseInt(this.collect) - 1 }else{ diff --git a/src/components/indexFollow.vue b/src/components/indexFollow.vue index f0b87da..47a7ebf 100644 --- a/src/components/indexFollow.vue +++ b/src/components/indexFollow.vue @@ -204,7 +204,10 @@ export default { type:3, click_id:this.sid, status: 1 - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.islike){ this.like = parseInt(this.like) - 1 }else{ @@ -219,7 +222,10 @@ export default { token:localStorage.getItem("token"), type:3, id:this.sid - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.iscllect){ this.collect = parseInt(this.collect) - 1 }else{ diff --git a/src/components/indexFollow1.vue b/src/components/indexFollow1.vue index c652347..c1a0305 100644 --- a/src/components/indexFollow1.vue +++ b/src/components/indexFollow1.vue @@ -67,9 +67,9 @@ width: 100%; color: #333333; font-size: 0.3rem; - text-indent: 0.3rem; + // text-indent: 0.3rem; line-height: 0.45rem; - font-weight: 500; + font-weight: 600; } .title { color: #333333; @@ -262,7 +262,10 @@ export default { type:1, click_id:this.$route.query.id, status: 1 - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.islike){ this.like = parseInt(this.like) - 1 }else{ @@ -277,7 +280,10 @@ export default { token:localStorage.getItem("token"), type:1, id:this.$route.query.id - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.iscllect){ this.collect = parseInt(this.collect) - 1 }else{ diff --git a/src/components/indexfindall.vue b/src/components/indexfindall.vue index ceadab0..5a194de 100644 --- a/src/components/indexfindall.vue +++ b/src/components/indexfindall.vue @@ -71,7 +71,10 @@ export default { type:this.type, click_id:this.id, status: 1 - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.islike){ this.like = parseInt(this.like) - 1 }else{ @@ -86,7 +89,10 @@ export default { token:localStorage.getItem("token"), type:this.type, id:this.id - }).then(()=>{ + }).then((res)=>{ + if(res.data.code != 200){ + return ; + } if(this.iscllect){ this.collect = parseInt(this.collect) - 1 }else{