diff --git a/miniprogram/app.json b/miniprogram/app.json index 777fa8f..6e427b8 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -59,7 +59,8 @@ "pages/meeting/pay/waitPay/waitPay", "pages/meeting/pay/waitComplete/waitComplete", "pages/meeting/reservationRecord/reservationRecord", - "pages/meeting/reservationRecord/meetingRecord/meetingRecord" + "pages/meeting/reservationRecord/meetingRecord/meetingRecord", + "pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail" ], "window": { "backgroundTextStyle": "light", diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index b579f30..2667c27 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -1,355 +1,364 @@ @import "/utils/common.wxss"; page { - width: 100%; - height: 100%; - /* overflow: hidden; */ - font-size: 24rpx; - /* color: #F3F3F3; */ - background-color: #F5F5F5; + width: 100%; + height: 100%; + /* overflow: hidden; */ + font-size: 24rpx; + /* color: #F3F3F3; */ + background-color: #F5F5F5; } .flow-checkout-header { - padding: 28rpx 0; - background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANYAAAANCAYAAADVGpDCAAAAGXRFW…GxrGBUn2PZ4lyoTdIsST0FQj0UDSLUak6ot3gcBLVY3wQYAJoVXxmNERajAAAAAElFTkSuQmCC) bottom left repeat-x; - background-size: 120rpx auto; - position: relative; + padding: 28rpx 0; + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANYAAAANCAYAAADVGpDCAAAAGXRFW…GxrGBUn2PZ4lyoTdIsST0FQj0UDSLUak6ot3gcBLVY3wQYAJoVXxmNERajAAAAAElFTkSuQmCC) bottom left repeat-x; + background-size: 120rpx auto; + position: relative; } .flow-header-left { - flex: 14; + flex: 14; } .flow-fixed-footer { - position: fixed; - bottom: 0; - width: 100%; - background: #fff; - border-top: 1px solid #eee; - z-index: 11; + position: fixed; + bottom: 0; + width: 100%; + background: #fff; + border-top: 1px solid #eee; + z-index: 11; } .flow-shopList { - padding: 20rpx 0; + padding: 20rpx 0; } .flow-shopList .flow-list-left { - flex: 2; + flex: 2; } .flow-btn { - background-color: #ff495e; - color: #fff; - text-align: center; - line-height: 46px; - display: block; + background-color: #ff495e; + color: #fff; + text-align: center; + line-height: 46px; + display: block; } .flow-num-box { - font-size: 30rpx; - color: #777; - padding: 15rpx 12px; - text-align: right; + font-size: 30rpx; + color: #777; + padding: 15rpx 12px; + text-align: right; } .flow-checkout-header .flow-checkout-address { - font-size: 26rpx; - color: #777; - margin-top: 6rpx; + font-size: 26rpx; + color: #777; + margin-top: 6rpx; } .goods-detail-box { - padding: 0; - min-height: 150px; + padding: 0; + min-height: 150px; } .flow-shopList .flow-list-right .small { - float: right; - font-size: 26rpx; - color: #777; + float: right; + font-size: 26rpx; + color: #777; } .flow-shopList .flow-list-right .flow-cont { - font-size: 30rpx; - color: #ff495e; + font-size: 30rpx; + color: #ff495e; } .flow-shopList .flow-list-right .flow-list-cont { - padding-top: 10rpx; + padding-top: 10rpx; } .flow-shopList .flow-list-left { - flex: 2; + flex: 2; } .flow-shopList .flow-list-right { - flex: 4; + flex: 4; } .flow-shopList .flow-list-left image { - width: 200rpx; - height: 200rpx; - border: 1rpx solid #eee; - background: #fff; + width: 200rpx; + height: 200rpx; + border: 1rpx solid #eee; + background: #fff; } -.flow-list custom-li, .addres-list custom-li { - margin-top: 25rpx; - display: block; +.flow-list custom-li, +.addres-list custom-li { + margin-top: 25rpx; + display: block; } -.flow-list custom-li:first-child, .addres-list custom-li:first-child { - margin-top: 0; +.flow-list custom-li:first-child, +.addres-list custom-li:first-child { + margin-top: 0; } .index-cont-search { - width: 100%; - font-size: 28rpx; - position: relative; - background: #f1f1f1; + width: 100%; + font-size: 28rpx; + position: relative; + background: #f1f1f1; } .selectNumber { - height: 34px; - flex-direction: row; - border: 1rpx solid #eee; - border-radius: 10rpx; - display: inline-block; + height: 34px; + flex-direction: row; + border: 1rpx solid #eee; + border-radius: 10rpx; + display: inline-block; } .selectNumber .default-active { - background: #f7f7f7 !important; - color: #ddd !important; + background: #f7f7f7 !important; + color: #ddd !important; } .selectNumber .default { - width: 34px; - height: 34px; - float: left; - line-height: 32px; - padding: 0; - background: #fff; - color: #444; - font-size: 48rpx; + width: 34px; + height: 34px; + float: left; + line-height: 32px; + padding: 0; + background: #fff; + color: #444; + font-size: 48rpx; } .selectNumber input { - float: left; - width: 50px; - height: 34px; - line-height: 34px; - border-right: 1rpx solid #eee; - border-left: 1rpx solid #eee; - text-align: center; - font-size: 28rpx; - color: #444; + float: left; + width: 50px; + height: 34px; + line-height: 34px; + border-right: 1rpx solid #eee; + border-left: 1rpx solid #eee; + text-align: center; + font-size: 28rpx; + color: #444; } .order-bt { - width: 50%; - background-color: #ff495e; - color: #fff; - text-align: center; - line-height: 46px; + width: 50%; + background-color: #ff495e; + color: #fff; + text-align: center; + line-height: 46px; } .profile-btn button { - background: #ff495e; - color: white; - margin-bottom: 20rpx; + background: #ff495e; + color: white; + margin-bottom: 20rpx; } .yoshop-notcont { - margin: 130rpx 100rpx; + margin: 130rpx 100rpx; } .yoshop-notcont .iconfont { - font-size: 150rpx; - color: #ccc; - text-align: center; - display: block; - margin-bottom: 24rpx; + font-size: 150rpx; + color: #ccc; + text-align: center; + display: block; + margin-bottom: 24rpx; } .yoshop-notcont .cont { - display: block; - text-align: center; - font-size: 30rpx; - color: #999; - margin-top: 20rpx; + display: block; + text-align: center; + font-size: 30rpx; + color: #999; + margin-top: 20rpx; } .footer-fixed { - position: fixed; - display: flex; - bottom: 0px; - left: 0px; - right: 0px; - height: 46px; - z-index: 18; - box-shadow: 1px 5px 15px rgba(50, 50, 50, 0.3); - background: #fff; + position: fixed; + display: flex; + bottom: 0px; + left: 0px; + right: 0px; + height: 46px; + z-index: 18; + box-shadow: 1px 5px 15px rgba(50, 50, 50, 0.3); + background: #fff; } .order-bt { - background-color: #ff495e; - color: #fff; - text-align: center; - line-height: 46px; + background-color: #ff495e; + color: #fff; + text-align: center; + line-height: 46px; } .container { - height: 100%; - align-items: center; - justify-content: space-between; - box-sizing: border-box; - font-family: PingFang-Medium, - PingFangSC-Regular, - Heiti, - Heiti SC, - DroidSans, - DroidSansFallback, - "Microsoft YaHei", - sans-serif; - -webkit-font-smoothing: antialiased; + height: 100%; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + font-family: PingFang-Medium, + PingFangSC-Regular, + Heiti, + Heiti SC, + DroidSans, + DroidSansFallback, + "Microsoft YaHei", + sans-serif; + -webkit-font-smoothing: antialiased; } .bold { - font-weight: 600; + font-weight: 600; } .next { - width: 100% !important; - height: 100rpx !important; - font-size: 28rpx; - color: white; - text-align: center; - line-height: 100rpx !important; - background: #4C84FF; - /* position: absolute !important; + width: 100% !important; + height: 100rpx !important; + font-size: 28rpx; + color: white; + text-align: center; + line-height: 100rpx !important; + background: #4C84FF; + /* position: absolute !important; bottom: 30rpx; left: 50% !important; */ - /* margin-left: -290rpx !important; */ - padding: 0 !important; - border-radius: 50rpx !important; - z-index: 5; + /* margin-left: -290rpx !important; */ + padding: 0 !important; + border-radius: 50rpx !important; + z-index: 5; } .floL { - float: left; + float: left; } .floR { - float: right; + float: right; } .fontW { - font-weight: 600; + font-weight: 600; } .bshaw { - width: 98%; - margin-left: 1%; - padding: 30rpx 30rpx 36rpx 22rpx; - background: rgba(255, 255, 255, 1); - box-shadow: 0px 0px 13rpx 1rpx rgba(233, 236, 244, 1); - border-radius: 4rpx; - margin-top: 50rpx; - box-sizing: border-box; + width: 98%; + margin-left: 1%; + padding: 30rpx 30rpx 36rpx 22rpx; + background: rgba(255, 255, 255, 1); + box-shadow: 0px 0px 13rpx 1rpx rgba(233, 236, 244, 1); + border-radius: 4rpx; + margin-top: 50rpx; + box-sizing: border-box; } /*隐藏滚动条*/ ::-webkit-scrollbar { - width: 0; - height: 0; - color: transparent; + width: 0; + height: 0; + color: transparent; } .da { - display: inline-block; - color: white; - background: #4C84FF; - padding: 0 50rpx; - height: 62rpx; - border-radius: 31rpx; - text-align: center; - line-height: 62rpx; - margin-right: 24rpx; - margin-bottom: 24rpx; + display: inline-block; + color: white; + background: #4C84FF; + padding: 0 50rpx; + height: 62rpx; + border-radius: 31rpx; + text-align: center; + line-height: 62rpx; + margin-right: 24rpx; + margin-bottom: 24rpx; } .da1 { - display: inline-block; - color: black; - background: #F2F2F2; - padding: 0 50rpx; - height: 62rpx; - border-radius: 31rpx; - text-align: center; - line-height: 62rpx; - margin-right: 24rpx; - margin-bottom: 24rpx; + display: inline-block; + color: black; + background: #F2F2F2; + padding: 0 50rpx; + height: 62rpx; + border-radius: 31rpx; + text-align: center; + line-height: 62rpx; + margin-right: 24rpx; + margin-bottom: 24rpx; } .titleC { - font-size: 13pt; - font-weight: 600; - margin-bottom: 10rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + font-size: 13pt; + font-weight: 600; + margin-bottom: 10rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .detailTextC { - color: #A5A5A5; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + color: #A5A5A5; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .textcolor { - color: #A5A5A5; + color: #A5A5A5; } .iconfont { - font-size: 14pt; - color: #C11D24; + font-size: 14pt; + color: #C11D24; } .iconfonts { - font-size: 14pt; + font-size: 14pt; } .btnColor { - background-color: #C11D24; - color: white; + background-color: #C11D24; + color: white; } image { - width: 100%; + width: 100%; } .paddingPercent_4 { - padding: 4%; + padding: 4%; } .borderBottom { - border-bottom: 1rpx solid #EEEEEE; + border-bottom: 1rpx solid #EEEEEE; } .borderTop { - border-top: 1rpx solid #E5E5E5; + border-top: 1rpx solid #E5E5E5; } .flex { - display: flex; + display: flex; } .containerView.public { + box-sizing: border-box; height: 100vh; width: 100vw; overflow: auto; padding-bottom: 100rpx; background: #ffffff; +} + +.leftLineTitle { + border-left: 8rpx solid #76aef9; + padding-left: 10rpx; + font-size: 32rpx; } \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js new file mode 100644 index 0000000..ba92a53 --- /dev/null +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js @@ -0,0 +1,67 @@ +const app = getApp() + +Page({ + + /** + * 页面的初始数据 + */ + data: { + IMG_NAME: app.IMG_NAME, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json new file mode 100644 index 0000000..eb25d5e --- /dev/null +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "会议预约详情" +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml new file mode 100644 index 0000000..7c56f8e --- /dev/null +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml @@ -0,0 +1,74 @@ + + + + + + + 10人间 | B2A | 3F + space spacespace spacespace spacespace spacespace space + 2023-01-01 10:10~12:12 + + + ¥200.00 + /半小时 + + + + + + + 基本信息 + + 会议时间 + 2024-01-01 10:10~11:10 共计1小时 + + + 会议主题 + My Meeting Room + + + 会议预约人 + admin + + + 联系方式 + 10086 + + 订单信息 + + 订单类型 + 会议室订单 + + + 订单状态 + 待使用 + + + 订单编号 + FO2121654654654 + + + 创建时间 + 2024-01-01 12:12:00 + + + 优惠卷 + 1张 + + + 支付金额 + ¥200.00 + + + 支付时间 + 2024-01-01 12:12:00 + + + + + + 去支付 + 去邀请 + 取消订单 + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss new file mode 100644 index 0000000..c247494 --- /dev/null +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss @@ -0,0 +1,120 @@ +.containerView.public { + padding-bottom: 200rpx; +} + +.itemView { + padding: 0 20rpx; +} + +.itemView .contentView { + box-sizing: border-box; + border-radius: 10rpx; + width: 100%; + margin-top: 20rpx; + padding: 30rpx 20rpx; + display: flex; + justify-content: flex-start; + align-items: center; + background: #f2f2f2; +} + +.itemView .contentView .img { + border-radius: 10rpx; + width: 200rpx; + height: 110rpx; +} + +.itemView .contentView .msgView { + flex: 1; + margin: 0 20rpx; + word-break: break-all; +} + +.itemView .contentView .msgView .title { + font-size: 28rpx; +} + +.itemView .contentView .msgView .name, +.itemView .contentView .msgView .time { + font-size: 24rpx; + color: gray; + margin-top: 6rpx; +} + +.itemView .contentView .priceView { + text-align: right; +} + +.itemView .contentView .priceView .price { + font-size: 28rpx; + font-weight: bold; + color: red; +} + +.itemView .contentView .priceView .unit { + font-size: 22rpx; + color: gray; +} + + +.basicView {} + +.basicView .labelTitle { + margin: 40rpx 20rpx; + font-size: 32rpx; +} + +.basicView .cellView { + border-bottom: 1px solid rgb(126, 126, 126, 0.2); + display: flex; + justify-content: space-between; + align-items: flex-start; + padding: 30rpx 20rpx; + word-break: break-all; +} + +.basicView .cellView .label { + font-size: 28rpx; + min-width: 180rpx; +} + +.basicView .cellView .content { + font-size: 26rpx; +} + +.basicView .cellView .content.payMoney { + font-size: 28rpx; + font-weight: bold; + color: red; +} + +.basicView .cellView .content.status { + color: #4e96f8; +} + +.bottomFix { + box-sizing: border-box; + position: fixed; + z-index: 1; + left: 0; + bottom: 0; + width: 100%; + height: 160rpx; + background: white; + box-shadow: rgb(187, 187, 187) 0px 0px 6px 0px; + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + align-items: center; + padding-right: 20rpx; +} + +.bottomFix .btn { + border: 1px solid #4e96f8; + border-radius: 10rpx; + margin-right: 16rpx; + margin-top: -20rpx; + padding: 10rpx 24rpx; + font-size: 30rpx; + color: #4e96f8; +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js index ba92a53..48aeffb 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js @@ -16,6 +16,20 @@ Page({ }, + // 跳转-支付 + jumpPay() { + wx.navigateTo({ + url: "/pages/meeting/pay/waitPay/waitPay" + }) + }, + + // 跳转-预约详情 + jumpMeetingDetail() { + wx.navigateTo({ + url: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail", + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ @@ -62,6 +76,12 @@ Page({ * 用户点击右上角分享 */ onShareAppMessage() { - + let param = { + title: "space 会议室101", + path: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail", + imageUrl: app.IMG_NAME + '/profile/static/index/banner/1.jpg', + } + console.log('onShareAppMessage' , param); + return param; } }) \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml index 6b4c79b..7ec4e30 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml @@ -1,14 +1,14 @@ - + YGDH20240120122 待使用 - + 10人间 | B2A | 3F - space space + space spacespace spacespace spacespace space 2023-01-01 10:10~12:12 @@ -17,10 +17,14 @@ ¥200.00 - 去支付 + 去支付 去邀请 取消订单 - 查看会议 + 查看会议 + + + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss index 87dc448..536474d 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss @@ -46,6 +46,7 @@ .itemView .contentView .msgView { flex: 1; margin-left: 20rpx; + word-break: break-all; } .itemView .contentView .msgView .title {