From 21d1b236efa71305535a34fefddc64de2733aecf Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 24 Jun 2019 00:20:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A0=8D=E4=BB=B7=E5=BE=85=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=87=E6=A1=88=E6=8F=90=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargainDatail/bargainDatail.js | 7 ++-- pages/coupon/detail/index.js | 38 ++++++++++++-------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 0258480..93a4ae4 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -385,14 +385,11 @@ Page({ } else if (err.code == 3012) { wx.showModal({ title: '提示', - content: '您有未支付订单,请先进行支付', - confirmText: "去支付", + content: "您有未支付订单,请到'我的-我的砍价'进行支付'", + showCancel: false, success: function (res) { console.log(res.confirm) if (res.confirm) { - wx.navigateTo({ - url: '/pages/order/index/index?id=all', - }) } } }) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 94e6175..4d1b43d 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -419,8 +419,6 @@ Page({ if (options && options.couponChannelId){ that.getDetail(options.couponChannelId, 'notendclock'); } - console.log(options.cuserId) - console.log("---------------------------------options.cuserId---------------------------------------------------") /** * 转赠判断 */ @@ -746,19 +744,31 @@ Page({ mask: false }); } else if (err.code == 3012) { - wx.showModal({ - title: '提示', - content: '您有未支付订单,请先进行支付', - confirmText:"去支付", - success: function (res) { - console.log(res.confirm) - if(res.confirm){ - wx.navigateTo({ - url: '/pages/order/index/index?id=all', - }) + if(that.data.data.type == 8){ + wx.showModal({ + title: '提示', + content: "您有未支付订单,请到'我的-我的砍价'进行支付'", + showCancel:false, + success: function (res) { + console.log(res.confirm) + if (res.confirm) { + } } - } - }) + }) + }else{ + wx.showModal({ + title: '提示', + content: '您有未支付订单,请先进行支付', + success: function (res) { + console.log(res.confirm) + if(res.confirm){ + wx.navigateTo({ + url: '/pages/order/index/index?id=all', + }) + } + } + }) + } } else if (err.code == 11005) { /** * 将值传到用户手机号授权的页面