From dcd1974c570050d9b7a0338bd62d9bfcf4a1b156 Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Tue, 28 Aug 2018 18:02:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/fail.png | Bin 0 -> 6838 bytes pages/coupon/detail/index.js | 76 +++++++++++++++++++++------------- pages/order/detail/index.js | 3 -- pages/order/detail/index.wxss | 3 +- pages/order/index/index.wxss | 2 +- pages/rushToBuy/index.wxml | 1 - pages/user/index.wxss | 4 +- utils/util.js | 1 + 8 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 assets/img/fail.png diff --git a/assets/img/fail.png b/assets/img/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..406cda1aeac7315b67672b67fb06f3a1fbd604a1 GIT binary patch literal 6838 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 RAD}=WLw#et8eO~S{{gny;tc=* literal 0 HcmV?d00001 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 9a68a5e..51b6882 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -82,15 +82,18 @@ Page({ }) .then(res => { console.log("payOrderUpdate then", res); - wx.showToast({ - title: "购买成功", - duration: 2500 - }); + // wx.showToast({ + // title: "购买成功", + // duration: 2500 + // }); }) .catch(err => { console.log("payOrderUpdate catch", err); }); }, + /** + * 发起支付 + */ orderFunc() { var that = this; wx.showLoading({ @@ -105,6 +108,10 @@ Page({ data: {} }) .then(res => { + console.log(res); + /** + * orderSave 下单 + */ return Http.post({ url: config.api.orderSave, data: { @@ -136,6 +143,9 @@ Page({ }); if (res.data.payment > 0) { // 支付金额不为0 + /** + * 支付订单创建 + */ Http.post({ url: config.api.payOrderCreate, data: { @@ -154,49 +164,59 @@ Page({ signType: "MD5", paySign: res.data.paySign, success: res => { + console.log(res); + console.log("姐在检查付款异常"); + that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 + console.log(res); - console.log("支付成功"); - wx.showToast({ - title: "购买成功", - duration: 2500 - }); + if(res.errMsg=='requestPayment:ok'){ + wx.showToast({ + title: "购买成功", + duration: 2500 + }); + } + wx.navigateBack({ delta: 2 }); }, + fail: res => { that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败 console.log(res); - console.log("支付失败"); return; }, complete: res => { console.log(res); console.log("支付完成"); - var url = res.data.url; - console.log("get url", url); + // var url = res.data.url; + // console.log("get url", url); if (res.errMsg == "requestPayment:ok") { wx.showModal({ title: "提示", content: "支付成功" }); - if (url) { - setTimeout(function () { - wx.redirectTo({ - url: "/pages" + url - }); - }, 2000); - } else { - setTimeout(() => { - wx.navigateBack(); - }, 2000); - } - } else { - wx.showModal({ - title: "错误提示", - content: res.errMsg - }); + // if (url) { + // setTimeout(function () { + // wx.redirectTo({ + // url: "/pages" + url + // }); + // }, 2000); + // } else { + // setTimeout(() => { + // wx.navigateBack(); + // }, 2000); + // } + } + + else { + wx.showToast({ + title:'支付失败', + image:'./../../../assets/img/fail.png', + duration: 1500, + mask:false + }) } return; } diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 16c7576..ba79212 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -84,14 +84,11 @@ Page({ }); //createDate 创建时间 - //paymentTime 支付时间 var createDate = util.fmtDate(res.data.createDate); - // var paymentTime = util.fmtDate(res.data.paymentTime); console.log(createDate); that.setData({ createDate:createDate, - // paymentTime:util.timechuo(paymentTime), }) }); }, diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 6208d9a..5c70f34 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -133,13 +133,14 @@ } .classif > view:nth-child(1) { display: block; + border-top:20rpx solid #f8f8f8; } .classif > view:nth-child(1) text:nth-child(2) { padding-left: 15rpx; } .classif > view:nth-child(3), .classif > view:nth-child(4) { - border-top: 20rpx solid #ededed; + border-top: 20rpx solid #f8f8f8; } .classif > view:nth-child(3) view text:nth-child(2) { padding-left: 15rpx; diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index e7c0039..1d8fd52 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -88,7 +88,7 @@ padding: 0 4%; display: flex; justify-content: space-between; - border-bottom: 20rpx solid #ededed; + border-bottom: 20rpx solid #f8f8f8; } .payment view:nth-child(1) text:nth-child(1) { diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index 57fc25e..0077ffd 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -24,7 +24,6 @@ 剩余件数:{{item.remainInventory}}件 购买 - diff --git a/pages/user/index.wxss b/pages/user/index.wxss index ed27b4a..0f9db78 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,10 +1,10 @@ .margin { - background: #f5f5f5; + background: #f8f8f8; height: 20rpx; } .user { - background: #f5f5f5; + background: #f8f8f8; min-height: 100vh; } diff --git a/utils/util.js b/utils/util.js index 0fe687f..85b263a 100644 --- a/utils/util.js +++ b/utils/util.js @@ -77,6 +77,7 @@ function fmtDate(obj) { ); } +//计算下单的时间与现在的时间的 function timechuo(startTime) { var s1 = new Date(startTime.replace(/-/g, "/")); var s2 = new Date();