xt / xcx-book · Commits

Go to a project

Commit fe32344f6c4980ee47daeaaae5ebfa37baaf49a0

Authored by pengye
1 parent 79dad634
build: skipped

邀请函标题为空显示标题1、主厨介绍为空显示问题处理

Inline Side-by-side
Showing 14 changed files with 18 additions and 18 deletions
... ... @@ -537,7 +537,7 @@ Page({
home = util.determine(data.home);
themeColor = data.lite_class || 'ultramarine';
StyleType = data.type;
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -140,7 +140,7 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
... ...
... ... @@ -537,7 +537,7 @@ Page({
home = util.determine(data.home);
themeColor = data.lite_class || 'ultramarine';
StyleType = data.type;
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -142,7 +142,7 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
... ...
... ... @@ -537,7 +537,7 @@ Page({
home = util.determine(data.home);
themeColor = data.lite_class || 'ultramarine';
StyleType = data.type;
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -125,7 +125,7 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
... ...
... ... @@ -536,7 +536,7 @@ Page({
home = util.determine(data.home);
themeColor = data.lite_class || 'ultramarine';
StyleType = data.type;
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -123,7 +123,7 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
... ...
... ... @@ -537,7 +537,7 @@ Page({
home = util.determine(data.home);
themeColor = data.lite_class || 'ultramarine';
StyleType = data.type;
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -138,7 +138,7 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
... ...
... ... @@ -536,7 +536,7 @@ Page({
home = util.determine(data.home);
themeColor = data.lite_class || 'ultramarine';
StyleType = data.type;
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -134,7 +134,7 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
... ...
... ... @@ -567,7 +567,7 @@ Page({
if (StyleType == '11' || StyleType == '12') colors = "#0B1A67";
if (StyleType == '13' || StyleType == '15') colors = "#0B3133";
if (StyleType == '14' || StyleType == '16') colors = "#1B1A23";
titleType = data.title_class;
titleType = data.title_class || '1';
swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
if (marketing) {
is_comments = marketing.is_comments ? marketing.is_comments : '';
... ...
... ... @@ -139,15 +139,15 @@
</block>
</view>
<!-- 主厨介绍 -->
<view class="introduce" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
<block wx:if="{{titleType}}">
<titleStyle titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</block>
<view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
<view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
</view>
<view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
<text class="texts">{{chef.introduce}}
</text>
</view>
<block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
<block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
<image src="{{chef.image}}" mode="widthFix" />
</block>
</view>
... ...