xt / xcx-book · Commits

Go to a project

Commit 2adf3bcc7e289fcb9167777e938939c283cf9f13

Authored by pengye
1 parent 77adda61
build: skipped

邀请函联系电话修改字段和样式

Inline Side-by-side
Showing 18 changed files with 60 additions and 16 deletions
@@ -247,6 +247,7 @@ Page({ @@ -247,6 +247,7 @@ Page({
247 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 247 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
248 lat: reserev.seller.lat, 248 lat: reserev.seller.lat,
249 long: reserev.seller.long, 249 long: reserev.seller.long,
  250 + seller_tel: reserev.seller.seller_tel,
250 } 251 }
251 }) 252 })
252 console.log('reserev reserev', reserev); 253 console.log('reserev reserev', reserev);
1 <!--pages/customer/detail_owner_invitation2.wxml--> 1 <!--pages/customer/detail_owner_invitation2.wxml-->
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 -<nav hasHome backgroundColor="{{themeSixteen}}" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav> 3 +<nav hasHome backgroundColor="{{themeSixteen}}" color="#fff" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
4 <scroll-view scroll-y class="{{themeColor}}"> 4 <scroll-view scroll-y class="{{themeColor}}">
5 <view class="positioningBox"> 5 <view class="positioningBox">
6 <view class="positioning" bindtap="looklocation"> 6 <view class="positioning" bindtap="looklocation">
@@ -30,11 +30,11 @@ @@ -30,11 +30,11 @@
30 </view> 30 </view>
31 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}"> 31 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
32 <view class="label font36r">【停车信息】</view> 32 <view class="label font36r">【停车信息】</view>
33 - <view class="contentData font34r">{{reserve.park_info}}</view> 33 + <view class="contentData font34r infos">{{reserve.park_info}}</view>
34 </view> 34 </view>
35 - <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 35 + <view class="flex-11" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">
36 <view class="label font36r">【联系餐厅】</view> 36 <view class="label font36r">【联系餐厅】</view>
37 - <view class="contentData font36r">{{detail.seller.phone}}</view> 37 + <view class="contentData font36r infos">{{seller.seller_tel}}</view>
38 </view> 38 </view>
39 <view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing"> 39 <view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing">
40 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 40 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
@@ -524,6 +524,14 @@ @@ -524,6 +524,14 @@
524 border-radius: 16rpx; 524 border-radius: 16rpx;
525 } 525 }
526 526
  527 +.infos {
  528 + overflow: hidden;
  529 + word-break: break-all;
  530 + text-overflow: ellipsis;
  531 + display: -webkit-box;
  532 + -webkit-box-orient: vertical;
  533 +}
  534 +
527 /* 深中国红 */ 535 /* 深中国红 */
528 .crimson .reservationInfo, 536 .crimson .reservationInfo,
529 .crimson .positioningBox { 537 .crimson .positioningBox {
@@ -248,6 +248,7 @@ Page({ @@ -248,6 +248,7 @@ Page({
248 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 248 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
249 lat: reserev.seller.lat, 249 lat: reserev.seller.lat,
250 long: reserev.seller.long, 250 long: reserev.seller.long,
  251 + seller_tel: reserev.seller.seller_tel,
251 } 252 }
252 }) 253 })
253 console.log('reserev reserev', reserev); 254 console.log('reserev reserev', reserev);
@@ -38,11 +38,11 @@ @@ -38,11 +38,11 @@
38 </view> 38 </view>
39 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}"> 39 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
40 <view class="label font36r">【停车】</view> 40 <view class="label font36r">【停车】</view>
41 - <view class="contentData font36r">{{reserve.park_info}}</view> 41 + <view class="contentData font36r infos">{{reserve.park_info}}</view>
42 </view> 42 </view>
43 - <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 43 + <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
44 <view class="label font36r">【联系】</view> 44 <view class="label font36r">【联系】</view>
45 - <view class="contentData font36r">{{detail.seller.phone}}</view> 45 + <view class="contentData font36r infos">{{seller.seller_tel}}</view>
46 </view> 46 </view>
47 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 47 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
48 <view class="handleInfo"> 48 <view class="handleInfo">
@@ -583,6 +583,14 @@ @@ -583,6 +583,14 @@
583 padding-left: 126rpx; 583 padding-left: 126rpx;
584 } 584 }
585 585
  586 +.infos {
  587 + overflow: hidden;
  588 + word-break: break-all;
  589 + text-overflow: ellipsis;
  590 + display: -webkit-box;
  591 + -webkit-box-orient: vertical;
  592 +}
  593 +
586 /* 黑蓝过渡 */ 594 /* 黑蓝过渡 */
587 .blackBlueGradient .reservationInfo { 595 .blackBlueGradient .reservationInfo {
588 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%); 596 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
@@ -248,6 +248,7 @@ Page({ @@ -248,6 +248,7 @@ Page({
248 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 248 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
249 lat: reserev.seller.lat, 249 lat: reserev.seller.lat,
250 long: reserev.seller.long, 250 long: reserev.seller.long,
  251 + seller_tel: reserev.seller.seller_tel,
251 } 252 }
252 }) 253 })
253 console.log('reserev reserev', reserev); 254 console.log('reserev reserev', reserev);
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <view class="leftInfo font36r">{{seller.date}} {{seller.soltName}}</view> 11 <view class="leftInfo font36r">{{seller.date}} {{seller.soltName}}</view>
12 <view class="leftInfo font36r">{{seller.time}}</view> 12 <view class="leftInfo font36r">{{seller.time}}</view>
13 <view class="leftInfo font36r over">{{seller.tablesText}}</view> 13 <view class="leftInfo font36r over">{{seller.tablesText}}</view>
14 - <view class="leftInfo font36r tables" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view> 14 + <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view>
15 </view> 15 </view>
16 <view class="line"></view> 16 <view class="line"></view>
17 <view class="infoBoxRight"> 17 <view class="infoBoxRight">
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 width: 2rpx; 13 width: 2rpx;
14 height: 400rpx; 14 height: 400rpx;
15 background: #FFD200; 15 background: #FFD200;
16 - margin: 0 20rpx 0 20rpx; 16 + margin: 10rpx 20rpx 0 20rpx;
17 } 17 }
18 18
19 .titleIcon { 19 .titleIcon {
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
60 justify-content: flex-end; 60 justify-content: flex-end;
61 word-break: break-all; 61 word-break: break-all;
62 line-height: 60rpx; 62 line-height: 60rpx;
  63 + text-align: right;
63 } 64 }
64 65
65 .tables { 66 .tables {
@@ -247,6 +247,7 @@ Page({ @@ -247,6 +247,7 @@ Page({
247 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 247 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
248 lat: reserev.seller.lat, 248 lat: reserev.seller.lat,
249 long: reserev.seller.long, 249 long: reserev.seller.long,
  250 + seller_tel: reserev.seller.seller_tel,
250 } 251 }
251 }) 252 })
252 console.log('reserev reserev', reserev); 253 console.log('reserev reserev', reserev);
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class="leftInfo font32r">{{seller.date}} {{seller.soltName}}</view> 12 <view class="leftInfo font32r">{{seller.date}} {{seller.soltName}}</view>
13 <view class="leftInfo font32r">{{seller.time}}</view> 13 <view class="leftInfo font32r">{{seller.time}}</view>
14 <view class="leftInfo font32r over">{{seller.tablesText}}</view> 14 <view class="leftInfo font32r over">{{seller.tablesText}}</view>
15 - <view class="leftInfo font32r" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view> 15 + <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view>
16 <view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}"> 16 <view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}">
17 <image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/mapIcon.png':'https://qn.colorcun.com/whiteAddress.png'}}" mode="" /> 17 <image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/mapIcon.png':'https://qn.colorcun.com/whiteAddress.png'}}" mode="" />
18 <text>{{seller.addr|| reserev.seller.map_address}}</text> 18 <text>{{seller.addr|| reserev.seller.map_address}}</text>
@@ -53,6 +53,11 @@ @@ -53,6 +53,11 @@
53 margin-right: 20rpx; 53 margin-right: 20rpx;
54 } 54 }
55 55
  56 +.tables {
  57 + height: 120rpx;
  58 + overflow-y: scroll;
  59 +}
  60 +
56 .infoBox { 61 .infoBox {
57 display: flex; 62 display: flex;
58 align-items: center; 63 align-items: center;
@@ -97,7 +102,7 @@ @@ -97,7 +102,7 @@
97 width: 2rpx; 102 width: 2rpx;
98 height: 450rpx; 103 height: 450rpx;
99 background: #FFD200; 104 background: #FFD200;
100 - margin: 0 20rpx 0 20rpx; 105 + margin: 10rpx 20rpx 0 20rpx;
101 } 106 }
102 107
103 .handleInfo { 108 .handleInfo {
@@ -200,6 +200,7 @@ Page({ @@ -200,6 +200,7 @@ Page({
200 soltName: reserev.soltName, 200 soltName: reserev.soltName,
201 lat: reserev.seller.lat, 201 lat: reserev.seller.lat,
202 long: reserev.seller.long, 202 long: reserev.seller.long,
  203 + seller_tel: reserev.seller.seller_tel,
203 } 204 }
204 }) 205 })
205 console.log('reserev reserev', reserev); 206 console.log('reserev reserev', reserev);
@@ -36,11 +36,11 @@ @@ -36,11 +36,11 @@
36 </view> 36 </view>
37 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}"> 37 <view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
38 <view class="label font36r">【停车】</view> 38 <view class="label font36r">【停车】</view>
39 - <view class="contentData font36r">{{reserve.park_info}}</view> 39 + <view class="contentData font36r infos">{{reserve.park_info}}</view>
40 </view> 40 </view>
41 - <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 41 + <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
42 <view class="label font36r">【联系】</view> 42 <view class="label font36r">【联系】</view>
43 - <view class="contentData font36r">{{detail.seller.phone}}</view> 43 + <view class="contentData font36r infos">{{seller.seller_tel}}</view>
44 </view> 44 </view>
45 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 45 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
46 <view class="handleInfo"> 46 <view class="handleInfo">
@@ -656,6 +656,14 @@ @@ -656,6 +656,14 @@
656 height: 30rpx; 656 height: 30rpx;
657 } 657 }
658 658
  659 +.infos {
  660 + overflow: hidden;
  661 + word-break: break-all;
  662 + text-overflow: ellipsis;
  663 + display: -webkit-box;
  664 + -webkit-box-orient: vertical;
  665 +}
  666 +
659 /* 黑蓝过渡 */ 667 /* 黑蓝过渡 */
660 .blackBlueGradient .titleImg { 668 .blackBlueGradient .titleImg {
661 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%); 669 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
@@ -247,6 +247,7 @@ Page({ @@ -247,6 +247,7 @@ Page({
247 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 247 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
248 lat: reserev.seller.lat, 248 lat: reserev.seller.lat,
249 long: reserev.seller.long, 249 long: reserev.seller.long,
  250 + seller_tel: reserev.seller.seller_tel,
250 } 251 }
251 }) 252 })
252 console.log('reserev reserev', reserev); 253 console.log('reserev reserev', reserev);
@@ -28,9 +28,9 @@ @@ -28,9 +28,9 @@
28 <view class="label font36r">【停车】</view> 28 <view class="label font36r">【停车】</view>
29 <view class="contentData font36r">{{reserve.park_info}}</view> 29 <view class="contentData font36r">{{reserve.park_info}}</view>
30 </view> 30 </view>
31 - <view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}"> 31 + <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
32 <view class="label font36r">【联系】</view> 32 <view class="label font36r">【联系】</view>
33 - <view class="contentData font36r">{{detail.seller.phone}}</view> 33 + <view class="contentData font36r infos">{{seller.seller_tel}}</view>
34 </view> 34 </view>
35 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}"> 35 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
36 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 36 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
@@ -556,6 +556,14 @@ @@ -556,6 +556,14 @@
556 justify-content: center; 556 justify-content: center;
557 } 557 }
558 558
  559 +.infos {
  560 + overflow: hidden;
  561 + word-break: break-all;
  562 + text-overflow: ellipsis;
  563 + display: -webkit-box;
  564 + -webkit-box-orient: vertical;
  565 +}
  566 +
559 /* 黑蓝过渡 */ 567 /* 黑蓝过渡 */
560 .blackBlueGradient .reservationInfo { 568 .blackBlueGradient .reservationInfo {
561 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%); 569 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);