xt / xcx-book · Commits

Go to a project

Commit a9fee9258c0121289ef8510ddb5dc964407b6b07

Authored by pengye
1 parent ddfdeb4d
build: skipped

邀请函模板加自定义图片、文字、视频

Inline Side-by-side
Showing 12 changed files with 237 additions and 144 deletions
@@ -421,6 +421,7 @@ @@ -421,6 +421,7 @@
421 margin: 24rpx 20rpx 10rpx 0; 421 margin: 24rpx 20rpx 10rpx 0;
422 display: flex; 422 display: flex;
423 justify-content: space-between; 423 justify-content: space-between;
  424 + align-items: baseline;
424 } 425 }
425 426
426 .btns text { 427 .btns text {
@@ -448,6 +448,7 @@ @@ -448,6 +448,7 @@
448 margin: 24rpx 20rpx 10rpx 0; 448 margin: 24rpx 20rpx 10rpx 0;
449 display: flex; 449 display: flex;
450 justify-content: space-between; 450 justify-content: space-between;
  451 + align-items: baseline;
451 } 452 }
452 453
453 .btns text { 454 .btns text {
@@ -438,6 +438,7 @@ @@ -438,6 +438,7 @@
438 margin: 24rpx 20rpx 10rpx 0; 438 margin: 24rpx 20rpx 10rpx 0;
439 display: flex; 439 display: flex;
440 justify-content: space-between; 440 justify-content: space-between;
  441 + align-items: baseline;
441 } 442 }
442 443
443 .btns text { 444 .btns text {
@@ -437,6 +437,7 @@ @@ -437,6 +437,7 @@
437 margin: 24rpx 20rpx 10rpx 0; 437 margin: 24rpx 20rpx 10rpx 0;
438 display: flex; 438 display: flex;
439 justify-content: space-between; 439 justify-content: space-between;
  440 + align-items: baseline;
440 } 441 }
441 442
442 .btns text { 443 .btns text {
@@ -430,6 +430,7 @@ @@ -430,6 +430,7 @@
430 margin: 24rpx 20rpx 10rpx 0; 430 margin: 24rpx 20rpx 10rpx 0;
431 display: flex; 431 display: flex;
432 justify-content: space-between; 432 justify-content: space-between;
  433 + align-items: baseline;
433 } 434 }
434 435
435 .btns text { 436 .btns text {
@@ -567,7 +567,13 @@ Page({ @@ -567,7 +567,13 @@ Page({
567 StyleType = data.type; 567 StyleType = data.type;
568 titleType = data.title_class || '1'; 568 titleType = data.title_class || '1';
569 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 569 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
  570 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  571 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  572 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  573 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  574 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
570 if (marketing) { 575 if (marketing) {
  576 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
571 is_comments = marketing.is_comments ? marketing.is_comments : ''; 577 is_comments = marketing.is_comments ? marketing.is_comments : '';
572 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 578 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
573 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 579 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -118,60 +118,43 @@ @@ -118,60 +118,43 @@
118 <text space="nbsp" 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 - <!-- 餐厅介绍 用餐环境 -->  
122 - <view class="introduceBox">  
123 - <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'))}}">  
124 - <view wx:if="{{titleType}}" class="chefText font36r">  
125 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle>  
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" />  
128 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
129 - <text space="nbsp" class="texts">{{store.introduce}}  
130 - </text>  
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>  
133 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
134 - <video  
135 - style="margin-bottom: 20rpx;"  
136 - object-fit="contain"  
137 - autoplay="{{true}}"  
138 - loop="{{true}}"  
139 - muted="{{true}}"  
140 - show-mute-btn="{{true}}"  
141 - vslide-gesture-in-fullscreen="{{true}}"  
142 - src="https://qn.colorcun.com/201_1733735811.mp4"  
143 - ></video>  
144 - <video  
145 - object-fit="contain"  
146 - autoplay="{{true}}"  
147 - loop="{{true}}"  
148 - muted="{{true}}"  
149 - show-mute-btn="{{true}}"  
150 - vslide-gesture-in-fullscreen="{{true}}"  
151 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
152 - ></video>  
153 - </view>  
154 - </block>  
155 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
156 - <view wx:if="{{titleType}}" class="chefText font36r">  
157 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle>  
158 - </view>  
159 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
160 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" /> 121 + <!-- 餐厅介绍 -->
  122 + <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))}}">
  123 + <view class="introduceBox">
  124 + <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'))}}">
  125 + <view wx:if="{{titleType}}" class="chefText font36r">
  126 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle>
  127 + </view>
  128 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  129 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  130 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  131 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  132 + </view>
161 </block> 133 </block>
162 - </block>  
163 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
164 - <video  
165 - object-fit="contain"  
166 - autoplay="{{true}}"  
167 - loop="{{true}}"  
168 - muted="{{true}}"  
169 - show-mute-btn="{{true}}"  
170 - vslide-gesture-in-fullscreen="{{true}}"  
171 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
172 - ></video>  
173 - </view>  
174 - </view> 134 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  135 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  136 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  137 + </block>
  138 + </block>
  139 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  140 + <block wx:for="{{store.content}}">
  141 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  142 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  143 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  144 + <video
  145 + object-fit="contain"
  146 + autoplay="{{true}}"
  147 + loop="{{true}}"
  148 + muted="{{true}}"
  149 + show-mute-btn="{{true}}"
  150 + vslide-gesture-in-fullscreen="{{true}}"
  151 + src="{{item.content}}"
  152 + ></video>
  153 + </view>
  154 + </block>
  155 + </view>
  156 + </view>
  157 + </block>
175 <!-- 主厨介绍 --> 158 <!-- 主厨介绍 -->
176 <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}"> 159 <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
177 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 160 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
@@ -370,6 +370,24 @@ @@ -370,6 +370,24 @@
370 font-weight: 500; 370 font-weight: 500;
371 } 371 }
372 372
  373 +.contentBox {
  374 + width: 100%;
  375 + margin-top: 20rpx;
  376 +}
  377 +
  378 +.contentBox .texts {
  379 + line-height: 40rpx;
  380 + margin: 0 20rpx;
  381 + color: #FFEFC5;
  382 + font-family: PingFang SC;
  383 + font-weight: 500;
  384 + display: block;
  385 +}
  386 +
  387 +.contentBox view,.contentBox text,.contentBox image{
  388 + margin-bottom: 20rpx !important;
  389 +}
  390 +
373 .introduceBox image { 391 .introduceBox image {
374 width: 100%; 392 width: 100%;
375 margin-bottom: 20rpx; 393 margin-bottom: 20rpx;
@@ -439,6 +457,7 @@ @@ -439,6 +457,7 @@
439 margin: 24rpx 20rpx 10rpx 0; 457 margin: 24rpx 20rpx 10rpx 0;
440 display: flex; 458 display: flex;
441 justify-content: space-between; 459 justify-content: space-between;
  460 + align-items: baseline;
442 } 461 }
443 462
444 .btns text { 463 .btns text {
@@ -667,7 +686,7 @@ @@ -667,7 +686,7 @@
667 flex-wrap: wrap; 686 flex-wrap: wrap;
668 align-items: center; 687 align-items: center;
669 justify-content: center; 688 justify-content: center;
670 - margin: 20rpx; 689 + margin: 0 20rpx;
671 } 690 }
672 691
673 .videoBox video{ 692 .videoBox video{
@@ -598,7 +598,13 @@ Page({ @@ -598,7 +598,13 @@ Page({
598 if (StyleType == '14' || StyleType == '16') colors = "#1B1A23"; 598 if (StyleType == '14' || StyleType == '16') colors = "#1B1A23";
599 titleType = data.title_class || '1'; 599 titleType = data.title_class || '1';
600 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 600 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
  601 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  602 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  603 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  604 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  605 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
601 if (marketing) { 606 if (marketing) {
  607 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
602 is_comments = marketing.is_comments ? marketing.is_comments : ''; 608 is_comments = marketing.is_comments ? marketing.is_comments : '';
603 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 609 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
604 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 610 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -122,93 +122,124 @@ @@ -122,93 +122,124 @@
122 </block> 122 </block>
123 </view> 123 </view>
124 <!-- 餐厅介绍 --> 124 <!-- 餐厅介绍 -->
125 - <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'))}}"> 125 + <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))}}">
126 <view class="introduce" wx:if="{{store}}"> 126 <view class="introduce" wx:if="{{store}}">
127 - <block wx:if="{{titleType}}">  
128 - <titleStyle titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle>  
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" /> 127 + <titleStyle wx:if="{{titleType}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
  128 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  129 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
131 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 130 <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
132 <text space="nbsp" class="texts font32r">{{store.introduce}}</text> 131 <text space="nbsp" class="texts font32r">{{store.introduce}}</text>
133 </view> 132 </view>
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>  
135 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
136 - <video  
137 - style="margin-bottom: 20rpx;"  
138 - object-fit="contain"  
139 - autoplay="{{true}}"  
140 - loop="{{true}}"  
141 - muted="{{true}}"  
142 - show-mute-btn="{{true}}"  
143 - vslide-gesture-in-fullscreen="{{true}}"  
144 - src="https://qn.colorcun.com/201_1733735811.mp4"  
145 - ></video>  
146 - <video  
147 - object-fit="contain"  
148 - autoplay="{{true}}"  
149 - loop="{{true}}"  
150 - muted="{{true}}"  
151 - show-mute-btn="{{true}}"  
152 - vslide-gesture-in-fullscreen="{{true}}"  
153 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
154 - ></video>  
155 - </view> 133 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  134 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  135 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  136 + </block>
  137 + </block>
  138 + <view class="labelBox" wx:if="{{store.content && store.content.length>0}}">
  139 + <block wx:for="{{store.content}}">
  140 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  141 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  142 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  143 + <video
  144 + object-fit="contain"
  145 + autoplay="{{true}}"
  146 + loop="{{true}}"
  147 + muted="{{true}}"
  148 + show-mute-btn="{{true}}"
  149 + vslide-gesture-in-fullscreen="{{true}}"
  150 + src="{{item.content}}"
  151 + ></video>
  152 + </view>
  153 + </block>
  154 + </view>
156 </view> 155 </view>
157 </block> 156 </block>
158 - <!-- 用餐环境 -->  
159 - <view class="introduce" wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
160 - <block wx:if="{{titleType}}">  
161 - <titleStyle titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle>  
162 - </block>  
163 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
164 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />  
165 - </block>  
166 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
167 - <video  
168 - object-fit="contain"  
169 - autoplay="{{true}}"  
170 - loop="{{true}}"  
171 - muted="{{true}}"  
172 - show-mute-btn="{{true}}"  
173 - vslide-gesture-in-fullscreen="{{true}}"  
174 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
175 - ></video>  
176 - </view>  
177 - </view>  
178 <!-- 主厨介绍 --> 157 <!-- 主厨介绍 -->
179 - <view class="introduce" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
180 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
181 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
182 - </view>  
183 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
184 - <text class="texts" space="nbsp">{{chef.introduce}}  
185 - </text> 158 + <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))}}">
  159 + <view class="introduce">
  160 + <view wx:if="{{titleType}}" class="chefText font36r">
  161 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
  162 + </view>
  163 + <block wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  164 + <view class="labelBox" wx:if="{{chef.introduce && (!chef.is_introduce || chef.is_introduce!='0')}}">
  165 + <text class="texts" space="nbsp">{{chef.introduce}}
  166 + </text>
  167 + </view>
  168 + </block>
  169 + <image wx:if="{{chef.image && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  170 + <view class="labelBox" wx:if="{{chef.content && chef.content.length>0}}">
  171 + <block wx:for="{{chef.content}}">
  172 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  173 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  174 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  175 + <video
  176 + object-fit="contain"
  177 + autoplay="{{true}}"
  178 + loop="{{true}}"
  179 + muted="{{true}}"
  180 + show-mute-btn="{{true}}"
  181 + vslide-gesture-in-fullscreen="{{true}}"
  182 + src="{{item.content}}"
  183 + ></video>
  184 + </view>
  185 + </block>
  186 + </view>
186 </view> 187 </view>
187 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
188 - <image src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />  
189 - </block>  
190 - </view> 188 + </block>
191 <!-- 特色菜品 --> 189 <!-- 特色菜品 -->
192 - <view class="introduce" wx:if="{{signboard && signboard.swich=='1' && signboard.images && signboard.images.length>0}}"> 190 + <view class="introduce" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
193 <block wx:if="{{titleType}}"> 191 <block wx:if="{{titleType}}">
194 - <titleStyle titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 192 + <titleStyle titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
195 </block> 193 </block>
196 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 194 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
197 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" /> 195 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />
198 </block> 196 </block>
  197 + <view class="labelBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  198 + <block wx:for="{{signboard.content}}">
  199 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  200 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  201 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  202 + <video
  203 + object-fit="contain"
  204 + autoplay="{{true}}"
  205 + loop="{{true}}"
  206 + muted="{{true}}"
  207 + show-mute-btn="{{true}}"
  208 + vslide-gesture-in-fullscreen="{{true}}"
  209 + src="{{item.content}}"
  210 + ></video>
  211 + </view>
  212 + </block>
  213 + </view>
199 </view> 214 </view>
200 <!-- 停车指引 --> 215 <!-- 停车指引 -->
201 - <view class="introduce" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 216 + <view class="introduce" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
202 <block wx:if="{{titleType}}"> 217 <block wx:if="{{titleType}}">
203 - <titleStyle titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 218 + <titleStyle titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
204 </block> 219 </block>
205 <view class="labelBox" wx:if="{{reserve.park_info}}"> 220 <view class="labelBox" wx:if="{{reserve.park_info}}">
206 - <text class="texts" space="nbsp">{{reserve.park_info}}  
207 - </text> 221 + <text class="texts" space="nbsp">{{reserve.park_info}}</text>
208 </view> 222 </view>
209 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 223 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
210 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" /> 224 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
211 </block> 225 </block>
  226 + <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  227 + <block wx:for="{{reserve.content}}">
  228 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  229 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  230 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  231 + <video
  232 + object-fit="contain"
  233 + autoplay="{{true}}"
  234 + loop="{{true}}"
  235 + muted="{{true}}"
  236 + show-mute-btn="{{true}}"
  237 + vslide-gesture-in-fullscreen="{{true}}"
  238 + src="{{item.content}}"
  239 + ></video>
  240 + </view>
  241 + </block>
  242 + </view>
212 </view> 243 </view>
213 <view class="introduce" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 244 <view class="introduce" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
214 <block wx:if="{{titleType}}"> 245 <block wx:if="{{titleType}}">
@@ -279,16 +279,20 @@ @@ -279,16 +279,20 @@
279 279
280 .labelBox { 280 .labelBox {
281 width: 100%; 281 width: 100%;
282 - display: flex;  
283 - position: relative; 282 + margin-top: 20rpx;
284 } 283 }
285 284
286 .labelBox .texts { 285 .labelBox .texts {
287 line-height: 40rpx; 286 line-height: 40rpx;
288 - margin: 20rpx; 287 + margin: 0 20rpx;
289 color: #FFEFC5; 288 color: #FFEFC5;
290 font-family: PingFang SC; 289 font-family: PingFang SC;
291 font-weight: 500; 290 font-weight: 500;
  291 + display: block;
  292 +}
  293 +
  294 +.labelBox view,.labelBox text,.labelBox image{
  295 + margin-bottom: 20rpx !important;
292 } 296 }
293 297
294 .introduce image { 298 .introduce image {
@@ -393,6 +397,7 @@ @@ -393,6 +397,7 @@
393 margin: 24rpx 20rpx 0 0; 397 margin: 24rpx 20rpx 0 0;
394 display: flex; 398 display: flex;
395 justify-content: space-between; 399 justify-content: space-between;
  400 + align-items: baseline;
396 } 401 }
397 402
398 .orderingFood { 403 .orderingFood {
@@ -779,7 +784,7 @@ @@ -779,7 +784,7 @@
779 flex-wrap: wrap; 784 flex-wrap: wrap;
780 align-items: center; 785 align-items: center;
781 justify-content: center; 786 justify-content: center;
782 - margin: 20rpx; 787 + margin: 0 20rpx;
783 } 788 }
784 789
785 .videoBox video{ 790 .videoBox video{
1 { 1 {
2 "setting": { 2 "setting": {
3 - "compileHotReLoad": false 3 + "compileHotReLoad": false,
  4 + "urlCheck": false,
  5 + "bigPackageSizeSupport": true
4 }, 6 },
5 "condition": { 7 "condition": {
6 "miniprogram": { 8 "miniprogram": {
@@ -575,7 +577,8 @@ @@ -575,7 +577,8 @@
575 { 577 {
576 "name": "pages/customer/detail_invitation", 578 "name": "pages/customer/detail_invitation",
577 "pathName": "pages/customer/detail_invitation", 579 "pathName": "pages/customer/detail_invitation",
578 - "query": "id=199122&hasInvitation=1&hasSellerShare=1&uid=2891", 580 + "query": "id=400386&hasInvitation=1&hasSellerShare=1&uid=2891",
  581 + "launchMode": "default",
579 "scene": null 582 "scene": null
580 }, 583 },
581 { 584 {
@@ -594,63 +597,70 @@ @@ -594,63 +597,70 @@
594 { 597 {
595 "name": "邀请函-----1", 598 "name": "邀请函-----1",
596 "pathName": "pages/customer/detail_invitation", 599 "pathName": "pages/customer/detail_invitation",
597 - "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1", 600 + "query": "id=1006096&hasInvitation=1&hasSellerShare=1&tplid=1",
598 "launchMode": "default", 601 "launchMode": "default",
599 "scene": null 602 "scene": null
600 }, 603 },
601 { 604 {
602 "name": "邀请函-----2", 605 "name": "邀请函-----2",
603 "pathName": "pages/customer/detail_owner_invitation2", 606 "pathName": "pages/customer/detail_owner_invitation2",
604 - "query": "id=600251&hasInvitation=1&hasSellerShare=1&tplid=1", 607 + "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
605 "launchMode": "default", 608 "launchMode": "default",
606 "scene": null 609 "scene": null
607 }, 610 },
608 { 611 {
609 "name": "邀请函-----3", 612 "name": "邀请函-----3",
610 "pathName": "pages/customer/detail_owner_invitation3", 613 "pathName": "pages/customer/detail_owner_invitation3",
611 - "query": "id=600251&hasInvitation=1&hasSellerShare=1&tplid=1", 614 + "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
612 "launchMode": "default", 615 "launchMode": "default",
613 "scene": null 616 "scene": null
614 }, 617 },
615 { 618 {
616 "name": "邀请函-----4", 619 "name": "邀请函-----4",
617 "pathName": "pages/customer/detail_owner_invitation4", 620 "pathName": "pages/customer/detail_owner_invitation4",
618 - "query": "id=600251&hasInvitation=1&hasSellerShare=1&tplid=1", 621 + "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
619 "launchMode": "default", 622 "launchMode": "default",
620 "scene": null 623 "scene": null
621 }, 624 },
622 { 625 {
623 "name": "邀请函-----5", 626 "name": "邀请函-----5",
624 "pathName": "pages/customer/detail_owner_invitation5", 627 "pathName": "pages/customer/detail_owner_invitation5",
625 - "query": "id=600251&hasInvitation=1&hasSellerShare=1&tplid=1", 628 + "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
626 "launchMode": "default", 629 "launchMode": "default",
627 "scene": null 630 "scene": null
628 }, 631 },
629 { 632 {
630 "name": "邀请函-----6", 633 "name": "邀请函-----6",
631 "pathName": "pages/customer/detail_owner_invitation6", 634 "pathName": "pages/customer/detail_owner_invitation6",
632 - "query": "id=600251&hasInvitation=1&hasSellerShare=1&tplid=1", 635 + "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
633 "launchMode": "default", 636 "launchMode": "default",
634 "scene": null 637 "scene": null
635 }, 638 },
636 { 639 {
637 "name": "邀请函-----7", 640 "name": "邀请函-----7",
638 "pathName": "pages/customer/detail_owner_invitation7", 641 "pathName": "pages/customer/detail_owner_invitation7",
639 - "query": "id=600251&hasInvitation=1&hasSellerShare=1&tplid=1", 642 + "query": "id=1044551&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
640 "launchMode": "default", 643 "launchMode": "default",
641 "scene": null 644 "scene": null
642 }, 645 },
643 { 646 {
644 "name": "邀请函-----8", 647 "name": "邀请函-----8",
645 "pathName": "pages/customer/detail_owner_invitation8", 648 "pathName": "pages/customer/detail_owner_invitation8",
646 - "query": "id=364508&hasInvitation=1&hasSellerShare=1&tplid=1", 649 + "query": "id=1050371&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=",
  650 + "launchMode": "default",
  651 + "scene": null
  652 + },
  653 + {
  654 + "name": "邀请函-----9",
  655 + "pathName": "pages/customer/detail_owner_invitation9",
  656 + "query": "id=698505&hasInvitation=1&hasSellerShare=1&tplid=1&paymentId=2435",
647 "launchMode": "default", 657 "launchMode": "default",
648 "scene": null 658 "scene": null
649 }, 659 },
650 { 660 {
651 "name": "新提前点餐", 661 "name": "新提前点餐",
652 "pathName": "pack-cookbook/pages/index_new", 662 "pathName": "pack-cookbook/pages/index_new",
653 - "query": "rid=602267&oid=8056&identity=1&sid=8&hasSuccess=1", 663 + "query": "rid=805612&oid=11324&identity=1&sid=8&hasSuccess=1",
654 "launchMode": "default", 664 "launchMode": "default",
655 "scene": null 665 "scene": null
656 }, 666 },
@@ -670,13 +680,6 @@ @@ -670,13 +680,6 @@
670 }, 680 },
671 { 681 {
672 "name": "", 682 "name": "",
673 - "pathName": "pages\\customer\\index.js",  
674 - "query": "id=392867&hasInvitation=1&hasSellerShare=1&uid=311",  
675 - "launchMode": "default",  
676 - "scene": null  
677 - },  
678 - {  
679 - "name": "",  
680 "pathName": "pages/me/wananchi", 683 "pathName": "pages/me/wananchi",
681 "query": "type=1&oid=392864&sid=8", 684 "query": "type=1&oid=392864&sid=8",
682 "launchMode": "default", 685 "launchMode": "default",
@@ -692,14 +695,14 @@ @@ -692,14 +695,14 @@
692 { 695 {
693 "name": "", 696 "name": "",
694 "pathName": "pack-cookbook/pages/success_new", 697 "pathName": "pack-cookbook/pages/success_new",
695 - "query": "type=1&sellerName=长安大排档&rid=573439&oid=7412&sid=4352&hasSuccess=1", 698 + "query": "type=1&sellerName=长安大排档&rid=708760&oid=9916&sid=4352&hasSuccess=1",
696 "launchMode": "default", 699 "launchMode": "default",
697 "scene": null 700 "scene": null
698 }, 701 },
699 { 702 {
700 - "name": "", 703 + "name": "商家详情",
701 "pathName": "pages/reserve/shopHome", 704 "pathName": "pages/reserve/shopHome",
702 - "query": "sid=8", 705 + "query": "sid=4352",
703 "launchMode": "default", 706 "launchMode": "default",
704 "scene": null 707 "scene": null
705 }, 708 },
@@ -716,11 +719,46 @@ @@ -716,11 +719,46 @@
716 "query": "", 719 "query": "",
717 "launchMode": "default", 720 "launchMode": "default",
718 "scene": null 721 "scene": null
  722 + },
  723 + {
  724 + "name": "新邀请函入口页",
  725 + "pathName": "pages/customer/detail_owner_invitation_new",
  726 + "query": "id=1037444&uid=&paymentId=",
  727 + "launchMode": "default",
  728 + "scene": null
  729 + },
  730 + {
  731 + "name": "无图的商家",
  732 + "pathName": "pages/reserve/detail",
  733 + "query": "id=4865",
  734 + "launchMode": "default",
  735 + "scene": null
  736 + },
  737 + {
  738 + "name": "小程序入口页",
  739 + "pathName": "pages/customer/index",
  740 + "query": "id=1018360&uid=7035&hasInvitation=1&hasSellerShare=1&tplid=1",
  741 + "launchMode": "default",
  742 + "scene": null
  743 + },
  744 + {
  745 + "name": "邀约",
  746 + "pathName": "pages/me/invitation",
  747 + "query": "",
  748 + "launchMode": "default",
  749 + "scene": null
  750 + },
  751 + {
  752 + "name": "商家有礼",
  753 + "pathName": "pages/reserve/sellerGift",
  754 + "query": "id=928221",
  755 + "launchMode": "default",
  756 + "scene": null
719 } 757 }
720 ] 758 ]
721 } 759 }
722 }, 760 },
723 "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", 761 "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
724 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A", 762 "projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
725 - "libVersion": "3.1.1" 763 + "libVersion": "2.19.2"
726 } 764 }