diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aa5ab0..ecce827 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.9](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.8...v1.0.0-B.9) (2023-06-15) + + +### Bug Fixes + +* 修改轮播底部按钮修改繁体字样 ([cbe0e6c](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/cbe0e6ca364a6e287ccbfd6e1cbed88b512d46be)) + ## [1.0.0-B.8](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.7...v1.0.0-B.8) (2023-06-15) diff --git a/package-lock.json b/package-lock.json index 70b1af4..8af26cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.8", + "version": "1.0.0-B.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.0-B.8", + "version": "1.0.0-B.9", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 3d2631b..6d148c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.8", + "version": "1.0.0-B.9", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 4305ade..ae5f5a5 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -37,7 +37,7 @@ - {{ showSearch ? '全局搜索' : route.meta.title }} + {{ showSearch ? '全局搜索' : switchLanguage(route.meta, 'name') }} diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 5c81c9b..368c3e9 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -24,7 +24,7 @@ - {{ route.meta.title }} + {{ switchLanguage(route.meta, 'name') }} diff --git a/src/components/ShopDetail/ShopDetail.vue b/src/components/ShopDetail/ShopDetail.vue index 473c8c5..ea86b84 100644 --- a/src/components/ShopDetail/ShopDetail.vue +++ b/src/components/ShopDetail/ShopDetail.vue @@ -165,10 +165,10 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode }) background: rgb(255 255 255 / 70%); border-radius: 12px; - --swiper-theme-color: rgb(0 0 0 / 30%); + --swiper-theme-color: #d7ba92; --swiper-pagination-bullet-width: 28px; --swiper-pagination-bullet-height: 4px; - --swiper-pagination-bullet-inactive-color: #fff; + --swiper-pagination-bullet-inactive-color: rgb(0 0 0 / 60%); .bg-top { position: absolute; @@ -186,15 +186,15 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode }) display: inline-block; overflow: hidden; width: 800px; - height: 450px; - min-height: 450px; - max-height: 450px; + height: 490px; + // min-height: 450px; + // max-height: 450px; margin-top: -178px; margin-left: 25px; // background: #d5d5d5; background: rgb(255 255 255); border-radius: 12px; - .swiper-slide { + :deep(.swiper-slide) { height: 450px; border-radius: 12px; } @@ -214,11 +214,11 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode }) object-fit: scale-down; } } - .swiper-pagination-bullet { + :deep(.swiper-pagination-bullet) { border-radius: 4px; } .detail { - bottom: -10px; + bottom: 18px; // left: 87%; // width: 100px; } diff --git a/src/components/SwitchTab/SwitchTab.vue b/src/components/SwitchTab/SwitchTab.vue index e3fcb09..54d2f45 100644 --- a/src/components/SwitchTab/SwitchTab.vue +++ b/src/components/SwitchTab/SwitchTab.vue @@ -26,7 +26,7 @@
- {{ item.name }} + {{ switchLanguage(item, 'name') }} {{ item.en }} diff --git a/src/components/TheServiceDetail/TheServiceDetail.vue b/src/components/TheServiceDetail/TheServiceDetail.vue index f4c9e73..55ef294 100644 --- a/src/components/TheServiceDetail/TheServiceDetail.vue +++ b/src/components/TheServiceDetail/TheServiceDetail.vue @@ -133,10 +133,11 @@ function close() { background: rgb(255 255 255 / 70%); border-radius: 12px 12px 24px 24px; - --swiper-theme-color: rgb(0 0 0 / 30%); + --swiper-theme-color: #d7ba92; --swiper-pagination-bullet-width: 28px; --swiper-pagination-bullet-height: 4px; - --swiper-pagination-bullet-inactive-color: #fff; + --swiper-pagination-bullet-inactive-color: rgb(0 0 0 / 60%); + .bg-top { position: absolute; top: 0; @@ -153,15 +154,13 @@ function close() { display: inline-block; overflow: hidden; width: 800px; - height: 450px; - min-height: 450px; - max-height: 450px; + height: 490px; margin-top: -176px; margin-left: 25px; // background: #d5d5d5; background: rgb(255 255 255); border-radius: 12px; - .swiper-slide { + :deep(.swiper-slide) { height: 450px; border-radius: 12px; } @@ -173,11 +172,11 @@ function close() { object-fit: cover; border-radius: 12px; } - .swiper-pagination-bullet { + :deep(.swiper-pagination-bullet) { border-radius: 4px; } .detail { - bottom: -10px; + bottom: 18px; // left: 87%; // width: 100px; } diff --git a/src/components/TypeBtnList/TypeBtnList.vue b/src/components/TypeBtnList/TypeBtnList.vue index 895c75a..e3764cc 100644 --- a/src/components/TypeBtnList/TypeBtnList.vue +++ b/src/components/TypeBtnList/TypeBtnList.vue @@ -78,6 +78,11 @@ function changeType(item: TypeItem, index: number) { color: rgb(0 0 0 / 80%); border-bottom: 6px solid #d7ba92; } + &.btn-en { + h4 { + font-size: 21px; + } + } } } } diff --git a/src/router/routes.ts b/src/router/routes.ts index 2af91ff..03f1d61 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -13,7 +13,7 @@ export const routes: RouteRecordRaw[] = [ path: '/guide', component: () => import(/* webpackChunkName: "guide" */ '@/views/Guide/Guide.vue'), meta: { - title: '地图导览', + name: '地图导览', titleEn: 'MAP\nGUIDE' } }, @@ -22,7 +22,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Nav', component: () => import(/* webpackChunkName: "nav" */ '@/views/Nav/Nav.vue'), meta: { - title: '地图导航', + name: '地图导航', titleEn: 'MAP\nNAVIGATION' } }, @@ -31,7 +31,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Parking', component: () => import('@/views/Parking/Parking.vue'), meta: { - title: '车位指引', + name: '车位指引', titleEn: 'PARKING\nGUIDANCE' } }, @@ -40,7 +40,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Brand', component: () => import('@/views/Brand/Brand.vue'), meta: { - title: '品牌列表', + name: '品牌列表', titleEn: 'BRAND\nLIST' } }, @@ -49,7 +49,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Building', component: () => import('@/views/Building/Building.vue'), meta: { - title: '楼栋列表', + name: '楼栋列表', titleEn: 'BLOCK\nLIST' } }, @@ -58,7 +58,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Activity', component: () => import('@/views/Activity/Activity.vue'), meta: { - title: '社区活动', + name: '社区活动', titleEn: 'COMUNITY\nACTIVITY' } }, @@ -67,7 +67,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Member', component: () => import('@/views/Member/Member.vue'), meta: { - title: '尊享会员', + name: '尊享会员', titleEn: 'MEMBER\nPRIVILEGES' } }, @@ -76,7 +76,7 @@ export const routes: RouteRecordRaw[] = [ name: 'Service', component: () => import('@/views/Service/Service.vue'), meta: { - title: '社区服务', + name: '社区服务', titleEn: 'COMMUNITY\nSERVICE' } }, diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index 5466ec6..d1f004a 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -41,8 +41,8 @@ -
+
@@ -129,6 +129,13 @@ getData('mall') background-size: 1080px 1419px; background-color: linear-gradient(180deg, #e2d8ca 0%, rgb(226 216 202 / 0%) 100%); + --swiper-theme-color: #d7ba92; + --swiper-pagination-bullet-width: 28px; + --swiper-pagination-bullet-height: 4px; + --swiper-pagination-bullet-inactive-color: rgb(0 0 0 / 60%); + :deep(.swiper-pagination-bullet) { + border-radius: 4px; + } .btn-group { width: 428px; margin: 420px auto 0; @@ -150,6 +157,14 @@ getData('mall') } } } + .list-paginationh { + position: absolute; + right: 0; + bottom: 111px; + left: 0; + width: fit-content; + margin: 0 auto; + } .no-data { position: absolute; right: 0; diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue index 984df01..1806c62 100644 --- a/src/views/Index/Index.vue +++ b/src/views/Index/Index.vue @@ -7,7 +7,7 @@