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 @@
-
-
+
-
+
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}}"
/>