diff --git a/miniprogram/app.json b/miniprogram/app.json
index b973436..05ffd65 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -56,6 +56,7 @@
"pages/meeting/meetingRoom/meetingOrder/meetingOrder",
"pages/meeting/meetingRoom/meetingProtocol/meetingProtocol",
"pages/meeting/meetingRoom/meetingCoupon/meetingCoupon",
+ "pages/meeting/meetingRoom/meetingBooked/meetingBooked",
"pages/meeting/pay/waitPay/waitPay",
"pages/meeting/pay/waitComplete/waitComplete",
"pages/meeting/reservationRecord/reservationRecord",
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
new file mode 100644
index 0000000..3254d7e
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
@@ -0,0 +1,83 @@
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ minHour: 10,
+ maxHour: 20,
+ minDate: new Date().getTime(),
+ maxDate: new Date(2029, 10, 1).getTime(),
+ currentDate: new Date().getTime(),
+ },
+
+
+ onInput(event) {
+ this.setData({
+ currentDate: event.detail,
+ });
+ },
+
+ // 跳转完成
+ jumpComplete() {
+ wx.navigateTo({
+ url: "/pages/meeting/meetingRoom/meetingOrder/meetingOrder",
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+ console.log('onShow' , 111);
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json
new file mode 100644
index 0000000..a7c4811
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json
@@ -0,0 +1,7 @@
+{
+ "usingComponents": {
+ "van-picker": "@vant/weapp/picker/index",
+ "van-datetime-picker": "@vant/weapp/datetime-picker/index"
+ },
+ "navigationBarTitleText": "会议室已预约"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml
new file mode 100644
index 0000000..62a9086
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml
@@ -0,0 +1,16 @@
+
+
+
+
+预约时间
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss
new file mode 100644
index 0000000..eb3f831
--- /dev/null
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss
@@ -0,0 +1,14 @@
+.submitBtn {
+ box-sizing: border-box;
+ position: absolute;
+ width: 600rpx;
+ left: 50%;
+ margin-left: -300rpx;
+ bottom: 120rpx;
+ border-radius: 10rpx;
+ padding: 20rpx;
+ background: #4e96f8;
+ color: white;
+ font-size: 30rpx;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
index 22e1b0d..7790efe 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
@@ -58,10 +58,10 @@ Page({
})
},
- // 跳转会议订单
- jumpMeetingOrder() {
+ // 跳转-会议室已预约
+ jumpMeetingBooked() {
wx.navigateTo({
- url: "/pages/meeting/meetingRoom/meetingOrder/meetingOrder",
+ url: "/pages/meeting/meetingRoom/meetingBooked/meetingBooked",
})
},
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
index 2cb4f87..9f0ffd4 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
@@ -1,4 +1,4 @@
-
+
@@ -60,6 +60,6 @@
- 会议预约
+ 会议预约
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
index 554f973..272acdc 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
@@ -1,17 +1,3 @@
-.containerView {
- height: 100vh;
- width: 100vw;
- overflow: auto;
- padding-bottom: 100rpx;
- background: #ffffff;
-}
-
-.leftLineTitle {
- border-left: 8rpx solid #76aef9;
- padding-left: 10rpx;
- font-size: 32rpx;
-}
-
.swiper-box {
border-radius: 14rpx;
box-sizing: border-box;
@@ -151,7 +137,7 @@
height: 500rpx;
}
-.reservationBtn{
+.reservationBtn {
background: #5a6ff2;
font-size: 28rpx;
color: white;
diff --git a/project.private.config.json b/project.private.config.json
index 9e89da9..a740da9 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "pages/meeting/meetingRoom/meetingBooked/meetingBooked",
+ "pathName": "pages/meeting/meetingRoom/meetingBooked/meetingBooked",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "pages/meeting/invite/invite",
"pathName": "pages/meeting/invite/invite",