diff --git a/README.md b/README.md index 487c0eb..a47dc3c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ wx.navigateTo({ url: `/subpages/home/pages/webview/webview?url=${global.WEBROOT()}&token=${token}&deptName=${this.data.street}&gridId=${this.data.departmentId}` - }) +}) 2a43afb52996723c6517edb048de6c79 小程序密钥 15554200534 diff --git a/app.json b/app.json index 788154c..aac690d 100644 --- a/app.json +++ b/app.json @@ -43,7 +43,11 @@ "root": "subpages/communitySelfInsp", "name": "communitySelfInsp", "pages": [ - "pages/historyQuery/historyQuery" + "pages/historyQuery/historyQuery", + "pages/synthesis/synthesis", + "pages/dissatisfactionDetails/dissatisfactionDetails", + "pages/followUpList/followUpList", + "pages/followUpDetail/followUpDetail" ] } ], diff --git a/images/work/bg.png b/images/work/bg.png new file mode 100644 index 0000000..9d8a642 Binary files /dev/null and b/images/work/bg.png differ diff --git a/images/work/messageBg.png b/images/work/messageBg.png new file mode 100644 index 0000000..1ab5b4d Binary files /dev/null and b/images/work/messageBg.png differ diff --git a/images/work/rightCri.png b/images/work/rightCri.png new file mode 100644 index 0000000..98ae819 Binary files /dev/null and b/images/work/rightCri.png differ diff --git a/pages/mine/mine.js b/pages/mine/mine.js index d1b86f7..01bb905 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -81,5 +81,11 @@ Page({ wx.navigateTo({ url: '/subpages/gatherInformation/pages/gatherInformation/gatherInformation', }) + }, + toFollowUpList(){ + console.log(1); + wx.navigateTo({ + url: '/subpages/communitySelfInsp/pages/followUpList/followUpList', + }) } }) \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index b5ff901..5fccd99 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -23,7 +23,7 @@ - + 我的回访记录 diff --git a/pages/work/work.js b/pages/work/work.js index 84010de..080a1b5 100644 --- a/pages/work/work.js +++ b/pages/work/work.js @@ -49,49 +49,21 @@ Page({ }) }, getInspRecord(){ - // let parm ={ - // pageSize:20, - // pageNo:1 - // } - // getInspRecord(parm).then(res=>{ - // console.log(res); - // }).catch(err=>{ - // wx.hideLoading() - // console.log(err); - // }) - let data = [ - { - monthName:'9', - agencyName:'海伦路社区', - status:2, - personQty:20, - synthesisScore:100, - qrCodeImgUrl:'erweimaurl', - questionnaireUrl:'tupianlianjie' - }, - { - monthName:'8', - agencyName:'海伦路社区', - status:2, - personQty:20, - synthesisScore:100, - qrCodeImgUrl:'erweimaurl', - questionnaireUrl:'tupianlianjie' - }, - { - monthName:'7', - agencyName:'海伦路社区', - status:2, - personQty:20, - synthesisScore:100, - qrCodeImgUrl:'erweimaurl', - questionnaireUrl:'tupianlianjie' - } - ] - this.setData({ - communitySelfInspTop:data.splice(0,1)[0], - communitySelfInspList:data.splice(0,2), + let parm ={ + pageSize:20, + pageNo:1 + } + getInspRecord(parm).then(res=>{ + this.setData({ + communitySelfInspTop:res.data.list.splice(0,1)[0], + communitySelfInspList:res.data.list.splice(0,2), + }) + }).catch(err=>{ + wx.hideLoading() + console.log(err); }) + + }, /** * 生命周期函数--监听页面初次渲染完成 @@ -203,4 +175,9 @@ Page({ url: '/subpages/communitySelfInsp/pages/historyQuery/historyQuery', }) }, + toSynthesis(){ + wx.navigateTo({ + url: '/subpages/communitySelfInsp/pages/synthesis/synthesis', + }) + } }) \ No newline at end of file diff --git a/pages/work/work.wxml b/pages/work/work.wxml index 9c19cfb..200c079 100644 --- a/pages/work/work.wxml +++ b/pages/work/work.wxml @@ -67,7 +67,7 @@ {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查 已提交 {{communitySelfInspTop.personQty}} 人 - 一键分享 查看统计 + 一键分享 查看统计 diff --git a/pages/work/work.wxss b/pages/work/work.wxss index be1a47b..ba47016 100644 --- a/pages/work/work.wxss +++ b/pages/work/work.wxss @@ -325,7 +325,7 @@ page { } .body .bto{ width: 100%; - height: 695rpx; + max-height: 695rpx; background: #FFFFFF; border-radius: 20rpx; box-sizing: border-box; diff --git a/project.private.config.json b/project.private.config.json index e5a2a4e..0415066 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,12 +9,40 @@ "miniprogram": { "list": [ { - "name": "社区满意度自查", + "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=add", + "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", diff --git a/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.js b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.js new file mode 100644 index 0000000..9d60634 --- /dev/null +++ b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.js @@ -0,0 +1,130 @@ +// subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.js +import {getInspResult} from "../../../../utils/api" +Page({ + + /** + * 页面的初始数据 + */ + data: { + tableData:[], + pageNo:1, + pageSize:20, + lowerThreshold:'10', + loadMoreVisible:false, + loadMoreType: "none", + nodata:false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + console.log(options); + this.setData({ + satisfactionCategory:options.category, + inspRecordId:options.inspRecordId + }) + this.getInspResult() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + onScrollToLower(e){ + if (this.data.loadMoreType === 'more') { + this.setData({ + loadMoreVisible: true, + }) + this.data.pageNo += 1 + this.getInspResult() + } + }, + getInspResult(){ + this.setData({ + loadMoreVisible: true, + nodata: false, + loadMoreType: "more", + }) + let parm = { + inspRecordId:this.data.inspRecordId, + satisfactionCategory:this.data.satisfactionCategory, + satisfactionLevel:'bad', + pageNo:this.data.pageNo, + pageSize:this.data.pageSize + } + if(!parm.type) delete parm.type + getInspResult(parm).then(res=>{ + this.setData({ + loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none', + tableData: this.data.tableData.concat(res.data.list), + }) + if (this.data.tableData.length == 0) { + this.setData({ + loadMoreVisible: false, + nodata: true + }) + } + }).catch(err=>{ + console.log(err); + this.setData({ + loadMoreVisible: false, + nodata: true, + }) + }) + }, + handleClickPhone(e){ + wx.makePhoneCall({ + phoneNumber: e.currentTarget.dataset.mobile, + }) + }, + toFollowUpDetails(e){ + console.log(JSON.stringify(e.currentTarget.dataset.item)); + wx.navigateTo({ + url: `/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail?resiInfo=${JSON.stringify(e.currentTarget.dataset.item)}`, + }) + }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.json b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.json new file mode 100644 index 0000000..96212af --- /dev/null +++ b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "load-more": "../../../../components/loadMore/loadMore", + "no-data": "../../../../components/noData/nodata" + }, + "navigationBarTitleText": "不满意结果明细" +} \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml new file mode 100644 index 0000000..7703ec0 --- /dev/null +++ b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxml @@ -0,0 +1,19 @@ + + + + + + {{item.reporterName}} {{item.reporterMobile}} + 打电话 回访记录 + + {{ item.followUpStatus!= null?item.followUpStatus == -1 ?'不接受回访':item.followUpStatus == 1 ?'已回访':'接受回访/未回访':'--' }} + + + 不满意原因：{{item.reason}} + + + + + + + \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxss b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxss new file mode 100644 index 0000000..571aa3d --- /dev/null +++ b/subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxss @@ -0,0 +1,80 @@ +/* subpages/communitySelfInsp/pages/dissatisfactionDetails/dissatisfactionDetails.wxss */ +page { + width: 100%; + min-height: 100vh; + overflow-y: scroll; + background-color: #f7f7f7; + } + .red, + .blue{ + font-size: 28rpx; + color: #fff; + padding: 8rpx 20rpx ; + border-radius: 40rpx; + box-sizing: border-box; + margin-right: 16rpx; + } + .red{ + background-color: #ff783c; + } + .blue{ + background-color: #4f94ff; + } + .blue_small, + .red_small{ + font-size: 26rpx; + width: fit-content; + padding: 8rpx 16rpx; + border-radius: 40rpx; + box-sizing: border-box; + height: 40rpx; + line-height: 20rpx; + margin: 24rpx 0 ; + + } + .blue_small{ + background-color: #eef4fd; + color: #5693EE; + } + .red_small{ + background-color: #fff1eb; + color: #FF783C; + } +.content{ + width: 100%; + padding:0 20rpx ; + box-sizing: border-box; +} +.content .scroll { + height: calc(100vh - 100rpx); + overflow-y: scroll; +} +.content .card{ + width: 100%; + background-color: #fff; + display: flex; + height: 236rpx; + flex-direction: column; + border-radius: 20rpx; + padding: 30rpx 30rpx; + box-sizing: border-box; + margin-top: 20rpx; + overflow: hidden; + color: #333; + +} +.content .card .title{ + display: flex; + justify-content: space-between; +} +/* */ +.content .card .bottom{ + border-bottom: 2rpx #EAEAEA solid; + padding-bottom: 20rpx; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + width: 100%; /* 根据实际情况调整 */ + max-height: 100rpx; /* 根据字体大小和行高调整 */ + min-height:50rpx ; +} \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js new file mode 100644 index 0000000..9b4bfaf --- /dev/null +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js @@ -0,0 +1,106 @@ +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + resiInfo:{}, + title:'回访记录', + formType:'add', + followUpWayList:[ + { + label:'电话回访', + value:'1' + }, + { + label:'上门回访', + value:'2' + } + ], + form:{ + + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + console.log(JSON.parse(options.resiInfo)); + this.setData({ + statusHeight: app.globalData.deviceInfo.statusHeight, + navigationHeight: app.globalData.deviceInfo.navigationHeight, + formType:options.type + }) + if(options.type == 'add'){ + this.setData({ + resiInfo:JSON.parse(options.resiInfo), + }) + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + bindPickerChangefollowUpWay(e){ + const selectedIndex = e.detail.value; + const selectedVillage = this.data.followUpWayList[selectedIndex]; + this.setData({ + 'form.followUpWay': selectedVillage.label, + }); + }, + handleChangeRadio(e){ + console.log(e); + }, + back(){ + wx.navigateBack({ + delta: 1 + }) + } +}) \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.json b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.json new file mode 100644 index 0000000..cf3facb --- /dev/null +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.json @@ -0,0 +1,4 @@ +{ + "navigationStyle": "custom", + "usingComponents": {} +} \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml new file mode 100644 index 0000000..0250365 --- /dev/null +++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml @@ -0,0 +1,50 @@ + + + + {{title}} + + + + + + 马魁 177777777777 + 河南省鹤壁市 + + + 不满意原因：aacece + + + + 填写回访记录 + + + 回访方式 + + + + + {{followUpWayName?followUpWayName:'请选择'}} + + + + + + + 回访情况记录 + +