From 1229d7b073f01ee0b2912caf6d10908e79b1862a Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 3 Jul 2019 14:44:19 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E5=8C=85=EF=BC=8C=E5=8D=A1=E5=8C=85?=
=?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95][=E5=A2=9E=E5=8A=A0]:[=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=97=A8=E5=BA=97=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E7=9A=84=E9=A1=B5=E9=9D=A2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/ConsumeDetail/ConsumeDetail.js | 8 ++++++++
pages/ConsumeDetail/ConsumeDetail.wxml | 4 ++--
pages/ConsumeDetail/ConsumeDetail.wxss | 2 +-
pages/coupon/detail/index.js | 2 --
pages/couponorder/detail/index.js | 8 ++++++++
pages/couponorder/detail/index.wxml | 4 ++--
pages/order/detail/index.js | 10 +++++++---
pages/order/detail/index.wxml | 6 +++++-
8 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js
index 644726f..6c3584e 100644
--- a/pages/ConsumeDetail/ConsumeDetail.js
+++ b/pages/ConsumeDetail/ConsumeDetail.js
@@ -64,6 +64,14 @@ Page({
phoneNumber: e.target.dataset.merchantlinkphone
});
},
+ /**
+ * 跳转到门店列表的详情页面
+ */
+ gotoDetail(e) {
+ wx.navigateTo({
+ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
+ })
+ },
gotoIndex(){
wx.navigateTo({
url: '/pages/index/index',
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml
index 9f1e973..bdad410 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxml
+++ b/pages/ConsumeDetail/ConsumeDetail.wxml
@@ -10,10 +10,10 @@
适用门店
-
+
-
+
{{item.merchantName}}
{{item.addr}}{{item.buildingName}}{{item.floorName}}
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxss b/pages/ConsumeDetail/ConsumeDetail.wxss
index 28d8265..f4b96e9 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxss
+++ b/pages/ConsumeDetail/ConsumeDetail.wxss
@@ -1,4 +1,4 @@
-
+button::after{ border: none; }
.notes{
padding-bottom: 60rpx;
}
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 6e1ea19..b76e869 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -103,8 +103,6 @@ Page({
* 跳转到门店列表的详情页面
*/
gotoDetail(e) {
- console.log(e)
-
wx.navigateTo({
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
})
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 484b970..32f5a90 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -44,6 +44,14 @@ Page({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
+ /**
+ * 跳转到门店列表的详情页面
+ */
+ gotoDetail(e) {
+ wx.navigateTo({
+ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
+ })
+ },
// 获取游戏
getStaticGame(token) {
let _this = this;
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index df67f97..6c2f33d 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -54,10 +54,10 @@
-
+
-
+
{{item.merchantName}}
{{item.addr}}{{item.buildingName}}{{item.floorName}}
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index 0e38ef9..fb99185 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -36,9 +36,13 @@ Page({
phoneNumber: e.currentTarget.dataset.merchantlinkphone
});
},
- //转赠给微信好友
- goToTranser() {
-
+ /**
+ * 跳转到门店列表的详情页面
+ */
+ gotoDetail(e) {
+ wx.navigateTo({
+ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
+ })
},
getUserInfo: function () {
let that = this;
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index e70b19a..ff2635c 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -67,7 +67,11 @@
适用门店:
- {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
+
+
+ {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
+
+