| @@ -350,10 +350,14 @@ Page({ | |||||
| data: data | data: data | ||||
| }) | }) | ||||
| .then(res => { | .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 => { | .catch(err => { | ||||
| wx.showToast({ | wx.showToast({ | ||||
| @@ -157,8 +157,13 @@ Page({ | |||||
| }).then(res => { | }).then(res => { | ||||
| that.setData({ | that.setData({ | ||||
| couponList: res.data.page.list, | couponList: res.data.page.list, | ||||
| qrCode: res.data.qrCode, | |||||
| }) | }) | ||||
| // if (res.data && res.data.qrCode){ | |||||
| // that.setData({ | |||||
| // qrCode: res.data.qrCode, | |||||
| // }) | |||||
| // } | |||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| wx.showToast({ | wx.showToast({ | ||||
| @@ -29,11 +29,11 @@ | |||||
| <!-- 一个商铺 --> | <!-- 一个商铺 --> | ||||
| <!-- 多个商铺 --> | <!-- 多个商铺 --> | ||||
| <view class='merchant-shop'> | <view class='merchant-shop'> | ||||
| <view> | |||||
| <view> | |||||
| <view class='clearfix' style='width:100%;'> | |||||
| <view class='fl'> | |||||
| <text>商户位置</text> | <text>商户位置</text> | ||||
| </view> | </view> | ||||
| <view class='merchants'> | |||||
| <view class='merchants fr'> | |||||
| <text wx:for="{{shopVoList}}" wx:key="{{index}}"> | <text wx:for="{{shopVoList}}" wx:key="{{index}}"> | ||||
| {{item.buildingName}}{{item.floorName}}--{{item.shopNumber}} | {{item.buildingName}}{{item.floorName}}--{{item.shopNumber}} | ||||
| </text> | </text> | ||||
| @@ -41,19 +41,21 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- 联系方式 --> | <!-- 联系方式 --> | ||||
| <view class='merchant-phone'> | |||||
| <view> | |||||
| <text>联系商户</text> | |||||
| </view> | |||||
| <view> | |||||
| <view style='display:block;text-align:left;margin-right:20rpx;'> | |||||
| <text>{{data.merchantLinkPhone}}</text> | |||||
| <view class='merchant-shop'> | |||||
| <view class='clearfix' style='width:100%;'> | |||||
| <view class='fl'> | |||||
| <text>联系商户</text> | |||||
| </view> | |||||
| <view class='fr'> | |||||
| <view style='display:inline-block;text-align:left;margin-right:20rpx;'> | |||||
| <text>{{data.merchantLinkPhone}}</text> | |||||
| </view> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| <image bindtap='phone' data-merchantLinkPhone='{{data.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- 商户活动 --> | <!-- 商户活动 --> | ||||
| <view class='merchant-activity' wx:if="{{data.actionDesc}}" > | |||||
| <view class='merchant-shop' wx:if="{{data.actionDesc}}" > | |||||
| <view class='notes'> | <view class='notes'> | ||||
| <view> | <view> | ||||
| <text>商户活动</text> | <text>商户活动</text> | ||||
| @@ -1,3 +1,4 @@ | |||||
| @import "../../../../app.wxss"; | |||||
| .index-slide, swiper-item | .index-slide, swiper-item | ||||
| .index-slide-image { | .index-slide-image { | ||||
| display: block; | display: block; | ||||
| @@ -75,8 +76,11 @@ | |||||
| .merchant-brand view:nth-child(2) { | .merchant-brand view:nth-child(2) { | ||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| flex: 6; | |||||
| width: 61%; | |||||
| padding-left: 30rpx; | padding-left: 30rpx; | ||||
| white-space: nowrap; | |||||
| text-overflow: ellipsis; | |||||
| overflow: hidden; | |||||
| } | } | ||||
| @@ -85,8 +89,8 @@ | |||||
| } | } | ||||
| .merchant-shop view, .merchant-phone view { | .merchant-shop view, .merchant-phone view { | ||||
| display: flex; | |||||
| flex: 2; | |||||
| /* display: flex; | |||||
| flex: 2; */ | |||||
| color: #333; | color: #333; | ||||
| } | } | ||||
| .merchant-activity view{ | .merchant-activity view{ | ||||
| @@ -134,12 +138,14 @@ | |||||
| } | } | ||||
| .tel { | .tel { | ||||
| right: 0; | |||||
| /* right: 0; | |||||
| top: 0; | top: 0; | ||||
| bottom: 0; | bottom: 0; | ||||
| margin: auto; | |||||
| margin: auto; */ | |||||
| display: inline-block; | |||||
| width: 50rpx; | width: 50rpx; | ||||
| height: 50rpx; | height: 50rpx; | ||||
| vertical-align: middle; | |||||
| } | } | ||||
| .shoplists { | .shoplists { | ||||
| @@ -162,11 +168,11 @@ | |||||
| text-align: left; | text-align: left; | ||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| margin-bottom: 6rpx; | margin-bottom: 6rpx; | ||||
| line-height: 15rpx; | |||||
| line-height: 24rpx; | |||||
| } | } | ||||
| .merchants { | .merchants { | ||||
| display: block !important; | |||||
| display: block!important; | |||||
| } | } | ||||
| .merchant-brand { | .merchant-brand { | ||||
| @@ -176,6 +182,7 @@ | |||||
| } | } | ||||
| .merchant-brand view:nth-child(2) text:nth-child(1) { | .merchant-brand view:nth-child(2) text:nth-child(1) { | ||||
| margin-top: 20rpx; | margin-top: 20rpx; | ||||
| font-size: 32rpx; | |||||
| } | } | ||||
| .title{ | .title{ | ||||
| @@ -239,7 +246,7 @@ | |||||
| .fenxiang image { | .fenxiang image { | ||||
| width: 108rpx; | width: 108rpx; | ||||
| position: absolute; | position: absolute; | ||||
| top: 0; | |||||
| top: 16rpx; | |||||
| right: 0; | right: 0; | ||||
| } | } | ||||