From 53ee154870006f49210d0bade4a1e6ed010e6c11 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Sun, 14 Apr 2024 10:28:43 +0800
Subject: [PATCH] =?UTF-8?q?202404-=E8=B0=83=E6=95=B4=E5=87=BA=E5=9C=BA?=
 =?UTF-8?q?=E8=AF=9D=E6=9C=AF=EF=BC=8C=E7=AF=AE=E7=90=83=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E6=9C=9F=E6=9D=A1=E4=BB=B6=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/currentEnter/index.js   |  6 ++++++
 pages/currentEnter/index.wxml |  8 ++++++--
 pages/currentEnter/index.wxss | 24 +++++++++++-------------
 pages/myEnters/index.js       |  6 ++++++
 pages/myEnters/index.wxml     |  8 ++++++--
 pages/myEnters/index.wxss     | 24 +++++++++++-------------
 6 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/pages/currentEnter/index.js b/pages/currentEnter/index.js
index af21931..8ae6499 100644
--- a/pages/currentEnter/index.js
+++ b/pages/currentEnter/index.js
@@ -128,6 +128,12 @@ Page({
       name: this.data.memberEnterDetail.lessonName,
       address: this.data.memberEnterDetail.address,
     })
+  },
+
+  backOut() {
+    wx.navigateBack({
+      delta: 1,
+    })
   }
 
 })
diff --git a/pages/currentEnter/index.wxml b/pages/currentEnter/index.wxml
index 8709866..82056e7 100644
--- a/pages/currentEnter/index.wxml
+++ b/pages/currentEnter/index.wxml
@@ -28,11 +28,11 @@
     <view class='cell'>
       <image src='../../images/42@3x.png' mode='aspectFit'></image>
       <text>运动时长</text>
-      <view class='cell-right-white'>{{memberEnterDetail.lessonCount}}</view>
+      <view class='cell-right-white'>{{memberEnterDetail.lessonCount}}分钟</view>
     </view>
     <view class='cell'>
       <image src='../../images/33@3x.png' mode='aspectFit'></image>
-      <text>费用</text>
+      <text>订单金额（押金）</text>
       <view class='cell-right-white'>￥{{memberEnterDetail.price}}</view>
     </view>
     <view class='cell' wx:if="{{memberEnterDetail.status == 2 && memberEnterDetail.payMoney > 0}}">
@@ -41,4 +41,8 @@
       <view class='cell-right-white'>￥{{memberEnterDetail.payMoney}}</view>
     </view>
   </view>
+  <view wx:if="{{memberEnterDetail.payStyle == 1}}" class="note-content">
+    本球场支持临时出门功能，10分钟内返回不再二次扣费，10分钟内不返回则将结算本次订单并退还剩余押金，请耐心等待
+  </view>
+  <view class='footer-btn' bindtap='backOut'>返回</view>
 </view>
diff --git a/pages/currentEnter/index.wxss b/pages/currentEnter/index.wxss
index 2b5a120..2bee4df 100644
--- a/pages/currentEnter/index.wxss
+++ b/pages/currentEnter/index.wxss
@@ -95,28 +95,26 @@
   color: rgba(255, 255, 255, 0.6);
 }
 
-.footer-box {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  width: 100%;
-  height: 100rpx;
+.note-content {
+  margin-top: 30rpx;
+  padding: 30rpx;
+  font-size: 36rpx;
+  color: #ffda2e;
 }
 
 .footer-btn {
-  flex: 1;
-  background: #767578;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100rpx;
+  background: #ffda2e;
   color: #1a191e;
   font-size: 32rpx;
   text-align: center;
   line-height: 100rpx;
 }
 
-.footer-btn.isActive {
-  background: #ffda2e;
-}
-
 .newplot {
   position: fixed;
   top: 200rpx;
diff --git a/pages/myEnters/index.js b/pages/myEnters/index.js
index 19b72b9..59f2975 100644
--- a/pages/myEnters/index.js
+++ b/pages/myEnters/index.js
@@ -128,6 +128,12 @@ Page({
       name: this.data.memberEnterDetail.lessonName,
       address: this.data.memberEnterDetail.address,
     })
+  },
+
+  backOut() {
+    wx.navigateBack({
+      delta: 1,
+    })
   }
 
 })
diff --git a/pages/myEnters/index.wxml b/pages/myEnters/index.wxml
index e5afea1..c689210 100644
--- a/pages/myEnters/index.wxml
+++ b/pages/myEnters/index.wxml
@@ -24,11 +24,11 @@
     <view class='cell'>
       <image src='../../images/42@3x.png' mode='aspectFit'></image>
       <text>运动时长</text>
-      <view class='cell-right-white'>{{memberEnterDetail.lessonCount}}</view>
+      <view class='cell-right-white'>{{memberEnterDetail.lessonCount}}分钟</view>
     </view>
     <view class='cell'>
       <image src='../../images/33@3x.png' mode='aspectFit'></image>
-      <text>费用</text>
+      <text>订单金额（押金）</text>
       <view class='cell-right-white'>￥{{memberEnterDetail.price}}</view>
     </view>
     <view class='cell' wx:if="{{memberEnterDetail.status == 2 && memberEnterDetail.payMoney > 0}}">
@@ -45,4 +45,8 @@
       </view>
     </view>
   </view>
+  <view wx:if="{{memberEnterDetail.payStyle == 1}}" class="note-content">
+    本球场支持临时出门功能，10分钟内返回不再二次扣费，10分钟内不返回则将结算本次订单并退还剩余押金，请耐心等待
+  </view>
+  <view class='footer-btn' bindtap='backOut'>返回</view>
 </view>
diff --git a/pages/myEnters/index.wxss b/pages/myEnters/index.wxss
index f9c3164..938f6ec 100644
--- a/pages/myEnters/index.wxss
+++ b/pages/myEnters/index.wxss
@@ -94,24 +94,22 @@
   color: rgba(255, 255, 255, 0.6);
 }
 
-.footer-box {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  width: 100%;
-  height: 100rpx;
+.note-content {
+  margin-top: 30rpx;
+  padding: 30rpx;
+  font-size: 36rpx;
+  color: #ffda2e;
 }
 
 .footer-btn {
-  flex: 1;
-  background: #767578;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100rpx;
+  background: #ffda2e;
   color: #1a191e;
   font-size: 32rpx;
   text-align: center;
   line-height: 100rpx;
 }
-
-.footer-btn.isActive {
-  background: #ffda2e;
-}