xt / xcx-book · Commits

Go to a project

Commit b390c90468882c0ff34b7bfb522d7404b73fd45e

Authored by pengye
1 parent 87a025ca
build: skipped

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

Inline Side-by-side
Showing 16 changed files with 117 additions and 95 deletions
@@ -17,13 +17,13 @@ @@ -17,13 +17,13 @@
17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
18 <view class="positioningBox"> 18 <view class="positioningBox">
19 <view class="positioning"> 19 <view class="positioning">
20 - <text class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>  
21 - <text class="font48r">{{seller.name || reserve.seller_name}}</text> 20 + <text space="nbsp" class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
  21 + <text space="nbsp" class="font48r">{{seller.name || reserve.seller_name}}</text>
22 </view> 22 </view>
23 </view> 23 </view>
24 <view class="reservationInfo"> 24 <view class="reservationInfo">
25 <view class="begin" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}"> 25 <view class="begin" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
26 - <view class="font28r">{{reserve && reserve.book_info}}</view> 26 + <text space="nbsp" class="font28r">{{reserve && reserve.book_info}}</text>
27 </view> 27 </view>
28 <view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"> 28 <view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
29 <view class="label font28r">【预订贵宾】</view> 29 <view class="label font28r">【预订贵宾】</view>
@@ -51,13 +51,13 @@ @@ -51,13 +51,13 @@
51 <text>{{item.name}}</text> 51 <text>{{item.name}}</text>
52 </view> 52 </view>
53 </view> 53 </view>
54 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r"> 54 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
55 {{marketing.wecomle}} 55 {{marketing.wecomle}}
56 - </view> 56 + </text>
57 <view class="positioningName"> 57 <view class="positioningName">
58 <view class="addrBox" wx:if="{{seller.addr|| reserve.seller.map_address}}"> 58 <view class="addrBox" wx:if="{{seller.addr|| reserve.seller.map_address}}">
59 <view class="font28r">【地址】</view> 59 <view class="font28r">【地址】</view>
60 - <text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text> 60 + <text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
61 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 61 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
62 导航到店 62 导航到店
63 </button> 63 </button>
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 120 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
121 <block wx:for="{{reserveData.content}}" wx:key="index"> 121 <block wx:for="{{reserveData.content}}" wx:key="index">
122 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/> 122 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/>
123 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 123 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
124 </block> 124 </block>
125 </view> 125 </view>
126 <!-- 餐厅介绍 用餐环境 --> 126 <!-- 餐厅介绍 用餐环境 -->
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 </view> 131 </view>
132 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 132 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
133 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 133 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
134 - <text class="texts">{{store.introduce}} 134 + <text space="nbsp" class="texts">{{store.introduce}}
135 </text> 135 </text>
136 </view> 136 </view>
137 <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> 137 <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 @@ @@ -151,7 +151,7 @@
151 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 151 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
152 </view> 152 </view>
153 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 153 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
154 - <text class="texts">{{chef.introduce}} 154 + <text space="nbsp" class="texts">{{chef.introduce}}
155 </text> 155 </text>
156 </view> 156 </view>
157 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 157 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
@@ -173,7 +173,7 @@ @@ -173,7 +173,7 @@
173 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 173 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
174 </view> 174 </view>
175 <view class="labelBox" wx:if="{{reserve.park_info}}"> 175 <view class="labelBox" wx:if="{{reserve.park_info}}">
176 - <text class="texts">{{reserve.park_info}} 176 + <text space="nbsp" class="texts">{{reserve.park_info}}
177 </text> 177 </text>
178 </view> 178 </view>
179 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 179 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
@@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
76 } 76 }
77 77
78 .welcome { 78 .welcome {
  79 + display: block;
79 text-align: right; 80 text-align: right;
80 margin: 42rpx 30rpx 0 30rpx; 81 margin: 42rpx 30rpx 0 30rpx;
81 padding-bottom: 24rpx; 82 padding-bottom: 24rpx;
@@ -151,6 +152,7 @@ @@ -151,6 +152,7 @@
151 } 152 }
152 153
153 .sloganBox { 154 .sloganBox {
  155 + display: block;
154 margin-bottom: 30rpx; 156 margin-bottom: 30rpx;
155 } 157 }
156 158
@@ -188,7 +190,11 @@ @@ -188,7 +190,11 @@
188 word-break: break-all; 190 word-break: break-all;
189 word-wrap: break-word; 191 word-wrap: break-word;
190 overflow: hidden; 192 overflow: hidden;
191 - text-align: left; 193 + text-align: left;
  194 +}
  195 +
  196 +.addrBox text {
  197 + flex: 1;
192 } 198 }
193 199
194 .mapBtn { 200 .mapBtn {
@@ -20,10 +20,10 @@ @@ -20,10 +20,10 @@
20 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" /> 20 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
21 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" /> 21 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
22 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" /> 22 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" />
23 - <view class="titleInfo {{seller.name.length>10?'titleInfo1':'titleInfo2'}}">{{seller.name}}</view>  
24 - <view class="info font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}"> 23 + <text space="nbsp" class="titleInfo {{seller.name.length>10?'titleInfo1':'titleInfo2'}}">{{seller.name}}</text>
  24 + <text space="nbsp" class="info font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">
25 {{home.slogan}} 25 {{home.slogan}}
26 - </view> 26 + </text>
27 </view> 27 </view>
28 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}"> 28 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
29 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 29 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </view> 32 </view>
33 </view> 33 </view>
34 <view class="begin"> 34 <view class="begin">
35 - <view class="font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">{{reserve && reserve.book_info}}</view> 35 + <text space="nbsp" class="font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">{{reserve && reserve.book_info}}</text>
36 </view> 36 </view>
37 <view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"> 37 <view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
38 <view class="label font28r">【贵宾】</view> 38 <view class="label font28r">【贵宾】</view>
@@ -71,12 +71,12 @@ @@ -71,12 +71,12 @@
71 </view> 71 </view>
72 </view> 72 </view>
73 </block> 73 </block>
74 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r"> 74 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
75 {{marketing.wecomle}} 75 {{marketing.wecomle}}
76 - </view> 76 + </text>
77 <view class="positioning"> 77 <view class="positioning">
78 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" /> 78 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
79 - <text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text> 79 + <text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
80 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 80 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
81 导航到店 81 导航到店
82 </button> 82 </button>
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 122 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
123 <block wx:for="{{reserveData.content}}" wx:key="index"> 123 <block wx:for="{{reserveData.content}}" wx:key="index">
124 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix" /> 124 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix" />
125 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 125 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
126 </block> 126 </block>
127 </view> 127 </view>
128 <!-- 餐厅介绍 用餐环境 --> 128 <!-- 餐厅介绍 用餐环境 -->
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 </view> 133 </view>
134 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 134 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
135 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 135 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
136 - <text class="texts">{{store.introduce}} 136 + <text space="nbsp" class="texts">{{store.introduce}}
137 </text> 137 </text>
138 </view> 138 </view>
139 <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> 139 <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 @@ @@ -153,7 +153,7 @@
153 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 153 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
154 </view> 154 </view>
155 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 155 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
156 - <text class="texts">{{chef.introduce}} 156 + <text space="nbsp" class="texts">{{chef.introduce}}
157 </text> 157 </text>
158 </view> 158 </view>
159 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 159 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
@@ -175,7 +175,7 @@ @@ -175,7 +175,7 @@
175 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 175 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
176 </view> 176 </view>
177 <view class="labelBox" wx:if="{{reserve.park_info}}"> 177 <view class="labelBox" wx:if="{{reserve.park_info}}">
178 - <text class="texts">{{reserve.park_info}} 178 + <text space="nbsp" class="texts">{{reserve.park_info}}
179 </text> 179 </text>
180 </view> 180 </view>
181 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 181 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 font-family: PingFang SC; 126 font-family: PingFang SC;
127 } 127 }
128 128
129 -.begin view { 129 +.begin text {
130 line-height: 64rpx; 130 line-height: 64rpx;
131 } 131 }
132 132
@@ -167,6 +167,7 @@ @@ -167,6 +167,7 @@
167 } 167 }
168 168
169 .welcome { 169 .welcome {
  170 + display: block;
170 text-align: right; 171 text-align: right;
171 margin: 27rpx 40rpx 16rpx 40rpx; 172 margin: 27rpx 40rpx 16rpx 40rpx;
172 font-weight: 500; 173 font-weight: 500;
@@ -274,7 +275,8 @@ @@ -274,7 +275,8 @@
274 text-overflow: ellipsis; 275 text-overflow: ellipsis;
275 display: -webkit-box; 276 display: -webkit-box;
276 -webkit-box-orient: vertical; 277 -webkit-box-orient: vertical;
277 - margin: 0 10rpx; 278 + margin: 0 10rpx;
  279 + flex: 1;
278 } 280 }
279 281
280 /* 优惠券开始 */ 282 /* 优惠券开始 */
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
20 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" /> 20 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" />
21 <view class="infoBox"> 21 <view class="infoBox">
22 <view class="boxLeft"> 22 <view class="boxLeft">
23 - <view class="sellerTitle">{{seller.name}}</view>  
24 - <view class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view> 23 + <text space="nbsp" class="sellerTitle">{{seller.name}}</text>
  24 + <text space="nbsp" class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
25 <view class="leftLine"></view> 25 <view class="leftLine"></view>
26 <view class="leftInfo font36r" 26 <view class="leftInfo font36r"
27 wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}" 27 wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"
@@ -55,12 +55,12 @@ @@ -55,12 +55,12 @@
55 </view> 55 </view>
56 </view> 56 </view>
57 </block> 57 </block>
58 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r"> 58 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
59 {{marketing.wecomle}} 59 {{marketing.wecomle}}
60 - </view> 60 + </text>
61 <view class="positioning"> 61 <view class="positioning">
62 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" /> 62 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
63 - <text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text> 63 + <text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
64 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 64 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
65 导航到店 65 导航到店
66 </button> 66 </button>
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 105 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
106 <block wx:for="{{reserveData.content}}" wx:key="index"> 106 <block wx:for="{{reserveData.content}}" wx:key="index">
107 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix" /> 107 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix" />
108 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 108 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
109 </block> 109 </block>
110 </view> 110 </view>
111 <!-- 餐厅介绍 用餐环境 --> 111 <!-- 餐厅介绍 用餐环境 -->
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 </view> 116 </view>
117 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 117 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
118 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 118 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
119 - <text class="texts">{{store.introduce}} 119 + <text space="nbsp" class="texts">{{store.introduce}}
120 </text> 120 </text>
121 </view> 121 </view>
122 <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> 122 <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 @@ @@ -136,7 +136,7 @@
136 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 136 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
137 </view> 137 </view>
138 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 138 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
139 - <text class="texts">{{chef.introduce}} 139 + <text space="nbsp" class="texts">{{chef.introduce}}
140 </text> 140 </text>
141 </view> 141 </view>
142 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 142 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 158 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
159 </view> 159 </view>
160 <view class="labelBox" wx:if="{{reserve.park_info}}"> 160 <view class="labelBox" wx:if="{{reserve.park_info}}">
161 - <text class="texts">{{reserve.park_info}} 161 + <text space="nbsp" class="texts">{{reserve.park_info}}
162 </text> 162 </text>
163 </view> 163 </view>
164 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 164 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 } 36 }
37 37
38 .sellerTitle { 38 .sellerTitle {
  39 + display: block;
39 text-align: center; 40 text-align: center;
40 font-size: 48rpx; 41 font-size: 48rpx;
41 font-family: PingFang SC; 42 font-family: PingFang SC;
@@ -101,6 +102,7 @@ @@ -101,6 +102,7 @@
101 } 102 }
102 103
103 .welcome { 104 .welcome {
  105 + display: block;
104 text-align: right; 106 text-align: right;
105 margin: 40rpx; 107 margin: 40rpx;
106 font-weight: 500; 108 font-weight: 500;
@@ -185,7 +187,8 @@ @@ -185,7 +187,8 @@
185 word-break: break-all; 187 word-break: break-all;
186 word-wrap: break-word; 188 word-wrap: break-word;
187 overflow: hidden; 189 overflow: hidden;
188 - text-align: left; 190 + text-align: left;
  191 + flex: 1;
189 } 192 }
190 193
191 .positioning image { 194 .positioning image {
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
21 <view class="infoBox"> 21 <view class="infoBox">
22 <view class="infoBoxRight">邀请函</view> 22 <view class="infoBoxRight">邀请函</view>
23 <view class="boxLeft"> 23 <view class="boxLeft">
24 - <view class="sellerTitle font48r">{{seller.name}}</view>  
25 - <view class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view> 24 + <text space="nbsp" class="sellerTitle font48r">{{seller.name}}</text>
  25 + <text space="nbsp" class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
26 <view class="leftLine"></view> 26 <view class="leftLine"></view>
27 <view class="leftInfo font36r" 27 <view class="leftInfo font36r"
28 wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}" 28 wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"
@@ -52,12 +52,12 @@ @@ -52,12 +52,12 @@
52 </view> 52 </view>
53 </view> 53 </view>
54 </block> 54 </block>
55 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r"> 55 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
56 {{marketing.wecomle}} 56 {{marketing.wecomle}}
57 - </view> 57 + </text>
58 <view class="positioning"> 58 <view class="positioning">
59 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" /> 59 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
60 - <text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text> 60 + <text space="nbsp" class="font28r">{{seller.addr|| reserve.seller.map_address}}</text>
61 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 61 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
62 导航到店 62 导航到店
63 </button> 63 </button>
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 103 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
104 <block wx:for="{{reserveData.content}}" wx:key="index"> 104 <block wx:for="{{reserveData.content}}" wx:key="index">
105 <image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" /> 105 <image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" />
106 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 106 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
107 </block> 107 </block>
108 </view> 108 </view>
109 <!-- 餐厅介绍 用餐环境 --> 109 <!-- 餐厅介绍 用餐环境 -->
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 </view> 114 </view>
115 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 115 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
116 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 116 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
117 - <text class="texts">{{store.introduce}} 117 + <text space="nbsp" class="texts">{{store.introduce}}
118 </text> 118 </text>
119 </view> 119 </view>
120 <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> 120 <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 @@ @@ -134,7 +134,7 @@
134 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 134 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
135 </view> 135 </view>
136 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 136 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
137 - <text class="texts">{{chef.introduce}} 137 + <text space="nbsp" class="texts">{{chef.introduce}}
138 </text> 138 </text>
139 </view> 139 </view>
140 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 140 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 156 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
157 </view> 157 </view>
158 <view class="labelBox" wx:if="{{reserve.park_info}}"> 158 <view class="labelBox" wx:if="{{reserve.park_info}}">
159 - <text class="texts">{{reserve.park_info}} 159 + <text space="nbsp" class="texts">{{reserve.park_info}}
160 </text> 160 </text>
161 </view> 161 </view>
162 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 162 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
29 29
30 30
31 .sellerTitle { 31 .sellerTitle {
  32 + display: block;
32 font-size: 48rpx; 33 font-size: 48rpx;
33 font-family: PingFang SC; 34 font-family: PingFang SC;
34 color: #FFD200; 35 color: #FFD200;
@@ -99,6 +100,7 @@ @@ -99,6 +100,7 @@
99 } 100 }
100 101
101 .welcome { 102 .welcome {
  103 + display: block;
102 text-align: right; 104 text-align: right;
103 margin: 40rpx; 105 margin: 40rpx;
104 font-weight: 500; 106 font-weight: 500;
@@ -17,19 +17,19 @@ @@ -17,19 +17,19 @@
17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
18 <view class="titleImg"> 18 <view class="titleImg">
19 <image src="{{whiteBj?'https://qn.colorcun.com/whiteBj1.png':'https://qn.colorcun.com/leaf.png'}}" class="titleIcon"></image> 19 <image src="{{whiteBj?'https://qn.colorcun.com/whiteBj1.png':'https://qn.colorcun.com/leaf.png'}}" class="titleIcon"></image>
20 - <view class="title">{{seller.name?seller.name:reserve.seller_name}}</view>  
21 - <view class="info"> 20 + <text space="nbsp" class="title">{{seller.name?seller.name:reserve.seller_name}}</text>
  21 + <text space="nbsp" class="info">
22 {{home.slogan}} 22 {{home.slogan}}
23 - </view> 23 + </text>
24 </view> 24 </view>
25 <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> 25 <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>
26 <view class="reservationInfo flex-ll"> 26 <view class="reservationInfo flex-ll">
27 <view class="line"> 27 <view class="line">
28 </view> 28 </view>
29 <view class="infoRight"> 29 <view class="infoRight">
30 - <view class="begin beginTop" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}"> 30 + <text space="nbsp" class="begin beginTop" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
31 <view class="font40r">{{reserve && reserve.book_info}}</view> 31 <view class="font40r">{{reserve && reserve.book_info}}</view>
32 - </view> 32 + </text>
33 <view class="begin"> 33 <view class="begin">
34 <view class="font40r">尊敬的贵宾，您好！</view> 34 <view class="font40r">尊敬的贵宾，您好！</view>
35 <view class="font40r">非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】！</view> 35 <view class="font40r">非常感谢您选择【{{seller.name?seller.name:reserve.seller_name}}】！</view>
@@ -71,12 +71,12 @@ @@ -71,12 +71,12 @@
71 </view> 71 </view>
72 </view> 72 </view>
73 </block> 73 </block>
74 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r"> 74 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
75 {{marketing.wecomle}} 75 {{marketing.wecomle}}
76 - </view> 76 + </text>
77 <view class="positioning"> 77 <view class="positioning">
78 <view class="name"> 78 <view class="name">
79 - <text>{{seller.addr?seller.addr:reserve.seller.map_address}}</text> 79 + <text space="nbsp">{{seller.addr?seller.addr:reserve.seller.map_address}}</text>
80 </view> 80 </view>
81 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 81 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
82 <image src="https://qn.colorcun.com/address.png" mode="" /> 82 <image src="https://qn.colorcun.com/address.png" mode="" />
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 122 <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
123 <block wx:for="{{reserveData.content}}" wx:key="index"> 123 <block wx:for="{{reserveData.content}}" wx:key="index">
124 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/> 124 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/>
125 - <text class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 125 + <text space="nbsp" class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
126 </block> 126 </block>
127 </view> 127 </view>
128 <!-- 品牌介绍类型 图文合并 --> 128 <!-- 品牌介绍类型 图文合并 -->
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 <view class="labelBox labelBox2"> 140 <view class="labelBox labelBox2">
141 <view class="line"> 141 <view class="line">
142 </view> 142 </view>
143 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text> 143 + <text space="nbsp" class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
144 </view> 144 </view>
145 </view> 145 </view>
146 </view> 146 </view>
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 </view> 158 </view>
159 <view class="labelBox"> 159 <view class="labelBox">
160 <view class="line"></view> 160 <view class="line"></view>
161 - <text class="label styleLabel">{{store.introduce}}</text> 161 + <text space="nbsp" class="label styleLabel">{{store.introduce}}</text>
162 </view> 162 </view>
163 </view> 163 </view>
164 <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" /> 164 <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 @@ @@ -178,7 +178,7 @@
178 {{chef.chef_name}} 178 {{chef.chef_name}}
179 </view> 179 </view>
180 <view class="labelBox labelBox2"> 180 <view class="labelBox labelBox2">
181 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}} 181 + <text space="nbsp" class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
182 </text> 182 </text>
183 <view class="line line1"> 183 <view class="line line1">
184 </view> 184 </view>
@@ -200,7 +200,7 @@ @@ -200,7 +200,7 @@
200 <view class="labelBox labelBox1"> 200 <view class="labelBox labelBox1">
201 <view class="line"> 201 <view class="line">
202 </view> 202 </view>
203 - <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}} 203 + <text space="nbsp" class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
204 </text> 204 </text>
205 </view> 205 </view>
206 </block> 206 </block>
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 28
29 29
30 .info { 30 .info {
  31 + display: block;
31 text-align: center; 32 text-align: center;
32 font-family: FangSong; 33 font-family: FangSong;
33 font-size: 40rpx; 34 font-size: 40rpx;
@@ -18,12 +18,12 @@ @@ -18,12 +18,12 @@
18 <view class="reservationInfo"> 18 <view class="reservationInfo">
19 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}"> 19 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
20 <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> 20 <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>
21 - <view class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>  
22 - <view class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</view> 21 + <text space="nbsp" class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
  22 + <text space="nbsp" class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</text>
23 </view> 23 </view>
24 - <view class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}"> 24 + <text space="nbsp" class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
25 {{reserve && reserve.book_info}} 25 {{reserve && reserve.book_info}}
26 - </view> 26 + </text>
27 <view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"> 27 <view class="flex-11" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
28 <view class="label font28r">【贵宾】</view> 28 <view class="label font28r">【贵宾】</view>
29 <view class="contentData font36r">{{detail.rnameStr}}</view> 29 <view class="contentData font36r">{{detail.rnameStr}}</view>
@@ -67,12 +67,12 @@ @@ -67,12 +67,12 @@
67 </view> 67 </view>
68 </view> 68 </view>
69 </block> 69 </block>
70 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r"> 70 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
71 {{marketing.wecomle}} 71 {{marketing.wecomle}}
72 - </view> 72 + </text>
73 <view class="positioning"> 73 <view class="positioning">
74 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" /> 74 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
75 - <text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text> 75 + <text class="font28r" space="nbsp">{{seller.addr|| reserve.seller.map_address}}</text>
76 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 76 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
77 导航到店 77 导航到店
78 </button> 78 </button>
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 118 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
119 <block wx:for="{{reserveData.content}}" wx:key="index"> 119 <block wx:for="{{reserveData.content}}" wx:key="index">
120 <image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" /> 120 <image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" />
121 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 121 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
122 </block> 122 </block>
123 </view> 123 </view>
124 <!-- 餐厅介绍 用餐环境 --> 124 <!-- 餐厅介绍 用餐环境 -->
@@ -129,8 +129,7 @@ @@ -129,8 +129,7 @@
129 </view> 129 </view>
130 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 130 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
131 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 131 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
132 - <text class="texts">{{store.introduce}}  
133 - </text> 132 + <text space="nbsp" class="texts">{{store.introduce}}</text>
134 </view> 133 </view>
135 <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 <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 </block> 135 </block>
@@ -149,8 +148,7 @@ @@ -149,8 +148,7 @@
149 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 148 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
150 </view> 149 </view>
151 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 150 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
152 - <text class="texts">{{chef.introduce}}  
153 - </text> 151 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
154 </view> 152 </view>
155 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 153 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
156 <image src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" /> 154 <image src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
@@ -171,8 +169,7 @@ @@ -171,8 +169,7 @@
171 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 169 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
172 </view> 170 </view>
173 <view class="labelBox" wx:if="{{reserve.park_info}}"> 171 <view class="labelBox" wx:if="{{reserve.park_info}}">
174 - <text class="texts">{{reserve.park_info}}  
175 - </text> 172 + <text space="nbsp" class="texts">{{reserve.park_info}}</text>
176 </view> 173 </view>
177 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 174 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
178 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 175 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
33 } 33 }
34 34
35 .imgBottom { 35 .imgBottom {
  36 + display: block;
36 width: 100%; 37 width: 100%;
37 text-align: center; 38 text-align: center;
38 position: absolute; 39 position: absolute;
@@ -43,6 +44,7 @@ @@ -43,6 +44,7 @@
43 } 44 }
44 45
45 .begin { 46 .begin {
  47 + display: block;
46 margin: 30rpx 40rpx 50rpx; 48 margin: 30rpx 40rpx 50rpx;
47 color: #FFEFC5; 49 color: #FFEFC5;
48 font-family: PingFang SC; 50 font-family: PingFang SC;
@@ -93,6 +95,7 @@ @@ -93,6 +95,7 @@
93 } 95 }
94 96
95 .welcome { 97 .welcome {
  98 + display: block;
96 text-align: center; 99 text-align: center;
97 margin: 42rpx 40rpx 16rpx 40rpx; 100 margin: 42rpx 40rpx 16rpx 40rpx;
98 font-weight: 500; 101 font-weight: 500;
@@ -200,7 +203,8 @@ @@ -200,7 +203,8 @@
200 text-overflow: ellipsis; 203 text-overflow: ellipsis;
201 display: -webkit-box; 204 display: -webkit-box;
202 -webkit-box-orient: vertical; 205 -webkit-box-orient: vertical;
203 - margin: 0 10rpx; 206 + margin: 0 10rpx;
  207 + flex: 1;
204 } 208 }
205 209
206 .pageSpacing { 210 .pageSpacing {
@@ -19,12 +19,12 @@ @@ -19,12 +19,12 @@
19 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}"> 19 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
20 <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" 20 <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}"
21 bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 21 bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
22 - <view class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>  
23 - <view class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</view> 22 + <text space="nbsp" class="imgTop font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
  23 + <text space="nbsp" class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</text>
24 </view> 24 </view>
25 - <view class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}"> 25 + <text space="nbsp" class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
26 {{reserve.book_info}} 26 {{reserve.book_info}}
27 - </view> 27 + </text>
28 <view class="infoItem" wx:if="{{seller.date}}"> 28 <view class="infoItem" wx:if="{{seller.date}}">
29 <view class="label font28r">【宴会日期】</view> 29 <view class="label font28r">【宴会日期】</view>
30 <view class="contentData font40r">{{seller.date}}</view> 30 <view class="contentData font40r">{{seller.date}}</view>
@@ -64,12 +64,12 @@ @@ -64,12 +64,12 @@
64 </view> 64 </view>
65 </view> 65 </view>
66 </block> 66 </block>
67 - <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r"> 67 + <text space="nbsp" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
68 {{marketing.wecomle}} 68 {{marketing.wecomle}}
69 - </view> 69 + </text>
70 <view class="positioning"> 70 <view class="positioning">
71 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" /> 71 <image src="{{themeColor == 'pearlWhite'?'https://nosqn.colorcun.com/mapIcon2.png':'https://nosqn.colorcun.com/mapIcon1.png'}}" />
72 - <text class="font28r">{{seller.addr|| reserve.seller.map_address}}</text> 72 + <text class="font28r" space="nbsp" >{{seller.addr|| reserve.seller.map_address}}</text>
73 <button bindtap="looklocation" class="flex-cc font24r mapBtn"> 73 <button bindtap="looklocation" class="flex-cc font24r mapBtn">
74 导航到店 74 导航到店
75 </button> 75 </button>
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 115 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
116 <block wx:for="{{reserveData.content}}" wx:key="index"> 116 <block wx:for="{{reserveData.content}}" wx:key="index">
117 <image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" /> 117 <image class="items" wx:if="{{item.type =='1'}}" bindtap="lookImgs" data-url="{{item.content}}" src="{{item.content}}" mode="widthFix" />
118 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 118 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
119 </block> 119 </block>
120 </view> 120 </view>
121 <!-- 餐厅介绍 用餐环境 --> 121 <!-- 餐厅介绍 用餐环境 -->
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </view> 126 </view>
127 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 127 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
128 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 128 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
129 - <text class="texts">{{store.introduce}} 129 + <text space="nbsp" class="texts">{{store.introduce}}
130 </text> 130 </text>
131 </view> 131 </view>
132 <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> 132 <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 @@ @@ -146,7 +146,7 @@
146 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 146 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
147 </view> 147 </view>
148 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 148 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
149 - <text class="texts">{{chef.introduce}} 149 + <text class="texts" space="nbsp">{{chef.introduce}}
150 </text> 150 </text>
151 </view> 151 </view>
152 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 152 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 168 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
169 </view> 169 </view>
170 <view class="labelBox" wx:if="{{reserve.park_info}}"> 170 <view class="labelBox" wx:if="{{reserve.park_info}}">
171 - <text class="texts">{{reserve.park_info}} 171 + <text class="texts" space="nbsp">{{reserve.park_info}}
172 </text> 172 </text>
173 </view> 173 </view>
174 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 174 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 } 27 }
28 28
29 .begin { 29 .begin {
  30 + display: block;
30 margin: 30rpx 40rpx 50rpx; 31 margin: 30rpx 40rpx 50rpx;
31 color: #FFEFC5; 32 color: #FFEFC5;
32 font-family: PingFang SC; 33 font-family: PingFang SC;
@@ -43,6 +44,7 @@ @@ -43,6 +44,7 @@
43 } 44 }
44 45
45 .imgBottom { 46 .imgBottom {
  47 + display: block;
46 width: 100%; 48 width: 100%;
47 text-align: center; 49 text-align: center;
48 position: absolute; 50 position: absolute;
@@ -99,6 +101,7 @@ @@ -99,6 +101,7 @@
99 } 101 }
100 102
101 .welcome { 103 .welcome {
  104 + display: block;
102 text-align: center; 105 text-align: center;
103 margin: 42rpx 40rpx 16rpx 40rpx; 106 margin: 42rpx 40rpx 16rpx 40rpx;
104 font-weight: 500; 107 font-weight: 500;
@@ -206,7 +209,8 @@ @@ -206,7 +209,8 @@
206 text-overflow: ellipsis; 209 text-overflow: ellipsis;
207 display: -webkit-box; 210 display: -webkit-box;
208 -webkit-box-orient: vertical; 211 -webkit-box-orient: vertical;
209 - margin: 0 10rpx; 212 + margin: 0 10rpx;
  213 + flex: 1;
210 } 214 }
211 215
212 .pageSpacing { 216 .pageSpacing {
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;"> 12 <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;">
13 <view class="infoTop"> 13 <view class="infoTop">
14 <view class="infoTopName"> 14 <view class="infoTopName">
15 - <view class="font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</view>  
16 - <view class="name">{{seller.name||reserve.seller_name}}</view> 15 + <text space="nbsp" class="font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
  16 + <text space="nbsp" class="name">{{seller.name||reserve.seller_name}}</text>
17 </view> 17 </view>
18 <view class="imgBox"> 18 <view class="imgBox">
19 <image class="inviteImg {{StyleType=='13' || StyleType=='14' ||StyleType=='15' ||StyleType=='16' || StyleType=='17'?'inviteImg1':''}}" src="{{inviteImgUrl}}" mode="aspectFill" /> 19 <image class="inviteImg {{StyleType=='13' || StyleType=='14' ||StyleType=='15' ||StyleType=='16' || StyleType=='17'?'inviteImg1':''}}" src="{{inviteImgUrl}}" mode="aspectFill" />
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </view> 21 </view>
22 <view class="bookInfo"> 22 <view class="bookInfo">
23 <view class="infoItem infoItemOne"> 23 <view class="infoItem infoItemOne">
24 - <view wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}" class="contentData font28r bookData">{{reserve.book_info}}</view> 24 + <text space="nbsp" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}" class="contentData font28r bookData">{{reserve.book_info}}</text>
25 </view> 25 </view>
26 <view class="infoItem" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}"> 26 <view class="infoItem" wx:if="{{detail && detail.rnameStr && reserve && reserve.swich_customer == '1'}}">
27 <view class="label font28r">预订贵宾:</view> 27 <view class="label font28r">预订贵宾:</view>
@@ -45,9 +45,9 @@ @@ -45,9 +45,9 @@
45 <text>{{item.name}}</text> 45 <text>{{item.name}}</text>
46 </view> 46 </view>
47 </view> 47 </view>
48 - <view class="welcomeMsg font28r" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}"> 48 + <text space="nbsp" class="welcomeMsg font28r" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}">
49 {{marketing.wecomle}} 49 {{marketing.wecomle}}
50 - </view> 50 + </text>
51 </view> 51 </view>
52 <view wx:if="{{titleType == '1'}}" class="separatrixOne"> 52 <view wx:if="{{titleType == '1'}}" class="separatrixOne">
53 <block wx:for="{{num1}}" wx:key="index"><text class="text{{item}}"></text></block> 53 <block wx:for="{{num1}}" wx:key="index"><text class="text{{item}}"></text></block>
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 <view class="positioningName"> 59 <view class="positioningName">
60 <view class="mapBox"> 60 <view class="mapBox">
61 <text class="font24r telBox">地址:</text> 61 <text class="font24r telBox">地址:</text>
62 - <text class="font24r positioningText">{{seller.addr || reserve.seller.map_address}}</text> 62 + <text space="nbsp" class="font24r positioningText">{{seller.addr || reserve.seller.map_address}}</text>
63 </view> 63 </view>
64 <button wx:if="{{seller.addr || reserve.seller.map_address}}" bindtap="looklocation" class="flex-cc font24r mapBtn">导航到店</button> 64 <button wx:if="{{seller.addr || reserve.seller.map_address}}" bindtap="looklocation" class="flex-cc font24r mapBtn">导航到店</button>
65 </view> 65 </view>
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view> 118 <view class="title font40r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
119 <block wx:for="{{reserveData.content}}" wx:key="index"> 119 <block wx:for="{{reserveData.content}}" wx:key="index">
120 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/> 120 <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" mode="widthFix"/>
121 - <text class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text> 121 + <text space="nbsp" class="items font32r" wx:if="{{item.type == '2'}}">{{item.content}}</text>
122 </block> 122 </block>
123 </view> 123 </view>
124 <!-- 餐厅介绍 --> 124 <!-- 餐厅介绍 -->
@@ -129,8 +129,7 @@ @@ -129,8 +129,7 @@
129 </block> 129 </block>
130 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 130 <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
131 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 131 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
132 - <text class="texts font32r">{{store.introduce}}  
133 - </text> 132 + <text space="nbsp" class="texts font32r">{{store.introduce}}</text>
134 </view> 133 </view>
135 <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 <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 </view> 135 </view>
@@ -150,7 +149,7 @@ @@ -150,7 +149,7 @@
150 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 149 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
151 </view> 150 </view>
152 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 151 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
153 - <text class="texts">{{chef.introduce}} 152 + <text class="texts" space="nbsp">{{chef.introduce}}
154 </text> 153 </text>
155 </view> 154 </view>
156 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}"> 155 <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
@@ -172,7 +171,7 @@ @@ -172,7 +171,7 @@
172 <titleStyle titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 171 <titleStyle titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle>
173 </block> 172 </block>
174 <view class="labelBox" wx:if="{{reserve.park_info}}"> 173 <view class="labelBox" wx:if="{{reserve.park_info}}">
175 - <text class="texts">{{reserve.park_info}} 174 + <text class="texts" space="nbsp">{{reserve.park_info}}
176 </text> 175 </text>
177 </view> 176 </view>
178 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 177 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
@@ -237,7 +236,7 @@ @@ -237,7 +236,7 @@
237 </view> 236 </view>
238 </scroll-view> 237 </scroll-view>
239 <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"> 238 <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">
240 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 239 + <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
241 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 240 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
242 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 241 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
243 </view> 242 </view>
@@ -48,6 +48,10 @@ @@ -48,6 +48,10 @@
48 margin-bottom: 66rpx; 48 margin-bottom: 66rpx;
49 } 49 }
50 50
  51 +.infoTopName text{
  52 + display: block;
  53 +}
  54 +
51 .infoTopName .name { 55 .infoTopName .name {
52 font-size: 56rpx; 56 font-size: 56rpx;
53 margin-top: 16rpx; 57 margin-top: 16rpx;