@@ -11,7 +11,7 @@ Page({ | |||||
data: { | data: { | ||||
poterbg: imgurl.poterbg.url, | poterbg: imgurl.poterbg.url, | ||||
teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
share01: imgurl.share01.url, | |||||
fenxiang: imgurl.fenxiang.url, | |||||
actUrl: imgurl.act.url, | actUrl: imgurl.act.url, | ||||
wmhome: imgurl.wmhome.url, | wmhome: imgurl.wmhome.url, | ||||
page: 1, | page: 1, | ||||
@@ -15,15 +15,17 @@ | |||||
<view class='merchant-detail'> | <view class='merchant-detail'> | ||||
<!-- 品牌信息 --> | <!-- 品牌信息 --> | ||||
<view class='merchant-brand' style='position:relative;z-index:9'> | <view class='merchant-brand' style='position:relative;z-index:9'> | ||||
<view> | |||||
<!-- <view> | |||||
<image src='{{data.merchantImgUrl}}' mode='aspectFill'></image> | <image src='{{data.merchantImgUrl}}' mode='aspectFill'></image> | ||||
</view> | |||||
</view> --> | |||||
<view> | <view> | ||||
<text>{{data.merchantName}}</text> | <text>{{data.merchantName}}</text> | ||||
<text class='title'>{{data.title}}</text> | <text class='title'>{{data.title}}</text> | ||||
</view> | </view> | ||||
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | ||||
<image class="fenxiang" src='{{share01}}' mode="widthFix"></image> | |||||
<image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||||
<text class='gift'>分享有礼</text> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 一个商铺 --> | <!-- 一个商铺 --> | ||||
@@ -31,9 +33,9 @@ | |||||
<view class='merchant-shop'> | <view class='merchant-shop'> | ||||
<view class='clearfix' style='width:100%;'> | <view class='clearfix' style='width:100%;'> | ||||
<view class='fl'> | <view class='fl'> | ||||
<text>商户位置</text> | |||||
<text>商户位置:</text> | |||||
</view> | </view> | ||||
<view class='merchants fr'> | |||||
<view class='merchants'> | |||||
<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> | ||||
@@ -44,14 +46,14 @@ | |||||
<view class='merchant-shop' wx:if="{{data.linkLinePhone}}"> | <view class='merchant-shop' wx:if="{{data.linkLinePhone}}"> | ||||
<view class='clearfix' style='width:100%;'> | <view class='clearfix' style='width:100%;'> | ||||
<view class='fl'> | <view class='fl'> | ||||
<text>客服电话</text> | |||||
<text>客服电话:</text> | |||||
</view> | </view> | ||||
<view class='fr'> | |||||
<view class='frHr'> | |||||
<view style='display:inline-block;text-align:left;margin-right:20rpx;'> | <view style='display:inline-block;text-align:left;margin-right:20rpx;'> | ||||
<text wx:if="{{data.linkLinePhone}}">{{data.linkLinePhone}}</text> | <text wx:if="{{data.linkLinePhone}}">{{data.linkLinePhone}}</text> | ||||
<text wx:else>{{data.merchantLinkPhone}}</text> | <text wx:else>{{data.merchantLinkPhone}}</text> | ||||
</view> | </view> | ||||
<image bindtap='phone' data-merchantLinkPhone='{{data.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
<!-- <image bindtap='phone' data-merchantLinkPhone='{{data.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> --> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -53,19 +53,27 @@ | |||||
.merchant-brand, .merchant-shop, .merchant-phone { | .merchant-brand, .merchant-shop, .merchant-phone { | ||||
width: 100%; | width: 100%; | ||||
display: flex; | |||||
padding: 20rpx 0; | |||||
/* display: flex; */ | |||||
/* padding: 10rpx 0; */ | |||||
background: #fff; | background: #fff; | ||||
border-bottom: 1rpx solid #efefef; | |||||
} | } | ||||
.merchant-brand view:nth-child(1) { | .merchant-brand view:nth-child(1) { | ||||
width: 130rpx; | |||||
border-radius: 16rpx; | |||||
width: 98%; | |||||
height: 130rpx; | height: 130rpx; | ||||
display: flex; | |||||
flex-direction: column; | |||||
white-space: nowrap; | |||||
text-overflow: ellipsis; | |||||
overflow: hidden; | |||||
} | } | ||||
.merchant-brand view:nth-child(1) image { | |||||
.merchant-brand view:nth-child(1) text:nth-child(1){ | |||||
font-size:32rpx; | |||||
font-family:PingFangSC-Regular; | |||||
font-weight:400; | |||||
color:rgba(60,60,60,1); | |||||
} | |||||
/* .merchant-brand view:nth-child(1) image { | |||||
display: block; | display: block; | ||||
width: 130rpx; | width: 130rpx; | ||||
height: 130rpx; | height: 130rpx; | ||||
@@ -81,17 +89,19 @@ | |||||
white-space: nowrap; | white-space: nowrap; | ||||
text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
overflow: hidden; | overflow: hidden; | ||||
} | |||||
} */ | |||||
.merchant-shop text, .merchant-phone text { | .merchant-shop text, .merchant-phone text { | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
} | } | ||||
.merchant-shop view, .merchant-phone view { | |||||
.merchant-shop .fl{ | |||||
color: #A6A6A6; | |||||
} | |||||
.merchant-phone view { | |||||
/* display: flex; | /* display: flex; | ||||
flex: 2; */ | flex: 2; */ | ||||
color: #333; | |||||
color: #A6A6A6; | |||||
} | } | ||||
.merchant-activity view{ | .merchant-activity view{ | ||||
color: #333; | color: #333; | ||||
@@ -168,17 +178,22 @@ | |||||
text-align: left; | text-align: left; | ||||
font-size: 26rpx; | font-size: 26rpx; | ||||
margin-bottom: 6rpx; | margin-bottom: 6rpx; | ||||
height: 26rpx; | |||||
line-height: 26rpx; | line-height: 26rpx; | ||||
color: #A6A6A6; | |||||
} | } | ||||
.merchants { | .merchants { | ||||
float: left; | |||||
display: block!important; | display: block!important; | ||||
width: 70%; | |||||
margin-left:12rpx; | |||||
} | } | ||||
.merchant-brand { | .merchant-brand { | ||||
border: none !important; | border: none !important; | ||||
width: 92%; | width: 92%; | ||||
margin: 0 auto; | |||||
margin: 20rpx auto 0; | |||||
} | } | ||||
.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; | ||||
@@ -186,8 +201,8 @@ | |||||
} | } | ||||
.title{ | .title{ | ||||
font-size: 24rpx; | |||||
color: #666; | |||||
font-size: 26rpx; | |||||
color: #A6A6A6; | |||||
width: 530rpx; | width: 530rpx; | ||||
height: 40rpx; | height: 40rpx; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
@@ -244,12 +259,19 @@ | |||||
padding: 0 4% 10rpx; | padding: 0 4% 10rpx; | ||||
} | } | ||||
.fenxiang image { | .fenxiang image { | ||||
width: 108rpx; | |||||
width: 48rpx; | |||||
height: 48rpx; | |||||
position: absolute; | position: absolute; | ||||
top: 16rpx; | top: 16rpx; | ||||
right: 14rpx; | |||||
} | |||||
.gift{ | |||||
color: #3C3C3C; | |||||
font-size: 20rpx; | |||||
position: absolute; | |||||
right: 0; | right: 0; | ||||
top: 65rpx; | |||||
} | } | ||||
.user-motto { | .user-motto { | ||||
width: 270rpx; | width: 270rpx; | ||||
border: 0; | border: 0; | ||||
@@ -399,3 +421,10 @@ button::after{ border: none; } | |||||
bottom: 0; | bottom: 0; | ||||
margin: auto; | margin: auto; | ||||
} | } | ||||
.frHr{ | |||||
float: left; | |||||
color: #FD832D; | |||||
font-size: 24rpx; | |||||
margin-left: 12rpx; | |||||
margin-top: 12rpx; | |||||
} |