From 1f6c96e3a958b28e9426df42b1ef1eb73ded231b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 31 Jul 2020 10:43:17 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MarketPercentageController.class.php | 2 ++ Application/Admin/View/Promote/add.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index d1f706fcd..eeb1ce40a 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -469,9 +469,11 @@ class MarketPercentageController extends ThinkController $sum['achievement_bonus'] += $data[$key]['achievement_bonus']; $sum['commission'] += $data[$key]['commission']; $sum['extend_commission'] += $data[$key]['extend_commission']; + $sum['company_profit'] += $data[$key]['company_profit']; } $sum['wait_commission'] = '-------'; + $sum['pay_time'] = '总计'; if ($_REQUEST['export']) { diff --git a/Application/Admin/View/Promote/add.html b/Application/Admin/View/Promote/add.html index db04682a1..d0d3561f8 100644 --- a/Application/Admin/View/Promote/add.html +++ b/Application/Admin/View/Promote/add.html @@ -8,7 +8,7 @@