From c0a9717e29bdf274ea22e36d9e5e149b7d484d0e Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Fri, 7 May 2021 13:35:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E9=A1=BA=E9=81=93?= =?UTF-8?q?=E6=8D=8E=E5=85=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/heartNew/heartNew.js | 71 ++++++++++++++++++++++++++-------- pages/heartNew/heartNew.wxml | 13 ++++++- pages/heartNew/heartNew.wxss | 4 +- pages/indexNew/indexNew.wxml | 4 +- pages/toRegister/toRegister.js | 2 +- utils/activity.js | 7 +++- utils/config.js | 4 +- 7 files changed, 78 insertions(+), 27 deletions(-) diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index 11364d9..f3ed418 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -51,12 +51,14 @@ Page({ isLoading: false, //防止标签切换加载数据时点击切换标签 btnTop: 0, btnLeft: 0, + shouye: {}, }, /** * 生命周期函数--监听页面加载 */ onLoad: function () { + this.getModuleList() this.bannerListV2() this.getVolunteerTags() this.getImgUrl()//获取配置图片 @@ -371,11 +373,12 @@ Page({ }) }) // 2021.03.31 拼团购顺道捎移至首页 - // api.getImgUrl("5").then(function (res) { - // that.setData({ - // tabRightList: res.data - // }) - // }) + // 2021.04.28 拼团购顺道捎移回... + api.getImgUrl("5").then(function (res) { + that.setData({ + tabRightList: res.data + }) + }) }, /** * 页面上拉触底事件的处理函数 @@ -503,18 +506,18 @@ Page({ }) }, - // 跳转 拼团购顺道捎 入口移至首页 - // toJumpPage (e) { - // if (e.currentTarget.dataset.code == 'ptg') { - // wx.navigateTo({ - // url: `/subpages/heart/pages/groupBuyList/groupBuyList?title=${e.currentTarget.dataset.title}` - // }) - // } else if (e.currentTarget.dataset.code == 'sds') { - // wx.navigateTo({ - // url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}` - // }) - // } - // }, + // 跳转 拼团购顺道捎 入口 + toJumpPage (e) { + if (e.currentTarget.dataset.code == 'ptg') { + wx.navigateTo({ + url: `/subpages/heart/pages/groupBuyList/groupBuyList?title=${e.currentTarget.dataset.title}` + }) + } else if (e.currentTarget.dataset.code == 'sds') { + wx.navigateTo({ + url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}` + }) + } + }, //选择志愿者标签筛选 changeTag (e) { if (this.data.isLoading) { @@ -587,4 +590,38 @@ Page({ } }) }, + // 获取模块信息 + getModuleList: function () { + let params = { + pageIndex: 1, + pageSize: 10, + pid: '0' + } + api.moduleCategory(params).then(res => { + console.log('获取模块列表',res.data) + res.data.forEach( item => { + if (item.categoryCode == 'shouye') { + this.data.shouye = { ...item } + this.setData({ + shouye: this.data.shouye + }) + } + }) + }).catch(err => { + console.log(err) + }) + }, + //跳转到 页面 + toShouye () { + //如果是 详情样式，直接跳转详情页面 + if (this.data.shouye.moduleStyle == '4') { + wx.navigateTo({ + url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?pid=${this.data.shouye.pid}&bannerflag=${this.data.shouye.bannerFlag}&categorycode=${this.data.shouye.categoryCode}&modulestyle=${this.data.shouye.moduleStyle}&categoryname=${this.data.shouye.categoryName}` + }) + } else { + wx.navigateTo({ + url: `/subpages/oneKeyService/pages/moduleList/moduleList?pid=${this.data.shouye.id}&bannerflag=${this.data.shouye.bannerFlag}&categorycode=${this.data.shouye.categoryCode}&modulestyle=${this.data.shouye.moduleStyle}&categoryname=${this.data.shouye.categoryName}` + }) + } + }, }) \ No newline at end of file diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index 06e339b..fa88e66 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -53,12 +53,12 @@ - + @@ -129,5 +129,14 @@ button-left="{{btnLeft}}" img-url="../../images/home/scan.png" bindmovebtnCallBack="scanCode"> + + \ No newline at end of file diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index a5e77c9..c4b9f5e 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -290,7 +290,7 @@ button:last-child { /* banner end */ -/* 拼团购/顺道捎 右侧按钮 +/* 拼团购/顺道捎 右侧按钮 */ .tab-right { position: fixed; right: 0; @@ -312,7 +312,7 @@ button:last-child { top: 26rpx; color: white; font-size: 34rpx; -} */ +} .tab-all { position: absolute; width: 100%; diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index c263b9f..25392a5 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -187,14 +187,14 @@ img-url="{{sxjs.imgUrl}}" bindmovebtnCallBack="toSxjs"> - + bindmovebtnCallBack="toShouye"> --> diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index fcd9ce2..b5752ce 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.32" + const versionNum = "1.6.34" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/utils/activity.js b/utils/activity.js index 87e8c3d..bcf03cc 100644 --- a/utils/activity.js +++ b/utils/activity.js @@ -8,7 +8,8 @@ module.exports = { getImgUrl, getBannerDetail, getVolunteerTags, - getToken + getToken, + moduleCategory } function getActivityList (params) { @@ -49,4 +50,8 @@ function getToken (wxCode) { return fly.get("app-user/user/ma/getToken", { wxCode: wxCode }) +} +// 一键服务/解码锦水 改版模块类别接口 20210428 +function moduleCategory(params) { + return fly.get('news/module/moduleCategory', params) } \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index 2ea636f..27e5b70 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - // return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.8:9094/epdc-api/api/' // return 'https://nei.netease.com/api/apimock-v2/068b11343b2a993a9292d11f4b3fa8a8/api/' }