From e8de82b43995a6416215250c5e545961f06f640b Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 2 Feb 2021 13:32:44 +0800 Subject: [PATCH] =?UTF-8?q?1.6.21=20=E6=8B=BC=E5=9B=A2=E8=B4=AD=E9=A1=BA?= =?UTF-8?q?=E9=81=93=E6=8D=8E=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=8C=87?= =?UTF-8?q?=E5=8D=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- .../heart/components/noticeNew/noticeNew.wxml | 4 ++-- subpages/heart/images/guide.png | Bin 0 -> 4259 bytes subpages/heart/pages/dropByList/dropByList.js | 7 +++++++ subpages/heart/pages/dropByList/dropByList.wxml | 3 +++ subpages/heart/pages/dropByList/dropByList.wxss | 9 ++++++++- .../heart/pages/groupBuyList/groupBuyList.js | 7 +++++++ .../heart/pages/groupBuyList/groupBuyList.wxml | 3 +++ .../heart/pages/groupBuyList/groupBuyList.wxss | 9 ++++++++- 9 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 subpages/heart/images/guide.png 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 0000000000000000000000000000000000000000..2e4f32e6d8980336bdce615b2d4d1249cb322fd6 GIT binary patch literal 4259 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 FV1lIV^6mft literal 0 HcmV?d00001 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%; }