@@ -40,13 +40,11 @@ Page({ | |||||
display:"none", | display:"none", | ||||
showbutton:false | showbutton:false | ||||
}, | }, | ||||
phone: function () { | |||||
phone: function (e) { | |||||
let that = this; | let that = this; | ||||
if (that.data.data.merchantLinkPhone) { | |||||
wx.makePhoneCall({ | |||||
phoneNumber: that.data.data.merchantLinkPhone | |||||
}); | |||||
} | |||||
wx.makePhoneCall({ | |||||
phoneNumber: e.target.dataset.merchantlinkphone | |||||
}); | |||||
}, | }, | ||||
/** | /** | ||||
* 点击提交问题单选 | * 点击提交问题单选 | ||||
@@ -58,15 +58,15 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='posi'> | <view class='posi'> | ||||
<view class='posi_logo'> | |||||
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | |||||
<view> | <view> | ||||
<image src='{{data.merChantImgUrl}}'></image> | |||||
<image src='{{item.merChantImgUrl}}'></image> | |||||
</view> | </view> | ||||
<view> | <view> | ||||
<text>{{data.merchantName}}</text> | |||||
<text>{{data.addr}}{{data.buildingName}}{{data.floorName}}</text> | |||||
<text>{{item.merchantName}}</text> | |||||
<text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | |||||
</view> | </view> | ||||
<image bindtap='phone' class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix" /> | |||||
<image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix" /> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='notes'> | <view class='notes'> | ||||
@@ -189,6 +189,7 @@ page { | |||||
padding: 20rpx 0; | padding: 20rpx 0; | ||||
background: #fff; | background: #fff; | ||||
height: 100rpx; | height: 100rpx; | ||||
margin-bottom: 20rpx; | |||||
border-bottom: 1px solid #f9f9f9; | border-bottom: 1px solid #f9f9f9; | ||||
} | } | ||||
@@ -18,7 +18,13 @@ Page({ | |||||
showIf: false | showIf: false | ||||
}, | }, | ||||
phone: function (e) { | |||||
let that = this; | |||||
console.log(e); | |||||
wx.makePhoneCall({ | |||||
phoneNumber: e.currentTarget.dataset.merchantlinkphone | |||||
}); | |||||
}, | |||||
powerDrawer: function (e) { | powerDrawer: function (e) { | ||||
let that = this; | let that = this; | ||||
// couponOrderStatus | // couponOrderStatus | ||||
@@ -27,10 +27,6 @@ | |||||
</view> --> | </view> --> | ||||
</view> | </view> | ||||
<view class='classif'> | <view class='classif'> | ||||
<view class="clearfix"> | |||||
<text>适用门店</text> | |||||
<text class="fr">{{order.merchantName}}</text> | |||||
</view> | |||||
<!-- | <!-- | ||||
couponOrderStatus | couponOrderStatus | ||||
0 未使用 | 0 未使用 | ||||
@@ -70,6 +66,12 @@ | |||||
<text>订单金额</text> | <text>订单金额</text> | ||||
<text class="jine">{{order.salePrice/100}}元</text> | <text class="jine">{{order.salePrice/100}}元</text> | ||||
</view> | </view> | ||||
<view class="clearfix" bindtap='showDoorList'> | |||||
<text>适用门店列表</text> | |||||
</view> | |||||
<view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}"> | |||||
<view class='merchantVoList' bindtap='phone' data-merchantlinkphone='{{item.merchantLinkPhone}}'><text class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</text><image class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix"></image></view> | |||||
</view> | |||||
</view> | </view> | ||||
<!-- 待付款 显示立即购买的按钮 --> | <!-- 待付款 显示立即购买的按钮 --> | ||||
<view wx:if="{{order.orderStatus==0}}" class="buy-view app-border-top"> | <view wx:if="{{order.orderStatus==0}}" class="buy-view app-border-top"> | ||||
@@ -1,5 +1,7 @@ | |||||
@import "../../../app.wxss"; | @import "../../../app.wxss"; | ||||
page { | |||||
height: auto!important; | |||||
} | |||||
.order { | .order { | ||||
width: 100%; | width: 100%; | ||||
} | } | ||||
@@ -16,7 +18,9 @@ | |||||
padding: 0 4%; | padding: 0 4%; | ||||
line-height: 88rpx; | line-height: 88rpx; | ||||
} | } | ||||
.merchantName{ | |||||
color: #999; | |||||
} | |||||
.tips text:nth-child(2) { | .tips text:nth-child(2) { | ||||
font-size: 32rpx; | font-size: 32rpx; | ||||
padding-left: 16rpx; | padding-left: 16rpx; | ||||
@@ -427,4 +431,18 @@ radio { | |||||
color: #999; | color: #999; | ||||
line-height: 24rpx; | line-height: 24rpx; | ||||
padding-left: 70rpx; | padding-left: 70rpx; | ||||
} | |||||
.merchantVoList{ | |||||
width: 100%; | |||||
position: relative; | |||||
} | |||||
.merchantVoList image{ | |||||
width: 40rpx; | |||||
position: absolute; | |||||
top: 0; | |||||
bottom: 0; | |||||
margin: auto; | |||||
right: 30rpx; | |||||
z-index: 10; | |||||
} | } |