From 059b203f00a089a22d9adfd5c4151f3f979f6793 Mon Sep 17 00:00:00 2001 From: caserKing Date: Fri, 2 Aug 2019 19:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=E9=A1=B6?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/acSignIn/index.js | 2 ++ pages/acSignIn/index.json | 5 ++++- pages/acSignIn/index.wxml | 1 + pages/addPark/addPark.js | 2 ++ pages/addPark/addPark.json | 5 ++++- pages/addPark/addPark.wxml | 3 ++- pages/bannerdetail/index.js | 2 ++ pages/bannerdetail/index.json | 5 ++++- pages/bannerdetail/index.wxml | 5 +++-- 9 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js index 913545c..3b290f3 100644 --- a/pages/acSignIn/index.js +++ b/pages/acSignIn/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const util = require("../../utils/util.js"); const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); @@ -6,6 +7,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, showPage: false, showPage1:false }, diff --git a/pages/acSignIn/index.json b/pages/acSignIn/index.json index 5f0c9e6..4548ae8 100644 --- a/pages/acSignIn/index.json +++ b/pages/acSignIn/index.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "签到" + "navigationBarTitleText": "签到", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/acSignIn/index.wxml b/pages/acSignIn/index.wxml index 5d4b765..de6125f 100644 --- a/pages/acSignIn/index.wxml +++ b/pages/acSignIn/index.wxml @@ -1,3 +1,4 @@ + 签到成功 diff --git a/pages/addPark/addPark.js b/pages/addPark/addPark.js index 74f886e..4f2cab4 100644 --- a/pages/addPark/addPark.js +++ b/pages/addPark/addPark.js @@ -1,5 +1,6 @@ // pages/park/addPark/addPark.js const app = getApp(); +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const imgurl = require("../../utils/imgurl"); Page({ @@ -7,6 +8,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, shanchuGrayUrl: imgurl.shanchuGray.url, shanchuUrl: imgurl.shanchu.url, title: '京', diff --git a/pages/addPark/addPark.json b/pages/addPark/addPark.json index 0db3cdf..0833fe6 100644 --- a/pages/addPark/addPark.json +++ b/pages/addPark/addPark.json @@ -1,4 +1,7 @@ { "navigationBarTitleText": "添加车辆", - "navigationBarBackgroundColor": "#F4F5F9" + "navigationBarBackgroundColor": "#F4F5F9", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/addPark/addPark.wxml b/pages/addPark/addPark.wxml index 9068a87..0a1a981 100644 --- a/pages/addPark/addPark.wxml +++ b/pages/addPark/addPark.wxml @@ -1,4 +1,5 @@ -请输入车牌号(新能源选填) + +请输入车牌号(新能源选填) {{title}} diff --git a/pages/bannerdetail/index.js b/pages/bannerdetail/index.js index 077b1e9..6cfa0a1 100644 --- a/pages/bannerdetail/index.js +++ b/pages/bannerdetail/index.js @@ -1,10 +1,12 @@ let config = require("../../config/config.js"); +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' let app = getApp(); const Http = require("../../utils/HttpBasics"); const util = require("../../utils/util"); const imgurl = require("../../utils/imgurl"); Page({ data: { + navigationBarHeight, data: {}, couponId: null, orderId: "", diff --git a/pages/bannerdetail/index.json b/pages/bannerdetail/index.json index 9fabb8c..cf361b6 100644 --- a/pages/bannerdetail/index.json +++ b/pages/bannerdetail/index.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "活动详情" + "navigationBarTitleText": "活动详情", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index 7f3b7a6..2abf98b 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -1,6 +1,7 @@ - + + - +