描述:会议预约时间10分钟间隔,选择增值服务必须提前2天

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

@@ -29,9 +29,9 @@ Page({
         showTime: false,
         dataList: [],
         filterTime(type, options) {
-            // if (type === 'minute') {
+            if (type === 'minute') {
-            //     return options.filter((option) => option == '00');
+                return options.filter((option) => (parseInt(option) % 10) == 0);
-            // }
+            }
             return options;
         },
     },
@@ -67,16 +67,16 @@ Page({
         let endTime = _this.data.endTime;
         let paramUrl = "?meetingRoomId=" + meetingRoomId + "&startTime=" + selfFormatTimeYMDHMS(startTime) + "&endTime=" + selfFormatTimeYMDHMS(endTime);
 
-        // // 预约时间不能小于1小时
+        // 预约时间不能小于10分钟
-        // if ((1000 * 60 * 60) > (endTime - startTime)) {
+        if ((1000 * 60 * 10) > (endTime - startTime)) {
-        //     Notify({
+            Notify({
-        //         type: 'danger',
+                type: 'danger',
-        //         message: '预约时间不能小于1小时',
+                message: '预约时间不能小于10分钟',
-        //         duration: 1000,
+                duration: 1000,
-        //         selector: '#notify',
+                selector: '#notify',
-        //     });
+            });
-        //     return
+            return
-        // }
+        }
 
         // 当前会议室是否可以预约
         selectFreeMeetingRoomRq({
@@ -125,8 +125,8 @@ Page({
 
     // 设置最小时间
     setMinTime() {
-        // let minTime = new Date(selfFormatTimeYMDH(new Date()) + ':00:00').getTime()
+        let minTime = new Date(selfFormatTimeYMDHMS(new Date()).substring(0,15) + '0:00').getTime()
-        let minTime = new Date().getTime()
+        // let minTime = new Date().getTime()
         this.setData({
             minTime,
             startTime: minTime

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

@@ -91,9 +91,10 @@ Page({
     // 跳转-空间设施
     jumpMeetingFacilities() {
         let meetingRoomId = this.data.meetingRoomId;
+        let startTime = this.data.startTime;
         let serviceListJsonStr = JSON.stringify(this.data.serviceList)
         wx.navigateTo({
-            url: `/pages/meeting/meetingRoom/meetingService/meetingService?meetingRoomId=${meetingRoomId}&serviceList=${serviceListJsonStr}`
+            url: `/pages/meeting/meetingRoom/meetingService/meetingService?meetingRoomId=${meetingRoomId}&serviceList=${serviceListJsonStr}&startTime=${startTime}`
         })
     },
 

miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js

@@ -8,6 +8,10 @@ import {
 } from "../../../../api/meeting/meetingRoom.js"
 
 
+import {
+    selfFormatTimeYMD,
+} from "../../../../utils/util.js"
+
 Page({
 
     /**
@@ -122,17 +126,21 @@ Page({
     submit() {
         let _this = this;
         let serviceList = _this.data.serviceList
-        // for (let i = 0; i < serviceList.length; i++) {
+        let startTime = _this.data.startTime
-        //     if (serviceList[i].isSelect && serviceList[i].num == '') {
+        // 如果选择增值服务需要提前2天
-        //         // 错误提示
+        if (serviceList.find(item => item.type == 'increment' && item.isSelect)) {
-        //         Notify({
+            let startTimeMS = new Date(selfFormatTimeYMD(startTime) + ' 00:00:00').getTime()
-        //             type: 'danger',
+            let nowTimeMS = new Date(selfFormatTimeYMD(new Date()) + ' 00:00:00').getTime()
-        //             message: `"${serviceList[i].serveName}"请输入人数!`
+            nowTimeMS = nowTimeMS + (1000 * 60 * 60 * 24 * 2)
-        //         });
+            if (startTimeMS < nowTimeMS) {
-        //         return;
+                // 错误提示
-        //     }
+                Notify({
-        // }
+                    type: 'danger',
-        //
+                    message: `A类会议服务需提前两天预约`
+                });
+                return
+            }
+        }
         let pages = getCurrentPages(); //获取page
         let prevPage = pages[pages.length - 2]; //上一个页面（父页面）
         prevPage.setData({

miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml

@@ -2,7 +2,7 @@
 
     <!-- 免费服务 -->
     <view class="serviceView">
-        <view class="leftLineTitle">免费服务</view>
+        <view class="leftLineTitle">基础会议服务</view>
         <view class="serviceItemView">
             <view class="serviceItem" wx:if="{{item.type == 'free'}}"  wx:for="{{serviceList}}" wx:key="*this">
                 <van-checkbox value="{{ item.isSelect }}" data-id="{{item.serveId}}" shape="square" bind:tap="checkBoxClick"></van-checkbox>
@@ -14,7 +14,7 @@
 
     <!-- 增值服务 -->
     <view class="serviceView">
-        <view class="leftLineTitle">增值服务</view>
+        <view class="leftLineTitle">A类会议服务(需提前两天预约)</view>
         <view class="serviceItemView">
             <view class="serviceItem" wx:if="{{item.type == 'increment'}}" wx:for="{{serviceList}}" wx:key="*this">
                 <van-checkbox value="{{ item.isSelect }}" data-id="{{item.serveId}}" shape="square" bind:tap="checkBoxClick"></van-checkbox>