From 75820535d023f182bc265e17191e158df6b846e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 12 Apr 2024 18:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json               |  7 +++++++
 pages/index/index.wxml | 12 ++++++++----
 pages/index/index.wxss | 36 ++++++++++++++++++++++++++----------
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/app.json b/app.json
index 709855f..bc882ce 100644
--- a/app.json
+++ b/app.json
@@ -22,6 +22,13 @@
                 "pages/addhouse/addhouse"
             ]
         },
+        {
+          "root": "subpages/morenews",
+          "name": "morenews",
+          "pages": [
+              "pages/morenews/morenews"
+          ]
+      },
         {
           "root": "subpages/nohouse",
           "name": "nohouse",
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d003c20..cd39012 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -46,17 +46,21 @@
         <text lines="1" class="text_7">人房信息采集</text>
       </view>
       <view class="block_1">
-        <view class="group_3">
-          <view class="text-group_4">
-            <text lines="1" class="text_8">{{collectedHouseCount?collectedHouseCount:'--'}}</text>
-            <text lines="1" class="text_9">录入房屋</text>
+        <view class="group_3">    
+             <image src="../../images/index/house.png" class="image_house"/>
+              <view class="text-group_4" >
+               <text lines="1" class="text_8">{{collectedHouseCount?collectedHouseCount:'--'}}</text>
+              <text lines="1" class="text_9">录入房屋</text>
           </view>
           <view class="text-group_5" bind:tap="noHouse">
             <text lines="1" class="text_10">{{emptyHouseNum?emptyHouseNum:'--'}}</text>
             <text lines="1" class="text_11">未采集居民房屋</text>
           </view>
+ 
+
         </view>
         <view class="group_4">
+        <image src="../../images/index/JM.png" class="image_JM" />
           <view class="text-group_6">
             <text lines="1" class="text_12">{{collectedPopulationCount?collectedPopulationCount:'--'}}</text>
             <text lines="1" class="text_13">录入居民</text>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 9e72533..7da2674 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -478,20 +478,28 @@
   margin: 2rpx 0 30rpx 30rpx;
 }
 .group_3 {
-  width: 310rpx;
+  width: 309rpx;
   height: 290rpx;
-  background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/ps82ewzf7rt4xi1ybsycqaxm2mffxacf314bf1b64-1799-409e-a8d3-54344bd32244) 100% no-repeat;
   background-size: 100% 100%;
   display: flex;
   flex-direction: column;
+  position: relative;
+
+}
+
+.image_house{
+  width: 310rpx;
+  height: 290rpx;
 }
 .text-group_4 {
+  position: absolute;
   width: 114rpx;
   height: 80rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
   margin: 38rpx 0 0 57rpx;
+
 }
 .text_8 {
   width: 114rpx;
@@ -519,12 +527,13 @@
   margin-top: 14rpx;
 }
 .text-group_5 {
-  width: 180rpx;
-  height: 78rpx;
+  position: absolute;
+  bottom: 20rpx; /* 调整文本在图片上的垂直位置 */
+  right:75rpx; /* 调整文本在图片上的水平位置 */
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  margin: 53rpx 0 41rpx 57rpx;
+  margin: 0 0 30rpx 0 ;
+
 }
 .text_10 {
   width: 112rpx;
@@ -559,13 +568,18 @@
   display: flex;
   flex-direction: column;
 }
+.image_JM{
+  width: 310rpx;
+  height: 290rpx;
+}
 .text-group_6 {
+  position: absolute;
   width: 114rpx;
   height: 80rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 40rpx 0 0 140rpx;
+  margin: 40rpx 0 0 115rpx;
 }
 .text_12 {
   width: 114rpx;
@@ -590,15 +604,17 @@
   text-align: left;
   white-space: nowrap;
   line-height: 36rpx;
-  margin: 14rpx 0 0 12rpx;
+  margin: 14rpx 0 0 33rpx;
 }
 .text-group_7 {
+  position:absolute;
   width: 180rpx;
   height: 80rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin: 49rpx 0 41rpx 74rpx;
+  margin: 49rpx 0 44rpx 74rpx;
+  bottom: 20px;
 }
 .text_14 {
   width: 113rpx;
@@ -980,4 +996,4 @@ line-height: 40rpx;
   width: 30rpx;
   height: 30rpx;
   margin-right: 10rpx;
-}
\ No newline at end of file
+}