diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json index a860586..b514879 100644 --- a/epdc-resident-mp-yushan/app.json +++ b/epdc-resident-mp-yushan/app.json @@ -224,6 +224,13 @@ "pages/index/index" ] }, + { + "root": "subpages/mediateHypermarket", + "name": "mediateHypermarket", + "pages": [ + "page/index/index" + ] + }, { "root": "subpages/societyOrg", "name": "societyOrg", diff --git a/epdc-resident-mp-yushan/images/home/mtcs.png b/epdc-resident-mp-yushan/images/home/mtcs.png new file mode 100644 index 0000000..646b781 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/mtcs.png differ diff --git a/epdc-resident-mp-yushan/images/mtcs.png b/epdc-resident-mp-yushan/images/mtcs.png new file mode 100644 index 0000000..646b781 Binary files /dev/null and b/epdc-resident-mp-yushan/images/mtcs.png differ diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js index 44ca24b..cc454a7 100644 --- a/epdc-resident-mp-yushan/pages/index/index.js +++ b/epdc-resident-mp-yushan/pages/index/index.js @@ -51,9 +51,9 @@ Page({ //志愿服务 { icon: - '../../images/hswy.png', + '../../images/mtcs.png', tip: '矛调超市', - module: 'volunteerService', + module: 'mediateHypermarket', }, // { @@ -481,10 +481,10 @@ Page({ // // /subpages/integralCentre/pages/index/index // url: '/subpages/family/pages/index/index', // }) - } else if (module === 'volunteerService') { - // wx.navigateTo({ - // url: '/pages/heart/heart', - // }) + } else if (module === 'mediateHypermarket') { + wx.navigateTo({ + url: '/subpages/mediateHypermarket/page/index/index', + }) } else if (module === 'societyOrg') { wx.navigateTo({ url: '/subpages/societyOrg/pages/orgList/orgList', diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml index 0831fc5..e102a5e 100644 --- a/epdc-resident-mp-yushan/pages/index/index.wxml +++ b/epdc-resident-mp-yushan/pages/index/index.wxml @@ -123,7 +123,7 @@ - + {{item.tip}} diff --git a/epdc-resident-mp-yushan/pages/index/index.wxss b/epdc-resident-mp-yushan/pages/index/index.wxss index afbe46e..2ea4e35 100644 --- a/epdc-resident-mp-yushan/pages/index/index.wxss +++ b/epdc-resident-mp-yushan/pages/index/index.wxss @@ -420,15 +420,18 @@ justify-content: center; } .module-list .module-item .icon { - width: 74rpx; - height: 79rpx; + width: 150rpx; + height: 150rpx; } .module-list .module-item .icon image { width: 100%; height: 100%; float: left; } - +.module-list .module-item .icon .p20{ + padding: 20rpx; + box-sizing: border-box; +} .module-list .module-item .tip { font-size: 26rpx; color: #3f3f3f; diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js new file mode 100644 index 0000000..011f2b7 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js @@ -0,0 +1,89 @@ +const api = require('../../utils/mediateHypermarket') +Page({ + + /** + * 页面的初始数据 + */ + data: { + pageIndex: 1, + pageSize: 10, + nodata: false, + loadMoreType: 'none', + loadMoreVisible: false, + isLoadMore: false, + modulelist: [], + pid: '1438320938730868737', + typeCode: 'MTCS' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + // this.modulelist() + // wx.setNavigationBarTitle({ + // title: options.title + // }) + this.getModuleList() + }, + // modulelist() { + // let that = this; + // api.modulelist(that.data.moduleCategory).then(function (res) { + // that.setData({ + // modulelist: res.data, + // }) + // console.log(that.data.modulelist) + // }) + // }, + getModuleList() { + let params = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + // pid: this.data.pid + typeCode: this.data.typeCode + } + api.getModuleList(params).then(res => { + console.log(res.data) + this.setData({ + modulelist: this.data.modulelist.concat(res.data), + loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none', + loadMoreVisible: res.data.length === this.data.pageSize ? false : true + }) + if (this.data.modulelist.length == 0) {//没有值 + this.setData({ + nodata: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + } + }).catch(err => { + this.setData({ + modulelist: [], + nodata: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + console.log(err) + }) + }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === 'loading') { + this.setData({ + pageIndex: this.data.pageIndex + 1, + pageSize: this.data.pageSize, + }) + this.getModuleList() + } + }, + goDetails (e) { + 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}`, + }) + } +}) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.json b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.json new file mode 100644 index 0000000..0940bed --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "矛调超市", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#bb0300", + "usingComponents": { + "load-more": "/components/loadMore/loadMore", + "no-data":"/components/nodata/nodata" + } + } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml new file mode 100644 index 0000000..3bacd01 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml @@ -0,0 +1,16 @@ + + + + + + diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxss b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxss new file mode 100644 index 0000000..4c04048 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxss @@ -0,0 +1,37 @@ +/* subpages/mediateHypermarket/page/index/index.wxss */ +.index { + width: calc(100% - 60rpx); + /* margin-top: 28rpx; */ + height: 300rpx; + line-height: 300rpx; + margin-left: 30rpx; + border-radius: 10rpx; + position: relative; + margin-bottom: 28rpx; + padding: 0; + background: #fff; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); + } + + button::after { + border: none; + } + + .hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); + } + + .index.top { + margin-top: 28rpx; + } + + .index .img-bj { + border-radius: 10rpx; + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + z-index: 10; + } + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/utils/mediateHypermarket.js b/epdc-resident-mp-yushan/subpages/mediateHypermarket/utils/mediateHypermarket.js new file mode 100644 index 0000000..dff046c --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/utils/mediateHypermarket.js @@ -0,0 +1,5 @@ +var request = require('../../../utils/request') + +export function getModuleList(params) { + return request.get('news/getModuleList', params) +}