From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html |  125 +++++++++++++++++++++--------------------
 1 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
index b918dd9..a87f13b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -46,26 +46,26 @@
 							<h1 class="no-margins" id="newNetcardriver">0</h1>
 							<small>在线司机</small>
 						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail1">0</h1>
-							<small>快车订单数</small>
-						</div>
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail1">0</h1>
+													<small>快车订单数</small>
+												</div>
 						<div class="ibox-content">
 							<h1 class="no-margins" id="orderDetail2">0</h1>
 							<small>出租车订单</small>
 						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail3">0</h1>
-							<small>跨城出行订单</small>
-						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail4">0</h1>
-							<small>同城小件物流订单</small>
-						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail5">0</h1>
-							<small>跨城小件物流订单</small>
-						</div>
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail3">0</h1>
+													<small>跨城出行订单</small>
+												</div>
+						<!--						<div class="ibox-content">-->
+						<!--							<h1 class="no-margins" id="orderDetail4">0</h1>-->
+						<!--							<small>同城小件物流订单</small>-->
+						<!--						</div>-->
+						<!--						<div class="ibox-content">-->
+						<!--							<h1 class="no-margins" id="orderDetail5">0</h1>-->
+						<!--							<small>跨城小件物流订单</small>-->
+						<!--						</div>-->
 					</div>
 				</div>
 				<div class="col-sm-3">
@@ -116,26 +116,26 @@
 							<h1 class="no-margins" id="netcarDriverSum1">0</h1>
 							<small>新增司机</small>
 						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail11">0</h1>
-							<small>快车订单数</small>
-						</div>
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail11">0</h1>
+													<small>快车订单数</small>
+												</div>
 						<div class="ibox-content">
 							<h1 class="no-margins" id="orderDetail21">0</h1>
 							<small>出租车订单数</small>
 						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail31">0</h1>
-							<small>跨城出行订单数</small>
-						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail41">0</h1>
-							<small>同城小件物流订单数</small>
-						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins" id="orderDetail51">0</h1>
-							<small>跨城小件物流订单数</small>
-						</div>
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail31">0</h1>
+													<small>跨城出行订单数</small>
+												</div>
+						<!--						<div class="ibox-content">-->
+						<!--							<h1 class="no-margins" id="orderDetail41">0</h1>-->
+						<!--							<small>同城小件物流订单数</small>-->
+						<!--						</div>-->
+						<!--						<div class="ibox-content">-->
+						<!--							<h1 class="no-margins" id="orderDetail51">0</h1>-->
+						<!--							<small>跨城小件物流订单数</small>-->
+						<!--						</div>-->
 						<div class="ibox-content">
 							<h1 class="no-margins" id="paiceSum1">0</h1>
 							<small>交易总金额</small>
@@ -164,36 +164,36 @@
 							</h1>
 							<small>用户注册趋势图</small>
 						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins">
-								<span class="dynamicsparkline" id="orderDetail12">Loading..</span>
-							</h1>
-							<small>快车订单趋势图</small>
-						</div>
+												<div class="ibox-content">
+													<h1 class="no-margins">
+														<span class="dynamicsparkline" id="orderDetail12">Loading..</span>
+													</h1>
+													<small>快车订单趋势图</small>
+												</div>
 						<div class="ibox-content">
 							<h1 class="no-margins">
 								<span class="dynamicsparkline" id="orderDetail22">Loading..</span>
 							</h1>
 							<small>出租车订单趋势图</small>
 						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins">
-								<span class="dynamicsparkline" id="orderDetail32">Loading..</span>
-							</h1>
-							<small>跨城出行订单趋势图</small>
-						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins">
-								<span class="dynamicsparkline" id="orderDetail42">Loading..</span>
-							</h1>
-							<small>同城小件物流订单趋势图</small>
-						</div>
-						<div class="ibox-content">
-							<h1 class="no-margins">
-								<span class="dynamicsparkline" id="orderDetail52">Loading..</span>
-							</h1>
-							<small>跨城小件物流订单趋势图</small>
-						</div>
+												<div class="ibox-content">
+													<h1 class="no-margins">
+														<span class="dynamicsparkline" id="orderDetail32">Loading..</span>
+													</h1>
+													<small>跨城出行订单趋势图</small>
+												</div>
+						<!--						<div class="ibox-content">-->
+						<!--							<h1 class="no-margins">-->
+						<!--								<span class="dynamicsparkline" id="orderDetail42">Loading..</span>-->
+						<!--							</h1>-->
+						<!--							<small>同城小件物流订单趋势图</small>-->
+						<!--						</div>-->
+						<!--						<div class="ibox-content">-->
+						<!--							<h1 class="no-margins">-->
+						<!--								<span class="dynamicsparkline" id="orderDetail52">Loading..</span>-->
+						<!--							</h1>-->
+						<!--							<small>跨城小件物流订单趋势图</small>-->
+						<!--						</div>-->
 					</div>
 				</div>
 			</div>
@@ -252,17 +252,18 @@
 					</div>
 				</div>
 			</div>
-
+		
 		</div>
 	</div>
 </div>
 <script type="text/javascript">
-    window._AMapSecurityConfig = {
-        securityJsCode:'cd326c917a4a890df304d93b26ee1cd6',
-    }
+	window._AMapSecurityConfig = {
+		securityJsCode: '44c5ee9ad584605d91ca69bfac32c761',
+	}
 </script>
-<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=d868ee8a0084a4a1b4271d8030e32fba"></script>
-<script src="https://webapi.amap.com/maps?v=1.4.15&key=d868ee8a0084a4a1b4271d8030e32fba&plugin=AMap.MouseTool"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=d3bde6afb050067e1a765a8d1d1f4c54"
+        type="text/javascript"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=d3bde6afb050067e1a765a8d1d1f4c54&plugin=AMap.MouseTool"></script>
 <script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
 <script src="${ctxPath}/static/home.js"></script>
 <script src="${ctxPath}/static/js/jquery.sparkline 2.1.2.js"></script>

--
Gitblit v1.7.1