From 5ecfe5a84152aaeccfb9886188f51eb6a2861829 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Fri, 25 Dec 2020 16:20:19 +0800 Subject: [PATCH] =?UTF-8?q?v1.6.13=20=E5=8A=A0=E5=8D=95=E5=8F=B7=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/heartNew/heartNew.js | 4 ++-- pages/heartNew/heartNew.wxml | 5 ++++- pages/heartNew/heartNew.wxss | 15 ++++++++++++--- pages/toRegister/toRegister.js | 2 +- subpages/heart/pages/dropByList/dropByList.js | 5 ++++- subpages/heart/pages/dropByList/dropByList.json | 2 +- .../heart/pages/dropByPublish/dropByPublish.json | 2 +- subpages/heart/pages/groupBuyList/groupBuyList.js | 3 +++ .../heart/pages/groupBuyList/groupBuyList.json | 2 +- .../pages/groupBuyPublish/groupBuyPublish.json | 2 +- .../pages/groupBuyPublish/groupBuyPublish.wxml | 2 +- 11 files changed, 31 insertions(+), 13 deletions(-) diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index 594dcef..bf7c624 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -467,11 +467,11 @@ Page({ toJumpPage (e) { if (e.currentTarget.dataset.code == 'ptg') { wx.navigateTo({ - url: `/subpages/heart/pages/groupBuyList/groupBuyList` + 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` + url: `/subpages/heart/pages/dropByList/dropByList?title=${e.currentTarget.dataset.title}` }) } }, diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index 650879b..b618ca9 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -54,7 +54,10 @@ - + + + {{item.remark}} + diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index 55c701e..9ce2f6d 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -299,10 +299,19 @@ button:last-child { flex-direction: column; } .tab-right image { - width: 234rpx; - height: 118rpx; + width: 160rpx; + height: 102rpx; +} +.tab-right .tab { + position: relative; +} +.tab-right .tab .tab-text { + position: absolute; + left: 40rpx; + top: 26rpx; + color: white; + font-size: 34rpx; } - .tab-all { position: absolute; width: 100%; diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 5fe258a..11580c8 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.12" + const versionNum = "1.6.13" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/pages/dropByList/dropByList.js b/subpages/heart/pages/dropByList/dropByList.js index fae073c..bfe4140 100644 --- a/subpages/heart/pages/dropByList/dropByList.js +++ b/subpages/heart/pages/dropByList/dropByList.js @@ -25,7 +25,10 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { + onLoad: function (options) { + wx.setNavigationBarTitle({ + title: options.title + }) // this.getSdsList() }, diff --git a/subpages/heart/pages/dropByList/dropByList.json b/subpages/heart/pages/dropByList/dropByList.json index 08d126c..970d540 100644 --- a/subpages/heart/pages/dropByList/dropByList.json +++ b/subpages/heart/pages/dropByList/dropByList.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "顺道捎", + "navigationBarTitleText": "", "usingComponents": { "notice": "../../components/noticeNew/noticeNew", "coverview-dialog": "../../components/coverViewDialog/coverViewDialog", diff --git a/subpages/heart/pages/dropByPublish/dropByPublish.json b/subpages/heart/pages/dropByPublish/dropByPublish.json index 3bc6e8c..e5b8f4a 100644 --- a/subpages/heart/pages/dropByPublish/dropByPublish.json +++ b/subpages/heart/pages/dropByPublish/dropByPublish.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "顺道捎", + "navigationBarTitleText": "发布", "usingComponents": { "date-time-picker": "../../../../components/DateTimePicker/index", "notice": "../../components/notice/notice" diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.js b/subpages/heart/pages/groupBuyList/groupBuyList.js index b331014..a773f0e 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.js +++ b/subpages/heart/pages/groupBuyList/groupBuyList.js @@ -24,6 +24,9 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + wx.setNavigationBarTitle({ + title: options.title + }) // this.getGroupBuyList() }, diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.json b/subpages/heart/pages/groupBuyList/groupBuyList.json index 59ee916..970d540 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.json +++ b/subpages/heart/pages/groupBuyList/groupBuyList.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "加单号", + "navigationBarTitleText": "", "usingComponents": { "notice": "../../components/noticeNew/noticeNew", "coverview-dialog": "../../components/coverViewDialog/coverViewDialog", diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json index 295eb1d..e5b8f4a 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "拼团购发布", + "navigationBarTitleText": "发布", "usingComponents": { "date-time-picker": "../../../../components/DateTimePicker/index", "notice": "../../components/notice/notice" diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml index d59f1b5..c7b9ffd 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml @@ -11,7 +11,7 @@ 内容 - + 联系电话