From 207cde547d49f343bb27bd5ac646b450f39619e0 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 12:00:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=A2=9E=E5=8A=A0]:[=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargain.js | 2 +- pages/coupon/detail/index.js | 2 +- pages/discountCardList/discountCardList.js | 2 +- pages/index/searchbar/index.js | 2 +- pages/integralmall/index.js | 2 +- pages/integralmall/integraHistory/index.js | 2 ++ pages/integralmall/integraHistory/index.json | 4 +++- pages/integralmall/integraHistory/index.wxml | 3 ++- pages/main/index.js | 2 +- pages/passCar/couponDetail/couponDetail.js | 2 ++ pages/passCar/couponDetail/couponDetail.json | 4 +++- pages/passCar/couponDetail/couponDetail.wxml | 3 ++- pages/passCar/couponList/couponList.js | 2 ++ pages/passCar/couponList/couponList.json | 3 ++- pages/passCar/couponList/couponList.wxml | 5 +++-- pages/passCar/couponList/couponList.wxss | 2 +- pages/passCar/passCar.js | 3 ++- pages/passCar/passCar.wxml | 2 +- pages/specialcourtesy/specialcourtesy.js | 2 +- pages/spellGroup/mySpellGroup/index.js | 2 +- pages/topicDetail/index.js | 2 +- utils/imgurl.js | 4 ++++ 22 files changed, 38 insertions(+), 19 deletions(-) diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index 7414e58..cfa0ab4 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 74896fb..dfd2721 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' var config = require("../../../config/config.js"); var app = getApp(); const Http = require("../../../utils/HttpBasics"); diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js index 183ef5e..b0f30f4 100644 --- a/pages/discountCardList/discountCardList.js +++ b/pages/discountCardList/discountCardList.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' const util = require("../../utils/util.js"); const config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); diff --git a/pages/index/searchbar/index.js b/pages/index/searchbar/index.js index 76211d7..4adb657 100644 --- a/pages/index/searchbar/index.js +++ b/pages/index/searchbar/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' const Http = require("../../../utils/HttpBasics"); const imgurl = require("../../../utils/imgurl"); const config = require("../../../config/config"); diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index 55ddd6e..ddeb269 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); diff --git a/pages/integralmall/integraHistory/index.js b/pages/integralmall/integraHistory/index.js index 8f857fd..2f53838 100644 --- a/pages/integralmall/integraHistory/index.js +++ b/pages/integralmall/integraHistory/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' var config = require("../../../config/config.js"); var app = getApp(); const Http = require("../../../utils/HttpBasics"); @@ -10,6 +11,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, score: 10, pageNum: 1, list: [], diff --git a/pages/integralmall/integraHistory/index.json b/pages/integralmall/integraHistory/index.json index 2bd5fcb..fb78eae 100644 --- a/pages/integralmall/integraHistory/index.json +++ b/pages/integralmall/integraHistory/index.json @@ -1,5 +1,7 @@ { "navigationBarTitleText": "积分变更记录", "enablePullDownRefresh": true, - "usingComponents": {} + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/integralmall/integraHistory/index.wxml b/pages/integralmall/integraHistory/index.wxml index 5162083..ea1e540 100644 --- a/pages/integralmall/integraHistory/index.wxml +++ b/pages/integralmall/integraHistory/index.wxml @@ -1,4 +1,5 @@ - + + 当前 {{creditAmount+'分'}} diff --git a/pages/main/index.js b/pages/main/index.js index 93c9a26..f907466 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); const config = require("../../config/config"); diff --git a/pages/passCar/couponDetail/couponDetail.js b/pages/passCar/couponDetail/couponDetail.js index 187aa80..e45d684 100644 --- a/pages/passCar/couponDetail/couponDetail.js +++ b/pages/passCar/couponDetail/couponDetail.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const util = require("../../../utils/util"); const config = require("../../../config/config.js"); const Http = require("../../../utils/HttpBasics"); @@ -5,6 +6,7 @@ const Http = require("../../../utils/HttpBasics"); //券详情页面 Page({ data: { + navigationBarHeight, data: {}, createDate: "", expiredTime: "", diff --git a/pages/passCar/couponDetail/couponDetail.json b/pages/passCar/couponDetail/couponDetail.json index 5aba0d6..2951b96 100644 --- a/pages/passCar/couponDetail/couponDetail.json +++ b/pages/passCar/couponDetail/couponDetail.json @@ -1,3 +1,5 @@ { - "navigationBarTitleText": "使用优惠券" + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/passCar/couponDetail/couponDetail.wxml b/pages/passCar/couponDetail/couponDetail.wxml index 1f0ccd0..b1f780e 100644 --- a/pages/passCar/couponDetail/couponDetail.wxml +++ b/pages/passCar/couponDetail/couponDetail.wxml @@ -1,4 +1,5 @@ - + + diff --git a/pages/passCar/couponList/couponList.js b/pages/passCar/couponList/couponList.js index 7ac376d..621a23f 100644 --- a/pages/passCar/couponList/couponList.js +++ b/pages/passCar/couponList/couponList.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const format = require("../../../utils/util.js"); const config = require("../../../config/config.js"); const app = getApp(); @@ -5,6 +6,7 @@ const Http = require("../../../utils/HttpBasics"); const imgurl = require("../../../utils/imgurl"); Page({ data: { + navigationBarHeight, noCoupon:imgurl.noCoupon.url, couponUrl: imgurl.coupon.url, linessUrl: imgurl.liness.url, diff --git a/pages/passCar/couponList/couponList.json b/pages/passCar/couponList/couponList.json index 9bc1f02..aa253d5 100644 --- a/pages/passCar/couponList/couponList.json +++ b/pages/passCar/couponList/couponList.json @@ -1,7 +1,8 @@ { "usingComponents": { "i-tab": "../../../dist/tab/index", - "i-tabs": "../../../dist/tabs/index" + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../../components/navbar/navbar" }, "navigationBarTitleText": "停车券", "navigationBarBackgroundColor": "#F4F5F9" diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml index ed09a19..b4d05bf 100644 --- a/pages/passCar/couponList/couponList.wxml +++ b/pages/passCar/couponList/couponList.wxml @@ -1,6 +1,7 @@ - + + - + diff --git a/pages/passCar/couponList/couponList.wxss b/pages/passCar/couponList/couponList.wxss index 9fb56d8..cff7f00 100644 --- a/pages/passCar/couponList/couponList.wxss +++ b/pages/passCar/couponList/couponList.wxss @@ -2,6 +2,7 @@ width: 100%; height: 100%; background: #F4F5F9; + position: relative; } .tabs { @@ -9,7 +10,6 @@ height: 88rpx; text-align: center; position: fixed; - top: 0; left: 0; right: 0; z-index: 100000; diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 0a0b81b..f663f9e 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let app = getApp(); const format = require("../../utils/util.js"); @@ -10,6 +10,7 @@ Page({ data: { navigationBarHeight, jianUrl: imgurl.jian.url, + jiaofeiwm: imgurl.jiaofeiwm.url, parkUrl: imgurl.park.url, guanliHr: imgurl.guanliHr.url, qidaiUrl: imgurl.qidai.url, diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index 181a685..6bcded4 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -91,7 +91,7 @@ - + 缴费规则 diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js index af76e5a..790f621 100644 --- a/pages/specialcourtesy/specialcourtesy.js +++ b/pages/specialcourtesy/specialcourtesy.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' var config = require("../../config/config.js"); var app = getApp(); const Http = require("../../utils/HttpBasics"); diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 219c6d5..8b3a39d 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -1,5 +1,5 @@ // pages/spellGroup/mySpellGroup/index.js -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' var config = require("../../../config/config.js"); const Http = require("../../../utils/HttpBasics"); const imgurl = require("../../../utils/imgurl"); diff --git a/pages/topicDetail/index.js b/pages/topicDetail/index.js index d688d9e..b11208c 100644 --- a/pages/topicDetail/index.js +++ b/pages/topicDetail/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' let config = require("../../config/config.js"); let app = getApp(); const Http = require("../../utils/HttpBasics"); diff --git a/utils/imgurl.js b/utils/imgurl.js index 4d6aafa..16d53bd 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -12,6 +12,10 @@ module.exports = { 'url': baseUrl + 'add.png', 'name': '' }, + 'jiaofeiwm':{ + 'url': baseUrl + 'jiaofeiwm.png', + 'name': '缴费规则' + }, 'addr-white': { 'url': baseUrl + 'addr-white.png', 'name': '' From 1dc51317dd1405d6142f87e2e61ed757548e1b5c Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 12:26:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD][?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0]:[=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/rushToBuy/index.js | 2 ++ pages/rushToBuy/index.json | 3 ++- pages/rushToBuy/index.wxml | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index 02fffb5..bb64876 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' let config = require("../../config/config.js"); let Http = require("../../utils/HttpBasics"); const util = require("../../utils/util"); @@ -8,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, linesUrl: imgurl.lines.url, loadingUrl: imgurl.loading.url, wmhome: imgurl.wmhome.url, diff --git a/pages/rushToBuy/index.json b/pages/rushToBuy/index.json index 823c0f3..ae49195 100644 --- a/pages/rushToBuy/index.json +++ b/pages/rushToBuy/index.json @@ -1,5 +1,6 @@ { - "usingComponents": { + "usingComponents": { + "navbar": "../../components/navbar/navbar" }, "navigationBarTitleText": "限时秒杀" } \ No newline at end of file diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index 5c8dfa2..4bea974 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -1,6 +1,7 @@ - + + - +