From eca5172b028340b8d644205cad19d434c4dec037 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 15 Jan 2025 18:14:39 +0800
Subject: [PATCH 1/2] finish tid1819

---
 src/pages.json                                     |   6 +
 src/subpackage/wallet/js/api.js                    |   3 +
 .../wallet/pages/douyin_withdraw/index.vue         |  15 ++-
 src/subpackage/wallet/pages/index/index.vue        |  72 ++++++++++-
 .../wallet/pages/index/modules/recharge_modal.vue  |  82 ++++++++++++
 .../wallet/pages/index/modules/wallet_info.vue     |   6 +-
 .../wallet/pages/index/recharge_record.vue         | 141 +++++++++++++++++++++
 7 files changed, 313 insertions(+), 12 deletions(-)
 create mode 100644 src/subpackage/wallet/pages/index/modules/recharge_modal.vue
 create mode 100644 src/subpackage/wallet/pages/index/recharge_record.vue

diff --git a/src/pages.json b/src/pages.json
index 807b35a..267b780 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -759,6 +759,12 @@
 					}
 				},
 				{
+					"path": "pages/index/recharge_record",
+					"style" : {
+						"navigationBarTitleText": "充值记录"
+					}
+				},
+				{
 					"path": "pages/douyin_withdraw/index",
 					"style" : {
 						"navigationBarTitleText": "平台提现"
diff --git a/src/subpackage/wallet/js/api.js b/src/subpackage/wallet/js/api.js
index 4ff0fc2..654bb3a 100644
--- a/src/subpackage/wallet/js/api.js
+++ b/src/subpackage/wallet/js/api.js
@@ -8,6 +8,9 @@ export const WALLET_API = {
 	// 宝付
 	getPayAssureConfigs:`${ORIGIN}/admin/pay/assure/getPayAssureConfigs`,  //  查看可选择的支付账户列表
 	baofuV2Gateway:`${ORIGIN}/admin/pay/assure/baofuV2/gateway`,  //  宝付v2获取金额信息
+	// tid1819
+	wxpayinfo:`${ORIGIN}/admin/assistant/merchantwallet/wxpayinfo`,  //  这个是充值
+	rechargeList:`${ORIGIN}/admin/merchantwallet/recharge/list`,  //  这是充值记录
 }
 
 export default WALLET_API;
\ 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 9c3665a..2264b47 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -5,14 +5,14 @@
             title="微信平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_wechat)"
             type="wx"
-            @click:extract="applyBtn(1)"
+            @click:extract="applyBtn(1, balanceInfo.total_amount_of_wechat)"
         ></platform-item>
         <view class="dw-space"></view>
         <platform-item
             title="抖音平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_douyin)"
             type="dy"
-            @click:extract="applyBtn(0)"
+            @click:extract="applyBtn(0, balanceInfo.total_amount_of_douyin)"
         ></platform-item>
 
         <view class="dw-space"></view>
@@ -26,7 +26,7 @@
 <script>
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, showModal } from '@/utils/util';
 
 import platformItem from "./modules/platform_item.vue";
 export default {
@@ -58,7 +58,14 @@ export default {
         },
         // 申请提现
         // md【241024】 241113新增 0抖音；1微信
-        applyBtn(source){
+        applyBtn(source, balance){
+            if(!isNaN(balance) && balance < 0)return showModal({
+                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。点击“前往”跳转钱包页面',
+                confirmText: '前往',
+                success: res=>{
+                    if(res.confirm)routeTo();
+                }
+            })
             routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}&source=${source}`, 'nT');
         },
         /**
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 55d9589..04beb4d 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -5,6 +5,8 @@
             @click:douyin="dyBtnClick"
             @click:baofu="bfBtnClick"
             @click:admin="toWebView"
+            @click:recharge="rechargeBtn"
+            @click:record="toRechargeRecord"
         ></wallet-info>
         <view class="wi-tips">
             <view class="wt-tit">温馨提示：</view>
@@ -17,20 +19,28 @@
                 </text>
             </view>
         </view>
-        <wallet-modal v-if="false"></wallet-modal>
+
+        <wallet-modal-success ref="walletModalSuccess" :title="'充值成功'">
+            <template v-slot:tip>充值成功！</template>
+            <template v-slot:btn>充值记录</template>
+        </wallet-modal-success>
+
+        <recharge-modal :balance="balance" ref="rechargeModal"></recharge-modal>
     </view>
 </template>
 
 <script>
 import walletInfo from './modules/wallet_info.vue'
-import walletModalSuccess from '../../components/wallet_modal_success.vue'
+import walletModalSuccess from '../../components/wallet_modal_success.vue';
+import rechargeModal from "./modules/recharge_modal.vue";
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, debounce, showModal } from '@/utils/util';
 export default {
     components: {
         'wallet-info': walletInfo,
-        'wallet-modal': walletModalSuccess,
+        walletModalSuccess,
+        rechargeModal
     },
     data(){
         return {
@@ -44,7 +54,32 @@ export default {
         this.getWalletBalance(options.brand_id);
         console.log(uni.getAccountInfoSync().miniProgram)
     },
+    onReady(){
+        // this.$refs?.walletModalSuccess?.alert();
+    },
     methods: {
+        toRechargeRecord(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/wallet/pages/index/recharge_record?brand_id=${brand_id ?? ''}`, 'nT');
+        },
+        rechargeBtn: debounce(function(){
+            let { brand_id } = this;
+            this.$refs?.rechargeModal?.show?.({
+                success: async num =>{
+                    let { wxpay_info } = await this.getPayInfo({ brand_id, pay_amount: num });
+                    uni.requestPayment({
+                        ...wxpay_info,
+                        success: res => {
+                            this.$refs?.walletModalSuccess?.alert?.();
+                        },
+                        fail: err => {
+                            console.log('wallet index rechargeBtn fail --->', err);
+                            if(err?.errMsg?.indexOf?.('cancel') === -1)showModal({ content: err?.errMsg ?? '支付失败！' })
+                        }
+                    })
+                }
+            })
+        }, 300, true),
         toWebView(){
             routeTo(`/pages/web_view/web_view?src=${encodeURIComponent(this.getAdminAddress())}`,'nT');
         },
@@ -82,7 +117,34 @@ export default {
         bfBtnClick(){
             routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
         
-        }
+        },
+        // 获取支付信息
+        getPayInfo({ brand_id, pay_amount }){
+			showLoad();
+            return servers.post({
+                url: WALLET_API.wxpayinfo,
+                data: { brand_id, pay_amount },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    return _data?.data ?? {};
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载支付信息失败！'
+                })
+                console.warn('wallet index getPayInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		},
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/index/modules/recharge_modal.vue b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue
new file mode 100644
index 0000000..784cc5b
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue
@@ -0,0 +1,82 @@
+<template>
+    <wallet-modal title="充值" :show="isShow"  @click:close="hide">
+        <view class="recharge-container">
+            <view class="rc-balance">
+                <text class="rb-txt">钱包余额：</text>
+                {{ balance || 0 }}元
+            </view>
+            <input type="digit" class="rc-ipt" v-model="iptNum" placeholder="请输入金额">
+            <view class="rc-btns">
+                <wm-button @click="hide">取消</wm-button>
+                <wm-button green @click="confirmBtn">确认</wm-button>
+            </view>
+        </view>
+    </wallet-modal>
+</template>
+
+<script>
+import walletModal from '../../../components/wallet_modal.vue';
+import wmButton from '../../../components/wm_button.vue';
+import { showNone } from '@/utils/util';
+export default {
+    props: {
+        balance: {
+            type: Number,
+            default: 0
+        }
+    },
+    components: {
+        walletModal,
+        wmButton,
+    },
+    data() {
+        return {
+            isShow: false,
+            iptNum: '',
+            initData: {},
+        }
+    },
+    methods: {
+        show(data){
+            this.isShow = true;
+            this.initData = data ?? {};
+        },
+        hide(){
+            this.isShow = false;
+        },
+        confirmBtn(){
+            let { initData, iptNum, hide } = this;
+            if(!iptNum || isNaN(iptNum) || Number(iptNum) <= 0)return showNone('请输入正确金额！');
+            initData?.success?.(iptNum);
+            hide();
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .recharge-container{
+        padding: 0 50upx;
+        .rc-balance{
+            margin-top: 60upx;
+            @include flcw(28upx, 40upx, $mColor);
+            @include tHide;
+            .rb-txt{
+                color: #1A1A1A;
+            }
+        }
+        .rc-ipt{
+            margin-top: 20upx;
+            padding: 0 20upx;
+            display: block;
+            height: 108upx;
+            border-radius: 10upx;
+            background: #F2F2F7;
+            @include flcw(32upx, 44upx, #1A1A1A);
+        }
+        .rc-btns{
+            margin-top: 80upx;
+            @include ctf(space-between);
+        }
+    }
+</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
index f450eb1..7826478 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -7,10 +7,10 @@
         <view class="wi-account">
             <veiw class="wa-top">
                 <view class="wt-name">欧轩内部钱包账户余额</view>
-                <!-- <view class="wt-record">
+                <view class="wt-record" @click="$emit('click:record')">
                     <text>充值记录</text>
                     <image class="wr-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
-                </view> -->
+                </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" @click="$emit('click:recharge')">充值</view>
             </view>
         </view>
         <view class="wi-btns">
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..6d5cbb9
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -0,0 +1,141 @@
+<template>
+    <view class="recharge-record">
+        <filtrate-bar
+            :filter-list="['全部', '已完成', '已退款']"
+            ref="filtrateBar"
+            @change:times="timesChange"
+            @change:filter="filterBtn"
+        ></filtrate-bar>
+        <view class="rr-ls">
+            <view class="rl-item" v-for="(e, i) in rechargeList" :key="i">
+                <record-line  name="充值金额" :tag="getTagTxt(e.pay_status)" >{{ e.amount || 0 }}</record-line>
+                <record-line  name="充值单号">{{ e.order_no || '-' }}</record-line>
+                <record-line  name="充值时间">{{ e.pay_time || '-' }}</record-line>
+                <record-line  name="支付方式">{{ e.pay_type || '-' }}</record-line>
+                <record-line  name="交易流水号">{{ e.trans_no || '-' }}</record-line>
+                <record-line  name="充值途径">{{ e.optsourse || '-' }}</record-line>
+            </view>
+        </view>
+    </view>
+    <!-- 充值金额：12.00
+充值单号：TX20191017898999
+充值时间：2024-10-17  12:12:12
+支付方式：微信支付
+交易流水号：4002676665666
+充值途径：商家助手（刘晓） -->
+</template>
+
+<script>
+import filtrateBar from '../../components/filtrate_bar.vue';
+import recordLine from '../../components/record_line.vue';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo, showLoad, hideLoad, debounce, showModal, showNone } from '@/utils/util';
+export default {
+    components: {
+        filtrateBar,
+        recordLine,
+    },
+    data(){
+        return {
+            rechargeList: [],
+            page: 1,
+            brand_id: '',
+
+            stime: '',
+            etime: '',
+            status: '' // 0:未支付, 1:已支付, 2:已退款
+        }
+    },
+    onLoad(opts){
+        let _bid = opts?.brand_id ?? '';
+        this.brand_id = _bid;
+        let { startDate, endDate } = this.$refs.filtrateBar.getTimes();
+        this.stime = startDate;
+        this.etime = endDate;
+        this.getRechargeList({ brand_id: _bid, stime: startDate, etime: endDate });
+    },
+    onReachBottom(){
+        let { brand_id, page, stime, etime } = this;
+        this.getRechargeList({ brand_id, page: ++page, stime, etime });
+    },
+    methods: {
+        getTagTxt(status = ''){
+            return  status === 0 ? '未支付' : 
+                    status === 1 ? '已完成' : 
+                    status === 2 ? '已退款' : '';
+        },
+        timesChange(e){
+            let { startDate, endDate } = e;
+            this.stime = startDate ?? '';
+            this.etime = endDate ?? '';
+            this.refreshLs();
+        },
+        filterBtn(idx) {
+            let _status = idx === 0 ? '' : idx;
+            this.status = _status;
+            this.refreshLs();
+        },
+        refreshLs(){
+            let { brand_id, stime, etime, status } = this;
+            this.page = 1;
+            this.rechargeList = [];
+            this.getRechargeList({ 
+                brand_id: brand_id, 
+                pay_status: status,
+                stime,
+                etime,
+            });
+        },
+        // 获取充值记录
+        getRechargeList({ brand_id, pay_status = '', stime = '', etime = '', page_size = 20, page = 1 }){
+			showLoad();
+            return servers.post({
+                url: WALLET_API.rechargeList,
+                data: { brand_id, pay_status, stime, etime, page_size, page },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data?.list || [];
+                    if(page === 1)return this.rechargeList = _ls;
+                    if(_ls?.length <= 0)return showNone('没有更多！');
+                    this.rechargeList = [ ...this.rechargeList, ..._ls ];
+                    this.page = page;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('wallet index getPayInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+
+    }
+}
+</script>
+
+<style lang="scss">
+    .recharge-record{
+
+    }
+    .rr-ls{
+        padding: 24upx;
+        .rl-item{
+            padding: 26upx 20upx;
+            border-radius: 10upx;
+            background: #fff;
+            &+ .rl-item{
+                margin-top: 24upx;
+            }
+        }
+    }
+</style>
\ No newline at end of file

From 95de40fc33f656b0a278e7db38caf23cc24ce6f5 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 21 Jan 2025 18:29:23 +0800
Subject: [PATCH 2/2] fixed tid1819

---
 src/subpackage/wallet/pages/douyin_withdraw/index.vue | 16 ++++++++++------
 src/subpackage/wallet/pages/index/index.vue           |  6 ++++--
 src/subpackage/wallet/pages/index/recharge_record.vue | 10 +++-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 2264b47..f11b299 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -5,14 +5,14 @@
             title="微信平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_wechat)"
             type="wx"
-            @click:extract="applyBtn(1, balanceInfo.total_amount_of_wechat)"
+            @click:extract="applyBtn(1)"
         ></platform-item>
         <view class="dw-space"></view>
         <platform-item
             title="抖音平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_douyin)"
             type="dy"
-            @click:extract="applyBtn(0, balanceInfo.total_amount_of_douyin)"
+            @click:extract="applyBtn(0)"
         ></platform-item>
 
         <view class="dw-space"></view>
@@ -35,6 +35,7 @@ export default {
     },
     data(){
         return {
+            balance: '',
             brand_id: '',
             balanceInfo: {
                 /**
@@ -46,7 +47,9 @@ export default {
         }
     },
     onLoad(options){
-        this.brand_id = options.brand_id || '';
+        this.brand_id = options?.brand_id || '';
+        this.balance = options?.balance ?? '';
+
     },
     onShow(){
         this.getDouyinWalletBalance(this.brand_id);
@@ -58,9 +61,10 @@ export default {
         },
         // 申请提现
         // md【241024】 241113新增 0抖音；1微信
-        applyBtn(source, balance){
-            if(!isNaN(balance) && balance < 0)return showModal({
-                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。点击“前往”跳转钱包页面',
+        applyBtn(source){
+            let { balance } = this;
+            if(!isNaN(balance) && Number(balance) < 0)return showModal({
+                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。',
                 confirmText: '前往',
                 success: res=>{
                     if(res.confirm)routeTo();
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 04beb4d..0cc02a3 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -20,7 +20,7 @@
             </view>
         </view>
 
-        <wallet-modal-success ref="walletModalSuccess" :title="'充值成功'">
+        <wallet-modal-success ref="walletModalSuccess" :title="'充值成功'" @click:button="toRechargeRecord">
             <template v-slot:tip>充值成功！</template>
             <template v-slot:btn>充值记录</template>
         </wallet-modal-success>
@@ -112,7 +112,9 @@ export default {
             })
         },
         dyBtnClick(){
-            routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
+            let { brand_id, balance } = this;
+            let _qryStr = `brand_id=${brand_id ?? ''}&balance=${balance ?? 0}`;
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?${_qryStr}`, 'nT');
         },
         bfBtnClick(){
             routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
index 6d5cbb9..d557240 100644
--- a/src/subpackage/wallet/pages/index/recharge_record.vue
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -13,16 +13,12 @@
                 <record-line  name="充值时间">{{ e.pay_time || '-' }}</record-line>
                 <record-line  name="支付方式">{{ e.pay_type || '-' }}</record-line>
                 <record-line  name="交易流水号">{{ e.trans_no || '-' }}</record-line>
-                <record-line  name="充值途径">{{ e.optsourse || '-' }}</record-line>
+                <record-line  name="充值途径">
+                    {{ e.optsourse || '-' }} <block v-if="e.optname"> （{{ e.optname }}） </block>
+                </record-line>
             </view>
         </view>
     </view>
-    <!-- 充值金额：12.00
-充值单号：TX20191017898999
-充值时间：2024-10-17  12:12:12
-支付方式：微信支付
-交易流水号：4002676665666
-充值途径：商家助手（刘晓） -->
 </template>
 
 <script>