Compare commits

...

2 Commits

Author SHA1 Message Date
liyongle 679030d6c7 chore(release): 1.0.0-B.10 3 years ago
liyongle 0d1da49249 fix: 🧩 新增敬请期待图 3 years ago
  1. 7
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 7
      src/assets/images/empty_big_tra.svg
  5. 26
      src/views/Activity/Activity.vue
  6. 2
      src/views/Activity/ActivityItem.vue
  7. 11
      src/views/Art/Art.vue
  8. 14
      src/views/Member/Member.vue
  9. 14
      src/views/Service/Service.vue
  10. 2
      src/views/Traffic/Traffic.vue

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

4
package-lock.json

@ -1,12 +1,12 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.9",
"version": "1.0.0-B.10",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.9",
"version": "1.0.0-B.10",
"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.0.0-B.9",
"version": "1.0.0-B.10",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

7
src/assets/images/empty_big_tra.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 13 KiB

26
src/views/Activity/Activity.vue

@ -19,12 +19,19 @@
enter-active-class="animate__faster animate__animated animate__fadeInRight" enter-active-class="animate__faster animate__animated animate__fadeInRight"
leave-active-class="animate__animated animate__fadeOutDown" leave-active-class="animate__animated animate__fadeOutDown"
> >
<ScrollView ref="actScroll" :list="actList" :refresh-delay="200" :scroll-x="true" :scrollbar="true" class="act-scroll">
<ScrollView
v-if="actList.length"
ref="actScroll"
:list="actList"
:refresh-delay="200"
:scroll-x="true"
:scrollbar="true"
class="act-scroll"
>
<ul class="act-list"> <ul class="act-list">
<ActivityItem v-for="(item, index) in actList" :key="index" :act-info="item" @click="clickItem"></ActivityItem> <ActivityItem v-for="(item, index) in actList" :key="index" :act-info="item" @click="clickItem"></ActivityItem>
</ul> </ul>
</ScrollView> </ScrollView>
<!-- -->
<!-- <swiper <!-- <swiper
v-if="showList" v-if="showList"
class="act-scroll" class="act-scroll"
@ -57,6 +64,7 @@
</swiper-slide> </swiper-slide>
</swiper> --> </swiper> -->
</transition> </transition>
<img v-if="showEmpty" class="tra" src="@/assets/images/empty_big_tra.svg" alt="" />
<activityDetail v-if="showDetail" :act-info="currentItem" @close="showDetail = false"></activityDetail> <activityDetail v-if="showDetail" :act-info="currentItem" @close="showDetail = false"></activityDetail>
</div> </div>
</template> </template>
@ -123,6 +131,8 @@ function handleSwitch(index: number) {
// list[index].fun() // list[index].fun()
} }
//
const showEmpty = ref(false)
function getData(type: 'mall' | 'shop') { function getData(type: 'mall' | 'shop') {
const fun = type === 'mall' ? getMallActivity() : getShopActivity() const fun = type === 'mall' ? getMallActivity() : getShopActivity()
fun.then(res => { fun.then(res => {
@ -130,6 +140,9 @@ function getData(type: 'mall' | 'shop') {
for (let t = 0; t < res.data.length; t++) { for (let t = 0; t < res.data.length; t++) {
actList.value.push({ id: res.data[t].id, ...res.data[t].content }) actList.value.push({ id: res.data[t].id, ...res.data[t].content })
} }
if (!res.data.length) {
showEmpty.value = true
}
showList.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;
}
</style> </style>

2
src/views/Activity/ActivityItem.vue

@ -1,5 +1,5 @@
<template> <template>
<div v-if="showThis" :key="actInfo.id" class="act-item animate__faster animate__animated animate__fadeInUp">
<div v-if="showThis" :key="actInfo.id" class="act-item">
<!-- 图片 --> <!-- 图片 -->
<div class="img-container" @click="clickActItem"> <div class="img-container" @click="clickActItem">
<img :style="{ backgroundImage: `url(${getBackGround()})` }" alt="" /> <img :style="{ backgroundImage: `url(${getBackGround()})` }" alt="" />

11
src/views/Art/Art.vue

@ -3,13 +3,14 @@
<div class="art-container"> <div class="art-container">
<div class="name">艺术装置</div> <div class="name">艺术装置</div>
<div class="nameEn">ARTWORK</div> <div class="nameEn">ARTWORK</div>
<ScrollView class="myScroll" :list="artPlaceList" scroll-x scrollbar>
<ScrollView v-if="artPlaceList.length" class="myScroll" :list="artPlaceList" scroll-x scrollbar>
<div style="display: inline-block"> <div style="display: inline-block">
<div class="lists"> <div class="lists">
<ArtItem v-for="item in artPlaceList" :key="item.id" :art-info="item" /> <ArtItem v-for="item in artPlaceList" :key="item.id" :art-info="item" />
</div> </div>
</div> </div>
</ScrollView> </ScrollView>
<img v-else class="tra" src="@/assets/images/empty_big_tra.svg" alt="" />
</div> </div>
</Transition> </Transition>
</template> </template>
@ -70,4 +71,12 @@ const { artPlaceList } = toRefs(store)
} }
} }
} }
.tra {
position: fixed;
top: 268px;
left: 56px;
width: 1808px;
height: 576px;
border-radius: 16px;
}
</style> </style>

14
src/views/Member/Member.vue

@ -32,6 +32,7 @@
</ul> </ul>
</ScrollView> </ScrollView>
</transition> </transition>
<img v-if="switchIdx !== 0 && showEmpty" class="tra" src="@/assets/images/empty_big_tra.svg" alt="" />
<activityDetail v-if="showDetail" :act-info="currentItem" @close="showDetail = false"></activityDetail> <activityDetail v-if="showDetail" :act-info="currentItem" @close="showDetail = false"></activityDetail>
</div> </div>
</template> </template>
@ -93,8 +94,13 @@ function handleSwitch(index: number) {
} }
} }
//
const showEmpty = ref(false)
function getData() { function getData() {
getMemberServices().then(res => { getMemberServices().then(res => {
if (!res.data.length) {
showEmpty.value = true
}
for (let t = 0; t < res.data.length; t++) { for (let t = 0; t < res.data.length; t++) {
const { name, nameEn, content, contentEn, file_code, point } = res.data[t].content const { name, nameEn, content, contentEn, file_code, point } = res.data[t].content
memberServiceList.value.push({ memberServiceList.value.push({
@ -159,4 +165,12 @@ getData()
} }
} }
} }
.tra {
position: fixed;
top: 268px;
left: 56px;
width: 1808px;
height: 576px;
border-radius: 16px;
}
</style> </style>

14
src/views/Service/Service.vue

@ -26,6 +26,7 @@
</div> </div>
</ScrollView> </ScrollView>
</transition> </transition>
<img v-if="switchIdx !== 1 && showEmpty" class="tra" src="@/assets/images/empty_big_tra.svg" alt="" />
<activityDetail v-if="showDetail" :act-info="currentItem" @close="showDetail = false"></activityDetail> <activityDetail v-if="showDetail" :act-info="currentItem" @close="showDetail = false"></activityDetail>
</div> </div>
</template> </template>
@ -82,8 +83,13 @@ function handleSwitch(index: number) {
} }
} }
//
const showEmpty = ref(false)
function getData() { function getData() {
getServeList().then(res => { getServeList().then(res => {
if (!res.data.length) {
showEmpty.value = true
}
for (let t = 0; t < res.data.length; t++) { for (let t = 0; t < res.data.length; t++) {
const { name, nameEn, content, contentEn, file_code, logo_code, facilityCode } = res.data[t].content const { name, nameEn, content, contentEn, file_code, logo_code, facilityCode } = res.data[t].content
serviceList.value.push({ serviceList.value.push({
@ -165,4 +171,12 @@ getData()
} }
} }
} }
.tra {
position: fixed;
top: 268px;
left: 56px;
width: 1808px;
height: 576px;
border-radius: 16px;
}
</style> </style>

2
src/views/Traffic/Traffic.vue

@ -11,7 +11,7 @@
/> />
<Transition appear enter-active-class="animate__animated animate__fadeIn"> <Transition appear enter-active-class="animate__animated animate__fadeIn">
<PictureText v-if="isCurrent" :ac-list="mallIntro" :qr-list="[]" /> <PictureText v-if="isCurrent" :ac-list="mallIntro" :qr-list="[]" />
<img v-else class="tra" :src="traImg ? traImg : require('@/assets/images/empty_big.svg')" alt="" />
<img v-else class="tra" :src="traImg ? traImg : require('@/assets/images/empty_big_tra.svg')" alt="" />
</Transition> </Transition>
</template> </template>

Loading…
Cancel
Save