解决app冲突

components/selectArea/selectArea.axml

+<view>
+  New Component
+</view>
\ No newline at end of file

components/selectArea/selectArea.js

+Component({
+  mixins: [],
+  data: {},
+  props: {},
+  didMount() {},
+  didUpdate() {},
+  didUnmount() {},
+  methods: {},
+});

components/selectArea/selectArea.json

+{
+  "component": true
+}
\ No newline at end of file

pages/meetingRoomList/meetingRoomList.acss

@@ -264,4 +264,12 @@
     border-radius: 50%;
     background: #3296FA;
     box-sizing: border-box;
+}
+/* 区域选择样式 */
+.lableTreeBox{
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
 }
\ No newline at end of file

pages/meetingRoomList/meetingRoomList.axml

@@ -10,7 +10,7 @@
         </view>
       </view>
       <view class="searchLocation">
-        <view>
+        <view onTap="changeLocation">
           {{search.location}}            
         </view>
         <view class="xialakuangSize">
@@ -124,4 +124,20 @@
         </view>
       </scroll-view>
     </view>
+  </view>
+  <view class="lableTreeBox" a:if="{{isShowLableModal}}">
+    <view class="lableTreeContent">
+      <view class="lableTreeHeader">
+        <view>
+          取消
+        </view>
+        <view>
+          确定
+        </view>
+      </view>
+      <view class="lableTreeModal">
+        <lable-tree>
+        </lable-tree>
+      </view>
+    </view>
   </view>
\ No newline at end of file

pages/meetingRoomList/meetingRoomList.js

@@ -13,10 +13,12 @@ create.Page({
     search: {
       category: '',
       location: '全部区域',
+      locationId: '',
       searchValue: '',
       checkList: []
     },
     isShowModal: false,
+    isShowLableModal: false,
     modalList: [],
     meetingTime: {
       startTime: '',
@@ -27,7 +29,8 @@ create.Page({
     }
   },
   onLoad(query) {
-    let date = new Date(this.store.data.startTime.replace(/\//g, "-"))
+    let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
+    // let date = new Date()
     let year = date.getFullYear()
     let month = `${date.getMonth() + 1}`
     let day = `${date.getDate()}`
@@ -277,7 +280,6 @@ create.Page({
           if (data.reserveStartTime, this.data.meetingTime.startTime) {
             this.setData({
               'meetingTime.startTime': data.reserveStartTime,
-              'meetingTime.endTime': this.data.meetingTime.startTime,
             },() => {
               that.refreshModalList()
             })
@@ -288,7 +290,6 @@ create.Page({
             if (res) {
               that.setData({
                 'meetingTime.startTime': data.reserveStartTime,
-                'meetingTime.endTime': this.data.meetingTime.startTime,
               },() => {
                 that.refreshModalList()
               })
@@ -489,6 +490,16 @@ create.Page({
       })
     }
   },
+  changeLocation(){
+    let that = this
+    let data = {
+      scene: 'meeting_room_location'
+    }
+    // 获取会议室设施的List
+    getLabelTree(data).then(res => {
+      console.log(res)
+    })
+  },
   onReady() {
     // 页面加载完成
   },

pages/meetingRoomList/meetingRoomList.json

 {
     "usingComponents": {
-        "timecheckmodal": "../../components/timeCheckModal/timeCheckModal"
+        "timecheckmodal": "../../components/timeCheckModal/timeCheckModal",
+        "lable-tree": "../../components/selectArea/selectArea"
     }
 }
\ No newline at end of file