xt / xcx-book · Commits

Go to a project

Commit eaa07ba543afc7641a7edf089cce532d56b8d1a9

Authored by pengye
1 parent 7d343be4
build: skipped

邀请函新模板6

Inline Side-by-side
Showing 2 changed files with 49 additions and 50 deletions
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 </view> 56 </view>
57 </view> 57 </view>
58 </block> 58 </block>
59 - <view class="welcome font32r">  
60 - {{home.slogan}} 59 + <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r">
  60 + {{marketing.wecomle}}
61 </view> 61 </view>
62 <view class="positioning" bindtap="looklocation"> 62 <view class="positioning" bindtap="looklocation">
63 <image src="https://qn.colorcun.com/address.png" mode="" /> 63 <image src="https://qn.colorcun.com/address.png" mode="" />
@@ -102,15 +102,9 @@ @@ -102,15 +102,9 @@
102 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 102 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
103 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 103 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
104 </view> 104 </view>
105 - <!-- 品牌介绍类型store.style 0只有图 1图文合并 2图文分开 -->  
106 - <view class="introduce" wx:if="{{store && store.style=='0'}}">  
107 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
108 - <view class="imgMask">  
109 - <image src="{{item}}" mode="aspectFill" />  
110 - </view>  
111 - </view>  
112 - </view>  
113 - <view class="introduce" wx:if="{{store && store.style=='1'}}"> 105 + <!-- 品牌介绍类型 图文合并 -->
  106 + <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
  107 + <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')}}">
114 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 108 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
115 <view class="imgMask"> 109 <view class="imgMask">
116 <image src="{{item}}" mode="aspectFill" /> 110 <image src="{{item}}" mode="aspectFill" />
@@ -123,46 +117,47 @@ @@ -123,46 +117,47 @@
123 <view class="labelBox labelBox2"> 117 <view class="labelBox labelBox2">
124 <view class="line"> 118 <view class="line">
125 </view> 119 </view>
126 - <text class="label">{{store.introduce}}  
127 - </text> 120 + <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
128 </view> 121 </view>
129 </view> 122 </view>
130 </view> 123 </view>
131 </view> 124 </view>
132 </view> 125 </view>
133 - <view class="introduce" wx:if="{{store && store.style=='2'}}"> 126 + <!-- 品牌介绍类型 图文分开 -->
  127 + <view class="introduce" wx:else>
134 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 128 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
135 <view class="imgMask"> 129 <view class="imgMask">
136 - <view class="IntroduceColor styleSeparate" wx:if="{{arryIndex=='0'}}">  
137 - <view class="englishText font28r">Introduce</view>  
138 - <view class="chefText">品牌介绍</view>  
139 - <view class="shopName styleShopName">  
140 - {{store.seller_name}}  
141 - </view>  
142 - <view class="labelBox">  
143 - <view class="line"> 130 + <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'))}}">
  131 + <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
  132 + <view class="englishText font28r">Introduce</view>
  133 + <view class="chefText">品牌介绍</view>
  134 + <view class="shopName styleShopName">
  135 + {{store.seller_name}}
144 </view> 136 </view>
145 - <text class="label styleLabel">{{store.introduce}}  
146 - </text>  
147 - </view> 137 + <view class="labelBox">
  138 + <view class="line"></view>
  139 + <text class="label styleLabel">{{store.introduce}}</text>
  140 + </view>
  141 + </block>
148 </view> 142 </view>
149 - <image src="{{item}}" mode="aspectFill" /> 143 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
150 </view> 144 </view>
151 </view> 145 </view>
152 </view> 146 </view>
153 <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 --> 147 <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
154 - <view class="introduce famousChefBox" wx:if="{{chef && chef.style=='1'}}"> 148 + <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
  149 + <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')}}">
155 <view class="IntroductionItems"> 150 <view class="IntroductionItems">
156 <view class="imgMask"> 151 <view class="imgMask">
157 - <image wx:if="{{chef.image}}" src="{{chef.image}}" mode="aspectFill" /> 152 + <image src="{{chef.image}}" mode="aspectFill" />
158 <view class="IntroduceColor Introducepublic"> 153 <view class="IntroduceColor Introducepublic">
159 <view class="englishText font28r">Chief Cook</view> 154 <view class="englishText font28r">Chief Cook</view>
160 <view class="chefText">知名主厨</view> 155 <view class="chefText">知名主厨</view>
161 - <view class="shopName"> 156 + <view class="shopName" wx:if="{{chef.chef_name}}">
162 {{chef.chef_name}} 157 {{chef.chef_name}}
163 </view> 158 </view>
164 <view class="labelBox labelBox2"> 159 <view class="labelBox labelBox2">
165 - <text class="label">{{chef.introduce}} 160 + <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
166 </text> 161 </text>
167 <view class="line line1"> 162 <view class="line line1">
168 </view> 163 </view>
@@ -171,23 +166,25 @@ @@ -171,23 +166,25 @@
171 </view> 166 </view>
172 </view> 167 </view>
173 </view> 168 </view>
174 - <view class="introduce famousChefBox" wx:if="{{chef && chef.style=='2'}}"> 169 + <view class="introduce famousChefBox" wx:else>
175 <view class="IntroductionItems"> 170 <view class="IntroductionItems">
176 <view class="imgMask"> 171 <view class="imgMask">
177 - <view class="IntroduceColor styleSeparate2">  
178 - <view class="englishText font28r">Chief Cook</view>  
179 - <view class="chefText">知名主厨</view>  
180 - <view class="shopName styleShopName">  
181 - {{chef .chef_name}}  
182 - </view>  
183 - <view class="labelBox labelBox1">  
184 - <view class="line"> 172 + <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'))}}">
  173 + <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  174 + <view class="englishText font28r">Chief Cook</view>
  175 + <view class="chefText">知名主厨</view>
  176 + <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
  177 + {{chef .chef_name}}
185 </view> 178 </view>
186 - <text class="label styleLabel">{{chef .introduce}}  
187 - </text>  
188 - </view> 179 + <view class="labelBox labelBox1">
  180 + <view class="line">
  181 + </view>
  182 + <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
  183 + </text>
  184 + </view>
  185 + </block>
189 </view> 186 </view>
190 - <image src="{{chef.image}}" mode="aspectFill" /> 187 + <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
191 </view> 188 </view>
192 </view> 189 </view>
193 </view> 190 </view>
@@ -249,7 +246,7 @@ @@ -249,7 +246,7 @@
249 <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 246 <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
250 点击了解更多会员优惠政策 247 点击了解更多会员优惠政策
251 </view> 248 </view>
252 - <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="heightFix" /> 249 + <image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="aspectFill" />
253 </view> 250 </view>
254 <view class="more" wx:if="{{showMoreTip}}"> 251 <view class="more" wx:if="{{showMoreTip}}">
255 <view class="moreText">滑动查看更多</view> 252 <view class="moreText">滑动查看更多</view>
@@ -246,6 +246,7 @@ @@ -246,6 +246,7 @@
246 display: flex; 246 display: flex;
247 margin-bottom: 30rpx; 247 margin-bottom: 30rpx;
248 position: relative; 248 position: relative;
  249 + height: 90%;
249 } 250 }
250 251
251 .labelBox .label { 252 .labelBox .label {
@@ -268,7 +269,7 @@ @@ -268,7 +269,7 @@
268 } 269 }
269 270
270 .labelBox2 .label { 271 .labelBox2 .label {
271 - height: 90%; 272 + max-height: 90%;
272 overflow-y: scroll; 273 overflow-y: scroll;
273 margin-right: 20rpx; 274 margin-right: 20rpx;
274 } 275 }
@@ -280,7 +281,7 @@ @@ -280,7 +281,7 @@
280 .labelBox .line { 281 .labelBox .line {
281 position: absolute; 282 position: absolute;
282 width: 4rpx; 283 width: 4rpx;
283 - height: 90%; 284 + height: 100%;
284 top: 3%; 285 top: 3%;
285 background: linear-gradient(270deg, #eeae74 20%, #0c0f0e 124%); 286 background: linear-gradient(270deg, #eeae74 20%, #0c0f0e 124%);
286 } 287 }
@@ -298,7 +299,6 @@ @@ -298,7 +299,6 @@
298 display: block; 299 display: block;
299 } 300 }
300 301
301 -  
302 .famousChefBox { 302 .famousChefBox {
303 position: relative; 303 position: relative;
304 } 304 }
@@ -315,7 +315,7 @@ @@ -315,7 +315,7 @@
315 height: 100%; 315 height: 100%;
316 background: linear-gradient(180deg, #0c0f0e 0%, #0c0f0e4d 100%); 316 background: linear-gradient(180deg, #0c0f0e 0%, #0c0f0e4d 100%);
317 padding: 0 30rpx; 317 padding: 0 30rpx;
318 - width: 45%; 318 + width: 40%;
319 } 319 }
320 320
321 321
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
324 right: 0; 324 right: 0;
325 color: #B39437; 325 color: #B39437;
326 padding: 0 20rpx 0 0; 326 padding: 0 20rpx 0 0;
327 - width: 50%; 327 + width: 40%;
328 height: 100%; 328 height: 100%;
329 box-sizing: border-box; 329 box-sizing: border-box;
330 } 330 }
@@ -435,7 +435,7 @@ @@ -435,7 +435,7 @@
435 } 435 }
436 436
437 .preferential { 437 .preferential {
438 - margin: 16rpx 40rpx 20rpx 40rpx; 438 + margin: 16rpx 40rpx 0 40rpx;
439 } 439 }
440 440
441 .preferentialItems { 441 .preferentialItems {
@@ -511,6 +511,7 @@ @@ -511,6 +511,7 @@
511 511
512 .vips image { 512 .vips image {
513 height: 300rpx; 513 height: 300rpx;
  514 + margin-top: 20rpx;
514 } 515 }
515 516
516 .vips { 517 .vips {
@@ -519,6 +520,7 @@ @@ -519,6 +520,7 @@
519 justify-content: center; 520 justify-content: center;
520 align-items: center; 521 align-items: center;
521 padding-bottom: 180rpx; 522 padding-bottom: 180rpx;
  523 + margin-top: 20rpx;
522 } 524 }
523 525
524 .vips .text { 526 .vips .text {