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({
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
long: reserev.seller.long,
seller_tel: reserev.seller.seller_tel,
}
})
console.log('reserev reserev', reserev);
... ...
<!--pages/customer/detail_owner_invitation2.wxml-->
<import src="../tpl/invitation"></import>
<nav hasHome backgroundColor="{{themeSixteen}}" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
<nav hasHome backgroundColor="{{themeSixteen}}" color="#fff" class="navhome" place="{{true}}">{{seller.name||reserve.seller_name}}</nav>
<scroll-view scroll-y class="{{themeColor}}">
<view class="positioningBox">
<view class="positioning" bindtap="looklocation">
... ... @@ -30,11 +30,11 @@
</view>
<view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
<view class="label font36r">【停车信息】</view>
<view class="contentData font34r">{{reserve.park_info}}</view>
<view class="contentData font34r infos">{{reserve.park_info}}</view>
</view>
<view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
<view class="flex-11" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">
<view class="label font36r">【联系餐厅】</view>
<view class="contentData font36r">{{detail.seller.phone}}</view>
<view class="contentData font36r infos">{{seller.seller_tel}}</view>
</view>
<view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing">
<view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
... ...
... ... @@ -524,6 +524,14 @@
border-radius: 16rpx;
}
.infos {
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
}
/* 深中国红 */
.crimson .reservationInfo,
.crimson .positioningBox {
... ...
... ... @@ -248,6 +248,7 @@ Page({
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
long: reserev.seller.long,
seller_tel: reserev.seller.seller_tel,
}
})
console.log('reserev reserev', reserev);
... ...
... ... @@ -38,11 +38,11 @@
</view>
<view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
<view class="label font36r">【停车】</view>
<view class="contentData font36r">{{reserve.park_info}}</view>
<view class="contentData font36r infos">{{reserve.park_info}}</view>
</view>
<view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
<view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
<view class="label font36r">【联系】</view>
<view class="contentData font36r">{{detail.seller.phone}}</view>
<view class="contentData font36r infos">{{seller.seller_tel}}</view>
</view>
<block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
<view class="handleInfo">
... ...
... ... @@ -583,6 +583,14 @@
padding-left: 126rpx;
}
.infos {
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
}
/* 黑蓝过渡 */
.blackBlueGradient .reservationInfo {
background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
... ...
... ... @@ -248,6 +248,7 @@ Page({
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
long: reserev.seller.long,
seller_tel: reserev.seller.seller_tel,
}
})
console.log('reserev reserev', reserev);
... ...
... ... @@ -11,7 +11,7 @@
<view class="leftInfo font36r">{{seller.date}} {{seller.soltName}}</view>
<view class="leftInfo font36r">{{seller.time}}</view>
<view class="leftInfo font36r over">{{seller.tablesText}}</view>
<view class="leftInfo font36r tables" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view>
<view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view>
</view>
<view class="line"></view>
<view class="infoBoxRight">
... ...
... ... @@ -13,7 +13,7 @@
width: 2rpx;
height: 400rpx;
background: #FFD200;
margin: 0 20rpx 0 20rpx;
margin: 10rpx 20rpx 0 20rpx;
}
.titleIcon {
... ... @@ -60,6 +60,7 @@
justify-content: flex-end;
word-break: break-all;
line-height: 60rpx;
text-align: right;
}
.tables {
... ...
... ... @@ -247,6 +247,7 @@ Page({
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
long: reserev.seller.long,
seller_tel: reserev.seller.seller_tel,
}
})
console.log('reserev reserev', reserev);
... ...
... ... @@ -12,7 +12,7 @@
<view class="leftInfo font32r">{{seller.date}} {{seller.soltName}}</view>
<view class="leftInfo font32r">{{seller.time}}</view>
<view class="leftInfo font32r over">{{seller.tablesText}}</view>
<view class="leftInfo font32r" wx:if="{{detail.seller.phone}}">预订台 {{detail.seller.phone}}</view>
<view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && reserve && seller.seller_tel}}">预订台 {{seller.seller_tel}}</view>
<view class="font32r addressInfo" bindtap="looklocation" wx:if="{{seller.addr|| reserev.seller.map_address}}">
<image src="{{themeColor=='pearlWhite'?'https://qn.colorcun.com/mapIcon.png':'https://qn.colorcun.com/whiteAddress.png'}}" mode="" />
<text>{{seller.addr|| reserev.seller.map_address}}</text>
... ...
... ... @@ -53,6 +53,11 @@
margin-right: 20rpx;
}
.tables {
height: 120rpx;
overflow-y: scroll;
}
.infoBox {
display: flex;
align-items: center;
... ... @@ -97,7 +102,7 @@
width: 2rpx;
height: 450rpx;
background: #FFD200;
margin: 0 20rpx 0 20rpx;
margin: 10rpx 20rpx 0 20rpx;
}
.handleInfo {
... ...
... ... @@ -200,6 +200,7 @@ Page({
soltName: reserev.soltName,
lat: reserev.seller.lat,
long: reserev.seller.long,
seller_tel: reserev.seller.seller_tel,
}
})
console.log('reserev reserev', reserev);
... ...
... ... @@ -36,11 +36,11 @@
</view>
<view class="flex-11" wx:if="{{reserve && reserve.swich_park=='1' && reserve.park_info}}">
<view class="label font36r">【停车】</view>
<view class="contentData font36r">{{reserve.park_info}}</view>
<view class="contentData font36r infos">{{reserve.park_info}}</view>
</view>
<view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
<view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
<view class="label font36r">【联系】</view>
<view class="contentData font36r">{{detail.seller.phone}}</view>
<view class="contentData font36r infos">{{seller.seller_tel}}</view>
</view>
<block wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
<view class="handleInfo">
... ...
... ... @@ -656,6 +656,14 @@
height: 30rpx;
}
.infos {
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
}
/* 黑蓝过渡 */
.blackBlueGradient .titleImg {
background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
... ...
... ... @@ -247,6 +247,7 @@ Page({
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
long: reserev.seller.long,
seller_tel: reserev.seller.seller_tel,
}
})
console.log('reserev reserev', reserev);
... ...
... ... @@ -28,9 +28,9 @@
<view class="label font36r">【停车】</view>
<view class="contentData font36r">{{reserve.park_info}}</view>
</view>
<view class="flex-11" wx:if="{{ swich_phone!='0' && detail.seller.phone}}">
<view class="flex-11" wx:if="{{ swich_phone!='0' && seller && reserve && seller.seller_tel}}">
<view class="label font36r">【联系】</view>
<view class="contentData font36r">{{detail.seller.phone}}</view>
<view class="contentData font36r infos">{{seller.seller_tel}}</view>
</view>
<view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
<view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
... ...
... ... @@ -556,6 +556,14 @@
justify-content: center;
}
.infos {
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
}
/* 黑蓝过渡 */
.blackBlueGradient .reservationInfo {
background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
... ...