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 @@ @@ -94,90 +94,39 @@
94 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 94 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
95 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 95 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
96 </view> 96 </view>
97 - <!-- 品牌介绍类型 图文合并 -->  
98 - <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->  
99 - <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')}}">  
100 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
101 - <view class="imgMask">  
102 - <image src="{{item}}" mode="aspectFill" />  
103 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
104 - <view class="englishText font28r">Introduce</view>  
105 - <view class="chefText font32r">品牌介绍</view>  
106 - <view class="shopName font32r">  
107 - {{store.seller_name}}  
108 - </view>  
109 - <view class="labelBox labelBox2">  
110 - <view class="line">  
111 - </view>  
112 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
113 - </view> 97 + <!-- 餐厅介绍图文分开 -->
  98 + <view class="introduce" wx:if="{{store}}">
  99 + <view class="imgMask">
  100 + <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  101 + <view class="chefText font36r">餐厅介绍</view>
  102 + <view class="labelBox">
  103 + <text class="texts">{{store.introduce}}
  104 + </text>
114 </view> 105 </view>
115 </view> 106 </view>
  107 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  108 + <view class="chefText font36r">餐厅环境</view>
  109 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  110 + <image src="{{item}}" mode="aspectFill" />
  111 + </block>
  112 + <view class="lines"></view>
  113 + </block>
116 </view> 114 </view>
117 </view> 115 </view>
118 - <!-- 品牌介绍类型 图文分开 -->  
119 - <view class="introduce" wx:else>  
120 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
121 - <view class="imgMask">  
122 - <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'))}}">  
123 - <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">  
124 - <view class="englishText font28r">Introduce</view>  
125 - <view class="chefText">品牌介绍</view>  
126 - <view class="shopName styleShopName">  
127 - {{store.seller_name}}  
128 - </view>  
129 - <view class="labelBox">  
130 - <view class="line"></view>  
131 - <text class="label styleLabel">{{store.introduce}}</text>  
132 - </view>  
133 - </block> 116 + <!-- 主厨介绍图文分开 -->
  117 + <view class="introduce famousChefBox" wx:if="{{chef}}">
  118 + <view class="imgMask">
  119 + <view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
  120 + <view class="chefText font36r">主厨介绍</view>
  121 + <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  122 + <text class="texts">{{chef.introduce}}
  123 + </text>
134 </view> 124 </view>
135 - <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />  
136 </view> 125 </view>
137 - </view>  
138 - </view>  
139 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
140 - <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->  
141 - <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')}}">  
142 - <view class="IntroductionItems">  
143 - <view class="imgMask"> 126 + <block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
144 <image src="{{chef.image}}" mode="aspectFill" /> 127 <image src="{{chef.image}}" mode="aspectFill" />
145 - <view class="IntroduceColor Introducepublic">  
146 - <view class="englishText font28r">Chief Cook</view>  
147 - <view class="chefText">知名主厨</view>  
148 - <view class="shopName" wx:if="{{chef.chef_name}}">  
149 - {{chef.chef_name}}  
150 - </view>  
151 - <view class="labelBox labelBox2">  
152 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
153 - </text>  
154 - <view class="line line1">  
155 - </view>  
156 - </view>  
157 - </view>  
158 - </view>  
159 - </view>  
160 - </view>  
161 - <view class="introduce famousChefBox" wx:else>  
162 - <view class="IntroductionItems">  
163 - <view class="imgMask">  
164 - <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'))}}">  
165 - <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
166 - <view class="englishText font28r">Chief Cook</view>  
167 - <view class="chefText">知名主厨</view>  
168 - <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">  
169 - {{chef .chef_name}}  
170 - </view>  
171 - <view class="labelBox labelBox1">  
172 - <view class="line">  
173 - </view>  
174 - <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}  
175 - </text>  
176 - </view>  
177 - </block>  
178 - </view>  
179 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />  
180 - </view> 128 + </block>
  129 + <view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
181 </view> 130 </view>
182 </view> 131 </view>
183 <!-- 菜品展示 swich为1展示 --> 132 <!-- 菜品展示 swich为1展示 -->
@@ -158,6 +158,10 @@ @@ -158,6 +158,10 @@
158 background-color: #DBDBDB; 158 background-color: #DBDBDB;
159 } 159 }
160 160
  161 +.mtnone {
  162 + margin-top: 0;
  163 +}
  164 +
161 .famousChefBox .labelBox { 165 .famousChefBox .labelBox {
162 border-bottom: none; 166 border-bottom: none;
163 } 167 }
@@ -102,90 +102,39 @@ @@ -102,90 +102,39 @@
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 - <!-- 品牌介绍类型 图文合并 -->  
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')}}">  
108 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
109 - <view class="imgMask">  
110 - <image src="{{item}}" mode="aspectFill" />  
111 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
112 - <view class="englishText font28r">Introduce</view>  
113 - <view class="chefText font32r">品牌介绍</view>  
114 - <view class="shopName font32r">  
115 - {{store.seller_name}}  
116 - </view>  
117 - <view class="labelBox labelBox2">  
118 - <view class="line">  
119 - </view>  
120 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
121 - </view> 105 + <!-- 餐厅介绍图文分开 -->
  106 + <view class="introduce" wx:if="{{store}}">
  107 + <view class="imgMask">
  108 + <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  109 + <view class="chefText font36r">餐厅介绍</view>
  110 + <view class="labelBox">
  111 + <text class="texts">{{store.introduce}}
  112 + </text>
122 </view> 113 </view>
123 </view> 114 </view>
  115 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  116 + <view class="chefText font36r">餐厅环境</view>
  117 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  118 + <image src="{{item}}" mode="aspectFill" />
  119 + </block>
  120 + <view class="lines"></view>
  121 + </block>
124 </view> 122 </view>
125 </view> 123 </view>
126 - <!-- 品牌介绍类型 图文分开 -->  
127 - <view class="introduce" wx:else>  
128 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
129 - <view class="imgMask">  
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}}  
136 - </view>  
137 - <view class="labelBox">  
138 - <view class="line"></view>  
139 - <text class="label styleLabel">{{store.introduce}}</text>  
140 - </view>  
141 - </block> 124 + <!-- 主厨介绍图文分开 -->
  125 + <view class="introduce famousChefBox" wx:if="{{chef}}">
  126 + <view class="imgMask">
  127 + <view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
  128 + <view class="chefText font36r">主厨介绍</view>
  129 + <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  130 + <text class="texts">{{chef.introduce}}
  131 + </text>
142 </view> 132 </view>
143 - <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />  
144 </view> 133 </view>
145 - </view>  
146 - </view>  
147 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
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')}}">  
150 - <view class="IntroductionItems">  
151 - <view class="imgMask"> 134 + <block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
152 <image src="{{chef.image}}" mode="aspectFill" /> 135 <image src="{{chef.image}}" mode="aspectFill" />
153 - <view class="IntroduceColor Introducepublic">  
154 - <view class="englishText font28r">Chief Cook</view>  
155 - <view class="chefText">知名主厨</view>  
156 - <view class="shopName" wx:if="{{chef.chef_name}}">  
157 - {{chef.chef_name}}  
158 - </view>  
159 - <view class="labelBox labelBox2">  
160 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
161 - </text>  
162 - <view class="line line1">  
163 - </view>  
164 - </view>  
165 - </view>  
166 - </view>  
167 - </view>  
168 - </view>  
169 - <view class="introduce famousChefBox" wx:else>  
170 - <view class="IntroductionItems">  
171 - <view class="imgMask">  
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}}  
178 - </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>  
186 - </view>  
187 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />  
188 - </view> 136 + </block>
  137 + <view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
189 </view> 138 </view>
190 </view> 139 </view>
191 <!-- 菜品展示 swich为1展示 --> 140 <!-- 菜品展示 swich为1展示 -->
@@ -199,6 +199,10 @@ @@ -199,6 +199,10 @@
199 background-color: #DBDBDB; 199 background-color: #DBDBDB;
200 } 200 }
201 201
  202 +.mtnone {
  203 + margin-top: 0;
  204 +}
  205 +
202 .famousChefBox .labelBox { 206 .famousChefBox .labelBox {
203 border-bottom: none; 207 border-bottom: none;
204 } 208 }
@@ -82,92 +82,39 @@ @@ -82,92 +82,39 @@
82 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 82 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
83 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 83 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
84 </view> 84 </view>
85 - <!-- 品牌介绍类型 图文合并 -->  
86 - <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->  
87 - <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')}}">  
88 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
89 - <view class="imgMask">  
90 - <image src="{{item}}" mode="aspectFill" />  
91 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
92 - <view class="englishText font28r">Introduce</view>  
93 - <view class="chefText font32r">品牌介绍</view>  
94 - <view class="shopName font32r">  
95 - {{store.seller_name}}  
96 - </view>  
97 - <view class="labelBox labelBox2">  
98 - <view class="line">  
99 - </view>  
100 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
101 - </view> 85 + <!-- 餐厅介绍图文分开 -->
  86 + <block wx:if="{{store}}">
  87 + <view class="imgMask">
  88 + <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  89 + <view class="text font36r rubric texts">餐厅介绍</view>
  90 + <view class="labelBox font24r">
  91 + {{store.introduce}}
102 </view> 92 </view>
103 </view> 93 </view>
  94 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  95 + <view class="text font36r rubric">餐厅环境</view>
  96 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  97 + <image src="{{item}}" mode="aspectFill" />
  98 + </block>
  99 + <view class="lines"></view>
  100 + </block>
104 </view> 101 </view>
105 - </view>  
106 - <!-- 品牌介绍类型 图文分开 -->  
107 - <view class="introduce" wx:else>  
108 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
109 - <view class="imgMask">  
110 - <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'))}}">  
111 - <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">  
112 - <view class="englishText font28r">Introduce</view>  
113 - <view class="chefText">品牌介绍</view>  
114 - <view class="shopName styleShopName">  
115 - {{store.seller_name}}  
116 - </view>  
117 - <view class="labelBox">  
118 - <view class="line"></view>  
119 - <text class="label styleLabel">{{store.introduce}}</text>  
120 - </view>  
121 - </block> 102 + </block>
  103 + <!-- 主厨介绍图文分开 -->
  104 + <block wx:if="{{chef}}">
  105 + <view class="imgMask">
  106 + <view class="IntroduceColor noneBor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
  107 + <view class="text font36r rubric texts">主厨介绍</view>
  108 + <view class="labelBox font24r" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  109 + {{chef.introduce}}
122 </view> 110 </view>
123 - <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />  
124 </view> 111 </view>
125 - </view>  
126 - </view>  
127 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
128 - <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->  
129 - <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')}}">  
130 - <view class="IntroductionItems">  
131 - <view class="imgMask"> 112 + <block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
132 <image src="{{chef.image}}" mode="aspectFill" /> 113 <image src="{{chef.image}}" mode="aspectFill" />
133 - <view class="IntroduceColor Introducepublic">  
134 - <view class="englishText font28r">Chief Cook</view>  
135 - <view class="chefText">知名主厨</view>  
136 - <view class="shopName" wx:if="{{chef.chef_name}}">  
137 - {{chef.chef_name}}  
138 - </view>  
139 - <view class="labelBox labelBox2">  
140 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
141 - </text>  
142 - <view class="line line1">  
143 - </view>  
144 - </view>  
145 - </view>  
146 - </view>  
147 - </view>  
148 - </view>  
149 - <view class="introduce famousChefBox" wx:else>  
150 - <view class="IntroductionItems">  
151 - <view class="imgMask">  
152 - <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'))}}">  
153 - <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
154 - <view class="englishText font28r">Chief Cook</view>  
155 - <view class="chefText">知名主厨</view>  
156 - <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">  
157 - {{chef .chef_name}}  
158 - </view>  
159 - <view class="labelBox labelBox1">  
160 - <view class="line">  
161 - </view>  
162 - <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}  
163 - </text>  
164 - </view>  
165 - </block>  
166 - </view>  
167 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />  
168 - </view> 114 + </block>
  115 + <view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
169 </view> 116 </view>
170 - </view> 117 + </block>
171 <block wx:if="{{signboard && signboard.swich=='1'}}"> 118 <block wx:if="{{signboard && signboard.swich=='1'}}">
172 <view class="imgMask"> 119 <view class="imgMask">
173 <view class="IntroduceColor noneBor"> 120 <view class="IntroduceColor noneBor">
@@ -171,6 +171,10 @@ @@ -171,6 +171,10 @@
171 background-color: #DBDBDB; 171 background-color: #DBDBDB;
172 } 172 }
173 173
  174 +.mtnone {
  175 + margin-top: 0;
  176 +}
  177 +
174 .imgMask .IntroduceColor { 178 .imgMask .IntroduceColor {
175 border-bottom: 2rpx solid #DBDBDB; 179 border-bottom: 2rpx solid #DBDBDB;
176 margin: 0 20rpx 20rpx 20rpx; 180 margin: 0 20rpx 20rpx 20rpx;
@@ -77,92 +77,39 @@ @@ -77,92 +77,39 @@
77 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 77 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
78 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 78 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
79 </view> 79 </view>
80 - <!-- 品牌介绍类型 图文合并 -->  
81 - <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->  
82 - <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')}}">  
83 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
84 - <view class="imgMask">  
85 - <image src="{{item}}" mode="aspectFill" />  
86 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
87 - <view class="englishText font28r">Introduce</view>  
88 - <view class="chefText font32r">品牌介绍</view>  
89 - <view class="shopName font32r">  
90 - {{store.seller_name}}  
91 - </view>  
92 - <view class="labelBox labelBox2">  
93 - <view class="line">  
94 - </view>  
95 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
96 - </view> 80 + <!-- 餐厅介绍图文分开 -->
  81 + <block wx:if="{{store}}">
  82 + <view class="imgMask">
  83 + <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  84 + <view class="text font36r rubric texts">餐厅介绍</view>
  85 + <view class="labelBox font24r">
  86 + {{store.introduce}}
97 </view> 87 </view>
98 </view> 88 </view>
  89 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  90 + <view class="text font36r rubric">餐厅环境</view>
  91 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  92 + <image src="{{item}}" mode="aspectFill" />
  93 + </block>
  94 + <view class="lines"></view>
  95 + </block>
99 </view> 96 </view>
100 - </view>  
101 - <!-- 品牌介绍类型 图文分开 -->  
102 - <view class="introduce" wx:else>  
103 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
104 - <view class="imgMask">  
105 - <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'))}}">  
106 - <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">  
107 - <view class="englishText font28r">Introduce</view>  
108 - <view class="chefText">品牌介绍</view>  
109 - <view class="shopName styleShopName">  
110 - {{store.seller_name}}  
111 - </view>  
112 - <view class="labelBox">  
113 - <view class="line"></view>  
114 - <text class="label styleLabel">{{store.introduce}}</text>  
115 - </view>  
116 - </block> 97 + </block>
  98 + <!-- 主厨介绍图文分开 -->
  99 + <block wx:if="{{chef}}">
  100 + <view class="imgMask">
  101 + <view class="IntroduceColor noneBor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
  102 + <view class="text font36r rubric texts">主厨介绍</view>
  103 + <view class="labelBox font24r" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  104 + {{chef.introduce}}
117 </view> 105 </view>
118 - <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />  
119 </view> 106 </view>
120 - </view>  
121 - </view>  
122 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
123 - <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->  
124 - <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')}}">  
125 - <view class="IntroductionItems">  
126 - <view class="imgMask"> 107 + <block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
127 <image src="{{chef.image}}" mode="aspectFill" /> 108 <image src="{{chef.image}}" mode="aspectFill" />
128 - <view class="IntroduceColor Introducepublic">  
129 - <view class="englishText font28r">Chief Cook</view>  
130 - <view class="chefText">知名主厨</view>  
131 - <view class="shopName" wx:if="{{chef.chef_name}}">  
132 - {{chef.chef_name}}  
133 - </view>  
134 - <view class="labelBox labelBox2">  
135 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
136 - </text>  
137 - <view class="line line1">  
138 - </view>  
139 - </view>  
140 - </view>  
141 - </view>  
142 - </view>  
143 - </view>  
144 - <view class="introduce famousChefBox" wx:else>  
145 - <view class="IntroductionItems">  
146 - <view class="imgMask">  
147 - <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'))}}">  
148 - <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
149 - <view class="englishText font28r">Chief Cook</view>  
150 - <view class="chefText">知名主厨</view>  
151 - <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">  
152 - {{chef .chef_name}}  
153 - </view>  
154 - <view class="labelBox labelBox1">  
155 - <view class="line">  
156 - </view>  
157 - <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}  
158 - </text>  
159 - </view>  
160 - </block>  
161 - </view>  
162 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />  
163 - </view> 109 + </block>
  110 + <view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
164 </view> 111 </view>
165 - </view> 112 + </block>
166 <block wx:if="{{signboard && signboard.swich=='1'}}"> 113 <block wx:if="{{signboard && signboard.swich=='1'}}">
167 <view class="imgMask"> 114 <view class="imgMask">
168 <view class="IntroduceColor noneBor"> 115 <view class="IntroduceColor noneBor">
@@ -170,6 +170,9 @@ @@ -170,6 +170,9 @@
170 background-color: #DBDBDB; 170 background-color: #DBDBDB;
171 } 171 }
172 172
  173 +.mtnone {
  174 + margin-top: 0;
  175 +}
173 176
174 .imgMask .IntroduceColor { 177 .imgMask .IntroduceColor {
175 border-bottom: 2rpx solid #DBDBDB; 178 border-bottom: 2rpx solid #DBDBDB;
@@ -96,90 +96,39 @@ @@ -96,90 +96,39 @@
96 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 96 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
97 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 97 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
98 </view> 98 </view>
99 - <!-- 品牌介绍类型 图文合并 -->  
100 - <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->  
101 - <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')}}">  
102 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
103 - <view class="imgMask">  
104 - <image src="{{item}}" mode="aspectFill" />  
105 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
106 - <view class="englishText font28r">Introduce</view>  
107 - <view class="chefText font32r">品牌介绍</view>  
108 - <view class="shopName font32r">  
109 - {{store.seller_name}}  
110 - </view>  
111 - <view class="labelBox labelBox2">  
112 - <view class="line">  
113 - </view>  
114 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
115 - </view> 99 + <!-- 餐厅介绍图文分开 -->
  100 + <view class="introduce" wx:if="{{store}}">
  101 + <view class="imgMask">
  102 + <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  103 + <view class="chefText font36r">餐厅介绍</view>
  104 + <view class="labelBox">
  105 + <text class="texts">{{store.introduce}}
  106 + </text>
116 </view> 107 </view>
117 </view> 108 </view>
  109 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  110 + <view class="chefText texts1 font36r">餐厅环境</view>
  111 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  112 + <image src="{{item}}" mode="aspectFill" />
  113 + </block>
  114 + <view class="lines"></view>
  115 + </block>
118 </view> 116 </view>
119 </view> 117 </view>
120 - <!-- 品牌介绍类型 图文分开 -->  
121 - <view class="introduce" wx:else>  
122 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
123 - <view class="imgMask">  
124 - <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'))}}">  
125 - <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">  
126 - <view class="englishText font28r">Introduce</view>  
127 - <view class="chefText">品牌介绍</view>  
128 - <view class="shopName styleShopName">  
129 - {{store.seller_name}}  
130 - </view>  
131 - <view class="labelBox">  
132 - <view class="line"></view>  
133 - <text class="label styleLabel">{{store.introduce}}</text>  
134 - </view>  
135 - </block> 118 + <!-- 主厨介绍图文分开 -->
  119 + <view class="introduce famousChefBox" wx:if="{{chef}}">
  120 + <view class="imgMask">
  121 + <view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
  122 + <view class="chefText font36r">主厨介绍</view>
  123 + <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  124 + <text class="texts">{{chef.introduce}}
  125 + </text>
136 </view> 126 </view>
137 - <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />  
138 </view> 127 </view>
139 - </view>  
140 - </view>  
141 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
142 - <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->  
143 - <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')}}">  
144 - <view class="IntroductionItems">  
145 - <view class="imgMask"> 128 + <block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
146 <image src="{{chef.image}}" mode="aspectFill" /> 129 <image src="{{chef.image}}" mode="aspectFill" />
147 - <view class="IntroduceColor Introducepublic">  
148 - <view class="englishText font28r">Chief Cook</view>  
149 - <view class="chefText">知名主厨</view>  
150 - <view class="shopName" wx:if="{{chef.chef_name}}">  
151 - {{chef.chef_name}}  
152 - </view>  
153 - <view class="labelBox labelBox2">  
154 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
155 - </text>  
156 - <view class="line line1">  
157 - </view>  
158 - </view>  
159 - </view>  
160 - </view>  
161 - </view>  
162 - </view>  
163 - <view class="introduce famousChefBox" wx:else>  
164 - <view class="IntroductionItems">  
165 - <view class="imgMask">  
166 - <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'))}}">  
167 - <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
168 - <view class="englishText font28r">Chief Cook</view>  
169 - <view class="chefText">知名主厨</view>  
170 - <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">  
171 - {{chef .chef_name}}  
172 - </view>  
173 - <view class="labelBox labelBox1">  
174 - <view class="line">  
175 - </view>  
176 - <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}  
177 - </text>  
178 - </view>  
179 - </block>  
180 - </view>  
181 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />  
182 - </view> 130 + </block>
  131 + <view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
183 </view> 132 </view>
184 </view> 133 </view>
185 <!-- 菜品展示 swich为1展示 --> 134 <!-- 菜品展示 swich为1展示 -->
@@ -162,6 +162,10 @@ @@ -162,6 +162,10 @@
162 background-color: #DBDBDB; 162 background-color: #DBDBDB;
163 } 163 }
164 164
  165 +.mtnone {
  166 + margin-top: 0;
  167 +}
  168 +
165 .IntroduceColor { 169 .IntroduceColor {
166 margin: 0 20rpx; 170 margin: 0 20rpx;
167 } 171 }
@@ -83,90 +83,39 @@ @@ -83,90 +83,39 @@
83 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 83 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
84 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 84 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
85 </view> 85 </view>
86 - <!-- 品牌介绍类型 图文合并 -->  
87 - <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->  
88 - <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')}}">  
89 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
90 - <view class="imgMask">  
91 - <image src="{{item}}" mode="aspectFill" />  
92 - <view class="IntroduceColor Introducepublic" wx:if="{{arryIndex=='0'}}">  
93 - <view class="englishText font28r">Introduce</view>  
94 - <view class="chefText font32r">品牌介绍</view>  
95 - <view class="shopName font32r">  
96 - {{store.seller_name}}  
97 - </view>  
98 - <view class="labelBox labelBox2">  
99 - <view class="line">  
100 - </view>  
101 - <text class="label" wx:if="{{store.introduce}}">{{store.introduce}}</text>  
102 - </view> 86 + <!-- 餐厅介绍图文分开 -->
  87 + <view class="introduce" wx:if="{{store}}">
  88 + <view class="imgMask">
  89 + <view class="IntroduceColor" wx:if="{{store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  90 + <view class="chefText font36r">餐厅介绍</view>
  91 + <view class="labelBox">
  92 + <text class="texts">{{store.introduce}}
  93 + </text>
103 </view> 94 </view>
104 </view> 95 </view>
  96 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  97 + <view class="chefText texts1 font36r">餐厅环境</view>
  98 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  99 + <image src="{{item}}" mode="aspectFill" />
  100 + </block>
  101 + <view class="lines"></view>
  102 + </block>
105 </view> 103 </view>
106 </view> 104 </view>
107 - <!-- 品牌介绍类型 图文分开 -->  
108 - <view class="introduce" wx:else>  
109 - <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
110 - <view class="imgMask">  
111 - <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'))}}">  
112 - <block wx:if="{{!store.is_introduce || store.is_introduce!='0'}}">  
113 - <view class="englishText font28r">Introduce</view>  
114 - <view class="chefText">品牌介绍</view>  
115 - <view class="shopName styleShopName">  
116 - {{store.seller_name}}  
117 - </view>  
118 - <view class="labelBox">  
119 - <view class="line"></view>  
120 - <text class="label styleLabel">{{store.introduce}}</text>  
121 - </view>  
122 - </block> 105 + <!-- 主厨介绍图文分开 -->
  106 + <view class="introduce famousChefBox" wx:if="{{chef}}">
  107 + <view class="imgMask">
  108 + <view class="IntroduceColor" wx:if="{{(!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0')}}">
  109 + <view class="chefText font36r">主厨介绍</view>
  110 + <view class="labelBox" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">
  111 + <text class="texts">{{chef.introduce}}
  112 + </text>
123 </view> 113 </view>
124 - <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />  
125 </view> 114 </view>
126 - </view>  
127 - </view>  
128 - <!-- 知名主厨类型chef.style 0不显示 1图文合并 2图文分开 -->  
129 - <!-- 知名主厨类型chef is_introduce是否展示文字介绍 is_images是否展示介绍图片 is_above餐厅介绍文字是否显示在第一张图片上-->  
130 - <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')}}">  
131 - <view class="IntroductionItems">  
132 - <view class="imgMask"> 115 + <block wx:if="{{!chef.is_images || chef.is_images!='0'}}">
133 <image src="{{chef.image}}" mode="aspectFill" /> 116 <image src="{{chef.image}}" mode="aspectFill" />
134 - <view class="IntroduceColor Introducepublic">  
135 - <view class="englishText font28r">Chief Cook</view>  
136 - <view class="chefText">知名主厨</view>  
137 - <view class="shopName" wx:if="{{chef.chef_name}}">  
138 - {{chef.chef_name}}  
139 - </view>  
140 - <view class="labelBox labelBox2">  
141 - <text class="label" wx:if="{{chef.introduce}}">{{chef.introduce}}  
142 - </text>  
143 - <view class="line line1">  
144 - </view>  
145 - </view>  
146 - </view>  
147 - </view>  
148 - </view>  
149 - </view>  
150 - <view class="introduce famousChefBox" wx:else>  
151 - <view class="IntroductionItems">  
152 - <view class="imgMask">  
153 - <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'))}}">  
154 - <block wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">  
155 - <view class="englishText font28r">Chief Cook</view>  
156 - <view class="chefText">知名主厨</view>  
157 - <view class="shopName styleShopName" wx:if="{{chef.chef_name}}">  
158 - {{chef .chef_name}}  
159 - </view>  
160 - <view class="labelBox labelBox1">  
161 - <view class="line">  
162 - </view>  
163 - <text class="label styleLabel" wx:if="{{!chef.is_introduce || chef.is_introduce!='0'}}">{{chef.introduce}}  
164 - </text>  
165 - </view>  
166 - </block>  
167 - </view>  
168 - <image wx:if="{{chef && (!chef.is_images || chef.is_images!='0')}}" src="{{chef.image}}" mode="aspectFill" />  
169 - </view> 117 + </block>
  118 + <view class="{{(!chef.is_images || chef.is_images!='0')?'lines':'lines mtnone'}}"></view>
170 </view> 119 </view>
171 </view> 120 </view>
172 <!-- 菜品展示 swich为1展示 --> 121 <!-- 菜品展示 swich为1展示 -->
@@ -185,6 +185,10 @@ @@ -185,6 +185,10 @@
185 background-color: #DBDBDB; 185 background-color: #DBDBDB;
186 } 186 }
187 187
  188 +.mtnone {
  189 + margin-top: 0;
  190 +}
  191 +
188 .IntroduceColor { 192 .IntroduceColor {
189 margin: 0 20rpx; 193 margin: 0 20rpx;
190 } 194 }