From 22ecf2636ffa0540633ca474bd434c22b4de1f20 Mon Sep 17 00:00:00 2001
From: unknown <unknown@example.com>
Date: Tue, 8 Oct 2024 16:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复管理员选择上午后不能选择其他时段的BUG
2. 放开管理员预约记录，点击首页预约记录查看所
---
 miniprogram/pages/meeting/index/index.js                 | 2 +-
 .../meeting/meetingRoom/meetingBooked/meetingBooked.js   | 8 +++++++-
 .../meeting/meetingRoom/meetingOrder/meetingOrder.js     | 6 +++++-
 miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml   | 2 +-
 .../pages/meeting/pay/waitComplete/waitComplete.js       | 2 +-
 .../pages/meeting/reservationRecord/approve/approve.js   | 9 +++++++++
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/miniprogram/pages/meeting/index/index.js b/miniprogram/pages/meeting/index/index.js
index bfb707b..c8b14a8 100644
--- a/miniprogram/pages/meeting/index/index.js
+++ b/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
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
index c6dbd04..3f8394f 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
+++ b/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,
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
index 08a180b..1fad010 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
+++ b/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,
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
index 3ae7eae..45ef6cb 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
+++ b/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>
 
diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js
index f3a1478..4312bc2 100644
--- a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js
+++ b/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({
diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
index 0e37185..15dc280 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js
+++ b/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'),