-
+
+
+
+
+
+ 修改密码
+
+
+
+
+
+
+ 使用指南
+
+
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 34688cf..b824cec 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -4,15 +4,17 @@ page{
width: 100%;
background-color: #f7f7f7;
+
}
.header {
width: 100%;
- height: 470rpx;
+ height: 370rpx;
/* position: fixed;
top: 0;
left: 0;
z-index: 1000; */
- background: linear-gradient(180deg, #7DB5FF 0%, #F7F7F7 100%);
+ /* background: linear-gradient(180deg, #7DB5FF 0%, #F7F7F7 100%); */
+ background: #3973F6;
overflow: hidden;
}
.header .navigation {
@@ -20,7 +22,7 @@ page{
display: flex;
align-items: center;
justify-content: center;
- color: #333333;
+ color: #fdfdfd;
font-size: 32rpx;
position: relative;
z-index: 100;
@@ -54,14 +56,15 @@ page{
.header .content .right .top b{
font-size: 36rpx;
font-family: PingFang SC;
- color: #000000;
+ color: #ffffff;
}
.header .content .right .top text{
margin-left: 19rpx;
padding-left: 19rpx;
height: 31rpx;
font-size: 30rpx;
- border-left: 1rpx solid #333333 ;
+ border-left: 1rpx solid #fffefe ;
+ color: #ffffff;
}
.header .content .right .bto{
display: flex;
@@ -73,10 +76,10 @@ page{
height: 46rpx;
display: flex;
align-items: center;
- background: #FFFFFF;
+ /* background: #FFFFFF; */
border-radius: 46rpx;
font-size: 28rpx;
- color: #999;
+ color: rgb(255, 255, 255);
margin-right: 10rpx;
}
.header .content .right .bto image{
@@ -86,9 +89,11 @@ page{
}
.body{
padding: 0 20rpx;
- height: auto;
- position: relative;
- top: -120rpx;
+ /* height: auto; */
+ /* position: relative; */
+ /* top: -120rpx; */
+ margin-top: 30rpx;
+
}
.body .card {
background-color: #ffffff;
@@ -104,7 +109,18 @@ page{
padding: 0 30rpx;
box-sizing: border-box;
}
+.text-wrapper_24 {
+background-color: #84ACF0;
+border-radius: 0;
+}
+.text_63 {
+overflow-wrap: break-word;
+color: rgb(255, 255, 255);
+font-family: PingFang-SC-Medium;
+white-space: nowrap;
+margin-left: 5rpx;
+}
.body .card .item::before{
content: "";
position: absolute;
diff --git a/project.config.json b/project.config.json
index 8873c38..9c610f9 100644
--- a/project.config.json
+++ b/project.config.json
@@ -5,30 +5,36 @@
"include": []
},
"setting": {
- "bundle": false,
- "userConfirmedBundleSwitch": false,
- "urlCheck": true,
- "scopeDataCheck": false,
- "coverView": true,
+ "urlCheck": false,
"es6": true,
+ "enhance": true,
"postcss": true,
- "compileHotReLoad": false,
- "lazyloadPlaceholderEnable": false,
"preloadBackgroundData": false,
"minified": true,
- "autoAudits": false,
"newFeature": false,
+ "coverView": true,
+ "nodeModules": false,
+ "autoAudits": false,
+ "showShadowRootInWxmlPanel": true,
+ "scopeDataCheck": false,
"uglifyFileName": false,
+ "checkInvalidKey": true,
+ "checkSiteMap": true,
"uploadWithSourceMap": true,
- "useIsolateContext": true,
- "nodeModules": false,
- "enhance": true,
+ "compileHotReLoad": false,
+ "lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
- "showShadowRootInWxmlPanel": true,
- "packNpmManually": true,
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
+ },
"enableEngineNative": false,
+ "useIsolateContext": false,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": true,
"packNpmRelationList": [
{
"packageJsonPath": "./package.json",
@@ -36,25 +42,19 @@
}
],
"minifyWXSS": true,
- "showES6CompileOption": false,
+ "disableUseStrict": false,
"minifyWXML": true,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "condition": false,
- "ignoreUploadUnusedFiles": true,
- "compileWorklet": false
+ "showES6CompileOption": false,
+ "useCompilerPlugins": false
},
"compileType": "miniprogram",
"libVersion": "2.19.4",
"appid": "wxaf87b420b87e2d79",
"projectname": "miniprogram-92",
- "condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 4
},
+ "condition": {},
"simulatorPluginLibVersion": {}
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 5c550fa..8b23685 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -5,6 +5,7 @@
"compileHotReLoad": true,
"urlCheck": false
},
+ "libVersion": "2.19.6",
"condition": {
"miniprogram": {
"list": [
@@ -37,249 +38,225 @@
"name": "subpages/statistics/pages/residentPortrait2/residentPortrait",
"pathName": "subpages/statistics/pages/residentPortrait2/residentPortrait",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/addResi/pages/addResi/addResi",
"pathName": "subpages/addResi/pages/addResi/addResi",
"query": "type=edit&resiId=1704759123301355521",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/addResi/pages/addResi/addResi",
"pathName": "subpages/addResi/pages/addResi/addResi",
"query": "type=edit&resiId=1704759138283409410",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/searchResult/pages/punchCard/punchCard",
"pathName": "subpages/searchResult/pages/punchCard/punchCard",
"query": "resiId=1704759138283409410",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/addResi/pages/addResi/addResi",
"pathName": "subpages/addResi/pages/addResi/addResi",
"query": "type=edit&resiId=1736923526105554946",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/addResi/pages/addResi/addResi",
"pathName": "subpages/addResi/pages/addResi/addResi",
"query": "type=edit&resiId=1704759138283409410",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/statistics/pages/demand/detail/detail",
"pathName": "subpages/statistics/pages/demand/detail/detail",
"query": "id=1726875931996110850&type=2",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/statistics/pages/demand/detail/detail",
"pathName": "subpages/statistics/pages/demand/detail/detail",
"query": "id=1726875931996110850&type=2",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/statistics/pages/demand/detail/detail",
"pathName": "subpages/statistics/pages/demand/detail/detail",
"query": "id=1730039765330636802&type=1",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/statistics/pages/demand/detail/detail",
"pathName": "subpages/statistics/pages/demand/detail/detail",
"query": "id=1730039765330636802&type=1",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/statistics/pages/event/detail/detail",
"pathName": "subpages/statistics/pages/event/detail/detail",
"query": "id=1717777356023885826",
- "launchMode": "default",
"scene": null
},
{
"name": "subpages/statistics/pages/problem/problem",
"pathName": "subpages/statistics/pages/problem/problem",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "subpages/statistics/pages/event/detail/detail",
"query": "id=%7B%22name%22%3A%22%E5%BC%A0%E4%B8%89%22%2C%22mobile%22%3A%22173****7327%22%2C%22satisfactionSource%22%3A%22satisfaction_community%22%2C%22createdTime%22%3A%222023-12-12%2016%3A05%22%2C%22satisfactionCategoryName%22%3A%22%E7%AC%AC%E4%B8%80%E7%BD%91%E6%A0%BC%22%2C%22reason%22%3A%22%E6%9D%91%E5%89%8D%E7%9A%84%E8%80%81%E5%AE%85%E6%9C%89%E4%B8%AA%E9%A5%AD%E5%BA%97%EF%BC%8C%E6%83%B3%E8%A6%81%E6%89%A9%E5%BB%BA%E4%BA%8C%E5%B1%82%EF%BC%8C%E5%91%A8%E8%BE%B9%E6%9D%91%E6%B0%91%E9%83%BD%E4%B8%8D%E5%90%8C%E6%84%8F%EF%BC%8C%E8%AF%A5%E5%B1%85%E6%B0%91%E6%83%B3%E8%87%AA%E8%A1%8C%E5%8A%A0%E9%AB%98%EF%BC%8C%E5%AF%B9%E6%AD%A4%E4%B8%8D%E6%BB%A1%EF%BC%8C%E8%A6%81%E6%B1%82%E5%81%9C%E6%AD%A2%E5%BB%BA%E8%AE%BE%EF%BC%8C%E5%B8%8C%E6%9C%9B%E8%B4%A3%E4%BB%BB%E9%83%A8%E9%97%A8%E5%B0%BD%E5%BF%AB%E8%90%BD%E5%AE%9E%E8%AF%A5%E4%BF%A1%E6%81%AF%C2%B7%C2%B7%C2%B7%22%7D",
- "launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "subpages/statistics/pages/event/list/list",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "pages/statistics/statistics",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "pages/webView/webView",
"query": "url=https://epmet-preview.elinkservice.cn/questionnaire/s/8ac9e858e42b4d87bc15812e60e930c4?agencyId=1691779171481239553&anonymous=1",
- "launchMode": "default",
"scene": null
},
{
"name": "身份识别",
"pathName": "subpages/OCRCard/pages/index/index",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "修改密码",
"pathName": "subpages/settings/pages/changePassword/changePassword",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "回访记录详情",
"pathName": "subpages/communitySelfInsp/pages/followUpDetail/followUpDetail",
"query": "resiInfo={\"periodStart\":\"2023-09-01\",\"createdTime\":\"2023-09-11\",\"reporterName\":\"老王5\",\"reporterMobile\":\"18500000005\",\"followUpWay\":\"0\",\"followUpStatus\":1,\"evaCulturalFacility\":\"veryGood\",\"evaSportsFacility\":\"veryGood\",\"evaEcologicalEnv\":\"bad\",\"evaSocialSecurity\":\"bad\",\"evaSocialAssistance\":\"good\",\"evaOldPeopleProvide\":\"good\",\"evaBasicEducation\":\"veryGood\",\"evaMedical\":\"veryGood\",\"reason\":\"aa\",\"id\":\"1701199625473716226\",\"status\":1,\"addressDetail\":null}&type=edit",
- "launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "pages/index/index",
"query": "",
- "launchMode": "default",
"scene": 1011
},
{
"name": "查询结果",
"pathName": "subpages/searchResult/pages/searchResult/searchResult",
"query": "type=resi&keyWord=张三",
- "launchMode": "default",
"scene": null
},
{
"name": "设置",
"pathName": "subpages/settings/pages/index/index",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "选择居民",
"pathName": "subpages/demandCheck/pages/dissatisfied/searchResi/searchResi",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "诉求摸排",
"pathName": "subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "回访记录",
"pathName": "subpages/communitySelfInsp/pages/followUpList/followUpList",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "不满意结果明细",
"pathName": "subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails",
"query": "category=ecologicalEnv&inspRecordId=1701186272096722946",
- "launchMode": "default",
"scene": null
},
{
"name": "社区满意度(历史自查)",
"pathName": "subpages/communitySelfInsp/pages/historyQuery/historyQuery",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "社区满意度自查(统计)",
"pathName": "subpages/communitySelfInsp/pages/synthesis/synthesis",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "登录",
"pathName": "pages/login/login",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "pages/index/index",
"query": "",
- "launchMode": "default",
"scene": 1017
},
{
"name": "新增居民",
"pathName": "subpages/addResi/pages/addResi/addResi",
"query": "type=edit&resiId=1695348130663325697",
- "launchMode": "default",
"scene": null
},
{
"name": "新增房屋",
"pathName": "subpages/addhouse/pages/addhouse/addhouse",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "搜索记录",
"pathName": "subpages/searchResult/pages/searchRecords/searchRecords",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "我的",
"pathName": "pages/mine/mine",
"query": "",
- "launchMode": "default",
"scene": null
},
{
"name": "采集信息",
"pathName": "subpages/gatherInformation/pages/gatherInformation/gatherInformation",
"query": "",
- "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "subpages/searchResult/pages/ceshi/ceshi",
+ "query": "resiId=1704759138283409410",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "subpages/searchResult/pages/cheshi/cheshi",
+ "query": "resiId=1704759138283409410",
"scene": null
}
]
}
- },
- "libVersion": "2.19.6"
+ }
}
\ No newline at end of file
diff --git a/subpages/searchResult/pages/cheshi/cheshi.js b/subpages/searchResult/pages/cheshi/cheshi.js
new file mode 100644
index 0000000..7b67e57
--- /dev/null
+++ b/subpages/searchResult/pages/cheshi/cheshi.js
@@ -0,0 +1,90 @@
+// subpages/searchResult/pages/cheshi/cheshi.js
+import {userXiangQ} from "../../../../utils/api"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ value: '',
+ jiChu:{},
+ edit: false,
+ nationality:'',
+ document:'',
+ documentNum:'',
+ phon:'',
+ weare:'',
+ age:'',
+ bristy:'',
+ merea:''
+ },
+
+ loadData: function (id) {
+ userXiangQ(id).then((res)=>{
+ console.log(11111, res);
+ this.setData({
+ 'jiChu': res.data,
+ 'documentNum':res.data.baseInfoDto.idNum,
+ 'phon':res.data.baseInfoDto.mobile,
+ 'age':res.data.baseInfoDto.genderName,
+ 'bristy': res.data.baseInfoDto.birthday,
+ 'merea':res.data.baseInfoDto.nationName
+ });
+ console.log(11111, this.data.jiChu);
+ }).catch(err=>{
+ console.log(222222, err);
+ });
+},
+// 生命周期函数--监听页面加载
+onLoad: function (options) {
+ const id = "1752963649818288129";
+ this.loadData(id); // 调用自定义函数
+},
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/subpages/searchResult/pages/cheshi/cheshi.json b/subpages/searchResult/pages/cheshi/cheshi.json
new file mode 100644
index 0000000..a6d026e
--- /dev/null
+++ b/subpages/searchResult/pages/cheshi/cheshi.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "基础信息"
+}
\ No newline at end of file
diff --git a/subpages/searchResult/pages/cheshi/cheshi.wxml b/subpages/searchResult/pages/cheshi/cheshi.wxml
new file mode 100644
index 0000000..d394017
--- /dev/null
+++ b/subpages/searchResult/pages/cheshi/cheshi.wxml
@@ -0,0 +1,157 @@
+
+
+
+
+
+ {{jiChu.baseInfoDto.name}}
+
+ 信息完整度：
+ 40%
+
+
+ 编辑
+
+
+
+
+ 群众{{kong}}
+
+
+ {{kong}}
+
+
+
+ 地址：
+ {{jiChu.baseInfoDto.resideInfos[0].homeName}}
+
+
+ 创建时间：
+ {{jiChu.baseInfoDto.createdTime}}
+
+
+ 最新更新时间：
+ {{jiChu.baseInfoDto.updatedTime}}
+
+
+
+
+ 基础信息（10/10)
+
+ 拓展信息 （
+ 3/4 )
+
+ 关系图谱
+
+
+
+
+ 残疾信息 （
+ 0/3 ）
+
+
+ 大病信息 （3)
+
+ 变更记录（2）
+
+
+
+ 业务记录（1）
+
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+ *
+
+ 国籍
+
+
+ 中国{{kong}}
+
+
+
+ *
+
+ 证件类型
+
+
+ 身份证{{kong}}
+
+
+
+
+ *
+
+ 证件号
+
+
+ {{documentNum}}
+
+
+
+
+ *
+
+ 联系电话
+
+
+ {{phon}}
+
+
+
+
+
+ 文化程度
+
+
+ {{kong}}
+
+
+
+
+
+ 性别
+
+
+ {{age}}
+
+
+
+
+ 出生日期
+
+
+ {{bristy}}
+
+
+
+
+ 民族
+
+
+ {{merea}}
+
+
+
+
+
+
+
+
+
+
+ 上报诉求
+ 满意度调查
+ 走访打卡
+
+
diff --git a/subpages/searchResult/pages/cheshi/cheshi.wxss b/subpages/searchResult/pages/cheshi/cheshi.wxss
new file mode 100644
index 0000000..29a0346
--- /dev/null
+++ b/subpages/searchResult/pages/cheshi/cheshi.wxss
@@ -0,0 +1,791 @@
+/* subpages/searchResult/pages/punchCard/punchCard.wxss */
+/**index.wxss**/
+page {
+ width: 100%;
+ min-height: 100vh;
+ overflow: hidden;
+ overflow-y: scroll;
+ background-color: #f7f7f7;
+ padding: 0 20rpx;
+ box-sizing: border-box;
+}
+.card{
+ background-color: #fff;
+ border-radius: 20rpx;
+ display: flex;
+ flex-direction: column;
+ min-height: 350rpx;
+ margin-top: 20rpx;
+ padding: 30rpx 30rpx 40rpx;
+}
+.title{
+ margin-left: 10px;
+}
+.card .title{
+ position: relative;
+ font-size: 34rpx;
+ z-index: 1;
+}
+/* .card .title::after{
+ position: absolute;
+ left: -30rpx;
+ top: 8rpx;
+ content: " ";
+ width: 10rpx;
+ height: 28rpx;
+ /* background-color: #3A80E7; */
+/* } */
+.card {
+position: relative;
+padding-left: 10px; /* 为了给阴影留出空间 */
+
+}
+
+
+.info{
+ margin-top: 6rpx;
+}
+.info .item{
+ display: flex;
+ margin-top: 28rpx;
+}
+.info .item .label{
+ width: fit-content;
+}
+.punch{
+ width: 260rpx;
+ height: 260rpx;
+ background: linear-gradient(180deg,#5E9FFF, #3A80E7);
+ box-shadow: 0rpx 4rpx 35rpx 0rpx rgba(61,139,248,0.48);
+ color: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50%;
+ margin: 50rpx auto 0;
+}
+
+.address{
+ color: #666666;
+ font-size: 28rpx ;
+ margin: 0 auto;
+ margin: 40rpx auto 30rpx;
+}
+
+@keyframes rotateAnimation {
+ 0% {
+ transform: rotateY(0deg);
+ }
+ 100% {
+ transform: rotateY(180deg);
+ }
+}
+
+.animate {
+ animation: rotateAnimation 2s forwards;
+}
+.btn{
+ padding: 0 85rpx;
+ box-sizing: border-box;
+ min-width: 364rpx;
+ text-align: center;
+ height: 76rpx;
+ border-radius: 38rpx;
+ margin: 30rpx auto 0;
+ line-height: 76rpx;
+ border-radius: 76rpx;
+}
+
+.blue{
+ color:#3A80E7 ;
+ border: 2rpx solid #3A80E7;
+
+}
+.yellow{
+ color: #FF783C;
+ border: 2rpx solid #FF783C;
+}
+.green{
+ color: #13C8BD;
+ border: 2rpx solid #13C8BD;
+}
+
+.flex-sb {
+ display: flex;
+ justify-content: space-between;
+ border-left: 5px solid blue;
+}
+.view {
+ color: #999;
+ font-size: 24rpx;
+}
+.jm-btn {
+ position: absolute;
+ top: 30rpx;
+ right: 20rpx;
+ width: 146rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ background: #3A80E7;
+ border-radius: 28rpx;
+ color: #fff;
+ text-align: center;
+ font-size: 28rpx;
+}
+.card {
+ position: relative;
+}
+
+
+
+/* subpages/searchResult/pages/cheshi/cheshi.wxss */
+.text_2 {
+width: 66rpx;
+height: 32rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 34rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 41rpx;
+margin-top: 4rpx;
+}
+
+.text-wrapper_1 {
+width: 243rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+font-size: 0; /* 小程序中不支持设置为 0 */
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+margin: 8rpx 0 0 35rpx;
+}
+
+.text_3 {
+width: 243rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(153, 153, 153, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+}
+
+.text_4 {
+width: 243rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(4, 184, 173, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Bold;
+font-weight: 700;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+}
+
+.text-wrapper_2 {
+background-color: rgba(57, 116, 246, 1);
+border-radius: 28rpx;
+height: 56rpx;
+margin-left: 185rpx;
+width: 120rpx;
+}
+
+.text_5 {
+width: 59rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(255, 255, 255, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+margin: 14rpx 0 0 31rpx;
+}
+.box_4 {
+width: 176rpx;
+height: 36rpx;
+/* margin-left: 30rpx; */
+display: flex;
+align-items: center;
+margin-top: 10rpx;
+}
+
+.text-wrapper_24 {
+background-color: rgba(236, 236, 236, 0.5);
+border-radius: 4rpx;
+height: 36rpx;
+width: 60rpx;
+}
+
+.text_63 {
+width: 45rpx;
+height: 23rpx;
+overflow-wrap: break-word;
+color: rgba(153, 153, 153, 1);
+font-size: 24rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 42rpx;
+margin: 7rpx 0 0 8rpx;
+}
+
+.text-wrapper_25 {
+margin-left: 10rpx;
+background-color: rgba(236, 236, 236, 0.5);
+border-radius: 4rpx;
+height: 36rpx;
+width: 110rpx;
+}
+
+.text_64 {
+width: 94rpx;
+height: 23rpx;
+overflow-wrap: break-word;
+color: rgba(153, 153, 153, 1);
+font-size: 24rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 42rpx;
+margin: 7rpx 0 0 8rpx;
+}
+.text-wrapper_5{
+margin-top: 20rpx;
+}
+.text-wrapper_5,
+.text-wrapper_6,
+.text-wrapper_7{
+width: 639rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+font-size: 0;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+margin: 24rpx 0 0 0;
+/* display: flex; */
+/* text-align: left; */
+}
+
+.text_9,
+.text_11,
+.text_13 {
+width: 476rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+white-space: nowrap;
+line-height: 40rpx;
+
+}
+
+.text_8 {
+width: 639rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(153, 153, 153, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+}
+
+.text_10 {
+width: 476rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(153, 153, 153, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+}
+
+.text_12 {
+width: 537rpx;
+height: 28rpx;
+overflow-wrap: break-word;
+color: rgba(153, 153, 153, 1);
+font-size: 30rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 40rpx;
+}
+
+.image_3 {
+width: 650rpx;
+height: 1rpx;
+margin: 30rpx 0 0 31rpx;
+}
+.box_5,
+.box_6 {
+width: 649rpx;
+height: 32rpx;
+margin: 30rpx 0 0 30rpx;
+display: flex;
+margin-left: 0;
+}
+
+.text_14 {
+width: 245rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(57, 116, 246, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Bold;
+font-weight: 700;
+text-align: right;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text-wrapper_8 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+font-size: 0; /* 小程序中不支持设置为 0 */
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: right;
+white-space: nowrap;
+line-height: 45rpx;
+margin: 1rpx 0 0 45rpx;
+}
+
+.text_15,
+.text_16,
+.text_17,
+.text_18 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+.text_19 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text_20 {
+width: 121rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: right;
+white-space: nowrap;
+line-height: 45rpx;
+margin-left: 45rpx;
+}
+
+.block_4 {
+background-color: rgba(57, 116, 246, 1);
+border-radius: 2rpx;
+width: 246rpx;
+height: 6rpx;
+margin: 10rpx 100rpx 0 12rpx;
+}
+
+
+
+.text-wrapper_9 {
+width: 194rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+font-size: 0; /* 小程序中不支持设置为 0 */
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: right;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text_21,
+.text_22 {
+width: 194rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+.text_23 {
+width: 194rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text_24 {
+width: 194rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(242, 114, 37, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text_25 {
+width: 194rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text-wrapper_10 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+font-size: 0; /* 小程序中不支持设置为 0 */
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: right;
+white-space: nowrap;
+line-height: 45rpx;
+margin-left: 45rpx;
+}
+
+.text_26,
+.text_27,
+.text_28 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+.text_29 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(28, 185, 175, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text_30 {
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(4, 184, 173, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+.china{
+ position: absolute;
+ left: 90.4pt;
+}
+.text_31,
+.text_33{
+width: 193rpx;
+height: 31rpx;
+overflow-wrap: break-word;
+color: rgba(51, 51, 51, 1);
+font-size: 32rpx;
+font-family: PingFang-SC-Medium;
+font-weight: 500;
+text-align: left;
+white-space: nowrap;
+line-height: 45rpx;
+}
+
+.text_33{
+text-align: right;
+margin: 1rpx 0 0 39rpx;
+}
+
+
+/* subpages/addResi/pages/addResi/addResi.wxss */
+page {
+width: 100%;
+min-height: 100vh;
+overflow-y: auto;
+background-color: #f7f7f7;
+}
+.gray{
+color: #C1C1C1;
+}
+.m-top20{
+margin-top: 20rpx;
+}
+.asterisk {
+ color: red;
+ margin-right: 11rpx;
+ position: absolute; /* 开启绝对定位 */
+ left: 15rpx; /* 将星号放置在左侧 */
+}
+.header {
+width: 100%;
+height: 444rpx;
+overflow: hidden;
+/* position: fixed;
+top: 0;
+left: 0;
+z-index: 1000; */
+}
+.header .header-bg {
+width: 100%;
+height: 444rpx;
+position: absolute;
+height: 100%;
+z-index: -999;
+}
+.back {
+width: 30rpx;
+height: 30rpx;
+margin-left: 20rpx;
+position: absolute;
+margin-top: 20rpx;
+border-radius: 0rpx;
+z-index: 101;
+}
+.header .navigation {
+width: 100%;
+display: flex;
+align-items: center;
+justify-content: center;
+color: #333333;
+font-size: 32rpx;
+position: relative;
+z-index: 100;
+}
+.header .content{
+margin: 160rpx 0 0 50rpx;
+}
+.header .content .h2{
+font-size: 44rpx;
+font-family: PingFang SC;
+font-weight: 800;
+color: #333333;
+margin-bottom: 28rpx;
+}
+.header .content .tag{
+width: 200rpx;
+height: 50rpx;
+position: relative;
+line-height: 48rpx;
+font-size: 28rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #94A6C2;
+padding-left: 15rpx;
+}
+.header .content .tag b {
+color: #FF2A00;
+}
+.header .content .tag image {
+width: 170rpx;
+height: 50rpx;
+position: absolute;
+top: 0;
+left: 0;
+z-index: -888;
+}
+.content{
+width: 100%;
+height: auto;
+padding: 0 20rpx;
+box-sizing: border-box;
+position: relative;
+top: -30rpx;
+}
+.form_card {
+background-color: #fff;
+border-radius: 10rpx;
+padding: 0 30rpx;
+box-sizing: border-box;
+height: auto;
+margin-left: 0rpx;
+}
+.form_card > .title{
+height: 90rpx;
+line-height: 90rpx;
+font-size: 34rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #333333;
+position: relative;
+}
+.form_card .title .tag{
+width: 10rpx;
+height: 28rpx;
+background: #3A80E7;
+border-radius: 4rpx;
+position: absolute;
+left: -30rpx;
+top: 50%;
+transform: translateY(-14rpx);
+}
+.form_card .form_item{
+display: flex;
+align-items: center;
+border-top: 1px solid #EAEAEA;
+height: 100rpx;
+}
+.form_card .form_house{
+height: 139rpx;
+display: flex;
+flex-direction: column;
+}
+.form_card .form_house .form_bottom{
+font-size: 24rpx;
+color:#C1C1C1;
+position: relative;
+top: -10rpx;
+}
+/* .form_card .form_house .form_bottom text{
+color:#3A80E7 ;
+} */
+.form_card .form_item .label{
+min-width: 130rpx;
+height: 100%;
+line-height: 100rpx;
+font-size: 32rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #666666;
+position: relative;
+}
+.form_card .form_item .label .must{
+font-size: 32rpx;
+font-weight: 500;
+color: #FF2A00;
+position: absolute;
+left: -18rpx;
+top: 50%;
+transform: translateY(-50rpx);
+}
+.form_card .form_item .input{
+flex: 1;
+display: flex;
+justify-content: space-around;
+align-items: center;
+margin-left: 51rpx;
+overflow: hidden;
+
+}
+.form_card .form_item .input .residentCategorySty{
+flex: 1;
+overflow: hidden;
+text-overflow: ellipsis;
+white-space: nowrap;
+}
+.form_card .form_item .input picker,
+.form_card .form_item .input input{
+flex: 1;
+}
+.form_card .form_item .input image{
+height: 22rpx;
+width: 22rpx;
+}
+.btn-container {
+display: flex;
+justify-content: space-around;
+width: 100%;
+margin-top: 30rpx;
+}
+
+.bottom_btn {
+width: 200rpx;
+height: 86rpx;
+background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%);
+border-radius: 43rpx;
+text-align: center;
+color: rgb(0, 0, 0);
+line-height: 86rpx;
+}
+.bottom_btn1 {
+width: 200rpx;
+height: 86rpx;
+background:#fff;
+border-radius: 43rpx;
+text-align: center;
+color: rgb(8, 8, 8);
+line-height: 86rpx;
+}
+
+.text-right {
+text-align: right!important;
+justify-content: flex-end!important;
+}
+.horizontal-line {
+border-bottom: 1px solid black; /* 设置水平线的样式和颜色 */
+width: 100%; /* 设置水平线的宽度 */
+margin: 10px 0; /* 可选：设置水平线的上下间距 */
+}
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index ec890b6..e48fea4 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -90,7 +90,13 @@ function clearMessage() {
function userLoginlog(para) {
return fly.post('auth/gov/loginbypassword', para)
}
-
+/**
+ *人员详情
+ */
+function userXiangQ(id) {
+ // return fly.get('actual/base/residentIntegratedInfo/detail/masked/${id}', para)
+ return fly.get(`actual/base/residentIntegratedInfo/detail/masked/${id}`)
+}
// 获取token
function getToken(para) {
return fly.post('auth/gov/loginwxmp/loginbywxcode', para)