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 @@
</view>
</view>
</block>
<view class="welcome font32r">
{{home.slogan}}
<view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r">
{{marketing.wecomle}}
</view>
<view class="positioning" bindtap="looklocation">
<image src="https://qn.colorcun.com/address.png" mode="" />
... ... @@ -102,15 +102,9 @@
<text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
<image src="https://qn.colorcun.com/evaluate.png" mode="" />
</view>
<!-- 品牌介绍类型store.style 0只有图 1图文合并 2图文分开 -->
<view class="introduce" wx:if="{{store && store.style=='0'}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<view class="introduce" wx:if="{{store && store.style=='1'}}">
<!-- 品牌介绍类型 图文合并 -->
<!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && 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" />
... ... @@ -123,46 +117,47 @@
<view class="labelBox labelBox2">
<view class="line">
</view>
<text class="label">{{store.introduce}}
</text>
<text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>
</view>
</view>
</view>
</view>
</view>
<view class="introduce" wx:if="{{store && store.style=='2'}}">
<!-- 品牌介绍类型 图文分开 -->
<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="{{arryIndex=='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 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>
<text class="label styleLabel">{{store.introduce}}
</text>
</view>
<view class="labelBox">
<view class="line"></view>
<text class="label styleLabel">{{store.introduce}}</text>
</view>
</block>
</view>
<image src="{{item}}" mode="aspectFill" />
<image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
</view>
</view>
</view>
<!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->
<view class="introduce famousChefBox" wx:if="{{chef && chef.style=='1'}}">
<!-- 知名主厨类型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">
<image wx:if="{{chef.image}}" src="{{chef.image}}" mode="aspectFill" />
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName">
<view class="shopName" wx:if="{{chef.chef_name}}">
{{chef.chef_name}}
</view>
<view class="labelBox labelBox2">
<text class="label">{{chef.introduce}}
<text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}
</text>
<view class="line line1">
</view>
... ... @@ -171,23 +166,25 @@
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:if="{{chef && chef.style=='2'}}">
<view class="introduce famousChefBox" wx:else>
<view class="IntroductionItems">
<view class="imgMask">
<view class="IntroduceColor styleSeparate2">
<view class="englishText font28r">Chief Cook</view>
<view class="chefText">知名主厨</view>
<view class="shopName styleShopName">
{{chef .chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="line">
<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>
<text class="label styleLabel">{{chef .introduce}}
</text>
</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 src="{{chef.image}}" mode="aspectFill" />
<image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />
</view>
</view>
</view>
... ... @@ -249,7 +246,7 @@
<view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="heightFix" />
<image wx:if="{{marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')}}" src="{{marketing.logo?marketing.logo:''}}" mode="aspectFill" />
</view>
<view class="more" wx:if="{{showMoreTip}}">
<view class="moreText">滑动查看更多</view>
... ...
... ... @@ -246,6 +246,7 @@
display: flex;
margin-bottom: 30rpx;
position: relative;
height: 90%;
}
.labelBox .label {
... ... @@ -268,7 +269,7 @@
}
.labelBox2 .label {
height: 90%;
max-height: 90%;
overflow-y: scroll;
margin-right: 20rpx;
}
... ... @@ -280,7 +281,7 @@
.labelBox .line {
position: absolute;
width: 4rpx;
height: 90%;
height: 100%;
top: 3%;
background: linear-gradient(270deg, #eeae74 20%, #0c0f0e 124%);
}
... ... @@ -298,7 +299,6 @@
display: block;
}
.famousChefBox {
position: relative;
}
... ... @@ -315,7 +315,7 @@
height: 100%;
background: linear-gradient(180deg, #0c0f0e 0%, #0c0f0e4d 100%);
padding: 0 30rpx;
width: 45%;
width: 40%;
}
... ... @@ -324,7 +324,7 @@
right: 0;
color: #B39437;
padding: 0 20rpx 0 0;
width: 50%;
width: 40%;
height: 100%;
box-sizing: border-box;
}
... ... @@ -435,7 +435,7 @@
}
.preferential {
margin: 16rpx 40rpx 20rpx 40rpx;
margin: 16rpx 40rpx 0 40rpx;
}
.preferentialItems {
... ... @@ -511,6 +511,7 @@
.vips image {
height: 300rpx;
margin-top: 20rpx;
}
.vips {
... ... @@ -519,6 +520,7 @@
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
}
.vips .text {
... ...