diff --git a/src/base/loading/loading.vue b/src/base/loading/loading.vue index 8c612d7..6317623 100644 --- a/src/base/loading/loading.vue +++ b/src/base/loading/loading.vue @@ -10,6 +10,7 @@ +
刷新
@@ -44,6 +45,7 @@ } }, mounted() { + //2500是因为我将所有axios请求timeout设为了2500ms setTimeout(() => { this.progressValue = Math.max(10, this.progressValue) }, 250) @@ -60,7 +62,7 @@ this.progressValue = Math.max(80, this.progressValue) }, 2000) setTimeout(() => { - this.progressValue = Math.max(100, this.progressValue) + this.progressValue = Math.max(99, this.progressValue) }, 2500) } } diff --git a/src/common/scss/loading.scss b/src/common/scss/loading.scss index eb7da18..1fb7747 100644 --- a/src/common/scss/loading.scss +++ b/src/common/scss/loading.scss @@ -23,6 +23,11 @@ $--padding: 2px; margin: 0; font-family: 'HoangYen11'; } + .refresh { + font-size: 14px; + font-weight: bold; + cursor: pointer; + } .progress-wrapper { width: $--width; height: $--progress-height; @@ -71,14 +76,3 @@ $--padding: 2px; background: rgba(0, 0, 0, .1); } } -.loading-fade-leave-active { - animation: loading-fade-out .3s; -} -@keyframes loading-fade-out { - 0% { - opacity: 1; - } - 100% { - opacity: 0; - } -} diff --git a/src/common/scss/mainPage.scss b/src/common/scss/mainPage.scss index a8f5606..381ba60 100644 --- a/src/common/scss/mainPage.scss +++ b/src/common/scss/mainPage.scss @@ -37,3 +37,16 @@ $primary-blue: #409EFF; margin: 10px auto; } } + +.loading-fade-leave-active { + animation: loading-fade-out .3s; +} + +@keyframes loading-fade-out { + 0% { + opacity: 1; + } + 100% { + opacity: 0; + } +} diff --git a/src/components/mainPage/mainPage.vue b/src/components/mainPage/mainPage.vue index abbf543..3e8bd54 100644 --- a/src/components/mainPage/mainPage.vue +++ b/src/components/mainPage/mainPage.vue @@ -67,7 +67,9 @@ -