From cc524162cc314b8e3095d191478ff0b2a57d5b5a Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 31 May 2019 00:31:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=97=A8=E5=BA=97=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E9=97=A8=E5=BA=97=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E7=9A=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/canvas/index.js | 12 ++++++++---- pages/index/searchbar/detail/index.js | 7 ++++++- pages/index/searchbar/detail/index.wxml | 26 +++++++++++++------------ pages/index/searchbar/detail/index.wxss | 23 ++++++++++++++-------- 4 files changed, 43 insertions(+), 25 deletions(-) diff --git a/pages/canvas/index.js b/pages/canvas/index.js index 36c7fde..2e364fc 100644 --- a/pages/canvas/index.js +++ b/pages/canvas/index.js @@ -350,10 +350,14 @@ Page({ data: data }) .then(res => { - that.setData({ - couponList: res.data.page.list, - qrCode: res.data.qrCode - }); + if (res.data && res.data.qrCode) { + that.setData({ + qrCode: res.data.qrCode, + }) + } + // that.setData({ + // couponList: res.data.page.list + // }); }) .catch(err => { wx.showToast({ diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index dbefba9..0a8bf88 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -157,8 +157,13 @@ Page({ }).then(res => { that.setData({ couponList: res.data.page.list, - qrCode: res.data.qrCode, }) + + // if (res.data && res.data.qrCode){ + // that.setData({ + // qrCode: res.data.qrCode, + // }) + // } }) .catch(err => { wx.showToast({ diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml index 7bf1db4..befc3d2 100644 --- a/pages/index/searchbar/detail/index.wxml +++ b/pages/index/searchbar/detail/index.wxml @@ -29,11 +29,11 @@ - - + + 商户位置 - + {{item.buildingName}}{{item.floorName}}--{{item.shopNumber}} @@ -41,19 +41,21 @@ - - - 联系商户 - - - - {{data.merchantLinkPhone}} + + + + 联系商户 + + + + {{data.merchantLinkPhone}} + + - - + 商户活动 diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss index 47b75a2..8ba7ac1 100644 --- a/pages/index/searchbar/detail/index.wxss +++ b/pages/index/searchbar/detail/index.wxss @@ -1,3 +1,4 @@ +@import "../../../../app.wxss"; .index-slide, swiper-item .index-slide-image { display: block; @@ -75,8 +76,11 @@ .merchant-brand view:nth-child(2) { display: flex; flex-direction: column; - flex: 6; + width: 61%; padding-left: 30rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } @@ -85,8 +89,8 @@ } .merchant-shop view, .merchant-phone view { - display: flex; - flex: 2; + /* display: flex; + flex: 2; */ color: #333; } .merchant-activity view{ @@ -134,12 +138,14 @@ } .tel { - right: 0; + /* right: 0; top: 0; bottom: 0; - margin: auto; + margin: auto; */ + display: inline-block; width: 50rpx; height: 50rpx; + vertical-align: middle; } .shoplists { @@ -162,11 +168,11 @@ text-align: left; font-size: 26rpx; margin-bottom: 6rpx; - line-height: 15rpx; + line-height: 24rpx; } .merchants { - display: block !important; + display: block!important; } .merchant-brand { @@ -176,6 +182,7 @@ } .merchant-brand view:nth-child(2) text:nth-child(1) { margin-top: 20rpx; + font-size: 32rpx; } .title{ @@ -239,7 +246,7 @@ .fenxiang image { width: 108rpx; position: absolute; - top: 0; + top: 16rpx; right: 0; }