From 0996919f24162b8a761c63f1eadb0dada2b02d66 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 06 一月 2025 12:08:45 +0800
Subject: [PATCH] feat(活码支付): 金额和商户信息直接从活码查询

---
 components/key-bord/key-bord.vue |   70 ++++++++++++++++------------------
 1 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/components/key-bord/key-bord.vue b/components/key-bord/key-bord.vue
index feba484..8b613f8 100644
--- a/components/key-bord/key-bord.vue
+++ b/components/key-bord/key-bord.vue
@@ -1,21 +1,19 @@
 <template>
-  <view>
-    <view class="u-text-right u-font-30 color-666 u-p-20" @click="close">鍏抽棴</view>
-    <view class="bord-box u-row-between">
+  <view class="box">
+    <view class="u-text-right u-font-30 color-666 u-p-h-20 u-p-t-10" @click="close">鍏抽棴</view>
+    <view class="u-p-10 u-flex u-row-between">
       <view class="u-flex u-flex-wrap">
-        <view v-for="(num,index) in numList" :key="index" class="num-item" hover-class="num-hover"
-              @click="inputStr(num)">{{ num }}
-        </view>
+        <view v-for="(num,index) in numList" :key="index" class="num-item" hover-class="num-hover" @click="inputStr(num)">{{num}}</view>
       </view>
-      <view class="u-flex-col">
+      <view class="flex-1 u-flex-col">
         <view hover-class="num-hover" class="del-item u-flex u-row-center" @click="delStr">
           <image src="@/static/del-icon.png" class="del-btn"></image>
         </view>
-        <view hover-class="num-hover" :class="['pay-btn', 'u-font-30', 'color-fff', 'font-bold',{'disa-btn':Number(emitNum||'0')===0}]" @click="pay">浠樻
-        </view>
+        <view hover-class="num-hover" class="flex-1 pay-btn u-font-30 color-fff font-bold" @click="pay">浠樻</view>
       </view>
     </view>
   </view>
+
 </template>
 
 <script>
@@ -46,11 +44,11 @@
           // 灏忔暟鐐逛笉鑳介噸澶嶆坊鍔�
           return;
         }
-        if (this.emitNum == '0.0' && num == '0') {
-          //灏忔暟鐐瑰悗闈笉鑳芥槸涓や釜0
+        if (dotinx == this.emitNum.length - 3) {
+          //灏忔暟鐐瑰悗闈㈡渶澶氫袱浣�
           return;
         }
-        if (dotinx == this.emitNum.length - 3) {
+        if (this.emitNum == '0.0' && num == '0') {
           //灏忔暟鐐瑰悗闈㈡渶澶氫袱浣�
           return;
         }
@@ -63,9 +61,9 @@
           return;
         }
       }
-      if (num == '.' && this.emitNum == '') {
+      if (this.emitNum == '' && num == '.') {
         this.emitNum = '0.';
-      } else if (num != '.' && this.emitNum == '0') {
+      } else if (this.emitNum == '0' && num != '.') {
         this.emitNum = num;
       } else {
         this.emitNum += num;
@@ -79,7 +77,6 @@
     },
     // 鏀粯
     pay() {
-      if(Number(this.emitNum||'0')===0) return
       this.$emit('pay')
     },
     // 鍏抽棴杈撳叆妗�
@@ -90,25 +87,24 @@
 }
 </script>
 
-<style lang="scss">
-.bord-box {
+<style lang="scss" scoped>
+.box {
   background-color: #F5F5F5;
-  display: flex;
-  padding: 10rpx 10rpx 0;
-  font-size: 0;
+  transition: all 0.3s;
+  padding-bottom: constant(safe-area-inset-bottom); /*鍏煎 IOS<11.2*/
+  padding-bottom: env(safe-area-inset-bottom); /*鍏煎 IOS>11.2*/
 }
 
 .num-item {
   width: 175rpx;
-  height: 80rpx;
-  line-height: 80rpx;
+  height: 90rpx;
+  line-height: 90rpx;
   color: #333333;
-  font-size: 32rpx;
+  font-size: 36rpx;
   font-weight: bold;
   text-align: center;
   margin: 0 10rpx 10rpx 0;
   background-color: #FFFFFF;
-  border-radius: 8rpx;
 }
 
 .num-hover {
@@ -119,24 +115,24 @@
   width: 356rpx;
 }
 
-.pay-btn {
-  width: 175rpx;
-  flex: 1;
-  background-color: #D45159;
-  border-radius: 8rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 10rpx;
+.h-100 {
+  height: 100%;
 }
-.disa-btn{
-  opacity: 0.7;
+
+.pay-btn {
+  background-color: #D45159;
+  border-radius: 16rpx;
+  text-align: center;
+  height: 290rpx;
+  line-height: 290rpx;
+  vertical-align: middle;
+  color: white;
+  margin-bottom: 10rpx;
 }
 
 .del-item {
   width: 175rpx;
-  height: 80rpx;
-  border-radius: 8rpx;
+  height: 90rpx;
   margin-bottom: 10rpx;
   background-color: #FFFFFF;
 }

--
Gitblit v1.9.1