diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 6f5f01c..41a472b 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -11,7 +11,9 @@ Page({ expiredTime: "", updateDate: "", //存储计时器 - setInter: "" + setInter: "", + staticGamedata: {}, + showIf:false }, onUnload: function() { let that = this; @@ -20,6 +22,31 @@ Page({ value: that.data.sight, }) }, + gotogame: function () { + let that = this; + wx.navigateTo({ + url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, + }) + }, + // 获取游戏 + getStaticGame(token) { + let _this = this; + Http.get({ + url: config.api.getGame, + data: { + triggleAction: 3 + } + }).then(res => { + if (res.data.id) { + _this.setData({ + showIf: true + }) + } + _this.setData({ + staticGamedata: res.data + }) + }) + }, onLoad: function(options) { let that = this; console.log(options.sight); @@ -38,9 +65,7 @@ Page({ //获得优惠券的详情 that.data.setInter = setInterval(function() { if ( - options.quancode != null && - options.quancode != "" && - options.quancode != undefined && + options.quancode && that.data.couponorderstatus == 0 ) { Http.get({ @@ -58,6 +83,8 @@ Page({ /** * 动态改变上一级页面的核销状态 */ + + that.getStaticGame() var pages = getCurrentPages(); var prevPage = pages[pages.length - 2]; //上一个页面 //直接调用上一个页面的setData()方法,把数据存到上一个页面中去 diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index 8fc1286..42ee36f 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -88,4 +88,11 @@ {{data.remark}} + + + + + 新用户专享神秘礼物 + 独家福利,抢完即止 + \ No newline at end of file diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 7face09..dbfd543 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -352,3 +352,48 @@ page { letter-spacing: 0; text-align: right; } + +/* 小游戏入口 + */ + .game-entry{ + width: 690rpx; + height: 140rpx; + margin: 0 auto; + border-radius: 14rpx; + box-shadow: 1px 4px 20px #C4C4C4; + background: #fff; +} +.game { + position: relative; + width: 750rpx; + height: 200rpx; + margin: 0 auto; + padding-top: 30rpx; + box-sizing: border-box; +} +.gameimg{ + position: absolute; + right: 25rpx; + top: -14rpx; + width: 250rpx; +} +.game text { + display: block; + position: relative; +} + +.game text:nth-of-type(1) { + display: inline-block; + padding-top: 39rpx; + padding-left: 70rpx; + font-size: 32rpx; + color: #333; + line-height: 36rpx; +} + +.game text:nth-of-type(2) { + font-size: 24rpx; + color: #999; + line-height: 24rpx; + padding-left: 70rpx; +} \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 6517277..2676b3d 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -97,8 +97,7 @@ Page({ Http.get({ url: config.api.getGame, data: { - triggleAction: 3, - token: token + triggleAction: 3 } }).then(res => { if (res.data.id){