Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

5 years ago · 21579a3e07
parent aa5eadaa02 33f5cf9ac3
commit 21579a3e07
2 changed files with 495 additions and 418 deletions
--- a/Application/Admin/Model/SpendModel.class.php
+++ b/Application/Admin/Model/SpendModel.class.php
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@ -229,7 +229,7 @@
                    <td>汇总</td>
-                    <td colspan="12">
+                    <td colspan="99">
                        当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                        今日充值：{$ttotal}
                        昨日充值：{$ytotal}