From 80c474aff635eef9e63a2af21d59b27233546eb6 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 25 Apr 2019 19:07:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E5=95=86=E6=88=B7=E8=AF=A6=E6=83=85]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/banner/index.wxml | 5 - pages/coupon/detail/index.js | 8 ++ pages/coupon/detail/index.wxml | 8 +- pages/coupon/detail/index.wxss | 53 ++++---- pages/index/detail/index.js | 2 +- pages/index/detail/index.wxml | 32 ++--- pages/index/detail/index.wxss | 206 +++++++++++++++++-------------- pages/index/searchbar/index.wxml | 6 +- pages/index/searchbar/index.wxss | 25 +++- 9 files changed, 191 insertions(+), 154 deletions(-) diff --git a/components/banner/index.wxml b/components/banner/index.wxml index f82ad3f..34fa4f6 100644 --- a/components/banner/index.wxml +++ b/components/banner/index.wxml @@ -7,9 +7,4 @@ - \ No newline at end of file diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index a1a8615..06e401a 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -76,6 +76,14 @@ Page({ countdown: "", showbutton1:false }, + /** + * 跳转到门店列表的详情页面 + */ + gotoDetail(e) { + wx.navigateTo({ + url: `/pages/index/detail/index?id=${e.currentTarget.dataset.id}` + }) + }, phone: function(e) { let that = this; wx.makePhoneCall({ diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 080fd38..ea48554 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -70,13 +70,17 @@ 适用门店 - {{item.merchantName}} - {{item.buildingName}}{{item.floorName}} + + + {{itemName.shopNumber}}{{itemName.buildingName}}{{itemName.floorName}}, + + diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss index 706f870..24b014a 100644 --- a/pages/index/searchbar/index.wxss +++ b/pages/index/searchbar/index.wxss @@ -92,7 +92,7 @@ } .merchants view:nth-child(1) { - width: 100rpx; + /* width: 100rpx; */ /* height: 100rpx; */ border-radius: 16rpx; } @@ -106,13 +106,17 @@ } .merchants view:nth-child(2) { - display: flex; + /* display: flex; flex-direction: column; - flex: 8; + flex: 8; */ padding-left: 30rpx; } - +.shopVo{ + display: flex; + padding-left: 0!important; +} .merchants view:nth-child(2) text:nth-child(1) { + display: block; overflow: hidden; font-size: 32rpx; color: #333; @@ -356,4 +360,17 @@ page { } .all{ padding-bottom: 80rpx; +} +.shopVoList{ + display: flex!important; + padding-left: 0!important; + flex-direction:row!important; +} +.shopVoList text{ + font-size: 20rpx!important; + display: inline-block!important; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + color: #b8b8b8!important; } \ No newline at end of file