修改定位问题

components/lang-btn/index.js

@@ -71,6 +71,7 @@ Component({
     donothing() {},
     donothing() {},
     changeBuilding({ currentTarget: { id } }) {
     changeBuilding({ currentTarget: { id } }) {
       const building = this.data.buildings[id];
       const building = this.data.buildings[id];
+      console.log('changeBuilding',this.data.buildings[id])
       getApp().setBuilding(building);
       getApp().setBuilding(building);
       getApp().blurPoi();
       getApp().blurPoi();
       this.setData({ showBuildings: false });
       this.setData({ showBuildings: false });

components/shop-addr/index.js

@@ -29,7 +29,11 @@ Component({
     setText() {
     setText() {
       const { isEn, shop } = this.data;
       const { isEn, shop } = this.data;
       const { enAddr, buildingFloor, street } = getAddr(shop, isEn);
       const { enAddr, buildingFloor, street } = getAddr(shop, isEn);
-      this.setData({ enAddr, buildingFloor, street });
+
+      // 过滤掉"国际商贸城"字样
+      const filteredBuildingFloor = buildingFloor ? buildingFloor.replace(/国际商贸城/g, '') : '';
+
+      this.setData({ enAddr, buildingFloor: filteredBuildingFloor, street });
     },
     },
   },
   },
   lifetimes: {
   lifetimes: {

pages/index/index.js

@@ -84,7 +84,9 @@ Page({
   onCurrentBuildingChange() {
   onCurrentBuildingChange() {
     this.getActs();
     this.getActs();
     if (!this.data.focusedPoi) {
     if (!this.data.focusedPoi) {
-      this.setFloorName(getApp().currentBuilding.floors[0]);
+      // 默认展示一楼
+      let isFrisfloor=getApp().currentBuilding.floors.indexOf('1F')
+      this.setFloorName(getApp().currentBuilding.floors[isFrisfloor]);
     }
     }
     if (!this.data.isIndex) {
     if (!this.data.isIndex) {
       if (this.data.activeId) this.setFacilities(this.data.activeId);
       if (this.data.activeId) this.setFacilities(this.data.activeId);
@@ -364,7 +366,7 @@ Page({
       console.log("定位切到室内");
       console.log("定位切到室内");
       this.setData({ resetCount: (this.data.resetCount || 0) + 1 });
       this.setData({ resetCount: (this.data.resetCount || 0) + 1 });
       this.setBuildingFloor(userLocation?.buildingId, userLocation?.floorName);
       this.setBuildingFloor(userLocation?.buildingId, userLocation?.floorName);
-    }
+    } 
   },
   },
 
 
   /**
   /**
@@ -412,6 +414,7 @@ Page({
     const building = getApp().buildings.find(
     const building = getApp().buildings.find(
       (building) => building.buildingId && building.buildingId === buildingId,
       (building) => building.buildingId && building.buildingId === buildingId,
     );
     );
+   
     if (building) {
     if (building) {
       getApp().setBuilding(building);
       getApp().setBuilding(building);
       this.setFloorName(floorName);
       this.setFloorName(floorName);