diff --git a/src/assets/images/brand/icon_format.svg b/src/assets/images/brand/icon_format.svg
index 7382660..fea599c 100644
--- a/src/assets/images/brand/icon_format.svg
+++ b/src/assets/images/brand/icon_format.svg
@@ -1,3 +1,3 @@
diff --git a/src/components/ActivityDetail/ActivityDetail.vue b/src/components/ActivityDetail/ActivityDetail.vue
index 4f5010a..80a95a8 100644
--- a/src/components/ActivityDetail/ActivityDetail.vue
+++ b/src/components/ActivityDetail/ActivityDetail.vue
@@ -402,10 +402,11 @@ function handleGo() {
font-family: 'font_bold';
text-align: center;
color: rgb(0 0 0 / 80%);
- background: var(--w-60, rgb(255 255 255 / 60%));
- border: 2px solid var(--w-100, #fff);
+ background: rgb(255 255 255 / 60%);
+ border: 2px solid #fff;
border-radius: 50px;
backdrop-filter: blur(20px);
+ box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
line-height: 72px;
// margin: auto;
img {
diff --git a/src/components/CarInfo/CarInfo.vue b/src/components/CarInfo/CarInfo.vue
index eec6821..28e925c 100644
--- a/src/components/CarInfo/CarInfo.vue
+++ b/src/components/CarInfo/CarInfo.vue
@@ -105,6 +105,7 @@ function go() {
border: 2px solid #fff;
border-radius: 50px;
backdrop-filter: blur(20px);
+ box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
img {
width: 48px;
height: 48px;
diff --git a/src/components/CarSearch/CarSearch.vue b/src/components/CarSearch/CarSearch.vue
index e9d6c63..2ad1452 100644
--- a/src/components/CarSearch/CarSearch.vue
+++ b/src/components/CarSearch/CarSearch.vue
@@ -149,6 +149,7 @@ function search(shopNum: string) {
border: 2px solid #fff;
border-radius: 50px;
backdrop-filter: blur(20px);
+ box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
img {
width: 48px;
height: 48px;
diff --git a/src/components/Recommend/Recommend.vue b/src/components/Recommend/Recommend.vue
index 20f6b55..0137f42 100644
--- a/src/components/Recommend/Recommend.vue
+++ b/src/components/Recommend/Recommend.vue
@@ -41,7 +41,7 @@ import { getColumnList } from '@/http/api/base'
import Brand from '@/utils/Class/Brand'
import ScrollView from '@/base/ScrollView/ScrollView.vue'
const store = useRootStore()
-const { columnList, showColumnList, shopMap } = toRefs(store)
+const { columnList, showColumnList, shopMap, shop } = toRefs(store)
const router = useRouter()
const { switchLanguage } = useSwitchLanguage()
@@ -50,6 +50,9 @@ function close() {
}
function clickShop(item: FeaturedList) {
if (item.content.shopCode) {
+ if (shop.value) {
+ store.SET_PREV_SHOP(shop.value)
+ }
store.SET_SHOP(shopMap.value[item.content.shopCode])
store.SET_SHOW_DETAIL(true)
} else if (item.content.point) {
@@ -109,6 +112,7 @@ getColumnList().then(({ data }) => {
border: 2px solid #fff;
border-radius: 50px;
backdrop-filter: blur(20px);
+ box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
img {
width: 48px;
height: 48px;
diff --git a/src/components/SearchResultListItem/SearchResultListItem.vue b/src/components/SearchResultListItem/SearchResultListItem.vue
index 97c7cef..b99393f 100644
--- a/src/components/SearchResultListItem/SearchResultListItem.vue
+++ b/src/components/SearchResultListItem/SearchResultListItem.vue
@@ -55,7 +55,7 @@ const emits = defineEmits(['click'])
}
.bottom {
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
width: 100%;
height: 28px;
@@ -64,7 +64,9 @@ const emits = defineEmits(['click'])
font-family: 'font_bold';
line-height: 28px;
.name {
- max-width: 460px;
+ // max-width: 460px;
+ width: 460px;
+ padding-right: 20px;
font-size: 24px;
color: #8e9090;
diff --git a/src/components/ShopDetail/ShopDetail.vue b/src/components/ShopDetail/ShopDetail.vue
index ef41b49..0d0651d 100644
--- a/src/components/ShopDetail/ShopDetail.vue
+++ b/src/components/ShopDetail/ShopDetail.vue
@@ -395,7 +395,7 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
border: 2px solid #fff;
border-radius: 50px;
backdrop-filter: blur(20px);
- // margin: auto;
+ box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
img {
width: 48px;
}
diff --git a/src/store/root/actions.ts b/src/store/root/actions.ts
index c3e8dfa..6798e65 100644
--- a/src/store/root/actions.ts
+++ b/src/store/root/actions.ts
@@ -27,6 +27,7 @@ export interface Actions {
SET_MAP_PARK_LIST(list: string[]): void
SET_SPECIAL_LIST(list: SpecialIndustry[]): void
SET_CURRENT_ART_NAME(name: string): void
+ SET_PREV_SHOP(shop: Shop): void
}
export type GenActions = CreateActions
@@ -100,5 +101,8 @@ export const actions: GenActions = {
},
SET_CURRENT_ART_NAME(name) {
this.currentArtName = name
+ },
+ SET_PREV_SHOP(shop) {
+ this.prevShop = shop
}
}
diff --git a/src/store/root/state.ts b/src/store/root/state.ts
index 0ead2eb..a82eb7c 100644
--- a/src/store/root/state.ts
+++ b/src/store/root/state.ts
@@ -23,6 +23,7 @@ export interface State {
mapParkList: string[] // 停车位列表
specialIndustryList: SpecialIndustry[] // 特殊业态列表
currentArtName: string // 当前选中艺术装置
+ prevShop: Shop //
}
export const state = (): State => ({
@@ -47,5 +48,6 @@ export const state = (): State => ({
artPlaceList: [],
mapParkList: [],
specialIndustryList: [],
- currentArtName: ''
+ currentArtName: '',
+ prevShop: {} as Shop
})
diff --git a/src/views/Activity/ActivityItem.vue b/src/views/Activity/ActivityItem.vue
index 4dbf5a8..66405aa 100644
--- a/src/views/Activity/ActivityItem.vue
+++ b/src/views/Activity/ActivityItem.vue
@@ -111,7 +111,7 @@ onMounted(() => {
position: relative;
width: inherit;
height: 495px;
- background: #ebebeb;
+ background: #ebebeb00;
img {
width: inherit;
diff --git a/src/views/Brand/shopList.vue b/src/views/Brand/shopList.vue
index 082eedf..a021b59 100644
--- a/src/views/Brand/shopList.vue
+++ b/src/views/Brand/shopList.vue
@@ -150,20 +150,20 @@ const toggleFormatAndFloors = ref<0 | 1 | 2>(0)
const list = [
{
- name: '区域筛选',
+ name: '区域搜索',
en: 'AREA',
icon: require('../../assets/images/brand/icon_area.svg'),
iconSel: require('../../assets/images/brand/icon_area_sel.svg')
},
{
- name: '楼层筛选',
+ name: '楼层搜索',
en: 'FLOOR',
icon: require('../../assets/images/brand/icon_floor.svg'),
iconSel: require('../../assets/images/brand/icon_floor_sel.svg')
},
{
- name: '业态筛选',
- en: 'FORMAT',
+ name: '业态搜索',
+ en: 'CLASSIFICATION',
icon: require('../../assets/images/brand/icon_format.svg'),
iconSel: require('../../assets/images/brand/icon_format_sel.svg')
}
diff --git a/src/views/Member/MemberItem.vue b/src/views/Member/MemberItem.vue
index 8d04842..16a3409 100644
--- a/src/views/Member/MemberItem.vue
+++ b/src/views/Member/MemberItem.vue
@@ -110,7 +110,7 @@ onMounted(() => {
position: relative;
width: inherit;
height: 495px;
- background: #ebebeb;
+ background: #ebebeb00;
img {
width: inherit;
diff --git a/src/views/Search/Search.vue b/src/views/Search/Search.vue
index c695838..d337cfc 100644
--- a/src/views/Search/Search.vue
+++ b/src/views/Search/Search.vue
@@ -241,6 +241,9 @@ function handleActivity(item: Activity) {
//点击店铺
function handleSearchShop(val: Shop) {
+ if (shop.value) {
+ store.SET_PREV_SHOP(shop.value)
+ }
store.SET_SHOP(val)
store.SET_SHOW_DETAIL(true)
useStatistics({ tag: 'brandSearch', shopCode: val.shopCode })
@@ -267,6 +270,9 @@ function handleHotSearch(item: Shop) {
if (!val) {
return
}
+ if (shop.value) {
+ store.SET_PREV_SHOP(shop.value)
+ }
store.SET_SHOP(val)
store.SET_SHOW_DETAIL(true)
// router.push('/search/detail')
@@ -364,6 +370,7 @@ function handleHotSearch(item: Shop) {
border: 2px solid #fff;
border-radius: 50px;
backdrop-filter: blur(20px);
+ box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
// margin: auto;
img {
width: 48px;