diff --git a/app.json b/app.json index b06c420..b650123 100644 --- a/app.json +++ b/app.json @@ -37,7 +37,8 @@ "pages/index/gameentry/gentry", "pages/specialcourtesy/specialcourtesy", "pages/discountCardList/discountCardList", - "pages/cardListDetail/cardListDetail" + "pages/cardListDetail/cardListDetail", + "pages/freeBannerDetail/index" ], "navigateToMiniProgramAppIdList": [ "wx192b7d2e8dcbefd0", diff --git a/assets/img/discountcard.png b/assets/img/discountcard.png deleted file mode 100644 index c96ba50..0000000 Binary files a/assets/img/discountcard.png and /dev/null differ diff --git a/components/banner/index.js b/components/banner/index.js index 9f1f140..6cd60e2 100644 --- a/components/banner/index.js +++ b/components/banner/index.js @@ -28,9 +28,16 @@ Component({ }); }, gotobannerdetail: function(e) { - wx.navigateTo({ - url: `/pages/bannerdetail/index?id=${e.currentTarget.dataset.id}` - }); + console.log(e) + if(e.currentTarget.dataset.data.type==2){ + wx.navigateTo({ + url: `/pages/freeBannerDetail/index?id=${e.currentTarget.dataset.id}` + }); + }else{ + wx.navigateTo({ + url: `/pages/bannerdetail/index?id=${e.currentTarget.dataset.id}` + }); + } } } }); diff --git a/components/banner/index.wxml b/components/banner/index.wxml index bacefba..0c16fe0 100644 --- a/components/banner/index.wxml +++ b/components/banner/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/config/config.js b/config/config.js index 516ea34..74a47c3 100755 --- a/config/config.js +++ b/config/config.js @@ -3,6 +3,7 @@ var config = { // url:"https://c.malls.iformall.com/C/api", // url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.66:7000/C/api', + // url: 'http://10.100.35.203:7000/C/api', api: { /** * 接口用途:login diff --git a/pages/bannerdetail/index.js b/pages/bannerdetail/index.js index f539eac..6f17dbe 100644 --- a/pages/bannerdetail/index.js +++ b/pages/bannerdetail/index.js @@ -9,7 +9,8 @@ Page({ orderId: "", day: "", hour: "", - minute: "" + minute: "", + nodes: '' }, onLoad(options) { let that = this; @@ -20,6 +21,13 @@ Page({ id: options.id } }).then(res => { + if(res.data.type==2){ + console.log(res.data.html,33333333) + // console.log(JSON.parse(res.data.html),222222222222) + that.setData({ + nodes: res.data.html + }) + } that.setData({ data: res.data }); diff --git a/pages/freeBannerDetail/index.js b/pages/freeBannerDetail/index.js new file mode 100644 index 0000000..add10a2 --- /dev/null +++ b/pages/freeBannerDetail/index.js @@ -0,0 +1,81 @@ +// pages/freeBannerDetail/index.js +let app = getApp(); +const config = require("../../config/config"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: config.url, + token: app.globalData.token, + id:'', + date:new Date() + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + console.log(config.url) + this.setData({ + url: config.url, + id:options.id, + token: app.globalData.token + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + bindLad: function(){ + console.log(11212122) + debugger + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + this.setData({ + date:new Date() + }) + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/freeBannerDetail/index.json b/pages/freeBannerDetail/index.json new file mode 100644 index 0000000..c82f53b --- /dev/null +++ b/pages/freeBannerDetail/index.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "卡详情" +} \ No newline at end of file diff --git a/pages/freeBannerDetail/index.wxml b/pages/freeBannerDetail/index.wxml new file mode 100644 index 0000000..3c6a01c --- /dev/null +++ b/pages/freeBannerDetail/index.wxml @@ -0,0 +1 @@ + diff --git a/pages/freeBannerDetail/index.wxss b/pages/freeBannerDetail/index.wxss new file mode 100644 index 0000000..dfa6342 --- /dev/null +++ b/pages/freeBannerDetail/index.wxss @@ -0,0 +1,5 @@ +/* pages/freeBannerDetail/index.wxss */ +img{ + width: 100%!important; + height: auto; +} \ No newline at end of file diff --git a/pages/game/index.wxml b/pages/game/index.wxml index 9f2ecf2..68dceb6 100644 --- a/pages/game/index.wxml +++ b/pages/game/index.wxml @@ -1 +1,2 @@ - \ No newline at end of file + + \ No newline at end of file