From 59fe4608107d78a7d5090e124e2225f4526d4b82 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Thu, 1 Jun 2023 16:27:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=90=8D=E6=BB=9A=E5=8A=A8=20=E5=B1=8F=E4=BF=9D=E5=80=92?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E5=9C=88=E6=B3=A8=E6=8E=89=20=E5=9C=88?= =?UTF-8?q?=E5=9C=88=E5=8A=A0=E9=80=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomeDialog/HomeDialog.vue | 4 ++-- src/components/Map/Map.vue | 9 ++++++--- src/composables/useHandleScreen.ts | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/components/HomeDialog/HomeDialog.vue b/src/components/HomeDialog/HomeDialog.vue index 0fbf37f..f808c31 100644 --- a/src/components/HomeDialog/HomeDialog.vue +++ b/src/components/HomeDialog/HomeDialog.vue @@ -51,9 +51,9 @@ function move() { // } // console.log('x,y :>> ', x, y) tip.value.style.transform = `translate(${x}px,${y}px)` //移动它的位置 - i += 0.5 //随意设置，与快慢有关，但也会影响35行判断到达最大移动距离时改变颜色，因为它可能加不到等于最大距离的时候 + i += 0.75 //随意设置，与快慢有关，但也会影响35行判断到达最大移动距离时改变颜色，因为它可能加不到等于最大距离的时候 //假如最大距离为10，i+=3，那i的值只能为3，6，9，12...则进不了改变颜色那个条件，则到达右边时不会改变颜色 - j += 0.5 + j += 0.75 x = i y = j if (i >= winWidth) { diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 0dfb354..e3f3eca 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -43,9 +43,12 @@ function handleDetail() { emits('handle-Detail') } watch(shop, () => { - nextTick(() => { - nameWidth.value = nameRef.value.clientWidth - }) + const timeId = setTimeout(() => { + clearTimeout(timeId) + nextTick(() => { + nameWidth.value = nameRef.value.clientWidth + }) + }, 400) }) diff --git a/src/composables/useHandleScreen.ts b/src/composables/useHandleScreen.ts index d990a21..5737830 100644 --- a/src/composables/useHandleScreen.ts +++ b/src/composables/useHandleScreen.ts @@ -81,7 +81,9 @@ export const useHandleScreen = (callback: () => void) => { //监听时间 大于等于0且小于等于5时显示弹框 watch([toIndexTime, toWallpaperTime], ([indexTime, wallpaperTime]) => { if ((indexTime >= MIN_TIME && indexTime <= MAX_TIME) || (wallpaperTime >= MIN_TIME && wallpaperTime <= MAX_TIME)) { - showCountDownDialog.value = true + if (!isWallpaper.value) { + showCountDownDialog.value = true + } } else { showCountDownDialog.value = false } From a7b33d64d56a83c93a31008503a8ca41a3afb0b0 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Thu, 1 Jun 2023 16:29:17 +0800 Subject: [PATCH 2/2] chore(release): 1.1.0-B.4 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c31ffd8..360ad33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.1.0-B.4](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.3...v1.1.0-B.4) (2023-06-01) + + +### Bug Fixes + +* 🧩 店铺名滚动 屏保倒计时圈注掉 圈圈加速修改 ([59fe460](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/59fe4608107d78a7d5090e124e2225f4526d4b82)) + ## [1.1.0-B.3](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.1.0-B.2...v1.1.0-B.3) (2023-06-01) diff --git a/package-lock.json b/package-lock.json index 3db8308..41dde4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.3", + "version": "1.1.0-B.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.1.0-B.3", + "version": "1.1.0-B.4", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 48316d0..8a914e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.1.0-B.3", + "version": "1.1.0-B.4", "private": true, "scripts": { "serve": "vue-cli-service serve",