diff --git a/pkg_product/views/experienceCouponOrderDetail.vue b/pkg_product/views/experienceCouponOrderDetail.vue index 70b112e..4e09cd5 100644 --- a/pkg_product/views/experienceCouponOrderDetail.vue +++ b/pkg_product/views/experienceCouponOrderDetail.vue @@ -35,19 +35,27 @@ - - - {{ orderInfo.experienceItemInfo && orderInfo.experienceItemInfo.themeName ? orderInfo.experienceItemInfo.themeName : '' }} - 营业时间:{{ formattedBusinessTime }} - - - 距该地{{ distanceText }}km - {{ orderInfo.address }} + + + + {{ orderInfo.experienceItemInfo && orderInfo.experienceItemInfo.themeName ? orderInfo.experienceItemInfo.themeName : '' }} + + + 距该地{{ distanceText }}km + {{ orderInfo.address }} + - - - + + 营业时间:{{ formattedBusinessTime }} + + + + + + + + @@ -216,6 +224,16 @@ export default { const d = R * c this.distanceText = d.toFixed(1) }, + callMerchant() { + const phone = this.orderInfo.merchantPhone || this.orderInfo.merPhone || (this.orderInfo.experienceItemInfo && this.orderInfo.experienceItemInfo.phone) || this.orderInfo.companyTel; + if (phone) { + uni.makePhoneCall({ + phoneNumber: phone + }) + } else { + uni.showToast({ title: '暂无商家电话', icon: 'none' }) + } + }, openLocation() { if (this.orderInfo.latitude && this.orderInfo.longitude) { uni.openLocation({ @@ -224,13 +242,8 @@ export default { name: this.orderInfo.merchantName, address: this.orderInfo.address }) - } - }, - callMerchant() { - if (this.orderInfo.merchantPhone) { - uni.makePhoneCall({ - phoneNumber: this.orderInfo.merchantPhone - }) + } else { + uni.showToast({ title: '暂无位置信息', icon: 'none' }) } }, copyVerifyCode() { @@ -381,8 +394,14 @@ export default { border-radius: 16rpx; padding: 24rpx; margin-bottom: 24rpx; + display: flex; + flex-direction: column; +} + +.merchant-card-top { display: flex; position: relative; + margin-bottom: 24rpx; } .merchant-avatar { @@ -408,10 +427,20 @@ export default { margin-bottom: 8rpx; } +.merchant-card-bottom { + display: flex; + align-items: center; + justify-content: space-between; +} + .merchant-time { font-size: 24rpx; color: #666; - margin-bottom: 8rpx; + margin-bottom: 0; + line-height: 1.4; + word-break: break-all; + flex: 1; + padding-right: 24rpx; } .merchant-location-wrap { @@ -443,15 +472,18 @@ export default { .merchant-actions { display: flex; flex-direction: row; - align-items: flex-end; - position: absolute; - right: 24rpx; - bottom: 24rpx; + align-items: center; + flex-shrink: 0; } -.action-icon { +.action-btn { width: 64rpx; height: 64rpx; + border-radius: 50%; + background: #C52733; + display: flex; + align-items: center; + justify-content: center; margin-left: 16rpx; }