From 5407471e657ed8384a87f0d6818228c950e39c89 Mon Sep 17 00:00:00 2001 From: zyronon Date: Tue, 19 Oct 2021 22:38:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/me/RequestUpdate.vue | 10 ++++++- src/pages/message/AllMessage.vue | 31 +++++++++++++------- src/pages/message/Fans.vue | 35 +++++++++++++---------- src/pages/message/Message.vue | 5 ++++ src/pages/message/notice/DouyinHelper.vue | 22 ++++++++------ src/pages/message/notice/LiveNotice.vue | 21 +++++++++----- src/pages/message/notice/MoneyNotice.vue | 26 ++++++++++------- src/pages/message/notice/SystemNotice.vue | 22 ++++++++------ src/pages/message/notice/TaskNotice.vue | 21 +++++++++----- src/pages/people/components/People.vue | 6 ++-- 10 files changed, 129 insertions(+), 70 deletions(-) diff --git a/src/pages/me/RequestUpdate.vue b/src/pages/me/RequestUpdate.vue index f32cd7e..0ea8403 100644 --- a/src/pages/me/RequestUpdate.vue +++ b/src/pages/me/RequestUpdate.vue @@ -10,7 +10,8 @@ -
+ +
暂时还没有粉丝点击“求更新”
@@ -66,6 +67,7 @@ export default { data() { return { isShowOption: false, + loading: false, openRequestUpdate: true, } }, @@ -73,8 +75,14 @@ export default { ...mapState(['friends']) }, created() { + this.getData() }, methods: { + async getData() { + this.loading = true + await this.$sleep(700) + this.loading = false + }, toggleRequestUpdate() { this.openRequestUpdate = !this.openRequestUpdate this.isShowOption = false diff --git a/src/pages/message/AllMessage.vue b/src/pages/message/AllMessage.vue index d7e56c5..242bbc1 100644 --- a/src/pages/message/AllMessage.vue +++ b/src/pages/message/AllMessage.vue @@ -40,7 +40,9 @@
+
- +
@@ -133,6 +135,7 @@ export default { data() { return { loading: false, + loadingMore: false, isShowType: false, showAll: false, recommend: [], @@ -162,14 +165,20 @@ export default { } }, created() { - this.recommend = this.$clone(this.friends.all) - this.fans = this.$clone(this.friends.all) - this.recommend.map(v => { - v.type = -1 - }) - this.messages = this.$clone(resource.videos) + this.getData() }, methods: { + async getData() { + this.loading = true + await this.$sleep(800) + this.loading = false + this.recommend = this.$clone(this.friends.all) + this.fans = this.$clone(this.friends.all) + this.recommend.map(v => { + v.type = -1 + }) + this.messages = this.$clone(resource.videos) + }, toggleShowType(index) { this.selectShowType = index this.isShowType = false @@ -183,10 +192,10 @@ export default { this.$refs.scroll.refreshEnd() }, async loadData() { - if (this.loading) return - this.loading = true + if (this.loadingMore) return + this.loadingMore = true await this.$sleep(500) - this.loading = false + this.loadingMore = false let temp = this.$clone(this.friends.all) temp.map(v => { v.type = -1 diff --git a/src/pages/message/Fans.vue b/src/pages/message/Fans.vue index 0b065eb..dabd931 100644 --- a/src/pages/message/Fans.vue +++ b/src/pages/message/Fans.vue @@ -6,18 +6,19 @@
- + +
朋友推荐
- +
@@ -40,6 +41,7 @@ export default { data() { return { loading: false, + loadingMore: false, recommend: [], fans: [], } @@ -48,22 +50,25 @@ export default { ...mapState(['userinfo', 'friends']) }, created() { - this.recommend = this.$clone(this.friends.all) - this.fans = this.$clone(this.friends.all) - this.recommend.map(v => { - v.type = -1 - }) + this.getData() }, methods: { - remove(index) { - this.$notice('将不会再为你推荐该用户') - this.recommend.splice(index, 1) - }, - async loadData() { - if (this.loading) return + async getData() { this.loading = true await this.$sleep(500) this.loading = false + + this.recommend = this.$clone(this.friends.all) + this.fans = this.$clone(this.friends.all) + this.recommend.map(v => { + v.type = -1 + }) + }, + async loadData() { + if (this.loadingMore) return + this.loadingMore = true + await this.$sleep(500) + this.loadingMore = false let temp = this.$clone(this.friends.all) temp.map(v => { v.type = -1 diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue index cc3232f..cef2d8c 100644 --- a/src/pages/message/Message.vue +++ b/src/pages/message/Message.vue @@ -464,6 +464,11 @@ export default { v.type = -2 }) }, + mounted() { + setTimeout(()=>{ + // this.isShowRecommend = true + },1000) + }, methods: { async loadRecommendData() { if (this.loading) return diff --git a/src/pages/message/notice/DouyinHelper.vue b/src/pages/message/notice/DouyinHelper.vue index ed23596..90d9b42 100644 --- a/src/pages/message/notice/DouyinHelper.vue +++ b/src/pages/message/notice/DouyinHelper.vue @@ -5,7 +5,8 @@ 抖音小助手 -
+ +
@@ -30,11 +31,9 @@ import {nextTick} from "vue"; export default { name: "DouyinHelper", components: {}, - props: { - modelValue: false - }, data() { return { + loading:false, list: [ { read: false, @@ -78,14 +77,21 @@ export default { }, computed: {}, created() { + this.getData() }, mounted() { - nextTick(() => { - let content = this.$refs['content'] - content.scrollTo({top: content.scrollHeight - content.clientHeight}) - }) }, methods: { + async getData(){ + this.loading = true + await this.$sleep(700) + this.loading = false + + nextTick(() => { + let content = this.$refs['content'] + content.scrollTo({top: content.scrollHeight - content.clientHeight}) + }) + }, goDetail(item) { item.read = true this.$no() diff --git a/src/pages/message/notice/LiveNotice.vue b/src/pages/message/notice/LiveNotice.vue index f96ecc2..d7bf847 100644 --- a/src/pages/message/notice/LiveNotice.vue +++ b/src/pages/message/notice/LiveNotice.vue @@ -8,7 +8,8 @@ 通知设置 -
+ +
@@ -33,6 +34,7 @@ export default { }, data() { return { + loading:false, list: [ { title: '直播举报反馈', @@ -50,14 +52,19 @@ export default { watch: {}, computed: {}, created() { - }, - mounted() { - nextTick(() => { - let content = this.$refs['content'] - content.scrollTo({top: content.scrollHeight - content.clientHeight}) - }) + this.getData() }, methods: { + async getData() { + this.loading = true + await this.$sleep(700) + this.loading = false + + nextTick(() => { + let content = this.$refs['content'] + content.scrollTo({top: content.scrollHeight - content.clientHeight}) + }) + }, goDetail(item) { item.read = true if (item.detail) { diff --git a/src/pages/message/notice/MoneyNotice.vue b/src/pages/message/notice/MoneyNotice.vue index 1fd3d91..e2f1224 100644 --- a/src/pages/message/notice/MoneyNotice.vue +++ b/src/pages/message/notice/MoneyNotice.vue @@ -8,7 +8,8 @@ 通知设置 -
+ +
@@ -78,6 +79,7 @@ export default { }, data() { return { + loading: false, isShowSetting: false, openNotice: false, list: [ @@ -102,17 +104,21 @@ export default { ] } }, - watch: {}, - computed: {}, created() { + this.getData() }, - mounted() { - nextTick(() => { - let content = this.$refs['content'] - content.scrollTo({top: content.scrollHeight - content.clientHeight}) - }) - }, - methods: {} + methods: { + async getData() { + this.loading = true + await this.$sleep(700) + this.loading = false + + nextTick(() => { + let content = this.$refs['content'] + content.scrollTo({top: content.scrollHeight - content.clientHeight}) + }) + }, + } } diff --git a/src/pages/message/notice/SystemNotice.vue b/src/pages/message/notice/SystemNotice.vue index f7f2c13..d732e99 100644 --- a/src/pages/message/notice/SystemNotice.vue +++ b/src/pages/message/notice/SystemNotice.vue @@ -8,7 +8,8 @@ 通知设置 -
+ +
@@ -64,11 +65,9 @@ import Mask from "../../../components/Mask"; export default { name: "SystemNotice", components: {Mask}, - props: { - modelValue: false - }, data() { return { + loading: false, isShowMask: false, isShowLeftHover: false, isShowRightHover: false, @@ -124,14 +123,21 @@ export default { }, computed: {}, created() { + this.getData() }, mounted() { - nextTick(() => { - let content = this.$refs['content'] - content.scrollTo({top: content.scrollHeight - content.clientHeight}) - }) }, methods: { + async getData() { + this.loading = true + await this.$sleep(700) + this.loading = false + + nextTick(() => { + let content = this.$refs['content'] + content.scrollTo({top: content.scrollHeight - content.clientHeight}) + }) + }, goDetail(item) { item.read = true if (item.detail) { diff --git a/src/pages/message/notice/TaskNotice.vue b/src/pages/message/notice/TaskNotice.vue index 8b2c4bb..c3e511d 100644 --- a/src/pages/message/notice/TaskNotice.vue +++ b/src/pages/message/notice/TaskNotice.vue @@ -8,7 +8,8 @@ 通知设置 -
+ +
@@ -67,6 +68,7 @@ export default { }, data() { return { + loading:false, isShowSetting: false, openNotice: false, list: [ @@ -90,14 +92,19 @@ export default { watch: {}, computed: {}, created() { - }, - mounted() { - nextTick(() => { - let content = this.$refs['content'] - content.scrollTo({top: content.scrollHeight - content.clientHeight}) - }) + this.getData() }, methods: { + async getData() { + this.loading = true + await this.$sleep(700) + this.loading = false + + nextTick(() => { + let content = this.$refs['content'] + content.scrollTo({top: content.scrollHeight - content.clientHeight}) + }) + }, goDetail(item) { item.read = true if (item.detail) { diff --git a/src/pages/people/components/People.vue b/src/pages/people/components/People.vue index e04fcdb..c97c765 100644 --- a/src/pages/people/components/People.vue +++ b/src/pages/people/components/People.vue @@ -153,7 +153,7 @@ export default { .People { transition: all 0.3s ease; width: 100%; - height: 7rem; + height: 8rem; display: flex; align-items: center; position: relative; @@ -207,11 +207,11 @@ export default { border-radius: .2rem; background: rgb(58, 58, 67); font-size: 1.2rem; - padding: .4rem 0; + padding: .5rem 0; display: flex; align-items: center; justify-content: center; - width: 5.5rem; + width: 5.8rem; &:only-child { width: 7rem;