Commit b390c90468882c0ff34b7bfb522d7404b73fd45e

Authored by pengye
1 parent 87a025ca

邀请函信息显示空格以及换行

... ... @@ -17,13 +17,13 @@
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="positioningBox">
<view class="positioning">
<text class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<text class="font48r">{{seller.name || reserve.seller_name}}</text>
<text space="nbsp" class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<text space="nbsp" class="font48r">{{seller.name || reserve.seller_name}}</text>
</view>
</view>
<view class="reservationInfo">
<view class="begin" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
<view class="font28r">{{reserve && reserve.book_info}}</view>
<text space="nbsp" class="font28r">{{reserve && reserve.book_info}}</text>
</view>
<view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
<view class="label font28r">【预订贵宾】</view>
... ... @@ -51,13 +51,13 @@
<text>{{item.name}}</text>
</view>
</view>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioningName">
<view class="addrBox" wx:if="{{seller.addr|| reserve.seller.map_address}}">
<view class="font28r">【地址】</view>
<text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
导航到店
</button>
... ... @@ -120,7 +120,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/>
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 用餐环境 -->
... ... @@ -131,7 +131,7 @@
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts">{{store.introduce}}
<text space="nbsp" class="texts">{{store.introduce}}
</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
... ... @@ -151,7 +151,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
<text space="nbsp" class="texts">{{chef.introduce}}
</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
... ... @@ -173,7 +173,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</view>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
<text space="nbsp" class="texts">{{reserve.park_info}}
</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
... ...
... ... @@ -76,6 +76,7 @@
}
.welcome {
display: block;
text-align: right;
margin: 42rpx 30rpx 0 30rpx;
padding-bottom: 24rpx;
... ... @@ -151,6 +152,7 @@
}
.sloganBox {
display: block;
margin-bottom: 30rpx;
}
... ... @@ -188,7 +190,11 @@
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
text-align: left;
}
.addrBox text {
flex: 1;
}
.mapBtn {
... ...
... ... @@ -20,10 +20,10 @@
<image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
<image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
<image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" />
<view class="titleInfo {{seller.name.length>10?'titleInfo1':'titleInfo2'}}">{{seller.name}}</view>
<view class="info font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">
<text space="nbsp" class="titleInfo {{seller.name.length>10?'titleInfo1':'titleInfo2'}}">{{seller.name}}</text>
<text space="nbsp" class="info font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">
{{home.slogan}}
</view>
</text>
</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}}">
... ... @@ -32,7 +32,7 @@
</view>
</view>
<view class="begin">
<view class="font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">{{reserve && reserve.book_info}}</view>
<text space="nbsp" class="font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">{{reserve && reserve.book_info}}</text>
</view>
<view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
<view class="label font28r">【贵宾】</view>
... ... @@ -71,12 +71,12 @@
</view>
</view>
</block>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioning">
<image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
<text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
导航到店
</button>
... ... @@ -122,7 +122,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix" />
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 用餐环境 -->
... ... @@ -133,7 +133,7 @@
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts">{{store.introduce}}
<text space="nbsp" class="texts">{{store.introduce}}
</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
... ... @@ -153,7 +153,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
<text space="nbsp" class="texts">{{chef.introduce}}
</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
... ... @@ -175,7 +175,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</view>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
<text space="nbsp" class="texts">{{reserve.park_info}}
</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
... ...
... ... @@ -126,7 +126,7 @@
font-family: PingFang SC;
}
.begin view {
.begin text {
line-height: 64rpx;
}
... ... @@ -167,6 +167,7 @@
}
.welcome {
display: block;
text-align: right;
margin: 27rpx 40rpx 16rpx 40rpx;
font-weight: 500;
... ... @@ -274,7 +275,8 @@
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
margin: 0 10rpx;
margin: 0 10rpx;
flex: 1;
}
/* 优惠券开始 */
... ...
... ... @@ -20,8 +20,8 @@
<image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" />
<view class="infoBox">
<view class="boxLeft">
<view class="sellerTitle">{{seller.name}}</view>
<view class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>
<text space="nbsp" class="sellerTitle">{{seller.name}}</text>
<text space="nbsp" class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<view class="leftLine"></view>
<view class="leftInfo font36r"
wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"
... ... @@ -55,12 +55,12 @@
</view>
</view>
</block>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioning">
<image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
<text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
导航到店
</button>
... ... @@ -105,7 +105,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix" />
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 用餐环境 -->
... ... @@ -116,7 +116,7 @@
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts">{{store.introduce}}
<text space="nbsp" class="texts">{{store.introduce}}
</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
... ... @@ -136,7 +136,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
<text space="nbsp" class="texts">{{chef.introduce}}
</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
... ... @@ -158,7 +158,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</view>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
<text space="nbsp" class="texts">{{reserve.park_info}}
</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
... ...
... ... @@ -36,6 +36,7 @@
}
.sellerTitle {
display: block;
text-align: center;
font-size: 48rpx;
font-family: PingFang SC;
... ... @@ -101,6 +102,7 @@
}
.welcome {
display: block;
text-align: right;
margin: 40rpx;
font-weight: 500;
... ... @@ -185,7 +187,8 @@
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
text-align: left;
flex: 1;
}
.positioning image {
... ...
... ... @@ -21,8 +21,8 @@
<view class="infoBox">
<view class="infoBoxRight">邀请函</view>
<view class="boxLeft">
<view class="sellerTitle font48r">{{seller.name}}</view>
<view class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>
<text space="nbsp" class="sellerTitle font48r">{{seller.name}}</text>
<text space="nbsp" class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<view class="leftLine"></view>
<view class="leftInfo font36r"
wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"
... ... @@ -52,12 +52,12 @@
</view>
</view>
</block>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioning">
<image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
<text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
导航到店
</button>
... ... @@ -103,7 +103,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" />
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 用餐环境 -->
... ... @@ -114,7 +114,7 @@
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts">{{store.introduce}}
<text space="nbsp" class="texts">{{store.introduce}}
</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
... ... @@ -134,7 +134,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
<text space="nbsp" class="texts">{{chef.introduce}}
</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
... ... @@ -156,7 +156,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</view>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
<text space="nbsp" class="texts">{{reserve.park_info}}
</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
... ...
... ... @@ -29,6 +29,7 @@
.sellerTitle {
display: block;
font-size: 48rpx;
font-family: PingFang SC;
color: #FFD200;
... ... @@ -99,6 +100,7 @@
}
.welcome {
display: block;
text-align: right;
margin: 40rpx;
font-weight: 500;
... ...
... ... @@ -17,19 +17,19 @@
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="titleImg">
<image src="{{whiteBj?'https://qn.colorcun.com/whiteBj1.png':'https://qn.colorcun.com/leaf.png'}}" class="titleIcon"></image>
<view class="title">{{seller.name?seller.name:reserve.seller_name}}</view>
<view class="info">
<text space="nbsp" class="title">{{seller.name?seller.name:reserve.seller_name}}</text>
<text space="nbsp" class="info">
{{home.slogan}}
</view>
</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" bindtap="lookImgs" data-url="{{home.image}}" src="{{home.image}}" class="homeImage" mode="widthFix"></image>
<view class="reservationInfo flex-ll">
<view class="line">
</view>
<view class="infoRight">
<view class="begin beginTop" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
<text space="nbsp" class="begin beginTop" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
<view class="font40r">{{reserve && reserve.book_info}}</view>
</view>
</text>
<view class="begin">
<view class="font40r">尊敬的贵宾,您好!</view>
<view class="font40r">非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】!</view>
... ... @@ -71,12 +71,12 @@
</view>
</view>
</block>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioning">
<view class="name">
<text>{{seller.addr?seller.addr:reserve.seller.map_address}}</text>
<text space="nbsp">{{seller.addr?seller.addr:reserve.seller.map_address}}</text>
</view>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
<image src="https://qn.colorcun.com/address.png" mode="" />
... ... @@ -122,7 +122,7 @@
<view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/>
<text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 品牌介绍类型 图文合并 -->
... ... @@ -140,7 +140,7 @@
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
<text space="nbsp" class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
</view>
</view>
... ... @@ -158,7 +158,7 @@
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
<text space="nbsp" class="label styleLabel">{{store.introduce}}</text>
</view>
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
... ... @@ -178,7 +178,7 @@
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
<text space="nbsp" class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
... ... @@ -200,7 +200,7 @@
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
<text space="nbsp" class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
... ...
... ... @@ -28,6 +28,7 @@
.info {
display: block;
text-align: center;
font-family: FangSong;
font-size: 40rpx;
... ...
... ... @@ -18,12 +18,12 @@
<view class="reservationInfo">
<view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
<view class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>
<view class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</view>
<text space="nbsp" class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<text space="nbsp" class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</text>
</view>
<view class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
<text space="nbsp" class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
{{reserve && reserve.book_info}}
</view>
</text>
<view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
<view class="label font28r">【贵宾】</view>
<view class="contentData font36r">{{detail.rnameStr}}</view>
... ... @@ -67,12 +67,12 @@
</view>
</view>
</block>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioning">
<image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
<text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<text class="font28r" space="nbsp">{{seller.addr|| reserve.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
导航到店
</button>
... ... @@ -118,7 +118,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" />
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 用餐环境 -->
... ... @@ -129,8 +129,7 @@
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts">{{store.introduce}}
</text>
<text space="nbsp" class="texts">{{store.introduce}}</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
</block>
... ... @@ -149,8 +148,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
<text space="nbsp" class="texts">{{chef.introduce}}</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
<image src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
... ... @@ -171,8 +169,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</view>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
</text>
<text space="nbsp" class="texts">{{reserve.park_info}}</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
... ...
... ... @@ -33,6 +33,7 @@
}
.imgBottom {
display: block;
width: 100%;
text-align: center;
position: absolute;
... ... @@ -43,6 +44,7 @@
}
.begin {
display: block;
margin: 30rpx 40rpx 50rpx;
color: #FFEFC5;
font-family: PingFang SC;
... ... @@ -93,6 +95,7 @@
}
.welcome {
display: block;
text-align: center;
margin: 42rpx 40rpx 16rpx 40rpx;
font-weight: 500;
... ... @@ -200,7 +203,8 @@
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
margin: 0 10rpx;
margin: 0 10rpx;
flex: 1;
}
.pageSpacing {
... ...
... ... @@ -19,12 +19,12 @@
<view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}"
bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
<view class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>
<view class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</view>
<text space="nbsp" class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<text space="nbsp" class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</text>
</view>
<view class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
<text space="nbsp" class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
{{reserve.book_info}}
</view>
</text>
<view class="infoItem" wx:if="{{seller.date}}">
<view class="label font28r">【宴会日期】</view>
<view class="contentData font40r">{{seller.date}}</view>
... ... @@ -64,12 +64,12 @@
</view>
</view>
</block>
<view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
<text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
{{marketing.wecomle}}
</view>
</text>
<view class="positioning">
<image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
<text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
<text class="font28r" space="nbsp" >{{seller.addr|| reserve.seller.map_address}}</text>
<button bindtap="looklocation" class="flex-cc font24r mapBtn">
导航到店
</button>
... ... @@ -115,7 +115,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" />
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 用餐环境 -->
... ... @@ -126,7 +126,7 @@
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts">{{store.introduce}}
<text space="nbsp" class="texts">{{store.introduce}}
</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
... ... @@ -146,7 +146,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
<text class="texts" space="nbsp">{{chef.introduce}}
</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
... ... @@ -168,7 +168,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</view>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
<text class="texts" space="nbsp">{{reserve.park_info}}
</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
... ...
... ... @@ -27,6 +27,7 @@
}
.begin {
display: block;
margin: 30rpx 40rpx 50rpx;
color: #FFEFC5;
font-family: PingFang SC;
... ... @@ -43,6 +44,7 @@
}
.imgBottom {
display: block;
width: 100%;
text-align: center;
position: absolute;
... ... @@ -99,6 +101,7 @@
}
.welcome {
display: block;
text-align: center;
margin: 42rpx 40rpx 16rpx 40rpx;
font-weight: 500;
... ... @@ -206,7 +209,8 @@
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
margin: 0 10rpx;
margin: 0 10rpx;
flex: 1;
}
.pageSpacing {
... ...
... ... @@ -12,8 +12,8 @@
<view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;">
<view class="infoTop">
<view class="infoTopName">
<view class="font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>
<view class="name">{{seller.name||reserve.seller_name}}</view>
<text space="nbsp" class="font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
<text space="nbsp" class="name">{{seller.name||reserve.seller_name}}</text>
</view>
<view class="imgBox">
<image class="inviteImg {{StyleType=='13' || StyleType=='14' ||StyleType=='15' ||StyleType=='16' || StyleType=='17'?'inviteImg1':''}}" src="{{inviteImgUrl}}" mode="aspectFill" />
... ... @@ -21,7 +21,7 @@
</view>
<view class="bookInfo">
<view class="infoItem infoItemOne">
<view wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}" class="contentData font28r bookData">{{reserve.book_info}}</view>
<text space="nbsp" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}" class="contentData font28r bookData">{{reserve.book_info}}</text>
</view>
<view class="infoItem" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
<view class="label font28r">预订贵宾:</view>
... ... @@ -45,9 +45,9 @@
<text>{{item.name}}</text>
</view>
</view>
<view class="welcomeMsg font28r" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}">
<text space="nbsp" class="welcomeMsg font28r" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}">
{{marketing.wecomle}}
</view>
</text>
</view>
<view wx:if="{{titleType == '1'}}" class="separatrixOne">
<block wx:for="{{num1}}" wx:key="index"><text class="text{{item}}"></text></block>
... ... @@ -59,7 +59,7 @@
<view class="positioningName">
<view class="mapBox">
<text class="font24r telBox">地址:</text>
<text class="font24r positioningText">{{seller.addr || reserve.seller.map_address}}</text>
<text space="nbsp" class="font24r positioningText">{{seller.addr || reserve.seller.map_address}}</text>
</view>
<button wx:if="{{seller.addr || reserve.seller.map_address}}" bindtap="looklocation" class="flex-cc font24r mapBtn">导航到店</button>
</view>
... ... @@ -118,7 +118,7 @@
<view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
<block wx:for="{{reserveData.content}}" wx:key="index">
<image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/>
<text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
<text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
</block>
</view>
<!-- 餐厅介绍 -->
... ... @@ -129,8 +129,7 @@
</block>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
<view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<text class="texts font32r">{{store.introduce}}
</text>
<text space="nbsp" class="texts font32r">{{store.introduce}}</text>
</view>
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
</view>
... ... @@ -150,7 +149,7 @@
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
<text class="texts" space="nbsp">{{chef.introduce}}
</text>
</view>
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
... ... @@ -172,7 +171,7 @@
<titleStyle titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
</block>
<view class="labelBox" wx:if="{{reserve.park_info}}">
<text class="texts">{{reserve.park_info}}
<text class="texts" space="nbsp">{{reserve.park_info}}
</text>
</view>
<block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
... ... @@ -237,7 +236,7 @@
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
</view>
... ...
... ... @@ -48,6 +48,10 @@
margin-bottom: 66rpx;
}
.infoTopName text{
display: block;
}
.infoTopName .name {
font-size: 56rpx;
margin-top: 16rpx;
... ...