diff --git a/assets/images/give.png b/assets/images/give.png index 2c606f3..3885f93 100644 Binary files a/assets/images/give.png and b/assets/images/give.png differ diff --git a/config/config.js b/config/config.js index 5ecef5f..a64b75d 100755 --- a/config/config.js +++ b/config/config.js @@ -2,7 +2,7 @@ var config = { url: "https://ciformall.youlane.cn/C/api", // 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.33.68:7000/C/api', // url: 'http://10.100.30.172:7000/C/api', api: { /** diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 28c36be..6ac6c25 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -55,7 +55,6 @@ Page({ }); }, onLoad(options) { - console.log(config.api.cardpayList); let that = this; wx.showLoading({ title: "加载中..." diff --git a/pages/ConsumeDetail/ConsumeDetail.json b/pages/ConsumeDetail/ConsumeDetail.json index 96c4fcf..b4079cf 100644 --- a/pages/ConsumeDetail/ConsumeDetail.json +++ b/pages/ConsumeDetail/ConsumeDetail.json @@ -1,3 +1,3 @@ { - "navigationBarTitleText": "券详情" + "navigationBarTitleText": "消费记录" } \ No newline at end of file diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 7f9e81c..ca89b08 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}`, + url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, }) }, fail: (res) => { diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 483df4a..dcdaed5 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -17,15 +17,17 @@ - - {{item.title}} - + + + {{item.title}} + + + + {{item.expiredTime}}到期 + 金额{{item.remainingAmount/100}} + - - {{item.expiredTime}}到期 - 金额{{item.remainingAmount/100}} - - 扫一扫付款 + 扫一扫付款 已失效 diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index a9e9751..806237e 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -72,7 +72,7 @@ border-radius: 50%; } -.info view:nth-child(1) { +.info >view view:nth-child(1) { display: flex; justify-content: space-between; padding: 0 2%; @@ -82,7 +82,7 @@ width: 100%; } -.info view:nth-child(1) text { +.info >view view:nth-child(1) text { font-size: 32rpx; line-height: 32rpx; height: 32rpx; @@ -96,7 +96,7 @@ margin-bottom: 10rpx; } -.info view:nth-child(2) { +.info >view view:nth-child(2) { font-size: 26rpx; color: #fff; letter-spacing: 0; diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 6a6fdf0..3db97cc 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -29,7 +29,7 @@ {{sec}} - {{data.title}}电子卡 + {{data.title}}电子卡 {{data.subTitle}} 售价: diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index 9959f60..c843f99 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -17,11 +17,11 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function(options) { - console.log(options) let that = this; that.setData({ merChant: JSON.parse(options.merChant), - cardid: options.cardid + cardid: options.cardid, + remainingAmount: options.remainingAmount }) }, bindKeyInput(e) { diff --git a/pages/scanPay/scanPay.wxml b/pages/scanPay/scanPay.wxml index 703be04..dc38c3a 100644 --- a/pages/scanPay/scanPay.wxml +++ b/pages/scanPay/scanPay.wxml @@ -1,4 +1,5 @@ + 卡余额:{{remainingAmount}}元 付款给{{merChant.merchant_name}} diff --git a/pages/scanPay/scanPay.wxss b/pages/scanPay/scanPay.wxss index f8e8a5b..28c355c 100644 --- a/pages/scanPay/scanPay.wxss +++ b/pages/scanPay/scanPay.wxss @@ -1,14 +1,14 @@ .content{ padding:0 57rpx; } +.title{ + margin-top: 60rpx; +} .head image{ width: 100rpx; height: 100rpx; border-radius:50%; } -.head{ - margin-top: 80rpx; -} .head .fl{ font-size:32rpx; font-family:PingFang-SC-Bold;