diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 25c4cbd..8dd6662 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -75,17 +75,23 @@ Page({ // }) }, onShareAppMessage: function (res) { - let _this = this; - return { - 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, - success: function (res) { - // 转发成功 - }, - fail: function (res) { - // 转发失败 + if (res.from === 'button') { + console.log(res,3333333333333333333333) + // 来自页面内转发按钮 + let _this = this; + return { + 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, + success: function (res) { + // 转发成功 + }, + fail: function (res) { + // 转发失败 + } } + }else{ + console.log(res, 444444444444444444) } }, // 点击查看更多 @@ -118,6 +124,7 @@ Page({ showIndexReuturn:true }) } + wx.hideShareMenu() }, cardpayList: function(cardId) { let that = this; diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 7a2eaf9..12f157e 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -15,10 +15,10 @@ - + - + {{item.remainingAmount/100}} {{item.expiredTime}}到期 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 6670d8b..60f8803 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -126,7 +126,7 @@ Page({ duration: 2000, mask: false }); - wx.navigateTo({ + wx.reLaunch({ url: '/pages/complete/index?couponOrderId=' + this.data.cardData.couponOrderId, }) }) diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js index bc3623f..27223ea 100644 --- a/pages/discountCardList/discountCardList.js +++ b/pages/discountCardList/discountCardList.js @@ -7,6 +7,7 @@ Page({ data: { couponUrl: imgurl.coupon.url, loadingUrl: imgurl.loading.url, + canTransferred: imgurl.canTransferred.url, tabs: [], list: [], current: "0", diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml index eaec6d3..9d9852b 100644 --- a/pages/discountCardList/discountCardList.wxml +++ b/pages/discountCardList/discountCardList.wxml @@ -15,6 +15,7 @@ + {{item.title}} diff --git a/pages/discountCardList/discountCardList.wxss b/pages/discountCardList/discountCardList.wxss index dd48239..f6685d4 100644 --- a/pages/discountCardList/discountCardList.wxss +++ b/pages/discountCardList/discountCardList.wxss @@ -230,3 +230,10 @@ button::after{ border: none; } margin-top: 30rpx; padding: 0 40rpx; } +.cantransferred{ + position: absolute; + right: 0; + top: 0; + width: 60rpx; + height: 60rpx; +} diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 24ec0b3..a8fe6e1 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -24,7 +24,8 @@ Page({ showIf: false, showPage:false, showButton:false, - cardDetail:null + cardDetail:null, + supportTransfer:'' }, phone: function (e) { @@ -53,20 +54,20 @@ Page({ }) }) }, - onShareAppMessage: function (res) { - let _this = this; - return { - title: '领取卡', - path: '/pages/index/index?couponChannelId=' + this.data.order.couponChannelId + '&cuserId=' + this.data.order.cuserId + '&couponId=' + '111' + '&coverImg=' + this.data.order.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.order.couponOrderId + '&updateDate=' + this.data.order.updateDate, - imageUrl: this.data.order.coverImg, - success: function (res) { - // 转发成功 - }, - fail: function (res) { - // 转发失败 - } - } - }, + // onShareAppMessage: function (res) { + // let _this = this; + // return { + // title: '领取卡', + // path: '/pages/index/index?couponChannelId=' + this.data.order.couponChannelId + '&cuserId=' + this.data.order.cuserId + '&couponId=' + this.data.order.productId + '&coverImg=' + this.data.order.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.order.couponOrderId + '&updateDate=' + this.data.order.updateDate, + // imageUrl: this.data.order.coverImg, + // success: function (res) { + // // 转发成功 + // }, + // fail: function (res) { + // // 转发失败 + // } + // } + // }, powerDrawer: function (e) { let that = this; console.log(e) @@ -159,7 +160,8 @@ Page({ }) } that.setData({ - order: res.data + order: res.data, + supportTransfer: res.data.supportTransfer }); that.getStaticGame() //createDate 创建时间 diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 28531dc..cfc1d73 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -79,5 +79,5 @@ - + \ No newline at end of file