dev #16

Merged
zhangyao merged 2 commits from dev into test 3 years ago
  1. 7
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 4
      src/components/HomeDialog/HomeDialog.vue
  5. 9
      src/components/Map/Map.vue
  6. 4
      src/composables/useHandleScreen.ts

7
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. 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) ## [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)

4
package-lock.json

@ -1,12 +1,12 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.1.0-B.3",
"version": "1.1.0-B.4",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.1.0-B.3",
"version": "1.1.0-B.4",
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.5.0", "@better-scroll/core": "^2.5.0",
"@better-scroll/observe-image": "^2.5.0", "@better-scroll/observe-image": "^2.5.0",

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.1.0-B.3",
"version": "1.1.0-B.4",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

4
src/components/HomeDialog/HomeDialog.vue

@ -51,9 +51,9 @@ function move() {
// } // }
// console.log('x,y :>> ', x, y) // console.log('x,y :>> ', x, y)
tip.value.style.transform = `translate(${x}px,${y}px)` // tip.value.style.transform = `translate(${x}px,${y}px)` //
i += 0.5 //35
i += 0.75 //35
//10i+=3i36912... //10i+=3i36912...
j += 0.5
j += 0.75
x = i x = i
y = j y = j
if (i >= winWidth) { if (i >= winWidth) {

9
src/components/Map/Map.vue

@ -43,9 +43,12 @@ function handleDetail() {
emits('handle-Detail') emits('handle-Detail')
} }
watch(shop, () => { watch(shop, () => {
nextTick(() => {
nameWidth.value = nameRef.value.clientWidth
})
const timeId = setTimeout(() => {
clearTimeout(timeId)
nextTick(() => {
nameWidth.value = nameRef.value.clientWidth
})
}, 400)
}) })
</script> </script>

4
src/composables/useHandleScreen.ts

@ -81,7 +81,9 @@ export const useHandleScreen = (callback: () => void) => {
//监听时间 大于等于0且小于等于5时显示弹框 //监听时间 大于等于0且小于等于5时显示弹框
watch([toIndexTime, toWallpaperTime], ([indexTime, wallpaperTime]) => { watch([toIndexTime, toWallpaperTime], ([indexTime, wallpaperTime]) => {
if ((indexTime >= MIN_TIME && indexTime <= MAX_TIME) || (wallpaperTime >= MIN_TIME && wallpaperTime <= MAX_TIME)) { if ((indexTime >= MIN_TIME && indexTime <= MAX_TIME) || (wallpaperTime >= MIN_TIME && wallpaperTime <= MAX_TIME)) {
showCountDownDialog.value = true
if (!isWallpaper.value) {
showCountDownDialog.value = true
}
} else { } else {
showCountDownDialog.value = false showCountDownDialog.value = false
} }

Loading…
Cancel
Save