From b9e0a0c5430255c74fb46fc45e53b5b13f35b4f4 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 16:36:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=85=91=E6=8D=A2=E7=A0=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/detail/index.wxss | 5 +++-- pages/orderquanma/index.js | 2 ++ pages/orderquanma/index.json | 5 +++-- pages/orderquanma/index.wxml | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 7668975..3010a6d 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -170,6 +170,7 @@ page { background: #FFFFFF; width: 100%; margin-top: 20rpx; + padding-bottom: 20rpx; } .classifShop >view{ font-size: 28rpx; @@ -179,7 +180,7 @@ page { justify-content: space-between; padding-left: 5%; padding-right: 5%; - margin-bottom: 10rpx; + margin-bottom: 20rpx; } .classifShop >view:nth-child(1){ height: 88rpx!important; @@ -510,7 +511,7 @@ radio { border-radius: 61rpx; } .merchantImgUrl{ - width: 120rpx; + width: 90rpx; float: left; border-radius: 10rpx; z-index: 10; diff --git a/pages/orderquanma/index.js b/pages/orderquanma/index.js index 5d3c871..748cdb5 100644 --- a/pages/orderquanma/index.js +++ b/pages/orderquanma/index.js @@ -1,4 +1,5 @@ // let util = require("../../utils/util"); +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' let Http = require("../../utils/HttpBasics"); let config = require("../../config/config.js"); let app = getApp(); @@ -6,6 +7,7 @@ const imgurl = require("../../utils/imgurl"); const QR = require("../../utils/memberqrcode.js"); Page({ data: { + navigationBarHeight, btomLineUrl: imgurl.btomLine.url, topLineUrl: imgurl.topLine.url, lineUrl: imgurl.line.url, diff --git a/pages/orderquanma/index.json b/pages/orderquanma/index.json index 80b65b3..d82a6ce 100644 --- a/pages/orderquanma/index.json +++ b/pages/orderquanma/index.json @@ -1,4 +1,5 @@ { - "navigationBarTitleText": "兑换码", - "navigationBarBackgroundColor": "#FD832D" + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml index 014ffa0..f4ccf83 100644 --- a/pages/orderquanma/index.wxml +++ b/pages/orderquanma/index.wxml @@ -1,4 +1,5 @@ - + + {{title}}