From 09521b1db1936810330ea280fd9a2c58bb648c8e Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 11:16:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=EF=BC=8C=E7=89=B9=E4=BA=AB?= =?UTF-8?q?=E7=A4=BC=E9=81=87][=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 --- components/navbar/navbar.wxss | 2 ++ pages/integralmall/index.js | 2 ++ pages/integralmall/index.json | 3 ++- pages/integralmall/index.wxml | 5 +++-- pages/integralmall/index.wxss | 4 ++-- pages/main/index.js | 2 +- pages/specialcourtesy/specialcourtesy.js | 2 ++ pages/specialcourtesy/specialcourtesy.json | 5 ++++- pages/specialcourtesy/specialcourtesy.wxml | 5 +++-- 9 files changed, 21 insertions(+), 9 deletions(-) diff --git a/components/navbar/navbar.wxss b/components/navbar/navbar.wxss index 8b1ff7e..25774b2 100644 --- a/components/navbar/navbar.wxss +++ b/components/navbar/navbar.wxss @@ -2,6 +2,8 @@ width: 100vw; background-color: #F4F5F9; position: fixed; + left: 0; + top: 0; z-index: 400000000; } diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index e1b22ad..55ddd6e 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); @@ -7,6 +8,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, erweima: imgurl.erweima.url, bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, diff --git a/pages/integralmall/index.json b/pages/integralmall/index.json index 28ea0b0..5f090e4 100644 --- a/pages/integralmall/index.json +++ b/pages/integralmall/index.json @@ -6,6 +6,7 @@ "usingComponents": { "c-banner": "../../components/spellbanner/index", "i-tab": "../../../dist/tab/index", - "i-tabs": "../../../dist/tabs/index" + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../components/navbar/navbar" } } \ No newline at end of file diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index f19fb86..c6503a0 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -1,5 +1,6 @@ - - + + + diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss index 568e69d..81a0498 100644 --- a/pages/integralmall/index.wxss +++ b/pages/integralmall/index.wxss @@ -99,7 +99,7 @@ progress{ width: 500rpx; height:30rpx; position: absolute; - top: 176rpx; + top: 294rpx; left:70rpx; } .jifen image{ @@ -110,7 +110,7 @@ progress{ font-size: 40rpx; font-weight: 500; position: absolute; - top:122rpx; + top:240rpx; left:70rpx; color: #FFFFFF; } diff --git a/pages/main/index.js b/pages/main/index.js index f907466..93c9a26 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); const config = require("../../config/config"); diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js index e0528c8..af76e5a 100644 --- a/pages/specialcourtesy/specialcourtesy.js +++ b/pages/specialcourtesy/specialcourtesy.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' var config = require("../../config/config.js"); var app = getApp(); const Http = require("../../utils/HttpBasics"); @@ -8,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, myspeacialUrl: imgurl.myspeacial.url, teliconUrl: imgurl.telicon.url, wmhome: imgurl.wmhome.url, diff --git a/pages/specialcourtesy/specialcourtesy.json b/pages/specialcourtesy/specialcourtesy.json index 6f07031..3d0fbad 100644 --- a/pages/specialcourtesy/specialcourtesy.json +++ b/pages/specialcourtesy/specialcourtesy.json @@ -1,5 +1,8 @@ { "navigationBarTitleText": "我的特权", "navigationBarBackgroundColor": "#FD832D", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml index 4c9c88e..f118731 100644 --- a/pages/specialcourtesy/specialcourtesy.wxml +++ b/pages/specialcourtesy/specialcourtesy.wxml @@ -1,5 +1,6 @@ - - + + +