From 7c853f90f4b2cb1f79096c2b5fb471e90ec8fdb2 Mon Sep 17 00:00:00 2001 From: shengliang Date: Sun, 26 Apr 2020 14:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B2=A1=E6=9C=89=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=97=B6=EF=BC=8C=E6=8F=90=E4=BE=9B=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E7=9B=B4=E6=8E=A5=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E7=9A=84=E6=A8=A1=E6=8B=9F=E6=94=AF=E4=BB=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E8=A1=A5=E4=B8=8A=E4=B8=80=E4=B8=AA=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=20=E4=BC=98=E5=8C=96=E5=8A=A0=E5=85=A5=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E8=BF=9E=E7=BB=AD=E7=82=B9=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=AE=A2=E5=8D=95=E5=A4=9A=E6=AC=A1=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/icon/success-w.png | Bin 0 -> 6034 bytes pages/cart/cart.js | 6 ++++++ pages/order-check/index.js | 5 +++++ pages/order-check/index.wxml | 2 +- pages/search/search.wxss | 1 + services/pay.js | 9 ++++++++- 6 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 images/icon/success-w.png diff --git a/images/icon/success-w.png b/images/icon/success-w.png new file mode 100644 index 0000000000000000000000000000000000000000..0d60d8612da7cbadcd57c303d66d51d1fdfc062f GIT binary patch literal 6034 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 literal 0 HcmV?d00001 diff --git a/pages/cart/cart.js b/pages/cart/cart.js index dd9c824..f42d56f 100644 --- a/pages/cart/cart.js +++ b/pages/cart/cart.js @@ -136,6 +136,10 @@ Page({ }, updateCart: function(itemIndex, productId, number, id) { let that = this; + wx.showLoading({ + title: '', + mask:true + }) util.request(api.CartUpdate, { productId: productId, number: number, @@ -155,6 +159,8 @@ Page({ that.setData({ checkedAllStatus: that.isCheckedAll() }); + wx.hideLoading({ + }) }); }, diff --git a/pages/order-check/index.js b/pages/order-check/index.js index 9bdb30f..4b7da46 100755 --- a/pages/order-check/index.js +++ b/pages/order-check/index.js @@ -157,6 +157,10 @@ Page({ let postscript = this.data.postscript; let freightPrice = this.data.freightPrice; let actualPrice = this.data.actualPrice; + wx.showLoading({ + title: '', + mask:true + }) util.request(api.OrderSubmit, { addressId: addressId, postscript: postscript, @@ -181,6 +185,7 @@ Page({ } else { util.showErrorToast(res.errmsg); } + wx.hideLoading() }); }, offlineOrder: function (e) { diff --git a/pages/order-check/index.wxml b/pages/order-check/index.wxml index 59fef44..789a91b 100644 --- a/pages/order-check/index.wxml +++ b/pages/order-check/index.wxml @@ -28,7 +28,7 @@ - + diff --git a/pages/search/search.wxss b/pages/search/search.wxss index db9acee..d8717b8 100755 --- a/pages/search/search.wxss +++ b/pages/search/search.wxss @@ -320,6 +320,7 @@ page { width: 338rpx; height: 338rpx; border-radius: 4rpx; + background-color: #f9f9f9; } .goods-box .navi-url .box { diff --git a/services/pay.js b/services/pay.js index 55295f6..a2ac46a 100644 --- a/services/pay.js +++ b/services/pay.js @@ -10,7 +10,8 @@ function payOrder(orderId) { }).then((res) => { if (res.errno === 0) { const payParam = res.data; - console.log(res.data); + // 如果没有支付想直接支付成功，下面注释。 + // ----------------------------------- wx.requestPayment({ 'timeStamp': payParam.timeStamp, 'nonceStr': payParam.nonceStr, @@ -36,6 +37,12 @@ function payOrder(orderId) { reject(res); } }); + // ----------------------------------- + + // ================================= + // 直接支付成功，下面打开，上面注释 + // resolve(res); + // ================================= } else { reject(res); }