diff --git a/app/repository/BillRepository.php b/app/repository/BillRepository.php index 055eda5..ac7cece 100644 --- a/app/repository/BillRepository.php +++ b/app/repository/BillRepository.php @@ -210,6 +210,7 @@ class BillRepository extends Repository "d.consumer_money", + "d.distribution_money", "d.admin_money", "d.agency_money", diff --git a/public/static/manager/js/bill_deduction.js b/public/static/manager/js/bill_deduction.js index 262df45..7e4f7ad 100644 --- a/public/static/manager/js/bill_deduction.js +++ b/public/static/manager/js/bill_deduction.js @@ -64,9 +64,10 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] {field:"business_name",title: '所属商家名称'}, {field:"agency_business_name",title: '商家所属平台商'}, {field: "money", title: '扣款总额'}, - {field: "balance", title: '当前余额'}, + {field: "balance", title: '商家剩余余额'}, {field: "consumer_money", title: '消费者红包'}, + {field: "distribution_money", title: '分销者佣金'}, {field: "agency_money", title: '平台商佣金'}, {field: "admin_money", title: '太古佣金'}, {field: "create_time", title: '扣款时间'},