From 81b3cb1e9457b3836129f5456eb7d3b752d97d80 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 10 Dec 2018 17:07:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 10 ++++------ pages/coupon/detail/index.wxml | 10 +++++----- pages/coupon/detail/index.wxss | 1 + pages/order/detail/index.js | 8 +++++++- pages/order/detail/index.wxml | 10 ++++++---- pages/order/detail/index.wxss | 22 ++++++++++++++++++++-- 6 files changed, 43 insertions(+), 18 deletions(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 5c7eee8..04cb78d 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -40,13 +40,11 @@ Page({ display:"none", showbutton:false }, - phone: function () { + phone: function (e) { let that = this; - if (that.data.data.merchantLinkPhone) { - wx.makePhoneCall({ - phoneNumber: that.data.data.merchantLinkPhone - }); - } + wx.makePhoneCall({ + phoneNumber: e.target.dataset.merchantlinkphone + }); }, /** * 点击提交问题单选 diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 6ad09ac..8fc735c 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -58,15 +58,15 @@ - diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 6d2a366..63c1acc 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -189,6 +189,7 @@ page { padding: 20rpx 0; background: #fff; height: 100rpx; + margin-bottom: 20rpx; border-bottom: 1px solid #f9f9f9; } diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index b917686..4e6b6ed 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -18,7 +18,13 @@ Page({ showIf: false }, - + phone: function (e) { + let that = this; + console.log(e); + wx.makePhoneCall({ + phoneNumber: e.currentTarget.dataset.merchantlinkphone + }); + }, powerDrawer: function (e) { let that = this; // couponOrderStatus diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 2795714..a696dda 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -27,10 +27,6 @@ --> - - 适用门店 - {{order.merchantName}} - diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index f8f7919..2d26eb1 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -1,5 +1,7 @@ @import "../../../app.wxss"; - +page { + height: auto!important; +} .order { width: 100%; } @@ -16,7 +18,9 @@ padding: 0 4%; line-height: 88rpx; } - +.merchantName{ + color: #999; +} .tips text:nth-child(2) { font-size: 32rpx; padding-left: 16rpx; @@ -427,4 +431,18 @@ radio { color: #999; line-height: 24rpx; padding-left: 70rpx; +} + +.merchantVoList{ + width: 100%; + position: relative; +} +.merchantVoList image{ + width: 40rpx; + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 30rpx; + z-index: 10; } \ No newline at end of file