{{ $t('detail') }}
{{ $t('nav') }}
@@ -19,6 +24,8 @@
@@ -49,6 +56,7 @@ defineProps<{ shop: any }>()
left: 50%;
width: 180px;
height: 180px;
+ object-fit: scale-down;
transform: translate(-50%, -50%);
&.no-data {
padding: 20px;
@@ -66,8 +74,13 @@ defineProps<{ shop: any }>()
font-family: 'font_bold';
text-align: left;
flex-direction: column;
- .name {
+ .marquee-wrapper {
+ overflow: hidden;
max-width: 90%;
+ white-space: nowrap;
+ }
+ .name {
+ // max-width: 90%;
height: 18px;
font-size: 16px;
color: #685c3b;
diff --git a/src/composables/useInitConfigAndMallInfo.ts b/src/composables/useInitConfigAndMallInfo.ts
index f69a768..8233ca6 100644
--- a/src/composables/useInitConfigAndMallInfo.ts
+++ b/src/composables/useInitConfigAndMallInfo.ts
@@ -35,6 +35,9 @@ export const useInitConfigAndMallInfo = async () => {
])
const { shopList, buildingList } = _shopAndBuilding.data
+
+ sortByFloorOrder(shopList)
+
store.SET_DEVICE(_DeviceInfo.data)
store.SET_SHOP_LIST(shopList)
store.SET_BUILDING_LIST(buildingList)
@@ -53,3 +56,9 @@ export const useInitConfigAndMallInfo = async () => {
Message({ text: '初始化数据失败', type: 'success' })
}
}
+
+function sortByFloorOrder(arr: Array
) {
+ arr.sort((a: Shop, b: Shop) => {
+ return b.floorOrder - a.floorOrder
+ })
+}
diff --git a/src/composables/useInitMap.ts b/src/composables/useInitMap.ts
index a515d62..16dddcb 100644
--- a/src/composables/useInitMap.ts
+++ b/src/composables/useInitMap.ts
@@ -43,6 +43,7 @@ function onClickShop(event: any) {
if (event.data) {
showMapDialog()
+ window.Map_QM.elementDestroy()
window.Map_QM.addElementLabel(document.getElementById('shopInfo'), event.data.xaxis, event.data.yaxis)
store.SET_SHOP(event.data.shopData)
} else {
@@ -55,7 +56,7 @@ export function hideMapDialog() {
}
//显示地图弹框
-function showMapDialog() {
+export function showMapDialog() {
;(document.getElementById('shopInfo') as HTMLElement).style.visibility = 'visible'
}
diff --git a/src/types/map.d.ts b/src/types/map.d.ts
index 25fde41..4712e77 100644
--- a/src/types/map.d.ts
+++ b/src/types/map.d.ts
@@ -37,6 +37,12 @@ export declare global {
// render 对象
renderer: any
+ /**
+ * 地图box跳动
+ * @param houseNumber 店铺号
+ */
+ setSelectShopMatByName(houseNumber: string): void
+
/**
* 地图事件函数
* @param name 事件名称
@@ -45,6 +51,13 @@ export declare global {
*/
addEventListener(name: string, callBack: (event: any) => void, type: boolean): void
+ /**
+ * 删除地图监听事件
+ * @param name
+ * @param callBack
+ */
+ removeEventListener(name: string, callBack: (event: any) => void): void
+
/**
* 修改标签位置
* @param obj 修改的标签源对象
diff --git a/src/types/shop.d.ts b/src/types/shop.d.ts
index e6ad169..4f87639 100644
--- a/src/types/shop.d.ts
+++ b/src/types/shop.d.ts
@@ -26,7 +26,7 @@ declare interface Shop {
industryCode?: string //子业态code
industryName?: string //子业态名称
industryNameEn?: string //子业态名称
- xaxis?: [number, number, number]
+ xaxis?: string // [number, number, number]
isNewShop?: 0 | 1 //是否新店0: 不是 1:新店
isPass?: 0 | 1 //是否途径 0: 不途径 1: 途径
isSpecial?: 0 | 1 //是否特殊业态 0: 不是 1: 是
diff --git a/src/views/Brand/Brand.vue b/src/views/Brand/Brand.vue
index 21787e3..2e381bd 100644
--- a/src/views/Brand/Brand.vue
+++ b/src/views/Brand/Brand.vue
@@ -93,7 +93,7 @@ const typeBtnList = [
},
{
title: '字母筛选',
- titleEn: 'Floors'
+ titleEn: 'Letters'
}
]
diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue
index c099abc..23afcf0 100644
--- a/src/views/Guide/Guide.vue
+++ b/src/views/Guide/Guide.vue
@@ -15,7 +15,13 @@
@@ -65,7 +71,7 @@