diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js index f23d531..183ef5e 100644 --- a/pages/discountCardList/discountCardList.js +++ b/pages/discountCardList/discountCardList.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const util = require("../../utils/util.js"); const config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); @@ -5,6 +6,7 @@ const imgurl = require("../../utils/imgurl"); let app = getApp(); Page({ data: { + navigationBarHeight, tabData:[ { title: '全部', diff --git a/pages/discountCardList/discountCardList.json b/pages/discountCardList/discountCardList.json index def9e01..4547901 100644 --- a/pages/discountCardList/discountCardList.json +++ b/pages/discountCardList/discountCardList.json @@ -1,7 +1,8 @@ { "usingComponents": { "i-tab": "../../../dist/tab/index", - "i-tabs": "../../../dist/tabs/index" + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../components/navbar/navbar" }, "navigationBarTitleText": "消费卡", "navigationBarBackgroundColor": "#F4F5F9" diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml index d8cdd22..65ca41d 100644 --- a/pages/discountCardList/discountCardList.wxml +++ b/pages/discountCardList/discountCardList.wxml @@ -1,6 +1,7 @@ - + + - + diff --git a/pages/game/index.json b/pages/game/index.json index 0d6ac40..f899d12 100644 --- a/pages/game/index.json +++ b/pages/game/index.json @@ -1,6 +1,3 @@ { - "usingComponents": { - - }, - "navigationBarTitleText": "" + "navigationBarTitleText": "小游戏" } \ No newline at end of file diff --git a/pages/main/index.js b/pages/main/index.js index 6c9884a..f907466 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -159,7 +159,7 @@ Page({ couponId: "" + that.data.couponId }; } - wx.navigateTo({ + wx.redirectTo({ url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, }) })