Commit 0699bc0c2db65ef293169bd48160b679a86113c5
1 parent
162ab881
3.有“包间预订”的商家详情,地址后面有电话,可以拨打电话;这部分有可能会影响我们之前设置的地址展示字数,如果有影响,将字数展示的宽度调窄)
Showing
3 changed files
with
25 additions
and
4 deletions
| @@ -140,8 +140,8 @@ Page({ | @@ -140,8 +140,8 @@ Page({ | ||
| 140 | path:path, | 140 | path:path, |
| 141 | } | 141 | } |
| 142 | }, | 142 | }, |
| 143 | - reserveEvent(){ | ||
| 144 | - if(this.data.hasOnlineReserve){ | 143 | + reserveEvent(e){ |
| 144 | + if(this.data.hasOnlineReserve && util.attr(e,'act')!='phone'){ | ||
| 145 | return this.setData({ | 145 | return this.setData({ |
| 146 | activeTab:'reserve' | 146 | activeTab:'reserve' |
| 147 | }) | 147 | }) |
| @@ -54,7 +54,19 @@ | @@ -54,7 +54,19 @@ | ||
| 54 | <text class="label_text" >{{seller.label_cstr}}</text> | 54 | <text class="label_text" >{{seller.label_cstr}}</text> |
| 55 | </view> | 55 | </view> |
| 56 | </view> | 56 | </view> |
| 57 | - <view class="addr flex-lr" bindtap="lookLocation"> | 57 | + <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}" > |
| 58 | + <view class="addr-view" bindtap="lookLocation"> | ||
| 59 | + <view class="addr-text flex-ll"> | ||
| 60 | + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image> | ||
| 61 | + <view class="text">{{seller.real_address||seller.map_address}}</view> | ||
| 62 | + </view> | ||
| 63 | + <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view> | ||
| 64 | + </view> | ||
| 65 | + <formids class="flex-vc" bindclick="reserveEvent" data-act="phone"> | ||
| 66 | + <view class="more more-phone"></view> | ||
| 67 | + </formids> | ||
| 68 | + </view> | ||
| 69 | + <view class="addr flex-lr" bindtap="lookLocation" wx:else="" > | ||
| 58 | <view class="addr-view"> | 70 | <view class="addr-view"> |
| 59 | <view class="addr-text flex-ll"> | 71 | <view class="addr-text flex-ll"> |
| 60 | <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image> | 72 | <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image> |
| @@ -32,7 +32,6 @@ | @@ -32,7 +32,6 @@ | ||
| 32 | font-size: 36rpx; | 32 | font-size: 36rpx; |
| 33 | line-height: 50rpx; | 33 | line-height: 50rpx; |
| 34 | margin-bottom: 20rpx; | 34 | margin-bottom: 20rpx; |
| 35 | - overflow: hidden; | ||
| 36 | } | 35 | } |
| 37 | .base .ping,.base .peitao{ | 36 | .base .ping,.base .peitao{ |
| 38 | height: 40rpx; | 37 | height: 40rpx; |
| @@ -397,6 +396,7 @@ | @@ -397,6 +396,7 @@ | ||
| 397 | min-width: 135rpx; | 396 | min-width: 135rpx; |
| 398 | margin-left: 120rpx; | 397 | margin-left: 120rpx; |
| 399 | text-align: right; | 398 | text-align: right; |
| 399 | + white-space: nowrap; | ||
| 400 | } | 400 | } |
| 401 | .name-info-text{ | 401 | .name-info-text{ |
| 402 | margin-right: 20rpx; | 402 | margin-right: 20rpx; |
| @@ -521,3 +521,12 @@ | @@ -521,3 +521,12 @@ | ||
| 521 | width: calc(100% - 60rpx); | 521 | width: calc(100% - 60rpx); |
| 522 | margin: 0 auto; | 522 | margin: 0 auto; |
| 523 | } | 523 | } |
| 524 | +.more-phone{ | ||
| 525 | + width: 158rpx; | ||
| 526 | + min-width: 158rpx; | ||
| 527 | + border-left: 2rpx solid #E0E0E0; | ||
| 528 | + height: 70rpx; | ||
| 529 | + background-size: 40rpx 36rpx; | ||
| 530 | + background-position: center center; | ||
| 531 | + background-image: url("https://qn.colorcun.com/reserve/images/sphone.png"); | ||
| 532 | +} |
-
Please register or login to post a comment