From 17393e222f09db523450d50f7cb8d654d743c155 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 12 Dec 2018 14:55:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E5=95=86=E6=88=B7=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=89=B9=E4=BA=AB=E7=A4=BC=E9=81=87?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=89=93=E6=8A=98=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 7 ++- pages/couponorder/detail/index.js | 6 +-- pages/couponorder/detail/index.wxml | 21 +++++--- pages/couponorder/detail/index.wxss | 6 +-- pages/grade/grade.js | 11 ++++ pages/passCar/couponList/couponList.js | 3 ++ pages/passCar/passCar.js | 12 +++-- pages/specialcourtesy/specialcourtesy.js | 25 ++++++++-- pages/specialcourtesy/specialcourtesy.wxml | 58 +++------------------- pages/user/index.js | 19 +++++++ pages/user/index.wxml | 3 +- 11 files changed, 96 insertions(+), 75 deletions(-) diff --git a/config/config.js b/config/config.js index 3a5e8fe..16cbb28 100755 --- a/config/config.js +++ b/config/config.js @@ -163,7 +163,12 @@ var config = { /** * 提交问卷 */ - answerQuestion:"/wxQuestion/answerQuestion" + answerQuestion:"/wxQuestion/answerQuestion", + /** + * + 获取打折商户列表 + */ + discountMerchantList:"/mall/discountMerchantList" }, weapp: { diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 01c4792..18d5fb3 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -150,11 +150,11 @@ Page({ }); }) }, - phone: function () { + phone: function (e) { let that = this; - if (that.data.data.merchantLinkPhone) { + if (e.currentTarget.dataset.merchantlinkphone) { wx.makePhoneCall({ - phoneNumber: that.data.data.merchantLinkPhone + phoneNumber: e.currentTarget.dataset.merchantlinkphone }); } } diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index d969019..e7a3b65 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -39,17 +39,22 @@ 适用门店 -