diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index 436e1f3..151a6a7 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -365,11 +365,12 @@ Page({ getImgUrl: res.data[0] }) }) - api.getImgUrl("5").then(function (res) { - that.setData({ - tabRightList: res.data - }) - }) + // 2021.03.31 拼团购顺道捎移至首页 + // api.getImgUrl("5").then(function (res) { + // that.setData({ + // tabRightList: res.data + // }) + // }) }, /** * 页面上拉触底事件的处理函数 @@ -497,18 +498,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) { diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index f5362b8..06e339b 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -53,12 +53,12 @@ - + diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index 5e10d46..a5e77c9 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -290,6 +290,7 @@ button:last-child { /* banner end */ +/* 拼团购/顺道捎 右侧按钮 .tab-right { position: fixed; right: 0; @@ -311,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.js b/pages/indexNew/indexNew.js index 0d7b80a..c6fd9f4 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -85,6 +85,7 @@ Page({ jmjs: {}, sxjs: {}, shouye: {}, + tabRightList: [], //拼团购和顺道捎 }, onShow: function () { if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) { @@ -163,6 +164,11 @@ Page({ }) } }) + api.getImgUrl("5").then(res => { + this.setData({ + tabRightList: res.data + }) + }) }, // 获取默认网格 getResidentConfig (){ @@ -781,5 +787,17 @@ Page({ reject(false) }) }) - } + }, + //拼团购/顺道捎 跳转 2021.03.31 + 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}` + }) + } + }, }) \ No newline at end of file diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 52e8e20..c263b9f 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -49,6 +49,12 @@ + + + + + +