diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
index a35a234..1b8250e 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
@@ -31,9 +31,9 @@
- ¥{{room.money}}/
+ ¥{{room.money}}/小时
- {{room.duration}}小时 起
+ ({{room.duration}}小时起)
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
index 7691eff..97309ed 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
@@ -41,6 +41,7 @@ Page({
couponNotUseList: [],
countAmount: '',
totalAmount: '',
+ priceDialogShow: false,
},
/**
@@ -125,7 +126,7 @@ Page({
jumpMeetingCoupon() {
let _this = this;
wx.navigateTo({
- url : `/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon?type=1&couponId=${_this.data.couponId}&meetingRoomId=${_this.data.meetingRoomId}`,
+ url: `/pages/meeting/meetingRoom/meetingCoupon/meetingCoupon?type=1&couponId=${_this.data.couponId}&meetingRoomId=${_this.data.meetingRoomId}`,
})
},
@@ -148,12 +149,9 @@ Page({
// 价格明细
priceDetail() {
let _this = this
- Dialog.alert({
- title: '价格明细',
- message: `¥${_this.data.room.money}/${_this.data.room.duration}小时 起`,
- }).then(() => {
- // on close
- });
+ _this.setData({
+ priceDialogShow: true
+ })
},
// 提交订单
@@ -196,7 +194,7 @@ Page({
})
} else {
wx.reLaunch({
- url: '/pages/meeting/reservationRecord/meetingRecord/meetingRecord',
+ url: '/pages/meeting/reservationRecord/meetingRecord/meetingRecord',
})
}
} else {
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
index e2183a0..ba5605f 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml
@@ -44,7 +44,7 @@
会议主题
-
+
@@ -81,13 +81,22 @@
合计:
¥{{totalAmount}}
价格明细
-
+
提交订单
+
+
+ {{room.money}}/小时({{room.duration}}小时起)
+
+
+
\ 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 14976ec..656095a 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss
@@ -220,4 +220,19 @@
background: #4e96f8;
}
+.priceDialogView {
+ padding: 60rpx 40rpx;
+}
+.priceDialogView .content {
+ font-weight: bold;
+ font-size: 30rpx;
+ color: red;
+ text-align: center;
+}
+
+.priceDialogView .remark {
+ margin-top: 20rpx;
+ font-size: 28rpx;
+ color: #616364;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
index 939e8be..c898a99 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
@@ -46,7 +46,11 @@
价格
- ¥{{detail.money}}/ {{detail.duration}}小时 起
+ ¥{{detail.money}}/小时 ({{detail.duration}}小时起)
+
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
index ed05820..574bb90 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
@@ -130,6 +130,12 @@
color: red;
}
+.priceView .remark {
+ margin: 30rpx 20rpx;
+ font-size: 28rpx;
+ color: #5e5e5e;
+}
+
.mapView {
margin: 50rpx 20rpx;
}