diff --git a/README.md b/README.md index f65b22e..3696382 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,7 @@ 2a43afb52996723c6517edb048de6c79 小程序密钥 15554200534 +12345678 + +18900000002 12345678 \ No newline at end of file diff --git a/app.js b/app.js index 485f0f5..0144990 100644 --- a/app.js +++ b/app.js @@ -30,6 +30,7 @@ App({ navigationHeight: 40 }, user:{}, - share:false + share:false, + keyWord:"" } }) diff --git a/app.json b/app.json index 18b1811..f472aa5 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,14 @@ "pages/xqwmz/xqwmz", "pages/yxwxfw/yxwxfw" ] + }, + { + "root": "subpages/demandCheck", + "name": "demandCheck", + "pages": [ + "pages/dissatisfied/demandCheck/demandCheck" + + ] } ], "window": { @@ -71,11 +79,13 @@ "navigationBarTitleText": "WeChat", "navigationBarTextStyle": "black" }, + "tabBar": { "color": "#333333", "selectedColor": "#3A80E7", "backgroundColor": "#FFFFFF", "borderStyle": "white", + "custom": true, "list": [ { "pagePath": "pages/index/index", diff --git a/images/mine/sz.png b/images/mine/sz.png new file mode 100644 index 0000000..b176cac Binary files /dev/null and b/images/mine/sz.png differ diff --git a/images/work/bg.png b/images/work/bg.png index 9d8a642..944a808 100644 Binary files a/images/work/bg.png and b/images/work/bg.png differ diff --git a/images/work/center.png b/images/work/center.png index fb93807..7b30ef7 100644 Binary files a/images/work/center.png and b/images/work/center.png differ diff --git a/images/work/jg.png b/images/work/jg.png new file mode 100644 index 0000000..242e340 Binary files /dev/null and b/images/work/jg.png differ diff --git a/images/work/sqmp.png b/images/work/sqmp.png new file mode 100644 index 0000000..d0ded6d Binary files /dev/null and b/images/work/sqmp.png differ diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 8a62fc7..0843bc5 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -8,7 +8,7 @@ - + 忘记密码 diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 509ccb7..b8ab35d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -26,17 +26,18 @@ - 我的回访记录 + 我回访的居民 - + - - 修改密码 + + 我摸排的诉求 + @@ -44,6 +45,13 @@ + + + + 设置 + + + diff --git a/pages/work/work.js b/pages/work/work.js index cd2fe06..d27819a 100644 --- a/pages/work/work.js +++ b/pages/work/work.js @@ -124,6 +124,7 @@ Page({ this.setData({ keyWord: e.detail.value }) + app.globalData.keyWord = e.detail.value }, handelClickSearch(e){ if(!this.data.keyWord) { @@ -133,8 +134,9 @@ Page({ }) return } + app.globalData.keyWord = this.data.keyWord wx.navigateTo({ - url: `/subpages/searchResult/pages/searchResult/searchResult?type=${this.data.setlectVal}&keyWord=${this.data.keyWord}`, + url: `/subpages/searchResult/pages/searchResult/searchResult?type=${this.data.setlectVal}`, }) console.log(this.data.setlectVal); if(this.data.setlectVal == 'house'){ @@ -196,5 +198,10 @@ Page({ }); } }); - } + }, + toDemandCheck(){ + wx.navigateTo({ + url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck', + }) + } }) \ No newline at end of file diff --git a/pages/work/work.wxml b/pages/work/work.wxml index 0d43250..945db3b 100644 --- a/pages/work/work.wxml +++ b/pages/work/work.wxml @@ -11,8 +11,8 @@ - - 搜索 + + 搜索 @@ -35,28 +35,29 @@ 采集记录 > - 关注官方公众号，可接受重要消息提醒。 + 采集更新人房信息需先通过上方进行查询 房屋采集情况 - {{realEstateCount}}实有房屋数 - {{pendingHouseCount}}待采集 - {{collectedHouseCount}}采集房屋数 + {{realEstateCount?realEstateCount:'--'}}实有房屋数 + {{pendingHouseCount?pendingHouseCount:'--'}}待采集 + {{collectedHouseCount?collectedHouseCount:'--'}}采集房屋数 人口采集情况 - {{populationCount}}辖区人口数 - {{pendingPopulationCount}}待采集 - {{collectedPopulationCount}}采集人口数 + {{populationCount?populationCount:'--'}}辖区人口数 + {{pendingPopulationCount?pendingPopulationCount:'--'}}待采集 + {{collectedPopulationCount?collectedPopulationCount:'--'}}采集人口数 + 满意度自查 @@ -66,7 +67,7 @@ {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查 - 已提交 {{communitySelfInspTop.personQty}} 人 + 已提交 {{communitySelfInspTop.personQty?communitySelfInspTop.personQty:'--'}} 人 一键分享 查看统计 diff --git a/pages/work/work.wxss b/pages/work/work.wxss index 93ceba7..b2b41b2 100644 --- a/pages/work/work.wxss +++ b/pages/work/work.wxss @@ -465,6 +465,11 @@ page { color: #999999; margin-top: 29rpx; } +.body .center_img{ + height: 130rpx; + width: 100%; + margin-top: 20rpx; +} .list_card .right b{ font-size: 40rpx; font-family: DIN Alternate; diff --git a/project.private.config.json b/project.private.config.json index 2ef10ce..bbbc93a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -109,5 +109,5 @@ ] } }, - "libVersion": "2.28.1" + "libVersion": "3.0.2" } \ No newline at end of file diff --git a/subpages/addhouse/pages/addhouse/addhouse.js b/subpages/addhouse/pages/addhouse/addhouse.js index d491645..652cfa4 100644 --- a/subpages/addhouse/pages/addhouse/addhouse.js +++ b/subpages/addhouse/pages/addhouse/addhouse.js @@ -96,7 +96,7 @@ Page({ this.setData({ statusHeight: app.globalData.deviceInfo.statusHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight, - agencyId:'7b6f9a9f9f38d5f9fa7ce94a93d6eb28',//app.globalData.user.agencyId + agencyId:app.globalData.user.agencyId, 'form.agencyId':app.globalData.user.agencyId, 'form.agencyName':app.globalData.user.agencyName, formType:options.type, diff --git a/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml index 7703ec0..cd8aaca 100644 --- a/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml +++ b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml @@ -9,7 +9,7 @@ {{ item.followUpStatus!= null?item.followUpStatus == -1 ?'不接受回访':item.followUpStatus == 1 ?'已回访':'接受回访/未回访':'--' }} - 不满意原因：{{item.reason}} + 不满意原因：{{item.reason?item.reason:'--'}} diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml index 8726891..3286728 100644 --- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml @@ -11,7 +11,7 @@ {{resiInfo.addressDetail?resiInfo.addressDetail:'--'}} - 不满意原因：{{resiInfo.reason}} + 不满意原因：{{resiInfo.reason?resiInfo.reason:'--'}} @@ -39,8 +39,8 @@ 是否还为不满意风险人员 - 否 是 + 否 diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js new file mode 100644 index 0000000..f29956f --- /dev/null +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js @@ -0,0 +1,67 @@ +import { $wuxActionSheet } from '../../../../../components/dist/index' + +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.json b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.json new file mode 100644 index 0000000..3928faa --- /dev/null +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml new file mode 100644 index 0000000..5456114 --- /dev/null +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -0,0 +1,244 @@ + + + + + + * + 事件位置 + + + {{addressContent}} + + + + + + + + 详细地址 + + + + + + + + + + + * + 所属街道 + + + + {{personalInfo.street}} + 请选择 + + + + + + + + * + 所属社区 + + + + {{personalInfo.community}} + 请选择 + + + + + + + + * + 所属网格 + + + + {{personalInfo.grid}} + 请选择 + + + + + + + + * + 是否公开 + + + + 不公开 + 公开 + + + + + + + * + 联系人姓名 + + + + + + + + + + * + 手机号 + + + + + + + + + + * + 手机号 + + + + + + + + + + * + 验证码 + + + + + + + + {{getMobileType === 'wx' ? '*如若获取手机号异常，请点击切换至手机号/验证码注册方式' : '*点击可切回至从微信获取手机号注册方式'}} + + + + + + + * + 问题描述 + + + + + + + + + + + + + + + + + + + + + + + + + + + {{recorderTimeCur}} + {{recorderTimeMax}} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss new file mode 100644 index 0000000..d0fe8c8 --- /dev/null +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss @@ -0,0 +1,158 @@ +/* subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss */ +.content { + width: 100%; + min-height: calc(100vh - 100rpx); + margin-top: 100rpx; + } + + .personal-info { + width: 100%; + height: 100%; + box-sizing: border-box; + padding: 0 20rpx; + overflow: hidden; + } + .basic-info { + width: 100%; + background: #fff; + border-radius: 16rpx; + box-sizing: border-box; + padding: 0 20rpx; + margin-top: 20rpx; + } + + .item { + border-bottom: 1rpx solid #e7eeee; + padding: 25rpx 0; + line-height: 60rpx; + display: flex; + justify-content: space-between; + } + .item .field { + position: relative; + box-sizing: border-box; + width: 300rpx; + padding-left: 25rpx; + } + + .field-d { + width: 220rpx !important; + } + .value-d{ + width: 450rpx !important; + } + .item .field.mobile-field { + width: 250rpx !important; + } + .item .field .must { + position: absolute; + top: 0; + left: 0; + margin: 0 auto; + color: #F61616; + font-size: 30rpx; + } + + .item .field .field-text { + font-size: 32rpx; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333; + } + + .item .value { + position: relative; + width: 410rpx; + display: flex; + font-size: 32rpx; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333; + line-height: 60rpx; + } + + .item .value-dl { + position: relative; + width: 410rpx; + display: flex; + font-size: 32rpx; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333; + line-height: 60rpx; + align-items: center; + } + + .di-name{ + margin-right: 14rpx; + text-align: right; + width: calc(100% - 30rpx); + } + + .di-but{ + width: 30rpx; + height: 34rpx; + } + + .item .value input { + text-align: right; + font-size: 34rpx; + color: #333; + height: 100%; + width: 100%; + } + .item .value .picker { + position: relative; + width: 100%; + padding-right: 40rpx; + text-align: right; + } + + .item .value .picker .z-weak { + color: #999; + } + + .item .value .picker .menu-arrow { + position: absolute; + top: 20rpx; + right: 0; + width: 16rpx; + height: 23rpx; + } + .item .value-mobile { + position: relative; + width: 410rpx; + display: flex; + font-size: 32rpx; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333; + line-height: 60rpx; + display: flex; + justify-content: flex-end; + } + .item .value-mobile .get-code { + padding: 0 15rpx; + height: 60rpx; + line-height: 60rpx; + background: linear-gradient(to right, #F40C0C, #FF4E4E); + color: #fff; + font-size: 24rpx; + border-radius: 6rpx; + margin: 0; + margin-left: 25rpx; + } + .item .value-mobile .button-hover { + background: rgb(175, 1, 1); + } + .item .value-mobile input { + text-align: right; + font-size: 34rpx; + color: #333; + height: 100%; + width: 55%; + } + .placeholder-style { + font-size: 28rpx; + color: #999; + } \ No newline at end of file diff --git a/subpages/searchResult/pages/searchResult/searchResult.js b/subpages/searchResult/pages/searchResult/searchResult.js index 248ca82..545acbd 100644 --- a/subpages/searchResult/pages/searchResult/searchResult.js +++ b/subpages/searchResult/pages/searchResult/searchResult.js @@ -1,5 +1,5 @@ // subpages/searchResult/pages/searchResult/searchResult.js -import api, {getCommunityHouse,getResidentBaseInfo} from "../../../../utils/api" +import {getCommunityHouse,getResidentBaseInfo} from "../../../../utils/api" const app = getApp() Page({ @@ -15,21 +15,24 @@ Page({ nodata:false, pageNo:1, pageSize:10, - type:'' + type:'', + keyWord:"" }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + console.log(options); this.setData({ statusHeight: app.globalData.deviceInfo.statusHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight, share:app.globalData.share, title:options.type =='resi'?'居民查询结果':'房屋查询结果', type:options.type, - keyWord:options.keyWord + keyWord:app.globalData.keyWord }) + console.log(this.data.keyWord,'dataK'); this.getTable() }, @@ -44,14 +47,16 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + console.log(this.data.keyWord,'show'); }, /** * 生命周期函数--监听页面隐藏 */ onHide() { - + this.setData({ + keyWord: '' //或者其他默认值 + }); }, /** @@ -163,9 +168,8 @@ Page({ }, back() { - //返回上一级，关闭当前页面 - wx.navigateBack({ - delta: 1 - }) + wx.switchTab({ + url: '/pages/work/work', + }) }, }) \ No newline at end of file diff --git a/subpages/searchResult/pages/searchResult/searchResult.wxml b/subpages/searchResult/pages/searchResult/searchResult.wxml index 234d6a2..deae625 100644 --- a/subpages/searchResult/pages/searchResult/searchResult.wxml +++ b/subpages/searchResult/pages/searchResult/searchResult.wxml @@ -7,7 +7,7 @@ - 查询关键字: {{keyWord}} + 查询关键字: {{keyWord}} 您可以对查询出的居民信息进行修改编辑,也可以点击底部按钮新增居民信息 diff --git a/utils/config.js b/utils/config.js index 1ae6ec5..f262e68 100644 --- a/utils/config.js +++ b/utils/config.js @@ -7,8 +7,8 @@ module.exports = { function BASEURL() { // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 正式环境 - // 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/' //测试环境 } function WEBROOT() { diff --git a/utils/request.js b/utils/request.js index 6232fd6..ffd6200 100644 --- a/utils/request.js +++ b/utils/request.js @@ -29,6 +29,10 @@ const request = function (url, options) { }) reject(response.data) } + }else if(response.statusCode === 10007 || response.statusCode == 1024 || response.statusCode == 2003){ + wx.redirectTo({ + url: '/pages/login/login', + }) } else { wx.showToast({ title: '网络问题，请稍后再试。',