xt / xcx-book · Commits

Go to a project

Commit f28c6d9fada61599a4afd3b7d34350d38ad5460b

Authored by pengye
1 parent 968a3a3b
build: skipped

餐厅信息和主厨信息判断是否展示

Inline Side-by-side
Showing 12 changed files with 179 additions and 466 deletions
... ... @@ -94,90 +94,39 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
<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')}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText font32r">品牌介绍</view>
<view class="shopName font32r">
{{store.seller_name}}
</view>
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
<!-- 餐厅介绍图文分开 -->
<view class="introduce" wx:if="{{store}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<view class="chefText font36r">餐厅介绍</view>
<view class="labelBox">
<text class="texts">{{store.introduce}}
</text>
</view>
</view>
<block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
<view class="chefText font36r">餐厅环境</view>
<block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="aspectFill" />
</block>
<view class="lines"></view>
</block>
</view>
</view>
<!-- 品牌介绍类型 图文分开 -->
<view class="introduce" wx:else>
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store.seller_name}}
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
<!-- 主厨介绍图文分开 -->
<view class="introduce famousChefBox" wx:if="{{chef}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="chefText font36r">主厨介绍</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
<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')}}">
<view class="IntroductionItems">
<view class="imgMask">
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
</view>
</view>
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
</view>
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</block>
<view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
</view>
</view>
<!-- 菜品展示 swich为1展示 -->
... ...
... ... @@ -158,6 +158,10 @@
background-color: #DBDBDB;
}
.mtnone {
margin-top: 0;
}
.famousChefBox .labelBox {
border-bottom: none;
}
... ...
... ... @@ -102,90 +102,39 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
<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')}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText font32r">品牌介绍</view>
<view class="shopName font32r">
{{store.seller_name}}
</view>
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
<!-- 餐厅介绍图文分开 -->
<view class="introduce" wx:if="{{store}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<view class="chefText font36r">餐厅介绍</view>
<view class="labelBox">
<text class="texts">{{store.introduce}}
</text>
</view>
</view>
<block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
<view class="chefText font36r">餐厅环境</view>
<block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="aspectFill" />
</block>
<view class="lines"></view>
</block>
</view>
</view>
<!-- 品牌介绍类型 图文分开 -->
<view class="introduce" wx:else>
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store.seller_name}}
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
<!-- 主厨介绍图文分开 -->
<view class="introduce famousChefBox" wx:if="{{chef}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="chefText font36r">主厨介绍</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
<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')}}">
<view class="IntroductionItems">
<view class="imgMask">
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
</view>
</view>
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
</view>
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</block>
<view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
</view>
</view>
<!-- 菜品展示 swich为1展示 -->
... ...
... ... @@ -199,6 +199,10 @@
background-color: #DBDBDB;
}
.mtnone {
margin-top: 0;
}
.famousChefBox .labelBox {
border-bottom: none;
}
... ...
... ... @@ -82,92 +82,39 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
<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')}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText font32r">品牌介绍</view>
<view class="shopName font32r">
{{store.seller_name}}
</view>
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
<!-- 餐厅介绍图文分开 -->
<block wx:if="{{store}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<view class="text font36r rubric texts">餐厅介绍</view>
<view class="labelBox font24r">
{{store.introduce}}
</view>
</view>
<block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
<view class="text font36r rubric">餐厅环境</view>
<block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="aspectFill" />
</block>
<view class="lines"></view>
</block>
</view>
</view>
<!-- 品牌介绍类型 图文分开 -->
<view class="introduce" wx:else>
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store.seller_name}}
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
</block>
<!-- 主厨介绍图文分开 -->
<block wx:if="{{chef}}">
<view class="imgMask">
<view class="IntroduceColor noneBor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="text font36r rubric texts">主厨介绍</view>
<view class="labelBox font24r" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
{{chef.introduce}}
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
<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')}}">
<view class="IntroductionItems">
<view class="imgMask">
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
</view>
</view>
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
</view>
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</block>
<view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
</view>
</view>
</block>
<block wx:if="{{signboard && signboard.swich=='1'}}">
<view class="imgMask">
<view class="IntroduceColor noneBor">
... ...
... ... @@ -171,6 +171,10 @@
background-color: #DBDBDB;
}
.mtnone {
margin-top: 0;
}
.imgMask .IntroduceColor {
border-bottom: 2rpx solid #DBDBDB;
margin: 0 20rpx 20rpx 20rpx;
... ...
... ... @@ -77,92 +77,39 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
<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')}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText font32r">品牌介绍</view>
<view class="shopName font32r">
{{store.seller_name}}
</view>
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
<!-- 餐厅介绍图文分开 -->
<block wx:if="{{store}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<view class="text font36r rubric texts">餐厅介绍</view>
<view class="labelBox font24r">
{{store.introduce}}
</view>
</view>
<block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
<view class="text font36r rubric">餐厅环境</view>
<block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="aspectFill" />
</block>
<view class="lines"></view>
</block>
</view>
</view>
<!-- 品牌介绍类型 图文分开 -->
<view class="introduce" wx:else>
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store.seller_name}}
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
</block>
<!-- 主厨介绍图文分开 -->
<block wx:if="{{chef}}">
<view class="imgMask">
<view class="IntroduceColor noneBor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="text font36r rubric texts">主厨介绍</view>
<view class="labelBox font24r" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
{{chef.introduce}}
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
<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')}}">
<view class="IntroductionItems">
<view class="imgMask">
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
</view>
</view>
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
</view>
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</block>
<view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
</view>
</view>
</block>
<block wx:if="{{signboard && signboard.swich=='1'}}">
<view class="imgMask">
<view class="IntroduceColor noneBor">
... ...
... ... @@ -170,6 +170,9 @@
background-color: #DBDBDB;
}
.mtnone {
margin-top: 0;
}
.imgMask .IntroduceColor {
border-bottom: 2rpx solid #DBDBDB;
... ...
... ... @@ -96,90 +96,39 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
<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')}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText font32r">品牌介绍</view>
<view class="shopName font32r">
{{store.seller_name}}
</view>
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
<!-- 餐厅介绍图文分开 -->
<view class="introduce" wx:if="{{store}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<view class="chefText font36r">餐厅介绍</view>
<view class="labelBox">
<text class="texts">{{store.introduce}}
</text>
</view>
</view>
<block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
<view class="chefText texts1 font36r">餐厅环境</view>
<block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="aspectFill" />
</block>
<view class="lines"></view>
</block>
</view>
</view>
<!-- 品牌介绍类型 图文分开 -->
<view class="introduce" wx:else>
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store.seller_name}}
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
<!-- 主厨介绍图文分开 -->
<view class="introduce famousChefBox" wx:if="{{chef}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="chefText font36r">主厨介绍</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
<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')}}">
<view class="IntroductionItems">
<view class="imgMask">
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
</view>
</view>
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
</view>
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</block>
<view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
</view>
</view>
<!-- 菜品展示 swich为1展示 -->
... ...
... ... @@ -162,6 +162,10 @@
background-color: #DBDBDB;
}
.mtnone {
margin-top: 0;
}
.IntroduceColor {
margin: 0 20rpx;
}
... ...
... ... @@ -83,90 +83,39 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
<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')}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText font32r">品牌介绍</view>
<view class="shopName font32r">
{{store.seller_name}}
</view>
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
<!-- 餐厅介绍图文分开 -->
<view class="introduce" wx:if="{{store}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
<view class="chefText font36r">餐厅介绍</view>
<view class="labelBox">
<text class="texts">{{store.introduce}}
</text>
</view>
</view>
<block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
<view class="chefText texts1 font36r">餐厅环境</view>
<block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<image src="{{item}}" mode="aspectFill" />
</block>
<view class="lines"></view>
</block>
</view>
</view>
<!-- 品牌介绍类型 图文分开 -->
<view class="introduce" wx:else>
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">
<view class="englishText font28r">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store.seller_name}}
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
<!-- 主厨介绍图文分开 -->
<view class="introduce famousChefBox" wx:if="{{chef}}">
<view class="imgMask">
<view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="chefText font36r">主厨介绍</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
</view>
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->
<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')}}">
<view class="IntroductionItems">
<view class="imgMask">
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
</view>
</view>
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<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'))}}">
<block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName" wx:if="{{chef.chef_name}}">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
</view>
<text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}
</text>
</view>
</block>
</view>
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</block>
<view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
</view>
</view>
<!-- 菜品展示 swich为1展示 -->
... ...
... ... @@ -185,6 +185,10 @@
background-color: #DBDBDB;
}
.mtnone {
margin-top: 0;
}
.IntroduceColor {
margin: 0 20rpx;
}
... ...