From 7df666c35d9ba60468679e3a5b547e7036afb87d Mon Sep 17 00:00:00 2001 From: liyongle Date: Wed, 11 Oct 2023 13:06:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E8=BD=AE=E6=92=AD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../offline/JSON/getAllActivityList.json | 57 +---------------- .../offline/JSON/getShopActivityList.json | 61 +------------------ src/views/Activity/Activity.vue | 6 +- 3 files changed, 6 insertions(+), 118 deletions(-) diff --git a/public/static/offline/JSON/getAllActivityList.json b/public/static/offline/JSON/getAllActivityList.json index 74b6a4f..38cba1e 100644 --- a/public/static/offline/JSON/getAllActivityList.json +++ b/public/static/offline/JSON/getAllActivityList.json @@ -1,56 +1 @@ -{ - "code": 200, - "msg": "操作成功", - "data": [ - { - "id": 617, - "entryCode": "UIBbbmSxX1bvI_icEzNNu", - "title": "欢度中秋国庆", - "content": { - "activityName": "欢度中秋国庆", - "activityNameEn": "happy", - "type": "档期活动", - "coverUrl": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230721/VxD2notoXjw8qTxQMerDh.png" - ], - "fileUrl_h": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230721/VxD2notoXjw8qTxQMerDh.png", - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230719/JUhRWWwrWE_WkoZgp_TOm.png" - ], - "fileUrl_v": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230721/VxD2notoXjw8qTxQMerDh.png" - ] - } - }, - { - "id": 618, - "entryCode": "liuUoTMkKVyk_ON7TV3jw", - "title": "品牌活动", - "content": { - "activityName": "品牌活动", - "activityNameEn": "brand988", - "type": "品牌活动", - "coverUrl": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230721/VxD2notoXjw8qTxQMerDh.png" - ], - "fileUrl_h": [], - "fileUrl_v": [] - } - }, - { - "id": 618, - "entryCode": "liuUoTMkKVyk_ON7TV3jw", - "title": "品牌活动", - "content": { - "activityName": "品牌活动", - "activityNameEn": "brand988", - "type": "品牌活动", - "coverUrl": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230721/VxD2notoXjw8qTxQMerDh.png" - ], - "fileUrl_h": [], - "fileUrl_v": [] - } - } - ] -} +{"code":200,"msg":"操作成功","data":[{"id":617,"entryCode":"UIBbbmSxX1bvI_icEzNNu","title":"欢度中秋国庆","content":{"activityName":"欢度中秋国庆","activityNameEn":"happy","type":"档期活动","coverUrl":["/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/ppjwV-F379hJ5WC7q3F-7.png"],"fileUrl_h":["/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/7XCHjm9R9uINfw2VGJGX1.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/ODj3klVJ_jq9vBzh_7R3n.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/hthxwc0k8nt90zkogGBcU.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/MOXZAQvMlJ405CagyLiTZ.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/e2CuQSr0mRQFf7qTW2evU.jpg"],"fileUrl_v":["/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/aCHcTwfotk1inOmQ69Xwi.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/_FSCPWq3GR_LrSUlrb22G.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/StBkghGoxr7_o2bJ-lVlb.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/DnQ4irpPUWTIK8GZnn3t3.jpg","/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/yK8vLWMh702zCLs-AYcbj.jpg"]}},{"id":618,"entryCode":"liuUoTMkKVyk_ON7TV3jw","title":"品牌特别企划","content":{"activityName":"品牌活动","activityNameEn":"brand988","type":"品牌活动","coverUrl":["/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/saAawwV-pBn5exhmEx0GM.jpg"],"fileUrl_h":[],"fileUrl_v":[]}}]} diff --git a/public/static/offline/JSON/getShopActivityList.json b/public/static/offline/JSON/getShopActivityList.json index 3f093a0..42e6d67 100644 --- a/public/static/offline/JSON/getShopActivityList.json +++ b/public/static/offline/JSON/getShopActivityList.json @@ -1,60 +1 @@ -{ - "code": 200, - "msg": "操作成功", - "data": [ - { - "id": 620, - "entryCode": "7PtFGpCK-XIyq_qKRJPR5", - "title": "品牌活动", - "content": { - "fileUrl": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230719/JUhRWWwrWE_WkoZgp_TOm.png" - ], - "title": "COLOMBO V-SPACE限时店 ", - "titleEn": "COLOMBO V-SPACE", - "time": "即日起-国庆节", - "place": "成都SKP 1F", - "placeEn": "成都SKP 1F", - "typeId": [ - "liuUoTMkKVyk_ON7TV3jw" - ] - } - }, - { - "id": 620, - "entryCode": "7PtFGpCK-XIyq_qKRJPR51", - "title": "品牌活动", - "content": { - "fileUrl": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230719/JUhRWWwrWE_WkoZgp_TOm.png" - ], - "title": "COLOMBO V-SPACE限时店 ", - "titleEn": "COLOMBO V-SPACE", - "time": "即日起-国庆节", - "place": "成都SKP 1F", - "placeEn": "成都SKP 1F", - "typeId": [ - "liuUoTMkKVyk_ON7TV3jw" - ] - } - }, - { - "id": 620, - "entryCode": "7PtFGpCK-XIyq_qKRJPR518", - "title": "品牌活动", - "content": { - "fileUrl": [ - "/iotFile/project-ey_fpaur6s6fkgvszywana/20230719/JUhRWWwrWE_WkoZgp_TOm.png" - ], - "title": "COLOMBO V-SPACE限时店 ", - "titleEn": "COLOMBO V-SPACE", - "time": "即日起-国庆节", - "place": "成都SKP 1F", - "placeEn": "成都SKP 1F", - "typeId": [ - "liuUoTMkKVyk_ON7TV3jw" - ] - } - } - ] -} +{"code":200,"msg":"操作成功","data":[{"id":620,"entryCode":"7PtFGpCK-XIyq_qKRJPR5","title":"COLOMBO V-SPACE限时店 ","content":{"fileUrl":["/iotFile/project-ey_fpaur6s6fkgvszywana/20231011/qefzeBHe1POo537vRZ08S.jpg"],"title":"COLOMBO V-SPACE限时店 ","titleEn":"COLOMBO V-SPACE","time":"即日起-10/30(一)","place":"成都SKP 1F","placeEn":"成都SKP 1F","typeId":["liuUoTMkKVyk_ON7TV3jw"]}}]} diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index efe3cc5..6126596 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -53,7 +53,9 @@ const modules = [Autoplay, Pagination] const currentItem = ref() const showDetail = ref(false) function clickItem(item: Activity, code: string) { - mySwiper.value.autoplay.stop() + if (mySwiper.value) { + mySwiper.value.autoplay.stop() + } item.list = shopAcList.value.filter(info => info.content.typeId[0] === code) currentItem.value = item showDetail.value = true @@ -95,7 +97,7 @@ function next() { watch( () => showDetail.value, () => { - if (!showDetail.value) { + if (!showDetail.value && mySwiper.value) { mySwiper.value.autoplay.start() } } -- 2.30.2 From 44ef87a7d53f878e86dc901b17ffa9f6d5894d60 Mon Sep 17 00:00:00 2001 From: liyongle Date: Wed, 11 Oct 2023 13:08:44 +0800 Subject: [PATCH 2/2] chore(release): 1.0.9-B.1 --- 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 1ab8396..7e8c672 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-B.1](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.9-B.0...v1.0.9-B.1) (2023-10-11) + + +### Bug Fixes + +* 🧩 轮播优化 ([7df666c](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/7df666c35d9ba60468679e3a5b547e7036afb87d)) + ### [1.0.9-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.8...v1.0.9-B.0) (2023-10-11) diff --git a/package-lock.json b/package-lock.json index 8d63b65..3cf4b5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.9-B.0", + "version": "1.0.9-B.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.9-B.0", + "version": "1.0.9-B.1", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index a27a642..cda8fdf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.9-B.0", + "version": "1.0.9-B.1", "private": true, "scripts": { "serve": "vue-cli-service serve", -- 2.30.2