Merge pull request 'dev' (#98) from dev into test

Reviewed-on: common/base_daoshi_vue_ts#98
3 years ago · f8c432a8ed
14 changed files with 536 additions and 26 deletions
--- a/public/static/offline/JSON/getAdList.json
+++ b/public/static/offline/JSON/getAdList.json
@ -1 +0,0 @@
-{"code":200,"msg":"操作成功","data":[]}
--- a/public/static/offline/JSON/getAreaList.json
+++ b/public/static/offline/JSON/getAreaList.json
@ -1 +0,0 @@
-{"code":200,"msg":"操作成功","data":[]}
--- a/public/static/offline/JSON/getBrandShopList.json
+++ b/public/static/offline/JSON/getBrandShopList.json
--- a/public/static/offline/JSON/getCinemaInfo.json
+++ b/public/static/offline/JSON/getCinemaInfo.json
@ -1 +1,28 @@
-{"code":200,"msg":"操作成功","data":{"industryFatherName":"轻餐饮","industryFatherNameEn":"","shopCode":"hm-mV58hy21EO53DJxk38","shopName":"星巴克","shopNameEn":"","alias":"","logoUrl":"","industryFatherUrl":"","industryUrl":"","building":"A栋","floor":"L1","houseNumber":"F113","intro":"星巴克(Starbucks)是美国一家连锁咖啡公司的名称，1971年成立，为全球最大的咖啡连锁店，其总部坐落美国华盛顿州西雅图市。星巴克旗下零售产品包括30多款全球顶级的咖啡豆、手工制作的浓缩咖啡和多款咖啡冷热饮料、新鲜美味的各式糕点食品以及丰富多样的咖啡机、咖啡杯等商品。星巴克在全球范围内已经有近21300间分店，遍布北美、南美洲、欧洲、中东及太平洋区。","businessHours":"10:00-22:00","contact":"029-88725666","materialList":[],"xaxis":"[1303, 50, 718]","yaxis":"30","navXaxis":"1324","navYaxis":"503","buildingOrder":0,"floorOrder":2}}
+{
+  "code": 200,
+  "msg": "操作成功",
+  "data": {
+    "industryFatherName": "轻餐饮",
+    "industryFatherNameEn": "",
+    "shopCode": "hm-mV58hy21EO53DJxk38",
+    "shopName": "星巴克",
+    "shopNameEn": "",
+    "alias": "",
+    "logoUrl": "",
+    "industryFatherUrl": "",
+    "industryUrl": "",
+    "building": "A栋",
+    "floor": "L1",
+    "houseNumber": "F113",
+    "intro": "星巴克(Starbucks)是美国一家连锁咖啡公司的名称，1971年成立，为全球最大的咖啡连锁店，其总部坐落美国华盛顿州西雅图市。星巴克旗下零售产品包括30多款全球顶级的咖啡豆、手工制作的浓缩咖啡和多款咖啡冷热饮料、新鲜美味的各式糕点食品以及丰富多样的咖啡机、咖啡杯等商品。星巴克在全球范围内已经有近21300间分店，遍布北美、南美洲、欧洲、中东及太平洋区。",
+    "businessHours": "10:00-22:00",
+    "contact": "029-88725666",
+    "materialList": [],
+    "xaxis": "[1303, 50, 718]",
+    "yaxis": "30",
+    "navXaxis": "1324",
+    "navYaxis": "503",
+    "buildingOrder": 0,
+    "floorOrder": 2
+  }
+}
--- a/public/static/offline/JSON/getFacilityList.json
+++ b/public/static/offline/JSON/getFacilityList.json
@ -1 +1,110 @@
-{"code":200,"msg":"操作成功","data":[{"name":"扶梯","nameEn":"escalator","code":"BPkOT2yn6E6BSZdByLsV7","customFacilityName":"","abbreviation":"ft","filePath":"/iotFile/2022/11/15/f3u4NjtZtlVfhoW-p3lqM.png"},{"name":"上扶梯","nameEn":"","code":"46JaZxVEDGb9wtEbtq9FI","customFacilityName":"","abbreviation":"upft","filePath":"/iotFile/2022/11/15/RbX3fMJtHD12cie3ZWbhl.png"},{"name":"下扶梯","nameEn":"xiafuti","code":"4RNabLyfQkeuHbeUKD22S","customFacilityName":"","abbreviation":"downft","filePath":"/iotFile/2022/11/15/KVRDjyi__OiTBK0wvTiab.png"},{"name":"母婴室","nameEn":"","code":"U_A-5h5Evg5wZTrehqdhP","customFacilityName":"","abbreviation":"mys","filePath":"/iotFile/2022/11/15/ASyeOlY20rCM0Y204kOXf.png"},{"name":"洗手间","nameEn":"toilet","code":"_H0POPNNR3e88fSHUmidK","customFacilityName":"","abbreviation":"xsj","filePath":"/iotFile/2022/11/15/R7GJWgwODBsGiM4A6ARzu.png"},{"name":"直梯","nameEn":"","code":"aVjmb6mQhaAcgNAvyad7F","customFacilityName":"","abbreviation":"dt","filePath":"/iotFile/2022/11/15/xOyk8yctB_D0KaD4jw6D-.png"},{"name":"吸烟室","nameEn":"","code":"JcrS9pPFETHYe9AxV5A6Z","customFacilityName":"","abbreviation":"xys","filePath":"/iotFile/2022/11/15/l-wKNIKm4SbRdalfC0adv.png"},{"name":"人行通道","nameEn":"","code":"LWKWolFPenMyJv3wqjZYc","customFacilityName":"","abbreviation":"td","filePath":"/iotFile/2022/11/15/-ZCv-lT1vGnozNj-hnYjW.png"},{"name":"男洗手间","nameEn":"","code":"rXy9tEaQeqnRn6kf3zZA-","customFacilityName":"","abbreviation":"xsjn","filePath":"/iotFile/2022/11/15/RPLs01DqaHy-HUcOWFunN.png"},{"name":"女洗手间","nameEn":"","code":"LDm-N9ZiCGacrTzJCRSwY","customFacilityName":"","abbreviation":"xsjv","filePath":"/iotFile/2022/11/15/7gt7rdAoCvH-Mz6afk7yu.png"},{"name":"活动","nameEn":"","code":"kh02P3QfEZ3uvNk7bI39c","customFacilityName":"","abbreviation":"hd","filePath":"/iotFile/2023/03/29/xiNzv4wixeghR6OIKWjad.png"},{"name":"服务台","nameEn":"","code":"Ol4zTMd1MVpCnqbHMWHZe","customFacilityName":"","abbreviation":"fwt","filePath":"/iotFile/saas/20230602/mnj4iHDnTbxx7SaYu9naD.png"},{"name":"停车场","nameEn":"","code":"y2kU9ZCDBOSOp61X3NcZs","customFacilityName":"","abbreviation":"tcc","filePath":"/iotFile/saas/20230602/5YOnznceV6MoLMbjysHdG.png"}]}
+{
+  "code": 200,
+  "msg": "操作成功",
+  "data": [
+    {
+      "name": "扶梯",
+      "nameEn": "escalator",
+      "code": "BPkOT2yn6E6BSZdByLsV7",
+      "customFacilityName": "",
+      "abbreviation": "ft",
+      "filePath": "/iotFile/2022/11/15/f3u4NjtZtlVfhoW-p3lqM.png"
+    },
+    {
+      "name": "上扶梯",
+      "nameEn": "",
+      "code": "46JaZxVEDGb9wtEbtq9FI",
+      "customFacilityName": "",
+      "abbreviation": "upft",
+      "filePath": "/iotFile/2022/11/15/RbX3fMJtHD12cie3ZWbhl.png"
+    },
+    {
+      "name": "下扶梯",
+      "nameEn": "xiafuti",
+      "code": "4RNabLyfQkeuHbeUKD22S",
+      "customFacilityName": "",
+      "abbreviation": "downft",
+      "filePath": "/iotFile/2022/11/15/KVRDjyi__OiTBK0wvTiab.png"
+    },
+    {
+      "name": "母婴室",
+      "nameEn": "",
+      "code": "U_A-5h5Evg5wZTrehqdhP",
+      "customFacilityName": "",
+      "abbreviation": "mys",
+      "filePath": "/iotFile/2022/11/15/ASyeOlY20rCM0Y204kOXf.png"
+    },
+    {
+      "name": "洗手间",
+      "nameEn": "toilet",
+      "code": "_H0POPNNR3e88fSHUmidK",
+      "customFacilityName": "",
+      "abbreviation": "xsj",
+      "filePath": "/iotFile/2022/11/15/R7GJWgwODBsGiM4A6ARzu.png"
+    },
+    {
+      "name": "直梯",
+      "nameEn": "",
+      "code": "aVjmb6mQhaAcgNAvyad7F",
+      "customFacilityName": "",
+      "abbreviation": "dt",
+      "filePath": "/iotFile/2022/11/15/xOyk8yctB_D0KaD4jw6D-.png"
+    },
+    {
+      "name": "吸烟室",
+      "nameEn": "",
+      "code": "JcrS9pPFETHYe9AxV5A6Z",
+      "customFacilityName": "",
+      "abbreviation": "xys",
+      "filePath": "/iotFile/2022/11/15/l-wKNIKm4SbRdalfC0adv.png"
+    },
+    {
+      "name": "人行通道",
+      "nameEn": "",
+      "code": "LWKWolFPenMyJv3wqjZYc",
+      "customFacilityName": "",
+      "abbreviation": "td",
+      "filePath": "/iotFile/2022/11/15/-ZCv-lT1vGnozNj-hnYjW.png"
+    },
+    {
+      "name": "男洗手间",
+      "nameEn": "",
+      "code": "rXy9tEaQeqnRn6kf3zZA-",
+      "customFacilityName": "",
+      "abbreviation": "xsjn",
+      "filePath": "/iotFile/2022/11/15/RPLs01DqaHy-HUcOWFunN.png"
+    },
+    {
+      "name": "女洗手间",
+      "nameEn": "",
+      "code": "LDm-N9ZiCGacrTzJCRSwY",
+      "customFacilityName": "",
+      "abbreviation": "xsjv",
+      "filePath": "/iotFile/2022/11/15/7gt7rdAoCvH-Mz6afk7yu.png"
+    },
+    {
+      "name": "活动",
+      "nameEn": "",
+      "code": "kh02P3QfEZ3uvNk7bI39c",
+      "customFacilityName": "",
+      "abbreviation": "hd",
+      "filePath": "/iotFile/2023/03/29/xiNzv4wixeghR6OIKWjad.png"
+    },
+    {
+      "name": "服务台",
+      "nameEn": "",
+      "code": "Ol4zTMd1MVpCnqbHMWHZe",
+      "customFacilityName": "",
+      "abbreviation": "fwt",
+      "filePath": "/iotFile/saas/20230602/mnj4iHDnTbxx7SaYu9naD.png"
+    },
+    {
+      "name": "停车场",
+      "nameEn": "",
+      "code": "y2kU9ZCDBOSOp61X3NcZs",
+      "customFacilityName": "",
+      "abbreviation": "tcc",
+      "filePath": "/iotFile/saas/20230602/5YOnznceV6MoLMbjysHdG.png"
+    }
+  ]
+}
--- a/public/static/offline/JSON/getMemberInterests.json
+++ b/public/static/offline/JSON/getMemberInterests.json
@ -1 +1,21 @@
-{"code":200,"msg":"操作成功","data":{"title":"会员介绍","titleEn":"member","content":"会员活动中心","contentEn":"jjcand","fileList":["/iotFile/project-zert3dski8fqmgr4zhusea/20230601/PrtloGMK4QfFgNh8WG138.jpg","/iotFile/project-zert3dski8fqmgr4zhusea/20230601/KJXXeLn6c96AebnwSP6Dc.jpg"],"qrFileList":[{"name":"123312","nameEn":"","fileUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230607/XcImBH2PbmTPDcX_rsCrw.png"}]}}
+{
+  "code": 200,
+  "msg": "操作成功",
+  "data": {
+    "title": "会员介绍",
+    "titleEn": "member",
+    "content": "会员活动中心",
+    "contentEn": "jjcand",
+    "fileList": [
+      "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/PrtloGMK4QfFgNh8WG138.jpg",
+      "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/KJXXeLn6c96AebnwSP6Dc.jpg"
+    ],
+    "qrFileList": [
+      {
+        "name": "123312",
+        "nameEn": "",
+        "fileUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/XcImBH2PbmTPDcX_rsCrw.png"
+      }
+    ]
+  }
+}
--- a/public/static/offline/JSON/getServeList.json
+++ b/public/static/offline/JSON/getServeList.json
@ -1 +1,73 @@
-{"code":200,"msg":"操作成功","data":{"serveList":[{"name":"雨伞租借","nameEn":"978","logoUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230601/XShSbsU3VEEYDkQm9rM2E.jpg","fileUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230601/QpbjfkbCODU5aVNuYAli9.jpg","fileUrls":["/iotFile/project-zert3dski8fqmgr4zhusea/20230601/QpbjfkbCODU5aVNuYAli9.jpg","/iotFile/project-zert3dski8fqmgr4zhusea/20230607/A-CmfymHNUGm0mhGFy7CU.png","/iotFile/project-zert3dski8fqmgr4zhusea/20230607/bWHtYY01TIsGbiS5QVDM8.png","/iotFile/project-zert3dski8fqmgr4zhusea/20230607/tMBspEmPjh8_GQgNBxHKO.png"],"qrUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230607/L4GB4WvBcah4iiThrFSgK.png","content":"租借雨伞了啊","contentEn":"租借雨伞了啊","isPoint":2,"building":"","buildingCode":"","buildingOrder":0,"floor":"","floorCode":"","floorOrder":0,"point":-1},{"name":"充电宝","nameEn":"bao","logoUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230601/TT4qvTjHO_mZ2e3gv8IgS.jpg","fileUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230601/hPk5Z0Q5TRBgTt-IfPOLN.jpg","fileUrls":["/iotFile/project-zert3dski8fqmgr4zhusea/20230601/hPk5Z0Q5TRBgTt-IfPOLN.jpg"],"qrUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230601/Euz5BcOe5i4Ua4Tz0Cbo-.jpg","content":"免费充电宝","contentEn":"123","isPoint":2,"building":"","buildingCode":"","buildingOrder":0,"floor":"","floorCode":"","floorOrder":0,"point":-1},{"name":"122312","nameEn":"","logoUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230607/3YwrjhTZPukVbfh9YBQKX.png","fileUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230607/BShONSttRX_UshFJqkrte.png","fileUrls":["/iotFile/project-zert3dski8fqmgr4zhusea/20230607/BShONSttRX_UshFJqkrte.png","/iotFile/project-zert3dski8fqmgr4zhusea/20230607/mbFngD46RgsP5qmc6NH80.png","/iotFile/project-zert3dski8fqmgr4zhusea/20230607/rNjUR4eGWQkwJ8uAKjWGl.png"],"qrUrl":"/iotFile/project-zert3dski8fqmgr4zhusea/20230607/0Undp5msC2GA1hrxqZ7VH.png","content":"123123","contentEn":"","isPoint":2,"building":"A栋","buildingCode":"DLvmtzN2qodUq_oYr7vyM","buildingOrder":0,"floor":"L2","floorCode":"7Q5J4mfRebZR_t_PKeEDJ","floorOrder":3,"point":40}]}}
+{
+  "code": 200,
+  "msg": "操作成功",
+  "data": {
+    "serveList": [
+      {
+        "name": "雨伞租借",
+        "nameEn": "978",
+        "logoUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/XShSbsU3VEEYDkQm9rM2E.jpg",
+        "fileUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/QpbjfkbCODU5aVNuYAli9.jpg",
+        "fileUrls": [
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/QpbjfkbCODU5aVNuYAli9.jpg",
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/A-CmfymHNUGm0mhGFy7CU.png",
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/bWHtYY01TIsGbiS5QVDM8.png",
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/tMBspEmPjh8_GQgNBxHKO.png"
+        ],
+        "qrUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/L4GB4WvBcah4iiThrFSgK.png",
+        "content": "租借雨伞了啊",
+        "contentEn": "租借雨伞了啊",
+        "isPoint": 2,
+        "building": "",
+        "buildingCode": "",
+        "buildingOrder": 0,
+        "floor": "",
+        "floorCode": "",
+        "floorOrder": 0,
+        "point": -1
+      },
+      {
+        "name": "充电宝",
+        "nameEn": "bao",
+        "logoUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/TT4qvTjHO_mZ2e3gv8IgS.jpg",
+        "fileUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/hPk5Z0Q5TRBgTt-IfPOLN.jpg",
+        "fileUrls": [
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/hPk5Z0Q5TRBgTt-IfPOLN.jpg"
+        ],
+        "qrUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230601/Euz5BcOe5i4Ua4Tz0Cbo-.jpg",
+        "content": "免费充电宝",
+        "contentEn": "123",
+        "isPoint": 2,
+        "building": "",
+        "buildingCode": "",
+        "buildingOrder": 0,
+        "floor": "",
+        "floorCode": "",
+        "floorOrder": 0,
+        "point": -1
+      },
+      {
+        "name": "122312",
+        "nameEn": "",
+        "logoUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/3YwrjhTZPukVbfh9YBQKX.png",
+        "fileUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/BShONSttRX_UshFJqkrte.png",
+        "fileUrls": [
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/BShONSttRX_UshFJqkrte.png",
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/mbFngD46RgsP5qmc6NH80.png",
+          "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/rNjUR4eGWQkwJ8uAKjWGl.png"
+        ],
+        "qrUrl": "/iotFile/project-zert3dski8fqmgr4zhusea/20230607/0Undp5msC2GA1hrxqZ7VH.png",
+        "content": "123123",
+        "contentEn": "",
+        "isPoint": 2,
+        "building": "A栋",
+        "buildingCode": "DLvmtzN2qodUq_oYr7vyM",
+        "buildingOrder": 0,
+        "floor": "L2",
+        "floorCode": "7Q5J4mfRebZR_t_PKeEDJ",
+        "floorOrder": 3,
+        "point": 40
+      }
+    ]
+  }
+}
--- a/public/static/qm/MainMap_QM.js
+++ b/public/static/qm/MainMap_QM.js
@ -1,4 +1,4 @@
-var Map_QM, renderFrame = -1, pathCameraState, stats, stateTime, isJUZ = false, hasLine = false, dir = false, iot = false, shopTime, debug = false;    //dir--自定义地图大小适应不同版本的地图大小
+var Map_QM, renderFrame = -1, pathCameraState, stats, stateTime, isJUZ = false, hasLine = false, dir = false, iot = true, shopTime, debug = false;    //dir--自定义地图大小适应不同版本的地图大小
 //basePath 基础路径      graphPath最佳路径       ftPath 扶梯路径      dtPath 电梯路径

 var typeObj = [{ ft: 0, type: 0, code: 'ft', name: '扶梯' }, { upft: 1, type: 1, code: 'upft', name: '上扶梯' }, { downft: 2, type: 2, code: 'downft', name: '下扶梯' }, { mys: 3, type: 3, code: 'mys', name: '母婴室' }, { xsj: 4, type: 4, code: 'xsj', name: '洗手间' },
@ -2798,7 +2798,7 @@ MainMap_QM.prototype = {
 	/**
 	 * @api {方法} rotationAngle(angle)   改变水平角度
 	 * @apiGroup 地图显示
-	 * @apiDescription  改变地图水平角度    angle>-180 &&  angle<180
+	 * @apiDescription  改变地图水平角度    angle>-180 &&  angle<180  逆时针旋转
 	 * @apiVersion 4.0.0
 	 * 
 	 * @apiParam {int} angle    旋转角度
@ -2811,9 +2811,8 @@ MainMap_QM.prototype = {
 	 * 
 	 */
 	rotationAngle: function (angle) {
-		if(Math.abs(parseInt(angle)+Map_QM.controls.getRotateHorizontal()*180/Math.PI)>5){
-      Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI)
-    }
+		Map_QM.controls.setRotateHorizontal(Map_QM.controls.getRotateHorizontal());
+		Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI)
 	},
 	/**
 	 * @api {方法} rotateAngle(angle)   改变垂直角度
@ -5891,8 +5890,8 @@ FloorMap_QM.prototype = {
 					if (arr.length > 0) {
 						let shape = new THREE.Shape();
 						shape.moveTo(arr[0][0], -1 * arr[0][1]);
-						for (let k = 0; k < arr.length; k++) {
-							shape.lineTo(arr[k][2], -1 * arr[k][3]);
+						for (let k = 1; k < arr.length; k++) {
+							shape.lineTo(arr[k][0], -1 * arr[k][1]);
 						}
 						shapeArr.push(shape);
 						let meshMaterial;
--- a/src/types/activity.d.ts
+++ b/src/types/activity.d.ts
@ -11,12 +11,10 @@ declare interface Activity {
  buildingCode: string
  startDate: string //开始日期
  endDate: string //结束日期
-  fileUrl: string //活动图片地址
+  fileUrl: string //封面
+  fileUrls: string[] //活动详情图片列表
  floor: string //楼层
  floorOrder: number
-  offline: string //下线日期
-  online: string //上线日期
-  ord: number //排序
  point: number // 导航点
  shopCode: string //关联店铺code
 }
--- a/src/types/featured.d.ts
+++ b/src/types/featured.d.ts
@ -4,5 +4,6 @@ declare interface Featured {
  nameEn: string //英文名称
  introduce: string
  introduceEn: string
-  fileUrl: string
+  crossFileCode: string //横屏图片
+  verticalFileCode: string //竖屏图片
 }
--- a/src/types/industry.d.ts
+++ b/src/types/industry.d.ts
@ -1,9 +1,9 @@
 declare interface Industry {
-  fileUrl: string
  isSpecial: 0 | 1 //1特殊业态 反之不是
  industryId: number //唯一标识
  industryName: string //业态名称
  industryNameEn: string //业态英文
  shopNum: number //店铺总数
  industryList: Array<{ industryId: number; industryName: string; shopNum: number }>
+  fileUrl?: string
 }
--- a/src/types/parkingInfo.d.ts
+++ b/src/types/parkingInfo.d.ts
@ -0,0 +1,8 @@
+declare interface ParkingInfo {
+  title: string
+  titleEn: string
+  content: string
+  contentEn: string
+  fileList: string[]
+  qrFileList: Array<{ name: string; nameEn: string; fileUrl: string }>
+}
--- a/src/types/recommendItem.d.ts
+++ b/src/types/recommendItem.d.ts
@ -0,0 +1,4 @@
+type Props = 'shopCode' | 'shopName' | 'shopNameEn' | 'building' | 'floor' | 'buildingCode' | 'buildingOrder' | 'floorCode' | 'floorOrder'
+
+//point大于-1绑定了点位
+declare type RecommendItem = { name: string; nameEn: string; fileUrl: string; point: number } & Required<Pick<Shop, Props>>
--- a/src/types/serve.d.ts
+++ b/src/types/serve.d.ts
@ -3,15 +3,16 @@ declare interface ServeItem {
  nameEn: string
  logoUrl: string
  fileUrl: string
+  fileUrls: string[]
  qrUrl: string
  content: string
  contentEn: string
  isPoint: 0 | 1 | 2 //是否关联点位 0无关联点位，1服务台设施，2地图选点
-  facilityCode: string
-  facilityName: string
-  building: ''
-  floor: ''
-  floorOrder: number
+  building: string
+  buildingCode: string
  buildingOrder: number
-  point: number
+  floor: string
+  floorCode: string
+  floorOrder: number
+  point: number | string
 }