diff --git a/assets/img/new.png b/assets/img/new.png new file mode 100644 index 0000000..6e048bb Binary files /dev/null and b/assets/img/new.png differ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d5a7374..1d6d922 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -5,9 +5,7 @@ - - 用户专享神秘礼物 - 独家福利,抢完即止 + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 921e98e..0a58b52 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -19,57 +19,16 @@ page { overflow-x: hidden; } - .txt { margin-left: 20rpx; } .game-entry{ width: 690rpx; height: 140rpx; - margin: 0 auto; - border-radius: 14rpx; - box-shadow: 1px 4px 20px #C4C4C4; -} -.game { - position: relative; - width: 750rpx; - height: 200rpx; - margin: 0 auto; - padding-top: 30rpx; - box-sizing: border-box; + margin: 10rpx auto 0; } .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; -} - -/* .game image { - position: absolute; width: 100%; - left: 0; - right: 0; - top: 0; - bottom: 0; -} */ + height: 140rpx; +} diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 80262ca..67b75bd 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -545,16 +545,14 @@ Page({ } }; that.setData({ - extraData: extraDataStr + extraData: extraDataStr, + stopFees: res.data, + timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) }); - that.setData({ - stopFees: res.data - }) - that.setData({ - timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) - }) + console.log(that.data.extraData) }) .catch(error => { + console.log(error) wx.showModal({ title: '提示', content: error.message, @@ -564,7 +562,6 @@ Page({ stopFees: {} }) }); - console.log(that.data.extraData) }, /**