From fd213a7b4b4a740c532cfd7debb61beb13171abe Mon Sep 17 00:00:00 2001 From: wangxinglong <2371974647@qq.com> Date: Wed, 29 Dec 2021 10:24:24 +0800 Subject: [PATCH] settter --- app/repository/BillRepository.php | 2 +- public/static/manager/js/bill.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/repository/BillRepository.php b/app/repository/BillRepository.php index 070f2e9..c2eec3a 100644 --- a/app/repository/BillRepository.php +++ b/app/repository/BillRepository.php @@ -58,7 +58,7 @@ class BillRepository extends Repository ->when(!empty($endTime), function ($q) use ($endTime) { $q->whereTime("a.create_time", "<=", $endTime); }) - ->field("a.*,b.business_name,c.nick_name,c.avatar_url,d.name as coupon_main_name"); + ->field("a.*,b.business_name,c.nick_name,c.avatar_url,d.name as coupon_main_name,d.deduction_money"); $failData ['total'] = $rep->count(); $failData ['list'] = $rep diff --git a/public/static/manager/js/bill.js b/public/static/manager/js/bill.js index 8778c7c..c13a534 100644 --- a/public/static/manager/js/bill.js +++ b/public/static/manager/js/bill.js @@ -52,7 +52,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"] {field: "business_name", title: '商家名称'}, {field: "coupon_main_name", title: '优惠券名称'}, {templet:"#row-commission", title: '持有比例(渠道商:平台:消费者)'}, - {field: 'money', minWidth: 200, title: '金额'}, + {field: 'deduction_money', minWidth: 200, title: '扣除金额'}, {field: 'create_time', minWidth: 200, title: '时间'}, ]], done: function (res, curr, count) {