Showing
3 changed files
with
27 additions
and
11 deletions
| @@ -271,7 +271,7 @@ Page({ | @@ -271,7 +271,7 @@ Page({ | ||
| 271 | type: reserev.type, | 271 | type: reserev.type, |
| 272 | is_set_ddate: reserev.is_set_ddate, | 272 | is_set_ddate: reserev.is_set_ddate, |
| 273 | hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, | 273 | hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, |
| 274 | - tel: reserev.seller.seller_tel.split(',')[0], | 274 | + tel: reserev.seller.seller_tel.split(','), |
| 275 | soltName: reserev.soltName, | 275 | soltName: reserev.soltName, |
| 276 | dateTime: util.unixtoTime(reserev.ddate, 'HH:II'), | 276 | dateTime: util.unixtoTime(reserev.ddate, 'HH:II'), |
| 277 | time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), | 277 | time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), |
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | <view class="name">{{seller.name||reserve.seller_name}}</view> | 9 | <view class="name">{{seller.name||reserve.seller_name}}</view> |
| 10 | </view> | 10 | </view> |
| 11 | <view class="imgBox"> | 11 | <view class="imgBox"> |
| 12 | - <image class="inviteImg {{StyleType=='13' || StyleType=='14' ||StyleType=='15' ||StyleType=='16' || StyleType=='17'?'inviteImg1':''}}" src="{{inviteImgUrl}}" alt="" srcset="" /> | 12 | + <image class="inviteImg {{StyleType=='13' || StyleType=='14' ||StyleType=='15' ||StyleType=='16' || StyleType=='17'?'inviteImg1':''}}" src="{{inviteImgUrl}}" mode="aspectFill" /> |
| 13 | </view> | 13 | </view> |
| 14 | </view> | 14 | </view> |
| 15 | <view class="bookInfo"> | 15 | <view class="bookInfo"> |
| @@ -50,11 +50,13 @@ | @@ -50,11 +50,13 @@ | ||
| 50 | <view class="centerBox"> | 50 | <view class="centerBox"> |
| 51 | <view class="positioning"> | 51 | <view class="positioning"> |
| 52 | <view class="positioningName"> | 52 | <view class="positioningName"> |
| 53 | - <text class="font24r">地址:</text> | ||
| 54 | - <text class="font24r positioningText">{{seller.addr || reserve.seller.map_address}}</text> | 53 | + <view class="mapBox"> |
| 54 | + <text class="font24r telBox">地址:</text> | ||
| 55 | + <text class="font24r positioningText">{{seller.addr || reserve.seller.map_address}}</text> | ||
| 56 | + </view> | ||
| 55 | <button wx:if="{{seller.addr || reserve.seller.map_address}}" bindtap="looklocation" class="flex-cc font24r mapBtn">导航到店</button> | 57 | <button wx:if="{{seller.addr || reserve.seller.map_address}}" bindtap="looklocation" class="flex-cc font24r mapBtn">导航到店</button> |
| 56 | </view> | 58 | </view> |
| 57 | - <text class="font24r" wx:if="{{seller.seller_tel}}">热线:{{seller.seller_tel}}</text> | 59 | + <text class="font24r telBox" wx:if="{{seller.seller_tel}}">热线:<block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==seller.tel.length?'':','}}</block></text> |
| 58 | </view> | 60 | </view> |
| 59 | <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> | 61 | <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> |
| 60 | <view class="handleInfo"> | 62 | <view class="handleInfo"> |
| @@ -228,13 +228,19 @@ | @@ -228,13 +228,19 @@ | ||
| 228 | margin-bottom: 30rpx; | 228 | margin-bottom: 30rpx; |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | -.positioning text:nth-of-type(1) { | 231 | +.positioning .telBox { |
| 232 | flex-shrink: 0; | 232 | flex-shrink: 0; |
| 233 | line-height: 50rpx; | 233 | line-height: 50rpx; |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | .positioningName { | 236 | .positioningName { |
| 237 | display: flex; | 237 | display: flex; |
| 238 | + justify-content: space-between; | ||
| 239 | +} | ||
| 240 | + | ||
| 241 | +.mapBox{ | ||
| 242 | + display: flex; | ||
| 243 | + flex: 1; | ||
| 238 | } | 244 | } |
| 239 | 245 | ||
| 240 | .positioningText { | 246 | .positioningText { |
| @@ -732,7 +738,8 @@ | @@ -732,7 +738,8 @@ | ||
| 732 | background: #750100; | 738 | background: #750100; |
| 733 | } | 739 | } |
| 734 | 740 | ||
| 735 | -.viewBox10 .introduce { | 741 | +.viewBox10 .introduce, |
| 742 | +.viewBox10 .reserveBox { | ||
| 736 | background: rgba(164, 9, 5, 0.35); | 743 | background: rgba(164, 9, 5, 0.35); |
| 737 | } | 744 | } |
| 738 | 745 | ||
| @@ -772,7 +779,9 @@ | @@ -772,7 +779,9 @@ | ||
| 772 | } | 779 | } |
| 773 | 780 | ||
| 774 | .viewBox11 .introduce, | 781 | .viewBox11 .introduce, |
| 775 | -.viewBox12 .introduce { | 782 | +.viewBox12 .introduce, |
| 783 | +.viewBox11 .reserveBox, | ||
| 784 | +.viewBox12 .reserveBox { | ||
| 776 | background: rgba(33, 74, 165, 0.3); | 785 | background: rgba(33, 74, 165, 0.3); |
| 777 | } | 786 | } |
| 778 | 787 | ||
| @@ -816,7 +825,9 @@ | @@ -816,7 +825,9 @@ | ||
| 816 | } | 825 | } |
| 817 | 826 | ||
| 818 | .viewBox13 .introduce, | 827 | .viewBox13 .introduce, |
| 819 | -.viewBox15 .introduce { | 828 | +.viewBox15 .introduce, |
| 829 | +.viewBox13 .reserveBox, | ||
| 830 | +.viewBox15 .reserveBox { | ||
| 820 | background: rgba(33, 89, 96, 0.75); | 831 | background: rgba(33, 89, 96, 0.75); |
| 821 | } | 832 | } |
| 822 | 833 | ||
| @@ -858,7 +869,9 @@ | @@ -858,7 +869,9 @@ | ||
| 858 | } | 869 | } |
| 859 | 870 | ||
| 860 | .viewBox14 .introduce, | 871 | .viewBox14 .introduce, |
| 861 | -.viewBox16 .introduce { | 872 | +.viewBox16 .introduce, |
| 873 | +.viewBox14 .reserveBox, | ||
| 874 | +.viewBox16 .reserveBox { | ||
| 862 | background: rgba(11, 8, 5, 0.75); | 875 | background: rgba(11, 8, 5, 0.75); |
| 863 | } | 876 | } |
| 864 | 877 | ||
| @@ -894,7 +907,8 @@ | @@ -894,7 +907,8 @@ | ||
| 894 | } | 907 | } |
| 895 | 908 | ||
| 896 | /* 模板17 */ | 909 | /* 模板17 */ |
| 897 | -.viewBox17 .introduce { | 910 | +.viewBox17 .introduce, |
| 911 | +.viewBox17 .reserveBox { | ||
| 898 | background: #850402; | 912 | background: #850402; |
| 899 | } | 913 | } |
| 900 | 914 |
-
Please register or login to post a comment