From 0d1da49249477cbf6305e3b6746d92801fdad319 Mon Sep 17 00:00:00 2001 From: liyongle Date: Wed, 26 Jul 2023 16:55:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=95=AC=E8=AF=B7=E6=9C=9F=E5=BE=85=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/empty_big_tra.svg | 7 +++++++ src/views/Activity/Activity.vue | 26 ++++++++++++++++++++++++-- src/views/Activity/ActivityItem.vue | 2 +- src/views/Art/Art.vue | 11 ++++++++++- src/views/Member/Member.vue | 14 ++++++++++++++ src/views/Service/Service.vue | 14 ++++++++++++++ src/views/Traffic/Traffic.vue | 2 +- 7 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 src/assets/images/empty_big_tra.svg diff --git a/src/assets/images/empty_big_tra.svg b/src/assets/images/empty_big_tra.svg new file mode 100644 index 0000000..de17f9b --- /dev/null +++ b/src/assets/images/empty_big_tra.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index 497db3b..9e21997 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -19,12 +19,19 @@ enter-active-class="animate__faster animate__animated animate__fadeInRight" leave-active-class="animate__animated animate__fadeOutDown" > - +
- + @@ -123,6 +131,8 @@ function handleSwitch(index: number) { // list[index].fun() } +// 展示敬请期待 +const showEmpty = ref(false) function getData(type: 'mall' | 'shop') { const fun = type === 'mall' ? getMallActivity() : getShopActivity() fun.then(res => { @@ -130,6 +140,9 @@ function getData(type: 'mall' | 'shop') { for (let t = 0; t < res.data.length; t++) { actList.value.push({ id: res.data[t].id, ...res.data[t].content }) } + if (!res.data.length) { + showEmpty.value = true + } showList.value = true }) } @@ -181,4 +194,13 @@ getData('mall') } } } + +.tra { + position: fixed; + top: 268px; + left: 56px; + width: 1808px; + height: 576px; + border-radius: 16px; +} diff --git a/src/views/Activity/ActivityItem.vue b/src/views/Activity/ActivityItem.vue index 66405aa..67277ba 100644 --- a/src/views/Activity/ActivityItem.vue +++ b/src/views/Activity/ActivityItem.vue @@ -1,5 +1,5 @@ @@ -70,4 +71,12 @@ const { artPlaceList } = toRefs(store) } } } +.tra { + position: fixed; + top: 268px; + left: 56px; + width: 1808px; + height: 576px; + border-radius: 16px; +} diff --git a/src/views/Member/Member.vue b/src/views/Member/Member.vue index cd1bce6..c18d73b 100644 --- a/src/views/Member/Member.vue +++ b/src/views/Member/Member.vue @@ -32,6 +32,7 @@ + @@ -93,8 +94,13 @@ function handleSwitch(index: number) { } } +// 展示敬请期待 +const showEmpty = ref(false) function getData() { getMemberServices().then(res => { + if (!res.data.length) { + showEmpty.value = true + } for (let t = 0; t < res.data.length; t++) { const { name, nameEn, content, contentEn, file_code, point } = res.data[t].content memberServiceList.value.push({ @@ -159,4 +165,12 @@ getData() } } } +.tra { + position: fixed; + top: 268px; + left: 56px; + width: 1808px; + height: 576px; + border-radius: 16px; +} diff --git a/src/views/Service/Service.vue b/src/views/Service/Service.vue index dcab413..8fbe615 100644 --- a/src/views/Service/Service.vue +++ b/src/views/Service/Service.vue @@ -26,6 +26,7 @@ + @@ -82,8 +83,13 @@ function handleSwitch(index: number) { } } +// 是否展示空图片 +const showEmpty = ref(false) function getData() { getServeList().then(res => { + if (!res.data.length) { + showEmpty.value = true + } for (let t = 0; t < res.data.length; t++) { const { name, nameEn, content, contentEn, file_code, logo_code, facilityCode } = res.data[t].content serviceList.value.push({ @@ -165,4 +171,12 @@ getData() } } } +.tra { + position: fixed; + top: 268px; + left: 56px; + width: 1808px; + height: 576px; + border-radius: 16px; +} diff --git a/src/views/Traffic/Traffic.vue b/src/views/Traffic/Traffic.vue index 26bbf35..3100c23 100644 --- a/src/views/Traffic/Traffic.vue +++ b/src/views/Traffic/Traffic.vue @@ -11,7 +11,7 @@ /> - + From 679030d6c758b6781306309ed6a40da420593c61 Mon Sep 17 00:00:00 2001 From: liyongle Date: Wed, 26 Jul 2023 16:56:41 +0800 Subject: [PATCH 2/2] chore(release): 1.0.0-B.10 --- 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 7dd079b..30b55e0 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.0-B.10](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.9...v1.0.0-B.10) (2023-07-26) + + +### Bug Fixes + +* 🧩 新增敬请期待图 ([0d1da49](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/0d1da49249477cbf6305e3b6746d92801fdad319)) + ## [1.0.0-B.9](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.8...v1.0.0-B.9) (2023-07-26) diff --git a/package-lock.json b/package-lock.json index 1951f86..587abbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.9", + "version": "1.0.0-B.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.0-B.9", + "version": "1.0.0-B.10", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index b11deff..f6242e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.9", + "version": "1.0.0-B.10", "private": true, "scripts": { "serve": "vue-cli-service serve",