diff --git a/images/icon/success-w.png b/images/icon/success-w.png new file mode 100644 index 0000000..0d60d86 Binary files /dev/null and b/images/icon/success-w.png differ 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); }