From 44368d96b1d235657e5e2823a35f3952036a275c Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 9 May 2024 15:18:40 +0800
Subject: [PATCH] fix

---
 src/pages/activity/manage/add/index.vue    |  2 +-
 src/pages/activity/manage/manage/index.vue |  2 +-
 src/pages/screen/index.vue                 | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/activity/manage/add/index.vue b/src/pages/activity/manage/add/index.vue
index 46a65b8..bb07db2 100644
--- a/src/pages/activity/manage/add/index.vue
+++ b/src/pages/activity/manage/add/index.vue
@@ -432,7 +432,7 @@ export default {
     backList () {
       this.pass = true
       this.updateTime = 0
-      this.$router.back()
+      this.$router.push('manage')
     },
     back () {
       this.pass = true
diff --git a/src/pages/activity/manage/manage/index.vue b/src/pages/activity/manage/manage/index.vue
index 3e530de..c19ded2 100644
--- a/src/pages/activity/manage/manage/index.vue
+++ b/src/pages/activity/manage/manage/index.vue
@@ -110,7 +110,7 @@ export default {
     },
     // 返回列表
     backPage () {
-      this.$router.push(`/activity/manage?page=${this.$store.state.activity.page}`)
+      this.$router.push(this.$store.state.activity.mgReferrer)
     },
     // tab切换
     tabSwitch (i) {
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index 7819f01..c08db4a 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -769,7 +769,7 @@ export default {
           color2: 'rgba(150, 20, 144, 0.4)'
         },
       ]
-1
+
 
       const cousrseRes = await this.$post(this.api.websiteProductList, {
         pageNum: 1,
@@ -1137,15 +1137,16 @@ export default {
       const dom = this.$refs.popularCourses
       const dom1 = this.$refs.ach
       const dom2 = this.$refs.active
+      const unit = window.innerWidth >= 1920 ? 2 : 1
       setInterval(() => {
-        dom.scrollTop += 1
-        if (dom.clientHeight + dom.scrollTop === dom.scrollHeight) dom.scrollTop = 0
+        dom.scrollTop += unit
+        if (dom.clientHeight + dom.scrollTop >= dom.scrollHeight) dom.scrollTop = 0
 
-        dom1.scrollTop += 1
-        if (dom1.clientHeight + dom1.scrollTop === dom1.scrollHeight) dom1.scrollTop = 0
+        dom1.scrollTop += unit
+        if (dom1.clientHeight + dom1.scrollTop >= dom1.scrollHeight) dom1.scrollTop = 0
 
-        dom2.scrollTop += 1
-        if (dom2.clientHeight + dom2.scrollTop === dom2.scrollHeight) dom2.scrollTop = 0
+        dom2.scrollTop += unit
+        if (dom2.clientHeight + dom2.scrollTop >= dom2.scrollHeight) dom2.scrollTop = 0
       }, 30)
     }
   }