From f2dca5ecc21a0c47c002415aabee030538c5abe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=B9?= <>
Date: Thu, 19 Sep 2024 18:37:24 +0800
Subject: [PATCH] .

---
 pages/index.vue | 58 +++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 77a9c65..53fb9df 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -28,9 +28,32 @@
 			</u-row>
 		</view>
 		<view class="content-section">
-			<view class="grey-box">
-				<view style="z-index: 10; top: 0" :style="[isSticky ? 'position: sticky;':'']">
-					<u-grid :border="false" col="4" v-if="!isSticky">
+			<view class="grey-box" style="border-radius: 15px 15px 0 0 ; padding-bottom: 0;">
+				<view :style="[isSticky ? 'position: sticky;':'','z-index: 10','top: -10px']">
+					<u-grid :border="false" col="4" v-if="isSticky"
+						style="background: #f3f3f3; margin-bottom: 0; box-shadow: 0 1px 9px rgba(209, 209, 209, 0.5);padding-bottom: 5px;">
+						<u-grid-item class="click" style="box-shadow: none;">
+							<text class="text">总设备</text>
+							<view class="iconfont icon-threshold"></view>
+							<u-badge numberType="overflow" type="success" max="999" value="155"></u-badge>
+						</u-grid-item>
+						<u-grid-item style="box-shadow: none;">
+							<text class="text">总设备</text>
+							<view class="iconfont icon-jizhan"></view>
+							<u-badge numberType="overflow" type="success" max="999" value="15"></u-badge>
+						</u-grid-item>
+						<u-grid-item style="box-shadow: none;">
+							<text class="text">总设备</text>
+							<view class="iconfont icon-lixian"></view>
+							<u-badge numberType="overflow" type="success" max="999" value="15"></u-badge>
+						</u-grid-item>
+						<u-grid-item style="box-shadow: none;">
+							<text class="text">总设备</text>
+							<view class="iconfont icon-shangqing"></view>
+							<u-badge numberType="overflow" type="success" max="999" value="15"></u-badge>
+						</u-grid-item>
+					</u-grid>
+					<u-grid :border="false" col="4" v-else style=" margin-bottom: 0;">
 						<u-grid-item class="click">
 							<view class="iconfont icon-threshold"></view>
 							<u-badge numberType="overflow" type="success" max="999" value="155"></u-badge>
@@ -52,29 +75,11 @@
 							<text class="text">土壤墒情</text>
 						</u-grid-item>
 					</u-grid>
-					<u-grid :border="false" col="4" v-if="isSticky" style="background: #fff;">
-						<u-grid-item class="click">
-							<text class="text">总设备</text>
-							<view class="iconfont icon-threshold"></view>
-							<u-badge numberType="overflow" type="success" max="999" value="155"></u-badge>
-						</u-grid-item>
-						<u-grid-item>
-							<text class="text">总设备</text>
-							<view class="iconfont icon-jizhan"></view>
-							<u-badge numberType="overflow" type="success" max="999" value="15"></u-badge>
-						</u-grid-item>
-						<u-grid-item>
-							<text class="text">总设备</text>
-							<view class="iconfont icon-lixian"></view>
-							<u-badge numberType="overflow" type="success" max="999" value="15"></u-badge>
-						</u-grid-item>
-						<u-grid-item>
-							<text class="text">总设备</text>
-							<view class="iconfont icon-shangqing"></view>
-							<u-badge numberType="overflow" type="success" max="999" value="15"></u-badge>
-						</u-grid-item>
-					</u-grid>
+				
 				</view>
+			</view>
+			<view class="grey-box" style="border-radius: 0 0 15px 15px;">
+				
 				<view class="card">
 					<u-collapse accordion>
 						<u-collapse-item>
@@ -234,7 +239,8 @@
 														<view class="iconfont icon-suoding icon"></view>
 													</view>
 												</view>
-												<u-line-progress height="8" :showText="false" :percentage="60" style="width: 100%;">
+												<u-line-progress height="8" :showText="false" :percentage="60"
+													style="width: 100%;">
 												</u-line-progress>
 
 											</u-col>