fix merge tid1894 conflict

src/subpackage/wallet/pages/baofu_withdraw/index.vue

@@ -29,7 +29,7 @@ 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, showLoad, hideLoad } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, showModal } from '@/utils/util';
 import { mapState} from 'vuex';
 export default {
     computed: {
@@ -42,15 +42,18 @@ export default {
     },
     data(){
         return {
-            accountLs: []
+            accountLs: [],
+            brand_id: '',
+            balance: '',
         }
     },
     onLoad(options){
         this.brand_id = options.brand_id ?? '';
+        this.balance = options.balance ?? '';
         // this.getWalletBalance(options.brand_id);
         console.log('brandInfo', this.brandInfo);
         this.getPayAssureConfigs({
-            appid: this.brandInfo?.brand?.mini_wechat_appid ?? 'wxc141a743225e7885'
+            appid: this.brandInfo?.brand?.mini_wechat_appid ?? ''
         });
     },
     methods: {
@@ -59,7 +62,16 @@ export default {
             this.$refs?.baofuItem?.[index]?.refreshItem(false);
         },
         extractBtn(i){
-            let { accountLs } = this;
+            let { accountLs, balance } = this;
+
+            if(!isNaN(balance) && Number(balance) < 0)return showModal({
+                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。',
+                confirmText: '前往',
+                success: res=>{
+                    if(res.confirm)routeTo();
+                }
+            })
+
             let _curItem = accountLs[i];
             let _type = this.getBaoFuV2AccountTypeForChinese(_curItem.baofu_v2_config) === '个人' ? '1' : '2'; 
             this.$refs.bfWithdraw.alert({

src/subpackage/wallet/pages/index/index.vue

@@ -116,8 +116,9 @@ export default {
             routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?${_qryStr}`, 'nT');
         },
         bfBtnClick(){
-            routeTo(`/subpackage/wallet/pages/baofu_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/baofu_withdraw/index?${_qryStr}`, 'nT');
         },
         // 获取支付信息
         getPayInfo({ brand_id, pay_amount }){