From 79c0cd44a064b02a587e2495c931d4ca9389d9b9 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 28 Mar 2024 16:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E4=BB=B7=E6=A0=BC=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingReservation/meetingReservation.wxml    |  4 ++--
 .../meetingRoom/meetingOrder/meetingOrder.js      | 14 ++++++--------
 .../meetingRoom/meetingOrder/meetingOrder.wxml    | 13 +++++++++++--
 .../meetingRoom/meetingOrder/meetingOrder.wxss    | 15 +++++++++++++++
 .../pages/meeting/meetingRoom/meetingRoom.wxml    |  6 +++++-
 .../pages/meeting/meetingRoom/meetingRoom.wxss    |  6 ++++++
 6 files changed, 45 insertions(+), 13 deletions(-)

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 @@
                 </view>
                 <view class="propOpen"></view>
                 <view class="priceView">
-                    <view class="price">￥{{room.money}}/</view>
+                    <view class="price">￥{{room.money}}/小时</view>
                     <text decode>&nbsp;</text>
-                    <view class="unit"> {{room.duration}}小时 起</view>
+                    <view class="unit">（{{room.duration}}小时起）</view>
                 </view>
             </view>
             <view class="imgView">
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 @@
         <view class="itemView">
             <view class="label">会议主题</view>
             <view class="content">
-                <van-field value="{{ title }}" placeholder="请输入会议主题" input-align="right" border="{{ false }}"  bind:change="titleChange"/>
+                <van-field value="{{ title }}" placeholder="请输入会议主题" input-align="right" border="{{ false }}" bind:change="titleChange" />
             </view>
         </view>
         <view class="itemView" bind:tap="jumpMeetingFacilities">
@@ -81,13 +81,22 @@
             <view class="title">合计:</view>
             <view class="price">￥{{totalAmount}}</view>
             <view class="describe">价格明细</view>
-            <van-icon name="arrow-up"  size="28rpx" color="red"/>
+            <van-icon name="arrow-up" size="28rpx" color="red" />
         </view>
         <view class="caseBtn" bind:tap="submitCase">提交订单</view>
     </view>
 
     <!-- 提示 -->
     <van-dialog id="van-dialog" />
+    <van-dialog use-slot title="价格明细" show="{{ priceDialogShow }}">
+        <view class="priceDialogView">
+            <view class="content">{{room.money}}/小时（{{room.duration}}小时起）</view>
+            <view class="remark">
+                <van-icon name="info-o" size="28rpx" />
+                {{room.remake}}
+            </view>
+        </view>
+    </van-dialog>
     <!-- 提示 -->
     <van-notify id="van-notify" />
 </view>
\ 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 @@
     <!-- 价格 -->
     <view class="priceView">
         <view class="leftLineTitle">价格</view>
-        <view class="content">￥{{detail.money}}/<text decode>&nbsp;</text>{{detail.duration}}小时 起</view>
+        <view class="content">￥{{detail.money}}/小时<text decode>&nbsp;</text>（{{detail.duration}}小时起）</view>
+        <view class="remark" wx:if="{{detail.remake}}">
+            <van-icon name="info-o" size="28rpx" />
+            {{detail.remake}}
+        </view>
     </view>
 
     <!-- 地图 -->
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;
 }