diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index ad2cad2..be7656c 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.20" + const versionNum = "1.6.21" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/components/noticeNew/noticeNew.wxml b/subpages/heart/components/noticeNew/noticeNew.wxml index c445faa..90bdad4 100644 --- a/subpages/heart/components/noticeNew/noticeNew.wxml +++ b/subpages/heart/components/noticeNew/noticeNew.wxml @@ -1,10 +1,10 @@ - + {{item.departure}} 到 {{item.destination}} 出发时间:{{item.departureTime}} - 查看{{">"}} + diff --git a/subpages/heart/images/guide.png b/subpages/heart/images/guide.png new file mode 100644 index 0000000..2e4f32e Binary files /dev/null and b/subpages/heart/images/guide.png differ diff --git a/subpages/heart/pages/dropByList/dropByList.js b/subpages/heart/pages/dropByList/dropByList.js index 0d03ba2..3fd81b5 100644 --- a/subpages/heart/pages/dropByList/dropByList.js +++ b/subpages/heart/pages/dropByList/dropByList.js @@ -201,5 +201,12 @@ Page({ wx.navigateTo({ url: "/subpages/heart/pages/volunteer/volunteer" }) + }, + //前往操作指南 + toNoticeGuide () { + console.log('操作指南') + wx.navigateTo({ + url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?categorycode=sds_czzn&categoryname=操作指南` + }) } }) \ No newline at end of file diff --git a/subpages/heart/pages/dropByList/dropByList.wxml b/subpages/heart/pages/dropByList/dropByList.wxml index 181a785..4b8c4af 100644 --- a/subpages/heart/pages/dropByList/dropByList.wxml +++ b/subpages/heart/pages/dropByList/dropByList.wxml @@ -14,6 +14,9 @@ + + + diff --git a/subpages/heart/pages/dropByList/dropByList.wxss b/subpages/heart/pages/dropByList/dropByList.wxss index 4eb061e..d1d36a4 100644 --- a/subpages/heart/pages/dropByList/dropByList.wxss +++ b/subpages/heart/pages/dropByList/dropByList.wxss @@ -78,7 +78,14 @@ page { right: -10rpx; top: 70rpx; } - .my-publish image { + .guide { + height: 76rpx; + width: 164rpx; + position: fixed; + right: -10rpx; + top: 140rpx; + } + .my-publish image, .guide image { height: 100%; width: 100%; } \ No newline at end of file diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.js b/subpages/heart/pages/groupBuyList/groupBuyList.js index 93348f6..2423c7c 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.js +++ b/subpages/heart/pages/groupBuyList/groupBuyList.js @@ -185,4 +185,11 @@ Page({ url: `/subpages/heart/pages/groupBuyDetail/groupBuyDetail?id=${id}` }) }, + //前往操作指南 + toNoticeGuide () { + console.log('操作指南') + wx.navigateTo({ + url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?categorycode=ptg_czzn&categoryname=操作指南` + }) + } }) \ No newline at end of file diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxml b/subpages/heart/pages/groupBuyList/groupBuyList.wxml index 2c4516c..0656895 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxml +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxml @@ -3,6 +3,9 @@ + + + diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxss b/subpages/heart/pages/groupBuyList/groupBuyList.wxss index 4a5c490..f3a235f 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxss +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxss @@ -17,7 +17,14 @@ page { right: -10rpx; top: 0rpx; } -.my-publish image { +.guide { + height: 76rpx; + width: 164rpx; + position: fixed; + right: -10rpx; + top: 80rpx; +} +.my-publish image, .guide image { height: 100%; width: 100%; }