From 76c4519d22895a6ec8fd3971ece1f219a5d20e54 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 20 Jul 2022 15:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index/index-menu.vue   | 49 ++++++++++++++++++++++++++++
 components/index/index-notice.vue | 53 +++++++++++++++++++++++++++++++
 pages.json                        |  6 ++--
 pages/index/index.vue             | 49 +---------------------------
 4 files changed, 106 insertions(+), 51 deletions(-)

diff --git a/components/index/index-menu.vue b/components/index/index-menu.vue
index b2e4363..9689db2 100644
--- a/components/index/index-menu.vue
+++ b/components/index/index-menu.vue
@@ -261,5 +261,54 @@
 		.home_item:last-child {
 			margin-right: 0;
 		}
+		
 	}
+	.new_box {
+		background: #fff;
+		padding: 20upx;
+		margin-bottom: 20upx;
+	
+		.new_wrap {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	
+		.new_item {
+			position: relative;
+			display: inline-block;
+			padding: 20upx;
+			margin-right: 20upx;
+			width: calc((100% - 40upx) / 2);
+			background: #f5f5f5;
+			border-radius: 5upx;
+	
+			.new_font {
+				z-index: 2;
+			}
+	
+			.name {
+				font-size: 28upx;
+				font-weight: 600;
+				color: #333;
+				text-align: left;
+			}
+	
+			.text {
+				font-size: 24upx;
+				font-weight: 400;
+				color: #999;
+			}
+	
+			image {
+				width: 160upx;
+				height: 120upx;
+			}
+		}
+	
+		.new_item:last-child {
+			margin-right: 0;
+		}
+	}
+	
 </style>
diff --git a/components/index/index-notice.vue b/components/index/index-notice.vue
index 541ad43..d95dabf 100644
--- a/components/index/index-notice.vue
+++ b/components/index/index-notice.vue
@@ -194,4 +194,57 @@
 			margin-right: 0;
 		}
 	}
+	
+	
+	.noticesList-list{
+	  font-size: 25rpx;
+	  display: flex;
+	  width: 100%;
+	  padding: 10rpx 0;   
+	  border-bottom: 1rpx solid #ECECEC;
+	  color: #6D6D6D;
+	  justify-content: space-between;
+	}
+	.notices-info-name{
+	  margin-top: 10rpx;
+	  color: black;
+	  font-size: 30rpx;
+	  display: -webkit-box;  /*设置为弹性盒子*/
+	  -webkit-line-clamp: 2;  /*最多显示5行*/
+	  overflow: hidden;  /*超出隐藏*/
+	  text-overflow: ellipsis;  /*超出显示为省略号*/
+	  -webkit-box-orient: vertical;
+	  word-break: break-all;  /*强制英文单词自动换行*/
+	}
+	.notices-info-image image{
+	  width: 200rpx;
+	  height: 150rpx;
+	  margin: 10rpx 20rpx 0rpx 20rpx;
+	  border-radius: 10rpx;
+	}
+	.notices-info{
+	  margin: 10rpx 0rpx 0rpx 20rpx;
+	  height: 150rpx;
+	  flex-direction: column;
+	  display: flex;
+	  justify-content: space-between;
+	}
+	.notice-bottom{
+	  display: flex;
+	  text-align: left;
+	}
+	.notice-bottom view{
+	  margin-right: 20rpx;
+	}
+	
+	.notice-bottom icon{
+	  color: #8a8a8a;
+	  display: inline-block;
+	  width: 40rpx;
+	  height: 40rpx;
+	}
+	.notice-bottom view text{
+	  font-size: 25rpx;
+	  line-height: 40rpx;
+	}
 </style>
diff --git a/pages.json b/pages.json
index c2fcd09..0a9a6d0 100755
--- a/pages.json
+++ b/pages.json
@@ -580,11 +580,11 @@
 		"backgroundColor": "#fff",
 		"borderStyle": "black",
 		"midButton": {
-			"width": "95px",
-			"height": "95px",
+			"width": "65px",
+			"height": "65px",
 			"iconPath": "static/images/homekey.png",
 			"text": "开门",
-			"iconWidth": "75px"
+			"iconWidth": "45px"
 		},
 		"list": [{
 				"pagePath": "pages/index/index",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3efb8e9..eb6daec 100755
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -170,53 +170,6 @@
 
 	
 
-	.new_box {
-		background: #fff;
-		padding: 20upx;
-		margin-bottom: 20upx;
-
-		.new_wrap {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-
-		.new_item {
-			position: relative;
-			display: inline-block;
-			padding: 20upx;
-			margin-right: 20upx;
-			width: calc((100% - 40upx) / 2);
-			background: #f5f5f5;
-			border-radius: 5upx;
-
-			.new_font {
-				z-index: 2;
-			}
-
-			.name {
-				font-size: 28upx;
-				font-weight: 600;
-				color: #333;
-				text-align: left;
-			}
-
-			.text {
-				font-size: 24upx;
-				font-weight: 400;
-				color: #999;
-			}
-
-			image {
-				width: 160upx;
-				height: 120upx;
-			}
-		}
-
-		.new_item:last-child {
-			margin-right: 0;
-		}
-	}
-
+	
 	
 </style>