From 4e77025e5d84ac4de86dfeccfb9075a75eafdd61 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 9 May 2024 14:39:01 +0800
Subject: [PATCH 01/12] number -> digit

---
 src/subpackage/order/pages/value_card/detail/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/subpackage/order/pages/value_card/detail/detail.vue b/src/subpackage/order/pages/value_card/detail/detail.vue
index 8f47c33..a3c8c8e 100644
--- a/src/subpackage/order/pages/value_card/detail/detail.vue
+++ b/src/subpackage/order/pages/value_card/detail/detail.vue
@@ -109,7 +109,7 @@
                             <view class="vi-box">
                                 <view class="vb-btn" @click="deductAmount--"></view>
                                 <view class="vb-ipt">
-                                    <input v-model="deductAmount" type="number" />
+                                    <input v-model="deductAmount" type="digit" />
                                 </view>
                                 <view class="vb-btn" @click="deductAmount++"></view>
                             </view>

From afb9cd4735a04a1f0613b4d4488ce531eb5e4a94 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 9 May 2024 18:19:54 +0800
Subject: [PATCH 02/12] add tid1505 style

---
 src/pages.json                                     |  17 +++
 src/subpackage/wallet/components/wallet_mask.vue   |  22 +++
 src/subpackage/wallet/components/wallet_modal.vue  |  49 +++++++
 .../wallet/components/wallet_modal_success.vue     |  45 ++++++
 src/subpackage/wallet/components/wm_button.vue     |  31 ++++
 .../wallet/pages/baofu_withdraw/index.vue          |  28 ++++
 .../pages/baofu_withdraw/modules/baofu_item.vue    | 159 +++++++++++++++++++++
 src/subpackage/wallet/pages/index/index.vue        |  53 +++++++
 .../wallet/pages/index/modules/wallet_info.vue     | 134 +++++++++++++++++
 9 files changed, 538 insertions(+)
 create mode 100644 src/subpackage/wallet/components/wallet_mask.vue
 create mode 100644 src/subpackage/wallet/components/wallet_modal.vue
 create mode 100644 src/subpackage/wallet/components/wallet_modal_success.vue
 create mode 100644 src/subpackage/wallet/components/wm_button.vue
 create mode 100644 src/subpackage/wallet/pages/baofu_withdraw/index.vue
 create mode 100644 src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
 create mode 100644 src/subpackage/wallet/pages/index/index.vue
 create mode 100644 src/subpackage/wallet/pages/index/modules/wallet_info.vue

diff --git a/src/pages.json b/src/pages.json
index 80a1f10..f14da70 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -711,6 +711,23 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "subpackage/wallet",
+			"pages": [
+				{
+					"path": "pages/index/index",
+					"style" : {
+						"navigationBarTitleText": "钱包&提现"
+					}
+				},
+				{
+					"path": "pages/baofu_withdraw/index",
+					"style" : {
+						"navigationBarTitleText": "新宝付提现"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/src/subpackage/wallet/components/wallet_mask.vue b/src/subpackage/wallet/components/wallet_mask.vue
new file mode 100644
index 0000000..d926835
--- /dev/null
+++ b/src/subpackage/wallet/components/wallet_mask.vue
@@ -0,0 +1,22 @@
+<template>
+    <view class="wallet-mask">
+
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .wallet-mask{
+        position: fixed;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        right: 0;
+        background: rgba($color: #000000, $alpha: .5);
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wallet_modal.vue b/src/subpackage/wallet/components/wallet_modal.vue
new file mode 100644
index 0000000..17960ca
--- /dev/null
+++ b/src/subpackage/wallet/components/wallet_modal.vue
@@ -0,0 +1,49 @@
+<template>
+    <view class="wallet-mask">
+        <view class="wm-content">
+            <image class="wc-close"></image>
+            <view class="wc-title">提现成功</view>
+            <slot></slot>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .wallet-mask{
+        position: fixed;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        right: 0;
+        background: rgba($color: #000000, $alpha: .5);
+        .wm-content{
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+            padding-top: 80upx;
+            padding-bottom: 80upx;
+            width: 620upx;
+            border-radius: 10upx;
+            background: #fff;
+            .wc-close{
+                position: absolute;
+                right: 30upx;
+                top: 30upx;
+                width: 34upx;
+                height: 34upx;
+                background: #000;
+            }
+            .wc-title{
+                text-align: center;
+                @include flcw(32upx, 44upx, #333333, 500);
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wallet_modal_success.vue b/src/subpackage/wallet/components/wallet_modal_success.vue
new file mode 100644
index 0000000..f5eb389
--- /dev/null
+++ b/src/subpackage/wallet/components/wallet_modal_success.vue
@@ -0,0 +1,45 @@
+<template>
+    <wallet-modal>
+        <view class="wallet-modal-success">
+            <image class="wms-icon"></image>
+            <view class="wms-des">充值成功！</view>
+            <view class="wallet-modal-button">
+                <wallet-modal-button>提现记录</wallet-modal-button>
+            </view>
+        </view>
+    </wallet-modal>
+</template>
+
+<script>
+import walletModal from './wallet_modal.vue';
+import wmButton from './wm_button.vue';
+export default {
+    components: {
+        'wallet-modal': walletModal,
+        'wallet-modal-button': wmButton
+    }
+}
+</script>
+
+<style lang="scss">
+    .wallet-modal-success{
+        padding-top: 50upx;
+        .wms-icon{
+            margin: 0 auto;
+            display: block;
+            width: 100upx;
+            height: 100upx;
+            background: skyblue;
+        }
+        .wms-des{
+            padding: 0 60upx;
+            margin-top: 28upx;
+            text-align: center;
+            @include flcw($color: #1A1A1A);
+        }
+        .wallet-modal-button{
+            margin-top: 86upx;
+            @include ctf(center);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wm_button.vue b/src/subpackage/wallet/components/wm_button.vue
new file mode 100644
index 0000000..527507c
--- /dev/null
+++ b/src/subpackage/wallet/components/wm_button.vue
@@ -0,0 +1,31 @@
+<template>
+    <view class="wallet-modal-button" :class="{ 'green': green }">
+        <slot>充值记录</slot>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        green: {
+            type: Boolean,
+            default: false
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .wallet-modal-button{
+        width: 240upx;
+        height: 88upx;
+        border: 2upx solid $mColor;
+        border-radius: 10upx;
+        text-align: center;
+        @include flcw($color: $mColor, $height: 84upx);
+        &.green{
+            background: $mColor;
+            color: #fff;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/index.vue b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
new file mode 100644
index 0000000..a3e653c
--- /dev/null
+++ b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
@@ -0,0 +1,28 @@
+<template>
+    <view class="baofu-index">
+        <view class="bi-item">
+            <baofu-item></baofu-item>
+        </view>
+        <view class="bi-item">
+            <baofu-item personal></baofu-item>
+        </view>
+    </view>
+</template>
+
+<script>
+import baofuItem from './modules/baofu_item.vue';
+export default {
+    components: {
+        'baofu-item': baofuItem
+    }
+}
+</script>
+
+<style lang="scss">
+    .baofu-index{
+        padding: 32upx;
+        .bi-item{
+            margin-top: 32upx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
new file mode 100644
index 0000000..2141dac
--- /dev/null
+++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
@@ -0,0 +1,159 @@
+<template>
+    <view class="baofu-item">
+        <view class="bi-bar" :class="{ 'bb-personal': personal }">
+            <view class="bb-name-bar">
+                <view class="bnb-left">
+                    <view class="bl-txt">广州欧轩网络有限公司</view>
+                    <view class="bl-tag" >企业</view>
+                </view>
+                <view class="bnb-right">
+                    <view class="br-txt">提现记录</view>
+                    <image class="wb-icon"></image>
+                </view>
+            </view>
+            <view class="bb-account-num">账户号：CM660000000095108678</view>
+        </view>
+        <view class="bi-info">
+            <view class="bi-balance">
+                <view class="bb-money">
+                    19990.00
+                </view>
+                <view class="bb-btn">充值</view>
+            </view>
+            <view class="bi-tip">
+                <view class="bt-txt">可提现资金(元)</view>
+                <image class="bt-icon"></image>
+            </view>
+            <view class="bi-mony-info">
+                <view class="bmi-item">
+                    <view class="bi-num">23525.89</view>
+                    <view class="bi-tip">
+                        <view class="bt-txt">总资产(元)</view>
+                        <image class="bt-icon"></image>
+                    </view>
+                </view>
+                <view class="bmi-item">
+                    <view class="bi-num">23525.89</view>
+                    <view class="bi-tip">
+                        <view class="bt-txt">在途资金(元)</view>
+                        <image class="bt-icon"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        personal: {
+            type: Boolean,
+            default: false
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .baofu-item{
+        border-radius: 30upx;
+        overflow: hidden;
+        background: #fff;
+        .bi-tip{
+            @include ctf;
+            .bt-txt{
+                @include flcw(24upx, 34upx, #9C9C9F);
+            }
+            .bt-icon{
+                margin-left: 6upx;
+                width: 28upx;
+                height: 28upx;
+                background: skyblue;
+            }
+        }
+        .bi-bar{
+            padding: 26upx 32upx 18upx;
+            padding-left: 32upx;
+            padding-right: 32upx;
+            background: $mColor;
+            &.bb-personal{
+                background: #585F69;
+                .bl-tag{
+                    background: #68C43B !important;
+                }
+            }
+            .bb-account-num{
+                @include flcw(24upx, 44upx, #FFFFFF);
+            }
+            .bb-name-bar{
+                @include ctf(space-between);
+                .bnb-left{
+                    flex-grow: 1;
+                    @include ctf;
+                    .bl-txt{
+                        @include flcw(28upx, 44upx, #fff, 500);
+                        @include tHide;
+                    }
+                    .bl-tag{
+                        margin-left: 6upx;
+                        padding: 0upx 6upx;
+                        border-radius: 6upx;
+                        background: #32C5FF;
+                        @include flcw(20upx, 28upx, #fff);
+
+                    }
+                }
+                .bnb-right{
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    @include ctf(flex-end);
+                    .br-txt{
+                        @include flcw(20upx, 28upx, rgba($color: #fff, $alpha: .57));
+                    }
+                    .wb-icon{
+                        flex-shrink: 0;
+                        width: 20upx;
+                        height: 20upx;
+                        background: skyblue;
+                    }
+                }
+            }
+        }
+        .bi-info{
+            padding: 40upx 32upx;
+            .bi-balance{
+                @include ctf(space-between);
+                .bb-money{
+                    @include flcw(84upx, 96upx, #000000, 700);
+                    @include tHide;
+                }
+                .bb-btn{
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    width: 160upx;
+                    text-align: center;
+                    border-radius: 10upx;
+                    background: #FF873D;
+                    @include flcw(28upx, 72upx, #FFFFFF, 500);
+                }
+            }
+            .bi-mony-info{
+                margin-top: 58upx;
+                @include ctf;
+                .bmi-item{
+                    flex-shrink: 0;
+                    flex-grow: 0;
+                    width: 50%;
+                    .bi-num{
+                        @include flcw(44upx, 52upx, #000000, 700);
+                        @include tHide;
+                    }
+                }
+            }
+
+        }
+        
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
new file mode 100644
index 0000000..abe56d6
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -0,0 +1,53 @@
+<template>
+    <view class="wallet-index">
+        <wallet-info></wallet-info>
+        <view class="wi-tips">
+            <view class="wt-tit">温馨提示：</view>
+            <view class="wt-content">
+                <text class="wc-txt">
+                    如需要分账账户可以自己单独提现，请访问 https://sps.ouxuanzhineng.cn 
+                    <text class="wt-copy">复制</text>
+                    \r\n账户为宝付的商户号，密码为申请时预留的手机号码
+                </text>
+            </view>
+        </view>
+        <wallet-modal></wallet-modal>
+    </view>
+</template>
+
+<script>
+import walletInfo from './modules/wallet_info.vue'
+import walletMask from '../../components/wallet_mask.vue'
+import walletModalSuccess from '../../components/wallet_modal_success.vue'
+export default {
+    components: {
+        'wallet-info': walletInfo,
+        'wallet-mask': walletMask,
+        'wallet-modal': walletModalSuccess,
+        
+    }
+}
+</script>
+
+<style lang="scss">
+    .wallet-index{
+        padding: 32upx;
+        .wi-tips{
+            margin-top: 24upx;
+            padding: 40upx;
+            border-radius: 30upx;
+            background: #fff;
+            .wt-tit{
+                @include flcw($color: #9A9A9D);
+            }
+            .wt-content{
+                margin-top: 20upx;
+                @include flcw($color: #1A1A1A, $height: 49upx);
+                .wt-copy{
+                    padding: 0 12upx;
+                    @include flcw($color: $mColor);
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
new file mode 100644
index 0000000..1393744
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -0,0 +1,134 @@
+<template>
+    <view class="wallet-info">
+        <view class="wi-bar">
+            <view class="wb-txt">钱包查账可登录后台查阅</view>
+            <image class="wb-icon"></image>
+        </view>
+        <view class="wi-account">
+            <veiw class="wa-top">
+                <view class="wt-name">欧轩内部钱包账户</view>
+                <view class="wt-record">
+                    <text>充值记录</text>
+                    <image class="wr-icon"></image>
+                </view>
+            </veiw>
+            <view class="wa-tip">(用于购买服务使用)</view>
+            <view class="wa-balance">
+                <view class="wb-money">
+                    <text class="wm-unit">¥</text>
+                    19990.00
+                </view>
+                <view class="wb-btn">充值</view>
+            </view>
+        </view>
+        <view class="wi-btns">
+            <view class="wb-item">
+                <text class="wi-txt">宝付提现</text>
+            </view>
+            <view class="wb-item">
+                <image class="wi-icon"></image>
+                <text class="wi-txt">抖音提现</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .wallet-info{
+        border-radius: 30upx;
+        overflow: hidden;
+        background: #fff;
+        .wi-bar{
+            padding-left: 40upx;
+            padding-right: 40upx;
+            height: 76upx;
+            background: #585F69;
+            @include ctf(space-between);
+            .wb-txt{
+                @include flcw(24upx, 34upx, #FFFFFF);
+            }
+            .wb-icon{
+                width: 20upx;
+                height: 20upx;
+                background: skyblue;
+            }
+        }
+        .wi-account{
+            padding: 36upx 40upx 50upx;
+            .wa-top{
+                @include ctf(space-between);
+                .wt-name{
+                    @include flcw(32upx, 44upx, #1A1A1A, 500);
+                    @include tHide;
+                }
+                .wt-record{
+                    @include ctf(flex-end);
+                    @include flcw(24upx, 34upx, #9C9C9F);
+                    .wr-icon{
+                        margin-left: 4upx;
+                        width: 20upx;
+                        height: 20upx;
+                        background: skyblue;
+                    }
+                }
+            }
+            .wa-tip{
+                margin-top: 8upx;
+                @include flcw(24upx, 34upx, #9C9C9F);
+            }
+            .wa-balance{
+                margin-top: 68upx;
+                @include ctf(space-between);
+                .wb-money{
+                    @include flcw(84upx, 96upx, #000000, 700);
+                    @include tHide;
+                    .wm-unit{
+                        font-size: 44upx;
+                    }
+                }
+                .wb-btn{
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    width: 120upx;
+                    text-align: center;
+                    border-radius: 10upx;
+                    background: #FF873D;
+                    @include flcw(24upx, 56upx, #FFFFFF, 500);
+                }
+            }
+        }
+        .wi-btns{
+            border-top: 1px solid rgba($color: #000000, $alpha: .1);
+            padding: 32upx 40upx 40upx;
+            @include ctf(space-between);
+            .wb-item{
+                flex-grow: 0;
+                flex-shrink: 0;
+                height: 112upx;
+                width: 284upx;
+                border-radius: 26upx;
+                background-image: linear-gradient(180deg, #7ACFEE 0%, #44A1D7 100%);
+                @include ctf(center);
+                .wi-icon{
+                    flex-shrink: 0;
+                    margin-right: 4upx;
+                    width: 44upx;
+                    height: 44upx;
+                    background: skyblue;
+                }
+                .wi-txt{
+                    @include flcw(32upx, 44upx, #FFFFFF, 500);
+                }
+                &+.wb-item{
+                    background-image: linear-gradient(180deg, #4A4A4A 0%, #000000 100%);
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file

From 5090bb6e4907a9419e07a978efd3543a8bb43699 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 13 May 2024 18:03:18 +0800
Subject: [PATCH 03/12] add tid1505 style

---
 src/pages.json                                     |  12 +++
 src/subpackage/wallet/components/bf_withdraw.vue   |  69 ++++++++++++
 .../wallet/components/dy_withdraw_apply.vue        | 116 +++++++++++++++++++++
 .../wallet/components/time_selection.vue           |  82 +++++++++++++++
 src/subpackage/wallet/components/top_up.vue        |  56 ++++++++++
 src/subpackage/wallet/components/wallet_modal.vue  |   9 +-
 .../wallet/pages/baofu_withdraw/index.vue          |   5 +-
 .../wallet/pages/douyin_withdraw/index.vue         |  74 +++++++++++++
 src/subpackage/wallet/pages/index/index.vue        |   8 +-
 .../wallet/pages/index/recharge_record.vue         |  20 ++++
 10 files changed, 444 insertions(+), 7 deletions(-)
 create mode 100644 src/subpackage/wallet/components/bf_withdraw.vue
 create mode 100644 src/subpackage/wallet/components/dy_withdraw_apply.vue
 create mode 100644 src/subpackage/wallet/components/time_selection.vue
 create mode 100644 src/subpackage/wallet/components/top_up.vue
 create mode 100644 src/subpackage/wallet/pages/douyin_withdraw/index.vue
 create mode 100644 src/subpackage/wallet/pages/index/recharge_record.vue

diff --git a/src/pages.json b/src/pages.json
index f14da70..98fd2c2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -722,6 +722,18 @@
 					}
 				},
 				{
+					"path": "pages/douyin_withdraw/index",
+					"style" : {
+						"navigationBarTitleText": "抖音提现"
+					}
+				},
+				{
+					"path": "pages/index/recharge_record",
+					"style" : {
+						"navigationBarTitleText": "充值记录"
+					}
+				},
+				{
 					"path": "pages/baofu_withdraw/index",
 					"style" : {
 						"navigationBarTitleText": "新宝付提现"
diff --git a/src/subpackage/wallet/components/bf_withdraw.vue b/src/subpackage/wallet/components/bf_withdraw.vue
new file mode 100644
index 0000000..17ab4fc
--- /dev/null
+++ b/src/subpackage/wallet/components/bf_withdraw.vue
@@ -0,0 +1,69 @@
+<template>
+    <wallet-modal title="提现">
+        <view class="bf-withdraw">
+            <view class="bw-txt">广州欧轩网络有限公司</view>
+            <view class="bw-txt">
+                可提现资金：
+                <text class="bt-price">399.63元</text>
+            </view>
+            <input type="text" class="bw-ipt">
+            
+            <view class="dwa-tip">
+                <view class="dt-tit">温馨提示</view>
+                <view class="dt-desc">1. 提现一般当天到账，具体以银行到账时间为准！</view>
+                <view class="dt-desc">2. 每提现一次(不限提现金额)，收取0.5元手续费</view>
+            </view>
+
+            <view class="dwa-btn">
+                <wm-button green>确认提现</wm-button>
+            </view>
+        </view>
+    </wallet-modal>
+</template>
+
+<script>
+import walletModal from './wallet_modal.vue';
+import wmButton from './wm_button.vue';
+export default {
+    components: {
+        'wallet-modal': walletModal,
+        'wm-button': wmButton
+    }
+}
+</script>
+
+<style lang="scss">
+    .bf-withdraw{
+        padding: 56upx 50upx 0upx;
+        .bw-txt{
+            @include flcw(28upx, 48upx, #1A1A1A);
+            .bt-price{
+                color: $mColor;
+            }
+        }
+        .bw-ipt{
+            box-sizing: border-box;
+            width: 100%;
+            margin-top: 28upx;
+            height: 108upx;
+            border-radius: 10upx;
+            padding: 0 20upx;
+            font-size: 32upx;
+            color: #1A1A1A;
+            background: #F2F2F7;
+        }
+        .dwa-tip{
+            margin-top: 18upx;
+            .dt-tit{
+                @include flcw(24upx, 44upx, #9A9A9D);
+            }
+            .dt-desc{
+                @include flcw(24upx, 44upx, #1A1A1A);
+            }
+        }
+        .dwa-btn{
+            margin-top: 62upx;
+            @include ctf(center);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/dy_withdraw_apply.vue b/src/subpackage/wallet/components/dy_withdraw_apply.vue
new file mode 100644
index 0000000..d2b7729
--- /dev/null
+++ b/src/subpackage/wallet/components/dy_withdraw_apply.vue
@@ -0,0 +1,116 @@
+<template>
+    <wallet-modal title="申请提现">
+        <view class="dy-withdraw-apply">
+            <view class="dwa-balance">
+                <text class="dwab-txt">可提现资金：</text>
+                399.63元
+            </view>
+            <scroll-view class="dwa-scroll" scroll-y>
+                <view class="dwa-opt-line" v-for="i in 5" :key="i">
+                    <view class="dol-name">*提现金额</view>
+                    <input type="text" class="dol-ipt" placeholder="请输入提现金额">
+                </view>
+                <view class="dwa-opt-line">
+                    <view class="dol-name">*银行名称</view>
+                    <picker class="dol-picker">
+                        <view class="dp-frame">
+                            <input type="text" class="df-ipt" placeholder="请选择">
+                            <image class="df-icon"></image>
+                        </view>
+                    </picker>
+                </view>
+            </scroll-view>
+            
+            <view class="dwa-tip">
+                <view class="dt-tit">温馨提示</view>
+                <view class="dt-desc">1、账户请预留一定的余额，避免余额不足导致退款失败！</view>
+                <view class="dt-desc">2、提现申请成功提交后，预计在3~7个工作日内进行处理。</view>
+            </view>
+            <view class="dwa-btn">
+                <wm-button green>确认提现</wm-button>
+            </view>
+        </view>
+    </wallet-modal>
+</template>
+
+<script>
+import walletModal from './wallet_modal.vue';
+import wmButton from './wm_button.vue';
+export default {
+    components: {
+        'wallet-modal': walletModal,
+        'wm-button': wmButton
+    }
+}
+</script>
+
+<style lang="scss">
+    .dy-withdraw-apply{
+        padding: 36upx 50upx 0upx;
+        .dwa-balance{
+            @include flcw(28upx, 48upx, $mColor);
+            @include tHide;
+            .dwab-txt{
+                color: #1A1A1A;
+            }
+        }
+        .dwa-scroll{
+            margin-top: 20upx;
+            height: 440upx;
+        }
+        .dwa-opt-line{
+            @include ctf(space-between);
+            &+.dwa-opt-line{
+                margin-top: 20upx;
+            }
+            .dol-name{
+                @include flcw(24upx, 34upx, #1A1A1A);
+            }
+            .dol-ipt{
+                box-sizing: border-box;
+                flex-grow: 0;
+                width: 392upx;
+                height: 108upx;
+                padding: 0 20upx;
+                border-radius: 10upx;
+                background: #F2F2F7;
+                @include flcw(24upx, 34upx, #1A1A1A);
+            }
+            .dol-picker{
+                flex-shrink: 0;
+                .dp-frame{
+                    width: 392upx;
+                    height: 108upx;
+                    padding: 0 20upx;
+                    border-radius: 10upx;
+                    background: #F2F2F7;
+                    @include ctf(space-between);
+                    .df-ipt{
+                        flex-grow: 1;
+                        height: 100%;
+                        @include flcw(24upx, 34upx, #1A1A1A);
+                    }
+                    .df-icon{
+                        flex-shrink: 0;
+                        width: 20upx;
+                        height: 20upx;
+                        background: skyblue;
+                    }
+                }
+            }
+        }
+        .dwa-tip{
+            margin-top: 18upx;
+            .dt-tit{
+                @include flcw(24upx, 44upx, #9A9A9D);
+            }
+            .dt-desc{
+                @include flcw(24upx, 44upx, #1A1A1A);
+            }
+        }
+        .dwa-btn{
+            margin-top: 62upx;
+            @include ctf(center);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/time_selection.vue b/src/subpackage/wallet/components/time_selection.vue
new file mode 100644
index 0000000..a39604c
--- /dev/null
+++ b/src/subpackage/wallet/components/time_selection.vue
@@ -0,0 +1,82 @@
+<template>
+    <view class="time-selection">
+        <view class="ts-left">
+            <picker class="tl-class">
+                <view class="tl-frame">
+                    <input type="text" class="tf-time" disabled value="2021-12-12">
+                    <image class="tf-icon"></image>
+                </view>
+            </picker>
+            <view class="tl-txt">至</view>
+            <picker class="tl-class">
+                <view class="tl-frame">
+                    <input type="text" class="tf-time" disabled value="2021-12-12">
+                    <image class="tf-icon"></image>
+                </view>
+            </picker>
+        </view>
+        <view class="ts-right">
+            <text class="tr-txt">筛选</text>
+            <image class="tr-icon"></image>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .time-selection{
+        padding: 26upx 24upx;
+        background: #fff;
+        @include ctf(space-between);
+        .ts-left{
+            @include ctf;
+            .tl-class{
+                flex-shrink: 0;
+            }
+            .tl-frame{
+                flex-shrink: 0;
+                padding: 0 16upx;
+                height: 92upx;
+                width: 240upx;
+                border-radius: 10upx;
+                background: #F2F2F7;
+                @include ctf(space-between);
+                .tf-time{
+                    flex-grow: 1;
+                    box-sizing: border-box;
+                    height: 100%;
+                    @include flcw(28upx, 40upx, #1A1A1A);
+                }
+                .tf-icon{
+                    margin-left: 4upx;
+                    flex-shrink: 0;
+                    width: 20upx;
+                    height: 20upx;
+                    background: skyblue;
+                }
+            }
+            .tl-txt{
+                margin: 0 18upx;
+                @include flcw(32upx, 44upx, #1A1A1A);
+            }
+        }
+        .ts-right{
+            @include ctf(flex-end);
+            .tr-txt{
+                margin-right: 12upx;
+                @include flcw(28upx, 40upx, #9C9C9F);
+            }
+            .tr-icon{
+                flex-shrink: 0;
+                width: 40upx;
+                height: 40upx;
+                background: skyblue;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/top_up.vue b/src/subpackage/wallet/components/top_up.vue
new file mode 100644
index 0000000..40c05b2
--- /dev/null
+++ b/src/subpackage/wallet/components/top_up.vue
@@ -0,0 +1,56 @@
+<template>
+    <wallet-modal title="充值">
+        <view class="top-up">
+            <view class="tu-txt">
+                可提现资金：
+                <text class="bt-price">399.63元</text>
+            </view>
+
+            <input type="text" class="bw-ipt">
+
+            <view class="tu-btns">
+                <wm-button>取消</wm-button>
+                <wm-button green>确认</wm-button>
+            </view>
+        </view>
+    </wallet-modal>
+</template>
+
+<script>
+import walletModal from './wallet_modal.vue';
+import wmButton from './wm_button.vue';
+export default {
+    components: {
+        'wallet-modal': walletModal,
+        'wm-button': wmButton
+    }
+}
+</script>
+
+<style lang="scss">
+    .top-up{
+        padding: 60upx 50upx 0;
+        .tu-txt{
+            @include flcw(28upx, 48upx, #1A1A1A);
+            .bt-price{
+                color: $mColor;
+            }
+        }
+        .bw-ipt{
+            box-sizing: border-box;
+            width: 100%;
+            margin-top: 20upx;
+            height: 108upx;
+            border-radius: 10upx;
+            padding: 0 20upx;
+            font-size: 32upx;
+            color: #1A1A1A;
+            background: #F2F2F7;
+        }
+
+        .tu-btns{
+            margin-top: 80upx;
+            @include ctf(space-between);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wallet_modal.vue b/src/subpackage/wallet/components/wallet_modal.vue
index 17960ca..79fd109 100644
--- a/src/subpackage/wallet/components/wallet_modal.vue
+++ b/src/subpackage/wallet/components/wallet_modal.vue
@@ -2,7 +2,7 @@
     <view class="wallet-mask">
         <view class="wm-content">
             <image class="wc-close"></image>
-            <view class="wc-title">提现成功</view>
+            <view class="wc-title">{{ title }}</view>
             <slot></slot>
         </view>
     </view>
@@ -10,7 +10,12 @@
 
 <script>
 export default {
-
+    props: {
+        title: {
+            type: String,
+            default: '提示'
+        }
+    }
 }
 </script>
 
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/index.vue b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
index a3e653c..1776059 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
@@ -6,14 +6,17 @@
         <view class="bi-item">
             <baofu-item personal></baofu-item>
         </view>
+        <bf-withdraw></bf-withdraw>
     </view>
 </template>
 
 <script>
 import baofuItem from './modules/baofu_item.vue';
+import bfWithdraw from '../../components/bf_withdraw.vue';
 export default {
     components: {
-        'baofu-item': baofuItem
+        'baofu-item': baofuItem,
+        'bf-withdraw': bfWithdraw
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
new file mode 100644
index 0000000..0051a25
--- /dev/null
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -0,0 +1,74 @@
+<template>
+    <view class="douyin-withdraw">
+        <image class="dw-icon"></image>
+        <view class="dw-tip">可提现资金</view>
+        <view class="dw-price">
+            <text class="dp-unit">¥</text>9870.65
+        </view>
+        <view class="dw-btn">申请提现</view>
+        <view class="dw-link">
+            <text class="dl-txt">提现明细</text>
+            <image class="dl-icon"></image>
+        </view>
+
+        <dy-withdraw-apply></dy-withdraw-apply>
+    </view>
+</template>
+
+<script>
+import dyWithdrawApply from '../../components/dy_withdraw_apply.vue';
+export default {
+    components: {
+        'dy-withdraw-apply': dyWithdrawApply
+    }
+
+}
+</script>
+
+<style lang="scss">
+    .douyin-withdraw{
+        padding-top: 88upx;
+        .dw-icon{
+            margin: 0 auto;
+            display: block;
+            width: 96upx;
+            height: 96upx;
+            background: skyblue;
+        }
+        .dw-tip{
+            margin-top: 62upx;
+            text-align: center;
+            @include flcw(28upx, 40upx, #000000);
+        }
+        .dw-price{
+            padding: 0 20upx;
+            margin-top: 20upx;
+            text-align: center;
+            @include flcw(84upx, 96upx, #000000, 700);
+            @include tHide(1);
+            .dp-unit{
+                font-size: 64upx;
+            }
+        }
+        .dw-btn{
+            margin: 154upx auto 0;
+            width: 300upx;
+            border-radius: 10upx;
+            text-align: center;
+            background: #FF873D;
+            @include flcw(32upx, 112upx, #fff);
+        }
+        .dw-link{
+            margin-top: 88upx;
+            @include flcw(28upx, 40upx, #9A9A9D);
+            @include ctf(center);
+            .dl-icon{
+                flex-shrink: 0;
+                margin-left: 6upx;
+                width: 28upx;
+                height: 28upx;
+                background: skyblue;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index abe56d6..7d8208c 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -11,20 +11,20 @@
                 </text>
             </view>
         </view>
-        <wallet-modal></wallet-modal>
+        <wallet-modal v-if="false"></wallet-modal>
+        <top-up></top-up>
     </view>
 </template>
 
 <script>
 import walletInfo from './modules/wallet_info.vue'
-import walletMask from '../../components/wallet_mask.vue'
 import walletModalSuccess from '../../components/wallet_modal_success.vue'
+import topUp from '../../components/top_up.vue';
 export default {
     components: {
         'wallet-info': walletInfo,
-        'wallet-mask': walletMask,
         'wallet-modal': walletModalSuccess,
-        
+        'top-up': topUp
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
new file mode 100644
index 0000000..37dcf2b
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -0,0 +1,20 @@
+<template>
+    <view class="recharge-record">
+        <time-selection></time-selection>
+    </view>
+</template>
+
+<script>
+import timeSelection from '../../components/time_selection.vue';
+export default {
+    components: {
+        'time-selection': timeSelection
+    }
+}
+</script>
+
+<style lang="scss">
+    .recharge-record{
+        
+    }
+</style>
\ No newline at end of file

From a12779c6e16c95bd4c5135561000e1aa9ce54627 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 14 May 2024 18:22:13 +0800
Subject: [PATCH 04/12] add tid1505 api

---
 src/pages.json                                     |   6 +
 .../wallet/components/dy_withdraw_apply.vue        | 142 ++++++++++++++++++++-
 src/subpackage/wallet/components/record_item.vue   |  68 ++++++++++
 src/subpackage/wallet/components/wallet_modal.vue  |   8 +-
 src/subpackage/wallet/components/wm_button.vue     |   2 +-
 src/subpackage/wallet/js/api.js                    |   9 ++
 src/subpackage/wallet/js/bank.js                   |   1 +
 src/subpackage/wallet/js/server.js                 |  10 ++
 .../wallet/pages/douyin_withdraw/index.vue         | 106 ++++++++++++++-
 .../wallet/pages/douyin_withdraw/record.vue        |  32 +++++
 src/subpackage/wallet/pages/index/index.vue        |  38 +++++-
 .../wallet/pages/index/modules/wallet_info.vue     |  14 +-
 src/utils/util.js                                  |   9 +-
 13 files changed, 422 insertions(+), 23 deletions(-)
 create mode 100644 src/subpackage/wallet/components/record_item.vue
 create mode 100644 src/subpackage/wallet/js/api.js
 create mode 100644 src/subpackage/wallet/js/bank.js
 create mode 100644 src/subpackage/wallet/js/server.js
 create mode 100644 src/subpackage/wallet/pages/douyin_withdraw/record.vue

diff --git a/src/pages.json b/src/pages.json
index 98fd2c2..6820a94 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -728,6 +728,12 @@
 					}
 				},
 				{
+					"path": "pages/douyin_withdraw/record",
+					"style" : {
+						"navigationBarTitleText": "提现记录"
+					}
+				},
+				{
 					"path": "pages/index/recharge_record",
 					"style" : {
 						"navigationBarTitleText": "充值记录"
diff --git a/src/subpackage/wallet/components/dy_withdraw_apply.vue b/src/subpackage/wallet/components/dy_withdraw_apply.vue
index d2b7729..a422a00 100644
--- a/src/subpackage/wallet/components/dy_withdraw_apply.vue
+++ b/src/subpackage/wallet/components/dy_withdraw_apply.vue
@@ -1,24 +1,41 @@
 <template>
-    <wallet-modal title="申请提现">
+    <wallet-modal title="申请提现" :show="show" @click:close="hide">
         <view class="dy-withdraw-apply">
             <view class="dwa-balance">
                 <text class="dwab-txt">可提现资金：</text>
-                399.63元
+                {{ balance }}元
             </view>
             <scroll-view class="dwa-scroll" scroll-y>
-                <view class="dwa-opt-line" v-for="i in 5" :key="i">
+                <view class="dwa-opt-line" :key="i">
                     <view class="dol-name">*提现金额</view>
-                    <input type="text" class="dol-ipt" placeholder="请输入提现金额">
+                    <input type="digit" class="dol-ipt" placeholder="请输入提现金额" v-model="info.amount">
+                </view>
+                <view class="dwa-opt-line" :key="i">
+                    <view class="dol-name">*账户名称</view>
+                    <input type="text" class="dol-ipt" placeholder="请输入提现金额" v-model="info.account_name_of_bank">
+                </view>
+                <view class="dwa-opt-line" :key="i">
+                    <view class="dol-name">*银行卡号</view>
+                    <input type="number" class="dol-ipt" placeholder="请输入提现金额" v-model="info.account">
                 </view>
                 <view class="dwa-opt-line">
                     <view class="dol-name">*银行名称</view>
-                    <picker class="dol-picker">
+                    <picker class="dol-picker" :range="banks" @change="bankNameChange">
                         <view class="dp-frame">
-                            <input type="text" class="df-ipt" placeholder="请选择">
+                            <input type="text" disabled class="df-ipt" placeholder="请选择" v-model="info.bank_name">
                             <image class="df-icon"></image>
                         </view>
                     </picker>
                 </view>
+                <view class="dwa-opt-line" :key="i">
+                    <view class="dol-name">*支行名称</view>
+                    <input type="text" class="dol-ipt" placeholder="请输入提现金额" v-model="info.bank_address">
+                </view>
+                <view class="dwa-opt-line" :key="i">
+                    <view class="dol-name">联系电话</view>
+                    <input type="number" class="dol-ipt" placeholder="请输入提现金额" v-model="info.mobile">
+                </view>
+                
             </scroll-view>
             
             <view class="dwa-tip">
@@ -27,7 +44,7 @@
                 <view class="dt-desc">2、提现申请成功提交后，预计在3~7个工作日内进行处理。</view>
             </view>
             <view class="dwa-btn">
-                <wm-button green>确认提现</wm-button>
+                <wm-button green @click="confirmExtract">确认提现</wm-button>
             </view>
         </view>
     </wallet-modal>
@@ -36,10 +53,121 @@
 <script>
 import walletModal from './wallet_modal.vue';
 import wmButton from './wm_button.vue';
+import banks from '../js/bank';
+import { showModal, showNone } from '@/utils/util';
 export default {
     components: {
         'wallet-modal': walletModal,
         'wm-button': wmButton
+    },
+    props: {
+        balance: {
+            type: Number,
+            default: 0
+        }
+    },
+    data(){
+        return {
+            banks,
+            show: false,
+            info: {
+                amount: '',
+                account_name_of_bank: '',
+                account: '',
+                bank_name: '',
+                bank_address: '',
+                mobile: ''
+            }
+        }
+    },
+    
+    methods: {
+        bankNameChange(e){
+            let { value } = e.detail;
+            this.info.bank_name = this.banks[value];
+        },
+        alert(){
+            this.getStorageAndSet();
+            // if(this.isEmptyInfo){
+            //     showModal({
+            //         content: '是否自动填充上次提现信息？',
+            //         showCancel: true,
+            //         success: res=>{
+            //             if(res.confirm)this.getStorageAndSet();
+            //         }
+            //     })
+            // }
+            this.show = true
+        },
+        hide(){
+            this.show = false
+        },
+        getStorageAndSet(){
+            uni.getStorage({
+                key: 'dyRecentWithdrawApplyInfo',
+                success: res=>{
+                    this.info = res.data;
+                }
+            })
+        },
+        setInfoToStorage(){
+            uni.setStorage({
+                key: 'dyRecentWithdrawApplyInfo',
+                data: this.info
+            });
+        },
+        confirmExtract(){
+            if(!this.infoCheck())return;
+            this.setInfoToStorage();
+            
+            showModal({
+                content: '是否确认提现？',
+                showCancel: true,
+                success: res=>{
+                    if(res.confirm){
+                        this.hide();
+                        this.$emit(
+                            'click:confirm', 
+                            Object.assign(this.info, { amount: +this.info.amount })
+                        );
+                    }
+                }
+            })
+            
+        },
+        isEmptyInfo(){
+            let _infoValues = Object.values(this.info);
+            return _infoValues.every(item=>item === '');
+        },
+        infoCheck(){
+            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile } = this.info;
+            let _amount = +(amount ?? 0);
+            if(_amount <= 0){
+                showNone('提现金额不正确');
+                return false
+            }
+            if(_amount > this.balance){
+                showNone('提现金额不能大于可提现金额');
+                return false
+            }
+            if(account_name_of_bank === ''){
+                showNone('账户名称不能为空');
+                return false
+            }
+            if(account === ''){
+                showNone('银行卡号不能为空');
+                return false
+            }
+            if(bank_name === ''){
+                showNone('银行名称不能为空');
+                return false
+            }
+            if(bank_address === ''){
+                showNone('支行名称不能为空');
+                return false
+            }
+            return true
+        }
     }
 }
 </script>
diff --git a/src/subpackage/wallet/components/record_item.vue b/src/subpackage/wallet/components/record_item.vue
new file mode 100644
index 0000000..ffc4bf1
--- /dev/null
+++ b/src/subpackage/wallet/components/record_item.vue
@@ -0,0 +1,68 @@
+<template>
+    <view class="record-item">
+        <veiw class="ri-line">
+            <veiw class="rl-name">提现金额：</veiw>
+            <view class="rl-value">12.00</view>
+            <view class="rl-status">待处理</view>
+        </veiw>
+        <veiw class="ri-line">
+            <veiw class="rl-name">提现单号：</veiw>
+            <view class="rl-value">TX20191017898999</view>
+        </veiw>
+        <veiw class="ri-line">
+            <veiw class="rl-name">申请时间：</veiw>
+            <view class="rl-value">2019-10-17  12:12:12</view>
+        </veiw>
+        <veiw class="ri-line">
+            <veiw class="rl-name">收款人名称：</veiw>
+            <view class="rl-value">广州欧轩网络科技有限公司</view>
+        </veiw>
+        <veiw class="ri-line">
+            <veiw class="rl-name">收款人账号：</veiw>
+            <view class="rl-value">62170033200934025456</view>
+        </veiw>
+        <veiw class="ri-line">
+            <veiw class="rl-name">处理时间：</veiw>
+            <view class="rl-value">2024-10-17  12:12:12</view>
+        </veiw>
+        <veiw class="ri-line">
+            <veiw class="rl-name">备注：</veiw>
+            <view class="rl-value">-</view>
+        </veiw>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .record-item{
+        padding: 26upx 20upx;
+        border-radius: 10upx;
+        background: #fff;
+        .ri-line{
+            display: flex;
+            justify-content: space-between;
+            align-items: baseline;
+            .rl-name{
+                flex-shrink: 0;
+                flex-grow: 0;
+                @include flcw(28upx, 56upx, #9A9A9D);
+            }
+            .rl-value{
+                flex-grow: 1;
+                @include flcw(28upx, 56upx, #1A1A1A);
+                @include tHide(2);
+            }
+            .rl-status{
+                flex-shrink: 0;
+                flex-grow: 0;
+                margin-left: 10upx;
+                @include flcw(28upx, 56upx, #1A1A1A);
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wallet_modal.vue b/src/subpackage/wallet/components/wallet_modal.vue
index 79fd109..0716b3a 100644
--- a/src/subpackage/wallet/components/wallet_modal.vue
+++ b/src/subpackage/wallet/components/wallet_modal.vue
@@ -1,7 +1,7 @@
 <template>
-    <view class="wallet-mask">
+    <view class="wallet-mask" v-show="show">
         <view class="wm-content">
-            <image class="wc-close"></image>
+            <image class="wc-close" @click="$emit('click:close')"></image>
             <view class="wc-title">{{ title }}</view>
             <slot></slot>
         </view>
@@ -14,6 +14,10 @@ export default {
         title: {
             type: String,
             default: '提示'
+        },
+        show: {
+            type: Boolean,
+            default: false
         }
     }
 }
diff --git a/src/subpackage/wallet/components/wm_button.vue b/src/subpackage/wallet/components/wm_button.vue
index 527507c..7ad9cf0 100644
--- a/src/subpackage/wallet/components/wm_button.vue
+++ b/src/subpackage/wallet/components/wm_button.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="wallet-modal-button" :class="{ 'green': green }">
+    <view class="wallet-modal-button" :class="{ 'green': green }" @click="$emit('click')">
         <slot>充值记录</slot>
     </view>
 </template>
diff --git a/src/subpackage/wallet/js/api.js b/src/subpackage/wallet/js/api.js
new file mode 100644
index 0000000..a1c1180
--- /dev/null
+++ b/src/subpackage/wallet/js/api.js
@@ -0,0 +1,9 @@
+import { ORIGIN } from '../../../js/api';
+
+export const WALLET_API = { 
+	walletBalance:`${ORIGIN}/admin/merchantwallet/balance`,  //  获取商户钱包余额
+	withdrawalOfDouyinOrg_totalAmount:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/totalAmount`,  //  可提现总额 抖音
+	withdrawalOfDouyinOrg_edit:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/edit`,  //  申请提现-编辑 抖音
+}
+
+export default WALLET_API;
\ No newline at end of file
diff --git a/src/subpackage/wallet/js/bank.js b/src/subpackage/wallet/js/bank.js
new file mode 100644
index 0000000..81830f4
--- /dev/null
+++ b/src/subpackage/wallet/js/bank.js
@@ -0,0 +1 @@
+export default ['中国工商银行', '中国建设银行', '中国银行', '中国农业银行', '中国邮政储蓄银行', '招商银行', '交通银行', '上海浦东发展银行', '中信银行', '中国光大银行', '华夏银行', '中国民生银行', '广东发展银行', '兴业银行', '平安银行', '浙商银行', '恒丰银行', '渤海银行', '上海银行', '北京银行', '杭州银行', '常熟农商银行', '青岛银行', '徽商银行', '南京银行', '张家口银行', '天津滨海农村商业银行', '天津银行', '深圳农村商业银行', '宁夏银行', '石嘴山银行', '海南省农村信用社联合社', '海南银行', '陕西省农村信用社联合社', '长安银行', '青海农村信用社联合社', '青海银行', '宁波通商银行', '鄞州银行', '宁波东海银行', '宁波银行', '江南农村商业银行', '江苏省农村信用社联合社', '江苏长江商业银行', '江阴农商银行', '昆山农村商业银行', '苏州银行', '太仓农村商业银行', '无锡农村商业银行', '吴江农村商业银行', '张家港农商行', '重庆农村商业银行', '重庆三峡银行', '重庆银行', '大同银行', '晋城银行', '晋商银行', '晋中市商业银行', '长治市商业银行', '阳泉商业银行', '德州银行', '东营银行', '烟台银行', '济宁银行', '莱商银行', '临商银行', '齐鲁银行', '齐商银行', '日照银行', '枣庄银行', '泰安银行', '威海市商业银行', '潍坊银行', '江西银行', '江西省农村信用社联合社', '九江银行', '赣州银行', '上饶银行', '甘肃省农村信用社联合社', '甘肃银行', '兰州银行', '鄂尔多斯银行', '内蒙古农村信用社联合社', '内蒙古银行', '乌海银行', '汉口银行', '湖北省农村信用社联合社', '湖北银行', '武汉农村商业银行', '鞍山银行', '本溪商业银行', '朝阳银行', '丹东银行', '阜新银行', '葫芦岛银行', '锦州银行', '辽宁省农村信用社', '辽阳银行', '盘锦商行', '盛京银行', '铁岭银行', '营口沿海银行', '营口银行', '东莞农村商业银行', '东莞银行', '广东华兴银行', '广东南粤银行', '广东省农村信用社联合社', '广州农村商业银行', '广州银行', '顺德农商银行', '珠海华润银行', '长沙银行', '湖南三湘银行', '成都农商银行', '达州市商业银行', '长城华西银行', '乐山商业银行', '凉山商业银行', '泸州市商业银行', '绵阳市商业银行', '四川天府银行', '攀枝花市商业银行', '四川省农村信用社联合社', '遂宁银行', '雅安市商业银行', '宜宾市商业银行', '自贡银行', '广西北部湾银行', '广西壮族自治区农村信用社联合社', '柳州银行', '上海农村商业银行', '贵阳银行', '贵州省农村信用社联合社', '贵州银行', '台州银行', '温州银行', '浙江民泰商业银行', '浙江泰隆商业银行', '湖州银行', '嘉兴银行', '金华银行', '绍兴银行', '浙江稠州商业银行', '浙商银行', '哈尔滨银行', '黑龙江省农村信用社联合社', '龙江银行', '吉林省农村信用社联合社', '吉林银行', '大连银行', '大连农商行', '富滇银行', '曲靖市商业银行', '云南红塔银行', '云南省农村信用社联合社', '哈密市商业银行', '库尔勒市商业银行', '昆仑银行', '乌鲁木齐银行', '新疆汇和银行', '新疆农村信用社联合社', '新疆银行', '厦门国际银行', '厦门银行', '福建省海峡银行', '泉州银行', '保定银行', '沧州银行', '承德银行', '邯郸银行', '河北省农村信用社联合社', '河北银行', '衡水银行', '廊坊银行', '秦皇岛市商业银行', '唐山银行', '邢台银行', '河南省农村信用社联合社', '焦作中旅银行', '洛阳银行', '平顶山银行', '郑州银行', '中原银行', '玉山银行', '西藏银行', '华侨永亨银行', '辽宁辰州汇通村镇银行', '佛山农村商业银行', '东港农村商业银行', '浙江东阳农村商业银行', '东莞农村商业银行']
diff --git a/src/subpackage/wallet/js/server.js b/src/subpackage/wallet/js/server.js
new file mode 100644
index 0000000..08c25b3
--- /dev/null
+++ b/src/subpackage/wallet/js/server.js
@@ -0,0 +1,10 @@
+import { Server } from '../../../js/server';
+
+class WalletServer extends Server {
+    constructor(props){
+        super(props)
+    }
+}
+
+
+export default new WalletServer();
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 0051a25..084f2ce 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -3,23 +3,121 @@
         <image class="dw-icon"></image>
         <view class="dw-tip">可提现资金</view>
         <view class="dw-price">
-            <text class="dp-unit">¥</text>9870.65
+            <text class="dp-unit">¥</text>{{ balance }}
         </view>
-        <view class="dw-btn">申请提现</view>
+        <view class="dw-btn" @click="applyBtn">申请提现</view>
         <view class="dw-link">
-            <text class="dl-txt">提现明细</text>
+            <text class="dl-txt" @click="toDetailBtn">提现明细</text>
             <image class="dl-icon"></image>
         </view>
 
-        <dy-withdraw-apply></dy-withdraw-apply>
+        <dy-withdraw-apply
+            ref="dwaModal"
+            :balance="balance"
+            @click:confirm="dyConfirmExtract"
+        ></dy-withdraw-apply>
     </view>
 </template>
 
 <script>
 import dyWithdrawApply from '../../components/dy_withdraw_apply.vue';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo, showLoad, hideLoad, showNone } from '@/utils/util';
 export default {
     components: {
         'dy-withdraw-apply': dyWithdrawApply
+    },
+    data(){
+        return {
+            brand_id: '',
+            balance: 0,
+        }
+    },
+    onLoad(options){
+        this.brand_id = options.brand_id ?? '';
+        this.getDouyinWalletBalance(options.brand_id);
+    },
+    methods: {
+        // 
+        toDetailBtn(){
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/record?brand_id=${this.brand_id}`, 'nT');
+        },
+        // 申请提现
+        applyBtn(){
+            this.$refs.dwaModal.alert();
+        },
+        /**
+         * http://api.ouxuan.net:61080/project/11/interface/api/2195
+         * @param {String} brand_id 品牌id
+         * */ 
+        getDouyinWalletBalance(brand_id){
+            showLoad();
+            servers.get({
+                url: WALLET_API.withdrawalOfDouyinOrg_totalAmount,
+                data: {
+                    brand_id: brand_id
+                },
+                failMsg: '获取钱包余额失败'
+            })
+            .then(res=>{
+                hideLoad();
+                this.balance = +res.total_amount ?? 0;
+            })
+            .catch(hideLoad)
+        },
+        // 提现申请确认
+        dyConfirmExtract(e){
+            this.douyinWalletExtract({
+                brand_id: this.brand_id,
+                ...e
+            })
+        },
+        /**
+         * http://api.ouxuan.net:61080/project/11/interface/api/2209
+         * @param {String} brand_id 品牌id
+         * @param {Number} amount 提现金额
+         * @param {String} account 账户
+         * @param {String} account_name_of_bank 账户名
+         * @param {String} bank_name // 银行名
+         * @param {String} bank_address // 银行地址
+         * @param {String} mobile 手机号
+         * @param {Number} status // 0未处理，1已处理
+         * */ 
+        douyinWalletExtract({
+            brand_id,
+            amount,
+            account,
+            account_name_of_bank,
+            bank_name,
+            bank_address,
+            mobile,
+            status = 0
+        }){
+            showLoad();
+            servers.post({
+                url: WALLET_API.withdrawalOfDouyinOrg_edit,
+                data: {
+                    brand_id, 
+                    amount,
+                    account,
+                    account_name_of_bank,
+                    bank_name,
+                    bank_address,
+                    mobile,
+                    status,
+                },
+                failMsg: '申请提现失败'
+            })
+            .then(res=>{
+                hideLoad();
+                showNone('申请提现成功');
+                setTimeout(_=>{
+                    this.getDouyinWalletBalance(brand_id);
+                }, 1200);
+            })
+            .catch(hideLoad)
+        },
     }
 
 }
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
new file mode 100644
index 0000000..193aebd
--- /dev/null
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -0,0 +1,32 @@
+<template>
+    <view class="withdraw-record">
+        <view class="wr-list">
+            <view class="record-item" v-for="i in 10" :key="i">
+                <record-item></record-item>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import recordItem from '../../components/record_item.vue';
+export default {
+    components: {
+        'record-item': recordItem
+    }
+}
+</script>
+
+<style lang="scss">
+    .withdraw-record{
+
+    }
+    .wr-list{
+        padding: 24upx 24upx 0;
+        .record-item{
+            &+ .record-item{
+                margin-top: 24upx;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 7d8208c..6b13b54 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -1,6 +1,9 @@
 <template>
     <view class="wallet-index">
-        <wallet-info></wallet-info>
+        <wallet-info 
+            :balance="balance"
+            @click:douyin="dyBtnClick"
+        ></wallet-info>
         <view class="wi-tips">
             <view class="wt-tit">温馨提示：</view>
             <view class="wt-content">
@@ -12,7 +15,7 @@
             </view>
         </view>
         <wallet-modal v-if="false"></wallet-modal>
-        <top-up></top-up>
+        <!-- <top-up></top-up> -->
     </view>
 </template>
 
@@ -20,11 +23,42 @@
 import walletInfo from './modules/wallet_info.vue'
 import walletModalSuccess from '../../components/wallet_modal_success.vue'
 import topUp from '../../components/top_up.vue';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo } from '@/utils/util'
 export default {
     components: {
         'wallet-info': walletInfo,
         'wallet-modal': walletModalSuccess,
         'top-up': topUp
+    },
+    data(){
+        return {
+            brand_id: '',
+            balance: 0,
+        }
+    },
+    onLoad(options){
+        this.brand_id = options.brand_id ?? '';
+        this.getWalletBalance(options.brand_id);
+    },
+    methods: {
+        getWalletBalance(brand_id){
+            servers.get({
+                url: WALLET_API.walletBalance,
+                data: {
+                    brand_id: brand_id
+                },
+                failMsg: '获取钱包余额失败'
+            })
+            .then(res=>{
+                this.balance = +res.balance ?? 0;
+                console.log(res);
+            })
+        },
+        dyBtnClick(){
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
+        }
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 1393744..7b8bab2 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -16,7 +16,7 @@
             <view class="wa-balance">
                 <view class="wb-money">
                     <text class="wm-unit">¥</text>
-                    19990.00
+                    {{ balance }}
                 </view>
                 <view class="wb-btn">充值</view>
             </view>
@@ -25,7 +25,7 @@
             <view class="wb-item">
                 <text class="wi-txt">宝付提现</text>
             </view>
-            <view class="wb-item">
+            <view class="wb-item" @click="$emit('click:douyin')">
                 <image class="wi-icon"></image>
                 <text class="wi-txt">抖音提现</text>
             </view>
@@ -35,7 +35,15 @@
 
 <script>
 export default {
-
+    props: {
+        balance: {
+            type: Number,
+            default: 0
+        }
+    },
+    methods: {
+        
+    }
 }
 </script>
 
diff --git a/src/utils/util.js b/src/utils/util.js
index a2af361..b871c30 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -50,7 +50,7 @@ export const routeTo = (url,type) => {
 	}
 }
 
-function showNone(txt,duration=1500){
+export function showNone(txt,duration=1500){
   uni.hideToast();
   uni.hideLoading();
   uni.showToast({
@@ -61,16 +61,17 @@ function showNone(txt,duration=1500){
   })
 }
 
-function showLoad(title='加载中', mask=true){
+export function showLoad(title='加载中', mask=true){
   uni.showLoading({
     mask,
     title,
   })
 }
-function hideLoad(){
+export function hideLoad(){
   uni.hideLoading()
 }
-function showModal({
+
+export function showModal({
   title='提示',
   content='',
   showCancel=false,

From 858fc5784bce70833774ad2cbf67ca8cf8d98e71 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 15 May 2024 18:28:44 +0800
Subject: [PATCH 05/12] add api

---
 src/subpackage/wallet/components/bf_withdraw.vue   | 113 ++++++++++++++++++++-
 src/subpackage/wallet/js/api.js                    |   4 +
 .../wallet/pages/baofu_withdraw/index.vue          |  71 +++++++++++--
 .../pages/baofu_withdraw/modules/baofu_item.vue    |  93 +++++++++++++++--
 .../wallet/pages/douyin_withdraw/record.vue        |  31 ++++++
 src/subpackage/wallet/pages/index/index.vue        |   5 +
 .../wallet/pages/index/modules/wallet_info.vue     |   2 +-
 src/utils/util.js                                  |   2 +-
 8 files changed, 298 insertions(+), 23 deletions(-)

diff --git a/src/subpackage/wallet/components/bf_withdraw.vue b/src/subpackage/wallet/components/bf_withdraw.vue
index 17ab4fc..577da09 100644
--- a/src/subpackage/wallet/components/bf_withdraw.vue
+++ b/src/subpackage/wallet/components/bf_withdraw.vue
@@ -1,12 +1,12 @@
 <template>
-    <wallet-modal title="提现">
+    <wallet-modal title="提现" :show="isShow" @click:close="hide">
         <view class="bf-withdraw">
-            <view class="bw-txt">广州欧轩网络有限公司</view>
+            <view class="bw-txt">{{ companyInfo.name || '' }}</view>
             <view class="bw-txt">
                 可提现资金：
-                <text class="bt-price">399.63元</text>
+                <text class="bt-price">{{ accountInfo.availableBal || 0 }}元</text>
             </view>
-            <input type="text" class="bw-ipt">
+            <input type="digit" class="bw-ipt" v-model="extractNum">
             
             <view class="dwa-tip">
                 <view class="dt-tit">温馨提示</view>
@@ -15,7 +15,7 @@
             </view>
 
             <view class="dwa-btn">
-                <wm-button green>确认提现</wm-button>
+                <wm-button green @click='confirmExtract'>确认提现</wm-button>
             </view>
         </view>
     </wallet-modal>
@@ -24,10 +24,113 @@
 <script>
 import walletModal from './wallet_modal.vue';
 import wmButton from './wm_button.vue';
+import { WALLET_API } from '../js/api';
+import servers from '../js/server';
+import { showNone, showLoad, hideLoad, debounce } from '@/utils/util'
 export default {
     components: {
         'wallet-modal': walletModal,
         'wm-button': wmButton
+    },
+    data(){
+        return {
+            isShow: false,
+            accountInfo: {},
+            extractNum: 0,
+            companyInfo: {}
+        }
+    },
+    methods: {
+        confirmExtract: debounce(async function(){
+            let { companyInfo, accountInfo, extractNum } = this;
+            try{
+                showLoad();
+                let _accountInfo = await this.setPriceInfo({
+                    contractNo: companyInfo?.account ?? '',
+                    dealAmount: extractNum
+                })
+                hideLoad();
+                if(_accountInfo?.errorCode === 'SUCCESS')this.isShow = true;
+            }catch(err){
+                hideLoad();
+                showNone(err?.message || err?.data?.errorMsg || '提现失败！');
+                console.warn('alert catch error: ', err);
+            }
+        }, 300, true),
+        /**
+         * @param {String} account 宝付V2账户
+         * @param {String} type '1'->个人 / '2'->企业
+         * @param {String} name 公司名
+         */
+        async alert({ account, type, name }){
+            if(!account)return showNone('账户号不存在！');
+            this.companyInfo = { account, type, name };
+            try{
+                showLoad();
+                let _accountInfo = await this.getPriceInfo({
+                    accType: type,
+                    contractNo: account
+                })
+                hideLoad();
+                if(_accountInfo?.errorCode === 'SUCCESS')this.isShow = true;
+            }catch(err){
+                hideLoad();
+                showNone(err?.message || err?.data?.errorMsg || '获取账户信息失败！');
+                console.warn('alert catch error: ', err);
+            }
+        },
+        hide(){
+            this.isShow = false
+        },
+        // 查询
+        getPriceInfo({ accType, contractNo }){
+            return this.baofuV2PriceOperate({
+                service: 'T-1001-013-06',
+                query: { accType, contractNo }
+            })
+        },
+        // 提现
+        setPriceInfo({ contractNo, dealAmount }){
+            return this.baofuV2PriceOperate({
+                service: 'T-1001-013-14',
+                query: {
+                    contractNo: contractNo,
+                    feeMemberId: contractNo,
+                    transSerialNo: `TX${new Date().getTime()}`, // 流水号
+                    dealAmount: dealAmount
+                }
+            })
+        },  
+        /**
+         * @param {String} service 查询 -> T-1001-013-06 / 提现 -> T-1001-013-14
+         * @param {String} api 接口 默认 '/'
+         * @param {Object} query 操作参数
+         * @param {String} version 版本 默认 '4.0.0'
+         * @returns {Promise}
+         * 
+         * */ 
+        baofuV2PriceOperate({ service = 'T-1001-013-06', api = '/', query, version = '4.0.0' }){
+            return servers.post({
+                url: WALLET_API.baofuV2Gateway,
+                data: {
+                    service: service,
+                    api: api,
+                    data: {
+                        ...query,
+                        version: version
+                    }
+                },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                let _data = res?.data;
+                if(_data.code === 0&&_data.data.errorCode === 'SUCCESS'){
+                    return this.accountInfo = _data.data;
+                }else{
+                    return Promise.reject(_data)
+                }
+            })
+        }
     }
 }
 </script>
diff --git a/src/subpackage/wallet/js/api.js b/src/subpackage/wallet/js/api.js
index a1c1180..4ff0fc2 100644
--- a/src/subpackage/wallet/js/api.js
+++ b/src/subpackage/wallet/js/api.js
@@ -4,6 +4,10 @@ export const WALLET_API = {
 	walletBalance:`${ORIGIN}/admin/merchantwallet/balance`,  //  获取商户钱包余额
 	withdrawalOfDouyinOrg_totalAmount:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/totalAmount`,  //  可提现总额 抖音
 	withdrawalOfDouyinOrg_edit:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/edit`,  //  申请提现-编辑 抖音
+	withdrawalOfDouyinOrg_list:`${ORIGIN}/admin/financialReconciliation/withdrawalOfDouyinOrg/list`,  //  提现申请-列表 抖音
+	// 宝付
+	getPayAssureConfigs:`${ORIGIN}/admin/pay/assure/getPayAssureConfigs`,  //  查看可选择的支付账户列表
+	baofuV2Gateway:`${ORIGIN}/admin/pay/assure/baofuV2/gateway`,  //  宝付v2获取金额信息
 }
 
 export default WALLET_API;
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/index.vue b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
index 1776059..c73bc7d 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
@@ -1,22 +1,81 @@
 <template>
     <view class="baofu-index">
-        <view class="bi-item">
-            <baofu-item></baofu-item>
+        <view class="bi-item" v-for="(e, i) in accountLs" :key="i">
+            <baofu-item
+                :name="e.label_name"
+                :account="e.baofu_v2_contract_no"
+                :tag="getBaoFuV2AccountTypeForChinese(e.baofu_v2_config)"
+                :personal="getBaoFuV2AccountTypeForChinese(e.baofu_v2_config) === '个人'"
+                @click:extract='extractBtn(i)'
+            ></baofu-item>
         </view>
-        <view class="bi-item">
-            <baofu-item personal></baofu-item>
-        </view>
-        <bf-withdraw></bf-withdraw>
+
+        <bf-withdraw ref="bfWithdraw"></bf-withdraw>
     </view>
 </template>
 
 <script>
 import baofuItem from './modules/baofu_item.vue';
 import bfWithdraw from '../../components/bf_withdraw.vue';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo } from '@/utils/util'
 export default {
     components: {
         'baofu-item': baofuItem,
         'bf-withdraw': bfWithdraw
+    },
+    data(){
+        return {
+            accountLs: []
+        }
+    },
+    onLoad(options){
+        this.brand_id = options.brand_id ?? '';
+        // this.getWalletBalance(options.brand_id);
+        this.getPayAssureConfigs();
+    },
+    methods: {
+        extractBtn(i){
+            let { accountLs } = this;
+            let _curItem = accountLs[i];
+            let _type = this.getBaoFuV2AccountTypeForChinese(_curItem.baofu_v2_config) === '个人' ? '1' : '2'; 
+            this.$refs.bfWithdraw.alert({
+                name: _curItem.label_name,
+                account: _curItem.baofu_v2_contract_no,
+                type: _type,
+            });
+        },
+        getPayAssureConfigs(){
+            servers.get({
+                url: WALLET_API.getPayAssureConfigs,
+                failMsg: '获取账户列表失败',
+                data: {
+                    pay_way: 'WeChat',
+                    appid: 'wxc141a743225e7885'
+                }
+            })
+            .then(res=>{
+                let _ls = res ?? [];
+                this.accountLs = this.filterBaoFuV2Accounts(_ls);
+            })
+        },
+        /**
+         * 过滤宝付V2账户 
+         * @param {Array} list 账户列表 -> /admin/pay/assure/getPayAssureConfigs
+         * @returns {Array} 宝付V2账户列表
+         * */ 
+        filterBaoFuV2Accounts(list){
+            return list.filter(e=>e.assure_account_type === 'BaoFuV2');
+        },
+        /**
+         * 获取宝付V2账户类型中文 -> 个人/企业
+         * @param {Object} baofuV2Config 宝付V2配置
+         * @returns {String} 个人/企业
+         * */ 
+        getBaoFuV2AccountTypeForChinese(baofuV2Config = null){
+            return baofuV2Config?.person ? '个人' : '企业';
+        }
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
index 2141dac..bb32140 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
@@ -3,22 +3,23 @@
         <view class="bi-bar" :class="{ 'bb-personal': personal }">
             <view class="bb-name-bar">
                 <view class="bnb-left">
-                    <view class="bl-txt">广州欧轩网络有限公司</view>
-                    <view class="bl-tag" >企业</view>
+                    <view class="bl-txt">{{ name }}</view>
+                    <view class="bl-tag" >{{ tag }}</view>
                 </view>
                 <view class="bnb-right">
                     <view class="br-txt">提现记录</view>
                     <image class="wb-icon"></image>
                 </view>
             </view>
-            <view class="bb-account-num">账户号：CM660000000095108678</view>
+            <view class="bb-account-num">账户号：{{ account }}</view>
         </view>
-        <view class="bi-info">
+        
+        <view class="bi-info" v-if="statusMsg === 'success'">
             <view class="bi-balance">
                 <view class="bb-money">
-                    19990.00
+                    {{ accountInfo.availableBal || 0 }}
                 </view>
-                <view class="bb-btn">充值</view>
+                <view class="bb-btn" @click="$emit('click:extract')">提现</view>
             </view>
             <view class="bi-tip">
                 <view class="bt-txt">可提现资金(元)</view>
@@ -26,14 +27,14 @@
             </view>
             <view class="bi-mony-info">
                 <view class="bmi-item">
-                    <view class="bi-num">23525.89</view>
+                    <view class="bi-num">{{ accountInfo.currBal || 0 }}</view>
                     <view class="bi-tip">
                         <view class="bt-txt">总资产(元)</view>
                         <image class="bt-icon"></image>
                     </view>
                 </view>
                 <view class="bmi-item">
-                    <view class="bi-num">23525.89</view>
+                    <view class="bi-num">{{ accountInfo.pendingBal || 0 }}</view>
                     <view class="bi-tip">
                         <view class="bt-txt">在途资金(元)</view>
                         <image class="bt-icon"></image>
@@ -41,16 +42,84 @@
                 </view>
             </view>
         </view>
-        
+        <view v-else class="bi-status-mes" @click="loadAgain">{{ statusMsg }}</view>
     </view>
 </template>
 
 <script>
+import { WALLET_API } from '../../../js/api';
+import servers from '../../../js/server';
+const failStatusMsg = '加载账户资金失败，点击重新加载！';
 export default {
     props: {
         personal: {
             type: Boolean,
             default: false
+        },
+        name: {
+            type: String,
+            default: ''
+        },
+        tag: { // 个人/企业
+            type: String,
+            default: ''
+        },
+        account: {
+            type: String,
+            default: ''
+        }
+    },
+    data(){
+        return {
+            statusMsg: '',
+            accountInfo: {},
+        }
+    },
+    created(){
+        this.getBaofuV2PriceInfo({
+            type: this.tag,
+            contractNo: this.account
+        });
+    },
+    methods:{
+        loadAgain(){
+            let { statusMsg } = this;
+            if(statusMsg === failStatusMsg){
+                this.getBaofuV2PriceInfo({
+                    type: this.tag,
+                    contractNo: this.account
+                });
+            }
+        },
+        getBaofuV2PriceInfo({ type, contractNo }){
+            this.statusMsg = '加载中...';
+            servers.post({
+                url: WALLET_API.baofuV2Gateway,
+                data: {
+                    service: 'T-1001-013-06',
+                    api: '/',
+                    data: {
+                        accType: type === '个人' ? '1' : '2',
+                        contractNo: contractNo,
+                        version: '4.0.0'
+                    }
+                },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                let _data = res?.data;
+                if(_data.code === 0&&_data.data.errorCode === 'SUCCESS'){
+                    this.statusMsg = 'success';
+                    this.accountInfo = _data.data;
+                }else{
+                    console.warn('getBaofuV2PriceInfo error: ', res);
+                    this.statusMsg = failStatusMsg;
+                }
+            })
+            .catch(err=>{
+                console.log('getBaofuV2PriceInfo catch error: ', err);
+                this.statusMsg = failStatusMsg;
+            })
         }
     }
 }
@@ -97,6 +166,7 @@ export default {
                         @include tHide;
                     }
                     .bl-tag{
+                        flex-shrink: 0;
                         margin-left: 6upx;
                         padding: 0upx 6upx;
                         border-radius: 6upx;
@@ -154,6 +224,9 @@ export default {
             }
 
         }
-        
+        .bi-status-mes{
+            padding: 40upx 32upx;
+            @include flcw(24upx, 34upx, #000000);
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 193aebd..988b661 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -10,9 +10,40 @@
 
 <script>
 import recordItem from '../../components/record_item.vue';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo, showLoad, hideLoad, showNone } from '@/utils/util';
 export default {
     components: {
         'record-item': recordItem
+    },
+    onLoad(options){
+        this.getDouyinWalletWithdrawRecord(options);
+    },
+    methods: {
+        /**
+         * http://api.ouxuan.net:61080/project/11/interface/api/2202
+         * @param {String} brand_id 品牌id
+         * @param {status} status 传0展示未处理,传1展示处理。不传展示全部
+         * @param {Number} page 页码
+         * @param {Number} page_size 每页条数
+         * */ 
+        getDouyinWalletWithdrawRecord({ brand_id, page = 1, page_size = 10 }){
+            showLoad();
+            servers.get({
+                url: WALLET_API.withdrawalOfDouyinOrg_list,
+                data: {
+                    brand_id: brand_id,
+                    page: page,
+                    page_size: page_size
+                },
+                failMsg: '加载提现记录失败'
+            })
+            .then(res=>{
+                console.log(res);
+            })
+            .catch(hideLoad)
+        },
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 6b13b54..36a8b28 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -3,6 +3,7 @@
         <wallet-info 
             :balance="balance"
             @click:douyin="dyBtnClick"
+            @click:baofu="bfBtnClick"
         ></wallet-info>
         <view class="wi-tips">
             <view class="wt-tit">温馨提示：</view>
@@ -58,6 +59,10 @@ export default {
         },
         dyBtnClick(){
             routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
+        },
+        bfBtnClick(){
+            routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
+        
         }
     }
 }
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 7b8bab2..064be55 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -22,7 +22,7 @@
             </view>
         </view>
         <view class="wi-btns">
-            <view class="wb-item">
+            <view class="wb-item" @click="$emit('click:baofu')">
                 <text class="wi-txt">宝付提现</text>
             </view>
             <view class="wb-item" @click="$emit('click:douyin')">
diff --git a/src/utils/util.js b/src/utils/util.js
index b871c30..383f8f1 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -95,7 +95,7 @@ export function showModal({
   })
 }
 
-function debounce(func, wait, immediate) {
+export function debounce(func, wait, immediate) {
   let timeout, args, context, timestamp, result;
   const later = function() {
     // 据上一次触发时间间隔

From eb36a155a509ce5e999fa18f67d0f33fdd46794b Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 16 May 2024 18:30:37 +0800
Subject: [PATCH 06/12] add api

---
 src/pages/index/index.vue                          |   6 ++
 src/subpackage/wallet/components/bf_withdraw.vue   |  75 +++++++++++++++++----
 .../wallet/components/dy_withdraw_apply.vue        |  27 ++++----
 src/subpackage/wallet/components/record_line.vue   |  47 +++++++++++++
 src/subpackage/wallet/components/wallet_modal.vue  |   8 ++-
 .../wallet/components/wallet_modal_success.vue     |  33 +++++++--
 .../wallet/pages/baofu_withdraw/index.vue          |  46 +++++++++++--
 .../pages/baofu_withdraw/modules/baofu_item.vue    |  34 +++++-----
 .../wallet/pages/douyin_withdraw/index.vue         |  24 +++++--
 .../wallet/pages/douyin_withdraw/record.vue        |  40 +++++++++--
 src/subpackage/wallet/pages/index/index.vue        |  19 ++++--
 .../wallet/pages/index/modules/wallet_info.vue     |  15 ++---
 src/subpackage/wallet/static/images/arrow_b2.png   | Bin 0 -> 251 bytes
 src/subpackage/wallet/static/images/arrow_c33.png  | Bin 0 -> 599 bytes
 src/subpackage/wallet/static/images/close.png      | Bin 0 -> 233 bytes
 src/subpackage/wallet/static/images/dy_logo.png    | Bin 0 -> 914 bytes
 .../wallet/static/images/question_mark.png         | Bin 0 -> 1023 bytes
 .../wallet/static/images/success_tip.png           | Bin 0 -> 974 bytes
 18 files changed, 292 insertions(+), 82 deletions(-)
 create mode 100644 src/subpackage/wallet/components/record_line.vue
 create mode 100644 src/subpackage/wallet/static/images/arrow_b2.png
 create mode 100644 src/subpackage/wallet/static/images/arrow_c33.png
 create mode 100644 src/subpackage/wallet/static/images/close.png
 create mode 100644 src/subpackage/wallet/static/images/dy_logo.png
 create mode 100644 src/subpackage/wallet/static/images/question_mark.png
 create mode 100644 src/subpackage/wallet/static/images/success_tip.png

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 22486f3..3ef557d 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -145,6 +145,12 @@
 			path: '/subpackage/blacklist/pages/abnormal_list/abnormal_list',
 			serverKey: 1015  // 后端对应权限编号 1015
 		},
+		{
+			id: 11,
+			name: '钱包',
+			path: '/subpackage/wallet/pages/index/index',
+			serverKey: 1015  // 后端对应权限编号 1015
+		},
 	];
 	
 	const app = getApp();
diff --git a/src/subpackage/wallet/components/bf_withdraw.vue b/src/subpackage/wallet/components/bf_withdraw.vue
index 577da09..05763e5 100644
--- a/src/subpackage/wallet/components/bf_withdraw.vue
+++ b/src/subpackage/wallet/components/bf_withdraw.vue
@@ -6,7 +6,7 @@
                 可提现资金：
                 <text class="bt-price">{{ accountInfo.availableBal || 0 }}元</text>
             </view>
-            <input type="digit" class="bw-ipt" v-model="extractNum">
+            <input type="digit" class="bw-ipt" v-model="extractNum" placeholder="请输入金额">
             
             <view class="dwa-tip">
                 <view class="dt-tit">温馨提示</view>
@@ -36,35 +36,67 @@ export default {
         return {
             isShow: false,
             accountInfo: {},
-            extractNum: 0,
-            companyInfo: {}
+            extractNum: '',
+            companyInfo: {
+                /**
+                 * name, -> 公司名称
+                 * account -> 账户账号
+                 * type -> 1(个人)/ 2(企业)
+                 * index -> 当前账户索引
+                 */
+            }
         }
     },
     methods: {
         confirmExtract: debounce(async function(){
             let { companyInfo, accountInfo, extractNum } = this;
+            if(!this.checkExtractNum({ availableBal: accountInfo?.availableBal, extractNum }))return;
             try{
                 showLoad();
-                let _accountInfo = await this.setPriceInfo({
+                let _operateInfo = await this.setPriceInfo({
                     contractNo: companyInfo?.account ?? '',
                     dealAmount: extractNum
                 })
                 hideLoad();
-                if(_accountInfo?.errorCode === 'SUCCESS')this.isShow = true;
+                // showNone(_operateInfo?.transRemark || '提现成功！');
+                this.hide();
+                this.$emit('click:extract', companyInfo.index);
             }catch(err){
                 hideLoad();
-                showNone(err?.message || err?.data?.errorMsg || '提现失败！');
-                console.warn('alert catch error: ', err);
+                let _errMsg = err?.message || err?.data?.transRemark || err?.data?.errorMsg || '提现失败！';
+                showNone(_errMsg);
+                console.warn('confirmExtract catch error: ', err);
             }
         }, 300, true),
         /**
+         * @param {String} availableBal 可提现金额
+         * @param {String} extractNum 提现金额
+         * @returns {Boolean}
+         */
+        checkExtractNum({ availableBal, extractNum }){
+            let _num = +extractNum || 0;
+            if(!extractNum){
+                showNone('请输入提现金额！');
+                return false;
+            }
+            if(_num <= 0){
+                showNone('提现金额必须大于0！');
+                return false;
+            }
+            if(_num > +availableBal){
+                showNone('提现金额不能大于可提现金额！');
+                return false;
+            }
+            return true;
+        },
+        /**
          * @param {String} account 宝付V2账户
          * @param {String} type '1'->个人 / '2'->企业
          * @param {String} name 公司名
          */
-        async alert({ account, type, name }){
+        async alert({ account, type, name, index }){
             if(!account)return showNone('账户号不存在！');
-            this.companyInfo = { account, type, name };
+            this.companyInfo = { account, type, name, index };
             try{
                 showLoad();
                 let _accountInfo = await this.getPriceInfo({
@@ -72,10 +104,11 @@ export default {
                     contractNo: account
                 })
                 hideLoad();
-                if(_accountInfo?.errorCode === 'SUCCESS')this.isShow = true;
+                this.isShow = true;
             }catch(err){
                 hideLoad();
-                showNone(err?.message || err?.data?.errorMsg || '获取账户信息失败！');
+                let _errMsg = err?.message ||  err?.data?.errorMsg || '获取账户信息失败！';
+                showNone(_errMsg);
                 console.warn('alert catch error: ', err);
             }
         },
@@ -88,6 +121,13 @@ export default {
                 service: 'T-1001-013-06',
                 query: { accType, contractNo }
             })
+            .then(res=>{
+                if(res?.data?.errorCode === 'SUCCESS'){
+                    return this.accountInfo = res?.data || {};
+                }else{
+                    return Promise.reject(res)
+                }
+            })
         },
         // 提现
         setPriceInfo({ contractNo, dealAmount }){
@@ -100,6 +140,13 @@ export default {
                     dealAmount: dealAmount
                 }
             })
+            .then(res=>{
+                if(res?.data.state === 1){
+                    return res?.data || {};
+                }else{
+                    return Promise.reject(res)
+                }
+            })
         },  
         /**
          * @param {String} service 查询 -> T-1001-013-06 / 提现 -> T-1001-013-14
@@ -124,10 +171,10 @@ export default {
             })
             .then(res=>{
                 let _data = res?.data;
-                if(_data.code === 0&&_data.data.errorCode === 'SUCCESS'){
-                    return this.accountInfo = _data.data;
+                if(_data.code === 0&&_data.data.retCode === 1){
+                    return _data || {};
                 }else{
-                    return Promise.reject(_data)
+                    return Promise.reject(_data || {})
                 }
             })
         }
diff --git a/src/subpackage/wallet/components/dy_withdraw_apply.vue b/src/subpackage/wallet/components/dy_withdraw_apply.vue
index a422a00..a86d363 100644
--- a/src/subpackage/wallet/components/dy_withdraw_apply.vue
+++ b/src/subpackage/wallet/components/dy_withdraw_apply.vue
@@ -23,7 +23,7 @@
                     <picker class="dol-picker" :range="banks" @change="bankNameChange">
                         <view class="dp-frame">
                             <input type="text" disabled class="df-ipt" placeholder="请选择" v-model="info.bank_name">
-                            <image class="df-icon"></image>
+                            <image class="df-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_c33.png"></image>
                         </view>
                     </picker>
                 </view>
@@ -87,17 +87,9 @@ export default {
             this.info.bank_name = this.banks[value];
         },
         alert(){
-            this.getStorageAndSet();
-            // if(this.isEmptyInfo){
-            //     showModal({
-            //         content: '是否自动填充上次提现信息？',
-            //         showCancel: true,
-            //         success: res=>{
-            //             if(res.confirm)this.getStorageAndSet();
-            //         }
-            //     })
-            // }
-            this.show = true
+            // this.getStorageAndSet();
+            this.show = true;
+            if(this.isEmptyInfo())this.getStorageAndSet();
         },
         hide(){
             this.show = false
@@ -106,7 +98,15 @@ export default {
             uni.getStorage({
                 key: 'dyRecentWithdrawApplyInfo',
                 success: res=>{
-                    this.info = res.data;
+                    showModal({
+                        content: '是否自动填充上次提现信息？',
+                        showCancel: true,
+                        success: mRes=>{
+                            if(mRes.confirm){
+                                this.info = res.data;
+                            }
+                        }
+                    })
                 }
             })
         },
@@ -222,7 +222,6 @@ export default {
                         flex-shrink: 0;
                         width: 20upx;
                         height: 20upx;
-                        background: skyblue;
                     }
                 }
             }
diff --git a/src/subpackage/wallet/components/record_line.vue b/src/subpackage/wallet/components/record_line.vue
new file mode 100644
index 0000000..1a6ff88
--- /dev/null
+++ b/src/subpackage/wallet/components/record_line.vue
@@ -0,0 +1,47 @@
+<template>
+    <veiw class="record-line">
+        <veiw class="rl-name">{{ name }}：</veiw>
+        <view class="rl-value"><slot></slot></view>
+        <view class="rl-tag" v-if="tag">{{ tag }}</view>
+    </veiw>
+</template>
+
+<script>
+export default {
+    props: {
+        name: {
+            type: String,
+            default: ''
+        },
+        
+        tag: {
+            type: String,
+            default: ''
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .record-line{
+        display: flex;
+        justify-content: space-between;
+        align-items: baseline;
+        .rl-name{
+            flex-shrink: 0;
+            flex-grow: 0;
+            @include flcw(28upx, 56upx, #9A9A9D);
+        }
+        .rl-value{
+            flex-grow: 1;
+            @include flcw(28upx, 56upx, #1A1A1A);
+            @include tHide(2);
+        }
+        .rl-tag{
+            flex-shrink: 0;
+            flex-grow: 0;
+            margin-left: 10upx;
+            @include flcw(28upx, 56upx, #1A1A1A);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wallet_modal.vue b/src/subpackage/wallet/components/wallet_modal.vue
index 0716b3a..dac98cd 100644
--- a/src/subpackage/wallet/components/wallet_modal.vue
+++ b/src/subpackage/wallet/components/wallet_modal.vue
@@ -1,7 +1,12 @@
 <template>
     <view class="wallet-mask" v-show="show">
         <view class="wm-content">
-            <image class="wc-close" @click="$emit('click:close')"></image>
+            <image 
+                class="wc-close" 
+                @click="$emit('click:close')" 
+                mode="aspect" 
+                src="/subpackage/wallet/static/images/close.png"
+            ></image>
             <view class="wc-title">{{ title }}</view>
             <slot></slot>
         </view>
@@ -47,7 +52,6 @@ export default {
                 top: 30upx;
                 width: 34upx;
                 height: 34upx;
-                background: #000;
             }
             .wc-title{
                 text-align: center;
diff --git a/src/subpackage/wallet/components/wallet_modal_success.vue b/src/subpackage/wallet/components/wallet_modal_success.vue
index f5eb389..b881ce6 100644
--- a/src/subpackage/wallet/components/wallet_modal_success.vue
+++ b/src/subpackage/wallet/components/wallet_modal_success.vue
@@ -1,10 +1,12 @@
 <template>
-    <wallet-modal>
+    <wallet-modal :show="isShow" @click:close="hide" :title="title">
         <view class="wallet-modal-success">
-            <image class="wms-icon"></image>
-            <view class="wms-des">充值成功！</view>
+            <image class="wms-icon" mode="aspect" src="/subpackage/wallet/static/images/success_tip.png"></image>
+            <view class="wms-des"><slot name="tip">成功！</slot></view>
             <view class="wallet-modal-button">
-                <wallet-modal-button>提现记录</wallet-modal-button>
+                <wallet-modal-button @click="btnClick">
+                    <slot name="btn">{{ btnName }}</slot>
+                </wallet-modal-button>
             </view>
         </view>
     </wallet-modal>
@@ -17,6 +19,28 @@ export default {
     components: {
         'wallet-modal': walletModal,
         'wallet-modal-button': wmButton
+    },
+    props: {
+        title: {
+            default: '提示'
+        }
+    },
+    data(){
+        return {
+            isShow: false
+        }
+    },
+    methods: {
+        hide(){
+            this.isShow = false;
+        },
+        alert(){
+            this.isShow = true;
+        },
+        btnClick(){
+            this.hide();
+            this.$emit('click:button');
+        }
     }
 }
 </script>
@@ -29,7 +53,6 @@ export default {
             display: block;
             width: 100upx;
             height: 100upx;
-            background: skyblue;
         }
         .wms-des{
             padding: 0 60upx;
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/index.vue b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
index c73bc7d..9fe989e 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/index.vue
@@ -7,23 +7,38 @@
                 :tag="getBaoFuV2AccountTypeForChinese(e.baofu_v2_config)"
                 :personal="getBaoFuV2AccountTypeForChinese(e.baofu_v2_config) === '个人'"
                 @click:extract='extractBtn(i)'
+                :ref="'baofuItem'"
             ></baofu-item>
         </view>
 
-        <bf-withdraw ref="bfWithdraw"></bf-withdraw>
+        <bf-withdraw ref="bfWithdraw" @click:extract="modalExtractBtn"></bf-withdraw>
+
+        <wallet-modal-success 
+            title="提现成功"
+            ref="walletModalSuccess"
+        >
+            <template v-slot:tip>提现一般当天到账，具体以银行到账时间为准！</template>
+            <template v-slot:btn>确定</template>
+        </wallet-modal-success>
     </view>
 </template>
 
 <script>
 import baofuItem from './modules/baofu_item.vue';
 import bfWithdraw from '../../components/bf_withdraw.vue';
+import wallet_modal_success from '../../components/wallet_modal_success.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo } from '@/utils/util'
+import { routeTo, showLoad, hideLoad } from '@/utils/util';
+import { mapState} from 'vuex';
 export default {
+    computed: {
+        ...mapState([ 'brandInfo' ])
+    },
     components: {
         'baofu-item': baofuItem,
-        'bf-withdraw': bfWithdraw
+        'bf-withdraw': bfWithdraw,
+        'wallet-modal-success': wallet_modal_success
     },
     data(){
         return {
@@ -33,9 +48,16 @@ export default {
     onLoad(options){
         this.brand_id = options.brand_id ?? '';
         // this.getWalletBalance(options.brand_id);
-        this.getPayAssureConfigs();
+        console.log('brandInfo', this.brandInfo);
+        this.getPayAssureConfigs({
+            appid: this.brandInfo?.brand?.mini_wechat_appid ?? 'wxc141a743225e7885'
+        });
     },
     methods: {
+        modalExtractBtn(index){
+            this.$refs.walletModalSuccess.alert();
+            this.$refs?.baofuItem?.[index]?.refreshItem(false);
+        },
         extractBtn(i){
             let { accountLs } = this;
             let _curItem = accountLs[i];
@@ -44,18 +66,28 @@ export default {
                 name: _curItem.label_name,
                 account: _curItem.baofu_v2_contract_no,
                 type: _type,
+                index: i
             });
         },
-        getPayAssureConfigs(){
+        /**
+         * http://api.ouxuan.net:61080/project/11/interface/api/9979
+         * 查看可选择的支付账户列表
+         * @param {String} pay_way 暂时只有 WeChat
+         * @param {String} appid 品牌小程序appid
+         * 
+         * */ 
+        getPayAssureConfigs({ pay_way = 'WeChat', appid }){
+            showLoad();
             servers.get({
                 url: WALLET_API.getPayAssureConfigs,
                 failMsg: '获取账户列表失败',
                 data: {
-                    pay_way: 'WeChat',
-                    appid: 'wxc141a743225e7885'
+                    pay_way,
+                    appid
                 }
             })
             .then(res=>{
+                hideLoad();
                 let _ls = res ?? [];
                 this.accountLs = this.filterBaoFuV2Accounts(_ls);
             })
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
index bb32140..14d73ec 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
@@ -6,10 +6,10 @@
                     <view class="bl-txt">{{ name }}</view>
                     <view class="bl-tag" >{{ tag }}</view>
                 </view>
-                <view class="bnb-right">
+                <!-- <view class="bnb-right">
                     <view class="br-txt">提现记录</view>
-                    <image class="wb-icon"></image>
-                </view>
+                    <image class="wb-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
+                </view> -->
             </view>
             <view class="bb-account-num">账户号：{{ account }}</view>
         </view>
@@ -23,21 +23,21 @@
             </view>
             <view class="bi-tip">
                 <view class="bt-txt">可提现资金(元)</view>
-                <image class="bt-icon"></image>
+                <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
             </view>
             <view class="bi-mony-info">
                 <view class="bmi-item">
                     <view class="bi-num">{{ accountInfo.currBal || 0 }}</view>
                     <view class="bi-tip">
                         <view class="bt-txt">总资产(元)</view>
-                        <image class="bt-icon"></image>
+                        <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
                     </view>
                 </view>
                 <view class="bmi-item">
                     <view class="bi-num">{{ accountInfo.pendingBal || 0 }}</view>
                     <view class="bi-tip">
                         <view class="bt-txt">在途资金(元)</view>
-                        <image class="bt-icon"></image>
+                        <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
                     </view>
                 </view>
             </view>
@@ -76,12 +76,16 @@ export default {
         }
     },
     created(){
-        this.getBaofuV2PriceInfo({
-            type: this.tag,
-            contractNo: this.account
-        });
+        this.refreshItem(true);
     },
     methods:{
+        refreshItem(loadStatus){
+            this.getBaofuV2PriceInfo({
+                type: this.tag,
+                contractNo: this.account,
+                loadStatus
+            });
+        },
         loadAgain(){
             let { statusMsg } = this;
             if(statusMsg === failStatusMsg){
@@ -91,8 +95,8 @@ export default {
                 });
             }
         },
-        getBaofuV2PriceInfo({ type, contractNo }){
-            this.statusMsg = '加载中...';
+        getBaofuV2PriceInfo({ type, contractNo, loadStatus = true }){
+            if(loadStatus)this.statusMsg = '加载中...';
             servers.post({
                 url: WALLET_API.baofuV2Gateway,
                 data: {
@@ -109,7 +113,7 @@ export default {
             .then(res=>{
                 let _data = res?.data;
                 if(_data.code === 0&&_data.data.errorCode === 'SUCCESS'){
-                    this.statusMsg = 'success';
+                    if(loadStatus)this.statusMsg = 'success';
                     this.accountInfo = _data.data;
                 }else{
                     console.warn('getBaofuV2PriceInfo error: ', res);
@@ -118,7 +122,7 @@ export default {
             })
             .catch(err=>{
                 console.log('getBaofuV2PriceInfo catch error: ', err);
-                this.statusMsg = failStatusMsg;
+                if(loadStatus)this.statusMsg = failStatusMsg;
             })
         }
     }
@@ -139,7 +143,6 @@ export default {
                 margin-left: 6upx;
                 width: 28upx;
                 height: 28upx;
-                background: skyblue;
             }
         }
         .bi-bar{
@@ -186,7 +189,6 @@ export default {
                         flex-shrink: 0;
                         width: 20upx;
                         height: 20upx;
-                        background: skyblue;
                     }
                 }
             }
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 084f2ce..54c7ad4 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="douyin-withdraw">
-        <image class="dw-icon"></image>
+        <image class="dw-icon" mode="aspect" src="/subpackage/wallet/static/images/dy_logo.png"></image>
         <view class="dw-tip">可提现资金</view>
         <view class="dw-price">
             <text class="dp-unit">¥</text>{{ balance }}
@@ -8,7 +8,7 @@
         <view class="dw-btn" @click="applyBtn">申请提现</view>
         <view class="dw-link">
             <text class="dl-txt" @click="toDetailBtn">提现明细</text>
-            <image class="dl-icon"></image>
+            <image class="dl-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
         </view>
 
         <dy-withdraw-apply
@@ -16,17 +16,28 @@
             :balance="balance"
             @click:confirm="dyConfirmExtract"
         ></dy-withdraw-apply>
+
+        <wallet-modal-success 
+            title="申请成功"
+            ref="walletModalSuccess"
+            @click:button="toDetailBtn"
+        >
+            <template v-slot:tip>平台已收到您的提现请求，预计在3~7个工作日内进行处理，请耐心等待！</template>
+            <template v-slot:btn>提现记录</template>
+        </wallet-modal-success>
     </view>
 </template>
 
 <script>
 import dyWithdrawApply from '../../components/dy_withdraw_apply.vue';
+import wallet_modal_success from '../../components/wallet_modal_success.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
 import { routeTo, showLoad, hideLoad, showNone } from '@/utils/util';
 export default {
     components: {
-        'dy-withdraw-apply': dyWithdrawApply
+        'dy-withdraw-apply': dyWithdrawApply,
+        'wallet-modal-success': wallet_modal_success
     },
     data(){
         return {
@@ -111,7 +122,7 @@ export default {
             })
             .then(res=>{
                 hideLoad();
-                showNone('申请提现成功');
+                this.$refs.walletModalSuccess.alert();
                 setTimeout(_=>{
                     this.getDouyinWalletBalance(brand_id);
                 }, 1200);
@@ -131,7 +142,8 @@ export default {
             display: block;
             width: 96upx;
             height: 96upx;
-            background: skyblue;
+            background: #000;
+            border-radius: 24upx;
         }
         .dw-tip{
             margin-top: 62upx;
@@ -165,7 +177,7 @@ export default {
                 margin-left: 6upx;
                 width: 28upx;
                 height: 28upx;
-                background: skyblue;
+                
             }
         }
     }
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 988b661..3586469 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -1,8 +1,14 @@
 <template>
     <view class="withdraw-record">
         <view class="wr-list">
-            <view class="record-item" v-for="i in 10" :key="i">
-                <record-item></record-item>
+            <view class="record-item" v-for="(e, i) in orderList" :key="i">
+                <record-line name="提现金额">{{ e.amount || 0 }}</record-line>
+                <record-line name="提现单号">{{ e.number || '-' }}</record-line>
+                <record-line name="申请时间">{{ e.request_time || '-' }}</record-line>
+                <record-line name="收款人名称">{{ e.account_name_of_bank || '-' }}</record-line>
+                <record-line name="收款人账号">{{ e.account || '-' }}</record-line>
+                <record-line name="处理时间">{{ e.updated_at || '-' }}</record-line>
+                <record-line name="备注">{{ e.remark || '-' }}</record-line>
             </view>
         </view>
     </view>
@@ -10,15 +16,31 @@
 
 <script>
 import recordItem from '../../components/record_item.vue';
+import recordLine from '../../components/record_line.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
 import { routeTo, showLoad, hideLoad, showNone } from '@/utils/util';
 export default {
     components: {
-        'record-item': recordItem
+        'record-item': recordItem,
+        'record-line': recordLine
+    },
+    data(){
+        return {
+            orderList: [],
+            loadPage: 1,
+        }
     },
     onLoad(options){
-        this.getDouyinWalletWithdrawRecord(options);
+        let _bid = options.brand_id ?? '';
+        this.brand_id = _bid;
+        this.getDouyinWalletWithdrawRecord({ brand_id: _bid });
+    },
+    onReachBottom(){
+        this.getDouyinWalletWithdrawRecord({ 
+            brand_id: this.brand_id, 
+            page: this.loadPage + 1 
+        });
     },
     methods: {
         /**
@@ -40,7 +62,12 @@ export default {
                 failMsg: '加载提现记录失败'
             })
             .then(res=>{
-                console.log(res);
+                hideLoad();
+                let _ls = res?.list || [];
+                if(page === 1)return this.orderList = _ls;
+                if(!_ls.length)return showNone('没有更多了！');
+                this.orderList = [...this.orderList, ..._ls];
+                this.loadPage = page;
             })
             .catch(hideLoad)
         },
@@ -55,6 +82,9 @@ export default {
     .wr-list{
         padding: 24upx 24upx 0;
         .record-item{
+            padding: 26upx 20upx;
+            border-radius: 10upx;
+            background: #fff;
             &+ .record-item{
                 margin-top: 24upx;
             }
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 36a8b28..6f4003b 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -9,8 +9,8 @@
             <view class="wt-tit">温馨提示：</view>
             <view class="wt-content">
                 <text class="wc-txt">
-                    如需要分账账户可以自己单独提现，请访问 https://sps.ouxuanzhineng.cn 
-                    <text class="wt-copy">复制</text>
+                    如需要分账账户可以自己单独提现，请访问 {{ oxAddress }} 
+                    <text class="wt-copy" @click="copyBtn">复制</text>
                     \r\n账户为宝付的商户号，密码为申请时预留的手机号码
                 </text>
             </view>
@@ -26,7 +26,7 @@ import walletModalSuccess from '../../components/wallet_modal_success.vue'
 import topUp from '../../components/top_up.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo } from '@/utils/util'
+import { routeTo, showLoad, hideLoad } from '@/utils/util';
 export default {
     components: {
         'wallet-info': walletInfo,
@@ -35,6 +35,7 @@ export default {
     },
     data(){
         return {
+            oxAddress: 'https://sps.ouxuanzhineng.cn',
             brand_id: '',
             balance: 0,
         }
@@ -44,7 +45,13 @@ export default {
         this.getWalletBalance(options.brand_id);
     },
     methods: {
+        copyBtn(){
+            uni.setClipboardData({
+                data: this.oxAddress,
+            })
+        },
         getWalletBalance(brand_id){
+            showLoad();
             servers.get({
                 url: WALLET_API.walletBalance,
                 data: {
@@ -53,8 +60,12 @@ export default {
                 failMsg: '获取钱包余额失败'
             })
             .then(res=>{
+                hideLoad();
                 this.balance = +res.balance ?? 0;
-                console.log(res);
+            })
+            .catch(err=>{
+                hideLoad();
+                console.log(err);
             })
         },
         dyBtnClick(){
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 064be55..cb1a39a 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -2,15 +2,15 @@
     <view class="wallet-info">
         <view class="wi-bar">
             <view class="wb-txt">钱包查账可登录后台查阅</view>
-            <image class="wb-icon"></image>
+            <image class="wb-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
         </view>
         <view class="wi-account">
             <veiw class="wa-top">
                 <view class="wt-name">欧轩内部钱包账户</view>
-                <view class="wt-record">
+                <!-- <view class="wt-record">
                     <text>充值记录</text>
-                    <image class="wr-icon"></image>
-                </view>
+                    <image class="wr-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
+                </view> -->
             </veiw>
             <view class="wa-tip">(用于购买服务使用)</view>
             <view class="wa-balance">
@@ -18,7 +18,7 @@
                     <text class="wm-unit">¥</text>
                     {{ balance }}
                 </view>
-                <view class="wb-btn">充值</view>
+                <!-- <view class="wb-btn">充值</view> -->
             </view>
         </view>
         <view class="wi-btns">
@@ -26,7 +26,7 @@
                 <text class="wi-txt">宝付提现</text>
             </view>
             <view class="wb-item" @click="$emit('click:douyin')">
-                <image class="wi-icon"></image>
+                <image class="wi-icon" mode="aspect" src="/subpackage/wallet/static/images/dy_logo.png"></image>
                 <text class="wi-txt">抖音提现</text>
             </view>
         </view>
@@ -64,7 +64,6 @@ export default {
             .wb-icon{
                 width: 20upx;
                 height: 20upx;
-                background: skyblue;
             }
         }
         .wi-account{
@@ -82,7 +81,6 @@ export default {
                         margin-left: 4upx;
                         width: 20upx;
                         height: 20upx;
-                        background: skyblue;
                     }
                 }
             }
@@ -128,7 +126,6 @@ export default {
                     margin-right: 4upx;
                     width: 44upx;
                     height: 44upx;
-                    background: skyblue;
                 }
                 .wi-txt{
                     @include flcw(32upx, 44upx, #FFFFFF, 500);
diff --git a/src/subpackage/wallet/static/images/arrow_b2.png b/src/subpackage/wallet/static/images/arrow_b2.png
new file mode 100644
index 0000000000000000000000000000000000000000..54df2b3b9b66beeb07c3830279efe65fe73e4f58
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK%K)DcS0KG($BwI4ubw(}YVY2?
zyLRn5di3b^>(_7GxN-dW@oU$v0i_NfK78WDiHjF6o<D#7%$YM+u3Xu)X;Z=-mmNUO
zLM1_d!3_WW&j0xHRD<V^vHhECJqz|F%{Nc&0m{aEx;TbdoPK-8o3BBE$2G8v;~Ia)
z_x%ycDOtZvn1tW`crr`h)o+5eONv8+Pyn0L(zlyV$3N}!VtP;}EBoR^Qr;C=@xty`
yHPYsH^N!6~{r+0Go`mj|qi;%P%$1v5U#2dj!n1u{y8tK9Dh5wiKbLh*2~7Zry>apY

literal 0
HcmV?d00001

diff --git a/src/subpackage/wallet/static/images/arrow_c33.png b/src/subpackage/wallet/static/images/arrow_c33.png
new file mode 100644
index 0000000000000000000000000000000000000000..50fd0243bbf2bc38581ef48c0d19c6154e703fba
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0006WNkl<ZNK5Th
zJ%|%Q6#m{|KtV(j6$O=8`BMaUX4iO?L9~#A!{$&M8$lFLZ0szwx<as%gR8VV5Do+j
z6~(`^a-CTSM4MRK2%3lxWiw9(c9)n-vWa?y;B+(dz3+ST-us5I#*5aNAO8h%E1Z?c
z_kE9<&kG@z!!UfB8#w^rdENmb#GDY~VHk!F93&G^O1%THAHWZ5?eQpzUQHsRl-dVi
z1;7@^0brZfx|In?DW4G0v4r#!fWunr595d^rFH{&4PaM-|JZ7^_B5N#@0mcQQrTH3
z6y5;Xk$~O<m~vT+67f85s}RCvzBj>rwbmYuqUh}}C32e}2m)*EO8^@Z@MEp@G=T0P
zk!rQNDURdk0AzCCVdiOL%(E1~$_G-)Q$)0s_J^5o8)Gi_3zW;{^~GZG5fL3p?qUG5
zTI>70*nviqQeG#b8$G~FTI+>$U#r#DwcG7wBAQ9gn3>NRWA5}PGStaZ$|WK?on|M5
zIFXDmDW&cLINL*ZRcn1~P#K2`xDu2~CD)HbE|8f&3n8YM`67TTDH$`*8)L2w8-$U6
zQ4j>%t+j5l(((HOU~>=oqA}*es42_+?1CUT*zI;#h-hOU(LJs8836W=1YEFE>LfF}
zriyfYJDtu<qtS4V9l3H}kVgByKgY~BnfXN=$Fuc%{aYUSDx-}N;1c37a2aIm7feE$
lYqZ}bo5%-$OXS}#(NB)^x*0w=?7jd1002ovPDHLkV1n=F4=Vrw

literal 0
HcmV?d00001

diff --git a/src/subpackage/wallet/static/images/close.png b/src/subpackage/wallet/static/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8cc22ac24bacbd5c363934c456e089a4ddd74d1
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U_3?xrvihTr9q5(c3u0VR$thuvi&jX@av*yj2
zvta)G`J67RB!Cj^B|(0{4FAGcH9K=WdFr_gC{*L=;uxZFe(t1`ybT6CEV}FdFJpSq
zz|N|0(ZOrMe=UcuN3OHv|J~TA-hRDv{<fH_-9L9ItBIzY%@tg{<=YX3xB42Q%B#+<
z?VQqIzLqu8=uMZivaa8e0C%2J5TTlMg2U*>(aDw8@h9|dXkJ~A6f*TxvDF-f<!9zI
aR5Ntv2!&33?otJG2ZN`ppUXO@geCyEcUXS_

literal 0
HcmV?d00001

diff --git a/src/subpackage/wallet/static/images/dy_logo.png b/src/subpackage/wallet/static/images/dy_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b27412396c8a6eca4f2c00c2caa374005d0227b
GIT binary patch
literal 914
zcmV;D18w|?P)<h;3K|Lk000e1NJLTq001li001lq0{{R3DO##C0003*P)t-s0000x
zmX>1o_4*J{_7qh88(3NeDEuj6^%_)J_Vro&`$_ls^%qj?8&yZ?=|HHcS_mOkpP%@U
ztMM9BQ|s&78B9>;=iC}k`$BW`G-*ii@9Y~>Tle=<>grGK?ncGJ<r-4c8cRpQ!bf6a
zCv0r>QhieS`1$(#@Yvx-<>lByYgFmz@EKD@+uPO~Oxmuz-55>P8BM<wKtZsuPv+y-
z7EY!ZI*i)ivlBm9>FLAu_3xLjckJr>h^F{xjez<2%GBM6`1bJj_xBZ2#naP`(9o{;
z^~F+h^cqyv6iCq)Nbzlug$pU+vcv!X|IhyZ`<JrI{{H*_|LXt#|M~m<?eY9$i@N^*
zR{s9|+2Z`s+i?E=;Qjso^Y;8VZD;-cp8fp%zRvq>k+1&!{pRfYhNSv>ob&$vi~aq2
z{`{By{P?H6+R&s_0000^bW%=J06qTBC;koo=>6^8nL;lt9~l0ASu!9U`r+N&$e@I6
zPC7C#A^Q3D^wiPAytcNkt%rYpbZlx_Q9AYV@bB*C+RVnpz__=ur=+5fMLb)I*NOlD
z0k26!K~y-)-PBief<P1nU{V$cDRvX1G0pVYdwTC#qaa|x-t+(8vpZrk69v~-&l59z
zTn@vXrKTq<ICe5?SYJeOli`{Do+L>(mQ^CWkcJRu9X4_dFSjPZx%UY$Jp7yh!@D>E
zo>ejAZ#S&=aX1ABTDp$YWRr2SR~CZFf{MkZ(aN5*T9bpx-{zd4jSX%W$8j#ZI{Aw|
zHs^)W*c9R9LM2^1bl6lpXN&n9dtzxAn>O~#m0||Md}(=r=P6?%^yZ5WTe(m~;vXKJ
zO|F0d8TKs7_`XtYwpz?MyeW53U7^VU*2!+`W0SX>Le>nNQ6p`n^|9fo%cK2WWBco_
zk9XE9s6~~rP(-*6F<vIXsD=b_4V(J8WsI8|*yF{M1#`c$;ROF5rFO4z6oh*jto<h3
z=|rxy(R)fS8e6}6!9$dTr-;?<lFLP08E7tj_zdD?q)wq*#}DQhc2x^|9y5L2=6QUT
zt$`&<GrJE5@Gp%TIGv|-v|stPc@ePNlwOR_=lO=BWE<5M0H?_6>)7$0SQFP6;0zL+
ow)98nH4q3UXo@T}O;b~pAKg)e5uJk`yZ`_I07*qoM6N<$f{0$}8UO$Q

literal 0
HcmV?d00001

diff --git a/src/subpackage/wallet/static/images/question_mark.png b/src/subpackage/wallet/static/images/question_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..0502dd6b51b862da9e3a8275fb0bb9407d7ffcf1
GIT binary patch
literal 1023
zcmV<b0|5MqP)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0001BP)t-s0001?
zp`@IgpPikcot>bbo}!$bpPikcot>YbpQ4<cpq-tdoSdJXouHncp`M<iqobpsprf3e
zpPZbao}QtfpP-(ep`D$dot>bbo}itbpq-tdo}QtdouHkapq!ka;mo!}0000VbW%=J
z00#Gmz%TIGwj$-1>tRJW7Z1&%o>@J{b#A7uRZe{RFEWDw00S>cL_t(Y$9$CAnyVlT
zg*k&L;Mr<hdH=WE2{_ns+sTFfAo&wmAte{1_-S8!Fui5W_GaL(wm7~SMXz*x6TQ|}
zF{Z56z1X;u$@>=?9>&K1%$i5|6KkDdk;MqLRFh08hU>_LYv~t?P`5x7ny%N$%c_!o
zT5FxQ7@!bx$5mV-rUakns-wqtSIrX_3Q^6gJ5tsRkF;>#Wdtq9b)GNDS<4&FpvR7Z
zB6HQ6hS4Hw<n^4gM^VI^mROLg%6jC_TcAk2%*(<V)DFvKs`LA3j4;n}4-|J&QH(La
z$f|~9s;<a!E4f2kvNdLv`N9yTAPk~T<Jg9}WST|%;lRP3^5<kVZt#!(VXMZHDd@r>
z`f<E!#3o}u6WA``7Be}NkoolpzCZS7gJj&hqsEL^SlT1hL3{1Hocn>XYV<86mV2tc
z6z|){s9Y`>u)@&&h&7vt0;e^gE0F14Ik+3}-3CH)g}8(=j;n<lLY7t;EV-3|3=4!m
zlJw6QbH)tTsAPRv8(I=`$dhz-7KHGmIGz}YiOxU(yCQ)XpoqgBLTOIRJ{@AC^!fo}
zq9-{65<p11!S6&0NxgIKU7aV`5F809hn)b}TJjQ+>7$3&aY9vJI=_|^oHdB|A{@p7
zAL*ArF9~^z1{ths7!pnf9o5>AFD9{VS^i?(s-hl<0dTsnhmQfc>nPC)Ktp;P8-LGH
zZ&;d+@Y~~?XnSH+Y~=kFr2#CeEs)F9H&IyvzUEFFn(v3o9o(r-13LdJy$n|vgn<~$
zaBKyKRLe#;$9(^{+>XKbBcTZP{;8zaYc7cZ9a*=)4UDM(n_Hby9N@~LvQ=*mWRAux
z6Y4F^;W!Lff@+2D)8l9pV2uI(08|1rDVJk_Zxx_Y4wC!2WgLfx-iG8dR=dSmF~~b*
zgN$@oy-P|@J$<A@#3~9K2=A}lRk1=I<@x;j(G8iTkVh3{fcd;Bb4-v=cPwD{jaYz~
z4#2+wZx`BarsFn8SJQQ=nM<`fH&&LPGm%J)wQc2IX5}6p5aTFd9v(cdcxhbe4@e%#
tqS&fLvW^hg5j#7AZb!842=j-2AHKFqPco`%suKVJ002ovPDHLkV1kvy>WlyY

literal 0
HcmV?d00001

diff --git a/src/subpackage/wallet/static/images/success_tip.png b/src/subpackage/wallet/static/images/success_tip.png
new file mode 100644
index 0000000000000000000000000000000000000000..e621534f55a01003f58e22038c88964b807dfe57
GIT binary patch
literal 974
zcmV;<12O!GP)<h;3K|Lk000e1NJLTq003kF003qP0{{R33iQNn0001EP)t-s00000
zm~;S|a{!oh0GM<Dm~;S{bO4!j0GV|Fm~;S{bO4!k0GV_EnR5V`bpQYVDXEJ(u$0g2
z<z&FB9;Afn_Vb<C%22qU_51p~<lCs+&vnSO+wkj!&b<+zeX-xvk<-H=^GS{X000hj
zQchC<+Zch#=(lTBlR=>_B*oK#B>(^e3`s;mRA}Di+S`_+AP@ymK*VbfnrLn&ng0K;
zoSrqkrn<cl3h-(6TR)vHt3cEUZ*7@1MoXFJQfgCWWh>IEGmRBGs}lvNLc_rn@e!rL
zTTK}ik-<+MT#lj$kC<%FDhR)tT7pgUhFUcUQgO=25lFV--ALaVgD8zpJ2WDhw;2bC
zXj-{5+8hZ;XUc&xc1uwbiRkSReg?n$1_?EcHJEr+)<~>fX?l*tB(ouj_T&;fX!+C2
zr&CW>2fUdug-FBwfi>SlD#STm?G0<PWQDx$*4jJP<f%H+J?y6sz}*$ZxLoZY6WpZ~
zh;Xuhov^O_3egBR*)KiF%5Ho}kzqS*h;IAI{(~(=<c@N&9w8=fk@Q!e5Jc_2!)U!i
z>d%k{fsXdO0b8<&mYgYIV}xnLS5bpSPS_NDe(0{VkTW*5qKIk;d0<l+cq@6@h0f7=
zg8;o<dSXi@bj-yf<8!+b6Ewk-Ul}yRDJJXK!9|K3Y`0m)9d6R6lHpgk+<VD{H*$}V
z>H7139p_6uKBPa=B3N4@7m&c7ygufaePCxmx<~jjF4ps%odNAyjKgg?K|MbMMi^Ja
zms`_~(Q`T#RnCT!^Rkd9{A3$j{p-BG%id<OUP@7~hfI%o$az-C4Zhm#+wW<dr3^m`
zIlkb_d60O{OX=v3aey!FJ`(khpQW5#hZE<KsPsPf+^@{xrNf<KoP6lYF?bxf`*E3Z
z1cUZ@bQq{H?55MBLkqXp(eig*qUdpsaliclhw*+e{T12}dN5UBq+C0&&|42i$^@2-
z_1fbWbg>{v19%=yyO2WsALU;Unk;XM`!1>*?FfD$#Ot)$+Y?x1$cxSkc<SV@Y<=FO
zE2NfF*BKWq^kQ))EM~HZMnZ=DA&5_>{-nkHsMV$#tb=f<(`2;!e`u74{XdyXwg1Oo
zBfL~QtihB!OkN9b${>hQf}_mACQHFp@w*Y=(14**B8;lMt5Ey=B#P)l#A-9?>~?k#
wNvN`ss{u`^L`teIDx<%$q&8JiEAij?4e_$Fbcanrx&QzG07*qoM6N<$g4svc;{X5v

literal 0
HcmV?d00001


From a8d2cc55732bd3513b9aee0229fb543644eda9e8 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 17 May 2024 16:06:45 +0800
Subject: [PATCH 07/12] add tid1505 api

---
 src/pages/index/index.vue                          |   4 +-
 src/subpackage/wallet/components/filtrate_bar.vue  | 107 +++++++++++++++++++++
 src/subpackage/wallet/components/record_item.vue   |  68 -------------
 .../wallet/pages/douyin_withdraw/record.vue        |   7 +-
 src/subpackage/wallet/static/images/filter.png     | Bin 0 -> 290 bytes
 5 files changed, 113 insertions(+), 73 deletions(-)
 create mode 100644 src/subpackage/wallet/components/filtrate_bar.vue
 delete mode 100644 src/subpackage/wallet/components/record_item.vue
 create mode 100644 src/subpackage/wallet/static/images/filter.png

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 3ef557d..4a4feb8 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -36,7 +36,7 @@
 			</view>
 		</view>
 		<view class="ic-tabs" v-if="indexData&&indexData.permission">
-			<block v-for="e in tabList" :key="e.id">
+			<block v-for="(e, i) in tabList" :key="i">
 				<view class="it-item" @click="toPageInfo(e)" v-if="isPermissionShowTab(e)">
 					<view>
 						<image mode="aspectFit" :src="'/static/images/icon/index/tab_'+ e.id + '.png'"></image>
@@ -146,7 +146,7 @@
 			serverKey: 1015  // 后端对应权限编号 1015
 		},
 		{
-			id: 11,
+			id: 10,
 			name: '钱包',
 			path: '/subpackage/wallet/pages/index/index',
 			serverKey: 1015  // 后端对应权限编号 1015
diff --git a/src/subpackage/wallet/components/filtrate_bar.vue b/src/subpackage/wallet/components/filtrate_bar.vue
new file mode 100644
index 0000000..e432dd7
--- /dev/null
+++ b/src/subpackage/wallet/components/filtrate_bar.vue
@@ -0,0 +1,107 @@
+<template>
+    <view class="time-selection">
+        <view class="ts-left">
+            <picker class="tl-class" mode="date" @change="startDateChange" :value="startDate">
+                <view class="tl-frame">
+                    <input type="text" class="tf-time" disabled :value="startDate">
+                    <image class="tf-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_c33.png"></image>
+                </view>
+            </picker>
+            <view class="tl-txt">至</view>
+            <picker class="tl-class" mode="date" @change="endDateChange" :value="endDate">
+                <view class="tl-frame">
+                    <input type="text" class="tf-time" disabled :value="endDate">
+                    <image class="tf-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_c33.png"></image>
+                </view>
+            </picker>
+        </view>
+        <view class="ts-right" @click="filterBtn">
+            <text class="tr-txt">筛选</text>
+            <image class="tr-icon" mode="aspect" src="/subpackage/wallet/static/images/filter.png"></image>
+        </view>
+    </view>
+</template>
+
+<script>
+import { formatDate } from '@/utils/util';
+export default {
+    data(){
+        return {
+            startDate: '',
+            endDate: ''
+        }
+    },
+    created(){
+        let _date = new Date();
+        this.startDate = formatDate({ date: new Date(_date.setFullYear(_date.getFullYear() - 1))});
+        this.endDate = formatDate({});
+    },
+    methods: {
+        startDateChange(e){
+            this.startDate = e.detail.value;
+        },
+        endDateChange(e){
+            this.endDate = e.detail.value;
+        },
+        filterBtn(){
+            uni.showActionSheet({
+                itemList: ['全部', '待处理', '已处理'],
+                success: (res) => {
+                    console.log(res.tapIndex);
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .time-selection{
+        padding: 26upx 24upx;
+        background: #fff;
+        @include ctf(space-between);
+        .ts-left{
+            @include ctf;
+            .tl-class{
+                flex-shrink: 0;
+            }
+            .tl-frame{
+                flex-shrink: 0;
+                padding: 0 16upx;
+                height: 92upx;
+                width: 240upx;
+                border-radius: 10upx;
+                background: #F2F2F7;
+                @include ctf(space-between);
+                .tf-time{
+                    flex-grow: 1;
+                    box-sizing: border-box;
+                    height: 100%;
+                    @include flcw(28upx, 40upx, #1A1A1A);
+                }
+                .tf-icon{
+                    margin-left: 4upx;
+                    flex-shrink: 0;
+                    width: 20upx;
+                    height: 20upx;
+                }
+            }
+            .tl-txt{
+                margin: 0 18upx;
+                @include flcw(32upx, 44upx, #1A1A1A);
+            }
+        }
+        .ts-right{
+            @include ctf(flex-end);
+            .tr-txt{
+                margin-right: 12upx;
+                @include flcw(28upx, 40upx, #9C9C9F);
+            }
+            .tr-icon{
+                flex-shrink: 0;
+                width: 40upx;
+                height: 40upx;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/record_item.vue b/src/subpackage/wallet/components/record_item.vue
deleted file mode 100644
index ffc4bf1..0000000
--- a/src/subpackage/wallet/components/record_item.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-    <view class="record-item">
-        <veiw class="ri-line">
-            <veiw class="rl-name">提现金额：</veiw>
-            <view class="rl-value">12.00</view>
-            <view class="rl-status">待处理</view>
-        </veiw>
-        <veiw class="ri-line">
-            <veiw class="rl-name">提现单号：</veiw>
-            <view class="rl-value">TX20191017898999</view>
-        </veiw>
-        <veiw class="ri-line">
-            <veiw class="rl-name">申请时间：</veiw>
-            <view class="rl-value">2019-10-17  12:12:12</view>
-        </veiw>
-        <veiw class="ri-line">
-            <veiw class="rl-name">收款人名称：</veiw>
-            <view class="rl-value">广州欧轩网络科技有限公司</view>
-        </veiw>
-        <veiw class="ri-line">
-            <veiw class="rl-name">收款人账号：</veiw>
-            <view class="rl-value">62170033200934025456</view>
-        </veiw>
-        <veiw class="ri-line">
-            <veiw class="rl-name">处理时间：</veiw>
-            <view class="rl-value">2024-10-17  12:12:12</view>
-        </veiw>
-        <veiw class="ri-line">
-            <veiw class="rl-name">备注：</veiw>
-            <view class="rl-value">-</view>
-        </veiw>
-    </view>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss">
-    .record-item{
-        padding: 26upx 20upx;
-        border-radius: 10upx;
-        background: #fff;
-        .ri-line{
-            display: flex;
-            justify-content: space-between;
-            align-items: baseline;
-            .rl-name{
-                flex-shrink: 0;
-                flex-grow: 0;
-                @include flcw(28upx, 56upx, #9A9A9D);
-            }
-            .rl-value{
-                flex-grow: 1;
-                @include flcw(28upx, 56upx, #1A1A1A);
-                @include tHide(2);
-            }
-            .rl-status{
-                flex-shrink: 0;
-                flex-grow: 0;
-                margin-left: 10upx;
-                @include flcw(28upx, 56upx, #1A1A1A);
-            }
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 3586469..8e91038 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -1,5 +1,6 @@
 <template>
     <view class="withdraw-record">
+        <filtrate-bar>123</filtrate-bar>
         <view class="wr-list">
             <view class="record-item" v-for="(e, i) in orderList" :key="i">
                 <record-line name="提现金额">{{ e.amount || 0 }}</record-line>
@@ -15,15 +16,15 @@
 </template>
 
 <script>
-import recordItem from '../../components/record_item.vue';
 import recordLine from '../../components/record_line.vue';
+import filtrate_bar from '../../components/filtrate_bar.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
 import { routeTo, showLoad, hideLoad, showNone } from '@/utils/util';
 export default {
     components: {
-        'record-item': recordItem,
-        'record-line': recordLine
+        'record-line': recordLine,
+        'filtrate-bar': filtrate_bar
     },
     data(){
         return {
diff --git a/src/subpackage/wallet/static/images/filter.png b/src/subpackage/wallet/static/images/filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc030b39ee091c8effc501f210038027ac553cfc
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK;{cx!S0FuO#*CRWX97tGm^Et_
zkO3qif<O`irca*^WB{c;l&x<AY7;04@(X5oo&NRXqgX%Jn$oaVo13Sv?oG4+%Jq4=
zIEGl9e%p7EtJ#3ZH91>q>*cTi_m{nH6>vN7rEt;nw{3?NOTx9bGprNn7b|jj5|Pr8
z*|*11aK+s@zY3PDtPXw77Q9FOgPFBR_OG~$nP;C~k6!b9)^pnpY1vWw>z`;Cbo({7
zSKbr3Hc!2DvgxMcYtv=*XY4k6$m*+{*R(=&@mcd;liT7_4+Zu0|H;bN-VkgER{6FX
P=rRURS3j3^P6<r_v|fGx

literal 0
HcmV?d00001


From f6432cfbcd29f394a8c92b9ebc9f6a26ac7b7a65 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 17 May 2024 18:18:49 +0800
Subject: [PATCH 08/12] fix tid1505 all

---
 src/pages.json                                     |   6 --
 src/pages/index/index.vue                          |   4 +-
 src/static/images/icon/index/tab_11.png            | Bin 0 -> 792 bytes
 src/store/index.js                                 |   1 +
 .../wallet/components/dy_withdraw_apply.vue        |   8 +-
 src/subpackage/wallet/components/filtrate_bar.vue  |  37 ++++++++--
 .../wallet/components/time_selection.vue           |  82 ---------------------
 src/subpackage/wallet/components/top_up.vue        |  56 --------------
 .../pages/baofu_withdraw/modules/baofu_item.vue    |  18 ++++-
 .../wallet/pages/douyin_withdraw/index.vue         |   6 +-
 .../wallet/pages/douyin_withdraw/record.vue        |  79 +++++++++++++++++---
 src/subpackage/wallet/pages/index/index.vue        |   3 -
 .../wallet/pages/index/recharge_record.vue         |  20 -----
 13 files changed, 125 insertions(+), 195 deletions(-)
 create mode 100644 src/static/images/icon/index/tab_11.png
 delete mode 100644 src/subpackage/wallet/components/time_selection.vue
 delete mode 100644 src/subpackage/wallet/components/top_up.vue
 delete mode 100644 src/subpackage/wallet/pages/index/recharge_record.vue

diff --git a/src/pages.json b/src/pages.json
index 6820a94..511b582 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -734,12 +734,6 @@
 					}
 				},
 				{
-					"path": "pages/index/recharge_record",
-					"style" : {
-						"navigationBarTitleText": "充值记录"
-					}
-				},
-				{
 					"path": "pages/baofu_withdraw/index",
 					"style" : {
 						"navigationBarTitleText": "新宝付提现"
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 4a4feb8..ea4a2b4 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -146,10 +146,10 @@
 			serverKey: 1015  // 后端对应权限编号 1015
 		},
 		{
-			id: 10,
+			id: 11,
 			name: '钱包',
 			path: '/subpackage/wallet/pages/index/index',
-			serverKey: 1015  // 后端对应权限编号 1015
+			serverKey: 1017  // 后端对应权限编号 1017
 		},
 	];
 	
diff --git a/src/static/images/icon/index/tab_11.png b/src/static/images/icon/index/tab_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f4f05c0b9f43b5cdb81aea53f0e0616ebcc78e3
GIT binary patch
literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq001-q001-y0{{R3@}}$A0002$P)t-s00000
zoOu8L|NsC04xW7f|NsC0|NsC0w&B;7)y4stbpV@!m(|ArnREb{bpV}o0GN38{Q3Zx
zbO4xi0GV?Dn05e{bpWDt0GV_Em~;S{bO4%l0GM?EnRNh}bO4!j0Ge|EmvoKM!IIO%
zo!H7%x}yM@bbiaX0GW0F|NsC0{{WbDFszT~_3}Njl@p+T`2GACqJadPcEjl4{QmvU
z?B%oI)<?CPGp&#yrG^Wgdf@Z!*YE0u&b&afm?Wo&?DzHD@$9bO)T7$XZN#v=<l3p+
z(VW-GSG=TAxS)>F!FkEHT)n0$sf&}%m;wL*04j7+PE!CeN&NQQ1oY+Q_X_^z-5(JB
z?X;azI~LW)!n&rHeOXB?`s?c2r;cVp!wE|w0005ANkl<ZNXPBg*-pYx6op{~6fMY%
zfQ-(17KKs@ZJA^c0f+a09d}EP*kW4Fg~kj2yB+ee0)arltD|7>C?Hz!@GvMQXeSa1
zMQBTGCv<!qqAjtVlW_RN-V)gf1L3{4lF{uBs6DoF*;1xb%kv$|ck3bpJLx8+UD?Ke
zD|(Ji`c#{9<F{1>)mK$LrH%RkTDI`s%3DL@-YhoI=C+AhDAw}aI*0?0T}C~(EYo8a
zVm(`3v&h4D=<F0|${d+<wn5C=>R&SDF5!vj+08EFh_3!p8?1q1-3zhVf_)-|EnhTc
zt<q6&n`kW!G-e&E31f1HqmE418yU)Fa<_2+YTIt5O!PKKZGEDwS{yk)3y#JHz!6}K
zLAg<~h~2hm+gDQt)i#=rIO4Yp)zfqvi-GKjBYwM3mQGz}t~lbkP=U@K6GRf7iYT%l
z{8gkW;%I29qn(%LhekkSD2kq}Z|>hkufV(TYZ@A+_`AoZT{5DG`e7u|nG!{DIy<7M
zLg#oOh;nH_)u&=8ngxiN4bM2@CF0nxfJ2p~eaxxrpTK>|-$>Qn-|57GPx-)qjy?c#
Wqx;{nLG@bz0000<MNUMnLSTZz>5+#3

literal 0
HcmV?d00001

diff --git a/src/store/index.js b/src/store/index.js
index cdc5dcc..043eaef 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -43,6 +43,7 @@ export default new Vuex.Store({
 			'1013': '课程管理',
 			'1014': '储值卡管理',
 			'1015': '进场人数异常',
+            '1017': '钱包提现'
         },
         // 场地占用提交页面信息
         occupyInfo: {
diff --git a/src/subpackage/wallet/components/dy_withdraw_apply.vue b/src/subpackage/wallet/components/dy_withdraw_apply.vue
index a86d363..56c8777 100644
--- a/src/subpackage/wallet/components/dy_withdraw_apply.vue
+++ b/src/subpackage/wallet/components/dy_withdraw_apply.vue
@@ -12,11 +12,11 @@
                 </view>
                 <view class="dwa-opt-line" :key="i">
                     <view class="dol-name">*账户名称</view>
-                    <input type="text" class="dol-ipt" placeholder="请输入提现金额" v-model="info.account_name_of_bank">
+                    <input type="text" class="dol-ipt" placeholder="请输入账户名称" v-model="info.account_name_of_bank">
                 </view>
                 <view class="dwa-opt-line" :key="i">
                     <view class="dol-name">*银行卡号</view>
-                    <input type="number" class="dol-ipt" placeholder="请输入提现金额" v-model="info.account">
+                    <input type="number" class="dol-ipt" placeholder="请输入银行卡号" v-model="info.account">
                 </view>
                 <view class="dwa-opt-line">
                     <view class="dol-name">*银行名称</view>
@@ -29,11 +29,11 @@
                 </view>
                 <view class="dwa-opt-line" :key="i">
                     <view class="dol-name">*支行名称</view>
-                    <input type="text" class="dol-ipt" placeholder="请输入提现金额" v-model="info.bank_address">
+                    <input type="text" class="dol-ipt" placeholder="请输入支行名称" v-model="info.bank_address">
                 </view>
                 <view class="dwa-opt-line" :key="i">
                     <view class="dol-name">联系电话</view>
-                    <input type="number" class="dol-ipt" placeholder="请输入提现金额" v-model="info.mobile">
+                    <input type="number" class="dol-ipt" placeholder="请输入联系电话" v-model="info.mobile">
                 </view>
                 
             </scroll-view>
diff --git a/src/subpackage/wallet/components/filtrate_bar.vue b/src/subpackage/wallet/components/filtrate_bar.vue
index e432dd7..62eb787 100644
--- a/src/subpackage/wallet/components/filtrate_bar.vue
+++ b/src/subpackage/wallet/components/filtrate_bar.vue
@@ -23,8 +23,14 @@
 </template>
 
 <script>
-import { formatDate } from '@/utils/util';
+import { formatDate, showNone } from '@/utils/util';
 export default {
+    props: {
+        filterList: {
+            type: Array,
+            default: () => ['全部', '待处理', '已处理']
+        }
+    },
     data(){
         return {
             startDate: '',
@@ -32,22 +38,41 @@ export default {
         }
     },
     created(){
-        let _date = new Date();
-        this.startDate = formatDate({ date: new Date(_date.setFullYear(_date.getFullYear() - 1))});
-        this.endDate = formatDate({});
+        this.initDate({});
     },
     methods: {
+        initDate({ startDate, endDate }){
+            let _date = new Date();
+            this.startDate = startDate ?? formatDate({ date: new Date(_date.setFullYear(_date.getFullYear() - 1))});
+            this.endDate = endDate ?? formatDate({});
+        },
+        getTimes(){
+            return { startDate: this.startDate, endDate: this.endDate };
+        },
         startDateChange(e){
             this.startDate = e.detail.value;
+            this.emitTimes();
         },
         endDateChange(e){
             this.endDate = e.detail.value;
+            this.emitTimes();
+        },
+        emitTimes(){
+            let { startDate, endDate } = this;
+            if(!startDate || !endDate)return;
+            let _sdTimestamp = new Date(startDate.replace(/-/g, '/')).getTime();
+            let _edTimestamp = new Date(endDate.replace(/-/g, '/')).getTime();
+            if(_sdTimestamp > _edTimestamp){
+                showNone('开始时间不能大于结束时间');
+                return;
+            }
+            this.$emit('change:times', { startDate, endDate });
         },
         filterBtn(){
             uni.showActionSheet({
-                itemList: ['全部', '待处理', '已处理'],
+                itemList: this.filterList,
                 success: (res) => {
-                    console.log(res.tapIndex);
+                    this.$emit('change:filter', res.tapIndex);
                 }
             })
         }
diff --git a/src/subpackage/wallet/components/time_selection.vue b/src/subpackage/wallet/components/time_selection.vue
deleted file mode 100644
index a39604c..0000000
--- a/src/subpackage/wallet/components/time_selection.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-    <view class="time-selection">
-        <view class="ts-left">
-            <picker class="tl-class">
-                <view class="tl-frame">
-                    <input type="text" class="tf-time" disabled value="2021-12-12">
-                    <image class="tf-icon"></image>
-                </view>
-            </picker>
-            <view class="tl-txt">至</view>
-            <picker class="tl-class">
-                <view class="tl-frame">
-                    <input type="text" class="tf-time" disabled value="2021-12-12">
-                    <image class="tf-icon"></image>
-                </view>
-            </picker>
-        </view>
-        <view class="ts-right">
-            <text class="tr-txt">筛选</text>
-            <image class="tr-icon"></image>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="scss">
-    .time-selection{
-        padding: 26upx 24upx;
-        background: #fff;
-        @include ctf(space-between);
-        .ts-left{
-            @include ctf;
-            .tl-class{
-                flex-shrink: 0;
-            }
-            .tl-frame{
-                flex-shrink: 0;
-                padding: 0 16upx;
-                height: 92upx;
-                width: 240upx;
-                border-radius: 10upx;
-                background: #F2F2F7;
-                @include ctf(space-between);
-                .tf-time{
-                    flex-grow: 1;
-                    box-sizing: border-box;
-                    height: 100%;
-                    @include flcw(28upx, 40upx, #1A1A1A);
-                }
-                .tf-icon{
-                    margin-left: 4upx;
-                    flex-shrink: 0;
-                    width: 20upx;
-                    height: 20upx;
-                    background: skyblue;
-                }
-            }
-            .tl-txt{
-                margin: 0 18upx;
-                @include flcw(32upx, 44upx, #1A1A1A);
-            }
-        }
-        .ts-right{
-            @include ctf(flex-end);
-            .tr-txt{
-                margin-right: 12upx;
-                @include flcw(28upx, 40upx, #9C9C9F);
-            }
-            .tr-icon{
-                flex-shrink: 0;
-                width: 40upx;
-                height: 40upx;
-                background: skyblue;
-            }
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/top_up.vue b/src/subpackage/wallet/components/top_up.vue
deleted file mode 100644
index 40c05b2..0000000
--- a/src/subpackage/wallet/components/top_up.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-    <wallet-modal title="充值">
-        <view class="top-up">
-            <view class="tu-txt">
-                可提现资金：
-                <text class="bt-price">399.63元</text>
-            </view>
-
-            <input type="text" class="bw-ipt">
-
-            <view class="tu-btns">
-                <wm-button>取消</wm-button>
-                <wm-button green>确认</wm-button>
-            </view>
-        </view>
-    </wallet-modal>
-</template>
-
-<script>
-import walletModal from './wallet_modal.vue';
-import wmButton from './wm_button.vue';
-export default {
-    components: {
-        'wallet-modal': walletModal,
-        'wm-button': wmButton
-    }
-}
-</script>
-
-<style lang="scss">
-    .top-up{
-        padding: 60upx 50upx 0;
-        .tu-txt{
-            @include flcw(28upx, 48upx, #1A1A1A);
-            .bt-price{
-                color: $mColor;
-            }
-        }
-        .bw-ipt{
-            box-sizing: border-box;
-            width: 100%;
-            margin-top: 20upx;
-            height: 108upx;
-            border-radius: 10upx;
-            padding: 0 20upx;
-            font-size: 32upx;
-            color: #1A1A1A;
-            background: #F2F2F7;
-        }
-
-        .tu-btns{
-            margin-top: 80upx;
-            @include ctf(space-between);
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
index 14d73ec..98681d5 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
@@ -23,21 +23,21 @@
             </view>
             <view class="bi-tip">
                 <view class="bt-txt">可提现资金(元)</view>
-                <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
+                <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(0)"></image>
             </view>
             <view class="bi-mony-info">
                 <view class="bmi-item">
                     <view class="bi-num">{{ accountInfo.currBal || 0 }}</view>
                     <view class="bi-tip">
                         <view class="bt-txt">总资产(元)</view>
-                        <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
+                        <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(1)"></image>
                     </view>
                 </view>
                 <view class="bmi-item">
                     <view class="bi-num">{{ accountInfo.pendingBal || 0 }}</view>
                     <view class="bi-tip">
                         <view class="bt-txt">在途资金(元)</view>
-                        <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
+                        <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(2)"></image>
                     </view>
                 </view>
             </view>
@@ -79,6 +79,18 @@ export default {
         this.refreshItem(true);
     },
     methods:{
+        showModalTip(type){
+            let tipArr = [
+                '该账户支持提现的资金',
+                '在途资金+可提现资金总和',
+                '用户支付后金额进入到商户在途户中，商户发起分账且达到T+1条件后资金才能从在途户结算到可提现资金',
+            ]
+            uni.showModal({
+                title: '提示',
+                content: tipArr[type],
+                showCancel: false
+            })
+        },
         refreshItem(loadStatus){
             this.getBaofuV2PriceInfo({
                 type: this.tag,
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 54c7ad4..f3322d7 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -73,7 +73,8 @@ export default {
             })
             .then(res=>{
                 hideLoad();
-                this.balance = +res.total_amount ?? 0;
+                let _balance = +res.total_amount ?? 0;
+                this.balance = _balance * 0.01;
             })
             .catch(hideLoad)
         },
@@ -81,7 +82,8 @@ export default {
         dyConfirmExtract(e){
             this.douyinWalletExtract({
                 brand_id: this.brand_id,
-                ...e
+                ...e,
+                amount: e.amount * 100
             })
         },
         /**
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 8e91038..01941e7 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -1,9 +1,17 @@
 <template>
     <view class="withdraw-record">
-        <filtrate-bar>123</filtrate-bar>
+        <filtrate-bar
+            :filter-list="['全部', '待处理', '已处理']"
+            ref="filtrateBar"
+            @change:times="timesChange"
+            @change:filter="filterBtn"
+        ></filtrate-bar>
         <view class="wr-list">
             <view class="record-item" v-for="(e, i) in orderList" :key="i">
-                <record-line name="提现金额">{{ e.amount || 0 }}</record-line>
+                <record-line 
+                    name="提现金额"
+                    :tag="getTagTxt(e.status)"
+                >{{ formatAmount(e.amount || 0) }}</record-line>
                 <record-line name="提现单号">{{ e.number || '-' }}</record-line>
                 <record-line name="申请时间">{{ e.request_time || '-' }}</record-line>
                 <record-line name="收款人名称">{{ e.account_name_of_bank || '-' }}</record-line>
@@ -30,36 +38,85 @@ export default {
         return {
             orderList: [],
             loadPage: 1,
+            brand_id: '',
+            start_time: '',
+            end_time: '',
+            status: '', // 传0展示未处理,传1展示处理。不传展示全部
         }
     },
     onLoad(options){
         let _bid = options.brand_id ?? '';
         this.brand_id = _bid;
-        this.getDouyinWalletWithdrawRecord({ brand_id: _bid });
+        let { startDate, endDate } = this.$refs.filtrateBar.getTimes();
+        this.getDouyinWalletWithdrawRecord({
+            brand_id: _bid,
+            start_time: startDate,
+            end_time: endDate
+        });
     },
     onReachBottom(){
+
         this.getDouyinWalletWithdrawRecord({ 
             brand_id: this.brand_id, 
-            page: this.loadPage + 1 
+            page: this.loadPage + 1,
+            status: this.status,
+            start_time: this.start_time,
+            end_time: this.end_time
         });
     },
     methods: {
+        formatAmount(num = 0){
+            let _num = Number(num) || 0;
+            return _num * 0.01;
+        },
+        getTagTxt(status = ''){
+            return status === 0 ? '待处理' : 
+                   status === 1 ? '已处理' : '';
+        },
+        filterBtn(idx){
+            this.loadPage = 1;
+            this.status = idx === 0 ? '' : idx - 1;
+            this.getDouyinWalletWithdrawRecord({ 
+                brand_id: this.brand_id, 
+                status: this.status,
+                start_time: this.start_time,
+                end_time: this.end_time
+            });
+        },
+        timesChange(e){
+            let { startDate, endDate } = e;
+            this.loadPage = 1;
+            this.start_time = startDate;
+            this.end_time = endDate;
+            this.getDouyinWalletWithdrawRecord({ 
+                brand_id: this.brand_id, 
+                status: this.status,
+                start_time: startDate,
+                end_time: endDate,
+            });
+        },
         /**
          * http://api.ouxuan.net:61080/project/11/interface/api/2202
          * @param {String} brand_id 品牌id
-         * @param {status} status 传0展示未处理,传1展示处理。不传展示全部
          * @param {Number} page 页码
          * @param {Number} page_size 每页条数
+         * @param {status} status 传0展示未处理,传1展示处理。不传展示全部
+         * @param {String} start_time 开始时间
+         * @param {String} end_time 结束时间
+         * 
          * */ 
-        getDouyinWalletWithdrawRecord({ brand_id, page = 1, page_size = 10 }){
+        getDouyinWalletWithdrawRecord({ 
+            brand_id, page = 1, page_size = 10, 
+            status = '',  start_time = '', end_time = ''
+        }){
             showLoad();
+            let _query = { brand_id, page, page_size };
+            if(status !== '')_query.status = status;
+            if(start_time !== '')_query.start_time = start_time;
+            if(end_time !== '')_query.end_time = end_time;
             servers.get({
                 url: WALLET_API.withdrawalOfDouyinOrg_list,
-                data: {
-                    brand_id: brand_id,
-                    page: page,
-                    page_size: page_size
-                },
+                data: _query,
                 failMsg: '加载提现记录失败'
             })
             .then(res=>{
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 6f4003b..05ffa80 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -16,14 +16,12 @@
             </view>
         </view>
         <wallet-modal v-if="false"></wallet-modal>
-        <!-- <top-up></top-up> -->
     </view>
 </template>
 
 <script>
 import walletInfo from './modules/wallet_info.vue'
 import walletModalSuccess from '../../components/wallet_modal_success.vue'
-import topUp from '../../components/top_up.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
 import { routeTo, showLoad, hideLoad } from '@/utils/util';
@@ -31,7 +29,6 @@ export default {
     components: {
         'wallet-info': walletInfo,
         'wallet-modal': walletModalSuccess,
-        'top-up': topUp
     },
     data(){
         return {
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
deleted file mode 100644
index 37dcf2b..0000000
--- a/src/subpackage/wallet/pages/index/recharge_record.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-    <view class="recharge-record">
-        <time-selection></time-selection>
-    </view>
-</template>
-
-<script>
-import timeSelection from '../../components/time_selection.vue';
-export default {
-    components: {
-        'time-selection': timeSelection
-    }
-}
-</script>
-
-<style lang="scss">
-    .recharge-record{
-        
-    }
-</style>
\ No newline at end of file

From cee44e10c50e9d4e26b2bbdecfaac79cc02777d0 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 20 May 2024 11:18:43 +0800
Subject: [PATCH 09/12] change dy withdraw apply modal to page

---
 src/pages.json                                     |   6 +
 src/pages/index/index.vue                          |   2 +-
 .../wallet/components/dy_withdraw_apply.vue        | 243 ---------------
 src/subpackage/wallet/components/wallet_modal.vue  |   1 +
 .../wallet/pages/douyin_withdraw/apply.vue         | 333 +++++++++++++++++++++
 .../wallet/pages/douyin_withdraw/index.vue         |  84 +-----
 6 files changed, 347 insertions(+), 322 deletions(-)
 delete mode 100644 src/subpackage/wallet/components/dy_withdraw_apply.vue
 create mode 100644 src/subpackage/wallet/pages/douyin_withdraw/apply.vue

diff --git a/src/pages.json b/src/pages.json
index 511b582..0ca85f4 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -728,6 +728,12 @@
 					}
 				},
 				{
+					"path": "pages/douyin_withdraw/apply",
+					"style" : {
+						"navigationBarTitleText": "申请提现"
+					}
+				},
+				{
 					"path": "pages/douyin_withdraw/record",
 					"style" : {
 						"navigationBarTitleText": "提现记录"
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index ea4a2b4..607abd9 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -225,7 +225,7 @@
 						brandInfo: indexData&&indexData.brand ? indexData.brand : null,
 					});
 				}
-				if(tabInfo.id === 10)return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
+				if(tabInfo.id === 10 || tabInfo.id === 11)return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
 
 				util.routeTo(tabInfo.path,'nT');
 			},
diff --git a/src/subpackage/wallet/components/dy_withdraw_apply.vue b/src/subpackage/wallet/components/dy_withdraw_apply.vue
deleted file mode 100644
index 56c8777..0000000
--- a/src/subpackage/wallet/components/dy_withdraw_apply.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-    <wallet-modal title="申请提现" :show="show" @click:close="hide">
-        <view class="dy-withdraw-apply">
-            <view class="dwa-balance">
-                <text class="dwab-txt">可提现资金：</text>
-                {{ balance }}元
-            </view>
-            <scroll-view class="dwa-scroll" scroll-y>
-                <view class="dwa-opt-line" :key="i">
-                    <view class="dol-name">*提现金额</view>
-                    <input type="digit" class="dol-ipt" placeholder="请输入提现金额" v-model="info.amount">
-                </view>
-                <view class="dwa-opt-line" :key="i">
-                    <view class="dol-name">*账户名称</view>
-                    <input type="text" class="dol-ipt" placeholder="请输入账户名称" v-model="info.account_name_of_bank">
-                </view>
-                <view class="dwa-opt-line" :key="i">
-                    <view class="dol-name">*银行卡号</view>
-                    <input type="number" class="dol-ipt" placeholder="请输入银行卡号" v-model="info.account">
-                </view>
-                <view class="dwa-opt-line">
-                    <view class="dol-name">*银行名称</view>
-                    <picker class="dol-picker" :range="banks" @change="bankNameChange">
-                        <view class="dp-frame">
-                            <input type="text" disabled class="df-ipt" placeholder="请选择" v-model="info.bank_name">
-                            <image class="df-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_c33.png"></image>
-                        </view>
-                    </picker>
-                </view>
-                <view class="dwa-opt-line" :key="i">
-                    <view class="dol-name">*支行名称</view>
-                    <input type="text" class="dol-ipt" placeholder="请输入支行名称" v-model="info.bank_address">
-                </view>
-                <view class="dwa-opt-line" :key="i">
-                    <view class="dol-name">联系电话</view>
-                    <input type="number" class="dol-ipt" placeholder="请输入联系电话" v-model="info.mobile">
-                </view>
-                
-            </scroll-view>
-            
-            <view class="dwa-tip">
-                <view class="dt-tit">温馨提示</view>
-                <view class="dt-desc">1、账户请预留一定的余额，避免余额不足导致退款失败！</view>
-                <view class="dt-desc">2、提现申请成功提交后，预计在3~7个工作日内进行处理。</view>
-            </view>
-            <view class="dwa-btn">
-                <wm-button green @click="confirmExtract">确认提现</wm-button>
-            </view>
-        </view>
-    </wallet-modal>
-</template>
-
-<script>
-import walletModal from './wallet_modal.vue';
-import wmButton from './wm_button.vue';
-import banks from '../js/bank';
-import { showModal, showNone } from '@/utils/util';
-export default {
-    components: {
-        'wallet-modal': walletModal,
-        'wm-button': wmButton
-    },
-    props: {
-        balance: {
-            type: Number,
-            default: 0
-        }
-    },
-    data(){
-        return {
-            banks,
-            show: false,
-            info: {
-                amount: '',
-                account_name_of_bank: '',
-                account: '',
-                bank_name: '',
-                bank_address: '',
-                mobile: ''
-            }
-        }
-    },
-    
-    methods: {
-        bankNameChange(e){
-            let { value } = e.detail;
-            this.info.bank_name = this.banks[value];
-        },
-        alert(){
-            // this.getStorageAndSet();
-            this.show = true;
-            if(this.isEmptyInfo())this.getStorageAndSet();
-        },
-        hide(){
-            this.show = false
-        },
-        getStorageAndSet(){
-            uni.getStorage({
-                key: 'dyRecentWithdrawApplyInfo',
-                success: res=>{
-                    showModal({
-                        content: '是否自动填充上次提现信息？',
-                        showCancel: true,
-                        success: mRes=>{
-                            if(mRes.confirm){
-                                this.info = res.data;
-                            }
-                        }
-                    })
-                }
-            })
-        },
-        setInfoToStorage(){
-            uni.setStorage({
-                key: 'dyRecentWithdrawApplyInfo',
-                data: this.info
-            });
-        },
-        confirmExtract(){
-            if(!this.infoCheck())return;
-            this.setInfoToStorage();
-            
-            showModal({
-                content: '是否确认提现？',
-                showCancel: true,
-                success: res=>{
-                    if(res.confirm){
-                        this.hide();
-                        this.$emit(
-                            'click:confirm', 
-                            Object.assign(this.info, { amount: +this.info.amount })
-                        );
-                    }
-                }
-            })
-            
-        },
-        isEmptyInfo(){
-            let _infoValues = Object.values(this.info);
-            return _infoValues.every(item=>item === '');
-        },
-        infoCheck(){
-            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile } = this.info;
-            let _amount = +(amount ?? 0);
-            if(_amount <= 0){
-                showNone('提现金额不正确');
-                return false
-            }
-            if(_amount > this.balance){
-                showNone('提现金额不能大于可提现金额');
-                return false
-            }
-            if(account_name_of_bank === ''){
-                showNone('账户名称不能为空');
-                return false
-            }
-            if(account === ''){
-                showNone('银行卡号不能为空');
-                return false
-            }
-            if(bank_name === ''){
-                showNone('银行名称不能为空');
-                return false
-            }
-            if(bank_address === ''){
-                showNone('支行名称不能为空');
-                return false
-            }
-            return true
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-    .dy-withdraw-apply{
-        padding: 36upx 50upx 0upx;
-        .dwa-balance{
-            @include flcw(28upx, 48upx, $mColor);
-            @include tHide;
-            .dwab-txt{
-                color: #1A1A1A;
-            }
-        }
-        .dwa-scroll{
-            margin-top: 20upx;
-            height: 440upx;
-        }
-        .dwa-opt-line{
-            @include ctf(space-between);
-            &+.dwa-opt-line{
-                margin-top: 20upx;
-            }
-            .dol-name{
-                @include flcw(24upx, 34upx, #1A1A1A);
-            }
-            .dol-ipt{
-                box-sizing: border-box;
-                flex-grow: 0;
-                width: 392upx;
-                height: 108upx;
-                padding: 0 20upx;
-                border-radius: 10upx;
-                background: #F2F2F7;
-                @include flcw(24upx, 34upx, #1A1A1A);
-            }
-            .dol-picker{
-                flex-shrink: 0;
-                .dp-frame{
-                    width: 392upx;
-                    height: 108upx;
-                    padding: 0 20upx;
-                    border-radius: 10upx;
-                    background: #F2F2F7;
-                    @include ctf(space-between);
-                    .df-ipt{
-                        flex-grow: 1;
-                        height: 100%;
-                        @include flcw(24upx, 34upx, #1A1A1A);
-                    }
-                    .df-icon{
-                        flex-shrink: 0;
-                        width: 20upx;
-                        height: 20upx;
-                    }
-                }
-            }
-        }
-        .dwa-tip{
-            margin-top: 18upx;
-            .dt-tit{
-                @include flcw(24upx, 44upx, #9A9A9D);
-            }
-            .dt-desc{
-                @include flcw(24upx, 44upx, #1A1A1A);
-            }
-        }
-        .dwa-btn{
-            margin-top: 62upx;
-            @include ctf(center);
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/components/wallet_modal.vue b/src/subpackage/wallet/components/wallet_modal.vue
index dac98cd..7c99e3e 100644
--- a/src/subpackage/wallet/components/wallet_modal.vue
+++ b/src/subpackage/wallet/components/wallet_modal.vue
@@ -36,6 +36,7 @@ export default {
         bottom: 0;
         right: 0;
         background: rgba($color: #000000, $alpha: .5);
+        z-index: 10;
         .wm-content{
             position: absolute;
             left: 50%;
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
new file mode 100644
index 0000000..6c4b945
--- /dev/null
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -0,0 +1,333 @@
+<template>
+    <view class="dy-withdraw-apply">
+        <view class="dwa-balance">
+            <text class="dwab-txt">可提现资金：</text>
+            {{ balance }}元
+        </view>
+        <view class="dwa-scroll">
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">*提现金额</view>
+                <input type="digit" class="dol-ipt" placeholder="请输入提现金额" v-model="info.amount">
+            </view>
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">*账户名称</view>
+                <input type="text" class="dol-ipt" placeholder="请输入账户名称" v-model="info.account_name_of_bank">
+            </view>
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">*银行卡号</view>
+                <input type="number" class="dol-ipt" placeholder="请输入银行卡号" v-model="info.account">
+            </view>
+            <view class="dwa-opt-line">
+                <view class="dol-name">*银行名称</view>
+                <picker class="dol-picker" :range="banks" @change="bankNameChange">
+                    <view class="dp-frame">
+                        <input type="text" disabled class="df-ipt" placeholder="请选择" v-model="info.bank_name">
+                        <image class="df-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_c33.png"></image>
+                    </view>
+                </picker>
+            </view>
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">*支行名称</view>
+                <input type="text" class="dol-ipt" placeholder="请输入支行名称" v-model="info.bank_address">
+            </view>
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">联系电话</view>
+                <input maxlength="11" type="number" class="dol-ipt" placeholder="请输入联系电话" v-model="info.mobile">
+            </view>
+            
+        </view>
+        
+        <view class="dwa-tip">
+            <view class="dt-tit">温馨提示</view>
+            <view class="dt-desc">1、账户请预留一定的余额，避免余额不足导致退款失败！</view>
+            <view class="dt-desc">2、提现申请成功提交后，预计在3~7个工作日内进行处理。</view>
+        </view>
+        <view class="dwa-btn">
+            <wm-button green @click="confirmExtract">确认提现</wm-button>
+        </view>
+
+        <wallet-modal-success 
+            title="申请成功"
+            ref="walletModalSuccess"
+            @click:button="toDetailBtn"
+        >
+            <template v-slot:tip>平台已收到您的提现请求，预计在3~7个工作日内进行处理，请耐心等待！</template>
+            <template v-slot:btn>提现记录</template>
+        </wallet-modal-success>
+    </view>
+</template>
+
+<script>
+import walletModal from '../../components/wallet_modal.vue';
+import wmButton from '../../components/wm_button.vue';
+import wallet_modal_success from '../../components/wallet_modal_success.vue';
+import banks from '../../js/bank';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo, showModal, showNone, showLoad, hideLoad } from '@/utils/util';
+export default {
+    components: {
+        'wallet-modal': walletModal,
+        'wm-button': wmButton,
+        'wallet-modal-success': wallet_modal_success
+    },
+    data(){
+        return {
+            balance: 0,
+            banks,
+            brand_id: '',
+            // show: false,
+            info: {
+                amount: '',
+                account_name_of_bank: '',
+                account: '',
+                bank_name: '',
+                bank_address: '',
+                mobile: ''
+            }
+        }
+    },
+    async onLoad(options){
+        let _bid =  options.brand_id || '';
+        this.brand_id = _bid;
+        await this.getDouyinWalletBalance(_bid);
+        if(this.isEmptyInfo())this.getStorageAndSet();
+    },
+    methods: {
+        toDetailBtn(){
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/record?brand_id=${this.brand_id}`, 'nT');
+        },
+        bankNameChange(e){
+            let { value } = e.detail;
+            this.info.bank_name = this.banks[value];
+        },
+        // alert(){
+        //     // this.getStorageAndSet();
+        //     this.show = true;
+        //     if(this.isEmptyInfo())this.getStorageAndSet();
+        // },
+        // hide(){
+        //     this.show = false
+        // },
+        getStorageAndSet(){
+            uni.getStorage({
+                key: 'dyRecentWithdrawApplyInfo',
+                success: res=>{
+                    showModal({
+                        content: '是否自动填充上次提现信息？',
+                        showCancel: true,
+                        success: mRes=>{
+                            if(mRes.confirm){
+                                this.info = res.data;
+                            }
+                        }
+                    })
+                }
+            })
+        },
+        setInfoToStorage(){
+            uni.setStorage({
+                key: 'dyRecentWithdrawApplyInfo',
+                data: this.info
+            });
+        },
+        confirmExtract(){
+            if(!this.infoCheck())return;
+            this.setInfoToStorage();
+            
+            showModal({
+                content: '是否确认提现？',
+                showCancel: true,
+                success: res=>{
+                    if(res.confirm){
+                        let _amount = this.info.amount || 0;
+                        this.dyConfirmExtract({
+                            ...this.info,
+                            amount: (+_amount) * 100
+                        })
+                        
+                    }
+                }
+            })
+            
+        },
+        // 提现申请确认
+        dyConfirmExtract(e){
+            this.douyinWalletExtract({
+                brand_id: this.brand_id,
+                ...e,
+            })
+        },
+        isEmptyInfo(){
+            let _infoValues = Object.values(this.info);
+            return _infoValues.every(item=>item === '');
+        },
+        infoCheck(){
+            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile } = this.info;
+            let _amount = +(amount ?? 0);
+            if(_amount <= 0){
+                showNone('提现金额不正确');
+                return false
+            }
+            if(_amount > this.balance){
+                showNone('提现金额不能大于可提现金额');
+                return false
+            }
+            if(account_name_of_bank === ''){
+                showNone('账户名称不能为空');
+                return false
+            }
+            if(account === ''){
+                showNone('银行卡号不能为空');
+                return false
+            }
+            if(bank_name === ''){
+                showNone('银行名称不能为空');
+                return false
+            }
+            if(bank_address === ''){
+                showNone('支行名称不能为空');
+                return false
+            }
+            return true
+        },
+        /**
+         * http://api.ouxuan.net:61080/project/11/interface/api/2195
+         * @param {String} brand_id 品牌id
+         * */ 
+        getDouyinWalletBalance(brand_id){
+            showLoad();
+            return servers.get({
+                url: WALLET_API.withdrawalOfDouyinOrg_totalAmount,
+                data: {
+                    brand_id: brand_id
+                },
+                failMsg: '获取钱包余额失败'
+            })
+            .then(res=>{
+                hideLoad();
+                let _balance = +res.total_amount ?? 0;
+                return this.balance = _balance * 0.01;
+            })
+            .catch(hideLoad)
+        },
+        /**
+         * http://api.ouxuan.net:61080/project/11/interface/api/2209
+         * @param {String} brand_id 品牌id
+         * @param {Number} amount 提现金额
+         * @param {String} account 账户
+         * @param {String} account_name_of_bank 账户名
+         * @param {String} bank_name // 银行名
+         * @param {String} bank_address // 银行地址
+         * @param {String} mobile 手机号
+         * @param {Number} status // 0未处理，1已处理
+         * */ 
+        douyinWalletExtract({
+            brand_id,
+            amount,
+            account,
+            account_name_of_bank,
+            bank_name,
+            bank_address,
+            mobile,
+            status = 0
+        }){
+            showLoad();
+            servers.post({
+                url: WALLET_API.withdrawalOfDouyinOrg_edit,
+                data: {
+                    brand_id, 
+                    amount,
+                    account,
+                    account_name_of_bank,
+                    bank_name,
+                    bank_address,
+                    mobile,
+                    status,
+                },
+                failMsg: '申请提现失败'
+            })
+            .then(res=>{
+                hideLoad();
+                this.$refs.walletModalSuccess.alert();
+                setTimeout(_=>{
+                    this.getDouyinWalletBalance(brand_id);
+                }, 1200);
+            })
+            .catch(hideLoad)
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    page{
+        background: #fff;
+    }
+    .dy-withdraw-apply{
+        padding: 36upx 50upx 20upx;
+        .dwa-balance{
+            @include flcw(28upx, 48upx, $mColor);
+            @include tHide;
+            .dwab-txt{
+                color: #1A1A1A;
+            }
+        }
+        .dwa-scroll{
+            margin-top: 20upx;
+        }
+        .dwa-opt-line{
+            @include ctf(space-between);
+            &+.dwa-opt-line{
+                margin-top: 20upx;
+            }
+            .dol-name{
+                @include flcw(24upx, 34upx, #1A1A1A);
+            }
+            .dol-ipt{
+                box-sizing: border-box;
+                flex-grow: 0;
+                width: 492upx;
+                height: 108upx;
+                padding: 0 20upx;
+                border-radius: 10upx;
+                background: #F2F2F7;
+                @include flcw(24upx, 34upx, #1A1A1A);
+            }
+            .dol-picker{
+                flex-shrink: 0;
+                .dp-frame{
+                    width: 492upx;
+                    height: 108upx;
+                    padding: 0 20upx;
+                    border-radius: 10upx;
+                    background: #F2F2F7;
+                    @include ctf(space-between);
+                    .df-ipt{
+                        flex-grow: 1;
+                        height: 100%;
+                        @include flcw(24upx, 34upx, #1A1A1A);
+                    }
+                    .df-icon{
+                        flex-shrink: 0;
+                        width: 20upx;
+                        height: 20upx;
+                    }
+                }
+            }
+        }
+        .dwa-tip{
+            margin-top: 18upx;
+            .dt-tit{
+                @include flcw(24upx, 44upx, #9A9A9D);
+            }
+            .dt-desc{
+                @include flcw(24upx, 44upx, #1A1A1A);
+            }
+        }
+        .dwa-btn{
+            margin-top: 62upx;
+            @include ctf(center);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index f3322d7..a358158 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -10,35 +10,14 @@
             <text class="dl-txt" @click="toDetailBtn">提现明细</text>
             <image class="dl-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
         </view>
-
-        <dy-withdraw-apply
-            ref="dwaModal"
-            :balance="balance"
-            @click:confirm="dyConfirmExtract"
-        ></dy-withdraw-apply>
-
-        <wallet-modal-success 
-            title="申请成功"
-            ref="walletModalSuccess"
-            @click:button="toDetailBtn"
-        >
-            <template v-slot:tip>平台已收到您的提现请求，预计在3~7个工作日内进行处理，请耐心等待！</template>
-            <template v-slot:btn>提现记录</template>
-        </wallet-modal-success>
     </view>
 </template>
 
 <script>
-import dyWithdrawApply from '../../components/dy_withdraw_apply.vue';
-import wallet_modal_success from '../../components/wallet_modal_success.vue';
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad, showNone } from '@/utils/util';
+import { routeTo, showLoad, hideLoad } from '@/utils/util';
 export default {
-    components: {
-        'dy-withdraw-apply': dyWithdrawApply,
-        'wallet-modal-success': wallet_modal_success
-    },
     data(){
         return {
             brand_id: '',
@@ -46,8 +25,10 @@ export default {
         }
     },
     onLoad(options){
-        this.brand_id = options.brand_id ?? '';
-        this.getDouyinWalletBalance(options.brand_id);
+        this.brand_id = options.brand_id || '';
+    },
+    onShow(){
+        this.getDouyinWalletBalance(this.brand_id);
     },
     methods: {
         // 
@@ -56,7 +37,7 @@ export default {
         },
         // 申请提现
         applyBtn(){
-            this.$refs.dwaModal.alert();
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}`, 'nT');
         },
         /**
          * http://api.ouxuan.net:61080/project/11/interface/api/2195
@@ -78,59 +59,6 @@ export default {
             })
             .catch(hideLoad)
         },
-        // 提现申请确认
-        dyConfirmExtract(e){
-            this.douyinWalletExtract({
-                brand_id: this.brand_id,
-                ...e,
-                amount: e.amount * 100
-            })
-        },
-        /**
-         * http://api.ouxuan.net:61080/project/11/interface/api/2209
-         * @param {String} brand_id 品牌id
-         * @param {Number} amount 提现金额
-         * @param {String} account 账户
-         * @param {String} account_name_of_bank 账户名
-         * @param {String} bank_name // 银行名
-         * @param {String} bank_address // 银行地址
-         * @param {String} mobile 手机号
-         * @param {Number} status // 0未处理，1已处理
-         * */ 
-        douyinWalletExtract({
-            brand_id,
-            amount,
-            account,
-            account_name_of_bank,
-            bank_name,
-            bank_address,
-            mobile,
-            status = 0
-        }){
-            showLoad();
-            servers.post({
-                url: WALLET_API.withdrawalOfDouyinOrg_edit,
-                data: {
-                    brand_id, 
-                    amount,
-                    account,
-                    account_name_of_bank,
-                    bank_name,
-                    bank_address,
-                    mobile,
-                    status,
-                },
-                failMsg: '申请提现失败'
-            })
-            .then(res=>{
-                hideLoad();
-                this.$refs.walletModalSuccess.alert();
-                setTimeout(_=>{
-                    this.getDouyinWalletBalance(brand_id);
-                }, 1200);
-            })
-            .catch(hideLoad)
-        },
     }
 
 }

From 1c53ee64a0792197a787f700ecab8054eb02849a Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 20 May 2024 17:42:51 +0800
Subject: [PATCH 10/12] del data.show

---
 src/subpackage/wallet/pages/douyin_withdraw/apply.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index 6c4b945..f168a97 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -76,7 +76,6 @@ export default {
             balance: 0,
             banks,
             brand_id: '',
-            // show: false,
             info: {
                 amount: '',
                 account_name_of_bank: '',
@@ -101,14 +100,6 @@ export default {
             let { value } = e.detail;
             this.info.bank_name = this.banks[value];
         },
-        // alert(){
-        //     // this.getStorageAndSet();
-        //     this.show = true;
-        //     if(this.isEmptyInfo())this.getStorageAndSet();
-        // },
-        // hide(){
-        //     this.show = false
-        // },
         getStorageAndSet(){
             uni.getStorage({
                 key: 'dyRecentWithdrawApplyInfo',

From 57edb63fb9fd357d79fcbe6a7465acbc9f070062 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 21 May 2024 18:29:54 +0800
Subject: [PATCH 11/12] fix id1505

---
 src/pages/index/index.vue                                  | 14 +++++++-------
 src/pages/login/login.vue                                  |  2 +-
 src/pages/merchant_login/merchant_login.vue                |  2 +-
 src/pages/web_view/web_view.vue                            | 12 +++++++++---
 src/store/index.js                                         |  2 +-
 .../wallet/pages/baofu_withdraw/modules/baofu_item.vue     |  6 +++---
 src/subpackage/wallet/pages/index/index.vue                | 10 ++++++++++
 src/subpackage/wallet/pages/index/modules/wallet_info.vue  |  2 +-
 8 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 607abd9..b64485b 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -127,12 +127,12 @@
 			path: '/subpackage/retail/pages/index/index',
 			serverKey: 1011  // 后端对应权限编号
 		},
-		{
-			id: 8,
-			name: '课程管理',
-			path: '/subpackage/course/pages/index/index',
-			serverKey: 1013  // 后端对应权限编号 1013
-		},
+		// {
+		// 	id: 8,
+		// 	name: '课程管理',
+		// 	path: '/subpackage/course/pages/index/index',
+		// 	serverKey: 1013  // 后端对应权限编号 1013
+		// },
 		{
 			id: 9,
 			name: '储值卡管理',
@@ -147,7 +147,7 @@
 		},
 		{
 			id: 11,
-			name: '钱包',
+			name: '钱包提现',
 			path: '/subpackage/wallet/pages/index/index',
 			serverKey: 1017  // 后端对应权限编号 1017
 		},
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 21c74dc..c6c6788 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -121,7 +121,7 @@ export default {
             }
         },
         toWebView(){
-            util.routeTo(`/pages/web_view/web_view`,'rL');
+            util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL');
         }
     },
 }
diff --git a/src/pages/merchant_login/merchant_login.vue b/src/pages/merchant_login/merchant_login.vue
index a88b4d6..c8f7a1c 100644
--- a/src/pages/merchant_login/merchant_login.vue
+++ b/src/pages/merchant_login/merchant_login.vue
@@ -12,7 +12,7 @@ import util from '../../utils/util'
 export default {
     methods: {
         toWebView(){
-            util.routeTo(`/pages/web_view/web_view`,'rL');
+            util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL');
         }
     }
 }
diff --git a/src/pages/web_view/web_view.vue b/src/pages/web_view/web_view.vue
index d05babe..5b8a040 100644
--- a/src/pages/web_view/web_view.vue
+++ b/src/pages/web_view/web_view.vue
@@ -1,10 +1,16 @@
 <template>
-    <web-view src="https://www.ouxuanzhineng.cn"></web-view>
+    <web-view :src="address"></web-view>
 </template>
 <script>
 export default {
-    onLoad(){
-
+    data(){
+        return {
+            address: ''
+        }
+    },
+    onLoad(options){
+        console.log('web_view options', options);
+        this.address = decodeURIComponent(options?.src || 'https://www.ouxuanzhineng.cn');
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 043eaef..198b45a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -40,7 +40,7 @@ export default new Vuex.Store({
             '1009': '场地管理',
             '1010': '设备管理',
             '1011': '商品零售',
-			'1013': '课程管理',
+			// '1013': '课程管理',
 			'1014': '储值卡管理',
 			'1015': '进场人数异常',
             '1017': '钱包提现'
diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
index 98681d5..ddb0db0 100644
--- a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
+++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
@@ -22,21 +22,21 @@
                 <view class="bb-btn" @click="$emit('click:extract')">提现</view>
             </view>
             <view class="bi-tip">
-                <view class="bt-txt">可提现资金(元)</view>
+                <view class="bt-txt" @click="showModalTip(0)">可提现资金(元)</view>
                 <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(0)"></image>
             </view>
             <view class="bi-mony-info">
                 <view class="bmi-item">
                     <view class="bi-num">{{ accountInfo.currBal || 0 }}</view>
                     <view class="bi-tip">
-                        <view class="bt-txt">总资产(元)</view>
+                        <view class="bt-txt" @click="showModalTip(1)">总资产(元)</view>
                         <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(1)"></image>
                     </view>
                 </view>
                 <view class="bmi-item">
                     <view class="bi-num">{{ accountInfo.pendingBal || 0 }}</view>
                     <view class="bi-tip">
-                        <view class="bt-txt">在途资金(元)</view>
+                        <view class="bt-txt" @click="showModalTip(2)">在途资金(元)</view>
                         <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(2)"></image>
                     </view>
                 </view>
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 05ffa80..7dd37cd 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -4,6 +4,7 @@
             :balance="balance"
             @click:douyin="dyBtnClick"
             @click:baofu="bfBtnClick"
+            @click:admin="toWebView"
         ></wallet-info>
         <view class="wi-tips">
             <view class="wt-tit">温馨提示：</view>
@@ -40,8 +41,17 @@ export default {
     onLoad(options){
         this.brand_id = options.brand_id ?? '';
         this.getWalletBalance(options.brand_id);
+        console.log(uni.getAccountInfoSync().miniProgram)
     },
     methods: {
+        toWebView(){
+            routeTo(`/pages/web_view/web_view?src=${encodeURIComponent(this.getAdminAddress())}`,'nT');
+        },
+        getAdminAddress(){
+            let _appid = uni.getAccountInfoSync()?.miniProgram?.appId || '';
+            if(_appid === "wx7106e84614cf0060")return 'https://testadmin.ouxuanzhineng.cn'; // 测试后台地址
+            return 'https://admin.ouxuanzhineng.cn'; // 正式后台地址
+        },
         copyBtn(){
             uni.setClipboardData({
                 data: this.oxAddress,
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index cb1a39a..6a90b84 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="wallet-info">
-        <view class="wi-bar">
+        <view class="wi-bar" @click="$emit('click:admin')">
             <view class="wb-txt">钱包查账可登录后台查阅</view>
             <image class="wb-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
         </view>

From 4a7dbd04e86f09d6c564be5668e9b6ddc73f373d Mon Sep 17 00:00:00 2001
From: "3075067877@qq.com" <3075067877@qq.com>
Date: Thu, 23 May 2024 18:29:48 +0800
Subject: [PATCH 12/12] fix wallet issue

---
 src/js/api.js                                           |  4 ++--
 src/subpackage/party/pages/login/regist.vue             | 17 ++++++++++++-----
 src/subpackage/wallet/pages/douyin_withdraw/apply.vue   |  2 +-
 src/subpackage/wallet/pages/douyin_withdraw/index.vue   |  2 +-
 .../wallet/pages/index/modules/wallet_info.vue          |  6 +++---
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index 960a873..66faf33 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,5 +1,5 @@
-// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
-export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
+export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
diff --git a/src/subpackage/party/pages/login/regist.vue b/src/subpackage/party/pages/login/regist.vue
index d98f74c..11f8cf7 100644
--- a/src/subpackage/party/pages/login/regist.vue
+++ b/src/subpackage/party/pages/login/regist.vue
@@ -553,8 +553,8 @@
 					this.submitData.mailing_address = res.Response.Address;
 					this.submitData.extension.legal_person_name = res.Response.Person;
 					this.submitData.agency_code = res.Response.RegNum;
-					const t =  this.company_types.find(item => item.label === res.Response.Type);
-					this.submitData.extension.company_type = t.value;
+					// const t =  this.company_types.find(item => item.label === res.Response.Type);
+					// this.submitData.extension.company_type = t.value;
 					if (res.Response.Capital) {
 						const num = res.Response.Capital.split('元')[0]
 						this.submitData.extension.registered_capital = this.chineseToNumber(num)
@@ -583,9 +583,16 @@
 								return item
 							}
 						});
-						this.submitData.extension.company_type = t.value
-						this.company_type_index = _index
-						this.company_type_show = this.company_types_arr[_index]
+						// console.log("t", t)
+						if(t){
+							this.submitData.extension.company_type = t.value
+							this.company_type_index = _index
+							this.company_type_show = this.company_types_arr[_index]
+							util.showNone("信息已填充,请二次确认证件信息")
+						}else{
+							console.log("OCR对应的企业类型无法匹配:",this.company_types, res.Response.Type)
+							util.showNone("请手动选择[企业类型],并二次确认证件信息")
+						}
 					}
 				} else {
 					this.submitData.extension.business_id_card = res.Response.IdNum
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index f168a97..f6a84ce 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -2,7 +2,7 @@
     <view class="dy-withdraw-apply">
         <view class="dwa-balance">
             <text class="dwab-txt">可提现资金：</text>
-            {{ balance }}元
+            {{ balance.toFixed(2)||"0.00" }}元
         </view>
         <view class="dwa-scroll">
             <view class="dwa-opt-line" :key="i">
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index a358158..a5ec2cc 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -3,7 +3,7 @@
         <image class="dw-icon" mode="aspect" src="/subpackage/wallet/static/images/dy_logo.png"></image>
         <view class="dw-tip">可提现资金</view>
         <view class="dw-price">
-            <text class="dp-unit">¥</text>{{ balance }}
+            <text class="dp-unit">¥</text>{{ balance.toFixed(2)||"0.00" }}
         </view>
         <view class="dw-btn" @click="applyBtn">申请提现</view>
         <view class="dw-link">
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 6a90b84..807e312 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -2,11 +2,11 @@
     <view class="wallet-info">
         <view class="wi-bar" @click="$emit('click:admin')">
             <view class="wb-txt">钱包查账可登录后台查阅</view>
-            <image class="wb-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
+            <image class="wb-icon" mode="aspect" src="@/subpackage/wallet/static/images/arrow_b2.png"></image>
         </view>
         <view class="wi-account">
             <veiw class="wa-top">
-                <view class="wt-name">欧轩内部钱包账户</view>
+                <view class="wt-name">欧轩内部钱包账户余额</view>
                 <!-- <view class="wt-record">
                     <text>充值记录</text>
                     <image class="wr-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
@@ -26,7 +26,7 @@
                 <text class="wi-txt">宝付提现</text>
             </view>
             <view class="wb-item" @click="$emit('click:douyin')">
-                <image class="wi-icon" mode="aspect" src="/subpackage/wallet/static/images/dy_logo.png"></image>
+                <image class="wi-icon" mode="aspect" src="@/subpackage/wallet/static/images/dy_logo.png"></image>
                 <text class="wi-txt">抖音提现</text>
             </view>
         </view>