修复

1. 修复管理员选择上午后不能选择其他时段的BUG
2. 放开管理员预约记录，点击首页预约记录查看所

miniprogram/pages/meeting/index/index.js

@@ -169,7 +169,7 @@ Page({
           item.visible = true
         }
         if (item.type == 'record') {
-          item.path = '/pages/meeting/reservationRecord/approve/approve'
+          item.path = '/pages/meeting/reservationRecord/approve/approve?act=show'
           item.visible = true
         }
         return item

miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js

@@ -93,10 +93,16 @@ Page({
     } else if (valueArr[0] == '17') {
       _minMintue = 0
       _maxMintue = 30
+      if (this.data.userDetail.roomRole == 5) {
+        // 管理员全天可选
+        _minMintue = 0
+        _maxMintue = 59
+      }
     } else {
       _minMintue = 0
       _maxMintue = 59
     }
+
     this.setData({
       minMinute: _minMintue,
       maxMinute: _maxMintue,
@@ -170,7 +176,7 @@ Page({
       // 提前占用
       console.log('占用！')
       // 获取当下
-      let nowTime = selfFormatTimeYMD(_this.data.date)
+      let nowTime = selfFormatTimeYMD(parseInt(date))
       let data = {
         "mr": {
           "roomId": meetingRoomId,

miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js

@@ -303,6 +303,10 @@ Page({
         })
       }
     }
+    let timeFormat = _this.data.timeRange
+    if (timeFormat == 4) {
+      timeFormat = 0
+    }
     let data = {
       "mr": {
         "id": _this.data.rId,
@@ -310,7 +314,7 @@ Page({
         "start": _this.data.startTime,
         "end": _this.data.endTime,
         "mrdate": _this.data.selectDay,
-        "timeFormat": _this.data.timeRange,
+        "timeFormat": timeFormat,
         "title": _this.data.detail.title,
         "personNum": _this.data.detail.personNum,
         "leader": _this.data.detail.leader,

miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml

@@ -28,7 +28,7 @@
   <view class="resView">
     <view class="leftLineTitle">预约情况</view>
     <van-cell-group>
-      <van-cell bind:click="goResInfo" data-id="{{item.id}}" wx:for="{{recordList}}" title="{{item.date}}" value="{{item.time}}" title-width="70%" label="{{item.userOrg}} | {{item.bookingUserName}} | {{item.bookingUserPhone}}" />
+      <van-cell bind:click="goResInfo" data-id="{{item.id}}" wx:for="{{recordList}}" title="{{item.date}}" value="{{item.time}}" title-width="70%" label="{{ item.userOrg ? item.userOrg + ' | ' + item.bookingUserName + ' | ' + item.bookingUserPhone : '占用' }}" />
     </van-cell-group>
   </view>
 

miniprogram/pages/meeting/pay/waitComplete/waitComplete.js

@@ -25,7 +25,7 @@ Page({
     if (this.data.userDetail.roomRole == 5) {
       // 管理员，跳到审核列表
       wx.reLaunch({
-        url: "/pages/meeting/reservationRecord/approve/approve",
+        url: "/pages/meeting/reservationRecord/approve/approve?act=show",
       })
     } else {
       wx.reLaunch({

miniprogram/pages/meeting/reservationRecord/approve/approve.js

@@ -145,6 +145,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    let act = options.act
+    if (act == 'show') {
+      wx.setNavigationBarTitle({
+        title: '预约记录',
+      })
+      this.setData({
+        'search.status.value': ''
+      })
+    }
     let _this = this;
     _this.setData({
       userData: wx.getStorageSync('user'),