From d8d851a348b682d3c5b2af391f723aa76e50e279 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 7 Oct 2023 14:01:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=9F=E4=B8=80=E6=94=BE?= =?UTF-8?q?=E5=A4=A7,=E8=AF=89=E6=B1=82=E6=91=B8=E6=8E=92bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/addResi/pages/addResi/addResi.wxml | 2 +- .../addhouse/pages/addhouse/addhouse.wxml | 2 +- .../pages/followUpDetail/followUpDetail.js | 12 +++++- .../pages/followUpDetail/followUpDetail.wxml | 2 +- .../pages/followUpDetail/followUpDetail.wxss | 2 +- .../pages/historyQuery/historyQuery.wxml | 2 +- .../pages/historyQuery/historyQuery.wxss | 2 +- .../pages/synthesis/synthesis.wxml | 2 +- .../pages/synthesis/synthesis.wxss | 2 +- .../dissatisfied/demandCheck/demandCheck.js | 40 ++++++++++++------- .../dissatisfied/searchResi/searchResi.js | 2 +- .../pages/searchRecords/searchRecords.wxml | 2 +- .../pages/searchRecords/searchRecords.wxss | 2 +- .../pages/searchResult/searchResult.wxml | 2 +- .../pages/searchResult/searchResult.wxss | 2 +- utils/api.js | 7 +++- 16 files changed, 56 insertions(+), 29 deletions(-) diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml index cb5a9a3..cd4435f 100644 --- a/subpages/addResi/pages/addResi/addResi.wxml +++ b/subpages/addResi/pages/addResi/addResi.wxml @@ -1,6 +1,6 @@ - + {{formType == 'edit'?'修改居民信息':'新增居民信息'}} diff --git a/subpages/addhouse/pages/addhouse/addhouse.wxml b/subpages/addhouse/pages/addhouse/addhouse.wxml index e68d67d..cf62fe1 100644 --- a/subpages/addhouse/pages/addhouse/addhouse.wxml +++ b/subpages/addhouse/pages/addhouse/addhouse.wxml @@ -1,6 +1,6 @@ - + {{formType == 'edit'?'修改房屋信息':'新增房屋信息'}} diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js index 819c751..070f050 100644 --- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js @@ -40,6 +40,7 @@ Page({ navigationHeight: app.globalData.deviceInfo.navigationHeight, formType:options.type }) + this.getFollowUpDetail(temp.id) if(options.type == 'add'){ this.setData({ resiInfo:temp, @@ -58,7 +59,16 @@ Page({ } }, - + getFollowUpDetail(id){ + api.getFollowUpDetail(id).then(res=>{ + console.log(res); + this.setData({ + 'resiInfo.reasons':res.data.categoryAndReasons + }) + }).catch(err=>{ + console.log(err); + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml index 3286728..c61d623 100644 --- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml @@ -1,5 +1,5 @@ - + {{title}} diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss index 78df86c..d3607b2 100644 --- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss @@ -48,7 +48,7 @@ page { height: 30rpx; margin-left: 20rpx; position: absolute; - margin-top: 25rpx; + margin-top: 20rpx; border-radius: 0rpx; z-index: 2; } diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml index 12b8da0..3d89ab8 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml @@ -1,5 +1,5 @@ - + {{title}} diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss index f8d85e8..bbb31f0 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss @@ -36,7 +36,7 @@ page { height: 30rpx; margin-left: 20rpx; position: absolute; - margin-top: 25rpx; + margin-top: 20rpx; border-radius: 0rpx; z-index: 2; } diff --git a/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml b/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml index 6502d38..5e885f7 100644 --- a/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml +++ b/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml @@ -1,6 +1,6 @@ - + 社区满意度自查 diff --git a/subpages/communitySelfInsp/pages/synthesis/synthesis.wxss b/subpages/communitySelfInsp/pages/synthesis/synthesis.wxss index 2216db2..ce80e74 100644 --- a/subpages/communitySelfInsp/pages/synthesis/synthesis.wxss +++ b/subpages/communitySelfInsp/pages/synthesis/synthesis.wxss @@ -42,7 +42,7 @@ page { height: 30rpx; margin-left: 20rpx; position: absolute; - margin-top: 25rpx; + margin-top: 20rpx; border-radius: 0rpx; z-index: 101; } diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js index b66518d..66ace68 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js @@ -13,7 +13,6 @@ Page({ */ data: { fmData: { - time: '', gridId: '', attachmentList:[],//图片 voiceList:[], @@ -23,8 +22,6 @@ Page({ happenTime:"", content:"",//内容 address:"",//地址 - wantServiceTime:"", - reportType:'' }, minDate: '2018-01-01 00:00:00', @@ -90,7 +87,6 @@ Page({ this.reverseLocation() this.setData({ - 'fmData.time': Date.now(), angencyId:app.globalData.user.agencyId, reportUserName:app.globalData.user.realName, reportUserMobile:app.globalData.user.phone, @@ -154,6 +150,7 @@ Page({ longitude: res.longitude, latitude: res.latitude }, + addressContent:res.address }); console.log(this.data.fmData); } @@ -295,12 +292,11 @@ Page({ const para = this.data.fmData console.log(para,'事件'); api.addEvent(para).then(res => { - wx.hideLoading() console.log(res); if (res.code === 0) { wx.showModal({ title: '提示', - content: `您的诉求我们已经查收，正在快马加鞭办理，请您耐心等待`, + content: `提交成功`, confirmText: '确认', showCancel: false, success: res => { @@ -315,7 +311,6 @@ Page({ showTime:'', resiName:'', resiMobile:'', - 'fmData.time':'', 'fmData.gridId':'', 'fmData.attachmentList':[],//图片 'fmData.voiceList':[], @@ -324,14 +319,17 @@ Page({ 'fmData.resiId':"", 'fmData.happenTime':"", 'fmData.content':"",//内容 - 'fmData.address':"",//地址 'fmData.wantServiceTime':"", 'fmData.reportType':'' }) + wx.switchTab({ + url: '/pages/work/work', + }) } }) wx.removeStorageSync('resiDetail') } else { + console.log('提交失败'); wx.showToast({ title: "提交失败，请重试~", icon: "none", @@ -343,11 +341,18 @@ Page({ } }).catch(err => { console.log(err) - wx.hideLoading() + wx.showToast({ + title: "提交失败，请重试~", + icon: "none", + duration: 1500 + }) this.setData({ submitDisabled: false }) }) + setTimeout(function(){ + wx.hideLoading() + },1000) }, // 个性服务提交 submitMeasure(){ @@ -375,12 +380,11 @@ Page({ } console.log(para,'服务'); api.addMeasure(para).then(res => { - wx.hideLoading() console.log(res); if (res.data) { wx.showModal({ title: '提示', - content: `您的需求我们已经查收，正在快马加鞭办理，请您耐心等待`, + content: `提交成功`, confirmText: '确认', showCancel: false, success: res => { @@ -398,7 +402,6 @@ Page({ categoryName:'', reportTypeName:'', showWantServiceTimeTime:'', - 'fmData.time':'', 'fmData.gridId':'', 'fmData.attachmentList':[],//图片 'fmData.voiceList':[], @@ -407,10 +410,12 @@ Page({ 'fmData.resiId':"", 'fmData.happenTime':"", 'fmData.content':"",//内容 - 'fmData.address':"",//地址 'fmData.wantServiceTime':"", 'fmData.reportType':'' }) + wx.switchTab({ + url: '/pages/work/work', + }) } }) wx.removeStorageSync('resiDetail') @@ -426,11 +431,18 @@ Page({ } }).catch(err => { console.log(err) - wx.hideLoading() + wx.showToast({ + title: "提交失败，请重试~", + icon: "none", + duration: 1500 + }) this.setData({ submitDisabled: false }) }) + setTimeout(function(){ + wx.hideLoading() + },1000) }, // 双向绑定 内容输入框 bindTextareaInput(e) { diff --git a/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js b/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js index b99bce5..d407759 100644 --- a/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js +++ b/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js @@ -37,7 +37,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.getTable() + // this.getTable() this.getQuartersOptions() }, diff --git a/subpages/searchResult/pages/searchRecords/searchRecords.wxml b/subpages/searchResult/pages/searchRecords/searchRecords.wxml index 40dd701..ff89cb7 100644 --- a/subpages/searchResult/pages/searchRecords/searchRecords.wxml +++ b/subpages/searchResult/pages/searchRecords/searchRecords.wxml @@ -1,5 +1,5 @@ - + 搜索历史 diff --git a/subpages/searchResult/pages/searchRecords/searchRecords.wxss b/subpages/searchResult/pages/searchRecords/searchRecords.wxss index 5b3e218..00ee76d 100644 --- a/subpages/searchResult/pages/searchRecords/searchRecords.wxss +++ b/subpages/searchResult/pages/searchRecords/searchRecords.wxss @@ -75,7 +75,7 @@ page { height: 30rpx; margin-left: 20rpx; position: absolute; - margin-top: 25rpx; + margin-top: 20rpx; border-radius: 0rpx; z-index: 2; } diff --git a/subpages/searchResult/pages/searchResult/searchResult.wxml b/subpages/searchResult/pages/searchResult/searchResult.wxml index deae625..7a64816 100644 --- a/subpages/searchResult/pages/searchResult/searchResult.wxml +++ b/subpages/searchResult/pages/searchResult/searchResult.wxml @@ -1,6 +1,6 @@ - + {{title}} diff --git a/subpages/searchResult/pages/searchResult/searchResult.wxss b/subpages/searchResult/pages/searchResult/searchResult.wxss index b1895dd..3518d1b 100644 --- a/subpages/searchResult/pages/searchResult/searchResult.wxss +++ b/subpages/searchResult/pages/searchResult/searchResult.wxss @@ -37,7 +37,7 @@ page { height: 30rpx; margin-left: 20rpx; position: absolute; - margin-top: 25rpx; + margin-top: 20rpx; border-radius: 0rpx; z-index: 2; } diff --git a/utils/api.js b/utils/api.js index ff11011..2841631 100644 --- a/utils/api.js +++ b/utils/api.js @@ -39,7 +39,8 @@ module.exports = { addEvent, getResidentBaseInfoPage, getDemandoption, - addMeasure + addMeasure, + getFollowUpDetail } // 消息列表 function getIntelligentMessage(param){ @@ -202,3 +203,7 @@ function getDemandoption (parm) { function addMeasure(parm) { return fly.post(`governance/userdemand/add`,parm) } +// 获取不满意原因 +function getFollowUpDetail(id) { + return fly.get(`governance/satisfaction/communitySelfInsp/followUp/detail/${id}`) +}