From c3dfd81feba33d49971bd21019b2c3828ac9b510 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Fri, 2 Aug 2019 13:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0]:[=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8C=89=E9=92=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cardorder/index/index.wxml | 2 +-
pages/couponorder/index/index.wxml | 2 +-
pages/order/index/index.wxml | 2 +-
pages/radetail/index.js | 2 ++
pages/radetail/index.json | 5 ++++-
pages/radetail/index.wxml | 7 ++++---
pages/user/myactivity/index.js | 2 ++
pages/user/myactivity/index.json | 3 ++-
pages/user/myactivity/index.wxml | 5 +++--
pages/user/myactivity/index.wxss | 1 -
10 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index ede689e..23a33cc 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index af56cc6..86ddc8a 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index eaedb42..0a78b98 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/radetail/index.js b/pages/radetail/index.js
index 81cc9fd..4a041ae 100644
--- a/pages/radetail/index.js
+++ b/pages/radetail/index.js
@@ -1,3 +1,4 @@
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px';
let config = require("../../config/config.js");
let app = getApp();
const Http = require("../../utils/HttpBasics");
@@ -8,6 +9,7 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let configUrls = extConfig.attr.configUrl;
Page({
data: {
+ navigationBarHeight,
data: {},
status: 1,
couponId: null,
diff --git a/pages/radetail/index.json b/pages/radetail/index.json
index 9fabb8c..7136149 100644
--- a/pages/radetail/index.json
+++ b/pages/radetail/index.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "活动详情"
+ "navigationBarTitleText": "活动详情",
+ "usingComponents": {
+ "navbar": "../../../components/navbar/navbar"
+ }
}
\ No newline at end of file
diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml
index 3563096..2cd9042 100644
--- a/pages/radetail/index.wxml
+++ b/pages/radetail/index.wxml
@@ -1,10 +1,11 @@
-