| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; | |||||
| var config = require("../../config/config.js"); | var config = require("../../config/config.js"); | ||||
| var app = getApp(); | var app = getApp(); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| @@ -5,6 +6,7 @@ const util = require("../../utils/util"); | |||||
| const imgurl = require("../../utils/imgurl"); | const imgurl = require("../../utils/imgurl"); | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| fenxiangUrl: imgurl.fenxiang.url, | fenxiangUrl: imgurl.fenxiang.url, | ||||
| clockUrl: imgurl.clock.url, | clockUrl: imgurl.clock.url, | ||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| @@ -80,18 +82,19 @@ Page({ | |||||
| goToTranser(){ | goToTranser(){ | ||||
| this.onShareAppMessage(); | this.onShareAppMessage(); | ||||
| // wx.navigateTo({ | // 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) { | onShareAppMessage: function (res) { | ||||
| if (res.from === 'button') { | if (res.from === 'button') { | ||||
| console.log(res,3333333333333333333333) | |||||
| console.log(this.data.cardDetail) | |||||
| console.log(111) | |||||
| // 来自页面内转发按钮 | // 来自页面内转发按钮 | ||||
| let _this = this; | let _this = this; | ||||
| return { | return { | ||||
| title: _this.data.userName + '赠送您一张' + _this.data.cardDetail.title, | 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) { | success: function (res) { | ||||
| // 转发成功 | // 转发成功 | ||||
| }, | }, | ||||
| @@ -1,3 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "交易明细" | |||||
| "navigationBarTitleText": "交易明细", | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view wx:if="{{showPage}}" class='notes'> | |||||
| <navbar home back text="交易明细" background="#fff" color="#000"></navbar> | |||||
| <view wx:if="{{showPage}}" class='notes' style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class='head'> | <view class='head'> | ||||
| <view class='titles' style='font-weight:bold;'>{{cardDetail.title}}</view> | <view class='titles' style='font-weight:bold;'>{{cardDetail.title}}</view> | ||||
| <view class='titles clearfix'> | <view class='titles clearfix'> | ||||
| @@ -37,7 +38,7 @@ | |||||
| <text>暂无交易明细</text> | <text>暂无交易明细</text> | ||||
| </view> | </view> | ||||
| <view class='share-bottom'> | <view class='share-bottom'> | ||||
| <button class='goback' wx:if="{{supportTransfer==1}}" bindtap='gotoIndex'><image src='{{home}}' mode="widthFix"></image></button> | |||||
| <!-- <button class='goback' wx:if="{{supportTransfer==1}}" bindtap='gotoIndex'><image src='{{home}}' mode="widthFix"></image></button> --> | |||||
| <button type="primary" open-type="share" wx:if="{{supportTransfer==1}}" class='support-tansfer'><image src="{{weixinTitle}}" class='share' mode="widthFix"></image>转赠给微信好友</button> | <button type="primary" open-type="share" wx:if="{{supportTransfer==1}}" class='support-tansfer'><image src="{{weixinTitle}}" class='share' mode="widthFix"></image>转赠给微信好友</button> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -203,12 +203,12 @@ button::after{ border: none; } | |||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| } | } | ||||
| .support-tansfer{ | .support-tansfer{ | ||||
| display: block; | |||||
| width: 540rpx; | width: 540rpx; | ||||
| float: left; | |||||
| margin-left: 30rpx; | |||||
| margin: 4rpx auto; | |||||
| border-radius: 50rpx; | 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{ | .share{ | ||||
| width: 40rpx; | width: 40rpx; | ||||
| @@ -62,6 +62,10 @@ Page({ | |||||
| }, | }, | ||||
| // 扫一扫去支付 | // 扫一扫去支付 | ||||
| gotoPay: function(e) { | gotoPay: function(e) { | ||||
| /* wx.navigateTo({ | |||||
| url: `/pages/scanPay/scanPay`, | |||||
| }) | |||||
| return */ | |||||
| let that = this; | let that = this; | ||||
| wx.scanCode({ | wx.scanCode({ | ||||
| success: (res) => { | success: (res) => { | ||||
| @@ -36,7 +36,7 @@ | |||||
| </view> | </view> | ||||
| <!-- <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns" style='color:{{item.background}}!important'>扫一扫付款</view> --> | <!-- <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns" style='color:{{item.background}}!important'>扫一扫付款</view> --> | ||||
| <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns">扫一扫付款</view> | <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns">扫一扫付款</view> | ||||
| <view hover-class='active' bindtap='gotoBuy' wx:if="{{item.couponOrderStatus!=4}}" style='color:rgba(179,180,181,1);' class="btns clearfix">再次购买</view> | |||||
| <view hover-class='active' bindtap='gotoBuy' wx:if="{{item.couponOrderStatus!=4}}" style='color:rgba(179,180,181,1);bottom:20rpx' class="btns clearfix">再次购买</view> | |||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 5}}">已过期</text> | <text class='txtstatus' wx:if="{{item.couponOrderStatus == 5}}">已过期</text> | ||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 6}}">余额已用完</text> | <text class='txtstatus' wx:if="{{item.couponOrderStatus == 6}}">余额已用完</text> | ||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 7}}">已线下退款</text> | <text class='txtstatus' wx:if="{{item.couponOrderStatus == 7}}">已线下退款</text> | ||||
| @@ -630,7 +630,8 @@ button::after { | |||||
| width: 60%; | width: 60%; | ||||
| border-radius: 50rpx; | border-radius: 50rpx; | ||||
| margin-top: 30rpx; | 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 { | .shaddow { | ||||
| @@ -1,4 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; | |||||
| let Util = require("../../utils/util"); | let Util = require("../../utils/util"); | ||||
| const imgurl = require("../../utils/imgurl"); | const imgurl = require("../../utils/imgurl"); | ||||
| Page({ | Page({ | ||||
| @@ -6,6 +6,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| data:null, | data:null, | ||||
| pay_success: imgurl.pay_success.url | pay_success: imgurl.pay_success.url | ||||
| }, | }, | ||||
| @@ -1,3 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "支付成功" | |||||
| "navigationBarTitleText": "支付成功", | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class='content'> | |||||
| <navbar back home text="支付成功" color="#000"></navbar> | |||||
| <view class='content' style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class="payContent"> | <view class="payContent"> | ||||
| <view class="payHeader"></view> | <view class="payHeader"></view> | ||||
| <view class="payBody"> | <view class="payBody"> | ||||
| @@ -10,7 +10,8 @@ button::after{ border: none; } | |||||
| text-align: center; | text-align: center; | ||||
| color: #fff; | color: #fff; | ||||
| font-size: 31rpx; | 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; | border-radius:48rpx!important; | ||||
| margin-top: 169rpx; | margin-top: 169rpx; | ||||
| border: 1px solid #02C0FF; | border: 1px solid #02C0FF; | ||||
| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; | |||||
| const util = require("../../utils/util.js"); | const util = require("../../utils/util.js"); | ||||
| const config = require("../../config/config.js"); | const config = require("../../config/config.js"); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| @@ -9,6 +10,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| merChant: {}, | merChant: {}, | ||||
| focus: true, | focus: true, | ||||
| inputValue: '', | inputValue: '', | ||||
| @@ -1,3 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "付款" | |||||
| "navigationBarTitleText": "付款", | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class='content'> | |||||
| <navbar home back text="付款"></navbar> | |||||
| <view class='content' style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class='head clearfix'> | <view class='head clearfix'> | ||||
| <text class='fl'>付款给{{merChant.merchantName}}</text> | <text class='fl'>付款给{{merChant.merchantName}}</text> | ||||
| <image class='fr' src='{{merChant.merchantImgUrl}}' mode='widthFix'></image> | <image class='fr' src='{{merChant.merchantImgUrl}}' mode='widthFix'></image> | ||||
| @@ -5,7 +5,7 @@ | |||||
| margin-top: 60rpx; | margin-top: 60rpx; | ||||
| } | } | ||||
| .head{ | .head{ | ||||
| margin-top: 100rpx; | |||||
| margin-top: 40rpx; | |||||
| } | } | ||||
| .head image{ | .head image{ | ||||
| width: 100rpx; | width: 100rpx; | ||||
| @@ -29,7 +29,8 @@ | |||||
| height:95rpx; | height:95rpx; | ||||
| line-height: 95rpx; | line-height: 95rpx; | ||||
| margin:80rpx auto 0; | 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; | border-radius:48rpx; | ||||
| color: #fff; | color: #fff; | ||||
| } | } | ||||
| @@ -39,14 +40,15 @@ | |||||
| color:rgba(51,51,51,1); | color:rgba(51,51,51,1); | ||||
| } | } | ||||
| .money .num{ | .money .num{ | ||||
| font-size:60rpx!important; | |||||
| font-size:58rpx!important; | |||||
| font-family:PingFang-SC-Bold; | font-family:PingFang-SC-Bold; | ||||
| font-weight:bold; | font-weight:bold; | ||||
| color:rgba(51,51,51,1); | color:rgba(51,51,51,1); | ||||
| display: inline-block!important; | display: inline-block!important; | ||||
| width: 580rpx; | width: 580rpx; | ||||
| height: 60rpx; | height: 60rpx; | ||||
| margin-top: 20rpx; | |||||
| margin-top: 16rpx; | |||||
| padding-top: 4rpx; | |||||
| line-height: 60rpx; | line-height: 60rpx; | ||||
| } | } | ||||
| .active{ | .active{ | ||||