From 1765b1af438aefb3c94bc95553d1f01a620f7970 Mon Sep 17 00:00:00 2001
From: lxy <liuxinyu_x@163.com>
Date: Wed, 3 Jul 2024 09:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/account/detail/index.json |  1 -
 src/components/account/detail/index.less | 11 ++++++++++-
 src/components/account/detail/index.ts   |  9 ++++++++-
 src/components/account/detail/index.xml  | 12 +++++-------
 src/components/deposit/new/index.ts      |  1 +
 src/components/deposit/new/index.xml     |  1 +
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/account/detail/index.json b/src/components/account/detail/index.json
index 9abd597a..904a0d52 100644
--- a/src/components/account/detail/index.json
+++ b/src/components/account/detail/index.json
@@ -2,7 +2,6 @@
     "usingComponents": {
         "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index",
         "l-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/popup/index",
-        "l-arc-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/arc-popup/index",
         "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index",
         "deposit-new": "../../deposit/new/index"
     }
diff --git a/src/components/account/detail/index.less b/src/components/account/detail/index.less
index 29f71e73..ebfe81b0 100644
--- a/src/components/account/detail/index.less
+++ b/src/components/account/detail/index.less
@@ -91,7 +91,16 @@
 .ad-container {
     padding: 24rpx;
     background-color: white;
-    .safe-area-inset-bottom();
+    // .safe-area-inset-bottom();
+    height: 45vh;
+
+    .btnBox {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        .safe-area-inset-bottom();
+    }
 }
 
 .uf {
diff --git a/src/components/account/detail/index.ts b/src/components/account/detail/index.ts
index 6251e479..155e05aa 100644
--- a/src/components/account/detail/index.ts
+++ b/src/components/account/detail/index.ts
@@ -130,7 +130,13 @@ export default OakComponent({
             onGoToUnfinishedPay && onGoToUnfinishedPay(payId);
         },
         setDepositOpen(depositOpen: boolean) {
-            this.setState({ depositOpen });
+            this.setState({ depositOpen }, () => {
+                setTimeout(() => {
+                    this.setState({
+                        focus: depositOpen
+                    })
+                }, 333);
+            });
         },
         setUfOpen(ufOpen: boolean) {
             this.setState({ ufOpen });
@@ -222,6 +228,7 @@ export default OakComponent({
         depositing: false,
         setDepPriceMp(price: number | null) { this.setDepPrice(price) },
         setDepositChannelMp(depositChannel: PayChannel | undefined) { this.setDepositChannel(depositChannel) },
+        focus: false
     },
     lifetimes: {
         ready() {
diff --git a/src/components/account/detail/index.xml b/src/components/account/detail/index.xml
index 6bef4d89..bc77fd35 100644
--- a/src/components/account/detail/index.xml
+++ b/src/components/account/detail/index.xml
@@ -47,13 +47,10 @@
         </view>
     </view>
     <block wx:if="{{depositOpen}}">
-        <l-arc-popup  
+        <l-popup 
             show="{{depositOpen}}" 
-            direction="bottom"
+            content-align="bottom"
             bind:lintap="onDepositModalClose"
-            min-height="200" 
-            max-height="800" 
-            z-index="1000"
         >
             <view class="ad-container">
                 <deposit-new
@@ -65,8 +62,9 @@
                     onSetPrice="{{setDepPriceMp}}"
                     onSetChannel="{{setDepositChannelMp}}"
                     onSetPrice="{{setDepPriceMp}}"
+                    focus="{{focus}}"
                 />
-                <view style="margin-top: 12rpx">
+                <view class="btnBox">
                     <l-button
                         type="default"
                         size="long"                    
@@ -78,7 +76,7 @@
                     </l-button>
                 </view>
             </view>
-        </l-arc-popup>
+        </l-popup>
     </block>
     <block wx:if="{{ufOpen}}">
         <l-dialog 
diff --git a/src/components/deposit/new/index.ts b/src/components/deposit/new/index.ts
index 9ce0b559..a1a4e524 100644
--- a/src/components/deposit/new/index.ts
+++ b/src/components/deposit/new/index.ts
@@ -12,6 +12,7 @@ export default OakComponent({
         onSetPrice: (price: null | number) => undefined as void,
         onSetChannel: (channel: PayChannel) => undefined as void,
         loss: [0, '', {}] as [number, string, any],
+        focus: false,
     },
     data: {
         onChooseChannelMp(channel: PayChannel) { this.onChooseChannel(channel) },
diff --git a/src/components/deposit/new/index.xml b/src/components/deposit/new/index.xml
index e2881e2e..5e1e5e9e 100644
--- a/src/components/deposit/new/index.xml
+++ b/src/components/deposit/new/index.xml
@@ -9,6 +9,7 @@
                 type="number"
                 placeholder="一次最大充值{{depositMax}}元"
                 bind:lininput="onDepPriceChangeMp"
+                focus="{{focus}}"
             />
         </l-form-item>
         <block wx:if="{{price > 0}}">