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({ @@ -537,7 +537,7 @@ Page({
537 home = util.determine(data.home); 537 home = util.determine(data.home);
538 themeColor = data.lite_class || 'ultramarine'; 538 themeColor = data.lite_class || 'ultramarine';
539 StyleType = data.type; 539 StyleType = data.type;
540 - titleType = data.title_class; 540 + titleType = data.title_class || '1';
541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
542 if (marketing) { 542 if (marketing) {
543 is_comments = marketing.is_comments ? marketing.is_comments : ''; 543 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 </block> 140 </block>
141 </view> 141 </view>
142 <!-- 主厨介绍 --> 142 <!-- 主厨介绍 -->
143 - <view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}"> 143 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
144 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 144 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
145 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 145 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
146 </view> 146 </view>
@@ -537,7 +537,7 @@ Page({ @@ -537,7 +537,7 @@ Page({
537 home = util.determine(data.home); 537 home = util.determine(data.home);
538 themeColor = data.lite_class || 'ultramarine'; 538 themeColor = data.lite_class || 'ultramarine';
539 StyleType = data.type; 539 StyleType = data.type;
540 - titleType = data.title_class; 540 + titleType = data.title_class || '1';
541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
542 if (marketing) { 542 if (marketing) {
543 is_comments = marketing.is_comments ? marketing.is_comments : ''; 543 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 </block> 142 </block>
143 </view> 143 </view>
144 <!-- 主厨介绍 --> 144 <!-- 主厨介绍 -->
145 - <view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}"> 145 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
146 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 146 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
147 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 147 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
148 </view> 148 </view>
@@ -537,7 +537,7 @@ Page({ @@ -537,7 +537,7 @@ Page({
537 home = util.determine(data.home); 537 home = util.determine(data.home);
538 themeColor = data.lite_class || 'ultramarine'; 538 themeColor = data.lite_class || 'ultramarine';
539 StyleType = data.type; 539 StyleType = data.type;
540 - titleType = data.title_class; 540 + titleType = data.title_class || '1';
541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
542 if (marketing) { 542 if (marketing) {
543 is_comments = marketing.is_comments ? marketing.is_comments : ''; 543 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 </block> 125 </block>
126 </view> 126 </view>
127 <!-- 主厨介绍 --> 127 <!-- 主厨介绍 -->
128 - <view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}"> 128 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
129 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 129 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
130 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 130 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
131 </view> 131 </view>
@@ -536,7 +536,7 @@ Page({ @@ -536,7 +536,7 @@ Page({
536 home = util.determine(data.home); 536 home = util.determine(data.home);
537 themeColor = data.lite_class || 'ultramarine'; 537 themeColor = data.lite_class || 'ultramarine';
538 StyleType = data.type; 538 StyleType = data.type;
539 - titleType = data.title_class; 539 + titleType = data.title_class || '1';
540 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 540 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
541 if (marketing) { 541 if (marketing) {
542 is_comments = marketing.is_comments ? marketing.is_comments : ''; 542 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </block> 123 </block>
124 </view> 124 </view>
125 <!-- 主厨介绍 --> 125 <!-- 主厨介绍 -->
126 - <view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}"> 126 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
127 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 127 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
128 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 128 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
129 </view> 129 </view>
@@ -537,7 +537,7 @@ Page({ @@ -537,7 +537,7 @@ Page({
537 home = util.determine(data.home); 537 home = util.determine(data.home);
538 themeColor = data.lite_class || 'ultramarine'; 538 themeColor = data.lite_class || 'ultramarine';
539 StyleType = data.type; 539 StyleType = data.type;
540 - titleType = data.title_class; 540 + titleType = data.title_class || '1';
541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 541 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
542 if (marketing) { 542 if (marketing) {
543 is_comments = marketing.is_comments ? marketing.is_comments : ''; 543 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 </block> 138 </block>
139 </view> 139 </view>
140 <!-- 主厨介绍 --> 140 <!-- 主厨介绍 -->
141 - <view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}"> 141 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
142 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 142 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
143 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 143 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
144 </view> 144 </view>
@@ -536,7 +536,7 @@ Page({ @@ -536,7 +536,7 @@ Page({
536 home = util.determine(data.home); 536 home = util.determine(data.home);
537 themeColor = data.lite_class || 'ultramarine'; 537 themeColor = data.lite_class || 'ultramarine';
538 StyleType = data.type; 538 StyleType = data.type;
539 - titleType = data.title_class; 539 + titleType = data.title_class || '1';
540 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 540 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
541 if (marketing) { 541 if (marketing) {
542 is_comments = marketing.is_comments ? marketing.is_comments : ''; 542 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 </block> 134 </block>
135 </view> 135 </view>
136 <!-- 主厨介绍 --> 136 <!-- 主厨介绍 -->
137 - <view class="introduceBox famousChefBox" wx:if="{{chef && (!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}"> 137 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
138 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r"> 138 <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
139 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle> 139 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
140 </view> 140 </view>
@@ -567,7 +567,7 @@ Page({ @@ -567,7 +567,7 @@ Page({
567 if (StyleType == '11' || StyleType == '12') colors = "#0B1A67"; 567 if (StyleType == '11' || StyleType == '12') colors = "#0B1A67";
568 if (StyleType == '13' || StyleType == '15') colors = "#0B3133"; 568 if (StyleType == '13' || StyleType == '15') colors = "#0B3133";
569 if (StyleType == '14' || StyleType == '16') colors = "#1B1A23"; 569 if (StyleType == '14' || StyleType == '16') colors = "#1B1A23";
570 - titleType = data.title_class; 570 + titleType = data.title_class || '1';
571 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 571 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
572 if (marketing) { 572 if (marketing) {
573 is_comments = marketing.is_comments ? marketing.is_comments : ''; 573 is_comments = marketing.is_comments ? marketing.is_comments : '';
@@ -139,15 +139,15 @@ @@ -139,15 +139,15 @@
139 </block> 139 </block>
140 </view> 140 </view>
141 <!-- 主厨介绍 --> 141 <!-- 主厨介绍 -->
142 - <view class="introduce" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">  
143 - <block wx:if="{{titleType}}">  
144 - <titleStyle titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>  
145 - </block> 142 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
  143 + <view wx:if="{{titleType && (chef.is_introduce || chef.is_images)}}" class="chefText font36r">
  144 + <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="主厨介绍"></titleStyle>
  145 + </view>
146 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}"> 146 <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
147 <text class="texts">{{chef.introduce}} 147 <text class="texts">{{chef.introduce}}
148 </text> 148 </text>
149 </view> 149 </view>
150 - <block wx:if="{{!chef.is_images || chef.is_images!='0'}}"> 150 + <block wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}">
151 <image src="{{chef.image}}" mode="widthFix" /> 151 <image src="{{chef.image}}" mode="widthFix" />
152 </block> 152 </block>
153 </view> 153 </view>