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 @@ 运动时长 - {{memberEnterDetail.lessonCount}} + {{memberEnterDetail.lessonCount}}分钟 - 费用 + 订单金额(押金) ¥{{memberEnterDetail.price}} @@ -41,4 +41,8 @@ ¥{{memberEnterDetail.payMoney}} + + 本球场支持临时出门功能,10分钟内返回不再二次扣费,10分钟内不返回则将结算本次订单并退还剩余押金,请耐心等待 + + 返回 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 @@ 运动时长 - {{memberEnterDetail.lessonCount}} + {{memberEnterDetail.lessonCount}}分钟 - 费用 + 订单金额(押金) ¥{{memberEnterDetail.price}} @@ -45,4 +45,8 @@ + + 本球场支持临时出门功能,10分钟内返回不再二次扣费,10分钟内不返回则将结算本次订单并退还剩余押金,请耐心等待 + + 返回 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; -}