From d85d0ace9ddce94fc88332d438d6eef0ea221297 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 13 Nov 2024 15:12:21 +0800
Subject: [PATCH 1/6] finish md241024

---
 src/pages.json                                     |   2 +-
 .../wallet/pages/douyin_withdraw/apply.vue         |  32 ++++--
 .../wallet/pages/douyin_withdraw/index.vue         |  81 +++++++-------
 .../douyin_withdraw/modules/platform_item.vue      | 117 +++++++++++++++++++++
 .../wallet/pages/douyin_withdraw/record.vue        |   5 +
 src/subpackage/wallet/pages/index/index.vue        |   5 +-
 .../wallet/pages/index/modules/wallet_info.vue     |   5 +-
 7 files changed, 192 insertions(+), 55 deletions(-)
 create mode 100644 src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue

diff --git a/src/pages.json b/src/pages.json
index 5dcf150..cc0c952 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -749,7 +749,7 @@
 				{
 					"path": "pages/douyin_withdraw/index",
 					"style" : {
-						"navigationBarTitleText": "抖音提现"
+						"navigationBarTitleText": "平台提现"
 					}
 				},
 				{
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index f6a84ce..88bb058 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -83,13 +83,22 @@ export default {
                 bank_name: '',
                 bank_address: '',
                 mobile: ''
-            }
+            },
+            // md【241024】 241113新增
+            source: '', // 提现源：0抖音；1微信
         }
     },
     async onLoad(options){
         let _bid =  options.brand_id || '';
         this.brand_id = _bid;
-        await this.getDouyinWalletBalance(_bid);
+
+        // md【241024】 241113新增
+        let { source } = options;
+        if(![ 0, 1 ].includes(+source))return showNone('缺少参数 source');
+        this.source = +source;
+
+        await this.getDouyinWalletBalance(_bid, +source);
+
         if(this.isEmptyInfo())this.getStorageAndSet();
     },
     methods: {
@@ -144,8 +153,10 @@ export default {
         },
         // 提现申请确认
         dyConfirmExtract(e){
+            let { brand_id, source } = this;
             this.douyinWalletExtract({
-                brand_id: this.brand_id,
+                brand_id,
+                source,
                 ...e,
             })
         },
@@ -186,7 +197,7 @@ export default {
          * http://api.ouxuan.net:61080/project/11/interface/api/2195
          * @param {String} brand_id 品牌id
          * */ 
-        getDouyinWalletBalance(brand_id){
+        getDouyinWalletBalance(brand_id, source){
             showLoad();
             return servers.get({
                 url: WALLET_API.withdrawalOfDouyinOrg_totalAmount,
@@ -196,8 +207,11 @@ export default {
                 failMsg: '获取钱包余额失败'
             })
             .then(res=>{
+                
                 hideLoad();
-                let _balance = +res.total_amount ?? 0;
+                let _balance = 0;
+                if(source === 0)_balance = +res.total_amount_of_douyin ?? 0;
+                if(source === 1)_balance = +res.total_amount_of_wechat ?? 0;
                 return this.balance = _balance * 0.01;
             })
             .catch(hideLoad)
@@ -212,6 +226,8 @@ export default {
          * @param {String} bank_address // 银行地址
          * @param {String} mobile 手机号
          * @param {Number} status // 0未处理，1已处理
+         * md【241024】 241113新增
+         * @param {Number} source // 提现源：0抖音；1微信
          * */ 
         douyinWalletExtract({
             brand_id,
@@ -221,7 +237,8 @@ export default {
             bank_name,
             bank_address,
             mobile,
-            status = 0
+            status = 0,
+            source
         }){
             showLoad();
             servers.post({
@@ -235,6 +252,7 @@ export default {
                     bank_address,
                     mobile,
                     status,
+                    source
                 },
                 failMsg: '申请提现失败'
             })
@@ -242,7 +260,7 @@ export default {
                 hideLoad();
                 this.$refs.walletModalSuccess.alert();
                 setTimeout(_=>{
-                    this.getDouyinWalletBalance(brand_id);
+                    this.getDouyinWalletBalance(brand_id, source);
                 }, 1200);
             })
             .catch(hideLoad)
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index a5ec2cc..9c3665a 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -1,11 +1,21 @@
 <template>
     <view class="douyin-withdraw">
-        <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.toFixed(2)||"0.00" }}
-        </view>
-        <view class="dw-btn" @click="applyBtn">申请提现</view>
+        <view class="dw-space"></view>
+        <platform-item
+            title="微信平台可提现资金"
+            :balance="formatMoney(balanceInfo.total_amount_of_wechat)"
+            type="wx"
+            @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)"
+        ></platform-item>
+
+        <view class="dw-space"></view>
         <view class="dw-link">
             <text class="dl-txt" @click="toDetailBtn">提现明细</text>
             <image class="dl-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
@@ -17,11 +27,22 @@
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
 import { routeTo, showLoad, hideLoad } from '@/utils/util';
+
+import platformItem from "./modules/platform_item.vue";
 export default {
+    components: {
+        'platform-item': platformItem,
+    },
     data(){
         return {
             brand_id: '',
-            balance: 0,
+            balanceInfo: {
+                /**
+                 * total_amount 
+                 * total_amount_of_douyin
+                 * total_amount_of_wechat
+                 */
+            },
         }
     },
     onLoad(options){
@@ -36,8 +57,9 @@ export default {
             routeTo(`/subpackage/wallet/pages/douyin_withdraw/record?brand_id=${this.brand_id}`, 'nT');
         },
         // 申请提现
-        applyBtn(){
-            routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}`, 'nT');
+        // md【241024】 241113新增 0抖音；1微信
+        applyBtn(source){
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}&source=${source}`, 'nT');
         },
         /**
          * http://api.ouxuan.net:61080/project/11/interface/api/2195
@@ -54,11 +76,13 @@ export default {
             })
             .then(res=>{
                 hideLoad();
-                let _balance = +res.total_amount ?? 0;
-                this.balance = _balance * 0.01;
+                this.balanceInfo = res || {};
             })
             .catch(hideLoad)
         },
+        formatMoney(money){
+            return ((money ?? 0) *0.01).toFixed(2);
+        }
     }
 
 }
@@ -66,40 +90,11 @@ export default {
 
 <style lang="scss">
     .douyin-withdraw{
-        padding-top: 88upx;
-        .dw-icon{
-            margin: 0 auto;
-            display: block;
-            width: 96upx;
-            height: 96upx;
-            background: #000;
-            border-radius: 24upx;
-        }
-        .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);
+        padding: 0 32upx;
+        .dw-space{
+            height: 32upx;
         }
         .dw-link{
-            margin-top: 88upx;
             @include flcw(28upx, 40upx, #9A9A9D);
             @include ctf(center);
             .dl-icon{
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue b/src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue
new file mode 100644
index 0000000..903d00d
--- /dev/null
+++ b/src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue
@@ -0,0 +1,117 @@
+<template>
+    <view class="baofu-item">
+        <view class="bi-bar" :class="{ 'bb-dy': type === 'dy' }">
+            <view class="bb-name-bar">
+                <view class="bnb-left">
+                    <view class="bl-txt">{{ title }}</view>
+                </view>
+            </view>
+        </view>
+        
+        <view class="bi-info">
+            <view class="bi-balance">
+                <view class="bb-money">
+                    {{ balance || 0 }}
+                </view>
+                <view class="bb-btn" @click="$emit('click:extract')">提现</view>
+            </view>
+            <view class="bi-tip">
+                <view class="bt-txt" @click="showModalTip">可提现资金(元)</view>
+                <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(0)"></image>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        title: {
+            default: ''
+        },
+        balance: {
+            default: '0'
+        },
+        type: {// dy: 抖音, wx: 微信
+            type: String,
+            default: 'dy', 
+        }
+    },
+    methods:{
+        showModalTip(){
+            let { type } = this;
+            let _str = '';
+            if(type === 'dy')_str = '抖音端与欧轩合作的平台小程序订单的结算金额';
+            if(type === 'wx')_str = '微信端与欧轩合作的平台小程序订单的结算金额';
+            uni.showModal({
+                title: '提示',
+                content: _str,
+                showCancel: 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;
+            }
+        }
+        .bi-bar{
+            padding: 26upx 32upx 18upx;
+            padding-left: 32upx;
+            padding-right: 32upx;
+            background: $mColor;
+            &.bb-dy{
+                background: #585f69;
+            }
+            .bb-name-bar{
+                @include ctf(space-between);
+                .bnb-left{
+                    flex-grow: 1;
+                    @include ctf;
+                    .bl-txt{
+                        @include flcw(28upx, 44upx, #fff, 500);
+                        @include tHide;
+                    }
+                }
+            }
+        }
+        .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-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 01941e7..3a336f4 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -12,6 +12,7 @@
                     name="提现金额"
                     :tag="getTagTxt(e.status)"
                 >{{ formatAmount(e.amount || 0) }}</record-line>
+                <record-line name="提现金额来源">{{ getSourceTxt(e.source) }}</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>
@@ -65,6 +66,10 @@ export default {
         });
     },
     methods: {
+        getSourceTxt(source = ''){
+            return source === 0 ? '抖音平台' : 
+                   source === 1 ? '微信平台' : '-';
+        },
         formatAmount(num = 0){
             let _num = Number(num) || 0;
             return _num * 0.01;
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 7dd37cd..55d9589 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -10,9 +10,10 @@
             <view class="wt-tit">温馨提示：</view>
             <view class="wt-content">
                 <text class="wc-txt">
-                    如需要分账账户可以自己单独提现，请访问 {{ oxAddress }} 
+                    1、如需要宝付分账账户可以自己单独提现，请访问 {{ oxAddress }} 
                     <text class="wt-copy" @click="copyBtn">复制</text>
-                    \r\n账户为宝付的商户号，密码为申请时预留的手机号码
+                    \r\n 账户为宝付的商户号，密码为申请时预留的手机号码
+                    \r\n 2、平台提现为平台版抖音小程序、平台版微信小程序的分账结算金额提现。
                 </text>
             </view>
         </view>
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 807e312..f450eb1 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -26,8 +26,9 @@
                 <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>
-                <text class="wi-txt">抖音提现</text>
+                <!-- 【241024】 “抖音提现”文案改为“平台提现”，原有的抖音logo去掉 -->
+                <!-- <image class="wi-icon" mode="aspect" src="@/subpackage/wallet/static/images/dy_logo.png"></image> -->
+                <text class="wi-txt">平台提现</text>
             </view>
         </view>
     </view>

From 2b9522d7a2fd09f0d7f3b645be69e655a6747cd8 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 13 Nov 2024 18:29:12 +0800
Subject: [PATCH 2/6]  add tid1577

---
 .../wallet/pages/douyin_withdraw/apply.vue         | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index 88bb058..d187ef8 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -34,6 +34,11 @@
                 <view class="dol-name">联系电话</view>
                 <input maxlength="11" type="number" class="dol-ipt" placeholder="请输入联系电话" v-model="info.mobile">
             </view>
+            <!-- // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入 -->
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">*证件号码</view>
+                <input type="idcard" class="dol-ipt" placeholder="请输入身份证/营业执照统一信用代码" v-model="info.credentials_number">
+            </view>
             
         </view>
         
@@ -82,7 +87,9 @@ export default {
                 account: '',
                 bank_name: '',
                 bank_address: '',
-                mobile: ''
+                mobile: '',
+                // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入
+                credentials_number: '' // 证件号码
             },
             // md【241024】 241113新增
             source: '', // 提现源：0抖音；1微信
@@ -165,7 +172,7 @@ export default {
             return _infoValues.every(item=>item === '');
         },
         infoCheck(){
-            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile } = this.info;
+            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile, credentials_number } = this.info;
             let _amount = +(amount ?? 0);
             if(_amount <= 0){
                 showNone('提现金额不正确');
@@ -191,6 +198,12 @@ export default {
                 showNone('支行名称不能为空');
                 return false
             }
+
+            if(credentials_number === ''){
+                showNone('证件号码不能为空');
+                return false
+            }
+
             return true
         },
         /**
@@ -228,6 +241,9 @@ export default {
          * @param {Number} status // 0未处理，1已处理
          * md【241024】 241113新增
          * @param {Number} source // 提现源：0抖音；1微信
+         * // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入
+         * @param {String} credentials_number // 证件号码
+         * 
          * */ 
         douyinWalletExtract({
             brand_id,
@@ -238,7 +254,8 @@ export default {
             bank_address,
             mobile,
             status = 0,
-            source
+            credentials_number,
+            source,
         }){
             showLoad();
             servers.post({
@@ -252,7 +269,8 @@ export default {
                     bank_address,
                     mobile,
                     status,
-                    source
+                    credentials_number,
+                    source,
                 },
                 failMsg: '申请提现失败'
             })

From d262039ac4587e958271f982984b7622bf17b121 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 12 Dec 2024 10:03:21 +0800
Subject: [PATCH 3/6] fix md1024

---
 src/subpackage/wallet/pages/douyin_withdraw/record.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 3a336f4..5fd1d9e 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -17,6 +17,7 @@
                 <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.credentials_number || '-' }}</record-line>
                 <record-line name="处理时间">{{ e.updated_at || '-' }}</record-line>
                 <record-line name="备注">{{ e.remark || '-' }}</record-line>
             </view>

From db5ec88aa160c3a5d220264fe5fdac5142cb8879 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 30 Dec 2024 18:19:13 +0800
Subject: [PATCH 4/6] fix md1024

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

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index d187ef8..7c1557a 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -46,6 +46,7 @@
             <view class="dt-tit">温馨提示</view>
             <view class="dt-desc">1、账户请预留一定的余额，避免余额不足导致退款失败！</view>
             <view class="dt-desc">2、提现申请成功提交后，预计在3~7个工作日内进行处理。</view>
+            <view class="dt-desc">3、提现需要扣除1元/次手续费。</view>
         </view>
         <view class="dwa-btn">
             <wm-button green @click="confirmExtract">确认提现</wm-button>

From 34fcb18b42f3d0304760ac1f6006cf2b783fdcd3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 31 Dec 2024 09:58:28 +0800
Subject: [PATCH 5/6] vtest 1.1.62 for tid1682

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

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index 7c1557a..8119da8 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -287,7 +287,6 @@ export default {
     }
 }
 </script>
-
 <style lang="scss">
     page{
         background: #fff;

From b4bf6398777b7dfa1f8cbe689c1d89d00c64ec7d Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 31 Dec 2024 10:06:14 +0800
Subject: [PATCH 6/6] vformal 1.1.62 for tid1682

---
 src/js/api.js     | 4 ++--
 src/manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index 550179d..88f6939 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/manifest.json b/src/manifest.json
index d409cc9..3fe960c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -73,7 +73,7 @@
 			//  }
 		 // },
         /* 正式 wxf1294b279ad1b845 */ 
-        "appid" : "wx7106e84614cf0060",
+        "appid" : "wxf1294b279ad1b845",
         "setting" : {
             "urlCheck" : false,
             "minified" : true