wikiboss/Henglianshutong
1
0
派生 0
代码 工单 合并请求 Actions 软件包 项目 版本发布 百科 动态

fix(withdraw): 修复提现台账导出PHP8兼容性与页面崩溃问题，统一大余额与导出体验

浏览代码
这个提交包含在：
chen
2026-09-21 15:11:58 +08:00
父节点 3bd0954df1
当前提交 dbd0ac5e02
共有 21 个文件被更改，包括 255 次插入 和 165 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

4
application/admin/view/shopro/commission/agent/detail.html
查看文件

@@ -385,7 +385,7 @@
{{ state.data.total_income || state.data.income_total_cash || '0.00' }}
</span>
<span class="ml-1" style="font-size: 12px; color: var(--sa-subfont);">元</span>
<el-tag size="small" type="success" style="margin-left: 8px;">直入商城余额</el-tag>
<el-tag size="small" type="success" style="margin-left: 8px;">直入钱包余额</el-tag>
</el-form-item>
<el-form-item>
<el-button type="primary" link
@@ -626,7 +626,7 @@
</div>
</el-col>
<el-col class="item" :xs="12" :sm="6" :md="6" :lg="6" :xl="6">
<div class="left">商城可用余额：</div>
<div class="left">钱包可用余额：</div>
<div class="right" style="color: #67c23a;">
{{ state.data.user?.money || state.data.user_money || '0.00' }}
<span class="unit">元</span>

2
application/admin/view/shopro/commission/reward/index.html
查看文件

@@ -6,7 +6,7 @@
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">历史佣金</div>
<el-tag size="small" type="info" style="margin-left: 10px;">注：当前收益分成已全额直入商城余额，历史未转佣金可批量转入余额</el-tag>
<el-tag size="small" type="info" style="margin-left: 10px;">注：当前收益分成已全额直入钱包余额，历史未转佣金可批量转入余额</el-tag>
<sa-filter-condition v-model="state.filter" @filter-delete="onChangeFilter">
</sa-filter-condition>
</div>

4
application/admin/view/shopro/order/order/detail.html
查看文件

@@ -887,7 +887,7 @@
<div v-if="state.detail.partner_split" style="font-size:13px;font-weight:400;color:var(--sa-subfont)">
<span v-if="Number(state.detail.partner_split.total_instant_cash || state.detail.partner_split.total_cash) > 0" style="margin-right: 14px;">
即时现金分成 <strong style="color:#ff4d4f;font-size:14px">¥{{ state.detail.partner_split.total_instant_cash || state.detail.partner_split.total_cash }}</strong>
<el-tag size="small" type="success" style="margin-left: 6px;">直入商城余额</el-tag>
<el-tag size="small" type="success" style="margin-left: 6px;">直入钱包余额</el-tag>
</span>
<span v-if="Number(state.detail.partner_split.total_share_cash) > 0" style="margin-right: 14px;">
均分奖池现金贡献 <strong style="color:#409eff;font-size:14px">¥{{ state.detail.partner_split.total_share_cash }}</strong>
@@ -965,7 +965,7 @@
size="small"
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'commission' ? 'warning' : (scope.row.wallet_type === 'madow' ? 'primary' : 'info'))"
>
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '平台留存')) }}
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '钱包余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '平台留存')) }}
</el-tag>
</template>
</el-table-column>

4
application/admin/view/shopro/partner/reward/index.html
查看文件

@@ -58,7 +58,7 @@
size="small"
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : (scope.row.wallet_type === 'commission' ? 'warning' : 'info'))"
>
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '钱包余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
</el-tag>
</template>
</el-table-column>
@@ -177,7 +177,7 @@
size="small"
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : 'info')"
>
{{ scope.row.wallet_type_text || '商城余额' }}
{{ scope.row.wallet_type_text || '钱包余额' }}
</el-tag>
</template>
</el-table-column>

8
application/admin/view/shopro/user/user/detail.html
查看文件

@@ -426,7 +426,7 @@
¥{{ state.detail.total_income || state.detail.income_total_cash || '0.00' }}
</div>
<div class="asset-card-desc">
当前商城余额: ¥{{ state.detail.money || '0.00' }}
当前钱包余额: ¥{{ state.detail.money || '0.00' }}
</div>
<div class="asset-card-desc">
历史未转佣金: ¥{{ state.detail.commission || '0.00' }}
@@ -480,7 +480,7 @@
<el-col :xs="24" :sm="12" :md="6">
<div class="asset-card-box">
<div class="asset-card-label sa-flex sa-row-between" style="display: flex; justify-content: space-between; align-items: center;">
<span>商城余额 / 积分</span>
<span>钱包余额 / 积分</span>
{if $auth->check('shopro/user/user/recharge')}
<div>
<el-button type="primary" link size="small" @click="onRecharge('money')">充余额</el-button>
@@ -544,7 +544,7 @@
<el-table-column label="入账账户" min-width="110">
<template #default="scope">
<el-tag size="small" :type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : (scope.row.wallet_type === 'commission' ? 'warning' : 'info'))">
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '钱包余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
</el-tag>
</template>
</el-table-column>
@@ -665,7 +665,7 @@
<el-table-column label="钱包类别" min-width="110" v-if="log.tabActive=='commission'">
<template #default="scope">
<el-tag size="small" :type="scope.row.type == 'money' ? 'success' : 'warning'">
{{ scope.row.type == 'money' ? '商城余额' : '佣金钱包' }}
{{ scope.row.type == 'money' ? '钱包余额' : '佣金钱包' }}
</el-tag>
</template>
</el-table-column>

2
application/admin/view/shopro/user/user/index.html
查看文件

@@ -152,7 +152,7 @@
<el-table-column label="收益中心资产" min-width="190">
<template #default="scope">
<div><span class="asset-sub">累计收益:</span> <b style="color: #409eff;">¥{{ scope.row.total_income || scope.row.income_total_cash || '0.00' }}</b></div>
<div class="asset-sub">商城余额: ¥{{ scope.row.money || '0.00' }}</div>
<div class="asset-sub">钱包余额: ¥{{ scope.row.money || '0.00' }}</div>
<div class="asset-sub">未转佣金: ¥{{ scope.row.commission || '0.00' }}</div>
</template>
</el-table-column>

2
application/admin/view/shopro/user/user/recharge.html
查看文件

@@ -22,7 +22,7 @@
<el-row :gutter="8">
<el-col :span="6">
<div style="background: #ffffff; padding: 8px 10px; border-radius: 6px; border: 1px solid #edf2f7; text-align: center;">
<div style="font-size: 11px; color: #64748b;">商城余额</div>
<div style="font-size: 11px; color: #64748b;">钱包余额</div>
<div style="font-size: 13px; font-weight: 600; color: #2563eb; margin-top: 2px;">¥{{ state.user.money || '0.00' }}</div>
</div>
</el-col>

2
application/admin/view/shopro/withdraw/index.html
查看文件

@@ -66,7 +66,7 @@
<template v-else-if="scope.row.is_money_withdraw">
<div class="sa-flex" style="margin-bottom: 2px;">
<el-tag size="small" type="success" effect="plain" style="border-radius: 4px; height: 20px; line-height: 20px; padding: 0 6px; font-weight: 500;">
商城余额
钱包余额
</el-tag>
</div>
<div class="sa-table-line-1" style="font-weight: 500;">