From b518f0abad61b111852cce8971489b292a622778 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 10:49:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0]:[=E5=A2=9E=E5=8A=A0=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=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/discountCardList/discountCardList.js | 2 ++ pages/discountCardList/discountCardList.json | 3 ++- pages/discountCardList/discountCardList.wxml | 5 +++-- pages/game/index.json | 5 +---- pages/main/index.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) 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, }) })