From 1a36d61f86993e8427a635bc1c684128930681f4 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 3 Jul 2019 14:14:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/detail/index.js | 16 ++++++---------- pages/order/detail/index.wxss | 2 +- pages/order/index/index.wxss | 6 +----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 91a11c9..0e38ef9 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -154,9 +154,6 @@ Page({ wx.showLoading({ title: "加载中" }); - setTimeout(function () { - wx.hideLoading(); - }, 1500); Http.get({ url: config.api.orderDetail, data: { @@ -164,6 +161,7 @@ Page({ } }) .then(res => { + wx.hideLoading(); if(res.code == 200){ that.getUserInfo() that.setData({ @@ -182,6 +180,7 @@ Page({ }); }) .catch(error=>{ + wx.hideLoading(); wx.showModal({ title: '提示', content: error.errMsg, @@ -199,7 +198,6 @@ Page({ * 去拼团 */ goToOrderGroup(orderId, orderGroupId, _this) { - console.log(22222222) let that = this; // 支付成功 Http.post({ @@ -241,10 +239,6 @@ Page({ orderId: orderId } }).then(res => { - /// Begin payment ---- - that.setData({ - showButton: false - }) var payOrderId = "" + res.data.payOrderId; wx.hideLoading(); wx.requestPayment({ @@ -283,7 +277,6 @@ Page({ return; }, }); - /// End payment -------- }); } else { // 免费券 @@ -321,7 +314,10 @@ Page({ } }) .then(res => { - wx.hideLoading() + wx.hideLoading(); + this.setData({ + showButton: false + }) if (!type&&type!='free') { wx.showToast({ title: "购买成功", diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 6288918..d2aad69 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -1,5 +1,5 @@ @import "../../../app.wxss"; - +button::after{ border: none; } page { height: auto !important; } diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index 7094d17..e3462e7 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -147,10 +147,6 @@ text-overflow: ellipsis; line-height: 33rpx; } -/* .info view:nth-child(2) text, .info view:nth-child(3) text { - font-size: 22rpx; -} */ - .info view:nth-child(3) { margin-top: 20rpx; } @@ -163,7 +159,7 @@ text-overflow: ellipsis; padding: 0 4%; display: flex; justify-content: space-between; - border-bottom: 1rpx solid #eee; + border-bottom: 8rpx solid #eee; } .payment view:nth-child(1) text:nth-child(1) {