From 265f3632a981cd68a46023848f8c782c0ec3d3c7 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Thu, 15 Jun 2023 13:41:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=93=81=E7=89=8C=E9=A1=B6=E9=83=A8=E8=87=AA=E5=8A=A8=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/offline/JSON/getBrandShopList.json | 35 ++++++++++++ public/static/qm/MainMap_QM.js | 21 ++++---- src/views/Brand/recommendShop.vue | 53 +++++++++++++------ 3 files changed, 82 insertions(+), 27 deletions(-) diff --git a/public/static/offline/JSON/getBrandShopList.json b/public/static/offline/JSON/getBrandShopList.json index fd832d8..a5dbc0e 100644 --- a/public/static/offline/JSON/getBrandShopList.json +++ b/public/static/offline/JSON/getBrandShopList.json @@ -89,6 +89,41 @@ "buildingOrder": 0, "floorCode": "EuMWamqDI1Vd3v-oIYjY5", "floorOrder": 1 + },{ + "isSpecial": 0, + "industryCode": "", + "industryFatherCode": "f0MfRIsC6lXi7Kd1LFz18", + "industryFatherName": "濮园三区", + "industryFatherNameEn": "", + "industryFatherNameJa": "", + "industryFatherNameOl": "", + "shopCode": "BtUmBL2P6LIz-_NQv48Ps", + "shopName": "濮园三区 16幢", + "shopNameEn": "", + "shopNameJa": "", + "shopNameOl": "", + "alias": "", + "logoCode": "oOellEk4GPD7tLyPIxdry", + "logoUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230608/oOellEk4GPD7tLyPIxdry.png", + "building": "濮园未来社区", + "floor": "L1", + "houseNumber": "濮园三区 16幢", + "introJa": "", + "introOl": "", + "regionCode": "", + "businessHours": "", + "contact": "", + "xaxis": "", + "yaxis": "", + "spelling": "pu yuan san qu 16chuang ", + "initials": "PYSQ 16C", + "borderColor": "", + "formatColor": "", + "activityList": [], + "buildingCode": "gAi7ksmAnlR22G8CyLXbI", + "buildingOrder": 0, + "floorCode": "EuMWamqDI1Vd3v-oIYjY5", + "floorOrder": 1 }, { "isSpecial": 0, diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 06aab33..602c31e 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -4139,7 +4139,7 @@ MainMap_QM.prototype = { if (item.hasOwnProperty("wayShop") && item.wayShop) { for (let i = 0; i < item.wayShop.length; i++) { let enTlite = item.wayShop[i].shop.shopNameEn == "" ? item.wayShop[i].shop.shopName : item.wayShop[i].shop.shopNameEn; - Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum }); + Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath || item.wayShop[i].shop.logoUrl, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum }); } } if (item.hasOwnProperty("Facilities") && item.Facilities) { //设施 @@ -5338,10 +5338,10 @@ FloorMap_QM.prototype = { show = shopData[h].shopName || shopData[h].name; showLeb = houseNum; showE = shopData[h].shopNameEn || shopData[h].nameEn; - logo = shopData[h].logoPath; + logo = shopData[h].logoPath || shopData[h].logoUrl; mapShow = shopData[h].mapShow ?? false; - if (shopData[h].navRecommend) { - navRecommend = shopData[h].navRecommend; + if (shopData[h].navRecommend || shopData[h].isPass) { + navRecommend = shopData[h].navRecommend || shopData[h].isPass; } else { navRecommend = false; } @@ -5354,12 +5354,12 @@ FloorMap_QM.prototype = { mapData.shopArea[i].type = "promotion"; this.addTagLabel(mapData.shopArea[i], { "node": mapData.shopArea[i].shopNav, "floor": this.floorOrder, "build": this.buildOrder }); } - if (shopData[h].formatColor) { - entColor = parseInt(shopData[h].formatColor.replace("#", "0x"), 16); - } - if (shopData[h].borderColor) { - borderColor = parseInt(shopData[h].borderColor.replace("#", "0x"), 16); - } + // if (shopData[h].formatColor) { + // entColor = parseInt(shopData[h].formatColor.replace("#", "0x"), 16); + // } + // if (shopData[h].borderColor) { + // borderColor = parseInt(shopData[h].borderColor.replace("#", "0x"), 16); + // } break; } } @@ -6515,3 +6515,4 @@ FindPath_QM.prototype.playMoveGuide = function () { } } + diff --git a/src/views/Brand/recommendShop.vue b/src/views/Brand/recommendShop.vue index 6e8fbc3..f29a184 100644 --- a/src/views/Brand/recommendShop.vue +++ b/src/views/Brand/recommendShop.vue @@ -6,27 +6,42 @@
- + + }" + + + :observer="true" + :observe-parents="true" + --> @@ -48,7 +63,7 @@