xt / xcx-book · Commits

Go to a project

Commit 4f0ed36f27cb65bf3d2c0268273c99e9685c6d6c

Authored by pengye
1 parent 2320c69a

邀请函模板2-8、18-22停车指引关闭显示、旧数据显示问题处理

Inline Side-by-side
Showing 11 changed files with 76 additions and 60 deletions
@@ -1553,7 +1553,7 @@ Page({ @@ -1553,7 +1553,7 @@ Page({
1553 intel.textInfo = ''; 1553 intel.textInfo = '';
1554 intel.imgsInfo = []; 1554 intel.imgsInfo = [];
1555 intel.videoImgsInfo = []; 1555 intel.videoImgsInfo = [];
1556 - if (type == '1') { 1556 + if (type == '1' && intel.is_introduce_all == '1') {
1557 if (intel.swich_park == '1' && (intel.park_info || intel.park_info_images)) { 1557 if (intel.swich_park == '1' && (intel.park_info || intel.park_info_images)) {
1558 intel.textInfo = intel.park_info; 1558 intel.textInfo = intel.park_info;
1559 imgs = intel.park_info_images 1559 imgs = intel.park_info_images
@@ -1639,7 +1639,7 @@ Page({ @@ -1639,7 +1639,7 @@ Page({
1639 intel.textInfo = ''; 1639 intel.textInfo = '';
1640 intel.imgsInfo = []; 1640 intel.imgsInfo = [];
1641 intel.videoImgsInfo = []; 1641 intel.videoImgsInfo = [];
1642 - if (type == '1') { 1642 + if (type == '1' && intel.is_introduce_all == '1') {
1643 if (intel.swich_park == '1' && (intel.park_info || intel.park_info_images)) { 1643 if (intel.swich_park == '1' && (intel.park_info || intel.park_info_images)) {
1644 intel.textInfo = intel.park_info; 1644 intel.textInfo = intel.park_info;
1645 imgs = intel.park_info_images 1645 imgs = intel.park_info_images
@@ -414,11 +414,13 @@ @@ -414,11 +414,13 @@
414 <view class="titleLine"></view> 414 <view class="titleLine"></view>
415 <view class="font36r">停车指引</view> 415 <view class="font36r">停车指引</view>
416 </view> 416 </view>
417 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
418 - <text class="texts" space="nbsp">{{reserve.park_info}}</text>  
419 - </view>  
420 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
421 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}" mode="widthFix" /> 417 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  418 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  419 + <text class="texts" space="nbsp">{{reserve.park_info}}</text>
  420 + </view>
  421 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  422 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}" mode="widthFix" />
  423 + </block>
422 </block> 424 </block>
423 <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 425 <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}">
424 <block wx:for="{{reserve.content}}"> 426 <block wx:for="{{reserve.content}}">
@@ -1642,7 +1642,7 @@ Page({ @@ -1642,7 +1642,7 @@ Page({
1642 intel.textInfo = ''; 1642 intel.textInfo = '';
1643 intel.imgsInfo = []; 1643 intel.imgsInfo = [];
1644 intel.videoImgsInfo = []; 1644 intel.videoImgsInfo = [];
1645 - if (type == '1') { 1645 + if (type == '1' && intel.is_introduce_all == '1') {
1646 if (intel.swich_park == '1' && (intel.park_info || intel.park_info_images)) { 1646 if (intel.swich_park == '1' && (intel.park_info || intel.park_info_images)) {
1647 intel.textInfo = intel.park_info; 1647 intel.textInfo = intel.park_info;
1648 imgs = intel.park_info_images 1648 imgs = intel.park_info_images
@@ -361,11 +361,13 @@ @@ -361,11 +361,13 @@
361 </block> 361 </block>
362 <block wx:if="{{modalType == '7'}}"> 362 <block wx:if="{{modalType == '7'}}">
363 <view class="publicModule" slot="modalContent" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}"> 363 <view class="publicModule" slot="modalContent" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}">
364 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
365 - <text class="texts font28r" space="nbsp">{{reserve.park_info}}</text>  
366 - </view>  
367 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
368 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" /> 364 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  365 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  366 + <text class="texts font28r" space="nbsp">{{reserve.park_info}}</text>
  367 + </view>
  368 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  369 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
  370 + </block>
369 </block> 371 </block>
370 <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 372 <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}">
371 <block wx:for="{{reserve.content}}"> 373 <block wx:for="{{reserve.content}}">
@@ -248,17 +248,19 @@ @@ -248,17 +248,19 @@
248 </view> 248 </view>
249 </view> 249 </view>
250 <!-- 停车指引 --> 250 <!-- 停车指引 -->
251 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}"> 251 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.is_introduce_all=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
252 <view wx:if="{{titleType}}" class="chefText font36r"> 252 <view wx:if="{{titleType}}" class="chefText font36r">
253 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle> 253 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
254 </view> 254 </view>
255 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
256 - <text space="nbsp" class="texts">{{reserve.park_info}}  
257 - </text>  
258 - </view>  
259 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
260 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>  
261 - </block> 255 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  256 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  257 + <text space="nbsp" class="texts">{{reserve.park_info}}
  258 + </text>
  259 + </view>
  260 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  261 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  262 + </block>
  263 + </block>
262 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 264 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
263 <block wx:for="{{reserve.content}}"> 265 <block wx:for="{{reserve.content}}">
264 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 266 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
@@ -253,17 +253,19 @@ @@ -253,17 +253,19 @@
253 </view> 253 </view>
254 </view> 254 </view>
255 <!-- 停车指引 --> 255 <!-- 停车指引 -->
256 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}"> 256 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.is_introduce_all=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
257 <view wx:if="{{titleType}}" class="chefText font36r"> 257 <view wx:if="{{titleType}}" class="chefText font36r">
258 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle> 258 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
259 </view> 259 </view>
260 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
261 - <text space="nbsp" class="texts">{{reserve.park_info}}  
262 - </text>  
263 - </view>  
264 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
265 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>  
266 - </block> 260 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  261 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  262 + <text space="nbsp" class="texts">{{reserve.park_info}}
  263 + </text>
  264 + </view>
  265 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  266 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  267 + </block>
  268 + </block>
267 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 269 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
268 <block wx:for="{{reserve.content}}"> 270 <block wx:for="{{reserve.content}}">
269 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 271 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
@@ -236,17 +236,19 @@ @@ -236,17 +236,19 @@
236 </view> 236 </view>
237 </view> 237 </view>
238 <!-- 停车指引 --> 238 <!-- 停车指引 -->
239 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}"> 239 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.is_introduce_all=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
240 <view wx:if="{{titleType}}" class="chefText font36r"> 240 <view wx:if="{{titleType}}" class="chefText font36r">
241 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle> 241 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
242 </view> 242 </view>
243 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
244 - <text space="nbsp" class="texts">{{reserve.park_info}}  
245 - </text>  
246 - </view>  
247 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
248 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>  
249 - </block> 243 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  244 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  245 + <text space="nbsp" class="texts">{{reserve.park_info}}
  246 + </text>
  247 + </view>
  248 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  249 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  250 + </block>
  251 + </block>
250 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 252 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
251 <block wx:for="{{reserve.content}}"> 253 <block wx:for="{{reserve.content}}">
252 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 254 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
@@ -235,17 +235,19 @@ @@ -235,17 +235,19 @@
235 </view> 235 </view>
236 </view> 236 </view>
237 <!-- 停车指引 --> 237 <!-- 停车指引 -->
238 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}"> 238 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.is_introduce_all=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
239 <view wx:if="{{titleType}}" class="chefText font36r"> 239 <view wx:if="{{titleType}}" class="chefText font36r">
240 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle> 240 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
241 </view> 241 </view>
242 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
243 - <text space="nbsp" class="texts">{{reserve.park_info}}  
244 - </text>  
245 - </view>  
246 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
247 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>  
248 - </block> 242 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  243 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  244 + <text space="nbsp" class="texts">{{reserve.park_info}}
  245 + </text>
  246 + </view>
  247 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  248 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  249 + </block>
  250 + </block>
249 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 251 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
250 <block wx:for="{{reserve.content}}"> 252 <block wx:for="{{reserve.content}}">
251 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 253 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
@@ -249,16 +249,18 @@ @@ -249,16 +249,18 @@
249 </view> 249 </view>
250 </view> 250 </view>
251 <!-- 停车指引 --> 251 <!-- 停车指引 -->
252 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}"> 252 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.is_introduce_all=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
253 <view wx:if="{{titleType}}" class="chefText font36r"> 253 <view wx:if="{{titleType}}" class="chefText font36r">
254 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle> 254 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
255 </view> 255 </view>
256 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
257 - <text space="nbsp" class="texts">{{reserve.park_info}}</text>  
258 - </view>  
259 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
260 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>  
261 - </block> 256 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  257 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  258 + <text space="nbsp" class="texts">{{reserve.park_info}}</text>
  259 + </view>
  260 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  261 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  262 + </block>
  263 + </block>
262 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 264 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
263 <block wx:for="{{reserve.content}}"> 265 <block wx:for="{{reserve.content}}">
264 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 266 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
@@ -246,17 +246,19 @@ @@ -246,17 +246,19 @@
246 </view> 246 </view>
247 </view> 247 </view>
248 <!-- 停车指引 --> 248 <!-- 停车指引 -->
249 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}"> 249 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.is_introduce_all=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
250 <view wx:if="{{titleType}}" class="chefText font36r"> 250 <view wx:if="{{titleType}}" class="chefText font36r">
251 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle> 251 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
252 </view> 252 </view>
253 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
254 - <text class="texts" space="nbsp">{{reserve.park_info}}  
255 - </text>  
256 - </view>  
257 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
258 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />  
259 - </block> 253 + <block wx:if="{{!reserve.content || reserve.content.length == '0'}}">
  254 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  255 + <text class="texts" space="nbsp">{{reserve.park_info}}
  256 + </text>
  257 + </view>
  258 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  259 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
  260 + </block>
  261 + </block>
260 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}"> 262 <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
261 <block wx:for="{{reserve.content}}"> 263 <block wx:for="{{reserve.content}}">
262 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" /> 264 <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />