From 97d6d134291f66d8c6c6d11b11087c7d69d334de 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: Tue, 16 Apr 2024 13:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BA=BA=E6=88=BF=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.wxss | 1 +
pages/index/index.wxml | 7 ++++---
pages/index/index.wxss | 18 ++++++++++++++++--
subpages/addResi/pages/addResi/addResi.wxml | 4 ++--
subpages/addResi/pages/addResi/addResi.wxss | 5 +++--
utils/config.js | 4 ++--
6 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/app.wxss b/app.wxss
index d7dda98..c5c0fdc 100644
--- a/app.wxss
+++ b/app.wxss
@@ -14,4 +14,5 @@ page {
--button-danger-background-color: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%);
--button-danger-border-color: 'none';
--calendar-selected-day-background-color: #3E92FF;
+
}
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 0612ac6..bb6a8f2 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -45,8 +45,8 @@
人房信息采集
-
-
+
+
{{collectedHouseCount?collectedHouseCount:'--'}}
录入房屋
@@ -58,7 +58,8 @@
-
+
+
{{collectedPopulationCount?collectedPopulationCount:'--'}}
录入居民
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 2498529..2712379 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -572,6 +572,7 @@
margin-top: 12rpx;
}
.group_4 {
+
width: 309rpx;
height: 290rpx;
background-size: 100% 100%;
@@ -584,6 +585,7 @@
height: 290rpx;
}
.text-group_6 {
+ position: absolute;
width: 114rpx;
height: 80rpx;
display: flex;
@@ -616,12 +618,14 @@
margin: 14rpx 0 0 43rpx;
}
.text-group_7 {
-
+ box-sizing: border-box;
+ position: absolute;
bottom: 20rpx;
right: 75rpx;
display: flex;
flex-direction: column;
- margin: 45rpx 0rpx 20rpx 50rpx ;
+ margin: 0rpx 0rpx 60rpx 50rpx ;
+
}
.text_14 {
width: 113rpx;
@@ -637,6 +641,7 @@
margin-left: 67rpx;
}
.text_15 {
+ box-sizing: border-box;
width: 180rpx;
height: 25rpx;
overflow-wrap: break-word;
@@ -649,6 +654,7 @@
line-height: 36rpx;
margin-top: 14rpx;
margin-left: 35rpx;
+
}
.group_5 {
@@ -1007,3 +1013,11 @@ line-height: 40rpx;
height: 30rpx;
margin-right: 10rpx;
}
+.imge1{
+ width: 309rpx;
+ height: 300rpx;
+}
+.imge2{
+ width: 309rpx;
+ height: 300rpx;
+}
\ No newline at end of file
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index 9c9c7d7..2a1363c 100644
--- a/subpages/addResi/pages/addResi/addResi.wxml
+++ b/subpages/addResi/pages/addResi/addResi.wxml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/subpages/addResi/pages/addResi/addResi.wxss b/subpages/addResi/pages/addResi/addResi.wxss
index 5d40600..dded2b1 100644
--- a/subpages/addResi/pages/addResi/addResi.wxss
+++ b/subpages/addResi/pages/addResi/addResi.wxss
@@ -12,7 +12,8 @@ page {
margin-top: 20rpx;
}
.steps{
- height: 140rpx;
+ height: 140rpx;
+ --van-step-font-size: 30px; /* 设置步骤文本的字体大小为15像素 */
}
.content{
@@ -31,8 +32,8 @@ page {
margin-top: 20rpx;
box-sizing: border-box;
-
}
+
/* .form_height{
height:calc(100vh - 120rpx - 140rpx) ;
margin-top: 20rpx;
diff --git a/utils/config.js b/utils/config.js
index dce6c12..06ba8aa 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -5,8 +5,8 @@ module.exports = {
};
function BASEURL() {
- return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
- // return 'http://192.168.1.144/api/' //测试环境
+ // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
+ return 'http://192.168.1.144/api/' //测试环境
// return 'http://219.146.91.110:30801/api/'
// return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境