From 971e7f019592277ec3d6b593359e9282927b946a Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 3 Jul 2019 11:28:07 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=97=A8=E5=BA=97][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/coupon/detail/index.js | 4 ++-
pages/coupon/detail/index.wxml | 39 +++++++++++++------------
pages/coupon/detail/index.wxss | 1 +
pages/index/searchbar/detail/index.wxml | 7 +++--
pages/index/searchbar/detail/index.wxss | 2 +-
5 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 64091f3..56f1a65 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -103,8 +103,10 @@ Page({
* 跳转到门店列表的详情页面
*/
gotoDetail(e) {
+ console.log(e)
+
wx.navigateTo({
- url: `/pages/index/detail/index?id=${e.currentTarget.dataset.id}`
+ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
})
},
/**
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 70cee55..8a3c07c 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -6,7 +6,7 @@
-
+
@@ -77,7 +77,8 @@
满{{data.usePriceStr}}元可用
- 限购条件:每人限购{{data.useLimitQuantity}}张
+ 限购条件:
+ 每人限购{{data.useLimitQuantity}}张
(仅限新用户活动)
({{minLimit}}-{{maxLimit}}成长值)
(大于{{minLimit}}成长值)
@@ -86,11 +87,11 @@
适用门店
-
-
+
+
-
+
{{item.merchantName}}
@@ -133,7 +134,7 @@
-
+
@@ -198,18 +199,18 @@
-
-
-
-
-
-
- 微信好友
-
-
-
- 生成海报
-
+
+
+
+
+
+
+ 微信好友
+
+
+
+ 生成海报
+
\ No newline at end of file
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index e32070e..db37aac 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -231,6 +231,7 @@ button::after {
display: flex;
padding: 20rpx 0;
background: #fff;
+ z-index: 10000;
}
.posi_logo view:nth-child(1) {
diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml
index 17490ae..9b29391 100644
--- a/pages/index/searchbar/detail/index.wxml
+++ b/pages/index/searchbar/detail/index.wxml
@@ -3,7 +3,7 @@
-
+
@@ -48,9 +48,10 @@
- {{data.merchantLinkPhone}}
+ {{data.linkLinePhone}}
+ {{data.merchantLinkPhone}}
-
+
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index 51c0fb7..83df9b2 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -6,7 +6,7 @@
margin: 0 auto;
overflow: hidden;
position: relative;
- height: 476rpx;
+ height: 450rpx;
}
.index-slide-view .dots {