diff --git a/README.md b/README.md
new file mode 100644
index 0000000..487c0eb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+ {
+ "pagePath": "pages/information/information",
+ "text": "数据",
+ "iconPath": "images/home/information.png",
+ "selectedIconPath": "images/home/informationSelected.png"
+},
+
+ wx.navigateTo({
+ url: `/subpages/home/pages/webview/webview?url=${global.WEBROOT()}&token=${token}&deptName=${this.data.street}&gridId=${this.data.departmentId}`
+ })
+
+2a43afb52996723c6517edb048de6c79 小程序密钥
+15554200534
+12345678
\ No newline at end of file
diff --git a/app.json b/app.json
index 28c91e0..788154c 100644
--- a/app.json
+++ b/app.json
@@ -6,39 +6,46 @@
"pages/message/message",
"pages/work/work",
"pages/information/information",
- "pages/mine/mine"
+ "pages/mine/mine",
+ "pages/webView/webView"
],
- "subPackages":[
+ "subPackages": [
{
"root": "subpages/addhouse",
"name": "addhouse",
"pages": [
- "pages/addhouse/addhouse"
+ "pages/addhouse/addhouse"
]
- },
- {
+ },
+ {
"root": "subpages/searchResult",
"name": "searchResult",
"pages": [
- "pages/searchResult/searchResult",
- "pages/searchRecords/searchRecords"
+ "pages/searchResult/searchResult",
+ "pages/searchRecords/searchRecords"
]
- },
- {
+ },
+ {
"root": "subpages/addResi",
"name": "addResi",
"pages": [
- "pages/addResi/addResi"
+ "pages/addResi/addResi"
]
- },
- {
+ },
+ {
"root": "subpages/gatherInformation",
"name": "gatherInformation",
"pages": [
- "pages/gatherInformation/gatherInformation"
+ "pages/gatherInformation/gatherInformation"
+ ]
+ },
+ {
+ "root": "subpages/communitySelfInsp",
+ "name": "communitySelfInsp",
+ "pages": [
+ "pages/historyQuery/historyQuery"
]
- }
-
+ }
],
"window": {
"backgroundTextStyle": "light",
@@ -64,7 +71,6 @@
"iconPath": "images/home/work.png",
"selectedIconPath": "images/home/workSelected.png"
},
-
{
"pagePath": "pages/mine/mine",
"text": "我的",
diff --git a/images/message/header_bg.jpg b/images/message/header_bg.jpg
new file mode 100644
index 0000000..d4a1aaf
Binary files /dev/null and b/images/message/header_bg.jpg differ
diff --git a/images/message/header_bg.png b/images/message/header_bg.png
deleted file mode 100644
index 901d521..0000000
Binary files a/images/message/header_bg.png and /dev/null differ
diff --git a/images/share.png b/images/share.png
new file mode 100644
index 0000000..35f382d
Binary files /dev/null and b/images/share.png differ
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8092e71..483a76f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,5 @@
-
+
搜索
@@ -19,7 +19,7 @@
识别身份证查询
-
+
最近查询:
{{item}}
@@ -57,16 +57,16 @@
-
+
\ No newline at end of file
diff --git a/pages/work/work.wxss b/pages/work/work.wxss
index ac85301..be1a47b 100644
--- a/pages/work/work.wxss
+++ b/pages/work/work.wxss
@@ -28,6 +28,9 @@ page {
.font_size_26{
font-size: 26rpx;
}
+ .none{
+ display: none !important;
+ }
.header {
width: 100%;
height: 470rpx;
@@ -95,7 +98,7 @@ page {
width: auto;
background: #F5F5FA;
border-radius: 47rpx;
- padding:0 110rpx 0 69rpx;
+ padding:0 100rpx 0 69rpx;
height: 76rpx;
font-size: 26rpx;
overflow: hidden;
@@ -110,14 +113,16 @@ page {
height: 30rpx;
}
.header .content .inout_box .btn_box{
- width: 69rpx;
+ width: 110rpx;
height: 50rpx;
position: absolute;
- top: 24rpx;
- right:30rpx;
+ top: 15rpx;
+ right:-10rpx;
+ display: flex;
+ align-items: center;
}
.header .content .inout_box .btn_box text{
- width: 69rpx;
+ width: 80rpx;
height: 30rpx;
line-height: 30rpx;
font-size: 28rpx;
diff --git a/project.private.config.json b/project.private.config.json
index e51fbe9..e5a2a4e 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "社区满意度自查",
+ "pathName": "subpages/communitySelfInsp/pages/historyQuery/historyQuery",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "登录",
"pathName": "pages/login/login",
@@ -73,5 +80,6 @@
}
]
}
- }
+ },
+ "libVersion": "2.27.3"
}
\ No newline at end of file
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
new file mode 100644
index 0000000..3379c54
--- /dev/null
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
@@ -0,0 +1,195 @@
+import {getCommunityHouse,getResidentBaseInfo} from "../../../../utils/api"
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ title:'社区满意度自查',
+ tableData:[{
+ monthName: "9",
+ agencyName: "市北",
+ status: 2,
+ personQty: 95,
+ synthesisScore: 45,
+ qrCodeImgUrl: "http://dummyimage.com/400x400",
+ questionnaireUrl: "http://otkchmw.mobi/inquewx"
+ },{
+ monthName: "8",
+ agencyName: "市北",
+ status: 3,
+ personQty: 95,
+ synthesisScore: 45,
+ qrCodeImgUrl: "http://dummyimage.com/400x400",
+ questionnaireUrl: "http://otkchmw.mobi/inquewx"
+
+ },{
+ monthName: "7",
+ agencyName: "市北",
+ status: 3,
+ personQty: 95,
+ synthesisScore: 45,
+ qrCodeImgUrl: "http://dummyimage.com/400x400",
+ questionnaireUrl: "http://otkchmw.mobi/inquewx"
+
+ }],
+ lowerThreshold:'10',
+ loadMoreVisible:false,
+ loadMoreType: "none",
+ nodata:false,
+ pageNo:1,
+ pageSize:10,
+ type:''
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.setData({
+ statusHeight: app.globalData.deviceInfo.statusHeight,
+ navigationHeight: app.globalData.deviceInfo.navigationHeight,
+ share:app.globalData.share,
+ type:options.type,
+ keyWord:options.keyWord
+ })
+ // this.getTable()
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ },
+ getTable(){
+ this.setData({
+ loadMoreVisible: true,
+ nodata: false,
+ loadMoreType: "more",
+ })
+ let parm ={
+ searchKey:this.data.keyWord,
+ pageSize:this.data.pageSize,
+ pageNo:this.data.pageNo
+ }
+ if(this.data.type == 'resi'){
+ getResidentBaseInfo(parm).then(res=>{
+ this.setData({
+ loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
+ tableData: this.data.tableData.concat(res.data.list),
+ })
+ console.log(this.data.loadMoreType);
+ if (this.data.tableData.length == 0) {
+ this.setData({
+ loadMoreVisible: false,
+ nodata: true
+ })
+ }
+ }).catch(err=>{
+ this.setData({
+ loadMoreVisible: false,
+ nodata: true,
+ })
+ })
+ }else{
+ getCommunityHouse(parm).then(res=>{
+ this.setData({
+ loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
+ tableData: this.data.tableData.concat(res.data.list),
+ })
+ console.log(this.data.loadMoreType);
+ if (this.data.tableData.length == 0) {
+ this.setData({
+ loadMoreVisible: false,
+ nodata: true
+ })
+ }
+ }).catch(err=>{
+ console.log(err);
+ })
+ }
+ },
+ onScrollToLower(e){
+ if (this.data.loadMoreType === 'more') {
+ this.setData({
+ loadMoreVisible: true,
+ })
+ this.data.pageNo += 1
+ this.getTable()
+ }
+ },
+ jumpAdd(){
+ if(this.data.type == 'resi'){
+ wx.navigateTo({
+ url: '/subpages/addResi/pages/addResi/addResi',
+ })
+ }else{
+ wx.navigateTo({
+ url: '/subpages/addhouse/pages/addhouse/addhouse',
+ })
+ }
+ },
+ handelClickedit(e){
+ console.log(e);
+ if(this.data.type == 'resi'){
+ wx.navigateTo({
+ url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.resiId}`,
+ })
+ }else{
+ wx.navigateTo({
+ url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.id}`,
+ })
+ }
+
+ },
+ back() {
+ //返回上一级，关闭当前页面
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+})
\ No newline at end of file
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.json b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.json
new file mode 100644
index 0000000..fe24eee
--- /dev/null
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.json
@@ -0,0 +1,7 @@
+{
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "load-more": "../../../../components/loadMore/loadMore",
+ "no-data": "../../../../components/noData/nodata"
+ }
+}
\ No newline at end of file
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
new file mode 100644
index 0000000..d7b4a42
--- /dev/null
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ {{item.agencyName}} {{item.monthName}}
+
+ {{item.status == 2?'进行中':'已结束'}}
+ 测评人数：{{item.synthesisScore}}
+
+
+
+
+ 分享
+
+
+ {{item.synthesisScore}}分
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
new file mode 100644
index 0000000..cd73b21
--- /dev/null
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
@@ -0,0 +1,167 @@
+page {
+ width: 100%;
+ min-height: 100vh;
+ overflow: hidden;
+ background-color: #f7f7f7;
+ }
+ .header {
+ width: 100%;
+ height: 532rpx;
+ background: linear-gradient(180deg, #7DB5FF 0%, #E8F2FF 66%, #F7F7F7 100%);
+}
+
+.header .header-bg {
+ width: 100%;
+ height: 100%;
+ /* position: absolute;
+ z-index: 10;
+ left: 0;
+ top: 0; */
+ position: absolute;
+ height: 100%;
+ z-index: -999;
+}
+
+.header .navigation {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ position: relative;
+ z-index: 1;
+}
+.back {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 20rpx;
+ position: absolute;
+ margin-top: 25rpx;
+ border-radius: 0rpx;
+ z-index: 2;
+}
+.content{
+ height: auto;
+ width: 100%;
+ overflow: hidden;
+ position: relative;
+ top: -380rpx;
+ padding: 0 20rpx;
+ box-sizing: border-box;
+}
+.content .scroll {
+ height: calc(100vh - 450rpx);
+ overflow-y: scroll;
+}
+.content .scroll .card{
+ background-color: #fff;
+ border-radius: 20rpx;
+ box-sizing: border-box;
+}
+.content .card .bgc{
+ background:linear-gradient(531deg, #cfe5f7 0%, #E8F2FF 66%, #F7F7F7 100%);
+ border-radius: 20rpx 20rpx 0 0;
+}
+
+.content .card .list_card{
+ display: flex;
+ justify-content: space-around;
+ padding: 30rpx;
+ align-items: center;
+ color: #333333;
+ border-top: 1px solid #EAEAEA;
+}
+.content .card .list_card .left{
+ flex: 1;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ font-size: 32rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #666666 ;
+}
+.content .card .list_card .left :nth-child(1),
+.content .card .list_card .left :nth-child(2){
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.content .card .list_card .left .left_bto_box{
+ display: flex;
+ font-size: 28rpx;
+ margin-top: 28rpx;
+}
+.content .card .list_card .left .left_bto_box .bule{
+ color: #3A80E7;
+ background-color:#d5e6fa ;
+ width: fit-content;
+ padding: 5rpx 12rpx;
+ box-sizing: border-box;
+ border-radius: 6rpx;
+ font-size: 26rpx;
+ margin-right: 20rpx;
+}
+.content .card .list_card .left .left_bto_box .gray{
+ color: #999999;
+ background-color: #f5f5f5;
+ width: fit-content;
+ padding: 5rpx 12rpx;
+ box-sizing: border-box;
+ border-radius: 6rpx;
+ font-size: 26rpx;
+ margin-right: 20rpx;
+}
+
+.list_card .right .bule{
+ background-color: #3a80e7;
+ color: #fff;
+ padding: 16rpx;
+ font-size: 28rpx;
+ width: fit-content;
+ color:#fff;
+ height: 56rpx;
+ border-radius: 25rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+}
+.list_card .right .score{
+ color: #999;
+ font-size: 24rpx;
+}
+.list_card .right .score b{
+ font-size: 40rpx;
+ font-family: DIN Alternate;
+ font-weight: bold;
+ color: #FF783C;
+}
+.list_card .right image{
+ width: 25rpx;
+ height: 25rpx;
+}
+button{
+ width: 360rpx;
+ height: 76rpx;
+ background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%);
+ border-radius: 76rpx !important;
+ font-size: 32rpx;
+ font-weight: 400 !important;
+ font-family: PingFang SC;
+ color: #FFFFFF;
+ position: fixed;
+ bottom: 63rpx;
+ left: 50%;
+ transform: translateX(-180rpx);
+}
+.fixed_btn{
+ position: fixed;
+ bottom: 30rpx;
+ left: 50%;
+ transform: translateX(-184rpx);
+}
diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss
index b63e58d..f8a2884 100644
--- a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss
+++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss
@@ -95,6 +95,7 @@ page{
.body .scroll .content .item{
height: 150rpx;
display: flex;
+ box-sizing: border-box;
flex-direction: column;
justify-content: space-between;
padding: 30rpx;
diff --git a/subpages/searchResult/pages/searchRecords/searchRecords.wxml b/subpages/searchResult/pages/searchRecords/searchRecords.wxml
index b90a61e..40dd701 100644
--- a/subpages/searchResult/pages/searchRecords/searchRecords.wxml
+++ b/subpages/searchResult/pages/searchRecords/searchRecords.wxml
@@ -9,7 +9,12 @@
搜索
- 搜索历史 清空记录
+
+搜索历史
+
+ 清空记录
+
+
{{item}}
diff --git a/subpages/searchResult/pages/searchRecords/searchRecords.wxss b/subpages/searchResult/pages/searchRecords/searchRecords.wxss
index cb7db57..5b3e218 100644
--- a/subpages/searchResult/pages/searchRecords/searchRecords.wxss
+++ b/subpages/searchResult/pages/searchRecords/searchRecords.wxss
@@ -95,10 +95,11 @@ page {
display: flex;
align-items: center;
color:#d8d8d8 ;
+ font-size: 28rpx;
}
.h2 .right image{
- width: 40rpx;
- height: 40rpx;
+ width: 30rpx;
+ height: 30rpx;
}
.flex{
diff --git a/utils/api.js b/utils/api.js
index 68e7aec..5e64f9c 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -1,11 +1,11 @@
var fly = require('./request.js')
module.exports = {
- getIntelligentMessage:getIntelligentMessage,
+ getIntelligentMessage,
userLoginlog:userLoginlog,
getToken:getToken,
- getResidentBaseInfo:getResidentBaseInfo,
- getCommunityHouse:getCommunityHouse,
- getStaffbasicinfo:getStaffbasicinfo,
+ getResidentBaseInfo,
+ getCommunityHouse,
+ getStaffbasicinfo,
resiAdd:resiAdd,
getNationDictList,
getEducationDictList,
@@ -27,7 +27,8 @@ module.exports = {
updateCommunityHouse,
getClearHouseDeatilById,
getCollect,
- clearMessage
+ clearMessage,
+ getInspRecord
}
// 消息列表
function getIntelligentMessage(param){
@@ -70,11 +71,11 @@ function getNationDictList () {
function getEducationDictList () {
return fly.post('sys/dict/data/education',{ formCode: "resi_base_info" })
}
-// 居民信息(根据当前用户组织id获取下级网格){"agencyId":"7b6f9a9f9f38d5f9fa7ce94a93d6eb28","purpose":"addorupdate"}
+// 居民信息(根据当前用户组织id获取下级网格){"agencyId":"","purpose":""}
function getGridoptionDict (parm) {
return fly.post('gov/org/customergrid/gridoption',parm)
}
-// 居民信息(选择网格获取小区列表) 入参 {"gridId":"86f71d0e4b07b62bceebeaea46ed487f","agencyId":"7b6f9a9f9f38d5f9fa7ce94a93d6eb28"}
+// 居民信息(选择网格获取小区列表) 入参 {"gridId":"","agencyId":""}
function getQuartersOptions (parm) {
return fly.post('actual/base/communityQuarters/listQuartersOptions',parm)
}
@@ -86,7 +87,7 @@ function getBuildingoption (id) {
function getUnitoption (id) {
return fly.post('actual/base/communityBuildingUnit/unitoption',{buildingId:id})
}
-// 居民信息(选择单元获取房屋列表) 入参{"unitId":"1565599765176528897"}
+// 居民信息(选择单元获取房屋列表) 入参{"unitId":""}
function getHouseoption (id) {
return fly.post('actual/base/communityHouse/houseoption',{unitId:id})
}
@@ -117,6 +118,7 @@ function getFamilyInfoDetailById (id) {
function resiEdit (parm) {
return fly.post(`actual/base/residentBaseInfo/update`,parm)
}
+// 工作页面信息采集面板
function getSituation () {
return fly.get(`actual/base/wxcollect/situation`)
}
@@ -136,6 +138,11 @@ function getClearHouseDeatilById (id) {
function updateCommunityHouse (parm) {
return fly.post(`actual/base/communityHouse/updateCommunityHouse`,parm)
}
+// 采集信息列表
function getCollect (parm) {
return fly.post(`message/intelligentMessage/collect/page`,parm)
}
+// 自查记录列表
+function getInspRecord (parm) {
+ return fly.get(`governance/satisfaction/communitySelfInsp/inspRecord/list`,parm)
+}
\ No newline at end of file
diff --git a/utils/config.js b/utils/config.js
index 03cf0b3..1ae6ec5 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -7,7 +7,8 @@ module.exports = {
function BASEURL() {
// return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 正式环境
- return 'https://epmet-preview.elinkservice.cn/api/' // 测试环境
+ // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
+ return 'http://192.168.1.144/api/' //测试环境
}
function WEBROOT() {