From ce726c2b2b4355b017e106d5ecfb114804b80715 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 9 Nov 2021 09:47:04 +0800 Subject: [PATCH] =?UTF-8?q?1.2.23=20=E7=BD=91=E6=A0=BC=E9=98=9F=E4=BC=8D?= =?UTF-8?q?=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-resident-mp-yushan/app.json | 4 +- epdc-resident-mp-yushan/pages/index/index.js | 2 +- .../pages/toRegister/toRegister.js | 2 +- .../subpages/gridArmy/images/right-sword.png | Bin 0 -> 368 bytes .../subpages/gridArmy/images/top-img.png | Bin 0 -> 25473 bytes .../pages/categoryList/categoryList.js | 65 +++++++++++++++ .../pages/categoryList/categoryList.json | 9 ++ .../pages/categoryList/categoryList.wxml | 18 ++++ .../pages/categoryList/categoryList.wxss | 77 ++++++++++++++++++ .../pages/communityList/communityList.js | 56 +++++++++++++ .../pages/communityList/communityList.json | 9 ++ .../pages/communityList/communityList.wxml | 18 ++++ .../pages/communityList/communityList.wxss | 77 ++++++++++++++++++ .../subpages/gridArmy/pages/index/index.js | 22 ++++- .../subpages/gridArmy/pages/index/index.json | 5 +- .../subpages/gridArmy/pages/index/index.wxml | 4 +- .../subpages/gridArmy/pages/index/index.wxss | 2 +- epdc-resident-mp-yushan/utils/api.js | 12 +++ 18 files changed, 369 insertions(+), 13 deletions(-) create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/images/right-sword.png create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/images/top-img.png create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.js create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.json create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxss create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.js create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.json create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxml create mode 100644 epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxss diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json index 94155e0..3020a95 100644 --- a/epdc-resident-mp-yushan/app.json +++ b/epdc-resident-mp-yushan/app.json @@ -184,7 +184,9 @@ "root": "subpages/gridArmy", "name": "gridArmy", "pages": [ - "pages/index/index" + "pages/index/index", + "pages/communityList/communityList", + "pages/categoryList/categoryList" ] }, { diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js index b9d9a35..6572e28 100644 --- a/epdc-resident-mp-yushan/pages/index/index.js +++ b/epdc-resident-mp-yushan/pages/index/index.js @@ -421,7 +421,7 @@ Page({ const { module } = e.currentTarget.dataset if (module === 'gridArmy') { wx.navigateTo({ - url: '/subpages/gridArmy/pages/index/index', + url: '/subpages/gridArmy/pages/communityList/communityList', }) } else if (module === 'pointRank') { wx.navigateTo({ diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js index 31c92ba..72d2484 100644 --- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js +++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ } }) let that = this - const versionNum = '1.2.22' + const versionNum = '1.2.23' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data ? res.data.scanFlag : '1' diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/images/right-sword.png b/epdc-resident-mp-yushan/subpages/gridArmy/images/right-sword.png new file mode 100644 index 0000000000000000000000000000000000000000..c4b1e857d9aee6f959a62dec069705056e22a554 GIT binary patch literal 368 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 literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.js b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.js new file mode 100644 index 0000000..ee9b8c2 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.js @@ -0,0 +1,65 @@ +const api = require('../../../../utils/api') + +Page({ + data: { + loadType: 'none', + loadVisible: false, + pageIndex: 1, + pageSize: 10, + deptId: '', + isShow: true, + categoryList: [], + categoryCode: '', + }, + onLoad(options) { + if (options.name) { + wx.setNavigationBarTitle({ + title: options.name, + }) + this.setData({ + deptId: options.id + }) + } + this.getGridCategoryList() + }, + // 获取社区列表 + getGridCategoryList() { + api.getGridCategoryList().then(res => { + if (res.code == 0 && res.msg == 'success') { + this.setData({ + isShow: false, + categoryList: this.data.categoryList.concat(res.data), + // loadType: res.data.length < this.data.pageSize ? 'none' : 'loading', + }) + if (this.data.categoryList.length == 0) { + this.setData({ + isShow: true, + // loadVisible: false, + }) + } + } + }).catch(err => { + this.setData({ + isShow: true, + loadVisible: false, + }) + }) + }, + // onReachBottom() { + // if (this.data.loadType == 'none') { + // return + // } + // this.setData({ + // pageIndex: ++this.data.pageIndex, + // }) + // this.getGridCategoryList() + // }, + // + navigateTo(e) { + let code = e.currentTarget.dataset.code + let name = e.currentTarget.dataset.name + wx.navigateTo({ + url: `../index/index?id=${this.data.deptId}&code=${code}&name=${name}` + }) + }, +}) diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.json b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.json new file mode 100644 index 0000000..e014e2b --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#349c83", + "usingComponents": { + "no-data": "/components/nodata/nodata", + "load-more": "/components/nodata/nodata" + } +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml new file mode 100644 index 0000000..afa04bc --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxml @@ -0,0 +1,18 @@ + + + + 网格队伍 + 基层党建·为民服务 + + + + + + + {{item.typeName}} + + + + + + diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxss b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxss new file mode 100644 index 0000000..8803318 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/categoryList/categoryList.wxss @@ -0,0 +1,77 @@ +page { + width: 100%; + min-height: 100vh; + height: auto; +} +.list { + width: 100%; +} +.list .top { + width: 100%; + height: 338rpx; + border-radius: 0 0 40rpx 40rpx; + background: linear-gradient(to bottom, #349c83, #39b092); + display: flex; +} +.list .top .left { + color: #ffffff; + width: 450rpx; + height: 227rpx; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding-left: 70rpx; + box-sizing: border-box; +} +.list .top .left .title { + font-size: 44rpx; + letter-spacing: 4rpx; +} +.list .top .left .desc { + font-size: 25rpx; + letter-spacing: 4rpx; + margin-top: 25rpx; +} +.list .top .left .line { + width: 99rpx; + height: 8rpx; + background-color: #ffb71c; + margin-top: 23rpx; +} +.list .top .top-img { + width: 256rpx; + height: 227rpx; +} + +.list .org-list { + width: 100%; + box-sizing: border-box; + padding: 0 30rpx; + position: relative; + top: -90rpx; +} +.list .org-list .list-item { + width: 100%; + height: 130rpx; + background: #fff; + box-shadow: 0rpx 5rpx 32rpx 0rpx rgba(198, 198, 198, 0.56); + border-radius: 14rpx; + box-sizing: border-box; + padding: 0 33rpx 0 35rpx; + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 30rpx; +} +.list .org-list .list-item .list-item-label { + color: #333; + font-size: 34rpx; +} +.list .org-list .list-item .list-item-icon { + width: 24rpx; + height: 24rpx; +} +.list .org-list .org-hover { + background: #f6f7f7; +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.js b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.js new file mode 100644 index 0000000..b39fc5e --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.js @@ -0,0 +1,56 @@ +const api = require('../../../../utils/api') + +Page({ + data: { + loadType: 'none', + loadVisible: false, + pageIndex: 1, + pageSize: 10, + deptId: '', + isShow: true, + deptList: [], + }, + onLoad() { + this.getCommunityDeptList() + }, + // 获取社区列表 + getCommunityDeptList() { + api.getCommunityDeptList().then(res => { + if (res.code == 0 && res.msg == 'success') { + this.setData({ + isShow: false, + deptList: this.data.deptList.concat(res.data), + // loadType: res.data.length < this.data.pageSize ? 'none' : 'loading', + }) + if (this.data.deptList.length == 0) { + this.setData({ + isShow: true, + // loadVisible: false, + }) + } + } + }).catch(err => { + this.setData({ + isShow: true, + loadVisible: false, + }) + }) + }, + // onReachBottom() { + // if (this.data.loadType == 'none') { + // return + // } + // this.setData({ + // pageIndex: ++this.data.pageIndex, + // }) + // this.getCommunityDeptList() + // }, + // + navigateTo(e) { + let id = e.currentTarget.dataset.id + let name = e.currentTarget.dataset.name + wx.navigateTo({ + url: `../categoryList/categoryList?id=${id}&name=${name}` + }) + }, +}) diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.json b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.json new file mode 100644 index 0000000..de776ac --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "网格队伍", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#349c83", + "usingComponents": { + "no-data": "/components/nodata/nodata", + "load-more": "/components/nodata/nodata" + } +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxml b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxml new file mode 100644 index 0000000..a18021a --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxml @@ -0,0 +1,18 @@ + + + + 网格队伍 + 基层党建·为民服务 + + + + + + + {{item.name}} + + + + + + diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxss b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxss new file mode 100644 index 0000000..8803318 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/communityList/communityList.wxss @@ -0,0 +1,77 @@ +page { + width: 100%; + min-height: 100vh; + height: auto; +} +.list { + width: 100%; +} +.list .top { + width: 100%; + height: 338rpx; + border-radius: 0 0 40rpx 40rpx; + background: linear-gradient(to bottom, #349c83, #39b092); + display: flex; +} +.list .top .left { + color: #ffffff; + width: 450rpx; + height: 227rpx; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding-left: 70rpx; + box-sizing: border-box; +} +.list .top .left .title { + font-size: 44rpx; + letter-spacing: 4rpx; +} +.list .top .left .desc { + font-size: 25rpx; + letter-spacing: 4rpx; + margin-top: 25rpx; +} +.list .top .left .line { + width: 99rpx; + height: 8rpx; + background-color: #ffb71c; + margin-top: 23rpx; +} +.list .top .top-img { + width: 256rpx; + height: 227rpx; +} + +.list .org-list { + width: 100%; + box-sizing: border-box; + padding: 0 30rpx; + position: relative; + top: -90rpx; +} +.list .org-list .list-item { + width: 100%; + height: 130rpx; + background: #fff; + box-shadow: 0rpx 5rpx 32rpx 0rpx rgba(198, 198, 198, 0.56); + border-radius: 14rpx; + box-sizing: border-box; + padding: 0 33rpx 0 35rpx; + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 30rpx; +} +.list .org-list .list-item .list-item-label { + color: #333; + font-size: 34rpx; +} +.list .org-list .list-item .list-item-icon { + width: 24rpx; + height: 24rpx; +} +.list .org-list .org-hover { + background: #f6f7f7; +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js index d630d4d..65cc2c2 100644 --- a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js @@ -14,10 +14,20 @@ Page({ griderLeftList: [], griderRightList: [] }, - onLoad() { + onLoad(options) { query = wx.createSelectorQuery() this.getDeptInfo() - this.getMemberList() + if (options.name) { + wx.setNavigationBarTitle({ + title: options.name, + }) + this.setData({ + deptId: options.id, + categoryCode: options.code + }, () => { + this.getMemberList() + }) + } }, onReachBottom() { this.setData({ @@ -58,7 +68,9 @@ Page({ getMemberList() { const params = { pageIndex: this.data.pageNo, - pageSize: this.data.pageSize + pageSize: this.data.pageSize, + deptId: this.data.deptId || '', + categoryCode: this.data.categoryCode || '' } wx.showLoading({ title: '加载中...' @@ -86,7 +98,9 @@ Page({ loadMoreMemberList() { const params = { pageIndex: this.data.pageNo, - pageSize: this.data.pageSize + pageSize: this.data.pageSize, + deptId: this.data.deptId || '', + categoryCode: this.data.categoryCode || '' } wx.showLoading({ title: '加载中...' diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.json b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.json index 0e14f91..a87010c 100644 --- a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.json +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.json @@ -1,8 +1,7 @@ { - "navigationBarBackgroundColor": "#d73e32", - "backgroundColor": "#f7f7f7", "navigationBarTextStyle": "white", - "navigationBarTitleText": "网格队伍", + "navigationBarBackgroundColor": "#349c83", + "navigationBarTitleText": "", "usingComponents": { "no-data": "/components/nodata/nodata" } diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxml b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxml index 42c3da1..8e36963 100644 --- a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxml +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxss b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxss index 08f0b2b..1595533 100644 --- a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxss +++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.wxss @@ -49,7 +49,7 @@ image { width: 100%; box-sizing: border-box; padding: 0 32rpx; - margin-top: -40rpx; + margin-top: 40rpx; } .grider-list .grider-left { diff --git a/epdc-resident-mp-yushan/utils/api.js b/epdc-resident-mp-yushan/utils/api.js index 477be9a..364aa47 100644 --- a/epdc-resident-mp-yushan/utils/api.js +++ b/epdc-resident-mp-yushan/utils/api.js @@ -64,6 +64,8 @@ module.exports = { gridmanList: gridmanList, getDeptInfo: getDeptInfo, getMemberList: getMemberList, + getCommunityDeptList: getCommunityDeptList, + getGridCategoryList: getGridCategoryList, getImgUrl: getImgUrl, getOrgTypeList: getOrgTypeList, getOrgListByType: getOrgListByType, @@ -513,6 +515,16 @@ function getMemberList(params) { return fly.get('sys/gridMember/getMemberList', params) } +// 网格队伍-社区列表 +function getCommunityDeptList() { + return fly.get('sys/gridMember/getCommunityDeptList') +} + +// 网格队伍-分类列表 +function getGridCategoryList() { + return fly.get('sys/gridMember/getGridCategoryList') +} + // 首页-服务电话 function getImgUrl(imageType) { return fly.get(`imgConfig/getImgUrl/${imageType}`)