Merge pull request '12.28功能提交' (#44) from feature/update_payment into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
master
郑永星 4 years ago
commit cd2d9b3bc2

@ -210,7 +210,7 @@
<th>创建时间</th> <th>创建时间</th>
<th>批次号</th> <th>批次号</th>
<th>结算金额</th> <th>结算金额</th>
<th>审批状态</th> <!-- <th>审批状态</th>-->
<!-- <th>结算流水</th>--> <!-- <th>结算流水</th>-->
<th>打款状态</th> <th>打款状态</th>
<th>支付时间</th> <th>支付时间</th>
@ -237,7 +237,7 @@
<td>{$data.batch_num}</td> <td>{$data.batch_num}</td>
<td>{$data.statement_money}</td> <td>{$data.statement_money}</td>
<td <if condition="$data.verify_status eq 2">style="color: red"</if>>{$data.verify|default='---'}</td> <!-- <td <if condition="$data.verify_status eq 2">style="color: red"</if>>{$data.verify|default='-&#45;&#45;'}</td>-->
<!-- <td>{$data.platform_amount}</td>--> <!-- <td>{$data.platform_amount}</td>-->
<if condition="($data['pay_status'] eq -1) "> <if condition="($data['pay_status'] eq -1) ">
<td style="color: red;">{$data.pay_status_str}</td> <td style="color: red;">{$data.pay_status_str}</td>

@ -114,7 +114,7 @@
<!-- <th>奖励</th>--> <!-- <th>奖励</th>-->
<!-- <th>罚款</th>--> <!-- <th>罚款</th>-->
<th>结算金额</th> <th>结算金额</th>
<th>审批状态</th> <!-- <th>审批状态</th>-->
<th>支付宝真实姓名</th> <th>支付宝真实姓名</th>
<th>支付宝账号</th> <th>支付宝账号</th>
<th>制单人</th> <th>制单人</th>
@ -163,7 +163,7 @@
<td>-</td> <td>-</td>
<td>-</td> <td>-</td>
</notempty> </notempty>
<td rowspan="{$com.row}">{$com.verify}</td> <!-- <td rowspan="{$com.row}">{$com.verify}</td>-->
<td rowspan="{$com.row}">{$com.company_info.ali_user}</td> <td rowspan="{$com.row}">{$com.company_info.ali_user}</td>
<td rowspan="{$com.row}">{$com.company_info.ali_account}</td> <td rowspan="{$com.row}">{$com.company_info.ali_account}</td>

Loading…
Cancel
Save