xt / xcx-book · Commits

Go to a project

Commit 010f85adcbf6ebfd4167830e90fbaf00225f83fb

Authored by “pengye”
1 parent 8ef0a498
build: skipped

邀请函店铺介绍文字显示了2个问题处理

Inline Side-by-side
Showing 12 changed files with 12 additions and 12 deletions
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <view class="icons font20r" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 40 <view class="icons font20r" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
41 <view class="icons font20r" wx:if="{{item.desc=='0'}}">无门槛</view> 41 <view class="icons font20r" wx:if="{{item.desc=='0'}}">无门槛</view>
42 </view> 42 </view>
43 - <view class="itemRight"> 43 + <view class="itemRight" data-activityId="{{item.activity_id}}">
44 <view class="anameText"> 44 <view class="anameText">
45 <text class="font40r">{{item.aname}}</text> 45 <text class="font40r">{{item.aname}}</text>
46 <view class="discountText1 font20r">{{item.accumulationShow == '1' ? '可' : '不可'}}叠加</view> 46 <view class="discountText1 font20r">{{item.accumulationShow == '1' ? '可' : '不可'}}叠加</view>
@@ -356,7 +356,7 @@ @@ -356,7 +356,7 @@
356 </view> 356 </view>
357 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 357 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
358 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 358 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
359 - <view class="labelBox" wx:if="{{store.introduce && store.is_introduce == '1'}}"> 359 + <view class="labelBox" wx:if="{{!store.content && store.introduce && store.is_introduce == '1'}}">
360 <text space="nbsp" class="texts font28r">{{store.introduce}}</text> 360 <text space="nbsp" class="texts font28r">{{store.introduce}}</text>
361 </view> 361 </view>
362 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 362 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 <block wx:if="{{modalType == '5'}}"> 307 <block wx:if="{{modalType == '5'}}">
308 <view class="publicModule" slot="modalContent" wx:if="{{store.textInfo || store.videoImgsInfo.length>0}}"> 308 <view class="publicModule" slot="modalContent" wx:if="{{store.textInfo || store.videoImgsInfo.length>0}}">
309 <block wx:if="{{bookType == '1'}}"> 309 <block wx:if="{{bookType == '1'}}">
310 - <view class="labelBox" wx:if="{{store.introduce && store.is_introduce == '1'}}"> 310 + <view class="labelBox" wx:if="{{!store.content && store.introduce && store.is_introduce == '1'}}">
311 <text space="nbsp" class="texts font28r">{{store.introduce}}</text> 311 <text space="nbsp" class="texts font28r">{{store.introduce}}</text>
312 </view> 312 </view>
313 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 313 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 </view> 156 </view>
157 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 157 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
158 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 158 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
159 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 159 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
160 <text space="nbsp" class="texts">{{store.introduce}} 160 <text space="nbsp" class="texts">{{store.introduce}}
161 </text> 161 </text>
162 </view> 162 </view>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 </view> 162 </view>
163 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 163 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
164 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 164 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
165 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 165 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
166 <text space="nbsp" class="texts">{{store.introduce}}</text> 166 <text space="nbsp" class="texts">{{store.introduce}}</text>
167 </view> 167 </view>
168 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 168 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
145 </view> 145 </view>
146 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 146 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
147 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 147 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
148 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 148 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
149 <text space="nbsp" class="texts">{{store.introduce}}</text> 149 <text space="nbsp" class="texts">{{store.introduce}}</text>
150 </view> 150 </view>
151 </block> 151 </block>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 </view> 143 </view>
144 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 144 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
145 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 145 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
146 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 146 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
147 <text space="nbsp" class="texts">{{store.introduce}} 147 <text space="nbsp" class="texts">{{store.introduce}}
148 </text> 148 </text>
149 </view> 149 </view>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 <view class="chefText font32r">品牌介绍</view> 162 <view class="chefText font32r">品牌介绍</view>
163 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 163 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
164 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 164 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
165 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 165 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
166 <text space="nbsp" class="texts">{{store.introduce}}</text> 166 <text space="nbsp" class="texts">{{store.introduce}}</text>
167 </view> 167 </view>
168 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 168 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 </view> 158 </view>
159 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 159 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
160 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 160 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
161 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 161 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
162 <text space="nbsp" class="texts">{{store.introduce}}</text> 162 <text space="nbsp" class="texts">{{store.introduce}}</text>
163 </view> 163 </view>
164 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 164 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 </view> 155 </view>
156 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 156 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
157 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 157 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
158 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 158 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
159 <text space="nbsp" class="texts">{{store.introduce}}</text> 159 <text space="nbsp" class="texts">{{store.introduce}}</text>
160 </view> 160 </view>
161 </block> 161 </block>
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 <titleStyle wx:if="{{titleType}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle> 155 <titleStyle wx:if="{{titleType}}" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
156 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 156 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
157 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 157 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
158 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 158 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
159 <text space="nbsp" class="texts font32r">{{store.introduce}}</text> 159 <text space="nbsp" class="texts font32r">{{store.introduce}}</text>
160 </view> 160 </view>
161 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 161 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 </view> 77 </view>
78 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 78 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
79 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 79 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
80 - <view class="labelBox" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}"> 80 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
81 <text space="nbsp" class="texts">{{store.introduce}}</text> 81 <text space="nbsp" class="texts">{{store.introduce}}</text>
82 </view> 82 </view>
83 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}"> 83 <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">