boyue2025/dbd-meeting-wx-small
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting-wx-small.git synced 2025-06-22 04:19:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

对接部分接口

Browse Source
This commit is contained in:
471615499@qq.com 2024-09-24 23:04:06 +08:00
parent 5dc16e9566
commit ee09115377
9 changed files with 240 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
miniprogram/api/meeting/meetingRoom.js
View File

@ -2,29 +2,32 @@ import {
request request
} from '../selfRequest'; } from '../selfRequest';
// 查询条件筛选 // 查询条件筛选，废弃
// 1.会议室类型，2.人数，3.会议室设备，4.形式 // 1.会议室类型，2.人数，3.会议室设备，4.形式
export function meetingRoomDict(param) { export function meetingRoomDict(param) {
return request({ return request({
url: '/api/roomContent/searchInfo/' + param, // url: '/api/roomContent/searchInfo/' + param,
method: "get", url: '/app/mr/getConstData',
method: "post",
}); });
} }
// 会议室列表 // 会议室列表
export function meetingRoomListRq(data) { export function meetingRoomListRq(data) {
return request({ return request({
url: '/api/roomContent/list', // url: '/api/roomContent/list',
url: '/app/mr/getAllRoom',
method: "post", method: "post",
data data
}); });
} }
// 会议室详情信息 // 会议室详情信息
export function meetingRoomDetailRq(id) { export function meetingRoomDetailRq(data) {
return request({ return request({
url: '/api/roomContent/info/' + id, url: '/app/mr/roomMrs',
method: "get", method: "post",
data
}); });
} }
@ -172,10 +175,11 @@ export function queryServiceMsgRq(data) {
} }
// 长阳-提交会议预约 // 提交会议预约
export function saveChangyangMeetingRecordRq(data) { export function saveChangyangMeetingRecordRq(data) {
return request({ return request({
url: '/api/roomContent/saveChangyangMeetingRecord', // url: '/api/roomContent/saveChangyangMeetingRecord',
url: '/app/mr/booking',
method: "post", method: "post",
data data
}); });

6
miniprogram/pages/meeting/index/index.js
View File

@ -58,6 +58,7 @@ Page({
username: '', // 用户名 username: '', // 用户名
pwd: '', // 登录密码 pwd: '', // 登录密码
depName: '', // 登录单位 depName: '', // 登录单位
depId: '', // 登录单位id
beforeClose(action) { beforeClose(action) {
return new Promise(resolve => { return new Promise(resolve => {
if (action === 'confirm') { if (action === 'confirm') {
@ -98,7 +99,7 @@ Page({
// 跳转会议预约页面 // 跳转会议预约页面
goRes(e) { goRes(e) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/meeting/meetingReservation/meetingReservation?time=' + e.detail + '&dep=' + this.data.depName, url: '/pages/meeting/meetingReservation/meetingReservation?time=' + e.detail + '&dep=' + this.data.depName + '&depId=' + this.data.depId,
}) })
}, },
// 跳转菜单 // 跳转菜单
@ -215,7 +216,8 @@ Page({
username: '', username: '',
pwd: '', pwd: '',
showLogin: false, showLogin: false,
depName: res.data.orgName depName: res.data.orgName,
depId: res.data.orgId,
}) })
this.showTimePicker() this.showTimePicker()
} }

192
miniprogram/pages/meeting/meetingReservation/meetingReservation.js
View File

@ -18,11 +18,12 @@ Page({
rId: '', rId: '',
dep: '', dep: '',
date: '', date: '',
dateStr: '',
queryParam: { queryParam: {
timeRangeDict: { timeRangeDict: {
list: [{ list: [{
text: '全天', text: '全天',
value: null value: 4
}, { }, {
text: '上午', text: '上午',
value: 1 value: 1
@ -33,7 +34,7 @@ Page({
text: '晚上', text: '晚上',
value: 3 value: 3
}], }],
value: null, value: 4,
}, },
meetingTypeDict: { meetingTypeDict: {
list: [], list: [],
@ -95,17 +96,14 @@ Page({
} }
if (!options.dep) { if (!options.dep) {
options.dep = '' options.dep = ''
options.depId = ''
} }
const time = options.time const time = options.time
if (!time || time === '') { if (!time || time === '') {
app.selfShowMsg('请选择时间！', '/pages/meeting/index/index') app.selfShowMsg('请选择时间！', '/pages/meeting/index/index')
return return
} }
this.setData({
date: time,
rId: options.rId,
dep: options.dep
})
const _date = new Date(parseInt(time)) const _date = new Date(parseInt(time))
const _year = _date.getFullYear() const _year = _date.getFullYear()
const _month = _date.getMonth() + 1 // 月份从0开始，需要+1 const _month = _date.getMonth() + 1 // 月份从0开始，需要+1
@ -114,6 +112,13 @@ Page({
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: _year + '年' + _month + '月' + _day + '日' title: _year + '年' + _month + '月' + _day + '日'
}) })
this.setData({
date: time,
rId: options.rId,
dep: options.dep,
depId: options.depId,
dateStr: _year + '-' + _month + '-' + _day
})
// 初始化数据 // 初始化数据
this.initData(); this.initData();
}, },
@ -121,28 +126,76 @@ Page({
// 初始化数据 // 初始化数据
initData() { initData() {
let _this = this; let _this = this;
// 1.会议室类型，2.人数，3.会议室设备，4.形式 meetingRoomDict().then(res => {
meetingRoomDict("1").then(res => { console.log('meetingRoomDict', res)
console.log('meetingRoomDict("1")', res); let queryParam = _this.data.queryParam
let dataObj = res.data
// 封装参数 // 封装参数
let list = res.roomContents.map(item => { let floorList = []
return { for (let key in dataObj.floors) {
text: item.typeName, let eachObj = dataObj.floors[key]
value: item.typeValue const keys = Object.keys(eachObj)
} floorList.push({
text: keys[0],
value: keys[0]
}) })
list = [{ }
floorList = [{
text: "楼层", text: "楼层",
value: null value: null
}, ...list] }, ...floorList]
queryParam.meetingTypeDict.list = floorList
let deviceList = []
for (let key in dataObj.devices) {
let eachObj = dataObj.devices[key]
const keys = Object.keys(eachObj)
deviceList.push({
text: keys[0],
value: keys[0]
})
}
// 赋值参数 // 赋值参数
let queryParam = _this.data.queryParam; queryParam.itemDict.list = deviceList
queryParam.meetingTypeDict.list = list; let typeList = []
for (let key in dataObj.types) {
let eachObj = dataObj.types[key]
const keys = Object.keys(eachObj)
typeList.push({
text: keys[0],
value: keys[0]
})
}
typeList = [{
text: "形式",
value: null
}, ...typeList]
queryParam.shapeDict.list = typeList
_this.setData({ _this.setData({
queryParam queryParam
}) })
console.log('meetingRoomDict("1")=>', list);
}) })
// 1.会议室类型，2.人数，3.会议室设备，4.形式
// meetingRoomDict("1").then(res => {
// console.log('meetingRoomDict("1")', res);
// // 封装参数
// let list = res.roomContents.map(item => {
// return {
// text: item.typeName,
// value: item.typeValue
// }
// })
// list = [{
// text: "楼层",
// value: null
// }, ...list]
// // 赋值参数
// let queryParam = _this.data.queryParam;
// queryParam.meetingTypeDict.list = list;
// _this.setData({
// queryParam
// })
// console.log('meetingRoomDict("1")=>', list);
// })
// meetingRoomDict("2").then(res => { // meetingRoomDict("2").then(res => {
// console.log('meetingRoomDict("2")', res); // console.log('meetingRoomDict("2")', res);
// // 封装参数 // // 封装参数
@ -164,44 +217,44 @@ Page({
// }) // })
// console.log('meetingRoomDict("2")=>', list); // console.log('meetingRoomDict("2")=>', list);
// }) // })
meetingRoomDict("3").then(res => { // meetingRoomDict("3").then(res => {
console.log('meetingRoomDict("3")', res); // console.log('meetingRoomDict("3")', res);
// 封装参数 // // 封装参数
let list = res.roomItem.map(item => { // let list = res.roomItem.map(item => {
return { // return {
text: item.name, // text: item.name,
value: item.id // value: item.id
} // }
}) // })
// 赋值参数 // // 赋值参数
let queryParam = _this.data.queryParam; // let queryParam = _this.data.queryParam;
queryParam.itemDict.list = list; // queryParam.itemDict.list = list;
_this.setData({ // _this.setData({
queryParam // queryParam
}) // })
console.log('meetingRoomDict("3")=>', list); // console.log('meetingRoomDict("3")=>', list);
}) // })
meetingRoomDict("4").then(res => { // meetingRoomDict("4").then(res => {
console.log('meetingRoomDict("4")', res); // console.log('meetingRoomDict("4")', res);
// 封装参数 // // 封装参数
let list = res.roomContents.map(item => { // let list = res.roomContents.map(item => {
return { // return {
text: item.shape, // text: item.shape,
value: item.shape // value: item.shape
} // }
}) // })
list = [{ // list = [{
text: "形式", // text: "形式",
value: null // value: null
}, ...list] // }, ...list]
// 赋值参数 // // 赋值参数
let queryParam = _this.data.queryParam; // let queryParam = _this.data.queryParam;
queryParam.shapeDict.list = list; // queryParam.shapeDict.list = list;
_this.setData({ // _this.setData({
queryParam // queryParam
}) // })
console.log('meetingRoomDict("4")=>', list); // console.log('meetingRoomDict("4")=>', list);
}) // })
// 数据-会议室列表 // 数据-会议室列表
this.meetingRoomList() this.meetingRoomList()
}, },
@ -261,26 +314,27 @@ Page({
} }
}) })
let param = { let param = {
"type": queryParam.meetingTypeDict.value, floor: queryParam.meetingTypeDict.value, // 楼层
"capacityNum": queryParam.personDict.value, capacityNum: queryParam.personDict.value, // 人数
"roomItemList": roomItemList, device: '', // 设备
"shape": queryParam.shapeDict.value, typeName: queryParam.shapeDict.value, // 形状
timeRange: queryParam.timeRangeDict.value timeFormat: queryParam.timeRangeDict.value, // 预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。
mrdate: _this.data.dateStr
} }
// 会议室列表数据 // 会议室列表数据
meetingRoomListRq(param).then(res => { meetingRoomListRq(param).then(res => {
console.log('meetingRoomListRq', res); console.log('meetingRoomListRq', res);
let roomArr = {} let roomArr = {}
let valueObj = res.rows let valueObj = res.data
for (let key in valueObj) { for (let key in valueObj) {
let eachObj = valueObj[key] let eachObj = valueObj[key]
if (eachObj['type'] in roomArr) {} else { if (eachObj['floorId'] in roomArr) {} else {
roomArr[eachObj['type']] = { roomArr[eachObj['floorId']] = {
name: eachObj['typeName'], name: eachObj['floor'],
list: [] list: []
} }
} }
roomArr[eachObj['type']]['list'].push(eachObj) roomArr[eachObj['floorId']]['list'].push(eachObj)
} }
// console.log(roomArr) // console.log(roomArr)
_this.setData({ _this.setData({
@ -296,7 +350,7 @@ Page({
timeRange = timeRange ? timeRange : 0 timeRange = timeRange ? timeRange : 0
// 跳转预约详情 // 跳转预约详情
wx.navigateTo({ wx.navigateTo({
url: "/pages/meeting/meetingRoom/meetingRoom?id=" + e.currentTarget.dataset.id + '&time=' + this.data.date + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep, url: "/pages/meeting/meetingRoom/meetingRoom?id=" + e.currentTarget.dataset.id + '&time=' + this.data.date + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep + '&depId=' + this.data.depId
}) })
}, },

4
miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
View File

@ -27,9 +27,9 @@
<view class="roomType">{{item.name}}</view> <view class="roomType">{{item.name}}</view>
<view class="meetingRoomItem" bind:tap="jumpMeetingRoom" wx:for="{{item.list}}" wx:for-item="room" wx:key="*this" data-id="{{room.id}}"> <view class="meetingRoomItem" bind:tap="jumpMeetingRoom" wx:for="{{item.list}}" wx:for-item="room" wx:key="*this" data-id="{{room.id}}">
<view class="content"> <view class="content">
<view class="title">{{room.roomName}}</view> <view class="title">{{room.roomNum}}</view>
<view class="priceView"> <view class="priceView">
<view class="unit">{{room.capacityNum}}人 {{room.shape}}</view> <view class="unit">{{room.capacityNum}}人 {{room.typeName}}</view>
</view> </view>
</view> </view>
<!-- <view class="imgView"> <!-- <view class="imgView">

18
miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
View File

@ -23,6 +23,7 @@ Page({
date: '', date: '',
rId: '', rId: '',
dep: '', dep: '',
depId: '',
dateText: '', dateText: '',
timeRange: '', timeRange: '',
timeRangeText: '', timeRangeText: '',
@ -112,7 +113,7 @@ Page({
startTime = parseInt(date) + (parseInt(startTimeArr[0]) * 60 * 60 + parseInt(startTimeArr[1]) * 60) * 1000 startTime = parseInt(date) + (parseInt(startTimeArr[0]) * 60 * 60 + parseInt(startTimeArr[1]) * 60) * 1000
let endTimeArr = endTime.split(':') let endTimeArr = endTime.split(':')
endTime = parseInt(date) + (parseInt(endTimeArr[0]) * 60 * 60 + parseInt(endTimeArr[1]) * 60) * 1000 endTime = parseInt(date) + (parseInt(endTimeArr[0]) * 60 * 60 + parseInt(endTimeArr[1]) * 60) * 1000
let paramUrl = "?meetingRoomId=" + meetingRoomId + "&startTime=" + selfFormatTimeYMDHMS(startTime) + "&endTime=" + selfFormatTimeYMDHMS(endTime) + '&rId=' + _this.data.rId + '&dep=' + _this.data.dep; let paramUrl = "?meetingRoomId=" + meetingRoomId + "&startTime=" + selfFormatTimeYMDHMS(startTime) + "&endTime=" + selfFormatTimeYMDHMS(endTime) + '&rId=' + _this.data.rId + '&dep=' + _this.data.dep + '&depId=' + _this.data.depId;
// 结束时间不能小于开始时间 // 结束时间不能小于开始时间
if (startTime >= endTime) { if (startTime >= endTime) {
Notify('结束时间不能小于开始时间！') Notify('结束时间不能小于开始时间！')
@ -166,8 +167,8 @@ Page({
let _maxTime = '' let _maxTime = ''
let _startTime = '' let _startTime = ''
if (_timeRange === 1) { if (_timeRange === 1) {
// 上午，从6：00 - 12：00 // 上午，从8：00 - 12：00
_minTime = 6 _minTime = 8
_maxTime = 11 _maxTime = 11
_startTime = '9:00' _startTime = '9:00'
} else if (_timeRange === 2) { } else if (_timeRange === 2) {
@ -176,7 +177,7 @@ Page({
_maxTime = 17 _maxTime = 17
_startTime = '14:00' _startTime = '14:00'
} else if (_timeRange === 3) { } else if (_timeRange === 3) {
// 下午，从12：00 - 18：00 // 晚上，从18：00 - 24：00
_minTime = 18 _minTime = 18
_maxTime = 23 _maxTime = 23
_startTime = '18:00' _startTime = '18:00'
@ -213,13 +214,13 @@ Page({
let _timeRange = this.data.timeRange let _timeRange = this.data.timeRange
_timeRange = parseInt(_timeRange) _timeRange = parseInt(_timeRange)
if (_timeRange === 1) { if (_timeRange === 1) {
// 上午，从6：00 - 12：00 // 上午，从8：00 - 12：00
_endMaxTime = 11 _endMaxTime = 11
} else if (_timeRange === 2) { } else if (_timeRange === 2) {
// 下午，从12：00 - 18：00 // 下午，从12：00 - 18：00
_endMaxTime = 17 _endMaxTime = 17
} else if (_timeRange === 3) { } else if (_timeRange === 3) {
// 下午，从12：00 - 18：00 // 晚上，从18：00 - 24：00
_endMaxTime = 23 _endMaxTime = 23
} }
this.setData({ this.setData({
@ -238,7 +239,7 @@ Page({
let _timeRange = options.timeRange let _timeRange = options.timeRange
let _rangeOp = [] let _rangeOp = []
let _timeRangeText = '' let _timeRangeText = ''
if (_timeRange === '0') { if (_timeRange === '4') {
// 全天，此时默认给1，上午 // 全天，此时默认给1，上午
_timeRange = '1' _timeRange = '1'
} }
@ -249,7 +250,7 @@ Page({
} else if (_timeRange === '3') { } else if (_timeRange === '3') {
_timeRangeText = '晚上' _timeRangeText = '晚上'
} }
if (options.timeRange === '0') { if (options.timeRange === '4') {
// 全天，则三个都可选 // 全天，则三个都可选
_rangeOp = ['上午', '下午', '晚上'] _rangeOp = ['上午', '下午', '晚上']
} else { } else {
@ -265,6 +266,7 @@ Page({
date: time, date: time,
rId: options.rId, rId: options.rId,
dep: options.dep, dep: options.dep,
depId: options.depId,
dateText: _year + '年' + _month + '月' + _day + '日', dateText: _year + '年' + _month + '月' + _day + '日',
timeRange: _timeRange, timeRange: _timeRange,
timeRangeText: _timeRangeText, timeRangeText: _timeRangeText,

98
miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
View File

@ -9,7 +9,8 @@ import {
calculateMeetingRoomAmountRq, calculateMeetingRoomAmountRq,
saveMeetingRecordRq, saveMeetingRecordRq,
saveChangyangMeetingRecordRq, saveChangyangMeetingRecordRq,
selectReservationByIdRq selectReservationByIdRq,
meetingRoomDict
} from "../../../../api/meeting/meetingRoom.js" } from "../../../../api/meeting/meetingRoom.js"
import { import {
@ -28,6 +29,7 @@ Page({
data: { data: {
rId: '', rId: '',
dep: '', dep: '',
depId: '',
IMG_NAME: app.IMG_NAME, IMG_NAME: app.IMG_NAME,
detail: {}, detail: {},
meetingRoomId: null, meetingRoomId: null,
@ -86,7 +88,8 @@ Page({
title: '', title: '',
personNum: '', personNum: '',
leader: '', leader: '',
depName: dep, depName: _this.data.dep,
depId: _this.data.depId,
remark: '' remark: ''
} }
}) })
@ -139,8 +142,10 @@ Page({
serveId = serveId || [] serveId = serveId || []
// 获取会议室详情 // 获取会议室详情
let _this = this let _this = this
meetingRoomDetailRq(this.data.meetingRoomId).then(res => { meetingRoomDetailRq({
let detail = res.roomContent; roomId: this.data.meetingRoomId
}).then(res => {
let detail = res.room
let bannerList = [] let bannerList = []
if (detail.indoorPicUrl) { if (detail.indoorPicUrl) {
try { try {
@ -149,27 +154,55 @@ Page({
console.log(`JSON error : ${error}`); console.log(`JSON error : ${error}`);
} }
} }
_this.getService(serveId)
// 提前处理服务，不需要进入页面后获取 // 提前处理服务，不需要进入页面后获取
let serviceList = detail.roomServeList.map(item => { // let serviceList = detail.roomServeList.map(item => {
let isSel = false // let isSel = false
if (serveId.includes(item.id)) { // if (serveId.includes(item.id)) {
isSel = true // isSel = true
} // }
return { // return {
serveId: item.id, // serveId: item.id,
serveName: item.serveName, // serveName: item.serveName,
isSelect: isSel, // isSelect: isSel,
num: '', // num: '',
type: 'free' // type: 'free'
} // }
}) // })
console.log(detail)
_this.setData({ _this.setData({
serviceList: serviceList, // serviceList: serviceList,
room: detail, room: detail,
bannerList bannerList
}) })
}) })
}, },
getService() {
let _this = this;
meetingRoomDict().then(res => {
console.log('meetingRoomDict', res)
let queryParam = _this.data.queryParam
let dataObj = res.data
// 封装参数
let serviceList = []
for (let key in dataObj.services) {
let eachObj = dataObj.services[key]
const keys = Object.keys(eachObj)
serviceList.push({
serveId: eachObj[keys[0]],
serveName: keys[0],
isSelect: false,
num: '',
type: 'free'
})
}
console.log(serviceList)
// queryParam.shapeDict.list = typeList
_this.setData({
serviceList: serviceList
})
})
},
// input修改监听 // input修改监听
inputChange(e) { inputChange(e) {
@ -245,25 +278,32 @@ Page({
let eachObj = serviceList[key] let eachObj = serviceList[key]
console.log(eachObj) console.log(eachObj)
if (eachObj.isSelect === true) { if (eachObj.isSelect === true) {
service.push(eachObj) service.push({
name: eachObj['serveName'],
value: eachObj['serveId'],
remark: ''
})
} }
} }
// console.log(service) // console.log(service)
// return // return
saveChangyangMeetingRecordRq({ saveChangyangMeetingRecordRq({
"roomContentId": _this.data.meetingRoomId, mr: {
"userId": _this.data.userData.id, "roomId": _this.data.meetingRoomId,
"customerId": _this.data.userData.icsCustomerId, "start": _this.data.startTime,
"end": _this.data.endTime,
"mrdate": "2024-09-27",
"timeFormat": "0",
"title": _this.data.detail.title, "title": _this.data.detail.title,
"personNum": _this.data.detail.personNum, "personNum": _this.data.detail.personNum,
"startTime": _this.data.startTime, "leader": _this.data.detail.leader,
"endDate": _this.data.endTime, "userOrgId": _this.data.detail.depId,
"orderMoney": 0, "userOrg": _this.data.detail.depName,
"reservationServes": service, "bookingUserName": _this.data.detail.orderUser,
"bookingUserPhone": _this.data.detail.orderTel,
"remark": _this.data.detail.remark, "remark": _this.data.detail.remark,
"orderUser": _this.data.detail.orderUser, },
"orderTel": _this.data.detail.orderTel, serve: service
"parkId": 25, // 写死，园区ID
}).then(res => { }).then(res => {
console.log('saveMeetingRecordRq', res); console.log('saveMeetingRecordRq', res);
if (res.code == 0) { if (res.code == 0) {

4
miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
View File

@ -1,7 +1,7 @@
<view class="containerView"> <view class="containerView">
<!-- 轮播图 --> <!-- 轮播图 -->
<view class="swiperView"> <view class="swiperView">
<view class="tag">{{room.meetingName}}</view> <view class="tag">{{room.name}}</view>
<swiper class='swiper-box' indicator-dots autoplay interval="3000" duration="1000" circular='true'> <swiper class='swiper-box' indicator-dots autoplay interval="3000" duration="1000" circular='true'>
<swiper-item wx:for="{{bannerList}}" wx:key="index"> <swiper-item wx:for="{{bannerList}}" wx:key="index">
<image class="img" src="{{IMG_NAME + item}}" mode="aspectFill"></image> <image class="img" src="{{IMG_NAME + item}}" mode="aspectFill"></image>
@ -12,7 +12,7 @@
<!-- 详细信息 --> <!-- 详细信息 -->
<view class="meetingDetailView"> <view class="meetingDetailView">
<view class="detailView"> <view class="detailView">
<view class="title">{{room.buildingName}} | {{room.roomName}} | {{room.capacityNum}}人 | {{room.shape}}</view> <view class="title">{{room.floor}} | {{room.roomNum}} | {{room.capacityNum}}人 | {{room.typeName}}</view>
<view class="itemList"> <view class="itemList">
<view class="item" wx:for="{{room.roomItemList}}" wx:for-item="serviceItem" wx:key="*this">#{{serviceItem.name}}</view> <view class="item" wx:for="{{room.roomItemList}}" wx:for-item="serviceItem" wx:key="*this">#{{serviceItem.name}}</view>
<view class="item" wx:for="{{room.roomServeList}}" wx:for-item="serveItem" wx:key="*this">#{{serveItem.serveName}}</view> <view class="item" wx:for="{{room.roomServeList}}" wx:for-item="serveItem" wx:key="*this">#{{serveItem.serveName}}</view>

12
miniprogram/pages/meeting/meetingRoom/meetingRoom.js
View File

@ -17,6 +17,7 @@ Page({
date: '', // 选择的时间 date: '', // 选择的时间
rId: '', // 预约id rId: '', // 预约id
dep: '', // 预约单位 dep: '', // 预约单位
depId: '',
timeRange: '', // 选择的时间范围 timeRange: '', // 选择的时间范围
detail: {}, detail: {},
bannerList: [], bannerList: [],
@ -37,12 +38,15 @@ Page({
date: time, date: time,
timeRange: timeRange, timeRange: timeRange,
rId: options.rId, rId: options.rId,
dep: options.dep dep: options.dep,
depId: options.depId
}) })
let meetingRoomId = options.id; let meetingRoomId = options.id;
meetingRoomDetailRq(meetingRoomId).then(res => { meetingRoomDetailRq({
roomId: meetingRoomId
}).then(res => {
console.log('meetingRoomDetailRq', res); console.log('meetingRoomDetailRq', res);
let detail = res.roomContent; let detail = res.room
let bannerList = [] let bannerList = []
if (detail.indoorPicUrl) { if (detail.indoorPicUrl) {
try { try {
@ -146,7 +150,7 @@ Page({
let time = this.data.date let time = this.data.date
let timeRange = this.data.timeRange let timeRange = this.data.timeRange
wx.navigateTo({ wx.navigateTo({
url: "/pages/meeting/meetingRoom/meetingBooked/meetingBooked?meetingRoomId=" + meetingRoomId + '&time=' + time + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep, url: "/pages/meeting/meetingRoom/meetingBooked/meetingBooked?meetingRoomId=" + meetingRoomId + '&time=' + time + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep + '&depId=' + this.data.depId,
}) })
}, },

9
miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
View File

@ -1,7 +1,7 @@
<view class="containerView public"> <view class="containerView public">
<!-- 轮播图 --> <!-- 轮播图 -->
<view class="swiperView"> <view class="swiperView">
<view class="tag">{{detail.meetingName}}</view> <view class="tag">{{detail.name}}</view>
<swiper class='swiper-box' indicator-dots autoplay interval="3000" duration="1000" circular='true'> <swiper class='swiper-box' indicator-dots autoplay interval="3000" duration="1000" circular='true'>
<swiper-item wx:for="{{bannerList}}" wx:key="index"> <swiper-item wx:for="{{bannerList}}" wx:key="index">
<image class="img" src="{{IMG_NAME + item}}" mode="aspectFill"></image> <image class="img" src="{{IMG_NAME + item}}" mode="aspectFill"></image>
@ -10,10 +10,11 @@
</view> </view>
<view class="meetingDetailView"> <view class="meetingDetailView">
<view class="detailView"> <view class="detailView">
<view class="title">{{detail.buildingName}} | {{detail.roomName}} | {{detail.capacityNum}}人 | {{detail.shape}}</view> <view class="title">{{detail.floor}} | {{detail.roomNum}} | {{detail.capacityNum}}人 | {{detail.typeName}}</view>
<view class="itemList"> <view class="itemList">
<view class="item" wx:for="{{detail.roomItemList}}" wx:for-item="serviceItem" wx:key="*this">#{{serviceItem.name}}</view> {{detail.device}}
<view class="item" wx:for="{{detail.roomServeList}}" wx:for-item="serveItem" wx:key="*this">#{{serveItem.serveName}}</view> <!-- <view class="item" wx:for="{{detail.roomItemList}}" wx:for-item="serviceItem" wx:key="*this">#{{serviceItem.name}}</view>
<view class="item" wx:for="{{detail.roomServeList}}" wx:for-item="serveItem" wx:key="*this">#{{serveItem.serveName}}</view> -->
</view> </view>
</view> </view>