From 9c8fc1691ce6daf449096b49283cfc369582612a Mon Sep 17 00:00:00 2001 From: jiangx <1457960500@qq.com> Date: Wed, 19 Apr 2023 16:59:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=BD=B1=E9=99=A2=E6=A8=A1=E5=9D=97=E7=9A=84ts=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- src/composables/useFacilityNav.ts | 8 ++++---- src/store/root/actions.ts | 2 +- src/store/root/state.ts | 1 - src/types/activity.d.ts | 5 +++-- src/types/building.d.ts | 3 ++- src/types/cinema.d.ts | 15 +++++++++++++++ src/types/language.d.ts | 1 + src/types/map.d.ts | 16 +++++++++++----- src/types/task-slice.d.ts | 11 +++++------ src/utils/utils.ts | 2 +- 11 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 src/types/cinema.d.ts create mode 100644 src/types/language.d.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 1f99aea..e7b948a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,9 +3,10 @@ "source.fixAll.stylelint": true, "source.fixAll.eslint": true }, + "editor.fontSize": 18, "cSpell.words": [ "chahao", "columer", "perc" ] -} \ No newline at end of file +} diff --git a/src/composables/useFacilityNav.ts b/src/composables/useFacilityNav.ts index bc2536f..2134edc 100644 --- a/src/composables/useFacilityNav.ts +++ b/src/composables/useFacilityNav.ts @@ -7,14 +7,14 @@ export const useFacilityNav = () => { const router = useRouter() function handleFacility({ abbreviation, customFacilityName, filePath, code }: Facility) { - const facility = window.Map_QM.pathIcon({ type: abbreviation }) - const floorName = store.currentBuildingFloorsList.find(floor => floor.floorOrder === facility.floor)?.floor + const { floor, node } = window.Map_QM.pathIcon({ type: abbreviation }) + const floorName = store.currentBuildingFloorsList.find(_floor => _floor.floorOrder === floor)?.floor const shop = new Brand({ shopName: customFacilityName, - floorOrder: facility.floor, + floorOrder: floor, floor: floorName as string, logoUrl: filePath, - yaxis: facility.node, + yaxis: node, shopCode: code }) store.SET_SHOP(shop) diff --git a/src/store/root/actions.ts b/src/store/root/actions.ts index bf12580..4435de8 100644 --- a/src/store/root/actions.ts +++ b/src/store/root/actions.ts @@ -1,5 +1,5 @@ import { i18n } from '@/i18n' -import type { Language, State } from './state' +import type { State } from './state' import type { Root } from '../key' import type { CreateActions } from '../types' diff --git a/src/store/root/state.ts b/src/store/root/state.ts index b4a9f27..5da2e63 100644 --- a/src/store/root/state.ts +++ b/src/store/root/state.ts @@ -1,4 +1,3 @@ -export type Language = 'zh' | 'en' | 'tw' //语言 zh: 简体中文 en: 英文 tw: 繁体中文 export interface State { shopList: Readonly //店铺列表 buildingList: Building[] //楼栋列表 diff --git a/src/types/activity.d.ts b/src/types/activity.d.ts index 7064600..4706969 100644 --- a/src/types/activity.d.ts +++ b/src/types/activity.d.ts @@ -3,11 +3,12 @@ declare interface Activity { activityAddressEn: string //活动地址英文 activityContent: string //活动内容 activityContentEn: string //活动内容英文 - activityId: number //活动ID + activityId: number | string //活动ID activityName: string activityNameEn: string //活动名称英文 activityType: 1 | 2 | 3 //活动类型，1商场活动；2品牌活动；3会员活动 building: string //楼栋 + buildingCode: string startDate: string //开始日期 endDate: string //结束日期 fileUrl: string //活动图片地址 @@ -16,6 +17,6 @@ declare interface Activity { offline: string //下线日期 online: string //上线日期 ord: number //排序 - point: number // 导航点 + point: number | null // 导航点 shopCode: string //关联店铺code } diff --git a/src/types/building.d.ts b/src/types/building.d.ts index 7904647..4b46d0f 100644 --- a/src/types/building.d.ts +++ b/src/types/building.d.ts @@ -1,8 +1,9 @@ declare interface Floor { - floorCode: number + floorCode: number | string floor: string floorOrder: number floorMapUrl: string + floorMapCode: string } declare interface Building { diff --git a/src/types/cinema.d.ts b/src/types/cinema.d.ts new file mode 100644 index 0000000..b89023e --- /dev/null +++ b/src/types/cinema.d.ts @@ -0,0 +1,15 @@ +declare interface Cinema { + alias: string //店铺别名 + building: string // 楼栋 + cinemaCode: string //影院编码 + cinemaIntro: string //影院介绍 + cinemaName: string //影院名称 + floor: string //楼层 + houseNumber: string //门牌号 + intro: string //简介（中文） + introEn: string //简介（英文） + logoUrl: string //店铺logo + materialList: string[] //店铺配图集合 + shopName: string //店铺名称（中文） + shopNameEn: string //店铺名称（英文） +} diff --git a/src/types/language.d.ts b/src/types/language.d.ts new file mode 100644 index 0000000..cb6a28f --- /dev/null +++ b/src/types/language.d.ts @@ -0,0 +1 @@ +declare type Language = 'zh' | 'en' | 'tw' //语言 zh: 简体中文 en: 英文 tw: 繁体中文 diff --git a/src/types/map.d.ts b/src/types/map.d.ts index 4229d53..ab9a326 100644 --- a/src/types/map.d.ts +++ b/src/types/map.d.ts @@ -203,13 +203,13 @@ export declare global { /** * 地图路径规划,根据传入的起、终点；直接导航 - * @param startObj shopNum 店铺编号/车位编号 type 'shop'/'park' + * @param startObj shopNum 店铺编号/车位编号 type 'shop'/'' * @param toObj shopNum 店铺编号/车位编号 type 'shop'/'park' * @param callBackFun 回调函数 */ pathByStartAndOver( - startObj: { shopNum: string; type: string }, - toObj: { shopNum: string; type: string }, + startObj: { shopNum: string; type: 'shop' | 'park' }, + toObj: { shopNum: string; type: 'shop' | 'park' }, callBackFun: () => void ): void @@ -280,13 +280,19 @@ export declare global { * 获取所有Icon * @param floorOrder 楼层编号 （默认所有） */ - getAllIcon(floorOrder?: number): Array> + getAllIcon(floorOrder?: number): Array /** * 获取车位导航点 * @param obj shopNum 车位编号 */ - pathPark(obj: { shopNum: string }): Partial + pathPark(obj: { shopNum: string }): { + shopNum: string + node: string | number + floor: number + xaxis: number | string + yaxis: number | string + } // 地图显示相关API声明 diff --git a/src/types/task-slice.d.ts b/src/types/task-slice.d.ts index 37ca039..5ffccc9 100644 --- a/src/types/task-slice.d.ts +++ b/src/types/task-slice.d.ts @@ -1,10 +1,9 @@ -interface Options { - init({ sliceList, callback }: { sliceList: number; callback: (i: number) => void }): void - next(): void - sliceQueue({ sliceList, callback }: { sliceList: number; callback: (i: number) => void }): void -} - declare module 'task-slice' { + interface Options { + init({ sliceList, callback }: { sliceList: number; callback: (i: number) => void }): void + next(): void + sliceQueue({ sliceList, callback }: { sliceList: number; callback: (i: number) => void }): void + } const TaskSlice: Options export default TaskSlice } diff --git a/src/utils/utils.ts b/src/utils/utils.ts index b4b768d..0f6d1d7 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -129,7 +129,7 @@ export const addPrefixByRecursive = (data: any[], prefix = '/static/offline', ex if (data && typeof data === 'object') { for (const key in data) { if (typeof data[key] === 'string' && exp.test(data[key])) { - data[key] = prefix + data[key].replace(/\\/g, '/') + data[key] = prefix + data[key] } if (data[key] && typeof data[key] === 'object') { addPrefixByRecursive(data[key])