From f1ba329891967bca6d083a9d5722683a9fa2080b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 09:17:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing

---
 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/driverIncomeData.html |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/driverIncomeData.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/driverIncomeData.html
index c97f7a8..b7deb21 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/driverIncomeData.html
+++ b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/driverIncomeData.html
@@ -10,13 +10,8 @@
                     <div class="col-sm-12">
                         <div class="row">
                             <div class="col-sm-3">
-                                <#SelectCon id="type" name="类别" >
-                                <option value="1">专车</option>
-                                <!--<option value="2">出租车</option>
-                                <option value="3">跨城</option>
-                                <option value="4">小件物流</option>-->
-                            </#SelectCon>
-                        </div>
+                                <#NameCon id="driverName" name="司机名称" />
+                            </div>
                         <div class="col-sm-3">
                             <#TimeCon id="time" name="起止时间" isTime="false"/>
                         </div>
@@ -35,6 +30,8 @@
                     </div>
                 </div>
                 <div class="hidden-xs" id="TDriverIncomeTableToolbar" role="group">
+                    <label>总计订单数:<span id="totalOrderCount"></span>;实付金额:<span id="totalPayMoney"></span>;
+                        司机收入:<span id="totalIncome"></span>;平台手续费:<span id="totalPlatformMoney"></span></label>
                 </div>
                 <#table id="TDriverIncomeTable"/>
             </div>

--
Gitblit v1.7.1