From db1607bda219ad6085fcdfa34bfac87e5dbc1eb0 Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Tue, 5 Mar 2024 19:18:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E9=80=89=E6=8B=A9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/api/meeting/meetingRoom.js | 9 +++++ .../meetingReservation.wxml | 3 +- .../meetingRoom/meetingOrder/meetingOrder.js | 38 ++++++++++++++++--- .../meetingOrder/meetingOrder.json | 3 +- .../meetingOrder/meetingOrder.wxml | 25 +++++++----- .../meetingOrder/meetingOrder.wxss | 30 ++++++++++----- .../meeting/meetingRoom/meetingRoom.wxml | 2 +- 7 files changed, 82 insertions(+), 28 deletions(-) diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js index 70b11fe..9583063 100644 --- a/miniprogram/api/meeting/meetingRoom.js +++ b/miniprogram/api/meeting/meetingRoom.js @@ -55,4 +55,13 @@ export function getCustomerTicketRq(data) { method: "post", data }); +} + +// 计算会议室金额 +export function calculateMeetingRoomAmountRq(data) { + return request({ + url: '/api/roomContent/calculateMeetingRoomAmount', + method: "post", + data + }); } \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml index 1217179..4fd511b 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml @@ -32,7 +32,8 @@ ￥ {{room.money}}/ - 小时 起 +   + {{room.duration}}小时 起 diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index e9801b0..2d01e87 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -1,8 +1,11 @@ const app = getApp() +import Dialog from '@vant/weapp/dialog/dialog'; + import { meetingRoomDetailRq, - getCustomerTicketRq + getCustomerTicketRq, + calculateMeetingRoomAmountRq } from "../../../../api/meeting/meetingRoom.js" import { @@ -30,10 +33,12 @@ Page({ room: {}, userData: {}, couponId: '', - couponData : {}, + couponData: {}, couponList: [], couponUseList: [], couponNotUseList: [], + countAmount: '', + totalAmount: '', }, /** @@ -130,6 +135,16 @@ Page({ }) }, + // 价格明细 + priceDetail() { + Dialog.alert({ + title: '价格明细', + message: '弹窗内容', + }).then(() => { + // on close + }); + }, + // 提交订单 submitCase() { wx.redirectTo({ @@ -150,13 +165,26 @@ Page({ onShow() { console.log('onShow'); let _this = this - _this.data.couponData - if(_this.data.couponId){ - let couponData = _this.data.couponList.find(item=> item.id == _this.data.couponId) + // 更新选择的优惠卷 + if (_this.data.couponId) { + let couponData = _this.data.couponList.find(item => item.id == _this.data.couponId) _this.setData({ couponData }) } + // 查询金额 + calculateMeetingRoomAmountRq({ + "startTime": _this.data.startTime, + "endDate": _this.data.endTime, + "roomContentId": _this.data.meetingRoomId, + "ticketId": _this.data.couponId + }).then(res => { + console.log('calculateMeetingRoomAmountRq', res); + _this.setData({ + countAmount: res.amount.totalMoney, + totalAmount: res.amount.paidMoney, + }) + }) }, /** diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.json b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.json index 2a540be..e3024cb 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.json +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.json @@ -2,8 +2,7 @@ "usingComponents": { "van-icon": "@vant/weapp/icon/index", "van-field": "@vant/weapp/field/index", - "van-checkbox": "@vant/weapp/checkbox/index", - "van-checkbox-group": "@vant/weapp/checkbox-group/index" + "van-dialog": "@vant/weapp/dialog/index" }, "navigationBarTitleText": "预约信息" } \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index 9f3525e..bdb89b0 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -14,12 +14,12 @@ {{room.capacityNum}}人间 | {{room.roomName}} | {{room.buildingName}} - #{{roomItem.name}} + #{{roomItem.name}} - ￥ {{room.money}}/ - 小时 起 + ￥{{room.money}}/ +  {{room.duration}}小时 起 @@ -44,26 +44,26 @@ 会议主题 - + 会议服务 - + 优惠券 - {{couponId? couponData.ticketName : couponUseList.length + '张可用' + '（共计'+ couponList.length +'张）'}} - + {{couponId? couponData.ticketName : couponUseList.length + '张可用' + '（共计'+ couponList.length +'张）'}} + 总金额 - ￥200.00 + ￥{{countAmount}} @@ -77,10 +77,15 @@ - + 合计: - ￥ 200.00 + ￥{{totalAmount}} + 价格明细 提交订单 + + + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss index 89058ee..7b5694e 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss @@ -164,6 +164,10 @@ color: gray; } +.fillMsgView .itemView .content .coupon.select { + color: black; +} + .fillMsgView .itemView .content .price { font-size: 30rpx; } @@ -176,36 +180,44 @@ margin: 40rpx 0 50rpx; } -.protocolTitle{ +.protocolTitle { color: #76aef9; } -.amountView{ +.amountView { display: flex; justify-content: space-between; align-items: center; padding: 0 38rpx; } -.amountView .priceView{ +.amountView .priceView { display: flex; justify-content: flex-start; - align-items: flex-start; + align-items: center; } -.amountView .priceView .title{ +.amountView .priceView .title { font-size: 32rpx; } -.amountView .priceView .price{ +.amountView .priceView .price { color: red; font-size: 34rpx; } - .amountView .caseBtn{ - border-radius: 10rpx; +.amountView .priceView .describe { + color: red; + font-size: 28rpx; + margin-left: 6rpx; +} + +.amountView .caseBtn { + border-radius: 10rpx; padding: 16rpx 60rpx; color: white; font-size: 30rpx; background: #4e96f8; - } +} + + diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml index 5ef3370..91988ea 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml @@ -54,7 +54,7 @@ 价格 - ￥ {{detail.money}}/小时 起 + ￥ {{detail.money}}/ {{detail.duration}}小时 起