diff --git a/assets/images/bgg.png b/assets/images/bgg.png
index 8385843..4e9766b 100644
Binary files a/assets/images/bgg.png and b/assets/images/bgg.png differ
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 {