xt / xcx-book · Commits

Go to a project

Commit d0a901fd501f0d112be66ec8ffde5c5a67018afb

Authored by pengye
1 parent be35e8ab
build: skipped

商家详情、邀请函模板加自定义图片、文字、视频3

Inline Side-by-side
Showing 7 changed files with 212 additions and 161 deletions
@@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
5 "usingComponents": { 5 "usingComponents": {
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 - "titleStyle":"/components/titleStyle/titleStyle",  
9 "my-modal": "/components/modal/modal" 8 "my-modal": "/components/modal/modal"
10 } 9 }
11 } 10 }
@@ -129,9 +129,8 @@ @@ -129,9 +129,8 @@
129 <block wx:if="{{marketing.logo || home.image || ((store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (store.images.length>0 && (!store.is_images || store.is_images!='0')) || (store.content && store.content.length>0))}}"> 129 <block wx:if="{{marketing.logo || home.image || ((store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (store.images.length>0 && (!store.is_images || store.is_images!='0')) || (store.content && store.content.length>0))}}">
130 <view class="introduceBox"> 130 <view class="introduceBox">
131 <block wx:if="{{(marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) || (store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (home.image && (!home.id_first_image || home.id_first_image!='0'))}}"> 131 <block wx:if="{{(marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) || (store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (home.image && (!home.id_first_image || home.id_first_image!='0'))}}">
132 - <view wx:if="{{titleType}}" class="chefText font36r">  
133 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>  
134 - </view> 132 + <view class="englishText font28r">Introduce</view>
  133 + <view class="chefText font32r">品牌介绍</view>
135 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 134 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
136 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 135 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
137 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 136 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
@@ -165,9 +164,8 @@ @@ -165,9 +164,8 @@
165 <!-- 主厨介绍 --> 164 <!-- 主厨介绍 -->
166 <block wx:if="{{chef && ((chef.introduce && (!chef.is_introduce || chef.is_introduce!='0')) || (chef.image && (!chef.is_images || chef.is_images!='0')) || (chef.content && chef.content.length>0))}}"> 165 <block wx:if="{{chef && ((chef.introduce && (!chef.is_introduce || chef.is_introduce!='0')) || (chef.image && (!chef.is_images || chef.is_images!='0')) || (chef.content && chef.content.length>0))}}">
167 <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}"> 166 <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
168 - <view wx:if="{{titleType}}" class="chefText font36r">  
169 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>  
170 - </view> 167 + <view class="englishText font28r">Chief Cook</view>
  168 + <view class="chefText font32r">知名主厨</view>
171 <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}"> 169 <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
172 <text space="nbsp" class="texts">{{chef.introduce}}</text> 170 <text space="nbsp" class="texts">{{chef.introduce}}</text>
173 </view> 171 </view>
@@ -193,9 +191,8 @@ @@ -193,9 +191,8 @@
193 </block> 191 </block>
194 <!-- 特色菜品 --> 192 <!-- 特色菜品 -->
195 <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}"> 193 <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
196 - <view wx:if="{{titleType}}" class="chefText font36r">  
197 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>  
198 - </view> 194 + <view class="englishText font28r">Favorites</view>
  195 + <view class="chefText font32r">菜品展示</view>
199 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 196 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
200 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" /> 197 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />
201 </block> 198 </block>
@@ -217,35 +214,6 @@ @@ -217,35 +214,6 @@
217 </block> 214 </block>
218 </view> 215 </view>
219 </view> 216 </view>
220 - <!-- 停车指引 -->  
221 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">  
222 - <view wx:if="{{titleType}}" class="chefText font36r">  
223 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>  
224 - </view>  
225 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
226 - <text space="nbsp" class="texts">{{reserve.park_info}}</text>  
227 - </view>  
228 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
229 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>  
230 - </block>  
231 - <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">  
232 - <block wx:for="{{reserve.content}}">  
233 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
234 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>  
235 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
236 - <video  
237 - object-fit="contain"  
238 - autoplay="{{true}}"  
239 - loop="{{true}}"  
240 - muted="{{true}}"  
241 - show-mute-btn="{{true}}"  
242 - vslide-gesture-in-fullscreen="{{true}}"  
243 - src="{{item.content}}"  
244 - ></video>  
245 - </view>  
246 - </block>  
247 - </view>  
248 - </view>  
249 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 217 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
250 <view class="rubric"> 218 <view class="rubric">
251 提前点餐 219 提前点餐
@@ -291,7 +259,6 @@ @@ -291,7 +259,6 @@
291 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 259 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
292 点击了解更多会员优惠政策 260 点击了解更多会员优惠政策
293 </view> 261 </view>
294 - <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo}}" mode="widthFix" bindtap="lookImgs" data-url="{{marketing.logo}}"/>  
295 <text class="businessBox"> 262 <text class="businessBox">
296 周到安排提供技术支持<text bindtap="call" data-phone="4000009690">4000009690</text>，餐厅入驻请点击<text bindtap="gotoJoinSeller" style="text-decoration: underline;">这里</text> 263 周到安排提供技术支持<text bindtap="call" data-phone="4000009690">4000009690</text>，餐厅入驻请点击<text bindtap="gotoJoinSeller" style="text-decoration: underline;">这里</text>
297 </text> 264 </text>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 font-size: 72rpx; 23 font-size: 72rpx;
24 color: #FFD200; 24 color: #FFD200;
25 position: relative; 25 position: relative;
26 - top: -70rpx; 26 + top: -50rpx;
27 } 27 }
28 28
29 29
@@ -288,51 +288,19 @@ @@ -288,51 +288,19 @@
288 } 288 }
289 289
290 .labelBox { 290 .labelBox {
291 - width: 100%; 291 + margin: 20rpx 20rpx 0 20rpx;
292 display: flex; 292 display: flex;
293 position: relative; 293 position: relative;
294 - height: calc(100% - 200rpx); 294 + padding-bottom: 20rpx;
295 } 295 }
296 296
297 -.labelBox .label {  
298 - width: 90%; 297 +.labelBox .texts {
  298 + width: 100%;
299 line-height: 40rpx; 299 line-height: 40rpx;
300 - color: #ffffff; 300 + color: #515151;
301 font-family: PingFang SC; 301 font-family: PingFang SC;
302 - font-size: 20rpx;  
303 - overflow: hidden;  
304 - white-space: pre-line;  
305 - word-wrap: break-word;  
306 - overflow: hidden;  
307 - word-break: break-all;  
308 - text-overflow: ellipsis;  
309 - padding: 0 20rpx;  
310 -}  
311 -  
312 -.labelBox2 .label {  
313 - height: 100%;  
314 - overflow-y: scroll;  
315 - margin-right: 20rpx;  
316 -}  
317 -  
318 -.labelBox .styleLabel {  
319 - color: #999999;  
320 -}  
321 -  
322 -.labelBox .line {  
323 - position: absolute;  
324 - width: 4rpx;  
325 - height: 100%;  
326 - top: 0;  
327 - background: linear-gradient(270deg, #eeae74 20%, #0c0f0e 124%);  
328 -}  
329 -  
330 -.labelBox1 .line {  
331 - margin: 0 0 0 16rpx;  
332 -}  
333 -  
334 -.labelBox .line1 {  
335 - margin: 0 0 0 16rpx; 302 + font-size: 32rpx;
  303 + font-weight: 500;
336 } 304 }
337 305
338 .IntroductionItems image { 306 .IntroductionItems image {
@@ -396,7 +364,7 @@ @@ -396,7 +364,7 @@
396 .contentBox .texts { 364 .contentBox .texts {
397 line-height: 40rpx; 365 line-height: 40rpx;
398 margin: 0 20rpx; 366 margin: 0 20rpx;
399 - color: #FFEFC5; 367 + color: #515151;
400 font-family: PingFang SC; 368 font-family: PingFang SC;
401 font-weight: 500; 369 font-weight: 500;
402 display: block; 370 display: block;
@@ -419,27 +387,19 @@ @@ -419,27 +387,19 @@
419 } 387 }
420 388
421 .vegetableBox .englishText { 389 .vegetableBox .englishText {
422 - margin: 10rpx 0 0 0;  
423 color: #B39437; 390 color: #B39437;
424 } 391 }
425 392
426 .englishText { 393 .englishText {
427 font-family: PingFang SC; 394 font-family: PingFang SC;
428 - margin: 20rpx 0 0 0; 395 + margin: 0 20rpx;
429 color: #b39437; 396 color: #b39437;
430 } 397 }
431 398
432 .chefText { 399 .chefText {
433 font-family: PingFang SC; 400 font-family: PingFang SC;
434 color: #b39437; 401 color: #b39437;
435 -}  
436 -  
437 -.famousChefBox .englishText {  
438 - text-align: right;  
439 -}  
440 -  
441 -.famousChefBox .chefText {  
442 - text-align: right; 402 + margin: 20rpx;
443 } 403 }
444 404
445 .famousChefBox .shopName { 405 .famousChefBox .shopName {
@@ -447,16 +407,7 @@ @@ -447,16 +407,7 @@
447 } 407 }
448 408
449 .famousChefBox .labelBox { 409 .famousChefBox .labelBox {
450 - justify-content: flex-end;  
451 -}  
452 -  
453 -.famousChefBox .labelBox .label {  
454 - margin-right: 0;  
455 -}  
456 -  
457 -.specialServices {  
458 - margin: 16rpx 40rpx;  
459 - border-bottom: 2rpx solid #DBDBDB; 410 + border-bottom: none;
460 } 411 }
461 412
462 .rubric { 413 .rubric {
@@ -467,20 +418,25 @@ @@ -467,20 +418,25 @@
467 margin-bottom: 10rpx; 418 margin-bottom: 10rpx;
468 } 419 }
469 420
  421 +.specialServices{
  422 + margin: 0 20rpx;
  423 + border-bottom: 2rpx solid #DBDBDB;
  424 +}
  425 +
470 .specialServices .news { 426 .specialServices .news {
471 color: #515151; 427 color: #515151;
472 font-family: PingFang SC; 428 font-family: PingFang SC;
473 font-weight: 500; 429 font-weight: 500;
474 font-size: 24rpx; 430 font-size: 24rpx;
475 line-height: 40rpx; 431 line-height: 40rpx;
476 - margin-left: 20rpx; 432 + margin-left: 28rpx;
477 } 433 }
478 434
479 .endStyle { 435 .endStyle {
480 display: flex; 436 display: flex;
481 justify-content: flex-end; 437 justify-content: flex-end;
482 height: 54rpx; 438 height: 54rpx;
483 - margin: 20rpx 0; 439 + margin: 20rpx 28rpx;
484 } 440 }
485 441
486 442
@@ -499,18 +455,14 @@ @@ -499,18 +455,14 @@
499 flex-shrink: 0; 455 flex-shrink: 0;
500 } 456 }
501 457
502 -.preferential {  
503 - margin: 16rpx 40rpx 0 40rpx;  
504 -}  
505 -  
506 .preferentialItems { 458 .preferentialItems {
507 padding: 16rpx 16rpx 16rpx 24rpx; 459 padding: 16rpx 16rpx 16rpx 24rpx;
508 display: flex; 460 display: flex;
509 justify-content: space-between; 461 justify-content: space-between;
510 align-items: center; 462 align-items: center;
511 - margin-bottom: 20rpx;  
512 background: url('https://qn.colorcun.com/certificateBj.png') no-repeat; 463 background: url('https://qn.colorcun.com/certificateBj.png') no-repeat;
513 background-size: 100% 100%; 464 background-size: 100% 100%;
  465 + margin-bottom: 20rpx;
514 } 466 }
515 467
516 .rubric1 { 468 .rubric1 {
@@ -601,10 +553,10 @@ @@ -601,10 +553,10 @@
601 553
602 .favouredPolicy { 554 .favouredPolicy {
603 width: 45%; 555 width: 45%;
604 - color: #5C95D7; 556 + color: #0143A3;
605 font-family: PingFang SC; 557 font-family: PingFang SC;
606 font-weight: 500; 558 font-weight: 500;
607 - border: 2rpx solid #5C95D7; 559 + border: 2rpx solid #0143A3;
608 border-radius: 22rpx; 560 border-radius: 22rpx;
609 text-align: center; 561 text-align: center;
610 padding: 10rpx; 562 padding: 10rpx;
@@ -652,10 +604,15 @@ @@ -652,10 +604,15 @@
652 align-items: center; 604 align-items: center;
653 } 605 }
654 606
  607 +.preferential{
  608 + margin: 16rpx 20rpx 0 20rpx;
  609 +}
  610 +
655 .cook { 611 .cook {
656 height: 94% !important; 612 height: 94% !important;
657 background: #fff; 613 background: #fff;
658 border: 2rpx solid #0143A3; 614 border: 2rpx solid #0143A3;
  615 + color: #0143A3;
659 border-radius: 32rpx; 616 border-radius: 32rpx;
660 font-weight: normal; 617 font-weight: normal;
661 width: 23% !important; 618 width: 23% !important;
@@ -19,12 +19,14 @@ Page({ @@ -19,12 +19,14 @@ Page({
19 }, 19 },
20 store: {}, 20 store: {},
21 chef: {}, 21 chef: {},
  22 + reserve: {},
22 signboard: {}, 23 signboard: {},
23 home: {}, 24 home: {},
24 sid: '', 25 sid: '',
25 IsCollectionSeller: false, 26 IsCollectionSeller: false,
26 hasValueCertificate:false,//商家是否开通优惠券功能 27 hasValueCertificate:false,//商家是否开通优惠券功能
27 hasValueRecharge:false,//商家是否开通充值功能 28 hasValueRecharge:false,//商家是否开通充值功能
  29 + titleType:'',//标题样式
28 marketing: {}, 30 marketing: {},
29 recharge_data: {}, 31 recharge_data: {},
30 scoreInfo:'', 32 scoreInfo:'',
@@ -146,17 +148,25 @@ Page({ @@ -146,17 +148,25 @@ Page({
146 sid 148 sid
147 }).then(res => { 149 }).then(res => {
148 let data = res.data 150 let data = res.data
  151 + console.log('data', data);
149 let couponList = [] 152 let couponList = []
150 - let home, chef, signboard, store, marketing, coupon, StyleType; 153 + let titleType, home, chef, signboard, store, marketing, coupon, reserve, StyleType;
151 chef = util.determine(data.chef); 154 chef = util.determine(data.chef);
  155 + reserve = util.determine(data.reserve);
152 signboard = util.determine(data.signboard); 156 signboard = util.determine(data.signboard);
153 store = util.determine(data.store); 157 store = util.determine(data.store);
154 home = util.determine(data.home); 158 home = util.determine(data.home);
155 marketing = util.determine(data.marketing); 159 marketing = util.determine(data.marketing);
156 - StyleType = data.type;  
157 - if (marketing) { 160 + titleType = data.title_class || '1';
  161 + StyleType = data.type;if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  162 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  163 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  164 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  165 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
  166 + if (marketing) {
  167 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
158 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 168 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
159 - } 169 + }
160 // is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示 170 // is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示
161 if (coupon && util.getType(coupon) == 'object') { 171 if (coupon && util.getType(coupon) == 'object') {
162 couponList.push({ 172 couponList.push({
@@ -172,17 +182,21 @@ Page({ @@ -172,17 +182,21 @@ Page({
172 }) 182 })
173 } 183 }
174 } 184 }
175 - if (store && store.images.length > 0) store.images = util.determine(store.images); 185 + if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
  186 + if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
176 if (signboard && signboard.images) signboard.images = util.determine(signboard.images); 187 if (signboard && signboard.images) signboard.images = util.determine(signboard.images);
177 let obj = { 188 let obj = {
178 chef, 189 chef,
  190 + reserve,
179 signboard, 191 signboard,
180 store, 192 store,
181 home, 193 home,
  194 + reserve,
182 marketing, 195 marketing,
183 coupon, 196 coupon,
184 couponList, 197 couponList,
185 StyleType, 198 StyleType,
  199 + titleType,
186 } 200 }
187 console.log('获取数据', { 201 console.log('获取数据', {
188 ...obj 202 ...obj
@@ -195,11 +209,13 @@ Page({ @@ -195,11 +209,13 @@ Page({
195 } 209 }
196 this.setData({ 210 this.setData({
197 chef, 211 chef,
  212 + reserve,
198 signboard, 213 signboard,
199 store, 214 store,
200 home, 215 home,
201 marketing, 216 marketing,
202 StyleType, 217 StyleType,
  218 + titleType,
203 }) 219 })
204 }).catch(res => { 220 }).catch(res => {
205 console.log('GetSellerTemplateConf请求失败'); 221 console.log('GetSellerTemplateConf请求失败');
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 "navigationBarTextStyle": "white", 3 "navigationBarTextStyle": "white",
4 "navigationBarTitleText": "", 4 "navigationBarTitleText": "",
5 "usingComponents": { 5 "usingComponents": {
6 - "nav": "/components/nav/nav" 6 + "nav": "/components/nav/nav",
  7 + "titleStyle":"/components/titleStyle/titleStyle"
7 } 8 }
8 } 9 }
@@ -47,56 +47,130 @@ @@ -47,56 +47,130 @@
47 </navigator> 47 </navigator>
48 </block> 48 </block>
49 </view> 49 </view>
50 - <!-- 餐厅介绍图文分开 -->  
51 - <view class="introduce" wx:if="{{store}}">  
52 - <view class="imgMask">  
53 - <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
54 - <view class="chefText font36r">餐厅介绍</view>  
55 - <view class="lines"></view>  
56 - <view class="labelBox">  
57 - <text class="texts">{{store.introduce}}  
58 - </text> 50 + <!-- 餐厅介绍 -->
  51 + <block wx:if="{{marketing.logo || home.image || ((store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (store.images.length>0 && (!store.is_images || store.is_images!='0')) || (store.content && store.content.length>0))}}">
  52 + <view class="introduceBox">
  53 + <block wx:if="{{(marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) || (store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (home.image && (!home.id_first_image || home.id_first_image!='0'))}}">
  54 + <view wx:if="{{titleType}}" class="chefText font36r">
  55 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
59 </view> 56 </view>
60 - </view>  
61 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
62 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
63 - <image src="{{item}}" mode="widthFix" /> 57 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  58 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  59 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  60 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  61 + </view>
  62 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  63 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  64 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  65 + </block>
64 </block> 66 </block>
  67 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  68 + <block wx:for="{{store.content}}">
  69 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  70 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  71 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  72 + <video
  73 + object-fit="contain"
  74 + autoplay="{{true}}"
  75 + loop="{{true}}"
  76 + muted="{{true}}"
  77 + show-mute-btn="{{true}}"
  78 + vslide-gesture-in-fullscreen="{{true}}"
  79 + src="{{item.content}}"
  80 + ></video>
  81 + </view>
  82 + </block>
  83 + </view>
65 </block> 84 </block>
66 </view> 85 </view>
67 - </view>  
68 - <!-- 主厨介绍图文分开 -->  
69 - <view class="introduce famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">  
70 - <view class="imgMask">  
71 - <view class="IntroduceColor">  
72 - <view class="chefText font36r" wx:if="{{chef.is_introduce || chef.is_images}}">主厨介绍</view>  
73 - <view class="lines" wx:if="{{chef && ((chef.is_introduce || chef.is_images) || (!chef.is_introduce || chef.is_introduce!='0'))}}"></view>  
74 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
75 - <text class="texts">{{chef.introduce}}  
76 - </text>  
77 - </view> 86 + </block>
  87 + <!-- 主厨介绍 -->
  88 + <block wx:if="{{chef && ((chef.introduce && (!chef.is_introduce || chef.is_introduce!='0')) || (chef.image && (!chef.is_images || chef.is_images!='0')) || (chef.content && chef.content.length>0))}}">
  89 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
  90 + <view wx:if="{{titleType}}" class="chefText font36r">
  91 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
78 </view> 92 </view>
79 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
80 - <image src="{{chef.image}}" mode="widthFix" /> 93 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  94 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
  95 + </view>
  96 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  97 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  98 + <block wx:for="{{chef.content}}">
  99 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  100 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  101 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  102 + <video
  103 + object-fit="contain"
  104 + autoplay="{{true}}"
  105 + loop="{{true}}"
  106 + muted="{{true}}"
  107 + show-mute-btn="{{true}}"
  108 + vslide-gesture-in-fullscreen="{{true}}"
  109 + src="{{item.content}}"
  110 + ></video>
  111 + </view>
  112 + </block>
  113 + </view>
  114 + </view>
  115 + </block>
  116 + <!-- 特色菜品 -->
  117 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
  118 + <view wx:if="{{titleType}}" class="chefText font36r">
  119 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
  120 + </view>
  121 + <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  122 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />
  123 + </block>
  124 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  125 + <block wx:for="{{signboard.content}}">
  126 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  127 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  128 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  129 + <video
  130 + object-fit="contain"
  131 + autoplay="{{true}}"
  132 + loop="{{true}}"
  133 + muted="{{true}}"
  134 + show-mute-btn="{{true}}"
  135 + vslide-gesture-in-fullscreen="{{true}}"
  136 + src="{{item.content}}"
  137 + ></video>
  138 + </view>
81 </block> 139 </block>
82 - <view wx:if="{{chef.is_introduce || chef.is_images}}" class="{{(!chef.is_images || chef.is_images!='0')?'':'mtnone'}}"></view>  
83 </view> 140 </view>
84 </view> 141 </view>
85 - <!-- 菜品展示 swich为1展示 -->  
86 - <view class="introduce vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}">  
87 - <view class="imgMask">  
88 - <view class="IntroduceColor">  
89 - <view class="chefText font36r">特色菜品</view>  
90 - <view class="lines"></view>  
91 - </view>  
92 - <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
93 - <image src="{{item}}" mode="widthFix" /> 142 + <!-- 停车指引 -->
  143 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
  144 + <view wx:if="{{titleType}}" class="chefText font36r">
  145 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
  146 + </view>
  147 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  148 + <text space="nbsp" class="texts">{{reserve.park_info}}</text>
  149 + </view>
  150 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  151 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  152 + </block>
  153 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  154 + <block wx:for="{{reserve.content}}">
  155 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  156 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  157 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  158 + <video
  159 + object-fit="contain"
  160 + autoplay="{{true}}"
  161 + loop="{{true}}"
  162 + muted="{{true}}"
  163 + show-mute-btn="{{true}}"
  164 + vslide-gesture-in-fullscreen="{{true}}"
  165 + src="{{item.content}}"
  166 + ></video>
  167 + </view>
94 </block> 168 </block>
95 </view> 169 </view>
96 </view> 170 </view>
97 <view class="preferential" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}"> 171 <view class="preferential" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">
98 - <view class="chefText font36r">  
99 - 特别优惠 172 + <view wx:if="{{titleType}}" class="chefText font36r">
  173 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
100 </view> 174 </view>
101 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.sellName}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover"> 175 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.sellName}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
102 <view class="preferentialItems"> 176 <view class="preferentialItems">
@@ -89,8 +89,8 @@ @@ -89,8 +89,8 @@
89 } 89 }
90 90
91 .labelBox { 91 .labelBox {
  92 + margin: 20rpx 20rpx 0 20rpx;
92 display: flex; 93 display: flex;
93 - margin: 0 20rpx 0 0;  
94 position: relative; 94 position: relative;
95 padding-bottom: 20rpx; 95 padding-bottom: 20rpx;
96 } 96 }
@@ -100,11 +100,35 @@ @@ -100,11 +100,35 @@
100 line-height: 40rpx; 100 line-height: 40rpx;
101 color: #515151; 101 color: #515151;
102 font-family: PingFang SC; 102 font-family: PingFang SC;
103 - font-size: 28rpx; 103 + font-size: 32rpx;
104 font-weight: 500; 104 font-weight: 500;
105 - word-break: break-all;  
106 - text-overflow: ellipsis;  
107 - display: -webkit-box; 105 +}
  106 +
  107 +.contentBox {
  108 + width: 100%;
  109 + margin-top: 20rpx;
  110 +}
  111 +
  112 +.contentBox .texts {
  113 + line-height: 40rpx;
  114 + margin: 0 20rpx;
  115 + color: #515151;
  116 + font-family: PingFang SC;
  117 + font-weight: 500;
  118 + display: block;
  119 +}
  120 +
  121 +.contentBox view,.contentBox text,.contentBox image{
  122 + margin-bottom: 20rpx !important;
  123 +}
  124 +
  125 +.introduceBox image {
  126 + width: 100%;
  127 + margin-bottom: 20rpx;
  128 + display: block !important;
  129 + vertical-align: top;
  130 + padding: 0 20rpx;
  131 + box-sizing: border-box;
108 } 132 }
109 133
110 .labelBox .line1 { 134 .labelBox .line1 {
@@ -172,7 +196,7 @@ @@ -172,7 +196,7 @@
172 } 196 }
173 197
174 .preferential { 198 .preferential {
175 - margin: 28rpx 40rpx 0 40rpx; 199 + margin-top: 28rpx;
176 } 200 }
177 201
178 .rubric1 { 202 .rubric1 {
@@ -184,9 +208,9 @@ @@ -184,9 +208,9 @@
184 display: flex; 208 display: flex;
185 justify-content: space-between; 209 justify-content: space-between;
186 align-items: center; 210 align-items: center;
187 - margin-bottom: 20rpx;  
188 background: url('https://qn.colorcun.com/certificateBj.png') no-repeat; 211 background: url('https://qn.colorcun.com/certificateBj.png') no-repeat;
189 background-size: 100% 100%; 212 background-size: 100% 100%;
  213 + margin: 0 20rpx 20rpx 20rpx;
190 } 214 }
191 215
192 .itemLeft { 216 .itemLeft {
@@ -286,4 +310,17 @@ @@ -286,4 +310,17 @@
286 border-radius: 22rpx; 310 border-radius: 22rpx;
287 text-align: center; 311 text-align: center;
288 padding: 10rpx; 312 padding: 10rpx;
  313 +}
  314 +
  315 +.videoBox{
  316 + display: flex;
  317 + flex-wrap: wrap;
  318 + align-items: center;
  319 + justify-content: center;
  320 + margin: 0 20rpx;
  321 +}
  322 +
  323 +.videoBox video{
  324 + width: 100%;
  325 + box-sizing: border-box;
289 } 326 }