diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 6c3584e..fccec60 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; var config = require("../../config/config.js"); var app = getApp(); const Http = require("../../utils/HttpBasics"); @@ -5,6 +6,7 @@ const util = require("../../utils/util"); const imgurl = require("../../utils/imgurl"); Page({ data: { + navigationBarHeight, fenxiangUrl: imgurl.fenxiang.url, clockUrl: imgurl.clock.url, teljpgUrl: imgurl.teljpg.url, @@ -80,18 +82,19 @@ Page({ goToTranser(){ this.onShareAppMessage(); // wx.navigateTo({ - // url: '/pages/index/index?couponChannelId=' + this.data.cardDetail.couponChannelId + '&cuserId=' + this.data.cardDetail.cuserId + '&couponId=' + this.data.cardDetail.couponId, + // url: '/pages/index/index?couponChannelId=316424281708658688&cuserId=316369316574887936&couponId=316424281708658688&coverImg=https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn/456/90d50e2d-547c-43e1-a801-2f6e15f622d2.jpg&userName=轻泉漪溪&avatarUrl=https://wx.qlogo.cn/mmopen/vi_32/oibIKqnzXT21eZJdjKVKY91A36FqLbD3ibEFc2oxIC4iahLniccDQKVu1Tgp4kJupxRZjtEpW0ravJ9QW1HuncGVjA/132&couponOrderId=316424688259530752&updateDate=1564553135000', // }) }, onShareAppMessage: function (res) { if (res.from === 'button') { - console.log(res,3333333333333333333333) + console.log(this.data.cardDetail) + console.log(111) // 来自页面内转发按钮 let _this = this; return { title: _this.data.userName + '赠送您一张' + _this.data.cardDetail.title, - path: '/pages/index/index?couponChannelId=' + this.data.cardDetail.couponChannelId + '&cuserId=' + this.data.cardDetail.ownerId + '&couponId=' + this.data.cardDetail.couponId + '&coverImg=' + this.data.cardDetail.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.cardDetail.id + '&updateDate=' + this.data.cardDetail.updateDate, - imageUrl: this.data.cardDetail.coverImg, + path: '/pages/index/index?couponChannelId=' + _this.data.cardDetail.couponChannelId + '&cuserId=' + _this.data.cardDetail.ownerId + '&couponId=' + _this.data.cardDetail.couponId + '&coverImg=' + _this.data.cardDetail.coverImg + '&userName=' + _this.data.userName + '&avatarUrl=' + _this.data.avatarUrl + '&couponOrderId=' + _this.data.cardDetail.id + '&updateDate=' + _this.data.cardDetail.updateDate, + imageUrl: _this.data.cardDetail.coverImg, success: function (res) { // 转发成功 }, diff --git a/pages/ConsumeDetail/ConsumeDetail.json b/pages/ConsumeDetail/ConsumeDetail.json index 2a07fc1..5f23343 100644 --- a/pages/ConsumeDetail/ConsumeDetail.json +++ b/pages/ConsumeDetail/ConsumeDetail.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "交易明细" + "navigationBarTitleText": "交易明细", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml index 25f82b2..bd04a0a 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxml +++ b/pages/ConsumeDetail/ConsumeDetail.wxml @@ -1,4 +1,5 @@ - + + {{cardDetail.title}} @@ -37,7 +38,7 @@ 暂无交易明细 \ No newline at end of file diff --git a/pages/ConsumeDetail/ConsumeDetail.wxss b/pages/ConsumeDetail/ConsumeDetail.wxss index f4b96e9..08b2be6 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxss +++ b/pages/ConsumeDetail/ConsumeDetail.wxss @@ -203,12 +203,12 @@ button::after{ border: none; } font-size: 32rpx; } .support-tansfer{ + display: block; width: 540rpx; - float: left; - margin-left: 30rpx; + margin: 4rpx auto; border-radius: 50rpx; - background: #02C0FF!important; - margin-top:4rpx; + /* background: #02C0FF!important; */ + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); } .share{ width: 40rpx; diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index f91895d..de2e053 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -62,6 +62,10 @@ Page({ }, // 扫一扫去支付 gotoPay: function(e) { + /* wx.navigateTo({ + url: `/pages/scanPay/scanPay`, + }) + return */ let that = this; wx.scanCode({ success: (res) => { diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 23a33cc..62b029a 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -36,7 +36,7 @@ 扫一扫付款 - 再次购买 + 再次购买 已过期 余额已用完 已线下退款 diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index dfa70e3..9ddd340 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -630,7 +630,8 @@ button::after { width: 60%; border-radius: 50rpx; margin-top: 30rpx; - background: #02c0ff !important; + /* background: #02c0ff !important; */ + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); } .shaddow { diff --git a/pages/paySuccess/paySuccess.js b/pages/paySuccess/paySuccess.js index 26ce1ca..3c4ff43 100644 --- a/pages/paySuccess/paySuccess.js +++ b/pages/paySuccess/paySuccess.js @@ -1,4 +1,4 @@ - +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; let Util = require("../../utils/util"); const imgurl = require("../../utils/imgurl"); Page({ @@ -6,6 +6,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, data:null, pay_success: imgurl.pay_success.url }, diff --git a/pages/paySuccess/paySuccess.json b/pages/paySuccess/paySuccess.json index 3d262cb..e5f854f 100644 --- a/pages/paySuccess/paySuccess.json +++ b/pages/paySuccess/paySuccess.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "支付成功" + "navigationBarTitleText": "支付成功", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/paySuccess/paySuccess.wxml b/pages/paySuccess/paySuccess.wxml index 2d07c51..1a23112 100644 --- a/pages/paySuccess/paySuccess.wxml +++ b/pages/paySuccess/paySuccess.wxml @@ -1,4 +1,5 @@ - + + diff --git a/pages/paySuccess/paySuccess.wxss b/pages/paySuccess/paySuccess.wxss index b8b316d..4f22509 100644 --- a/pages/paySuccess/paySuccess.wxss +++ b/pages/paySuccess/paySuccess.wxss @@ -10,7 +10,8 @@ button::after{ border: none; } text-align: center; color: #fff; font-size: 31rpx; - background: #02C0FF!important; + /* background: #02C0FF!important; */ + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); border-radius:48rpx!important; margin-top: 169rpx; border: 1px solid #02C0FF; diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index b8914d1..d9bb6ef 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; const util = require("../../utils/util.js"); const config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); @@ -9,6 +10,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, merChant: {}, focus: true, inputValue: '', diff --git a/pages/scanPay/scanPay.json b/pages/scanPay/scanPay.json index 76e73cc..0bb9eb8 100644 --- a/pages/scanPay/scanPay.json +++ b/pages/scanPay/scanPay.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "付款" + "navigationBarTitleText": "付款", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/scanPay/scanPay.wxml b/pages/scanPay/scanPay.wxml index d8d623e..17438fa 100644 --- a/pages/scanPay/scanPay.wxml +++ b/pages/scanPay/scanPay.wxml @@ -1,4 +1,5 @@ - + + 付款给{{merChant.merchantName}} diff --git a/pages/scanPay/scanPay.wxss b/pages/scanPay/scanPay.wxss index 66909b0..ce78c93 100644 --- a/pages/scanPay/scanPay.wxss +++ b/pages/scanPay/scanPay.wxss @@ -5,7 +5,7 @@ margin-top: 60rpx; } .head{ - margin-top: 100rpx; + margin-top: 40rpx; } .head image{ width: 100rpx; @@ -29,7 +29,8 @@ height:95rpx; line-height: 95rpx; margin:80rpx auto 0; - background:rgba(2,192,255,1); + /* background:rgba(2,192,255,1); */ + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); border-radius:48rpx; color: #fff; } @@ -39,14 +40,15 @@ color:rgba(51,51,51,1); } .money .num{ - font-size:60rpx!important; + font-size:58rpx!important; font-family:PingFang-SC-Bold; font-weight:bold; color:rgba(51,51,51,1); display: inline-block!important; width: 580rpx; height: 60rpx; - margin-top: 20rpx; + margin-top: 16rpx; + padding-top: 4rpx; line-height: 60rpx; } .active{