From c089854c104cb7f2f24afcc9679d6fbe7e576fa0 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 28 Dec 2018 18:05:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E4=B8=93=E4=BA=AB=E6=8A=98?= =?UTF-8?q?=E6=89=A3=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/bgg.png | Bin 13310 -> 13693 bytes pages/ConsumeDetail/ConsumeDetail.wxml | 4 ++-- pages/cardorder/index/index.js | 2 +- pages/index/index.js | 22 ++++++++++++++++++++++ pages/index/index.wxml | 2 +- pages/index/index.wxss | 6 +++--- 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/assets/images/bgg.png b/assets/images/bgg.png index 83858431577d18bf9e10f630de2b6bd450aa822b..4e9766b14c4ba442498910f48b790b12cbee12b9 100644 GIT binary patch literal 13693 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 ZapOnJUw&Cp0)AFSr>AA8S)gtk`ajeT6kPxS literal 13310 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 diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml index e34b13a..aebf204 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxml +++ b/pages/ConsumeDetail/ConsumeDetail.wxml @@ -3,7 +3,7 @@ {{cardDetail.title}} - {{cardDetail.expiredTime}} + 有效期:{{cardDetail.expiredTime}} 余额:¥{{cardDetail.remainingAmount/100}} @@ -39,7 +39,7 @@ {{item.updateDate}} - 余额{{item.cardRemainAmount/100}}元 + 余额:{{item.cardRemainAmount/100}}元 diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 86f2b62..87a61b0 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -46,7 +46,7 @@ Page({ wx.scanCode({ success: (res) => { wx.navigateTo({ - url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, + url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&cardRemainRealAmount=${e.currentTarget.dataset.cardRemainRealAmount}`, }) }, fail: (res) => { diff --git a/pages/index/index.js b/pages/index/index.js index 18e7b5a..c92a085 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -21,6 +21,7 @@ Page({ havePlayEd: app.globalData.havePlayEd, staticGamedata: {}, showIf: false, + discountEnable:false, page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 }, gotodiscountCardList:function(){ @@ -33,6 +34,26 @@ Page({ url: '/pages/rushToBuy/index', }) }, + showSpecial:function(){ + let that = this; + Http.get({ + url: config.api.scoreLevelInfo, + data: {} + }) + .then(res => { + // if true 则开启特享礼遇 + if (res.data.discountEnable) { + that.setData({ + discountEnable: true + }) + } + else { + that.setData({ + discountEnable: false + }) + } + }) + }, qrcode: function (e) { var that = this; that.setData({ @@ -291,6 +312,7 @@ Page({ } Http.setToken(res.data.token); that.checkUserCarStatus(); + that.showSpecial(); that.getUserInfo(); that.getBannerlist(); if (app.couponChannelListCallback) { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 275b9d7..5acfd5a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -29,6 +29,6 @@ {{levelName}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index a1d7df6..0416ed5 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -50,6 +50,7 @@ page { .section >view image { width: 73rpx; height: 74rpx; + margin-bottom: 14rpx; } .section text { height: 23rpx; @@ -87,16 +88,15 @@ page { .canvas-box { position: fixed; width: 500rpx; - height: 671rpx; overflow: hidden; left: 0; - top: 0; - bottom: 0; + top: 200rpx; right: 0; margin: auto; background: #fff; border-radius: 16rpx; z-index:100; + padding-bottom: 50rpx; } .showQrcode text {