From 21df16f0c0e4f86a274f35b94c890e492c5ac273 Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Thu, 9 May 2024 18:00:26 +0800
Subject: [PATCH] 11

---
 pages.json                          |  8 ++++
 pages_admin/admin_index.vue         | 71 ++++++++++++++++++++++++++++-
 pages_admin/admin_order.vue         |  2 +-
 pages_admin/admin_worke.vue         |  2 +-
 pages_admin/order/device_detail.vue | 22 +++++++++
 5 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 pages_admin/order/device_detail.vue

diff --git a/pages.json b/pages.json
index a470ad7..7e5be09 100644
--- a/pages.json
+++ b/pages.json
@@ -68,6 +68,14 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "order/device_detail",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh" : false
+					}
 				}
 
 				// ... 分包A的其他页面  
diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue
index 89488fe..f378a79 100644
--- a/pages_admin/admin_index.vue
+++ b/pages_admin/admin_index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		
-		<u-navbar title="地图" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
+		<u-navbar title="地图"  :is-back='false' :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
 			height='36'></u-navbar>
 			<view class="slider">
 				<view class="tit">
@@ -32,6 +32,62 @@
 					1
 				</view>
 			</view>
+			<view class="cont">
+				<view class="text">
+					用户行驶中
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
+			<view class="cont" style="width: 140rpx;">
+				<view class="text">
+					用户临时锁定
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
+			<view class="cont">
+				<view class="text">
+					已禁用
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
+			<view class="cont">
+				<view class="text">
+					已离线
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
+			<view class="cont">
+				<view class="text">
+					待租
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
+			<view class="cont">
+				<view class="text">
+					用户预约中
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
+			<view class="cont">
+				<view class="text">
+					调度设备
+				</view>
+				<view class="text">
+					1
+				</view>
+			</view>
 		</view>
 		<tab-bar :indexs='1' style=""></tab-bar>
 	</view>
@@ -277,11 +333,19 @@
 		width: 750rpx;
 		.decice_cont{
 			display: flex;
+			flex-wrap: wrap;
 			align-items: center;
 			padding: 22rpx 28rpx;
+			.cont:nth-child(5n) {
+			    margin-right: 0;
+			}
 			.cont{
-				width: 120rpx;
+				margin-top: 18rpx;
+				margin-right: 10rpx;
+				// display: flex;
+				width: 130rpx;
 				.text{
+					width: 100%;
 					text-align: center;
 					font-weight: 500;
 					font-size: 24rpx;
@@ -289,6 +353,9 @@
 					color: #3D3D3D;
 				}
 			}
+			.act1{
+				color: #4C97E7;
+			}
 		}
 		.btn_box{
 			width: 100%;
diff --git a/pages_admin/admin_order.vue b/pages_admin/admin_order.vue
index 70b05b8..924cc62 100644
--- a/pages_admin/admin_order.vue
+++ b/pages_admin/admin_order.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar :is-back="false" title="订单" :border-bottom="false" :background="bgc" title-color='#2E4975'
+		<u-navbar  :is-back="false" title="订单" :border-bottom="false" :background="bgc" title-color='#2E4975'
 			title-size='36' height='36'></u-navbar>
 		<view class="top_box">
 			<view class="left_text">
diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue
index 049f266..38942d2 100644
--- a/pages_admin/admin_worke.vue
+++ b/pages_admin/admin_worke.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="工作台" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
+		<u-navbar  :is-back='false' title="工作台" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
 			height='36'></u-navbar>
 			
 		<view class="cont_box">
diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages_admin/order/device_detail.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>