packages/community/choseCommunity/index.vue

@@ -4,34 +4,49 @@
       <div class="currentAdd_left">{{ city.region }}</div>
       <div class="currentAdd_right" @click="changeAddress">
         切换城市
-        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_choseAddress.png"></image>
+        <image
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_choseAddress.png"
+        ></image>
       </div>
     </div>
 
     <div class="communityBox" v-if="step == 1">
       <div class="search">
-        <input type="text" placeholder="请输入小区名称" v-model="communityName" />
+        <input
-        <image @click="searchByName"
+          type="text"
-          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png">
+          placeholder="请输入小区名称"
-        </image>
+          v-model="communityName"
+        />
+        <image
+          @click="searchByName"
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
+        ></image>
       </div>
 
       <!-- @click="chooseCommunity(item)" -->
       <div class="communityList">
-        <div class="communityItem" v-for="item in communityList" :key="item.community_id" @click="nextStep(item)">
+        <div
+          class="communityItem"
+          v-for="item in communityList"
+          :key="item.community_id"
+          @click="nextStep(item)"
+        >
           <div class="communityItem_left">
             <div class="communityItem_tit">{{ item.name }}</div>
             <div class="communityItem_address">{{ item.addr }}</div>
           </div>
           <div class="communityItem_right">
-            <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communityMore.png">
+            <image
-            </image>
+              src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communityMore.png"
+            ></image>
           </div>
         </div>
       </div>
 
       <div class="empty" v-if="communityList.length == 0">
-        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
+        <image
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
+        ></image>
         <span>未找到相关信息的小区</span>
       </div>
     </div>
@@ -57,20 +72,28 @@
     <div class="communityBox" v-if="step == 2">
       <div class="search">
         <input v-model="searchQuery" type="text" placeholder="请输入楼栋名称" />
-        <image @click="searchName"
+        <image
-          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png">
+          @click="searchName"
-        </image>
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
+        ></image>
       </div>
 
       <div class="floorList">
-        <div @click="nextStep(item, index)" :class="{ active: index === selectedFloorIndex }" class="floorItem"
+        <div
-          v-for="(item, index) in filteredFloorsList" :key="index">
+          @click="nextStep(item, index)"
+          :class="{ active: index === selectedFloorIndex }"
+          class="floorItem"
+          v-for="(item, index) in filteredFloorsList"
+          :key="index"
+        >
           {{ item.label }}
         </div>
       </div>
 
       <div class="empty" v-if="filteredFloorsList.length === 0">
-        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
+        <image
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
+        ></image>
         <span>未找到相关信息的楼栋</span>
       </div>
     </div>
@@ -78,21 +101,29 @@
     <div class="communityBox" v-if="step == 3">
       <div class="search">
         <input v-model="searchQuery" type="text" placeholder="请输入楼层名称" />
-        <image @click="searchName"
+        <image
-          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png">
+          @click="searchName"
-        </image>
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
+        ></image>
       </div>
 
       <div class="roomList">
         <!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> -->
-        <div @click="nextStep(item, index, 'room')" :class="{ active2: index === selectedRoomIndex }" class="roomItem"
+        <div
-          v-for="(item, index) in filteredFloorsList" :key="index">
+          @click="nextStep(item, index, 'room')"
+          :class="{ active2: index === selectedRoomIndex }"
+          class="roomItem"
+          v-for="(item, index) in filteredFloorsList"
+          :key="index"
+        >
           {{ item.label }}
         </div>
       </div>
 
       <div class="empty" v-if="filteredFloorsList.length === 0">
-        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
+        <image
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
+        ></image>
         <span>未找到相关信息的楼层</span>
       </div>
     </div>
@@ -100,21 +131,29 @@
     <div class="communityBox" v-if="step == 4">
       <div class="search">
         <input v-model="searchQuery" type="text" placeholder="请输入房间名称" />
-        <image @click="searchName"
+        <image
-          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png">
+          @click="searchName"
-        </image>
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
+        ></image>
       </div>
 
       <div class="roomList">
         <!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> -->
-        <div @click="nextStep(item, index, 'room')" :class="{ active2: index === selectedRoomIndex }" class="roomItem"
+        <div
-          v-for="(item, index) in filteredFloorsList" :key="index">
+          @click="nextStep(item, index, 'room')"
+          :class="{ active2: index === selectedRoomIndex }"
+          class="roomItem"
+          v-for="(item, index) in filteredFloorsList"
+          :key="index"
+        >
           {{ item.label }}
         </div>
       </div>
 
       <div class="empty" v-if="filteredFloorsList.length === 0">
-        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
+        <image
+          src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
+        ></image>
         <span>未找到相关信息的房间</span>
       </div>
     </div>
@@ -230,15 +269,15 @@ export default {
           : "",
       }).then((res) => {
         // 对楼层数据进行从大到小排序
-        if (this.step != 4) {
+          if(this.step != 4) {
-          res.rows.sort((a, b) => {
+            res.rows.sort((a, b) => {
-            // 提取楼层数字
+              // 提取楼层数字
-            const floorA = parseInt(a.label.replace(/[^\d]/g, ''));
+              const floorA = parseInt(a.label.replace(/[^\d]/g, ''));
-            const floorB = parseInt(b.label.replace(/[^\d]/g, ''));
+              const floorB = parseInt(b.label.replace(/[^\d]/g, ''));
-            return floorA - floorB;
+              return floorA - floorB;
-          });
+            });
-        }
+          }
-        this.filteredFloorsList = this.step == 4 ? this.filteredFloorsList : res.rows;
+          this.filteredFloorsList = this.step == 4 ? this.filteredFloorsList : res.rows;
         this.searchList = res.rows;
         this.searchQuery = "";
         if (this.step == "1") {
@@ -250,7 +289,7 @@ export default {
           // this.floorsList = res.rows
         } else if (this.step == "3") {
           console.log(item.label);
-          this.fName = item.label.includes("层") ? item.label : item.label + "层";
+          this.fName = item.label;
           // this.roomList = res.rows
           this.step = "4";
         } else {
@@ -314,7 +353,7 @@ export default {
     this.searchByName();
   },
 
-  onReachBottom() { },
+  onReachBottom() {},
 };
 </script>
 

packages/community/index/index.vue

@@ -203,7 +203,6 @@ export default {
       console.log("🚀 ~ onLoad ~ res.rows:", res.rows)
       if (!uni.getStorageSync("changeCommData")) {
         uni.setStorageSync("changeCommData", { name: res.rows[0].name, id: res.rows[0].community_id })
-        uni.setStorageSync("isShowNav", res.rows[0].room_owner_list[0].type)
       }
       this.communityList = res.rows;
     });

packages/community/myCommunity/index.vue

@@ -79,7 +79,6 @@ export default {
 			this.currentCommunity = e
 			uni.setStorageSync('changeCommData', { id: e.community_id, name: e.name });
 			uni.setStorageSync('currentCommunityAddr',e.addr);
-			uni.setStorageSync("isShowNav", e.room_owner_list[0].type)
 			NavgateTo("1")
 		},
 	},

pages/index/index.vue

@@ -1001,8 +1001,6 @@ export default {
     this.localHeight = meun.height;
     this.showSearch()
     this.getSearchVal()
-    this.showNav = uni.getStorageSync("isShowNav") == 1
-
   },
 
   onShow() {