From e6cdd99f4beb731b1369c4edadbb8b48eb9c649a Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 12 Oct 2023 10:27:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Activity/Activity.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index 6126596..6a76bb0 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -53,12 +53,14 @@ const modules = [Autoplay, Pagination] const currentItem = ref() const showDetail = ref(false) function clickItem(item: Activity, code: string) { - if (mySwiper.value) { - mySwiper.value.autoplay.stop() - } item.list = shopAcList.value.filter(info => info.content.typeId[0] === code) - currentItem.value = item - showDetail.value = true + if ((item.type === '档期活动' && item.fileUrl_h.length) || (item.type !== '档期活动' && item.list.length)) { + if (mySwiper.value) { + mySwiper.value.autoplay.stop() + } + currentItem.value = item + showDetail.value = true + } } // 展示敬请期待 From a3bce6fbcddb49f29b7a77f1028d4bc116fb2110 Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 12 Oct 2023 10:29:02 +0800 Subject: [PATCH 2/3] chore(release): 1.0.9 --- 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 436f299..b9efa54 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.0.9](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.9-B.2...v1.0.9) (2023-10-12) + + +### Bug Fixes + +* 🧩 活动详情为空时点击无效果 ([e6cdd99](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/e6cdd99f4beb731b1369c4edadbb8b48eb9c649a)) + ### [1.0.9-B.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.9-B.1...v1.0.9-B.2) (2023-10-11) diff --git a/package-lock.json b/package-lock.json index 6d39cea..81bf043 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.9-B.2", + "version": "1.0.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.9-B.2", + "version": "1.0.9", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 01363c5..359a529 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.9-B.2", + "version": "1.0.9", "private": true, "scripts": { "serve": "vue-cli-service serve", From 5d8c40c720361d5197586f694f4049e1c5371fbf Mon Sep 17 00:00:00 2001 From: liyongle Date: Thu, 12 Oct 2023 10:29:15 +0800 Subject: [PATCH 3/3] chore(release): 1.0.10-B.0 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9efa54..f0d19e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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.0.10-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.9...v1.0.10-B.0) (2023-10-12) + ### [1.0.9](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.9-B.2...v1.0.9) (2023-10-12) diff --git a/package-lock.json b/package-lock.json index 81bf043..5e567c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.9", + "version": "1.0.10-B.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.9", + "version": "1.0.10-B.0", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 359a529..67c79f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.9", + "version": "1.0.10-B.0", "private": true, "scripts": { "serve": "vue-cli-service serve",