diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss index fed57b1..709acc6 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss +++ b/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; diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js index 174f357..67636bc 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js @@ -29,9 +29,9 @@ Page({ showTime: false, dataList: [], filterTime(type, options) { - if (type === 'minute') { - return options.filter((option) => option == '00'); - } + // if (type === 'minute') { + // 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小时 - if ((1000 * 60 * 60) > (endTime - startTime)) { - Notify({ - type: 'danger', - message: '预约时间不能小于1小时', - duration: 1000, - selector: '#notify', - }); - return - } + // // 预约时间不能小于1小时 + // if ((1000 * 60 * 60) > (endTime - startTime)) { + // Notify({ + // type: 'danger', + // message: '预约时间不能小于1小时', + // duration: 1000, + // selector: '#notify', + // }); + // 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 diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml index 154ad54..d0e371f 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml @@ -29,12 +29,12 @@ - + 空间设施 - - - {{serviceItem.serveName}} + + + {{serviceItem.name}} diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js index 57e4e8d..3e8caac 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js +++ b/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++) { - if (serviceList[i].isSelect && serviceList[i].num == '') { - // 错误提示 - Notify({ - type: 'danger', - message: `"${serviceList[i].serveName}"请输入人数!` - }); - return; - } - } + // for (let i = 0; i < serviceList.length; i++) { + // if (serviceList[i].isSelect && serviceList[i].num == '') { + // // 错误提示 + // Notify({ + // type: 'danger', + // message: `"${serviceList[i].serveName}"请输入人数!` + // }); + // return; + // } + // } // let pages = getCurrentPages(); //获取page let prevPage = pages[pages.length - 2]; //上一个页面（父页面） diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml index 5009c46..08861bf 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml @@ -7,7 +7,7 @@ {{item.serveName}} - + diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js index 889c063..ccd1c03 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js +++ b/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() diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml index fe70d0c..3589cc0 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml @@ -39,25 +39,36 @@ {{detail.phone}} - 订单状态 + 预约状态 {{detail.statusName}} + + 空间设施 + + + + + + {{serviceItem.name}} + + + + 取消原因 {{detail.cancelResaon}} - - 创建时间 - {{detail.createTime}} - 会议服务 {{item.serveName}} - {{item.num}} + - + + 创建时间 + {{detail.createTime}} + diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss index ca90d8c..1e0b8f8 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss +++ b/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; } \ No newline at end of file diff --git a/miniprogram/pages/my/my.js b/miniprogram/pages/my/my.js index 504da22..6728d81 100644 --- a/miniprogram/pages/my/my.js +++ b/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; diff --git a/miniprogram/pages/my/my.wxml b/miniprogram/pages/my/my.wxml index e9f4788..7469730 100644 --- a/miniprogram/pages/my/my.wxml +++ b/miniprogram/pages/my/my.wxml @@ -11,6 +11,27 @@ + + + 性别 + + {{userDetail.gender == 0 ? '男' : '女'}} + + + + 园区 + + {{parkName}} + + + + 企业 + + {{customerName? customerName : ''}} + + + +