Merge branch 'data-paga-xiaowang' into data-page

app.json

@@ -22,6 +22,13 @@
                 "pages/addhouse/addhouse"
             ]
         },
+        {
+          "root": "subpages/morenews",
+          "name": "morenews",
+          "pages": [
+              "pages/morenews/morenews"
+          ]
+      },
         {
           "root": "subpages/nohouse",
           "name": "nohouse",

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="group_3">    
-          <view class="text-group_4">
+             <image src="../../images/index/house.png" class="image_house"/>
-            <text lines="1" class="text_8">{{collectedHouseCount?collectedHouseCount:'--'}}</text>
+              <view class="text-group_4" >
-            <text lines="1" class="text_9">录入房屋</text>
+               <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>

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;
+  position: absolute;
-  height: 78rpx;
+  bottom: 20rpx; /* 调整文本在图片上的垂直位置 */
+  right:75rpx; /* 调整文本在图片上的水平位置 */
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
+  margin: 0 0 30rpx 0 ;
-  margin: 53rpx 0 41rpx 57rpx;
+
 }
 .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;
-}
+}