diff --git a/config/config.js b/config/config.js index b90f37c..768e844 100755 --- a/config/config.js +++ b/config/config.js @@ -77,6 +77,9 @@ var config = { * 获取券价格与库存 */ couponPriceAndStock: "/wxCoupon/couponPriceAndStock", + + couponInfo: "/wxCoupon/couponInfo", + /** * 获取券适用门店List */ diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 7f06219..420d62c 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -95,17 +95,11 @@ Page({ if (res.from === 'button') { console.log(this.data.cardDetail) // 来自页面内转发按钮 - const restData = JSON.stringify({ - coverImg: _this.data.cardDetail.coverImg, - avatarUrl: _this.data.avatarUrl, - couponOrderId: _this.data.cardDetail.id, - updateDate: _this.data.cardDetail.updateDate - }) return { title: _this.data.userName + '赠送您一张' + _this.data.cardDetail.title, imageUrl: _this.data.cardDetail.coverImg, - path: `/pages/index/index?couponChannelId=${_this.data.cardDetail.couponChannelId}&avatarUrl=${_this.data.cardDetail.avatarUrl}&cuserId=${_this.data.cardDetail.ownerId}&userName=${_this.data.userName}&couponId=${_this.data.cardDetail.couponId}&couponOrderId=${_this.data.cardDetail.id}&updateDate=${_this.data.cardDetail.updateDate}&coverImg=${_this.data.cardDetail.coverImg}`, + path: `/pages/index/index?couponChannelId=${_this.data.cardDetail.couponChannelId}&avatarUrl=${_this.data.cardDetail.avatarUrl}&cuserId=${_this.data.cardDetail.ownerId}&userName=${_this.data.userName}&couponId=${_this.data.cardDetail.couponId}&couponOrderId=${_this.data.cardDetail.id}&updateDate=${_this.data.cardDetail.updateDate}&coverImg=${_this.data.cardDetail.coverImg}&tenantId=${_this.data.cardDetail.tenantId}`, success: function (res) { // 转发成功 diff --git a/pages/cardorder/cardUse/cardUse.js b/pages/cardorder/cardUse/cardUse.js index b6d3e17..f9a2e4d 100644 --- a/pages/cardorder/cardUse/cardUse.js +++ b/pages/cardorder/cardUse/cardUse.js @@ -120,6 +120,9 @@ Page({ let timer let expiredSeconds = res.data.expiredSeconds if (expiredSeconds) { + this.setData({ + expiredSeconds: expiredSeconds + }) timer = setInterval(() => { if (expiredSeconds != 0) { this.setData({ diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index b6e96ca..bfed2fc 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -95,7 +95,8 @@ Page({ contentType: 0, page: 1,//查询商户优惠券page idList: [], - mallList: "" + mallList: "", + jumpToIndex: false }, /** * 显示分享弹框 @@ -298,9 +299,16 @@ Page({ }) }, closeAlert() { - this.setData({ - showCardOffer: false - }) + if (this.data.jumpToIndex) { + wx.switchTab({ + url: '/pages/theme/index1/index', + }) + } else { + this.setData({ + showCardOffer: false + }) + } + }, goback: function () { let this_ = this @@ -530,12 +538,16 @@ Page({ that.setData({ onshow: false }) + + if (dealOptions && (dealOptions.couponChannelId || dealOptions.couponIds)) { - if (dealOptions.couponIds) { + if (dealOptions.couponChannelId == "undefined") { this.setData({ - couponIds: dealOptions.couponIds + couponIds: dealOptions.couponIds, + jumpToIndex: true }) that.getDetail(dealOptions.couponIds, 'notendclock'); + // that.getCouponInfo(dealOptions.couponIds, dealOptions.tenantId) } else { that.getDetail(dealOptions.couponChannelId, 'notendclock'); } @@ -581,6 +593,18 @@ Page({ }) }, + // getCouponInfo(couponId, mallTenantId) { + // Http.get({ + // url: config.api.couponInfo, + // data: { + // couponId: couponId, + // mallTenantId: mallTenantId + // } + // }).then(res => { }).catch(err => { + + // }) + + // }, getCouponPriceAndStock(couponChannelId) {//获取券价格与库存 Http.get({ diff --git a/pages/index/index.js b/pages/index/index.js index 4867405..60ee758 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -174,7 +174,7 @@ Page({ // 转赠判断 if (options.cuserId) { wx.redirectTo({ - url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`, + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}&couponIds=${options.couponId}&tenantId=${options.tenantId}`, }) } else { // 跳转普通券/消费卡/限时秒杀/砍价详情 diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js index 87d3329..15ba8c7 100644 --- a/pages/theme/index1/index.js +++ b/pages/theme/index1/index.js @@ -659,8 +659,7 @@ Page({ }) } } - console.log(JSON.stringify(app.globalData.styleLsit), "styleLsit") - + // console.log(JSON.stringify(app.globalData.styleLsit), "styleLsit") this.ifShowSqare(); if (wx.getStorageSync("squareList") && wx.getStorageSync("selectedMall")) {