xt / xcx-book · Commits

Go to a project

Commit c142d3a1bc12565aab41448ee2cc00dd697a35e3

Authored by pengye
1 parent a6c822ba
build: skipped

邀请函2-17热线加拨号功能

Inline Side-by-side
Showing 18 changed files with 27 additions and 17 deletions
@@ -265,7 +265,7 @@ Page({ @@ -265,7 +265,7 @@ Page({
265 type: reserev.type, 265 type: reserev.type,
266 is_set_ddate: reserev.is_set_ddate, 266 is_set_ddate: reserev.is_set_ddate,
267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
268 - tel: reserev.seller.seller_tel.split(',')[0], 268 + tel: reserev.seller.seller_tel.split(','),
269 soltName: reserev.soltName, 269 soltName: reserev.soltName,
270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 导航到店 56 导航到店
57 </button> 57 </button>
58 </view> 58 </view>
59 - <view class="font28r" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">【热线】{{seller.seller_tel}}</view> 59 + <view class="font28r telBox" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">【热线】<block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
60 </view> 60 </view>
61 </view> 61 </view>
62 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 62 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
@@ -169,6 +169,11 @@ @@ -169,6 +169,11 @@
169 margin-top: 42rpx; 169 margin-top: 42rpx;
170 } 170 }
171 171
  172 +.telBox{
  173 + display: flex;
  174 + flex: 1;
  175 +}
  176 +
172 .positioningName .addrBox { 177 .positioningName .addrBox {
173 display: flex; 178 display: flex;
174 margin-bottom: 10rpx; 179 margin-bottom: 10rpx;
@@ -265,7 +265,7 @@ Page({ @@ -265,7 +265,7 @@ Page({
265 type: reserev.type, 265 type: reserev.type,
266 is_set_ddate: reserev.is_set_ddate, 266 is_set_ddate: reserev.is_set_ddate,
267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
268 - tel: reserev.seller.seller_tel.split(',')[0], 268 + tel: reserev.seller.seller_tel.split(','),
269 soltName: reserev.soltName, 269 soltName: reserev.soltName,
270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </view> 50 </view>
51 <view class="flex-11" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}"> 51 <view class="flex-11" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">
52 <view class="label font28r">【联系】</view> 52 <view class="label font28r">【联系】</view>
53 - <view class="contentData font36r infos">{{seller.seller_tel}}</view> 53 + <view class="contentData font36r infos"><block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
54 </view> 54 </view>
55 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 55 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
56 <view class="handleInfo"> 56 <view class="handleInfo">
@@ -265,7 +265,7 @@ Page({ @@ -265,7 +265,7 @@ Page({
265 type: reserev.type, 265 type: reserev.type,
266 is_set_ddate: reserev.is_set_ddate, 266 is_set_ddate: reserev.is_set_ddate,
267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
268 - tel: reserev.seller.seller_tel.split(',')[0], 268 + tel: reserev.seller.seller_tel.split(','),
269 soltName: reserev.soltName, 269 soltName: reserev.soltName,
270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <view class="leftInfo font36r">{{seller.date}}</view> 23 <view class="leftInfo font36r">{{seller.date}}</view>
24 <view class="leftInfo font36r"> {{seller.soltName}}<text class="marLeft font36r">{{seller.dateTime}}</text></view> 24 <view class="leftInfo font36r"> {{seller.soltName}}<text class="marLeft font36r">{{seller.dateTime}}</text></view>
25 <view class="leftInfo font36r over">{{seller.tablesText}}</view> 25 <view class="leftInfo font36r over">{{seller.tablesText}}</view>
26 - <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view> 26 + <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台<block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
27 </view> 27 </view>
28 <view class="infoBoxRight"> 28 <view class="infoBoxRight">
29 邀请函 29 邀请函
@@ -264,7 +264,7 @@ Page({ @@ -264,7 +264,7 @@ Page({
264 type: reserev.type, 264 type: reserev.type,
265 is_set_ddate: reserev.is_set_ddate, 265 is_set_ddate: reserev.is_set_ddate,
266 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 266 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
267 - tel: reserev.seller.seller_tel.split(',')[0], 267 + tel: reserev.seller.seller_tel.split(','),
268 soltName: reserev.soltName, 268 soltName: reserev.soltName,
269 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 269 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
270 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 270 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <view class="leftInfo font36r">{{seller.date}}</view> 24 <view class="leftInfo font36r">{{seller.date}}</view>
25 <view class="leftInfo font36r">{{seller.soltName}}<text class="marLeft font36r">{{seller.dateTime}}</text></view> 25 <view class="leftInfo font36r">{{seller.soltName}}<text class="marLeft font36r">{{seller.dateTime}}</text></view>
26 <view class="leftInfo font36r over">{{seller.tablesText}}</view> 26 <view class="leftInfo font36r over">{{seller.tablesText}}</view>
27 - <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view> 27 + <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
28 </view> 28 </view>
29 </view> 29 </view>
30 <view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing"> 30 <view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing">
@@ -66,6 +66,10 @@ @@ -66,6 +66,10 @@
66 overflow-y: scroll; 66 overflow-y: scroll;
67 } 67 }
68 68
  69 +.tables text{
  70 + line-height: 64rpx;
  71 +}
  72 +
69 .infoBox { 73 .infoBox {
70 display: flex; 74 display: flex;
71 align-items: center; 75 align-items: center;
@@ -219,7 +219,7 @@ Page({ @@ -219,7 +219,7 @@ Page({
219 type: reserev.type, 219 type: reserev.type,
220 is_set_ddate: reserev.is_set_ddate, 220 is_set_ddate: reserev.is_set_ddate,
221 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 221 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
222 - tel: reserev.seller.seller_tel.split(',')[0], 222 + tel: reserev.seller.seller_tel.split(','),
223 soltName: reserev.soltName, 223 soltName: reserev.soltName,
224 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 224 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
225 lat: reserev.seller.lat, 225 lat: reserev.seller.lat,
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </view> 50 </view>
51 <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}"> 51 <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
52 <view class="label font36r">【联系】</view> 52 <view class="label font36r">【联系】</view>
53 - <view class="contentData font36r infos">{{seller.seller_tel}}</view> 53 + <view class="contentData font36r infos"><block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
54 </view> 54 </view>
55 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 55 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
56 <view class="handleInfo"> 56 <view class="handleInfo">
@@ -265,7 +265,7 @@ Page({ @@ -265,7 +265,7 @@ Page({
265 type: reserev.type, 265 type: reserev.type,
266 is_set_ddate: reserev.is_set_ddate, 266 is_set_ddate: reserev.is_set_ddate,
267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
268 - tel: reserev.seller.seller_tel.split(',')[0], 268 + tel: reserev.seller.seller_tel.split(','),
269 soltName: reserev.soltName, 269 soltName: reserev.soltName,
270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 </view> 40 </view>
41 <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}"> 41 <view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
42 <view class="label font28r">【联系】</view> 42 <view class="label font28r">【联系】</view>
43 - <view class="contentData font36r infos">{{seller.seller_tel}}</view> 43 + <view class="contentData font36r infos"><block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
44 </view> 44 </view>
45 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}"> 45 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
46 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 46 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
@@ -265,7 +265,7 @@ Page({ @@ -265,7 +265,7 @@ Page({
265 type: reserev.type, 265 type: reserev.type,
266 is_set_ddate: reserev.is_set_ddate, 266 is_set_ddate: reserev.is_set_ddate,
267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 267 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
268 - tel: reserev.seller.seller_tel.split(',')[0], 268 + tel: reserev.seller.seller_tel.split(','),
269 soltName: reserev.soltName, 269 soltName: reserev.soltName,
270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 270 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 271 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
@@ -34,6 +34,10 @@ @@ -34,6 +34,10 @@
34 <view class="label font28r">【宴会位置】</view> 34 <view class="label font28r">【宴会位置】</view>
35 <view class="contentData font40r">{{seller.tablesText}}</view> 35 <view class="contentData font40r">{{seller.tablesText}}</view>
36 </view> 36 </view>
  37 + <view class="infoItem" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
  38 + <view class="label font28r">【热线电话】</view>
  39 + <view class="contentData font40r"><block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
  40 + </view>
37 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}"> 41 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
38 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 42 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
39 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image> 43 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 </view> 56 </view>
57 <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>
58 </view> 58 </view>
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> 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-1)?'':','}}</block></text>
60 </view> 60 </view>
61 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 61 <block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
62 <view class="handleInfo"> 62 <view class="handleInfo">
@@ -10,13 +10,10 @@ @@ -10,13 +10,10 @@
10 } 10 }
11 11
12 .reservationInfo { 12 .reservationInfo {
13 - min-height: 200rpx;  
14 padding-bottom: 20rpx; 13 padding-bottom: 20rpx;
15 position: relative; 14 position: relative;
16 color: #FFEFC5; 15 color: #FFEFC5;
17 padding-top: 160rpx; 16 padding-top: 160rpx;
18 - max-height: 1890rpx;  
19 - background-size: cover;  
20 } 17 }
21 18
22 .reservationInfo .infoItem { 19 .reservationInfo .infoItem {