Merge remote-tracking branch 'origin/dev' into dev

5 years ago · 935cb50c2b
parent b61fdf2e97 d64b627883
commit 935cb50c2b
1 changed files with 5 additions and 2 deletions
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@ -230,13 +230,16 @@


                    <td>汇总</td>
-                    <td colspan="99">
+                    <td colspan="6">
                        当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                        今日充值：{$ttotal}
                        昨日充值：{$ytotal}
                        累计充值：{$total}（此处只汇总充值成功的订单）
                    </td>
-                    <td></td>
+                    <td colspan="99" style="color: #a9a9a9;">
+                        今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
+                        昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
+                    </td>
                </tr>
                </tbody>
            </table>