Browse Source

fix: 修改品牌模块推荐页自适应,不显示景观城和B2B3,修改搜索页面结果显示区域

pull/19/head
张耀 3 years ago
parent
commit
882f061cdd
  1. 5
      src/assets/images/search/icon_area.svg
  2. 5
      src/components/ActivityDetail/ActivityDetail.vue
  3. 8
      src/components/SearchResultListItem/SearchResultListItem.vue
  4. 16
      src/views/Brand/shopList.vue

5
src/assets/images/search/icon_area.svg

@ -0,0 +1,5 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#229;&#159;&#186;&#231;&#161;&#128;/&#228;&#186;&#140;&#231;&#186;&#167;&#232;&#143;&#156;&#229;&#141;&#149;/&#230;&#156;&#141;&#229;&#138;&#161;-&#229;&#145;&#168;&#232;&#190;&#185;">
<path id="&#231;&#159;&#162;&#233;&#135;&#143;" d="M16.6667 2.5C17.1267 2.5 17.5 2.87333 17.5 3.33333V16.6667C17.5 17.1267 17.1267 17.5 16.6667 17.5H3.33333C2.87333 17.5 2.5 17.1267 2.5 16.6667V3.33333C2.5 2.87333 2.87333 2.5 3.33333 2.5H16.6667ZM9.32417 10.965L4.16667 11.875V15.8333H10.1817L9.32333 10.965H9.32417ZM15.8333 4.16667H9.8175L11.8742 15.8333H15.8333V4.16667ZM8.125 4.16667H4.16667V10.1817L9.035 9.32333L8.125 4.16667Z" fill="#615C59"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 751 B

5
src/components/ActivityDetail/ActivityDetail.vue

@ -162,6 +162,11 @@ function handleGo() {
const facList = res.data const facList = res.data
console.log('props.actInfo.facilityCode :>> ', props.actInfo.facilityCode) console.log('props.actInfo.facilityCode :>> ', props.actInfo.facilityCode)
const fac = facList.find(item => item.code === props.actInfo.facilityCode) const fac = facList.find(item => item.code === props.actInfo.facilityCode)
const obj = store.facilityList.find(item => item.abbreviation === fac?.abbreviation)
if (obj && fac) {
fac.navFilePath = obj.navFilePath
}
if (fac) { if (fac) {
handleFacility(toRaw(fac)) handleFacility(toRaw(fac))
} }

8
src/components/SearchResultListItem/SearchResultListItem.vue

@ -6,6 +6,8 @@
<div class="bottom"> <div class="bottom">
<span class="name">{{ switchLanguage(shop, 'shopName') }}</span> <span class="name">{{ switchLanguage(shop, 'shopName') }}</span>
<span class="floor-name"> <span class="floor-name">
<img src="@/assets/images/search/icon_area.svg" alt="" />
<span class="format-name">{{ switchLanguage(shop, 'regionName') }}</span>
<img v-if="shop.industryUrl" :src="shop.industryUrl" alt="" /> <img v-if="shop.industryUrl" :src="shop.industryUrl" alt="" />
<span class="format-name">{{ switchLanguage(shop, 'industryFatherName') }}</span> <span class="format-name">{{ switchLanguage(shop, 'industryFatherName') }}</span>
<img src="@/assets/images/search/pos.svg" alt="" /> <img src="@/assets/images/search/pos.svg" alt="" />
@ -59,13 +61,13 @@ const emits = defineEmits(['click'])
align-items: center; align-items: center;
width: 100%; width: 100%;
height: 28px; height: 28px;
padding-right: 40px;
padding-right: 32px;
padding-left: 32px; padding-left: 32px;
font-family: 'font_bold'; font-family: 'font_bold';
line-height: 28px; line-height: 28px;
.name { .name {
// max-width: 460px; // max-width: 460px;
width: 460px;
width: 398px;
padding-right: 20px; padding-right: 20px;
font-size: 24px; font-size: 24px;
color: #8e9090; color: #8e9090;
@ -85,7 +87,7 @@ const emits = defineEmits(['click'])
margin-right: 8px; margin-right: 8px;
} }
.format-name { .format-name {
width: 96px;
width: 84px;
@include no-wrap(); @include no-wrap();
} }

16
src/views/Brand/shopList.vue

@ -1,5 +1,5 @@
<template> <template>
<div class="shop-list">
<div class="shop-list" :class="{ 'no-rec': recList.length === 0 }">
<!-- --> <!-- -->
<switchtab <switchtab
class="switch-btn" class="switch-btn"
@ -19,6 +19,7 @@
:refresh-delay="200" :refresh-delay="200"
:pull-up="true" :pull-up="true"
:list="pageList" :list="pageList"
:class="{ 'no-rec': recList.length === 0 }"
@scroll-end="myScrollEnd" @scroll-end="myScrollEnd"
> >
<!-- <swiper <!-- <swiper
@ -199,7 +200,9 @@ const floorsList = computed(() => {
floorOrder: -1, floorOrder: -1,
floorMapCode: '' floorMapCode: ''
}, },
...currentBuildingFloorsList.value
...currentBuildingFloorsList.value.filter(
item => item.floor !== 'B2' && item.floor !== 'B3' && item.floorOrder < currentBuildingFloorsList.value.length - 1
)
] ]
}) })
const recList = ref<Shop[]>([]) const recList = ref<Shop[]>([])
@ -381,6 +384,9 @@ function myScrollEnd() {
height: 1080px; height: 1080px;
padding-top: 0; padding-top: 0;
padding-left: 0; padding-left: 0;
&.no-rec {
width: 1790px;
}
.right-control-area { .right-control-area {
position: absolute; position: absolute;
top: 134px; top: 134px;
@ -499,6 +505,12 @@ function myScrollEnd() {
.swiper-wrapper { .swiper-wrapper {
height: auto; height: auto;
} }
&.no-rec {
width: 1532px;
.shop-items {
width: 1532px;
}
}
.shop-items { .shop-items {
width: 1388px; width: 1388px;

Loading…
Cancel
Save