xt / xcx-book · Commits

Go to a project

Commit 698976e4e4c95d9249d269be66bee174c1a00e8c

Authored by pengye
1 parent e21bf339
build: skipped

邀请函9/6餐厅介绍修改显示条件

Inline Side-by-side
Showing 2 changed files with 22 additions and 22 deletions
@@ -144,18 +144,16 @@ @@ -144,18 +144,16 @@
144 <view class="introduce" wx:else> 144 <view class="introduce" wx:else>
145 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 145 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
146 <view class="imgMask"> 146 <view class="imgMask">
147 - <view class="IntroduceColor styleSeparate" wx:if="{{store && arryIndex=='0' && store.style!='0' && store.introduce && ((!store.is_introduce || store.is_introduce!='0') || (!store.is_images || store.is_images!='0'))}}">  
148 - <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">  
149 - <view class="englishText font28r">Introduce</view>  
150 - <view class="chefText">品牌介绍</view>  
151 - <view class="shopName styleShopName">  
152 - {{store.seller_name}}  
153 - </view>  
154 - <view class="labelBox">  
155 - <view class="line"></view>  
156 - <text class="label styleLabel">{{store.introduce}}</text>  
157 - </view>  
158 - </block> 147 + <view class="IntroduceColor styleSeparate" wx:if="{{store && arryIndex=='0' && ((!store.is_introduce || store.is_introduce!='0') || (!store.is_images || store.is_images!='0'))}}">
  148 + <view class="englishText font28r">Introduce</view>
  149 + <view class="chefText">品牌介绍</view>
  150 + <view class="shopName styleShopName">
  151 + {{store.seller_name}}
  152 + </view>
  153 + <view class="labelBox">
  154 + <view class="line"></view>
  155 + <text class="label styleLabel">{{store.introduce}}</text>
  156 + </view>
159 </view> 157 </view>
160 <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="widthFix" /> 158 <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="widthFix" />
161 </view> 159 </view>
@@ -116,17 +116,19 @@ @@ -116,17 +116,19 @@
116 </block> 116 </block>
117 </view> 117 </view>
118 <!-- 餐厅介绍 --> 118 <!-- 餐厅介绍 -->
119 - <view class="introduce" wx:if="{{store}}">  
120 - <block wx:if="{{titleType}}">  
121 - <titleStyle titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle>  
122 - </block>  
123 - <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="widthFix" />  
124 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
125 - <text class="texts font32r">{{store.introduce}}  
126 - </text> 119 + <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'))}}">
  120 + <view class="introduce" wx:if="{{store}}">
  121 + <block wx:if="{{titleType}}">
  122 + <titleStyle titleStyleType="{{titleType}}" titleText="餐厅介绍"></titleStyle>
  123 + </block>
  124 + <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="widthFix" />
  125 + <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  126 + <text class="texts font32r">{{store.introduce}}
  127 + </text>
  128 + </view>
  129 + <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" class="homeImage" mode="widthFix"></image>
127 </view> 130 </view>
128 - <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" class="homeImage" mode="widthFix"></image>  
129 - </view> 131 + </block>
130 <!-- 用餐环境 --> 132 <!-- 用餐环境 -->
131 <view class="introduce"> 133 <view class="introduce">
132 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 134 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">