diff --git a/app.json b/app.json
index 62a06b7..138671d 100644
--- a/app.json
+++ b/app.json
@@ -22,7 +22,6 @@
"pages/cardorder/index/index",
"pages/scanPay/scanPay",
"pages/edit/edit",
- "pages/actdetail/actdetail",
"pages/radetail/index",
"pages/radetail/joinActivity/edit",
"pages/bannerdetail/index",
diff --git a/pages/actdetail/actdetail.js b/pages/actdetail/actdetail.js
deleted file mode 100644
index f0f8259..0000000
--- a/pages/actdetail/actdetail.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// pages/actdetail/actdetail.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- detail:''
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- let that = this;
- console.log(options);
- that.setData({
- detail:options.detail
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
-})
\ No newline at end of file
diff --git a/pages/actdetail/actdetail.json b/pages/actdetail/actdetail.json
deleted file mode 100644
index 9fabb8c..0000000
--- a/pages/actdetail/actdetail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "navigationBarTitleText": "活动详情"
-}
\ No newline at end of file
diff --git a/pages/actdetail/actdetail.wxml b/pages/actdetail/actdetail.wxml
deleted file mode 100644
index 1499319..0000000
--- a/pages/actdetail/actdetail.wxml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- {{detail}}
-
\ No newline at end of file
diff --git a/pages/actdetail/actdetail.wxss b/pages/actdetail/actdetail.wxss
deleted file mode 100644
index 330b835..0000000
--- a/pages/actdetail/actdetail.wxss
+++ /dev/null
@@ -1,12 +0,0 @@
-view text {
- display: block;
-}
-
-view text:nth-of-type(1) {
- padding: 20rpx 30rpx;
- font-size: 26rpx;
- color: #191919;
- letter-spacing: 0;
- text-align: justify;
- line-height: 46rpx;
-}
diff --git a/pages/bannerdetail/index.js b/pages/bannerdetail/index.js
index 6cfa0a1..6aed197 100644
--- a/pages/bannerdetail/index.js
+++ b/pages/bannerdetail/index.js
@@ -48,12 +48,5 @@ Page({
url: '/pages/main/index',
})
},
- gotoactdetail:function(){
- let that = this;
- console.log(that.data.data.detail)
-
- wx.navigateTo({
- url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`,
- })
- }
+
});
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml
index cde1c57..dff4d92 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxml
+++ b/pages/bargain/bargainDatail/bargainDatail.wxml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/pages/canvas/index.js b/pages/canvas/index.js
index c007558..4ba7a68 100644
--- a/pages/canvas/index.js
+++ b/pages/canvas/index.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,
poterbg: imgurl.poterbg.url,
windowWidth: wx.getSystemInfoSync().windowWidth,
windowHeight: wx.getSystemInfoSync().screenHeight,
diff --git a/pages/canvas/index.json b/pages/canvas/index.json
index a793d1a..d8a0ead 100644
--- a/pages/canvas/index.json
+++ b/pages/canvas/index.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "分享",
- "usingComponents": {}
+ "usingComponents": {
+ "navbar": "../../components/navbar/navbar"
+ }
}
\ No newline at end of file
diff --git a/pages/canvas/index.wxml b/pages/canvas/index.wxml
index 80b1380..0e62267 100644
--- a/pages/canvas/index.wxml
+++ b/pages/canvas/index.wxml
@@ -1,4 +1,5 @@
-
+
+
diff --git a/pages/cardorder/detail/index.js b/pages/cardorder/detail/index.js
index bfa4bc6..ff8c1a8 100644
--- a/pages/cardorder/detail/index.js
+++ b/pages/cardorder/detail/index.js
@@ -1,3 +1,4 @@
+const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px'
const util = require("../../../utils/util");
const config = require("../../../config/config.js");
const Http = require("../../../utils/HttpBasics");
@@ -6,6 +7,7 @@ let app = getApp();
//券详情页面
Page({
data: {
+ navigationBarHeight,
code: "",
lineUrl: imgurl.line.url,
wm01Url: imgurl.wm01.url,
diff --git a/pages/cardorder/detail/index.json b/pages/cardorder/detail/index.json
index 3765266..9433a94 100644
--- a/pages/cardorder/detail/index.json
+++ b/pages/cardorder/detail/index.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "使用优惠券"
+ "navigationBarTitleText": "使用优惠券",
+ "usingComponents": {
+ "navbar": "../../../components/navbar/navbar"
+ }
}
diff --git a/pages/cardorder/detail/index.wxml b/pages/cardorder/detail/index.wxml
index 3914dde..a3444f0 100644
--- a/pages/cardorder/detail/index.wxml
+++ b/pages/cardorder/detail/index.wxml
@@ -1,4 +1,5 @@
-
+
+
diff --git a/pages/cardorder/userule/userule.js b/pages/cardorder/userule/userule.js
index f7b3f44..57edc81 100644
--- a/pages/cardorder/userule/userule.js
+++ b/pages/cardorder/userule/userule.js
@@ -1,11 +1,12 @@
// pages/cardorder/userule/userule.js
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
Page({
/**
* 页面的初始数据
*/
data: {
-
+ navigationBarHeight,
},
/**
diff --git a/pages/cardorder/userule/userule.json b/pages/cardorder/userule/userule.json
index d9d772a..40d70c7 100644
--- a/pages/cardorder/userule/userule.json
+++ b/pages/cardorder/userule/userule.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "使用规则"
+ "navigationBarTitleText": "使用规则",
+ "usingComponents": {
+ "navbar": "../../../components/navbar/navbar"
+ }
}
\ No newline at end of file
diff --git a/pages/cardorder/userule/userule.wxml b/pages/cardorder/userule/userule.wxml
index 66797f6..fa14bb2 100644
--- a/pages/cardorder/userule/userule.wxml
+++ b/pages/cardorder/userule/userule.wxml
@@ -1,4 +1,5 @@
-
+
+
1、如何使用消费卡?
diff --git a/pages/complete/index.js b/pages/complete/index.js
index fb1d5dc..2a35997 100644
--- a/pages/complete/index.js
+++ b/pages/complete/index.js
@@ -1,11 +1,13 @@
// pages/complete/index.js
const imgurl = require("../../utils/imgurl");
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
Page({
/**
* 页面的初始数据
*/
data: {
+ navigationBarHeight,
success01: imgurl.success01.url,
couponOrderId:''
},
diff --git a/pages/complete/index.json b/pages/complete/index.json
index 41ca691..cac1432 100644
--- a/pages/complete/index.json
+++ b/pages/complete/index.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "navbar": "../../components/navbar/navbar"
+ },
"navigationBarTitleText": "领取成功"
}
\ No newline at end of file
diff --git a/pages/complete/index.wxml b/pages/complete/index.wxml
index 409a315..c150983 100644
--- a/pages/complete/index.wxml
+++ b/pages/complete/index.wxml
@@ -1,4 +1,5 @@
-
+
+
diff --git a/pages/freeBannerDetail/index.js b/pages/freeBannerDetail/index.js
index 1507d6a..95c03c3 100644
--- a/pages/freeBannerDetail/index.js
+++ b/pages/freeBannerDetail/index.js
@@ -1,4 +1,5 @@
let app = getApp();
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
var WxParse = require('../../wxParse/wxParse.js');
const config = require("../../config/config");
const Http = require("../../utils/HttpBasics");
@@ -12,6 +13,7 @@ Page({
* 页面的初始数据
*/
data: {
+ navigationBarHeight,
url: config.url,
token: app.globalData.token,
id:'',
diff --git a/pages/freeBannerDetail/index.json b/pages/freeBannerDetail/index.json
index 9fabb8c..cf361b6 100644
--- a/pages/freeBannerDetail/index.json
+++ b/pages/freeBannerDetail/index.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "活动详情"
+ "navigationBarTitleText": "活动详情",
+ "usingComponents": {
+ "navbar": "../../components/navbar/navbar"
+ }
}
\ No newline at end of file
diff --git a/pages/freeBannerDetail/index.wxml b/pages/freeBannerDetail/index.wxml
index fa77f36..ee04214 100644
--- a/pages/freeBannerDetail/index.wxml
+++ b/pages/freeBannerDetail/index.wxml
@@ -1,5 +1,6 @@
-
+
+
diff --git a/pages/radetail/index.js b/pages/radetail/index.js
index dfbc6ac..85936a8 100644
--- a/pages/radetail/index.js
+++ b/pages/radetail/index.js
@@ -100,13 +100,5 @@ Page({
url: '/pages/main/index',
})
},
- gotoactdetail: function() {
- let that = this;
- console.log(that.data.data.detail)
-
- wx.navigateTo({
- url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`,
- })
- },
});
\ No newline at end of file
diff --git a/pages/topicDetail/index.js b/pages/topicDetail/index.js
index b11208c..9297d50 100644
--- a/pages/topicDetail/index.js
+++ b/pages/topicDetail/index.js
@@ -82,11 +82,5 @@ Page({
})
}
},
- gotoactdetail:function(){
- let that = this;
- console.log(that.data.data.detail)
- wx.navigateTo({
- url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`,
- })
- }
+
});