diff --git a/miniprogram/app.json b/miniprogram/app.json index 3913a43..64e183b 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -55,7 +55,8 @@ "pages/meeting/meetingRoom/meetingFacilities/meetingFacilities", "pages/meeting/meetingRoom/meetingOrder/meetingOrder", "pages/meeting/meetingRoom/meetingProtocol/meetingProtocol", - "pages/meeting/meetingRoom/meetingCoupon/meetingCoupon" + "pages/meeting/meetingRoom/meetingCoupon/meetingCoupon", + "pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay" ], "window": { "backgroundTextStyle": "light", diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index b5c6baa..21339ef 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -85,7 +85,7 @@ Page({ }, */ { - name: "会议预约", + name: "会议邀约", img: "/profile/static/index/menu-hyyy.png", path: "/pages/meeting/meetingReservation/meetingReservation" }, @@ -95,7 +95,7 @@ Page({ path: "" }, { - name: "访客邀约", + name: "访客预约", img: "/profile/static/index/menu-fkyy.png", path: "/pages/meeting/visitorIinvitation/visitorIinvitation" }, diff --git a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js index 3fa4cdb..0259f4d 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.js @@ -24,6 +24,14 @@ Page({ }); }, + // 点击-选择优惠卷 + couponSelect(e) { + console.log('couponSelect', e); + this.setData({ + couponId: e.currentTarget.dataset.id, + }); + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml index b598e49..33f58eb 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon.wxml @@ -2,8 +2,8 @@ - - + + diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index 81fa6a0..bb97f05 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -58,6 +58,13 @@ Page({ }) }, + // 提交订单 + submitCase() { + wx.redirectTo({ + url: "/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay", + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index 85c0ac0..0eb60d0 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -81,6 +81,6 @@ 合计: ¥ 200.00 - 提交订单 + 提交订单 \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.js b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.js new file mode 100644 index 0000000..1dc2ec8 --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.js @@ -0,0 +1,66 @@ +// pages/meeting/meetingRoom/meetingWaitPay.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + countdownTime : 5 * 60 * 1000 // 单位毫秒 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.json b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.json new file mode 100644 index 0000000..5aecf2b --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-count-down": "@vant/weapp/count-down/index" + }, + "navigationBarTitleText": "支付订单" +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.wxml b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.wxml new file mode 100644 index 0000000..380f002 --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.wxml @@ -0,0 +1,13 @@ + + + + + + ¥200.00 + 支付金额 + + + + 确认支付 + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.wxss b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.wxss new file mode 100644 index 0000000..315ca4b --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingWaitPay/meetingWaitPay.wxss @@ -0,0 +1,36 @@ +.msgView { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-top: 150rpx; +} + +.msgView .time .van-count-down { + font-size: 28rpx; +} + +.msgView .price { + margin: 20rpx 0; + font-size: 70rpx; +} + +.msgView .title { + font-size: 28rpx; + color: gray; +} + +.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