From a35c1d94d86488fbbab0dfe59af6fef5668f2c14 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 21 Jul 2023 16:32:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=B0=86=E5=8F=B0=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0,=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-resident-mp-yushan/app.json | 3 +- ...tu1fd95QULD2WPlMiI98KQQ6WHNWQDQA_80_80.png | Bin 0 -> 4649 bytes .../pages/index/index.wxss | 11 +- .../pages/categoryList/categoryList.wxml | 2 +- .../mediateHypermarket/images/phone.png | Bin 0 -> 451 bytes .../page/dotGeneral/dotGeneral.js | 168 ++++++++++ .../page/dotGeneral/dotGeneral.json | 8 + .../page/dotGeneral/dotGeneral.wxml | 68 ++++ .../page/dotGeneral/dotGeneral.wxss | 312 ++++++++++++++++++ .../mediateHypermarket/page/index/index.js | 17 +- 10 files changed, 582 insertions(+), 7 deletions(-) create mode 100644 epdc-resident-mp-yushan/images/home/lQLPJwE4tu1fd95QULD2WPlMiI98KQQ6WHNWQDQA_80_80.png create mode 100644 epdc-resident-mp-yushan/subpages/mediateHypermarket/images/phone.png create mode 100644 epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.js create mode 100644 epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.json create mode 100644 epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxml create mode 100644 epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxss diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json index eca08c6..4b7b871 100644 --- a/epdc-resident-mp-yushan/app.json +++ b/epdc-resident-mp-yushan/app.json @@ -228,7 +228,8 @@ "root": "subpages/mediateHypermarket", "name": "mediateHypermarket", "pages": [ - "page/index/index" + "page/index/index", + "page/dotGeneral/dotGeneral" ] }, { diff --git a/epdc-resident-mp-yushan/images/home/lQLPJwE4tu1fd95QULD2WPlMiI98KQQ6WHNWQDQA_80_80.png b/epdc-resident-mp-yushan/images/home/lQLPJwE4tu1fd95QULD2WPlMiI98KQQ6WHNWQDQA_80_80.png new file mode 100644 index 0000000000000000000000000000000000000000..ae8e8a90defc7b9b2accf7165a62e6752424e032 GIT binary patch literal 4649 zcmaJ_c{r5q+a5Gzi}+EtjIm`m_8E=H*kTmMP8p1Sc6&k#LUxi}wyYDAtfOSfQl`AN zWG%9lB}=I2)BC=?zweLl{hs4^p8LA*<2ujlysrEF>xsQ=Zp6tZ$OZraI8BTZmPhO5 zU+;0|qi^EL&6=Y{z~8{m-wN;HAA}}h0DA6tR}9Dmi}u7=V$kj(#6HY90Dwu{8)fHj zhctt^;jxP7Upb1wSi%t+062F(n1FWk#rT65%h3-xt_x`WT_fX)TOjtH5l<>xU!5g5lsld0|KKuVW=J=+6{?UpV+L zQFh47AbmUu15#JiP;i5&X@NAMiVzJoWmOG%kcu({s-&!?1W{E`hQO3HVCtHnzaQ{X zHIlmr%o1Vvcderx9PH)qPk<>Y1qB5u2B|9INuEjⅅR!MM*_P;V46a9D?&l2P@#n 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 a04N4IpB!c>-1znL#>BuJLAl^^^M3#$ZCQ)} literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/pages/index/index.wxss b/epdc-resident-mp-yushan/pages/index/index.wxss index 2b9d8f6..4aac9fa 100644 --- a/epdc-resident-mp-yushan/pages/index/index.wxss +++ b/epdc-resident-mp-yushan/pages/index/index.wxss @@ -428,10 +428,13 @@ justify-content: center; height: 100%; float: left; } -/* .module-list .module-item .icon .p20{ - padding: 20rpx; - box-sizing: border-box; -} */ +.module-list .module-item .icon .p20{ + width:100rpx ; + height: 100rpx; + position: relative; + left: -10rpx; + top: -12rpx; +} .module-list .module-item .tip { font-size: 26rpx; color: #3f3f3f; diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml index afa04bc..52ff0ac 100644 --- a/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml @@ -8,7 +8,7 @@ - + {{item.typeName}} diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/images/phone.png b/epdc-resident-mp-yushan/subpages/mediateHypermarket/images/phone.png new file mode 100644 index 0000000000000000000000000000000000000000..ea1fc33aec4a53b0d209a99e3bcd8b04d06d40ba GIT binary patch literal 451 zcmV;!0X+VRP)lF?00004XF*Lt006O% z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0063uBQgL000(qQO+^Rg2pl(@3~LN#10RPPx#p=+b>m{m zIFzu@B%_=Y1JGp6g^OK#;WrwzD`Kb<7e{p0wrio9HMK)-2P(Wc>4R>TmAJ~F4K`e} tr?Ji>5R(AM%pw$!{{x3rR-&6$`U~tNd$@VfDRKY+002ovPDHLkV1k$tv_1d; literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.js b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.js new file mode 100644 index 0000000..9e394d2 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.js @@ -0,0 +1,168 @@ +const api = require('../../../../utils/api') +let leftHeight = 0 +let rightHeight = 0 +let query = '' +Page({ + data: { + loadMoreType: 'none', + loadMoreVisible: false, + pageNo: 1, + pageSize: 10, + deptName: '', + deptIntro: '', + griderList: [], + griderLeftList: [], + griderRightList: [], + selectedTabBar:'shilitiaojie' + }, + onLoad(options) { + query = wx.createSelectorQuery() + this.getDeptInfo() + this.setData({ + deptId: '1258587136866476033', + categoryCode:'SLTJ' + }, () => { + this.getMemberList() + }) + }, + onReachBottom() { + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === 'loading') { + this.data.pageNo += 1 + this.loadMoreMemberList() + } + }, + chooseTabBar(e) { + this.data.pageNo = 1 + this.data.pageSize = 10 + if (e.currentTarget.dataset.type === 'shilitiaojie') { + this.setData({ + categoryCode:'SLTJ' + }) + this.getMemberList() + } else if (e.currentTarget.dataset.type === 'qinglitiaojie') { + this.setData({ + categoryCode:'QLTJ' + }) + this.getMemberList() + } else if (e.currentTarget.dataset.type === 'falitiaojie') { + this.setData({ + categoryCode:'FLTJ' + }) + this.getMemberList() + }else if (e.currentTarget.dataset.type === 'xinlitiaojie'){ + this.setData({ + categoryCode:'XLTJ' + }) + this.getMemberList() + } + this.setData({ + selectedTabBar: e.currentTarget.dataset.type, + }) + console.log(this.data.selectedTabBar); + }, + getBoxHeight(griderLeftList, griderRightList) { //获取左右两边高度 + return new Promise((resolve, reject) => { + this.setData({ griderLeftList, griderRightList }, () => { + query.select('#left').boundingClientRect() + query.select('#right').boundingClientRect() + query.exec((res) => { + leftHeight = res[0].height //获取左边列表的高度 + rightHeight = res[1].height //获取右边列表的高度 + resolve() + }) + }) + }) + }, + // 社区介绍 + getDeptInfo() { + api.getDeptInfo().then(res => { + console.log(res) + const { deptInfo, deptName } = res.data + this.setData({ + deptName: deptName, + deptIntro: deptInfo + }) + }).catch(err => { + console.error(err) + }) + }, + // 初始化加载网格员队伍 + getMemberList() { + const params = { + pageIndex: this.data.pageNo, + pageSize: this.data.pageSize, + deptId: this.data.deptId || '', + categoryCode: this.data.categoryCode || '' + } + wx.showLoading({ + title: '加载中...' + }) + this.setData({ + griderList:[], + griderLeftList:[], + griderRightList:[], + }) + api.getMemberList(params).then(async (res) => { + wx.hideLoading() + this.setData({ + griderList: res.data, + loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none' + }) + const { griderLeftList, griderRightList } = this.data + for (const item of res.data) { + leftHeight <= rightHeight ? griderLeftList.push(item) : griderRightList.push(item) //判断两边高度，来觉得添加到那边 + await this.getBoxHeight(griderLeftList, griderRightList) + } + }).catch(err => { + wx.hideLoading() + this.setData({ + griderList: [], + loadMoreType: 'none' + }) + }) + }, + // 下拉加载 网格员列表 + loadMoreMemberList() { + const params = { + pageIndex: this.data.pageNo, + pageSize: this.data.pageSize, + deptId: this.data.deptId || '', + categoryCode: this.data.categoryCode || '' + } + wx.showLoading({ + title: '加载中...' + }) + + api.getMemberList(params).then(async (res) => { + wx.hideLoading() + + this.setData({ + griderList: this.data.griderList.concat(res.data), + loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none' + }) + const { griderLeftList, griderRightList } = this.data + for (const item of res.data) { + leftHeight <= rightHeight ? griderLeftList.push(item) : griderRightList.push(item) //判断两边高度，来觉得添加到那边 + await this.getBoxHeight(griderLeftList, griderRightList) + } + }).catch(err => { + wx.hideLoading() + console.error(err) + }) + }, + // 打电话 + callGrider(e) { + const { phone } = e.currentTarget.dataset + wx.makePhoneCall({ + phoneNumber: phone + }) + }, + previewImage(e) { + wx.previewImage({ + urls: [e.currentTarget.dataset.src] + }) + } +}) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.json b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.json new file mode 100644 index 0000000..e818e39 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.json @@ -0,0 +1,8 @@ +{ + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#bb0300", + "navigationBarTitleText": "点将台", + "usingComponents": { + "no-data": "/components/nodata/nodata" + } + } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxml b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxml new file mode 100644 index 0000000..6962ff8 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxml @@ -0,0 +1,68 @@ + + + + + + 事理调解队 + + + 法理调解队 + + + 情理调解队 + + + + 心理调解队 + + + + + + + + + + + {{item.name}} + + + 电话：{{item.mobile}} + + + + + 打电话 + + + + + + + + + {{item.name}} + 电话：{{item.mobile}} + + + + + 打电话 + + + + + + + + + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxss b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxss new file mode 100644 index 0000000..005bc2d --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/dotGeneral/dotGeneral.wxss @@ -0,0 +1,312 @@ +page { + background: #f7f7f7; + } + + image { + width: 100%; + height: 100%; + float: left; + } + + .grid-army { + width: 100%; + height: auto; + } + + .community-intro { + width: 100%; + background: linear-gradient(to bottom, #d73e32, #cd1b1e); + box-sizing: border-box; + padding: 0 32rpx 80rpx; + } + + .community-intro .community-name { + display: flex; + align-items: center; + height: 100rpx; + width: 100%; + } + + .community-intro .community-name .icon { + width: 56rpx; + height: 56rpx; + } + + .community-intro .community-name .name { + font-size: 52rpx; + color: #fff; + margin-left: 15rpx; + } + + .community-intro .community-detail { + font-size: 30rpx; + color: #fff; + line-height: 50rpx; + text-indent: 60rpx; + } + + .grider-list { + width: 100%; + box-sizing: border-box; + padding: 0 32rpx; + margin-top: 40rpx; + } + + .grider-list .grider-left { + width: calc(50% - 15rpx); + margin-right: 15rpx; + float: left; + } + + .grider-list .grider-right { + width: calc(50% - 15rpx); + margin-left: 15rpx; + float: left; + } + + .grider-list .grid-item { + width: 100%; + background: #fff; + margin-bottom: 20rpx; + border-radius: 14rpx; + box-sizing: border-box; + padding: 40rpx 30rpx 30rpx; + display: flex; + flex-direction: column; + align-items: center; + } + + .grider-list .grid-item .avatar { + width: 110rpx; + height: 110rpx; + border-radius: 50%; + background: yellow; + overflow: hidden; + } + + .grider-list .grid-item .name { + font-size: 30rpx; + line-height: 50rpx; + color: #333; + margin-top: 20rpx; + } + + .grider-list .grid-item .item { + width: 100%; + line-height: 36rpx; + font-size: 26rpx; + color: #c1c1c1; + } + + .grider-list .grid-item .item + .item { + margin-top: 4rpx; + } + + .grider-list .grid-item .call-phone { + margin-top: 20rpx; + width: 156rpx; + height: 56rpx; + background-image: linear-gradient(90deg, + #e3271c 0%, + #f95c2c 100%), + linear-gradient( + #8da5eb, + #8da5eb); + background-blend-mode: normal, + normal; + border-radius: 28rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 26rpx; + color: #ffffff; + } + + .grider-list .grid-item .hover-call-phone { + background: red; + } + + .grider-list .grid-item .call-phone .phone { + width:23rpx; + height:27rpx; + margin-right: 6rpx; + } + + .no-data-container { + width: 100%; + height: 50vh; + display: flex; + align-items: center; + justify-content: center; + } + .f-wr { + width: 100%; + box-sizing: border-box; +} +.f-wr .xinlitiaojie-list { + overflow-y: scroll; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-hader{ + display: flex; + padding: 20rpx 61rpx; + background-color: #fff; + +} +.f-wr .xinlitiaojie-list .xinlitiaojie-hader .active_btn{ + background: #dc1e20; + color: #fff; + border: 1px solid #dc1e20; + opacity: 1; +} +.f-wr .xinlitiaojie-list .search-box{ + display: flex; + margin-top: 20rpx; + height: 60rpx; + line-height: 60rpx; + align-items: center; + padding: 0 30rpx; + position: relative; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-content{ + width: 100%; + height: 440rpx; + border-radius: 5%; + margin-top: 20rpx; + box-sizing: border-box; + background-color: #fff; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-content view{ + background-color: #fff; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-content .xinlitiaojie-header{ + display: flex; + background-color: #fff; + box-sizing: border-box; + padding: 10rpx 0 10rpx 0; + border-radius: 5rpx 5rpx 0 0 ; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-content .xinlitiaojie-body{ + padding: 0 20rpx; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-content .xinlitiaojie-header image{ + width: 100rpx; + height: 100rpx; + border-radius: 50%; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-content .xinlitiaojie-header .xinlitiaojie-header-name { + display: flex; + flex-direction: column; + justify-content: center; + padding:0 20rpx; + flex: 1; +} +.f-wr .xinlitiaojie-list .search-img{ + width:40rpx; + height:40rpx; + object-fit: cover; + margin: 0 7rpx 0 25rpx; + position: absolute; + z-index: 5; +} +.f-wr .xinlitiaojie-list .search-box .search-input{ + background: #fff; + border-radius: 25rpx; + padding-left: 24rpx; + width:100%; + height: 100%; +} +.f-wr .xinlitiaojie-list .search-box .search-img{ + position: absolute; + right: 38rpx; + width: 29rpx; + height: 32rpx; + top:12rpx ; +} +.f-wr .xinlitiaojie-list .xinlitiaojie-hader view{ + width: 166rpx; + height: 56rpx; + line-height: 56rpx; + background: #FFFFFF; + border: 1px solid #828282a9; + border-radius: 28rpx; + text-align: center; + color: #333333; + font-family: PingFang SC; + font-weight: bold; +} +.tab-bar { + width: 100%; + height: 90rpx; + background: #fff; + overflow-x: scroll; + display: flex; + align-items: center; + justify-content: space-around; + position: relative; + padding:0 20rpx; + box-sizing: border-box; +} + +.tab-bar .type { + font-size: 30rpx; + color: #999; + flex: 1; + text-align: center; + /* width: 300rpx; */ + height: 90rpx; + line-height: 90rpx; +} + +.tab-bar .hover-tabbar { + background: #f3f3f3; +} + +.tab-bar .type.selected-shilitiaojie { + color: #F82525; + font-weight: bolder; +} + +.tab-bar .type.selected-xinlitiaojie { + color: #F82525; + font-weight: bolder; +} + +.tab-bar .type.selected-qinglitiaojie { + color: #F82525; + font-weight: bolder; +} + +.tab-bar .type.selected-falitiaojie { + color: #F82525; + font-weight: bolder; +} + +.tab-bar .select-bar { + position: absolute; + bottom: 0; + left: 0; + width: 80rpx; + height: 6rpx; + background: #f95454; + border-radius: 4rpx; + transition: left 0.5s ease; +} + +.tab-bar .select-bar.selected-shilitiaojie { + left: 9%; + transition: left 0.5s ease; + } + + .tab-bar .select-bar.selected-xinlitiaojie { + left: 80%; + transition: left 0.5s ease; + } + + .tab-bar .select-bar.selected-qinglitiaojie { + left: 57%; + transition: left 0.5s ease; + } + .tab-bar .select-bar.selected-falitiaojie { + left: 32%; + transition: left 0.5s ease; +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js index 011f2b7..0476811 100644 --- a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js @@ -43,7 +43,10 @@ Page({ typeCode: this.data.typeCode } api.getModuleList(params).then(res => { - console.log(res.data) + const customOrder = ["有话说", "点将台", "联动轴", "闪光灯"]; + res.data.sort((a, b) => { + return customOrder.indexOf(a.name) - customOrder.indexOf(b.name); + }); this.setData({ modulelist: this.data.modulelist.concat(res.data), loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none', @@ -82,6 +85,18 @@ Page({ } }, goDetails (e) { + console.log(e); + if(e.currentTarget.dataset.module.typeCode == '01'){ + wx.redirectTo({ + url: '/pages/discussion/discussion', + }) + return + }else if(e.currentTarget.dataset.module.typeCode == 'DJT'){ + wx.navigateTo({ + url: '/subpages/mediateHypermarket/page/dotGeneral/dotGeneral', + }) + return + } wx.navigateTo({ url: `/subpages/workTodo/pages/moduleList/moduleList?pid=${e.currentTarget.dataset.module.id}&typeCode=${e.currentTarget.dataset.module.typeCode}&name=${e.currentTarget.dataset.module.name}&style=${e.currentTarget.dataset.module.moduleStyle}`, })