xt / xcx-book · Commits

Go to a project

Commit be35e8ab4a6be0c3870a612b0fe40bcd937d3ae0

Authored by “pengye”
1 parent a9fee925
build: skipped

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

Inline Side-by-side
Showing 22 changed files with 878 additions and 537 deletions
@@ -568,7 +568,13 @@ Page({ @@ -568,7 +568,13 @@ Page({
568 StyleType = data.type; 568 StyleType = data.type;
569 titleType = data.title_class || '1'; 569 titleType = data.title_class || '1';
570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
  571 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  572 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  573 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  574 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  575 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
571 if (marketing) { 576 if (marketing) {
  577 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
572 is_comments = marketing.is_comments ? marketing.is_comments : ''; 578 is_comments = marketing.is_comments ? marketing.is_comments : '';
573 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 579 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
574 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 580 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -123,86 +123,103 @@ @@ -123,86 +123,103 @@
123 <text space="nbsp" 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 - <!-- 餐厅介绍 用餐环境 -->  
127 - <view class="introduceBox">  
128 - <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'))}}"> 126 + <!-- 餐厅介绍 -->
  127 + <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))}}">
  128 + <view class="introduceBox">
  129 + <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'))}}">
  130 + <view wx:if="{{titleType}}" class="chefText font36r">
  131 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
  132 + </view>
  133 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  134 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  135 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  136 + <text space="nbsp" class="texts">{{store.introduce}}
  137 + </text>
  138 + </view>
  139 + </block>
  140 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  141 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  142 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" />
  143 + </block>
  144 + </block>
  145 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  146 + <block wx:for="{{store.content}}">
  147 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  148 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  149 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  150 + <video
  151 + object-fit="contain"
  152 + autoplay="{{true}}"
  153 + loop="{{true}}"
  154 + muted="{{true}}"
  155 + show-mute-btn="{{true}}"
  156 + vslide-gesture-in-fullscreen="{{true}}"
  157 + src="{{item.content}}"
  158 + ></video>
  159 + </view>
  160 + </block>
  161 + </view>
  162 + </view>
  163 + </block>
  164 + <!-- 主厨介绍 -->
  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))}}">
  166 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
129 <view wx:if="{{titleType}}" class="chefText font36r"> 167 <view wx:if="{{titleType}}" class="chefText font36r">
130 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle> 168 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
131 </view> 169 </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" />  
133 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
134 - <text space="nbsp" class="texts">{{store.introduce}}  
135 - </text> 170 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  171 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
136 </view> 172 </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>  
138 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
139 - <video  
140 - style="margin-bottom: 20rpx;"  
141 - object-fit="contain"  
142 - autoplay="{{true}}"  
143 - loop="{{true}}"  
144 - muted="{{true}}"  
145 - show-mute-btn="{{true}}"  
146 - vslide-gesture-in-fullscreen="{{true}}"  
147 - src="https://qn.colorcun.com/201_1733735811.mp4"  
148 - ></video>  
149 - <video  
150 - object-fit="contain"  
151 - autoplay="{{true}}"  
152 - loop="{{true}}"  
153 - muted="{{true}}"  
154 - show-mute-btn="{{true}}"  
155 - vslide-gesture-in-fullscreen="{{true}}"  
156 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
157 - ></video>  
158 - </view>  
159 - </block>  
160 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
161 - <view wx:if="{{titleType}}" class="chefText font36r">  
162 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle> 173 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>
  174 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  175 + <block wx:for="{{chef.content}}">
  176 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  177 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  178 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  179 + <video
  180 + object-fit="contain"
  181 + autoplay="{{true}}"
  182 + loop="{{true}}"
  183 + muted="{{true}}"
  184 + show-mute-btn="{{true}}"
  185 + vslide-gesture-in-fullscreen="{{true}}"
  186 + src="{{item.content}}"
  187 + ></video>
  188 + </view>
  189 + </block>
163 </view> 190 </view>
164 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
165 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" />  
166 - </block>  
167 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
168 - <video  
169 - object-fit="contain"  
170 - autoplay="{{true}}"  
171 - loop="{{true}}"  
172 - muted="{{true}}"  
173 - show-mute-btn="{{true}}"  
174 - vslide-gesture-in-fullscreen="{{true}}"  
175 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
176 - ></video>  
177 - </view>  
178 - </block>  
179 - </view>  
180 - <!-- 主厨介绍 -->  
181 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
182 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
183 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
184 - </view>  
185 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
186 - <text space="nbsp" class="texts">{{chef.introduce}}  
187 - </text>  
188 </view> 191 </view>
189 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
190 - <image src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>  
191 - </block>  
192 - </view>  
193 - <!-- 特色菜品 swich为1展示 -->  
194 - <view class="introduceBox vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 192 + </block>
  193 + <!-- 特色菜品 -->
  194 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
195 <view wx:if="{{titleType}}" class="chefText font36r"> 195 <view wx:if="{{titleType}}" class="chefText font36r">
196 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 196 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
197 </view> 197 </view>
198 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 198 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
199 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/> 199 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/>
200 </block> 200 </block>
  201 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  202 + <block wx:for="{{signboard.content}}">
  203 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  204 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  205 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  206 + <video
  207 + object-fit="contain"
  208 + autoplay="{{true}}"
  209 + loop="{{true}}"
  210 + muted="{{true}}"
  211 + show-mute-btn="{{true}}"
  212 + vslide-gesture-in-fullscreen="{{true}}"
  213 + src="{{item.content}}"
  214 + ></video>
  215 + </view>
  216 + </block>
  217 + </view>
201 </view> 218 </view>
202 - <!-- 停车指引 swich为1展示 -->  
203 - <view class="introduceBox stopBox" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 219 + <!-- 停车指引 -->
  220 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
204 <view wx:if="{{titleType}}" class="chefText font36r"> 221 <view wx:if="{{titleType}}" class="chefText font36r">
205 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 222 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
206 </view> 223 </view>
207 <view class="labelBox" wx:if="{{reserve.park_info}}"> 224 <view class="labelBox" wx:if="{{reserve.park_info}}">
208 <text space="nbsp" class="texts">{{reserve.park_info}} 225 <text space="nbsp" class="texts">{{reserve.park_info}}
@@ -211,6 +228,23 @@ @@ -211,6 +228,23 @@
211 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 228 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
212 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 229 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
213 </block> 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>
214 </view> 248 </view>
215 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 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'}}">
216 <view wx:if="{{titleType}}" class="chefText font36r"> 250 <view wx:if="{{titleType}}" class="chefText font36r">
@@ -352,6 +352,24 @@ @@ -352,6 +352,24 @@
352 font-weight: 500; 352 font-weight: 500;
353 } 353 }
354 354
  355 +.contentBox {
  356 + width: 100%;
  357 + margin-top: 20rpx;
  358 +}
  359 +
  360 +.contentBox .texts {
  361 + line-height: 40rpx;
  362 + margin: 0 20rpx;
  363 + color: #FFEFC5;
  364 + font-family: PingFang SC;
  365 + font-weight: 500;
  366 + display: block;
  367 +}
  368 +
  369 +.contentBox view,.contentBox text,.contentBox image{
  370 + margin-bottom: 20rpx !important;
  371 +}
  372 +
355 .introduceBox image { 373 .introduceBox image {
356 width: 100%; 374 width: 100%;
357 margin-bottom: 20rpx; 375 margin-bottom: 20rpx;
@@ -646,7 +664,7 @@ @@ -646,7 +664,7 @@
646 flex-wrap: wrap; 664 flex-wrap: wrap;
647 align-items: center; 665 align-items: center;
648 justify-content: center; 666 justify-content: center;
649 - margin: 20rpx; 667 + margin: 0 20rpx;
650 } 668 }
651 669
652 .videoBox video{ 670 .videoBox video{
@@ -954,7 +972,8 @@ @@ -954,7 +972,8 @@
954 .pearlWhite .bottom, 972 .pearlWhite .bottom,
955 .pearlWhite .businessBox, 973 .pearlWhite .businessBox,
956 .pearlWhite .reserveBox .items, 974 .pearlWhite .reserveBox .items,
957 -.pearlWhite .reserveBox .title { 975 +.pearlWhite .reserveBox .title,
  976 +.pearlWhite .contentBox text {
958 color: #578C69; 977 color: #578C69;
959 } 978 }
960 979
@@ -568,7 +568,13 @@ Page({ @@ -568,7 +568,13 @@ Page({
568 StyleType = data.type; 568 StyleType = data.type;
569 titleType = data.title_class || '1'; 569 titleType = data.title_class || '1';
570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
  571 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  572 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  573 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  574 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  575 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
571 if (marketing) { 576 if (marketing) {
  577 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
572 is_comments = marketing.is_comments ? marketing.is_comments : ''; 578 is_comments = marketing.is_comments ? marketing.is_comments : '';
573 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 579 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
574 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 580 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -125,86 +125,102 @@ @@ -125,86 +125,102 @@
125 <text space="nbsp" 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 - <!-- 餐厅介绍 用餐环境 -->  
129 - <view class="introduceBox">  
130 - <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'))}}"> 128 + <!-- 餐厅介绍 -->
  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">
  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>
  135 + <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>
  137 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  138 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  139 + </view>
  140 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  141 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  142 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}"/>
  143 + </block>
  144 + </block>
  145 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  146 + <block wx:for="{{store.content}}">
  147 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  148 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  149 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  150 + <video
  151 + object-fit="contain"
  152 + autoplay="{{true}}"
  153 + loop="{{true}}"
  154 + muted="{{true}}"
  155 + show-mute-btn="{{true}}"
  156 + vslide-gesture-in-fullscreen="{{true}}"
  157 + src="{{item.content}}"
  158 + ></video>
  159 + </view>
  160 + </block>
  161 + </view>
  162 + </block>
  163 + </view>
  164 + </block>
  165 + <!-- 主厨介绍 -->
  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))}}">
  167 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
131 <view wx:if="{{titleType}}" class="chefText font36r"> 168 <view wx:if="{{titleType}}" class="chefText font36r">
132 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle> 169 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
133 </view> 170 </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" />  
135 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
136 - <text space="nbsp" class="texts">{{store.introduce}}  
137 - </text> 171 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  172 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
138 </view> 173 </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>  
140 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
141 - <video  
142 - style="margin-bottom: 20rpx;"  
143 - object-fit="contain"  
144 - autoplay="{{true}}"  
145 - loop="{{true}}"  
146 - muted="{{true}}"  
147 - show-mute-btn="{{true}}"  
148 - vslide-gesture-in-fullscreen="{{true}}"  
149 - src="https://qn.colorcun.com/201_1733735811.mp4"  
150 - ></video>  
151 - <video  
152 - object-fit="contain"  
153 - autoplay="{{true}}"  
154 - loop="{{true}}"  
155 - muted="{{true}}"  
156 - show-mute-btn="{{true}}"  
157 - vslide-gesture-in-fullscreen="{{true}}"  
158 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
159 - ></video>  
160 - </view>  
161 - </block>  
162 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
163 - <view wx:if="{{titleType}}" class="chefText font36r">  
164 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle> 174 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>
  175 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  176 + <block wx:for="{{chef.content}}">
  177 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  178 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  179 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  180 + <video
  181 + object-fit="contain"
  182 + autoplay="{{true}}"
  183 + loop="{{true}}"
  184 + muted="{{true}}"
  185 + show-mute-btn="{{true}}"
  186 + vslide-gesture-in-fullscreen="{{true}}"
  187 + src="{{item.content}}"
  188 + ></video>
  189 + </view>
  190 + </block>
165 </view> 191 </view>
166 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
167 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}"/>  
168 - </block>  
169 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
170 - <video  
171 - object-fit="contain"  
172 - autoplay="{{true}}"  
173 - loop="{{true}}"  
174 - muted="{{true}}"  
175 - show-mute-btn="{{true}}"  
176 - vslide-gesture-in-fullscreen="{{true}}"  
177 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
178 - ></video>  
179 - </view>  
180 - </block>  
181 - </view>  
182 - <!-- 主厨介绍 -->  
183 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
184 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
185 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
186 - </view>  
187 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
188 - <text space="nbsp" class="texts">{{chef.introduce}}  
189 - </text>  
190 </view> 192 </view>
191 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
192 - <image src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>  
193 - </block>  
194 - </view>  
195 - <!-- 特色菜品 swich为1展示 -->  
196 - <view class="introduceBox vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 193 + </block>
  194 + <!-- 特色菜品 -->
  195 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
197 <view wx:if="{{titleType}}" class="chefText font36r"> 196 <view wx:if="{{titleType}}" class="chefText font36r">
198 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 197 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
199 </view> 198 </view>
200 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 199 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
201 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/> 200 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/>
202 </block> 201 </block>
  202 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  203 + <block wx:for="{{signboard.content}}">
  204 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  205 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  206 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  207 + <video
  208 + object-fit="contain"
  209 + autoplay="{{true}}"
  210 + loop="{{true}}"
  211 + muted="{{true}}"
  212 + show-mute-btn="{{true}}"
  213 + vslide-gesture-in-fullscreen="{{true}}"
  214 + src="{{item.content}}"
  215 + ></video>
  216 + </view>
  217 + </block>
  218 + </view>
203 </view> 219 </view>
204 - <!-- 停车指引 swich为1展示 -->  
205 - <view class="introduceBox stopBox" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 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))}}">
206 <view wx:if="{{titleType}}" class="chefText font36r"> 222 <view wx:if="{{titleType}}" class="chefText font36r">
207 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 223 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
208 </view> 224 </view>
209 <view class="labelBox" wx:if="{{reserve.park_info}}"> 225 <view class="labelBox" wx:if="{{reserve.park_info}}">
210 <text space="nbsp" class="texts">{{reserve.park_info}} 226 <text space="nbsp" class="texts">{{reserve.park_info}}
@@ -213,6 +229,23 @@ @@ -213,6 +229,23 @@
213 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 229 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
214 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 230 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
215 </block> 231 </block>
  232 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  233 + <block wx:for="{{reserve.content}}">
  234 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  235 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  236 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  237 + <video
  238 + object-fit="contain"
  239 + autoplay="{{true}}"
  240 + loop="{{true}}"
  241 + muted="{{true}}"
  242 + show-mute-btn="{{true}}"
  243 + vslide-gesture-in-fullscreen="{{true}}"
  244 + src="{{item.content}}"
  245 + ></video>
  246 + </view>
  247 + </block>
  248 + </view>
216 </view> 249 </view>
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="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
218 <view wx:if="{{titleType}}" class="chefText font36r"> 251 <view wx:if="{{titleType}}" class="chefText font36r">
@@ -379,6 +379,24 @@ @@ -379,6 +379,24 @@
379 font-weight: 500; 379 font-weight: 500;
380 } 380 }
381 381
  382 +.contentBox {
  383 + width: 100%;
  384 + margin-top: 20rpx;
  385 +}
  386 +
  387 +.contentBox .texts {
  388 + line-height: 40rpx;
  389 + margin: 0 20rpx;
  390 + color: #FFEFC5;
  391 + font-family: PingFang SC;
  392 + font-weight: 500;
  393 + display: block;
  394 +}
  395 +
  396 +.contentBox view,.contentBox text,.contentBox image{
  397 + margin-bottom: 20rpx !important;
  398 +}
  399 +
382 .introduceBox image { 400 .introduceBox image {
383 width: 100%; 401 width: 100%;
384 margin-bottom: 20rpx; 402 margin-bottom: 20rpx;
@@ -677,7 +695,7 @@ @@ -677,7 +695,7 @@
677 flex-wrap: wrap; 695 flex-wrap: wrap;
678 align-items: center; 696 align-items: center;
679 justify-content: center; 697 justify-content: center;
680 - margin: 20rpx; 698 + margin: 0 20rpx;
681 } 699 }
682 700
683 .videoBox video{ 701 .videoBox video{
@@ -987,7 +1005,8 @@ @@ -987,7 +1005,8 @@
987 .pearlWhite .reserveBox .title, 1005 .pearlWhite .reserveBox .title,
988 .pearlWhite .titleImg .info, 1006 .pearlWhite .titleImg .info,
989 .pearlWhite .label, 1007 .pearlWhite .label,
990 -.pearlWhite .reservationInfo .flex-11 { 1008 +.pearlWhite .reservationInfo .flex-11,
  1009 +.pearlWhite .contentBox text {
991 color: #578C69; 1010 color: #578C69;
992 } 1011 }
993 1012
@@ -568,7 +568,13 @@ Page({ @@ -568,7 +568,13 @@ Page({
568 StyleType = data.type; 568 StyleType = data.type;
569 titleType = data.title_class || '1'; 569 titleType = data.title_class || '1';
570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
  571 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  572 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  573 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  574 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  575 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
571 if (marketing) { 576 if (marketing) {
  577 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
572 is_comments = marketing.is_comments ? marketing.is_comments : ''; 578 is_comments = marketing.is_comments ? marketing.is_comments : '';
573 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 579 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
574 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 580 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -108,86 +108,102 @@ @@ -108,86 +108,102 @@
108 <text space="nbsp" 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 - <!-- 餐厅介绍 用餐环境 -->  
112 - <view class="introduceBox">  
113 - <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'))}}"> 111 + <!-- 餐厅介绍 -->
  112 + <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))}}">
  113 + <view class="introduceBox">
  114 + <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'))}}">
  115 + <view wx:if="{{titleType}}" class="chefText font36r">
  116 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
  117 + </view>
  118 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  119 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  120 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  121 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  122 + </view>
  123 + </block>
  124 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  125 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  126 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}"/>
  127 + </block>
  128 + </block>
  129 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  130 + <block wx:for="{{store.content}}">
  131 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  132 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  133 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  134 + <video
  135 + object-fit="contain"
  136 + autoplay="{{true}}"
  137 + loop="{{true}}"
  138 + muted="{{true}}"
  139 + show-mute-btn="{{true}}"
  140 + vslide-gesture-in-fullscreen="{{true}}"
  141 + src="{{item.content}}"
  142 + ></video>
  143 + </view>
  144 + </block>
  145 + </view>
  146 + </view>
  147 + </block>
  148 + <!-- 主厨介绍 -->
  149 + <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))}}">
  150 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
114 <view wx:if="{{titleType}}" class="chefText font36r"> 151 <view wx:if="{{titleType}}" class="chefText font36r">
115 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle> 152 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
116 </view> 153 </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" />  
118 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
119 - <text space="nbsp" class="texts">{{store.introduce}}  
120 - </text> 154 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  155 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
121 </view> 156 </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>  
123 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
124 - <video  
125 - style="margin-bottom: 20rpx;"  
126 - object-fit="contain"  
127 - autoplay="{{true}}"  
128 - loop="{{true}}"  
129 - muted="{{true}}"  
130 - show-mute-btn="{{true}}"  
131 - vslide-gesture-in-fullscreen="{{true}}"  
132 - src="https://qn.colorcun.com/201_1733735811.mp4"  
133 - ></video>  
134 - <video  
135 - object-fit="contain"  
136 - autoplay="{{true}}"  
137 - loop="{{true}}"  
138 - muted="{{true}}"  
139 - show-mute-btn="{{true}}"  
140 - vslide-gesture-in-fullscreen="{{true}}"  
141 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
142 - ></video>  
143 - </view>  
144 - </block>  
145 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
146 - <view wx:if="{{titleType}}" class="chefText font36r">  
147 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle> 157 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>
  158 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  159 + <block wx:for="{{chef.content}}">
  160 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  161 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  162 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  163 + <video
  164 + object-fit="contain"
  165 + autoplay="{{true}}"
  166 + loop="{{true}}"
  167 + muted="{{true}}"
  168 + show-mute-btn="{{true}}"
  169 + vslide-gesture-in-fullscreen="{{true}}"
  170 + src="{{item.content}}"
  171 + ></video>
  172 + </view>
  173 + </block>
148 </view> 174 </view>
149 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
150 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}"/>  
151 - </block>  
152 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
153 - <video  
154 - object-fit="contain"  
155 - autoplay="{{true}}"  
156 - loop="{{true}}"  
157 - muted="{{true}}"  
158 - show-mute-btn="{{true}}"  
159 - vslide-gesture-in-fullscreen="{{true}}"  
160 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
161 - ></video>  
162 - </view>  
163 - </block>  
164 - </view>  
165 - <!-- 主厨介绍 -->  
166 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
167 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
168 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
169 - </view>  
170 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
171 - <text space="nbsp" class="texts">{{chef.introduce}}  
172 - </text>  
173 </view> 175 </view>
174 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
175 - <image src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>  
176 - </block>  
177 - </view>  
178 - <!-- 特色菜品 swich为1展示 -->  
179 - <view class="introduceBox vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 176 + </block>
  177 + <!-- 特色菜品 -->
  178 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
180 <view wx:if="{{titleType}}" class="chefText font36r"> 179 <view wx:if="{{titleType}}" class="chefText font36r">
181 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 180 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
182 </view> 181 </view>
183 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 182 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
184 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/> 183 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/>
185 </block> 184 </block>
  185 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  186 + <block wx:for="{{signboard.content}}">
  187 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  188 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  189 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  190 + <video
  191 + object-fit="contain"
  192 + autoplay="{{true}}"
  193 + loop="{{true}}"
  194 + muted="{{true}}"
  195 + show-mute-btn="{{true}}"
  196 + vslide-gesture-in-fullscreen="{{true}}"
  197 + src="{{item.content}}"
  198 + ></video>
  199 + </view>
  200 + </block>
  201 + </view>
186 </view> 202 </view>
187 - <!-- 停车指引 swich为1展示 -->  
188 - <view class="introduceBox stopBox" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 203 + <!-- 停车指引 -->
  204 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
189 <view wx:if="{{titleType}}" class="chefText font36r"> 205 <view wx:if="{{titleType}}" class="chefText font36r">
190 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 206 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
191 </view> 207 </view>
192 <view class="labelBox" wx:if="{{reserve.park_info}}"> 208 <view class="labelBox" wx:if="{{reserve.park_info}}">
193 <text space="nbsp" class="texts">{{reserve.park_info}} 209 <text space="nbsp" class="texts">{{reserve.park_info}}
@@ -196,6 +212,23 @@ @@ -196,6 +212,23 @@
196 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 212 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
197 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 213 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
198 </block> 214 </block>
  215 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  216 + <block wx:for="{{reserve.content}}">
  217 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  218 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  219 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  220 + <video
  221 + object-fit="contain"
  222 + autoplay="{{true}}"
  223 + loop="{{true}}"
  224 + muted="{{true}}"
  225 + show-mute-btn="{{true}}"
  226 + vslide-gesture-in-fullscreen="{{true}}"
  227 + src="{{item.content}}"
  228 + ></video>
  229 + </view>
  230 + </block>
  231 + </view>
199 </view> 232 </view>
200 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 233 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
201 <view wx:if="{{titleType}}" class="chefText font36r"> 234 <view wx:if="{{titleType}}" class="chefText font36r">
@@ -369,6 +369,24 @@ @@ -369,6 +369,24 @@
369 font-weight: 500; 369 font-weight: 500;
370 } 370 }
371 371
  372 +.contentBox {
  373 + width: 100%;
  374 + margin-top: 20rpx;
  375 +}
  376 +
  377 +.contentBox .texts {
  378 + line-height: 40rpx;
  379 + margin: 0 20rpx;
  380 + color: #FFEFC5;
  381 + font-family: PingFang SC;
  382 + font-weight: 500;
  383 + display: block;
  384 +}
  385 +
  386 +.contentBox view,.contentBox text,.contentBox image{
  387 + margin-bottom: 20rpx !important;
  388 +}
  389 +
372 .introduceBox image { 390 .introduceBox image {
373 width: 100%; 391 width: 100%;
374 margin-bottom: 20rpx; 392 margin-bottom: 20rpx;
@@ -667,7 +685,7 @@ @@ -667,7 +685,7 @@
667 flex-wrap: wrap; 685 flex-wrap: wrap;
668 align-items: center; 686 align-items: center;
669 justify-content: center; 687 justify-content: center;
670 - margin: 20rpx; 688 + margin: 0 20rpx;
671 } 689 }
672 690
673 .videoBox video{ 691 .videoBox video{
@@ -1023,7 +1041,8 @@ @@ -1023,7 +1041,8 @@
1023 .pearlWhite .leftInfo, 1041 .pearlWhite .leftInfo,
1024 .pearlWhite .sellerTitle, 1042 .pearlWhite .sellerTitle,
1025 .pearlWhite .boxLeft .info, 1043 .pearlWhite .boxLeft .info,
1026 -.pearlWhite .reservationInfo .flex-11 { 1044 +.pearlWhite .reservationInfo .flex-11,
  1045 +.pearlWhite .contentBox text {
1027 color: #578C69; 1046 color: #578C69;
1028 } 1047 }
1029 1048
@@ -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) : '';
@@ -106,86 +106,103 @@ @@ -106,86 +106,103 @@
106 <text space="nbsp" 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 - <!-- 餐厅介绍 用餐环境 -->  
110 - <view class="introduceBox">  
111 - <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'))}}"> 109 + <!-- 餐厅介绍 -->
  110 + <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))}}">
  111 + <view class="introduceBox">
  112 + <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'))}}">
  113 + <view wx:if="{{titleType}}" class="chefText font36r">
  114 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
  115 + </view>
  116 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  117 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  118 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  119 + <text space="nbsp" class="texts">{{store.introduce}}
  120 + </text>
  121 + </view>
  122 + </block>
  123 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  124 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  125 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  126 + </block>
  127 + </block>
  128 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  129 + <block wx:for="{{store.content}}">
  130 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  131 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  132 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  133 + <video
  134 + object-fit="contain"
  135 + autoplay="{{true}}"
  136 + loop="{{true}}"
  137 + muted="{{true}}"
  138 + show-mute-btn="{{true}}"
  139 + vslide-gesture-in-fullscreen="{{true}}"
  140 + src="{{item.content}}"
  141 + ></video>
  142 + </view>
  143 + </block>
  144 + </view>
  145 + </view>
  146 + </block>
  147 + <!-- 主厨介绍 -->
  148 + <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))}}">
  149 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
112 <view wx:if="{{titleType}}" class="chefText font36r"> 150 <view wx:if="{{titleType}}" class="chefText font36r">
113 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle> 151 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
114 </view> 152 </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" />  
116 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
117 - <text space="nbsp" class="texts">{{store.introduce}}  
118 - </text> 153 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  154 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
119 </view> 155 </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>  
121 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
122 - <video  
123 - style="margin-bottom: 20rpx;"  
124 - object-fit="contain"  
125 - autoplay="{{true}}"  
126 - loop="{{true}}"  
127 - muted="{{true}}"  
128 - show-mute-btn="{{true}}"  
129 - vslide-gesture-in-fullscreen="{{true}}"  
130 - src="https://qn.colorcun.com/201_1733735811.mp4"  
131 - ></video>  
132 - <video  
133 - object-fit="contain"  
134 - autoplay="{{true}}"  
135 - loop="{{true}}"  
136 - muted="{{true}}"  
137 - show-mute-btn="{{true}}"  
138 - vslide-gesture-in-fullscreen="{{true}}"  
139 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
140 - ></video>  
141 - </view>  
142 - </block>  
143 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
144 - <view wx:if="{{titleType}}" class="chefText font36r">  
145 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle> 156 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>
  157 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  158 + <block wx:for="{{chef.content}}">
  159 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  160 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  161 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  162 + <video
  163 + object-fit="contain"
  164 + autoplay="{{true}}"
  165 + loop="{{true}}"
  166 + muted="{{true}}"
  167 + show-mute-btn="{{true}}"
  168 + vslide-gesture-in-fullscreen="{{true}}"
  169 + src="{{item.content}}"
  170 + ></video>
  171 + </view>
  172 + </block>
146 </view> 173 </view>
147 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
148 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}"/>  
149 - </block>  
150 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
151 - <video  
152 - object-fit="contain"  
153 - autoplay="{{true}}"  
154 - loop="{{true}}"  
155 - muted="{{true}}"  
156 - show-mute-btn="{{true}}"  
157 - vslide-gesture-in-fullscreen="{{true}}"  
158 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
159 - ></video>  
160 - </view>  
161 - </block>  
162 - </view>  
163 - <!-- 主厨介绍 -->  
164 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
165 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
166 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
167 - </view>  
168 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
169 - <text space="nbsp" class="texts">{{chef.introduce}}  
170 - </text>  
171 </view> 174 </view>
172 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
173 - <image src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}"/>  
174 - </block>  
175 - </view>  
176 - <!-- 特色菜品 swich为1展示 -->  
177 - <view class="introduceBox vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 175 + </block>
  176 + <!-- 特色菜品 -->
  177 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
178 <view wx:if="{{titleType}}" class="chefText font36r"> 178 <view wx:if="{{titleType}}" class="chefText font36r">
179 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 179 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
180 </view> 180 </view>
181 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 181 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
182 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/> 182 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/>
183 </block> 183 </block>
  184 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  185 + <block wx:for="{{signboard.content}}">
  186 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  187 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  188 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  189 + <video
  190 + object-fit="contain"
  191 + autoplay="{{true}}"
  192 + loop="{{true}}"
  193 + muted="{{true}}"
  194 + show-mute-btn="{{true}}"
  195 + vslide-gesture-in-fullscreen="{{true}}"
  196 + src="{{item.content}}"
  197 + ></video>
  198 + </view>
  199 + </block>
  200 + </view>
184 </view> 201 </view>
185 - <!-- 停车指引 swich为1展示 -->  
186 - <view class="introduceBox stopBox" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 202 + <!-- 停车指引 -->
  203 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
187 <view wx:if="{{titleType}}" class="chefText font36r"> 204 <view wx:if="{{titleType}}" class="chefText font36r">
188 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 205 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
189 </view> 206 </view>
190 <view class="labelBox" wx:if="{{reserve.park_info}}"> 207 <view class="labelBox" wx:if="{{reserve.park_info}}">
191 <text space="nbsp" class="texts">{{reserve.park_info}} 208 <text space="nbsp" class="texts">{{reserve.park_info}}
@@ -194,6 +211,23 @@ @@ -194,6 +211,23 @@
194 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 211 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
195 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 212 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
196 </block> 213 </block>
  214 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  215 + <block wx:for="{{reserve.content}}">
  216 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  217 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  218 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  219 + <video
  220 + object-fit="contain"
  221 + autoplay="{{true}}"
  222 + loop="{{true}}"
  223 + muted="{{true}}"
  224 + show-mute-btn="{{true}}"
  225 + vslide-gesture-in-fullscreen="{{true}}"
  226 + src="{{item.content}}"
  227 + ></video>
  228 + </view>
  229 + </block>
  230 + </view>
197 </view> 231 </view>
198 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 232 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
199 <view wx:if="{{titleType}}" class="chefText font36r"> 233 <view wx:if="{{titleType}}" class="chefText font36r">
@@ -368,6 +368,24 @@ @@ -368,6 +368,24 @@
368 font-weight: 500; 368 font-weight: 500;
369 } 369 }
370 370
  371 +.contentBox {
  372 + width: 100%;
  373 + margin-top: 20rpx;
  374 +}
  375 +
  376 +.contentBox .texts {
  377 + line-height: 40rpx;
  378 + margin: 0 20rpx;
  379 + color: #FFEFC5;
  380 + font-family: PingFang SC;
  381 + font-weight: 500;
  382 + display: block;
  383 +}
  384 +
  385 +.contentBox view,.contentBox text,.contentBox image{
  386 + margin-bottom: 20rpx !important;
  387 +}
  388 +
371 .introduceBox image { 389 .introduceBox image {
372 width: 100%; 390 width: 100%;
373 margin-bottom: 20rpx; 391 margin-bottom: 20rpx;
@@ -666,7 +684,7 @@ @@ -666,7 +684,7 @@
666 flex-wrap: wrap; 684 flex-wrap: wrap;
667 align-items: center; 685 align-items: center;
668 justify-content: center; 686 justify-content: center;
669 - margin: 20rpx; 687 + margin: 0 20rpx;
670 } 688 }
671 689
672 .videoBox video{ 690 .videoBox video{
@@ -1023,7 +1041,8 @@ @@ -1023,7 +1041,8 @@
1023 .pearlWhite .sellerTitle, 1041 .pearlWhite .sellerTitle,
1024 .pearlWhite .boxLeft .info, 1042 .pearlWhite .boxLeft .info,
1025 .pearlWhite .infoBox .infoBoxRight, 1043 .pearlWhite .infoBox .infoBoxRight,
1026 -.pearlWhite .reservationInfo .flex-11 { 1044 +.pearlWhite .reservationInfo .flex-11,
  1045 +.pearlWhite .contentBox text {
1027 color: #578C69; 1046 color: #578C69;
1028 } 1047 }
1029 1048
@@ -52,6 +52,7 @@ Page({ @@ -52,6 +52,7 @@ Page({
52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
53 _attentionAnim: {}, 53 _attentionAnim: {},
54 isPlay: '1', 54 isPlay: '1',
  55 + titleType:'',//标题样式
55 paymentStatus:'',//定金支付状态 1支付 0未支付 56 paymentStatus:'',//定金支付状态 1支付 0未支付
56 reserveData:{},//自定义图文数据 57 reserveData:{},//自定义图文数据
57 toastBool: false, //支付定金提示框 58 toastBool: false, //支付定金提示框
@@ -505,7 +506,7 @@ Page({ @@ -505,7 +506,7 @@ Page({
505 let data = res.data 506 let data = res.data
506 console.log('data', data); 507 console.log('data', data);
507 let couponList = [] 508 let couponList = []
508 - let themeColor, StyleType, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store; 509 + let themeColor, StyleType, titleType, whiteBj, home, chef, marketing, coupon, reserve, swich_phone, is_comments, signboard, store;
509 chef = util.determine(data.chef); 510 chef = util.determine(data.chef);
510 reserve = util.determine(data.reserve); 511 reserve = util.determine(data.reserve);
511 marketing = util.determine(data.marketing); 512 marketing = util.determine(data.marketing);
@@ -514,8 +515,15 @@ Page({ @@ -514,8 +515,15 @@ Page({
514 home = util.determine(data.home); 515 home = util.determine(data.home);
515 themeColor = data.lite_class || 'ultramarine'; 516 themeColor = data.lite_class || 'ultramarine';
516 StyleType = data.type; 517 StyleType = data.type;
  518 + titleType = data.title_class || '1';
517 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 519 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
518 - if (marketing) { 520 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  521 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  522 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  523 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  524 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
  525 + if (marketing) {
  526 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
519 is_comments = marketing.is_comments ? marketing.is_comments : ''; 527 is_comments = marketing.is_comments ? marketing.is_comments : '';
520 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 528 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
521 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 529 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -550,6 +558,7 @@ Page({ @@ -550,6 +558,7 @@ Page({
550 swich_phone, 558 swich_phone,
551 is_comments, 559 is_comments,
552 StyleType, 560 StyleType,
  561 + titleType,
553 themeColor, 562 themeColor,
554 } 563 }
555 console.log('获取数据', { 564 console.log('获取数据', {
@@ -579,6 +588,7 @@ Page({ @@ -579,6 +588,7 @@ Page({
579 swich_phone, 588 swich_phone,
580 is_comments, 589 is_comments,
581 StyleType, 590 StyleType,
  591 + titleType,
582 themeColor, 592 themeColor,
583 whiteBj, 593 whiteBj,
584 }) 594 })
1 { 1 {
2 - "navigationBarBackgroundColor": "#ffffff",  
3 - "navigationBarTextStyle": "white",  
4 - "navigationBarTitleText": "",  
5 - "usingComponents": {  
6 - "nav": "/components/nav/nav",  
7 - "painter":"/components/painter/painter",  
8 - "my-modal": "/components/modal/modal"  
9 - } 2 + "navigationBarBackgroundColor": "#ffffff",
  3 + "navigationBarTextStyle": "white",
  4 + "navigationBarTitleText": "",
  5 + "usingComponents": {
  6 + "nav": "/components/nav/nav",
  7 + "painter":"/components/painter/painter",
  8 + "titleStyle":"/components/titleStyle/titleStyle",
  9 + "my-modal": "/components/modal/modal"
  10 + }
10 } 11 }
@@ -125,164 +125,125 @@ @@ -125,164 +125,125 @@
125 <text space="nbsp" 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 - <!-- 品牌介绍类型 图文合并 -->  
129 - <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->  
130 - <view class="introduce" wx:if="{{(store && store.images.length && store.is_above && store.is_above=='1' && store.is_images=='1' && store.is_introduce=='1') || (store && !store.is_above && store.style=='1')}}">  
131 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
132 - <view class="imgMask">  
133 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}"/>  
134 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
135 - <view class="englishText font28r">Introduce</view>  
136 - <view class="chefText font32r">品牌介绍</view>  
137 - <view class="shopName font32r">  
138 - {{store.seller_name}}  
139 - </view>  
140 - <view class="labelBox labelBox2">  
141 - <view class="line"> 128 + <!-- 餐厅介绍 -->
  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">
  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>
  135 + <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>
  137 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  138 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  139 + </view>
  140 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  141 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  142 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  143 + </block>
  144 + </block>
  145 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  146 + <block wx:for="{{store.content}}">
  147 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  148 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  149 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  150 + <video
  151 + object-fit="contain"
  152 + autoplay="{{true}}"
  153 + loop="{{true}}"
  154 + muted="{{true}}"
  155 + show-mute-btn="{{true}}"
  156 + vslide-gesture-in-fullscreen="{{true}}"
  157 + src="{{item.content}}"
  158 + ></video>
142 </view> 159 </view>
143 - <text space="nbsp" class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
144 - </view> 160 + </block>
145 </view> 161 </view>
146 - </view> 162 + </block>
147 </view> 163 </view>
148 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
149 - <video  
150 - style="margin-bottom: 20rpx;"  
151 - object-fit="contain"  
152 - autoplay="{{true}}"  
153 - loop="{{true}}"  
154 - muted="{{true}}"  
155 - show-mute-btn="{{true}}"  
156 - vslide-gesture-in-fullscreen="{{true}}"  
157 - src="https://qn.colorcun.com/201_1733735811.mp4"  
158 - ></video>  
159 - <video  
160 - object-fit="contain"  
161 - autoplay="{{true}}"  
162 - loop="{{true}}"  
163 - muted="{{true}}"  
164 - show-mute-btn="{{true}}"  
165 - vslide-gesture-in-fullscreen="{{true}}"  
166 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
167 - ></video>  
168 - </view>  
169 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
170 - <video  
171 - object-fit="contain"  
172 - autoplay="{{true}}"  
173 - loop="{{true}}"  
174 - muted="{{true}}"  
175 - show-mute-btn="{{true}}"  
176 - vslide-gesture-in-fullscreen="{{true}}"  
177 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
178 - ></video>  
179 - </view>  
180 - </view>  
181 - <!-- 品牌介绍类型 图文分开 -->  
182 - <view class="introduce" wx:else>  
183 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
184 - <view class="imgMask">  
185 - <view class="IntroduceColor styleSeparate" wx:if="{{store && arryIndex=='0' && ((!store.is_introduce || store.is_introduce!='0') || (!store.is_images || store.is_images!='0'))}}">  
186 - <view class="englishText font28r">Introduce</view>  
187 - <view class="chefText">品牌介绍</view>  
188 - <view class="shopName styleShopName">  
189 - {{store.seller_name}}  
190 - </view>  
191 - <view class="labelBox">  
192 - <view class="line"></view>  
193 - <text space="nbsp" class="label styleLabel">{{store.introduce}}</text>  
194 - </view>  
195 - </view>  
196 - <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 + </block>
  165 + <!-- 主厨介绍 -->
  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))}}">
  167 + <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>
197 </view> 170 </view>
198 - </view>  
199 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
200 - <video  
201 - style="margin-bottom: 20rpx;"  
202 - object-fit="contain"  
203 - autoplay="{{true}}"  
204 - loop="{{true}}"  
205 - muted="{{true}}"  
206 - show-mute-btn="{{true}}"  
207 - vslide-gesture-in-fullscreen="{{true}}"  
208 - src="https://qn.colorcun.com/201_1733735811.mp4"  
209 - ></video>  
210 - <video  
211 - object-fit="contain"  
212 - autoplay="{{true}}"  
213 - loop="{{true}}"  
214 - muted="{{true}}"  
215 - show-mute-btn="{{true}}"  
216 - vslide-gesture-in-fullscreen="{{true}}"  
217 - src="https://qn.colorcun.com/WeChatVideo1.mp4"  
218 - ></video>  
219 - </view>  
220 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
221 - <video  
222 - object-fit="contain"  
223 - autoplay="{{true}}"  
224 - loop="{{true}}"  
225 - muted="{{true}}"  
226 - show-mute-btn="{{true}}"  
227 - vslide-gesture-in-fullscreen="{{true}}"  
228 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
229 - ></video>  
230 - </view>  
231 - </view>  
232 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
233 - <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->  
234 - <view class="introduce famousChefBox" wx:if="{{(chef && chef.image && chef.is_above && chef.is_above=='1' && chef.is_images=='1' && chef.is_introduce=='1') || (chef && !chef.is_above && chef.style=='1')}}">  
235 - <view class="IntroductionItems">  
236 - <view class="imgMask">  
237 - <image src="{{chef.image}}" mode="widthFix" bindtap="lookImgs" data-url="{{chef.image}}" />  
238 - <view class="IntroduceColor Introducepublic">  
239 - <view class="englishText font28r">Chief Cook</view>  
240 - <view class="chefText">知名主厨</view>  
241 - <view class="shopName" wx:if="{{chef.chef_name}}">  
242 - {{chef.chef_name}}  
243 - </view>  
244 - <view class="labelBox labelBox2">  
245 - <text space="nbsp" class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
246 - </text>  
247 - <view class="line line1">  
248 - </view> 171 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  172 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
  173 + </view>
  174 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  175 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  176 + <block wx:for="{{chef.content}}">
  177 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  178 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  179 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  180 + <video
  181 + object-fit="contain"
  182 + autoplay="{{true}}"
  183 + loop="{{true}}"
  184 + muted="{{true}}"
  185 + show-mute-btn="{{true}}"
  186 + vslide-gesture-in-fullscreen="{{true}}"
  187 + src="{{item.content}}"
  188 + ></video>
249 </view> 189 </view>
250 - </view> 190 + </block>
251 </view> 191 </view>
252 </view> 192 </view>
253 - </view>  
254 - <view class="introduce famousChefBox" wx:else>  
255 - <view class="IntroductionItems">  
256 - <view class="imgMask">  
257 - <view class="IntroduceColor styleSeparate2" wx:if="{{chef && chef.style!='0' && chef.introduce && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
258 - <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
259 - <view class="englishText font28r">Chief Cook</view>  
260 - <view class="chefText">知名主厨</view>  
261 - <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">  
262 - {{chef .chef_name}}  
263 - </view>  
264 - <view class="labelBox labelBox1">  
265 - <view class="line">  
266 - </view>  
267 - <text space="nbsp" class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}  
268 - </text>  
269 - </view>  
270 - </block> 193 + </block>
  194 + <!-- 特色菜品 -->
  195 + <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>
  199 + <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" />
  201 + </block>
  202 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  203 + <block wx:for="{{signboard.content}}">
  204 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  205 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  206 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  207 + <video
  208 + object-fit="contain"
  209 + autoplay="{{true}}"
  210 + loop="{{true}}"
  211 + muted="{{true}}"
  212 + show-mute-btn="{{true}}"
  213 + vslide-gesture-in-fullscreen="{{true}}"
  214 + src="{{item.content}}"
  215 + ></video>
271 </view> 216 </view>
272 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />  
273 - </view> 217 + </block>
274 </view> 218 </view>
275 </view> 219 </view>
276 - <!-- 菜品展示 swich为1展示 -->  
277 - <view class="introduce vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}">  
278 - <view class="IntroductionItems" wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
279 - <view class="imgMask">  
280 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}"/>  
281 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
282 - <view class="englishText font28r">Favorites</view>  
283 - <view class="chefText">菜品展示</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>
284 </view> 245 </view>
285 - </view> 246 + </block>
286 </view> 247 </view>
287 </view> 248 </view>
288 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 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'}}">
@@ -388,6 +388,32 @@ @@ -388,6 +388,32 @@
388 height: 128rpx; 388 height: 128rpx;
389 } 389 }
390 390
  391 +.contentBox {
  392 + width: 100%;
  393 + margin-top: 20rpx;
  394 +}
  395 +
  396 +.contentBox .texts {
  397 + line-height: 40rpx;
  398 + margin: 0 20rpx;
  399 + color: #FFEFC5;
  400 + font-family: PingFang SC;
  401 + font-weight: 500;
  402 + display: block;
  403 +}
  404 +
  405 +.contentBox view,.contentBox text,.contentBox image{
  406 + margin-bottom: 20rpx !important;
  407 +}
  408 +
  409 +.introduceBox image {
  410 + width: 100%;
  411 + margin-bottom: 20rpx;
  412 + display: block !important;
  413 + padding: 0 20rpx;
  414 + box-sizing: border-box;
  415 +}
  416 +
391 .styleSeparate { 417 .styleSeparate {
392 padding-left: 26rpx; 418 padding-left: 26rpx;
393 } 419 }
@@ -416,10 +442,6 @@ @@ -416,10 +442,6 @@
416 text-align: right; 442 text-align: right;
417 } 443 }
418 444
419 -.famousChefBox text {  
420 - text-align: right;  
421 -}  
422 -  
423 .famousChefBox .shopName { 445 .famousChefBox .shopName {
424 text-align: right; 446 text-align: right;
425 } 447 }
@@ -890,10 +912,15 @@ @@ -890,10 +912,15 @@
890 } 912 }
891 913
892 .pearlWhite .title, 914 .pearlWhite .title,
893 -.pearlWhite .info { 915 +.pearlWhite .info,
  916 +.pearlWhite .contentBox text{
894 color: #515151; 917 color: #515151;
895 } 918 }
896 919
  920 +.pearlWhite .chefText .texts{
  921 + color: #515151 !important;
  922 +}
  923 +
897 .businessBox { 924 .businessBox {
898 color: #515151; 925 color: #515151;
899 font-size: 24rpx; 926 font-size: 24rpx;
@@ -568,7 +568,13 @@ Page({ @@ -568,7 +568,13 @@ Page({
568 StyleType = data.type; 568 StyleType = data.type;
569 titleType = data.title_class || '1'; 569 titleType = data.title_class || '1';
570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 570 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
  571 + if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
  572 + if (chef) chef.content = (chef.is_introduce_all == '1' && chef.content) ? util.determine(chef.content) : '';
  573 + if (signboard) signboard.content = (signboard.is_introduce_all == '1' && signboard.content) ? util.determine(signboard.content) : '';
  574 + if (reserve) reserve.content = (reserve.is_introduce_all == '1' && reserve.content) ? util.determine(reserve.content) : '';
  575 + if (home) home.image = (home && home.image && (!home.id_first_image || home.id_first_image!='0')) ? home.image : '';
571 if (marketing) { 576 if (marketing) {
  577 + marketing.logo = (marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) ? marketing.logo : '';
572 is_comments = marketing.is_comments ? marketing.is_comments : ''; 578 is_comments = marketing.is_comments ? marketing.is_comments : '';
573 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : ''; 579 coupon = marketing.coupon_data ? util.determine(marketing.coupon_data) : '';
574 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : ''; 580 let info = marketing.coupon_data_comments ? util.determine(marketing.coupon_data_comments) : '';
@@ -121,84 +121,102 @@ @@ -121,84 +121,102 @@
121 <text space="nbsp" 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 - <!-- 餐厅介绍 用餐环境 -->  
125 - <view class="introduceBox">  
126 - <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 + <!-- 餐厅介绍 -->
  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="introduceBox">
  127 + <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'))}}">
  128 + <view wx:if="{{titleType}}" class="chefText font36r">
  129 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
  130 + </view>
  131 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  132 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  133 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  134 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  135 + </view>
  136 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  137 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  138 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  139 + </block>
  140 + </block>
  141 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  142 + <block wx:for="{{store.content}}">
  143 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  144 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  145 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  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="{{item.content}}"
  154 + ></video>
  155 + </view>
  156 + </block>
  157 + </view>
  158 + </block>
  159 + </view>
  160 + </block>
  161 + <!-- 主厨介绍 -->
  162 + <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))}}">
  163 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
127 <view wx:if="{{titleType}}" class="chefText font36r"> 164 <view wx:if="{{titleType}}" class="chefText font36r">
128 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle> 165 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
129 </view> 166 </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" />  
131 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
132 - <text space="nbsp" class="texts">{{store.introduce}}</text> 167 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  168 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
133 </view> 169 </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>  
156 - </block>  
157 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
158 - <view wx:if="{{titleType}}" class="chefText font36r">  
159 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="用餐环境"></titleStyle> 170 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  171 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  172 + <block wx:for="{{chef.content}}">
  173 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  174 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  175 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  176 + <video
  177 + object-fit="contain"
  178 + autoplay="{{true}}"
  179 + loop="{{true}}"
  180 + muted="{{true}}"
  181 + show-mute-btn="{{true}}"
  182 + vslide-gesture-in-fullscreen="{{true}}"
  183 + src="{{item.content}}"
  184 + ></video>
  185 + </view>
  186 + </block>
160 </view> 187 </view>
161 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
162 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />  
163 - </block>  
164 - <view wx:if="{{seller && seller.sid == '8'}}" class="videoBox">  
165 - <video  
166 - object-fit="contain"  
167 - autoplay="{{true}}"  
168 - loop="{{true}}"  
169 - muted="{{true}}"  
170 - show-mute-btn="{{true}}"  
171 - vslide-gesture-in-fullscreen="{{true}}"  
172 - src="https://qn.colorcun.com/WeChatVideo2.mp4"  
173 - ></video>  
174 - </view>  
175 - </block>  
176 - </view>  
177 - <!-- 主厨介绍 -->  
178 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
179 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
180 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
181 - </view>  
182 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
183 - <text space="nbsp" class="texts">{{chef.introduce}}</text>  
184 </view> 188 </view>
185 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
186 - <image src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />  
187 - </block>  
188 - </view>  
189 - <!-- 特色菜品 swich为1展示 -->  
190 - <view class="introduceBox vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 189 + </block>
  190 + <!-- 特色菜品 -->
  191 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
191 <view wx:if="{{titleType}}" class="chefText font36r"> 192 <view wx:if="{{titleType}}" class="chefText font36r">
192 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 193 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
193 </view> 194 </view>
194 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 195 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
195 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" /> 196 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />
196 </block> 197 </block>
  198 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  199 + <block wx:for="{{signboard.content}}">
  200 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  201 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  202 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  203 + <video
  204 + object-fit="contain"
  205 + autoplay="{{true}}"
  206 + loop="{{true}}"
  207 + muted="{{true}}"
  208 + show-mute-btn="{{true}}"
  209 + vslide-gesture-in-fullscreen="{{true}}"
  210 + src="{{item.content}}"
  211 + ></video>
  212 + </view>
  213 + </block>
  214 + </view>
197 </view> 215 </view>
198 - <!-- 停车指引 swich为1展示 -->  
199 - <view class="introduceBox stopBox" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 216 + <!-- 停车指引 -->
  217 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
200 <view wx:if="{{titleType}}" class="chefText font36r"> 218 <view wx:if="{{titleType}}" class="chefText font36r">
201 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 219 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
202 </view> 220 </view>
203 <view class="labelBox" wx:if="{{reserve.park_info}}"> 221 <view class="labelBox" wx:if="{{reserve.park_info}}">
204 <text space="nbsp" class="texts">{{reserve.park_info}}</text> 222 <text space="nbsp" class="texts">{{reserve.park_info}}</text>
@@ -206,6 +224,23 @@ @@ -206,6 +224,23 @@
206 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 224 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
207 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 225 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
208 </block> 226 </block>
  227 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  228 + <block wx:for="{{reserve.content}}">
  229 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  230 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  231 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  232 + <video
  233 + object-fit="contain"
  234 + autoplay="{{true}}"
  235 + loop="{{true}}"
  236 + muted="{{true}}"
  237 + show-mute-btn="{{true}}"
  238 + vslide-gesture-in-fullscreen="{{true}}"
  239 + src="{{item.content}}"
  240 + ></video>
  241 + </view>
  242 + </block>
  243 + </view>
209 </view> 244 </view>
210 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 245 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
211 <view wx:if="{{titleType}}" class="chefText font36r"> 246 <view wx:if="{{titleType}}" class="chefText font36r">
@@ -362,6 +362,24 @@ @@ -362,6 +362,24 @@
362 font-weight: 500; 362 font-weight: 500;
363 } 363 }
364 364
  365 +.contentBox {
  366 + width: 100%;
  367 + margin-top: 20rpx;
  368 +}
  369 +
  370 +.contentBox .texts {
  371 + line-height: 40rpx;
  372 + margin: 0 20rpx;
  373 + color: #FFEFC5;
  374 + font-family: PingFang SC;
  375 + font-weight: 500;
  376 + display: block;
  377 +}
  378 +
  379 +.contentBox view,.contentBox text,.contentBox image{
  380 + margin-bottom: 20rpx !important;
  381 +}
  382 +
365 .introduceBox image { 383 .introduceBox image {
366 width: 100%; 384 width: 100%;
367 margin-bottom: 20rpx; 385 margin-bottom: 20rpx;
@@ -659,7 +677,7 @@ @@ -659,7 +677,7 @@
659 flex-wrap: wrap; 677 flex-wrap: wrap;
660 align-items: center; 678 align-items: center;
661 justify-content: center; 679 justify-content: center;
662 - margin: 20rpx; 680 + margin: 0 20rpx;
663 } 681 }
664 682
665 .videoBox video{ 683 .videoBox video{
@@ -1016,7 +1034,8 @@ @@ -1016,7 +1034,8 @@
1016 .pearlWhite .sellerTitle, 1034 .pearlWhite .sellerTitle,
1017 .pearlWhite .boxLeft .info, 1035 .pearlWhite .boxLeft .info,
1018 .pearlWhite .infoBox .infoBoxRight, 1036 .pearlWhite .infoBox .infoBoxRight,
1019 -.pearlWhite .reservationInfo .flex-11 { 1037 +.pearlWhite .reservationInfo .flex-11,
  1038 +.pearlWhite .contentBox text {
1020 color: #578C69; 1039 color: #578C69;
1021 } 1040 }
1022 1041
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 <view class="introduceBox"> 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'))}}"> 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"> 125 <view wx:if="{{titleType}}" class="chefText font36r">
126 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle> 126 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
127 </view> 127 </view>
128 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 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> 129 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
@@ -156,31 +156,64 @@ @@ -156,31 +156,64 @@
156 </view> 156 </view>
157 </block> 157 </block>
158 <!-- 主厨介绍 --> 158 <!-- 主厨介绍 -->
159 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
160 - <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">  
161 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
162 - </view>  
163 - <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
164 - <text class="texts" space="nbsp">{{chef.introduce}}  
165 - </text> 159 + <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))}}">
  160 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
  161 + <view wx:if="{{titleType}}" class="chefText font36r">
  162 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
  163 + </view>
  164 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  165 + <text class="texts" space="nbsp">{{chef.introduce}}</text>
  166 + </view>
  167 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  168 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  169 + <block wx:for="{{chef.content}}">
  170 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  171 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  172 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  173 + <video
  174 + object-fit="contain"
  175 + autoplay="{{true}}"
  176 + loop="{{true}}"
  177 + muted="{{true}}"
  178 + show-mute-btn="{{true}}"
  179 + vslide-gesture-in-fullscreen="{{true}}"
  180 + src="{{item.content}}"
  181 + ></video>
  182 + </view>
  183 + </block>
  184 + </view>
166 </view> 185 </view>
167 - <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">  
168 - <image src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />  
169 - </block>  
170 - </view>  
171 - <!-- 特色菜品 swich为1展示 -->  
172 - <view class="introduceBox vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 186 + </block>
  187 + <!-- 特色菜品 -->
  188 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
173 <view wx:if="{{titleType}}" class="chefText font36r"> 189 <view wx:if="{{titleType}}" class="chefText font36r">
174 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="特色菜品"></titleStyle> 190 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
175 </view> 191 </view>
176 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 192 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
177 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" /> 193 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" />
178 </block> 194 </block>
  195 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  196 + <block wx:for="{{signboard.content}}">
  197 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  198 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  199 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  200 + <video
  201 + object-fit="contain"
  202 + autoplay="{{true}}"
  203 + loop="{{true}}"
  204 + muted="{{true}}"
  205 + show-mute-btn="{{true}}"
  206 + vslide-gesture-in-fullscreen="{{true}}"
  207 + src="{{item.content}}"
  208 + ></video>
  209 + </view>
  210 + </block>
  211 + </view>
179 </view> 212 </view>
180 - <!-- 停车指引 swich为1展示 -->  
181 - <view class="introduceBox stopBox" wx:if="{{reserve && reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images)}}"> 213 + <!-- 停车指引 -->
  214 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
182 <view wx:if="{{titleType}}" class="chefText font36r"> 215 <view wx:if="{{titleType}}" class="chefText font36r">
183 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="停车指引"></titleStyle> 216 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
184 </view> 217 </view>
185 <view class="labelBox" wx:if="{{reserve.park_info}}"> 218 <view class="labelBox" wx:if="{{reserve.park_info}}">
186 <text class="texts" space="nbsp">{{reserve.park_info}} 219 <text class="texts" space="nbsp">{{reserve.park_info}}
@@ -189,6 +222,23 @@ @@ -189,6 +222,23 @@
189 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 222 <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
190 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" /> 223 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
191 </block> 224 </block>
  225 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  226 + <block wx:for="{{reserve.content}}">
  227 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  228 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  229 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  230 + <video
  231 + object-fit="contain"
  232 + autoplay="{{true}}"
  233 + loop="{{true}}"
  234 + muted="{{true}}"
  235 + show-mute-btn="{{true}}"
  236 + vslide-gesture-in-fullscreen="{{true}}"
  237 + src="{{item.content}}"
  238 + ></video>
  239 + </view>
  240 + </block>
  241 + </view>
192 </view> 242 </view>
193 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 243 <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
194 <view wx:if="{{titleType}}" class="chefText font36r"> 244 <view wx:if="{{titleType}}" class="chefText font36r">
@@ -1043,7 +1043,8 @@ @@ -1043,7 +1043,8 @@
1043 .pearlWhite .sellerTitle, 1043 .pearlWhite .sellerTitle,
1044 .pearlWhite .boxLeft .info, 1044 .pearlWhite .boxLeft .info,
1045 .pearlWhite .infoBox .infoBoxRight, 1045 .pearlWhite .infoBox .infoBoxRight,
1046 -.pearlWhite .reservationInfo .flex-11 { 1046 +.pearlWhite .reservationInfo .flex-11,
  1047 +.pearlWhite .contentBox text {
1047 color: #578C69; 1048 color: #578C69;
1048 } 1049 }
1049 1050
@@ -158,15 +158,12 @@ @@ -158,15 +158,12 @@
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))}}"> 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"> 159 <view class="introduce">
160 <view wx:if="{{titleType}}" class="chefText font36r"> 160 <view wx:if="{{titleType}}" class="chefText font36r">
161 - <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle> 161 + <titleStyle titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
162 </view> 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" /> 163 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  164 + <text class="texts" space="nbsp">{{chef.introduce}}</text>
  165 + </view>
  166 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
170 <view class="labelBox" wx:if="{{chef.content && chef.content.length>0}}"> 167 <view class="labelBox" wx:if="{{chef.content && chef.content.length>0}}">
171 <block wx:for="{{chef.content}}"> 168 <block wx:for="{{chef.content}}">
172 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 169 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />