From 8c56d1a198509125e3a3cc2ff4fef92581fa1c44 Mon Sep 17 00:00:00 2001
From: mike <esseak@gmail.com>
Date: Mon, 18 Mar 2024 19:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=94=AE=E7=9B=98=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/cu-keyboard/cu-keyboard.vue    | 31 ++++++++++++++-----
 agentApp/pages/payment/payment.vue            | 18 +++++++++--
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/agentApp/components/cu-keyboard/cu-keyboard.vue b/agentApp/components/cu-keyboard/cu-keyboard.vue
index 75d31e4..9b52a3d 100644
--- a/agentApp/components/cu-keyboard/cu-keyboard.vue
+++ b/agentApp/components/cu-keyboard/cu-keyboard.vue
@@ -1,8 +1,8 @@
 <template>
-	<view class="key-container" v-show="showMask">
-		<uni-transition :modeClass="['slide-bottom']" :show="show"
+<view class="key-container">
+		<!-- 	<uni-transition :modeClass="['slide-bottom']" :show="show"
 		:styles="{height:'100vh'}"
-		 :duration="duration">
+		 :duration="duration"> -->
 			<view class="key-content" @click.stop>
 				<slot></slot>
 				<view class="key-box block flex">
@@ -34,9 +34,10 @@
 						</view>
 					</view>
 				</view>
+				<view class="end-box" :style="'height:'+safeHeight+'px'"></view>
 			</view>
-		</uni-transition>
-	</view>
+<!-- 		</uni-transition>-->
+	</view> 
 </template>
 
 <script>
@@ -62,6 +63,10 @@ export default{
 			type:String,
 			default:'付款'
 		},
+		safeHeight:{
+			type:Number,
+			 default:0
+		},
 		confirmStyle:{
 			type:Object,
 			default:()=>{
@@ -209,8 +214,8 @@ export default{
 }
 .key-container{
 	position: fixed;
-	bottom: 0;
-	top:0;
+	 bottom: 0;
+	//top:0;
 	left:0;
 	right:0;
 	.key-content{
@@ -279,5 +284,15 @@ export default{
 		}
 	}
 }
-
+.end-box{
+	// position: fixed;
+	// left: 0;
+	// right: 0;
+	// bottom: 0;
+	// padding-bottom: constant(safe-area-inset-bottom);
+	// padding-bottom: env(safe-area-inset-bottom);
+	// margin-bottom: constant(safe-area-inset-bottom);
+	// margin-bottom: env(safe-area-inset-bottom);
+	//height: 40rpx;
+}
 </style>
diff --git a/agentApp/pages/payment/payment.vue b/agentApp/pages/payment/payment.vue
index 1b58ff2..f017fe9 100644
--- a/agentApp/pages/payment/payment.vue
+++ b/agentApp/pages/payment/payment.vue
@@ -31,7 +31,7 @@
 						￥
 					</view>
 					<view class="num">
-						<input type="text" class="pr-num" v-model="amount" placeholder="请输入金额"
+						<input type="text" class="pr-num" disabled  v-model="amount" placeholder="请输入金额"
 							placeholder-style="color: #cfcfcf;" />
 					</view>
 				</view>
@@ -56,7 +56,7 @@
 				</view>
 			</view>
 			<!-- 			<u-keyboard confirmText="1" mode="number" :closeOnClickOverlay="true" @close="close" :show="show" @confirm="confirm" @cancel="cancel"></u-keyboard> -->
-			<cu-keyboard ref="cukeyboard" @change="change" @confirm="confirm" @hide="hide"></cu-keyboard>
+			<cu-keyboard ref="cukeyboard" @change="change" @confirm="confirm" @hide="hide" :safeHeight="safeHeight"></cu-keyboard>
 		</view>
 	</view>
 </template>
@@ -77,7 +77,8 @@
 					name: '加载中...',
 					address: '',
 					logo: ''
-				}
+				},
+				safeHeight:0
 			}
 		},
 		onReady() {
@@ -86,6 +87,16 @@
 		onLoad() {
 			this.payment_code = uni.getStorageSync('payment_code')
 			this.getMerchantInfo()
+			let info = uni.getSystemInfoSync()
+			// alert(info.safeArea.bottom)
+			// alert(info.screenHeight)
+			// alert(info.safeArea.height)
+			
+			if(info.screenHeight!=info.safeArea.bottom){
+				this.safeHeight = 20;
+			}
+			
+			
 		},
 		methods: {
 			getMerchantInfo() {
@@ -188,6 +199,7 @@
 </script>
 
 <style lang="scss">
+	
 	.uni-page-body {
 		background: #ededed;
 	}