From 84b9167d7b7efa5d7d13a7238d65a53d876b054b Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Fri, 6 Jan 2023 15:50:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/qm/MainMap_QM.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js
index 37a8fd8..4f51286 100644
--- a/public/static/qm/MainMap_QM.js
+++ b/public/static/qm/MainMap_QM.js
@@ -328,7 +328,7 @@ ConfigFun = function () {
           Config.allMap = JSON.parse(LZString.decompressFromBase64(mapData.mapData))
         }
       } catch (e) {
-        console.log(e);
+        console.log(e)
         backObj.code = 404
         backObj.msg = '地图数据JSON格式错误'
         callBack(backObj)
@@ -1457,7 +1457,7 @@ ConfigFun = function () {
             Map_QM.loaderOver()
           }
         } catch (e) {
-          console.log(e);
+          console.log(e)
           callBack({ code: 404, msg: '地图数据解析失败' })
           callBack = null
         }
@@ -1727,7 +1727,7 @@ MainMap_QM.prototype = {
   },
 
   initBuild: function (e) {
-    console.log("******");
+    console.log('******')
     elevator = null
     straight = null
     elevatorDown = null
@@ -2881,9 +2881,9 @@ MainMap_QM.prototype = {
    *
    */
   addElementLabel: function (divObj, x = 0, y = 0, type = 'shopInfo') {
-    Map_QM.elementDestroy(type);
+    Map_QM.elementDestroy(type)
     let shopInfo = new THREE.CSS2DObject(divObj)
-    shopInfo.position.set(x, -1 * y, Config.shopHeight || 50)
+    shopInfo.position.set(x, -1 * y, type === 'shopInfo' ? (Config.shopHeight || 50) + 100 : 150)
     shopInfo.applyMatrix(Map_QM.mapArr[Config.selectBuild][Config.selectFloor].allObj.matrix)
     shopInfo.userData.type = type
     shopInfo.name = 'shopInfo'
@@ -3428,7 +3428,13 @@ MainMap_QM.prototype = {
     }
 
     if (selIcon) {
-      return { build: selIcon.build, floor: selIcon.floor, node: selIcon.navCode, site:{x: selIcon.position.x, y: selIcon.position.y}, typeCode: Config.getFacType(iconType.type) }
+      return {
+        build: selIcon.build,
+        floor: selIcon.floor,
+        node: selIcon.navCode,
+        site: { x: selIcon.position.x, y: -selIcon.position.y },
+        typeCode: Config.getFacType(iconType.type)
+      }
     } else {
       // 当前楼栋没有
       let startNade = Config.deviceObj.build + '_' + Config.startObj.floor + '_' + Config.startObj.node
@@ -3458,7 +3464,13 @@ MainMap_QM.prototype = {
       }
     }
     if (selIcon) {
-      return { build: selIcon.build, floor: selIcon.floor, node: selIcon.navCode, site:{x: selIcon.position.x, y: selIcon.position.y}, typeCode: Config.getFacType(iconType.type) }
+      return {
+        build: selIcon.build,
+        floor: selIcon.floor,
+        node: selIcon.navCode,
+        site: { x: selIcon.position.x, y: -selIcon.position.y },
+        typeCode: Config.getFacType(iconType.type)
+      }
     }
   },
   /**