描述: 上海会议预约修改

miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss

@@ -37,6 +37,7 @@
 
 .meetingRoomView .meetingRoomItem .content .articleView {
     display: flex;
+    flex-wrap: wrap;
     justify-content: start;
     align-items: center;
     margin-top: 18rpx;

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) => option == '00');
-            }
+            // }
             return options;
         },
     },
@@ -67,16 +67,16 @@ Page({
         let endTime = _this.data.endTime;
         let paramUrl = "?meetingRoomId=" + meetingRoomId + "&startTime=" + selfFormatTimeYMDHMS(startTime) + "&endTime=" + selfFormatTimeYMDHMS(endTime);
 
-        // 预约时间不能小于1小时
+        // // 预约时间不能小于1小时
-        if ((1000 * 60 * 60) > (endTime - startTime)) {
+        // if ((1000 * 60 * 60) > (endTime - startTime)) {
-            Notify({
+        //     Notify({
-                type: 'danger',
+        //         type: 'danger',
-                message: '预约时间不能小于1小时',
+        //         message: '预约时间不能小于1小时',
-                duration: 1000,
+        //         duration: 1000,
-                selector: '#notify',
+        //         selector: '#notify',
-            });
+        //     });
-            return
+        //     return
-        }
+        // }
 
         // 当前会议室是否可以预约
         selectFreeMeetingRoomRq({
@@ -125,7 +125,8 @@ Page({
 
     // 设置最小时间
     setMinTime() {
-        let minTime = new Date(selfFormatTimeYMDH(new Date()) + ':00:00').getTime()
+        // let minTime = new Date(selfFormatTimeYMDH(new Date()) + ':00:00').getTime()
+        let minTime = new Date().getTime()
         this.setData({
             minTime,
             startTime: minTime

miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml

@@ -29,12 +29,12 @@
     </view>
 
     <!-- 设施 -->
-    <view class="facilitiesView" bind:tap="jumpMeetingFacilities">
+    <view class="facilitiesView">
         <view class="leftLineTitle">空间设施</view>
         <view class="itemView">
-            <view class="singleItem" wx:for="{{detail.roomServeList}}" wx:for-item="serviceItem" wx:key="*this">
+            <view class="singleItem" wx:for="{{detail.roomItemList}}" wx:for-item="serviceItem" wx:key="*this">
-                <image class="img" src="{{IMG_NAME + serviceItem.pic}}" mode="aspectFill"></image>
+                <image class="img" src="{{IMG_NAME + serviceItem.picUrl}}" mode="aspectFill"></image>
-                <view class="name">{{serviceItem.serveName}}</view>
+                <view class="name">{{serviceItem.name}}</view>
             </view>
         </view>
     </view>

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

@@ -111,16 +111,16 @@ Page({
     submit() {
         let _this = this;
         let serviceList = _this.data.serviceList
-        for (let i = 0; i < serviceList.length; i++) {
+        // for (let i = 0; i < serviceList.length; i++) {
-            if (serviceList[i].isSelect && serviceList[i].num == '') {
+        //     if (serviceList[i].isSelect && serviceList[i].num == '') {
-                // 错误提示
+        //         // 错误提示
-                Notify({
+        //         Notify({
-                    type: 'danger',
+        //             type: 'danger',
-                    message: `"${serviceList[i].serveName}"请输入人数!`
+        //             message: `"${serviceList[i].serveName}"请输入人数!`
-                });
+        //         });
-                return;
+        //         return;
-            }
+        //     }
-        }
+        // }
         //
         let pages = getCurrentPages(); //获取page
         let prevPage = pages[pages.length - 2]; //上一个页面（父页面）

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

@@ -7,7 +7,7 @@
             <view class="serviceItem" wx:for="{{serviceList}}" wx:key="*this">
                 <van-checkbox value="{{ item.isSelect }}" data-id="{{item.serveId}}" shape="square" bind:tap="checkBoxClick"></van-checkbox>
                 <view class="name" data-id="{{item.serveId}}" bind:tap="checkBoxClick">{{item.serveName}}</view>
-                <van-field style="width: 220rpx;" data-id="{{item.serveId}}" value="{{ item.num }}" type="number" clearable placeholder="请输入人数" border="{{ false }}" bind:change="inputChange" />
+                <van-field style="width: 10rpx; visibility: hidden;" data-id="{{item.serveId}}" value="{{ item.num }}" type="number" clearable placeholder="请输入人数" border="{{ false }}" bind:change="inputChange" />
             </view>
         </view>
     </view>

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js

@@ -12,7 +12,8 @@ import {
 import {
     selectReservationByIdRq,
     cancelOrderRq,
-    inviteRecordPersonListRq
+    inviteRecordPersonListRq,
+    getMeetingRoomServiceAndEquipmentRq,
 } from "../../../../../api/meeting/meetingRoom.js"
 
 Page({
@@ -24,6 +25,7 @@ Page({
         IMG_NAME: app.IMG_NAME,
         id: null,
         detail: null,
+        facilities: {},
         joinPersonList: []
     },
 
@@ -113,6 +115,13 @@ Page({
             _this.setData({
                 detail
             })
+
+            // 查询服务
+            getMeetingRoomServiceAndEquipmentRq(_this.data.detail.roomContent.id).then(res => {
+                _this.setData({
+                    facilities: res.data
+                })
+            })
         })
         // 查询参与会议预约人员列表
         _this.getInviteRecordPersonList()

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml

@@ -39,25 +39,36 @@
             <view class="content">{{detail.phone}}</view>
         </view>
         <view class="cellView">
-            <view class="label">订单状态</view>
+            <view class="label">预约状态</view>
             <view class="content status" style="color: {{detail.statusColor}};">{{detail.statusName}}</view>
         </view>
+        <view class="serviceItemView">
+            <view class="label">空间设施</view>
+            <!-- 设施 -->
+            <view class="facilitiesView">
+                <view class="itemView">
+                    <view class="singleItem" wx:for="{{facilities.roomItem}}" wx:for-item="serviceItem" wx:key="*this">
+                        <image class="img" src="{{IMG_NAME + serviceItem.picUrl}}" mode="aspectFill"></image>
+                        <view class="name">{{serviceItem.name}}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
         <view class="cellView" wx:if="{{detail.statusValue == 4}}">
             <view class="label">取消原因</view>
             <view class="content status" style="color: {{detail.statusColor}};">{{detail.cancelResaon}}</view>
         </view>
-        <view class="cellView">
-            <view class="label">创建时间</view>
-            <view class="content">{{detail.createTime}}</view>
-        </view>
         <view class="serviceItemView">
             <view class="label">会议服务</view>
             <view class="serviceItem" wx:for="{{detail.reservationServes}}" wx:key="*this">
                 <view class="name">{{item.serveName}}</view>
-                <view class="name">{{item.num}}</view>
+                <!-- <view class="name">{{item.num}}</view> -->
             </view>
         </view>
-
+        <view class="cellView">
+            <view class="label">创建时间</view>
+            <view class="content">{{detail.createTime}}</view>
+        </view>
     </view>
 
     <!-- 参与人员 -->

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss

@@ -122,9 +122,26 @@
 }
 
 .serviceItemView .serviceItem .name {
+    position: relative;
     font-size: 26rpx;
+    padding-left: 30rpx;
 }
 
+.serviceItemView .serviceItem .name::after {
+    display: block;
+    content: '';
+    width: 10rpx;
+    height: 10rpx;
+    border-radius: 30rpx;
+    background: #000000;
+
+    position: absolute;
+    left: 0;
+    top: 0;
+
+    top: 50%;
+    transform: translateY(-50%);
+}
 
 .joinView {
     display: flex;
@@ -199,4 +216,40 @@
     left: 0;
     top: 0;
     opacity: 0;
+}
+
+
+.facilitiesView {
+}
+
+.facilitiesView .itemView {
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.facilitiesView .itemView .singleItem {
+    box-sizing: border-box;
+    width: 25%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-top: 30rpx;
+}
+
+.facilitiesView .itemView .singleItem .img {
+    width: 60rpx;
+    height: 60rpx;
+}
+
+.facilitiesView .itemView .singleItem .name {
+    margin-top: 16rpx;
+    width: 150rpx;
+    text-align: center;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+    white-space: nowrap;
 }

miniprogram/pages/my/my.js

@@ -3,7 +3,8 @@ let app = getApp()
 import Notify from '@vant/weapp/notify/notify';
 
 import {
-    userProfile
+    userProfile,
+    getUserInfoRq
 } from "../../api/user/user.js"
 
 import {
@@ -22,6 +23,8 @@ Page({
     data: {
         DOMAIN_NAME: app.IMG_NAME,
         userDetail: {},
+        parkName: app.parkName,
+        customerName: '',
         // tabBar param
         tabBarParam: {
             selected: 2,
@@ -115,6 +118,14 @@ Page({
                     userDetail: res.data
                 })
             })
+            getUserInfoRq(userId).then(res => {
+                console.log('getUserInfoRq', res);
+                let userDetail = res.data;
+                _this.setData({
+                    customerName: userDetail.customerName,
+                    // parkName: wx.getStorageSync('parkName')
+                })
+            })
         } else {
             app.getlogin()
         }
@@ -143,6 +154,13 @@ Page({
         }
     },
 
+    // 跳转-我的
+    jumpMy(){
+        wx.navigateTo({
+            url: '/pages/my/personalData/personalData',
+        })
+    },
+
     // 扫一扫
     jumpScan() {
         let _this = this;

miniprogram/pages/my/my.wxml

@@ -11,6 +11,27 @@
     </view>
 
     <!-- 菜单 -->
+    <view class="itemView">
+        <view class="itemData" bindtap='jumpMy'>
+            <view class="label">性别</view>
+            <view class="propOpen"></view>
+            <view class="content">{{userDetail.gender == 0 ? '男' : '女'}}</view>
+            <van-icon name="arrow" size="40rpx" color="gray" />
+        </view>
+        <view class="itemData" bindtap='jumpMy'>
+            <view class="label">园区</view>
+            <view class="propOpen"></view>
+            <view class="content">{{parkName}}</view>
+            <van-icon name="arrow" size="40rpx" color="gray" />
+        </view>
+        <view class="itemData" bindtap='jumpMy'>
+            <view class="label">企业</view>
+            <view class="propOpen"></view>
+            <view class="content">{{customerName? customerName : ''}}</view>
+            <van-icon name="arrow" size="40rpx" color="gray" />
+        </view>
+    </view>
+
     <view class="itemView">
         <!-- 扫一扫 -->
         <!-- <view class="itemData" bindtap='jumpScan'>

miniprogram/pages/my/my.wxss

@@ -37,4 +37,9 @@
 
 .itemView .propOpen {
     flex: 1;
+}
+
+.itemView .content {
+    color: #888888;
+    font-size: 30rpx;
 }