diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js new file mode 100644 index 0000000..afd4173 --- /dev/null +++ b/miniprogram/api/meeting/meetingRoom.js @@ -0,0 +1,11 @@ +import { + request +} from '../selfRequest'; + +// 查询条件筛选 +export function loginRq(param) { + return request({ + url: '/api/roomContent/searchInfo/' + param, + method: "get", + }); +} diff --git a/miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js b/miniprogram/api/meeting/visitorIinvitation.js similarity index 92% rename from miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js rename to miniprogram/api/meeting/visitorIinvitation.js index 3c82bf7..c8bb8b1 100644 --- a/miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js +++ b/miniprogram/api/meeting/visitorIinvitation.js @@ -1,6 +1,6 @@ import { request -} from '../../selfRequest'; +} from '../selfRequest'; // 微信登录接口 export function companyRq(data) { diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js index 090992e..ab16915 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js @@ -5,7 +5,28 @@ Page({ * 页面的初始数据 */ data: { - IMG_NAME: app.IMG_NAME + IMG_NAME: app.IMG_NAME, + queryParam: { + switchTitle1: '包邮', + switchTitle2: '团购', + itemTitle: '筛选', + meetingTypeDict: { + list: [{ + text: '会议室类型', + value: 0 + }, + { + text: '会议室', + value: 1 + }, + { + text: '茶室', + value: 2 + }, + ], + value: 0, + } + } }, /** @@ -18,10 +39,20 @@ Page({ }) }, + // 查询条件-会议类型 + meetingTypeQueryChange(e){ + console.log('meetingTypeQueryChange', e); + let queryParam = this.data.queryParam; + queryParam.meetingTypeDict.value = e.detail; + this.setData({ + queryParam + }) + }, + // 会议室 - jumpMeetingRoom(){ + jumpMeetingRoom() { wx.navigateTo({ - url: "/pages/meeting/meetingRoom/meetingRoom", + url: "/pages/meeting/meetingRoom/meetingRoom", }) }, diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.json b/miniprogram/pages/meeting/meetingReservation/meetingReservation.json index 0124749..bfda1f2 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.json +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.json @@ -1,5 +1,9 @@ { - "usingComponents": { - "van-field": "@vant/weapp/field/index" - } + "usingComponents": { + "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", + "van-dropdown-item": "@vant/weapp/dropdown-item/index", + "van-cell": "@vant/weapp/cell/index", + "van-switch": "@vant/weapp/switch/index", + "van-button": "@vant/weapp/button/index" + } } \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml index c373dd9..46ed8c4 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml @@ -1,4 +1,12 @@ - + + + + + + + + + diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss index d29919b..2772b26 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxss @@ -1,10 +1,15 @@ -.container { - width: 100vw; - height: 100vh; - background: #ffffff; + +.queryView{ + position: fixed; + left: 0; + top: 0; + z-index: 999; + width: 100%; } + .meetingRoomView { + margin-top: 100rpx; padding: 30rpx 30rpx; } diff --git a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js index 49a0823..c527655 100644 --- a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js +++ b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js @@ -1,216 +1,277 @@ let app = getApp(); import { - companyRq -} from "../../../api/meeting/visitorIinvitation/visitorIinvitation.js" + companyRq +} from "../../../api/meeting/visitorIinvitation.js" + Page({ - /** - * 页面的初始数据 - */ - data: { - IMG_NAME: app.IMG_NAME, - value: '', - companyShow:false, - usernameShow:false, - cardTypeShow: false, - arriveShow:false, - leaveShow:false, - submitSuccesShow:false, - companyColumns:['公司1','公司2','公司3'], - columns: ['身份证', '护照', '通行证'], - fileList: [], - currentDate: new Date().getTime(), - /** 索引栏*/ - indexList: ["A", "B", "C", "D"], - scrollTop: 0, - /** mock客户数据*/ - customerList: [ - { - firstLetter: "A", - list: [ - { code: "AB01", name: "A1客户" }, - { code: "AB02", name: "A2客户" }, - { code: "AB03", name: "A3客户" }, - ], - }, - { - firstLetter: "B", - list: [ - { code: "BB01", name: "B1客户" }, - { code: "BB02", name: "B2客户" }, - { code: "BB03", name: "B3客户" }, - { code: "BB04", name: "B4客户" }, - ], - }, - { - firstLetter: "C", - list: [ - { code: "CB01", name: "C1客户" }, - { code: "CB02", name: "C2客户" }, - { code: "CB03", name: "C3客户" }, - { code: "CB04", name: "C4客户" }, - { code: "CB05", name: "C5客户" }, - ], - }, - { - firstLetter: "D", - list: [ - { code: "DB01", name: "D1客户" }, - { code: "DB02", name: "D2客户" }, - { code: "DB03", name: "D3客户" }, - { code: "DB04", name: "D4客户" }, - { code: "DB05", name: "D5客户" }, - { code: "DB06", name: "D6客户" }, - ], - }, - ], - - }, + /** + * 页面的初始数据 + */ + data: { + IMG_NAME: app.IMG_NAME, + value: '', + companyShow: false, + usernameShow: false, + cardTypeShow: false, + arriveShow: false, + leaveShow: false, + submitSuccesShow: false, + companyColumns: ['公司1', '公司2', '公司3'], + columns: ['身份证', '护照', '通行证'], + fileList: [], + currentDate: new Date().getTime(), + /** 索引栏*/ + indexList: ["A", "B", "C", "D"], + scrollTop: 0, + /** mock客户数据*/ + customerList: [{ + firstLetter: "A", + list: [{ + code: "AB01", + name: "A1客户" + }, + { + code: "AB02", + name: "A2客户" + }, + { + code: "AB03", + name: "A3客户" + }, + ], + }, + { + firstLetter: "B", + list: [{ + code: "BB01", + name: "B1客户" + }, + { + code: "BB02", + name: "B2客户" + }, + { + code: "BB03", + name: "B3客户" + }, + { + code: "BB04", + name: "B4客户" + }, + ], + }, + { + firstLetter: "C", + list: [{ + code: "CB01", + name: "C1客户" + }, + { + code: "CB02", + name: "C2客户" + }, + { + code: "CB03", + name: "C3客户" + }, + { + code: "CB04", + name: "C4客户" + }, + { + code: "CB05", + name: "C5客户" + }, + ], + }, + { + firstLetter: "D", + list: [{ + code: "DB01", + name: "D1客户" + }, + { + code: "DB02", + name: "D2客户" + }, + { + code: "DB03", + name: "D3客户" + }, + { + code: "DB04", + name: "D4客户" + }, + { + code: "DB05", + name: "D5客户" + }, + { + code: "DB06", + name: "D6客户" + }, + ], + }, + ], - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - // 页面初始化 options为页面跳转所带来的参数 - wx.setNavigationBarTitle({ - title: options.name - }) - console.log('options.goods_id',options.name) - companyRq({}).then( res =>{ - console.log('res',res) - if(res.code ==0){ - // res.row - } + }, - }) - }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + // 页面初始化 options为页面跳转所带来的参数 + wx.setNavigationBarTitle({ + title: options.name + }) + console.log('options.goods_id', options.name) + companyRq({}).then(res => { + console.log('res', res) + if (res.code == 0) { + // res.row + } - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { + }) + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { + }, - }, - onChange(event) { - // event.detail 为当前输入的值 - console.log(event.detail); - }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { + }, + onChange(event) { + // event.detail 为当前输入的值 + console.log(event.detail); + }, - }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { + }, - }, - getUsernameHandle(){ - // this.setData({ - // usernameShow: true - // }); - wx.navigateTo({ - url: '/pages/meeting/visitorIinvitation/indexBar/indexBar' - }) + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { - }, - getCompanyHandle() { - this.setData({ - companyShow: true - }); - }, - getCardTypeHandle() { - this.setData({ - cardTypeShow: true - }); - }, - changeHandler(e){ - console.log(e) + }, + getUsernameHandle() { + // this.setData({ + // usernameShow: true + // }); + wx.navigateTo({ + url: '/pages/meeting/visitorIinvitation/indexBar/indexBar' + }) - }, - // confirmHandle(){ + }, + getCompanyHandle() { + this.setData({ + companyShow: true + }); + }, + getCardTypeHandle() { + this.setData({ + cardTypeShow: true + }); + }, + changeHandler(e) { + console.log(e) - // }, - confirmHandle(){ - this.setData({ - companyShow:false, - usernameShow:false, - cardTypeShow: false, - arriveShow: false, - leaveShow:false - }); - }, - cancelHandle(){ - this.setData({ - companyShow:false, - usernameShow:false, - cardTypeShow: false, - arriveShow: false, - leaveShow:false - }); - }, - getArriveHandle(){ - this.setData({ - arriveShow: true - }); + }, + // confirmHandle(){ - }, - getLeaveHandle(){ - this.setData({ - leaveShow: true - }); - }, - onClose(){ - this.setData({ - usernameShow: true - }); - }, - afterRead(event) { - const { file } = event.detail; - // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式 - wx.uploadFile({ - url: 'https://example.weixin.qq.com/upload', // 仅为示例,非真实的接口地址 - filePath: file.url, - name: 'file', - formData: { user: 'test' }, - success(res) { - // 上传完成需要更新 fileList - const { fileList = [] } = this.data; - fileList.push({ ...file, url: res.data }); - this.setData({ fileList }); - }, - }); - }, - onInput(event) { - this.setData({ - currentDate: event.detail, - }); - }, - submitFormFn(){ - this.setData({ - submitSuccesShow: true, - }); + // }, + confirmHandle() { + this.setData({ + companyShow: false, + usernameShow: false, + cardTypeShow: false, + arriveShow: false, + leaveShow: false + }); + }, + cancelHandle() { + this.setData({ + companyShow: false, + usernameShow: false, + cardTypeShow: false, + arriveShow: false, + leaveShow: false + }); + }, + getArriveHandle() { + this.setData({ + arriveShow: true + }); - }, - submitDialogFn(){ - this.setData({ - submitSuccesShow: false, - }); - setTimeout(() => { - wx.navigateTo({ - url: '/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord', - }) - }, 10); - } + }, + getLeaveHandle() { + this.setData({ + leaveShow: true + }); + }, + onClose() { + this.setData({ + usernameShow: true + }); + }, + afterRead(event) { + const { + file + } = event.detail; + // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式 + wx.uploadFile({ + url: 'https://example.weixin.qq.com/upload', // 仅为示例,非真实的接口地址 + filePath: file.url, + name: 'file', + formData: { + user: 'test' + }, + success(res) { + // 上传完成需要更新 fileList + const { + fileList = [] + } = this.data; + fileList.push({ + ...file, + url: res.data + }); + this.setData({ + fileList + }); + }, + }); + }, + onInput(event) { + this.setData({ + currentDate: event.detail, + }); + }, + submitFormFn() { + this.setData({ + submitSuccesShow: true, + }); + + }, + submitDialogFn() { + this.setData({ + submitSuccesShow: false, + }); + setTimeout(() => { + wx.navigateTo({ + url: '/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord', + }) + }, 10); + } }) \ No newline at end of file