From 3e7f3330f3e8f9daedfdf654b66a78397353833b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 30 Aug 2023 17:39:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2,=E9=87=87?= =?UTF-8?q?=E9=9B=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 8 + components/dist/calendar/index.wxml | 2 +- images/mine/avater.png | Bin 0 -> 3087 bytes images/mine/cj.png | Bin 0 -> 4778 bytes images/mine/gy.png | Bin 0 -> 8785 bytes images/mine/hf.png | Bin 0 -> 8092 bytes images/mine/lz.png | Bin 0 -> 5164 bytes images/mine/password.png | Bin 0 -> 3832 bytes images/mine/wgz.png | Bin 0 -> 2974 bytes pages/index/index.js | 8 +- pages/mine/mine.js | 25 ++- pages/mine/mine.json | 2 +- pages/mine/mine.wxml | 48 ++++- pages/mine/mine.wxss | 118 +++++++++++- project.private.config.json | 14 ++ subpages/addResi/pages/addResi/addResi.wxml | 11 +- .../gatherInformation/gatherInformation.js | 181 ++++++++++++++++++ .../gatherInformation/gatherInformation.json | 9 + .../gatherInformation/gatherInformation.wxml | 44 +++++ .../gatherInformation/gatherInformation.wxss | 146 ++++++++++++++ .../gatherInformation/pages/images/del.png | Bin 0 -> 600 bytes .../gatherInformation/pages/images/down.png | Bin 0 -> 418 bytes utils/api.js | 8 +- utils/config.js | 7 +- 24 files changed, 606 insertions(+), 25 deletions(-) create mode 100644 images/mine/avater.png create mode 100644 images/mine/cj.png create mode 100644 images/mine/gy.png create mode 100644 images/mine/hf.png create mode 100644 images/mine/lz.png create mode 100644 images/mine/password.png create mode 100644 images/mine/wgz.png create mode 100644 subpages/gatherInformation/pages/gatherInformation/gatherInformation.js create mode 100644 subpages/gatherInformation/pages/gatherInformation/gatherInformation.json create mode 100644 subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml create mode 100644 subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss create mode 100644 subpages/gatherInformation/pages/images/del.png create mode 100644 subpages/gatherInformation/pages/images/down.png diff --git a/app.json b/app.json index 2d545f8..fbd5b69 100644 --- a/app.json +++ b/app.json @@ -30,7 +30,15 @@ "pages": [ "pages/addResi/addResi" ] + }, + { + "root": "subpages/gatherInformation", + "name": "gatherInformation", + "pages": [ + "pages/gatherInformation/gatherInformation" + ] } + ], "window": { "backgroundTextStyle": "light", diff --git a/components/dist/calendar/index.wxml b/components/dist/calendar/index.wxml index b8c791b..b7ba60e 100644 --- a/components/dist/calendar/index.wxml +++ b/components/dist/calendar/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/images/mine/avater.png b/images/mine/avater.png new file mode 100644 index 0000000000000000000000000000000000000000..5cef5575a681496f15a9ccea5bfec77c418373f1 GIT binary patch literal 3087 zcmV+q4Dj=bP)Px=$w@>(RCr$1TWOSBMHT+OTdy}JA&hJ;0U^G-Z~uUb9O6f-F{1B%xGwl%;>26V*X3G@Tj2k_c0K+Rm^wO|K4eKCSr%pC7vVMW~$MF@? zVF5eD>$Xr#6JnYXGhvtm;&B2ufpT$qQU3OJ=i4>{w)wVA?sL_X0Xqgj&VZ{RxKW_@ zux6GeaRWtjGD{Tm3^*J_2;)VQOZnv+KE=K)n4^7KCSb}L)>+Mkr$BHV)K;mNiyZtN z?MQAkh7SsRid8=bU_XPqpy={Tp8Xu3Z6#J_0?dpZODiWB?dt~IK(Xbl+TU79rdeML zxRb#xBy=8)U+V8Fe4k{dUY3b~$xFi-5$s|BqQ=vl_iLI>zMXbHm!Bo(&wyDir~Jrs zrxgF17C$us#WO2M(fhMZ+%l;}E7As>2zwPdp5&(?Tv%RIxGYVKrU{6<{1(e9XPe=j zrZ~}=zc)>wiMF*|FxS-1C-9SjuEJ-U9TH6u@Ydg1(0ffsdYRgwg1IynZmpACP=*U{T>i;|+`Kf1XB%;-8t1nov1HXJ zI0S|r2OA*|5B}=(SO^_3nVvC?W&~R!uOfkws2CFNPpZ6PBS*iaDZJ0@XKL$;nJ~u#w1|N?}V?d z33?&?Bx}*?W`Z?qW6q8?Wd~>>qTq_eFNi(_W0B-Ws$JeJRx@_VT0v`<1(Y{G-&I^Y z+UG?CB;$T*_mt{d!pBf7b3Di3?hLyN-`t#lrQ!XC;PWo3w56Egb8ZXqI@@5cANtCtCYDfw_p6h; zT+I)p_8-H+i+dA+CE?=YF2e+rmR0vM)hopNx3nXOGCv)N_6IcA4m?0=K(I=z+LrHx zI(I8gjwmnA_a;N2v@|>ih6=r3)@s5Qa6j|5YpXb8`P1<}Ms`c9*xtECLKMnf#gh{P zic7=$j9BDq{x7Y7n+x_gjgqc4Q4b|}fIeE)3ck;|-Dy}Bb`^JJT(|d8$;T2Bt?o7@ZoxI?h zoX0;ixIv^w;xrfeOuH}>``}P%D@!7+ z_>lGtl|RdZ;l=GC#OW;clpl=(cX+N+`$t-!T9Dh;`P%!^`nA*EyWCZ|sJ0<3rsX)* zOsIGNIL4fW&*86>TblZIY;QX-#hoXW0 zE32!QUAiV(-wX+h=j3-gX?Ac}Tr7Jg#MARGFJDlf1X(Ypzi9?{q)l9xK%Nh@Mu6Bc zaVcx8;1?WHINBGMaS2mOAoyV3w)mgySL$+VLwRXux_e5jYB?T4n zNPR*zOhDEl5LL8Oit@pF4f^VS`8|%A<%X+D*R9u^7hYd!s=j#R5v8N1ZH2)~F{nqZ zteo5Xm>(`;jE<=q{48Kp_x)Ho4iAB>A3>972eaVNdIX3Fet2kb(CqDlT^@c`A3Of~ z%C%4STeX=U@P_R{( zIy0@9Nh#9-9jxrWRFBFHX^-wUZHLzcR(oyh1rg#f1z!GAv|pV27b1Uk+Soqt-ati9 z*j1c4SQ6_Amn#su3?(sNaFZED?}aiEJN(xkv9eLG%2G8paa|yC@u~430ZXcLjQUgY zet6}UrXi8p*3RM3_*gNGUshYv^?4s%ACOOF!BFRJ6UYY!y7PY=aV`)(Xda8RYW!4P z5iXhwaLm0ymPE(&F#`1%-swLcfG2kl+$6g(#Dh2RCE zQ;|z(mR)MS81d>AhHEC3N;?fnZ8tj{E%lVoFk(lEbaARg|4)oH2zp>xA9feMINZTT z=AP(&^WlSPJgOb)&l+vJoUoOiB+8p1&-Ee;;&D(=%zA`{0<#L%X3D>A zx>@4zO_)Ui`O&e&(2WSqM8MDt(Xq60oWV{v%1wk{p0+mMD7kv?W5J_&o=jpM!7ukO zDqPs?9ih>fnF$yIiuJ{zuP!G12{5cy$**Xa*6>9en)u?RRu{l=E)5svrTCqf?Be9; z?R%u8t{G)<^Q>>vtxDBSa=E5qm4Ka zhN+t_Pv57&!!WFqoIdHpQlD5jczK$|4p%Hs(wb}oVwwQcjo5Y5<>|+0xCtVc{7+w= zt~XvMEqQ)B@A3zjA(r9IfZ;U;yo_R#%s468@X`8A*+<}M5Dyu+mc+fzSAW~Lcyg*E due9Hl{{W)@vCie)=iLAR002ovPDHLkV1kZ){WJgo literal 0 HcmV?d00001 diff --git a/images/mine/cj.png b/images/mine/cj.png new file mode 100644 index 0000000000000000000000000000000000000000..a8d6d418e721d501cbcd052b1e93ea40ae806309 GIT binary patch literal 4778 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 Us)zKvTmS$707*qoM6N<$f*MMcOaK4? literal 0 HcmV?d00001 diff --git a/pages/index/index.js b/pages/index/index.js index 0d073ef..4e2872b 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -16,15 +16,15 @@ Page({ }, // 事件处理函数 - onLoad() { + onLoad: async function () { this.setData({ statusHeight: app.globalData.deviceInfo.statusHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight, share:app.globalData.share }) - this.getToken() - this.getIntelligentMessage() - this.getStaffbasicinfo() + await this.getToken() + await this.getIntelligentMessage() + await this.getStaffbasicinfo() }, onScrollToLower(e){ diff --git a/pages/mine/mine.js b/pages/mine/mine.js index c553b9a..d1b86f7 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -1,18 +1,29 @@ // pages/mine/mine.js +const app = getApp() + Page({ /** * 页面的初始数据 */ data: { - + statusHeight:'', + navigationHeight:'', + agencyName:'', + userName:'' }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + this.setData({ + statusHeight: app.globalData.deviceInfo.statusHeight, + navigationHeight: app.globalData.deviceInfo.navigationHeight, + share:app.globalData.share, + agencyName:app.globalData.user.agencyName, + userName:app.globalData.user.realName + }) }, /** @@ -26,7 +37,10 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.setData({ + agencyName:app.globalData.user.agencyName, + userName:app.globalData.user.realName + }) }, /** @@ -62,5 +76,10 @@ Page({ */ onShareAppMessage() { + }, + handelInformation(){ + wx.navigateTo({ + url: '/subpages/gatherInformation/pages/gatherInformation/gatherInformation', + }) } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 9f5c5e2..7af8b0a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "我的" + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index d236877..b5ff901 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -1,2 +1,48 @@ -pages/mine/mine.wxml + + + 我的 + + + + + {{userName}} {{agencyName}} + + 网格长 + 楼长 + + + + + + + + + + 我采集的信息 + + + + + + + 我的回访记录 + + + + + + + 修改密码 + + + + + + + 关于 + + + + + diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 91eea05..9489e24 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -1 +1,117 @@ -/* pages/mine/mine.wxss */ \ No newline at end of file +/* pages/mine/mine.wxss */ +page{ + height: 100vh; + width: 100%; + background-color: #f7f7f7; + +} +.header { + width: 100%; + height: 470rpx; + /* position: fixed; + top: 0; + left: 0; + z-index: 1000; */ + background: linear-gradient(180deg, #7DB5FF 0%, #F7F7F7 100%); + overflow: hidden; +} +.header .navigation { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + color: #333333; + font-size: 32rpx; + position: relative; + z-index: 100; +} +.header .navigation image{ + width: 34rpx; + height: 34rpx; + margin-right: 17rpx; +} +.header .content{ + margin:80rpx 0 0; + height: 130rpx; + width: 100%; + padding: 0 30rpx; + box-sizing: border-box; + display: flex; + justify-content: space-around; +} +.header .content .left image{ + width: 120rpx; + height: 120rpx; + border-radius: 50%; +} +.header .content .right{ + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + padding-left: 30rpx; +} +.header .content .right .top b{ + font-size: 36rpx; + font-family: PingFang SC; + color: #000000; +} +.header .content .right .top text{ + margin-left: 19rpx; + padding-left: 19rpx; + height: 31rpx; + font-size: 30rpx; + border-left: 1rpx solid #333333 ; +} +.header .content .right .bto{ + display: flex; + margin-top: 20rpx; +} +.header .content .right .bto view{ + width: fit-content; + padding:7rpx 24rpx 7rpx 17rpx; + height: 46rpx; + display: flex; + align-items: center; + background: #FFFFFF; + border-radius: 46rpx; + font-size: 28rpx; + color: #999; + margin-right: 10rpx; +} +.header .content .right .bto image{ + width: 32rpx; + height: 32rpx; + margin-right: 10rpx; +} +.body{ + padding: 0 20rpx; + height: auto; + position: relative; + top: -100rpx; +} +.body .card { + background-color: #ffffff; + border-radius: 20rpx; + height: auto; +} +.body .card .item{ + height: 100rpx; + display: flex; + align-items: center; + padding: 0 30rpx; + box-sizing: border-box; +} +.body .card .item .left { + flex: 1; + display: flex; +} +.body .card .item .left image{ + width: 40rpx; + height: 40rpx; + margin-right: 22rpx; +} +.body .card .item .right image{ + width: 20rpx; + height: 20rpx; +} \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index e68b207..e51fbe9 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -56,6 +56,20 @@ "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 } ] } diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml index 997bdfc..6433812 100644 --- a/subpages/addResi/pages/addResi/addResi.wxml +++ b/subpages/addResi/pages/addResi/addResi.wxml @@ -115,12 +115,11 @@ 出生日期 - - - {{form.birthday?form.birthday:'请选择'}} - - - + + + {{form.birthday?form.birthday:'请选择'}} + + diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js new file mode 100644 index 0000000..70e2711 --- /dev/null +++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js @@ -0,0 +1,181 @@ +// subpages/gatherInformation/pages/gatherInformation/gatherInformation.js +import { $wuxCalendar } from '../../../../components/dist/index' +import {getCollect} from '../../../../utils/api' +Page({ + + /** + * 页面的初始数据 + */ + data: { + selectList:[['全部信息','居民信息采集','房屋信息采集'],['','新增','修改','删除']], + selectValue:['全部信息',''], + pageSize:10, + pageNo:1, + tableData:[], + lowerThreshold:'10', + loadMoreVisible:false, + loadMoreType: "none", + nodata:false, + visible:false, + typeVal:'', + collectType:'', + form:{ + type: "", + collectType: "", + collectStartDate: "", + collectEndDate: "" + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getCollect() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + openCalendar2() { + $wuxCalendar().open({ + value: this.data.value2, + multiple: true, + onChange: (values, displayValues) => { + console.log('onChange', values, displayValues) + this.setData({ + 'form.collectStartDate': displayValues[0], + 'form.collectEndDate': displayValues[1], + }) + }, + }) + }, + getCollect(){ + this.setData({ + loadMoreVisible: true, + nodata: false, + loadMoreType: "more", + }) + const parm = { + type:this.data.form.type, + pageSize:this.data.pageSize, + pageNo:this.data.pageNo, + collectType:this.data.form.collectType, + collectStartDate:this.data.form.collectStartDate, + collectEndDate:this.data.form.collectEndDate + } + console.log(parm); + getCollect(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, + }) + }) + }, + onScrollToLower(e){ + if (this.data.loadMoreType === 'more') { + this.setData({ + loadMoreVisible: true, + }) + this.data.pageNo += 1 + this.getCollect() + } + }, + onValueChange(e){ + this.setData({ + typeVal: e.detail.selectedIndex[0] === 1 ? 'resi' : e.detail.selectedIndex[0] === 2 ? 'house' : '', + collectTypeVal: e.detail.selectedIndex[1] === 1 ? 'add' : e.detail.selectedIndex[1] === 2 ? 'edit' : e.detail.selectedIndex[1] === 3 ? 'del' : '', + }) + }, + onConfirm(e) { + this.setData({ + typeVal: e.detail.selectedIndex[0] === 1 ? 'resi' : e.detail.selectedIndex[0] === 2 ? 'house' : '', + collectTypeVal: e.detail.selectedIndex[1] === 1 ? 'add' : e.detail.selectedIndex[1] === 2 ? 'edit' : e.detail.selectedIndex[1] === 3 ? 'del' : '', + 'form.type': e.detail.selectedIndex[0] === 1 ? 'resi' : e.detail.selectedIndex[0] === 2 ? 'house' : '', + 'form.collectType':e.detail.selectedIndex[1] === 1 ? 'add' : e.detail.selectedIndex[1] === 2 ? 'edit' : e.detail.selectedIndex[1] === 3 ? 'del' : '', + visible:false, + selectValue:e.detail.selectedValue + }) + }, + handelShow(){ + this.setData({ + visible:true + }) + }, + handelHidden(){ + this.setData({ + visible:false + }) + }, + handleClickfilter(){ + this.setData({ + tableData:[], + pageNo:1 + }) + this.getCollect() + + }, + handelDel(){ + this.setData({ + 'form.collectStartDate':'', + 'form.collectEndDate':'' + }) + } +}) \ No newline at end of file diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.json b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.json new file mode 100644 index 0000000..c835fb7 --- /dev/null +++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "wux-calendar":"../../../../components/dist/calendar", + "load-more": "../../../../components/loadMore/loadMore", + "no-data": "../../../../components/noData/nodata", + "wux-picker":"../../../../components/dist/picker/index" + }, + "navigationBarTitleText": "我采集的信息" +} \ No newline at end of file diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml new file mode 100644 index 0000000..9572d12 --- /dev/null +++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml @@ -0,0 +1,44 @@ + + + + {{typeVal =='resi'?'居民信息采集':typeVal=='house'?'房屋信息采集':'全部信息'}} , {{collectTypeVal =='add'?'新增':collectTypeVal =='edit'?'修改':collectTypeVal == 'del'?'删除':''}} + + + + + + {{form.collectStartDate}} {{form.collectEndDate}} + 请选择时间 + + + + + + 筛选 + + + + + + {{item.collectType == 'edit'?'修改':item.collectType == 'add'?'新增':'删除'}} {{item.houseName?item.houseName:'--'}} + {{item.orgName}} {{item.collectTime}} + + + + + + + + + + + \ No newline at end of file diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss new file mode 100644 index 0000000..b63e58d --- /dev/null +++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss @@ -0,0 +1,146 @@ +/* subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss */ +page{ + height: 100vh; + overflow: hidden; + background-color:#f7f7f7 ; +} +.edit{ + background-color: #def7f6; + color:#04B8AD; +} +.add{ + background-color: #e6f0ff; + color: #4F94FF; +} +.del{ + color: #FF783C; + background-color: #ffece3; +} +.search{ + height: 90rpx; + width: 100%; + padding:0 22rpx; + box-sizing: border-box; + background-color: #fff; + display: flex; + align-items: center; + justify-content: space-between; +} +.search image{ + width: 16rpx; + height: 16rpx; +} +.search .filter{ + max-width: 300rpx; + height: 40rpx; + background: rgba(58,128,231,0.16); + border: 1px solid #3A80E7; + border-radius: 40rpx; + display: flex; + align-items: center; + color: #3A80E7 ; + justify-content: space-between; + padding: 13rpx 24rpx 13rpx 20rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.search .box { + flex: 1; + padding: 0 29rpx 0 15rpx; + overflow: hidden; +} +.search .box .date{ + height: 40rpx; + background: rgba(58,128,231,0.16); + border: 1px solid #3A80E7; + border-radius: 40rpx; + padding: 13rpx 24rpx 13rpx 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + color: #3A80E7; +} +.search .box .date .text{ + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +/* */ +.search .btn { + width: 120rpx; + height: 66rpx; + line-height: 66rpx; + background: #3A80E7; + border-radius: 33rpx; + color: #fff; + text-align: center; +} +.body{ + padding: 20rpx; + box-sizing: border-box; + overflow: hidden; +} + +.body .scroll { + height: calc(100vh - 130rpx); + overflow-y: scroll; +} +.body .scroll .content{ + border-radius: 20rpx; + background-color: #fff; + height: auto; +} +.body .scroll .content .item{ + height: 150rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 30rpx; + border-bottom:1px solid #EAEAEA; +} +.body .scroll .content .item .top{ + display: flex; + align-items: center; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #333333; +} +.body .scroll .content .item .top text{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.body .scroll .content .item .top .tag{ + width: 80rpx; + height: 36rpx; + line-height: 36rpx; + border-radius: 18rpx; + font-size: 26rpx; + text-align: center; + margin-right: 20rpx; +} +.body .scroll .content .item .bto{ + display: flex; + justify-content: space-between; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; +} +.body .scroll .content .item .bto .address{ + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.body .scroll .content .item .bto .date{ + width: 265rpx; + height: 20rpx; + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 500; + color: #C1C1C1; +} \ No newline at end of file diff --git a/subpages/gatherInformation/pages/images/del.png b/subpages/gatherInformation/pages/images/del.png new file mode 100644 index 0000000000000000000000000000000000000000..bc50e586a2bb912a9741964628fc597230813a85 GIT binary patch literal 600 zcmV-e0;m0nP)Px%5=lfsRA@u(S<7+4Kn#^^QUFjuOeau82)E#S%uFf(D##4Z9gYNwfK-B00MG!o zGP}kJ0o&}_J1`{TilmkF^g$1V8~@;q`wtwzwGm_l7=e-*Fj7LD*R2!U&_s;xRs12c zKJ5^e)0b+XBA+KyI)IM9ZAL%~ZASW(IbQkp_ zLdUdQs`l(1x_QGvtMODHy`}=^hdRZz&q91#u#r)h$iP2N7F8q==5!o1M2;?La+G0mbu=w|Xd1db$! z_x5zjUM&Q~8z({NK$s_65LN8}k|3Z0PDtRW{;84Yy9L%qQHHuu0H%^|!VU*uB8z2g mFal+=XF`_|FpPx$TuDShRA@u(m(6VgQ4EBiqci|C0G*_Yh#TS_kf;DsK@K!PZV4%ZQb+?44WKpJ z8zND5{KihSlJ~l{-+VLH{z&QhB|X<)65ziR%mgw4(t%td(m=XB6QC_52V?@IfpmK& zKwC%-$OK3O>2^~B)9vX&rJ2>7+Ng}7K9$#xSAec0yv4h&(6wVfB@rP$4B&ebemj4=TJ9@!dqDdcj(!@Wdw*RQ4p1Y? z(vtudw<2mYfe2SEGcy5;TM@OHK!mH7nVEpat%%x8Ai`D4%-$z(0V%(7F$S1fCIA2c M07*qoM6N<$f@AKi8UO$Q literal 0 HcmV?d00001 diff --git a/utils/api.js b/utils/api.js index 4fe3089..828cb27 100644 --- a/utils/api.js +++ b/utils/api.js @@ -25,7 +25,8 @@ module.exports = { getHouseCoding, saveCommunityHouse, updateCommunityHouse, - getClearHouseDeatilById + getClearHouseDeatilById, + getCollect } // 消息列表 function getIntelligentMessage(param){ @@ -130,4 +131,7 @@ function getClearHouseDeatilById (id) { // 房屋编辑 function updateCommunityHouse (parm) { return fly.post(`actual/base/communityHouse/updateCommunityHouse`,parm) -} \ No newline at end of file +} +function getCollect (parm) { + return fly.post(`message/intelligentMessage/collect/page`,parm) +} diff --git a/utils/config.js b/utils/config.js index d3d7484..ba3fce9 100644 --- a/utils/config.js +++ b/utils/config.js @@ -7,16 +7,11 @@ module.exports = { function BASEURL() { // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 正式环境 - // return 'http://10.10.10.66:9094/epdc-api/api/' // 王童本地环境地址 - // http://219.146.91.110:30801/api //线上测试 return 'http://192.168.1.144/api/' // 测试环境 } function WEBROOT() { - // return 'https://epdc-shibei.elinkservice.cn/epidemic/appraise.html#/cadre-list' // 街道干部评价h5地址 - // return 'http://lihenian.gitee.io/epidemic/appraise.html#/cadre-list' // 街道干部评价h5地址测试环境 - // https://lyljdgs.qingdaoshibei.cn/app/mobileapp/qlsb/index.aspx - return 'https://lyljdgs.qingdaoshibei.cn/app/mobileapp/qlsb/index.aspx'// 2020-05-20 + return 'https://lyljdgs.qingdaoshibei.cn/app/mobileapp/qlsb/index.aspx' } function getToken() {