xt / xcx-book · Commits

Go to a project

Commit 968a3a3b341f3d18d8c527c1224dc88a34e9d030

Authored by pengye
1 parent 4140e3d2
build: skipped

餐厅介绍和主厨信息是否显示问题处理

Inline Side-by-side
Showing 8 changed files with 515 additions and 133 deletions
@@ -94,33 +94,90 @@ @@ -94,33 +94,90 @@
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 - <view class="introduce" wx:if="{{store}}">  
98 - <view class="imgMask">  
99 - <view class="IntroduceColor">  
100 - <view class="chefText font36r">餐厅介绍</view>  
101 - <view class="labelBox">  
102 - <text class="texts">{{store.introduce}}  
103 - </text> 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>
104 </view> 114 </view>
105 </view> 115 </view>
106 - <view class="chefText font36r">餐厅环境</view>  
107 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
108 - <image src="{{item}}" mode="aspectFill" />  
109 - </block>  
110 - <view class="lines"></view>  
111 </view> 116 </view>
112 </view> 117 </view>
113 - <view class="introduce famousChefBox" wx:if="{{chef}}">  
114 - <view class="imgMask">  
115 - <view class="IntroduceColor">  
116 - <view class="chefText font36r">主厨介绍</view>  
117 - <view class="labelBox">  
118 - <text class="texts">{{chef.introduce}}  
119 - </text> 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>
120 </view> 134 </view>
  135 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
  136 + </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">
  144 + <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" />
121 </view> 180 </view>
122 - <image src="{{chef.image}}" mode="aspectFill" />  
123 - <view class="lines"></view>  
124 </view> 181 </view>
125 </view> 182 </view>
126 <!-- 菜品展示 swich为1展示 --> 183 <!-- 菜品展示 swich为1展示 -->
@@ -690,4 +690,33 @@ @@ -690,4 +690,33 @@
690 .moroccanBlue .welcome, 690 .moroccanBlue .welcome,
691 .moroccanBlue .rubric { 691 .moroccanBlue .rubric {
692 color: #19516A; 692 color: #19516A;
  693 +}
  694 +
  695 +/* 珍珠白 */
  696 +.pearlWhite .reservationInfo {
  697 + background: #fbf6f1;
  698 +}
  699 +
  700 +.pearlWhite .chefText,
  701 +.pearlWhite .rubric {
  702 + color: #06436F;
  703 +}
  704 +
  705 +.pearlWhite .handlePhone,
  706 +.pearlWhite .welcome,
  707 +.pearlWhite .begin,
  708 +.pearlWhite .title,
  709 +.pearlWhite .info,
  710 +.pearlWhite .reservationInfo .flex-11 {
  711 + color: #515151;
  712 +}
  713 +
  714 +.pearlWhite .brownFont {
  715 + color: #515151;
  716 + border: 2rpx solid #515151;
  717 +}
  718 +
  719 +.pearlWhite .positioning {
  720 + background: #FBF6F1;
  721 + color: #515151;
693 } 722 }
@@ -102,33 +102,90 @@ @@ -102,33 +102,90 @@
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 - <view class="introduce" wx:if="{{store}}">  
106 - <view class="imgMask">  
107 - <view class="IntroduceColor">  
108 - <view class="chefText font36r">餐厅介绍</view>  
109 - <view class="labelBox">  
110 - <text class="texts">{{store.introduce}}  
111 - </text> 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>
112 </view> 122 </view>
113 </view> 123 </view>
114 - <view class="chefText font36r">餐厅环境</view>  
115 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
116 - <image src="{{item}}" mode="aspectFill" />  
117 - </block>  
118 - <view class="lines"></view>  
119 </view> 124 </view>
120 </view> 125 </view>
121 - <view class="introduce famousChefBox" wx:if="{{chef}}">  
122 - <view class="imgMask">  
123 - <view class="IntroduceColor">  
124 - <view class="chefText font36r">主厨介绍</view>  
125 - <view class="labelBox">  
126 - <text class="texts">{{chef.introduce}}  
127 - </text> 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>
128 </view> 142 </view>
  143 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
  144 + </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">
  152 + <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" />
129 </view> 188 </view>
130 - <image src="{{chef.image}}" mode="aspectFill" />  
131 - <view class="lines"></view>  
132 </view> 189 </view>
133 </view> 190 </view>
134 <!-- 菜品展示 swich为1展示 --> 191 <!-- 菜品展示 swich为1展示 -->
@@ -82,33 +82,92 @@ @@ -82,33 +82,92 @@
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 - <block wx:if="{{store}}">  
86 - <view class="imgMask">  
87 - <view class="IntroduceColor">  
88 - <view class="text font36r rubric texts">餐厅介绍</view>  
89 - <view class="labelBox font24r">  
90 - {{store.introduce}} 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>
91 </view> 102 </view>
92 </view> 103 </view>
93 - <view class="text font36r rubric">餐厅环境</view>  
94 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
95 - <image src="{{item}}" mode="aspectFill" />  
96 - </block>  
97 - <view class="lines"></view>  
98 </view> 104 </view>
99 - </block>  
100 - <block wx:if="{{chef}}">  
101 - <view class="imgMask">  
102 - <view class="IntroduceColor noneBor">  
103 - <view class="text font36r rubric texts">主厨介绍</view>  
104 - <view class="labelBox font24r">  
105 - {{chef.introduce}} 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>
106 </view> 122 </view>
  123 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
107 </view> 124 </view>
108 - <image src="{{chef.image}}" mode="aspectFill" />  
109 - <view class="lines"></view>  
110 </view> 125 </view>
111 - </block> 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">
  132 + <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>
  169 + </view>
  170 + </view>
112 <block wx:if="{{signboard && signboard.swich=='1'}}"> 171 <block wx:if="{{signboard && signboard.swich=='1'}}">
113 <view class="imgMask"> 172 <view class="imgMask">
114 <view class="IntroduceColor noneBor"> 173 <view class="IntroduceColor noneBor">
@@ -77,33 +77,92 @@ @@ -77,33 +77,92 @@
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 - <block wx:if="{{store}}">  
81 - <view class="imgMask">  
82 - <view class="IntroduceColor">  
83 - <view class="text font36r rubric texts">餐厅介绍</view>  
84 - <view class="labelBox font24r">  
85 - {{store.introduce}} 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>
86 </view> 97 </view>
87 </view> 98 </view>
88 - <view class="text font36r rubric">餐厅环境</view>  
89 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
90 - <image src="{{item}}" mode="aspectFill" />  
91 - </block>  
92 - <view class="lines"></view>  
93 </view> 99 </view>
94 - </block>  
95 - <block wx:if="{{chef}}">  
96 - <view class="imgMask">  
97 - <view class="IntroduceColor noneBor">  
98 - <view class="text font36r rubric texts">主厨介绍</view>  
99 - <view class="labelBox font24r">  
100 - {{chef.introduce}} 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>
101 </view> 117 </view>
  118 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
102 </view> 119 </view>
103 - <image src="{{chef.image}}" mode="aspectFill" />  
104 - <view class="lines"></view>  
105 </view> 120 </view>
106 - </block> 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">
  127 + <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>
  164 + </view>
  165 + </view>
107 <block wx:if="{{signboard && signboard.swich=='1'}}"> 166 <block wx:if="{{signboard && signboard.swich=='1'}}">
108 <view class="imgMask"> 167 <view class="imgMask">
109 <view class="IntroduceColor noneBor"> 168 <view class="IntroduceColor noneBor">
@@ -96,33 +96,90 @@ @@ -96,33 +96,90 @@
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 - <view class="introduce" wx:if="{{store}}">  
100 - <view class="imgMask">  
101 - <view class="IntroduceColor">  
102 - <view class="chefText font36r">餐厅介绍</view>  
103 - <view class="labelBox">  
104 - <text class="texts">{{store.introduce}}  
105 - </text> 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>
106 </view> 116 </view>
107 </view> 117 </view>
108 - <view class="chefText texts1 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 </view> 118 </view>
114 </view> 119 </view>
115 - <view class="introduce famousChefBox" wx:if="{{chef}}">  
116 - <view class="imgMask">  
117 - <view class="IntroduceColor">  
118 - <view class="chefText font36r">主厨介绍</view>  
119 - <view class="labelBox">  
120 - <text class="texts">{{chef.introduce}}  
121 - </text> 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>
122 </view> 136 </view>
  137 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
  138 + </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">
  146 + <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" />
123 </view> 182 </view>
124 - <image src="{{chef.image}}" mode="aspectFill" />  
125 - <view class="lines"></view>  
126 </view> 183 </view>
127 </view> 184 </view>
128 <!-- 菜品展示 swich为1展示 --> 185 <!-- 菜品展示 swich为1展示 -->
@@ -83,33 +83,90 @@ @@ -83,33 +83,90 @@
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 - <view class="introduce" wx:if="{{store}}">  
87 - <view class="imgMask">  
88 - <view class="IntroduceColor">  
89 - <view class="chefText font36r">餐厅介绍</view>  
90 - <view class="labelBox">  
91 - <text class="texts">{{store.introduce}}  
92 - </text> 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>
93 </view> 103 </view>
94 </view> 104 </view>
95 - <view class="chefText texts1 font36r">餐厅环境</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 </view> 105 </view>
101 </view> 106 </view>
102 - <view class="introduce famousChefBox" wx:if="{{chef}}">  
103 - <view class="imgMask">  
104 - <view class="IntroduceColor">  
105 - <view class="chefText font36r">主厨介绍</view>  
106 - <view class="labelBox">  
107 - <text class="texts">{{chef.introduce}}  
108 - </text> 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>
109 </view> 123 </view>
  124 + <image wx:if="{{store && (!store.is_images || store.is_images!='0')}}" src="{{item}}" mode="aspectFill" />
  125 + </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">
  133 + <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" />
110 </view> 169 </view>
111 - <image src="{{chef.image}}" mode="aspectFill" />  
112 - <view class="lines"></view>  
113 </view> 170 </view>
114 </view> 171 </view>
115 <!-- 菜品展示 swich为1展示 --> 172 <!-- 菜品展示 swich为1展示 -->
@@ -593,49 +593,56 @@ @@ -593,49 +593,56 @@
593 { 593 {
594 "name": "邀请函-----1", 594 "name": "邀请函-----1",
595 "pathName": "pages/customer/detail_invitation", 595 "pathName": "pages/customer/detail_invitation",
596 - "query": "id=400725&hasInvitation=1&hasSellerShare=1&tplid=1", 596 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
597 "launchMode": "default", 597 "launchMode": "default",
598 "scene": null 598 "scene": null
599 }, 599 },
600 { 600 {
601 "name": "邀请函-----2", 601 "name": "邀请函-----2",
602 "pathName": "pages/customer/detail_owner_invitation2", 602 "pathName": "pages/customer/detail_owner_invitation2",
603 - "query": "id=400725&hasInvitation=1&hasSellerShare=1&tplid=1", 603 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
604 "launchMode": "default", 604 "launchMode": "default",
605 "scene": null 605 "scene": null
606 }, 606 },
607 { 607 {
608 "name": "邀请函-----3", 608 "name": "邀请函-----3",
609 "pathName": "pages/customer/detail_owner_invitation3", 609 "pathName": "pages/customer/detail_owner_invitation3",
610 - "query": "id=401339&hasInvitation=1&hasSellerShare=1&tplid=1", 610 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
611 "launchMode": "default", 611 "launchMode": "default",
612 "scene": null 612 "scene": null
613 }, 613 },
614 { 614 {
615 "name": "邀请函-----4", 615 "name": "邀请函-----4",
616 "pathName": "pages/customer/detail_owner_invitation4", 616 "pathName": "pages/customer/detail_owner_invitation4",
617 - "query": "id=401339&hasInvitation=1&hasSellerShare=1&tplid=1", 617 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
618 "launchMode": "default", 618 "launchMode": "default",
619 "scene": null 619 "scene": null
620 }, 620 },
621 { 621 {
622 "name": "邀请函-----5", 622 "name": "邀请函-----5",
623 "pathName": "pages/customer/detail_owner_invitation5", 623 "pathName": "pages/customer/detail_owner_invitation5",
624 - "query": "id=401339&hasInvitation=1&hasSellerShare=1&tplid=1", 624 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
625 "launchMode": "default", 625 "launchMode": "default",
626 "scene": null 626 "scene": null
627 }, 627 },
628 { 628 {
629 "name": "邀请函-----6", 629 "name": "邀请函-----6",
630 "pathName": "pages/customer/detail_owner_invitation6", 630 "pathName": "pages/customer/detail_owner_invitation6",
631 - "query": "id=400725&hasInvitation=1&hasSellerShare=1&tplid=1", 631 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
632 "launchMode": "default", 632 "launchMode": "default",
633 "scene": null 633 "scene": null
634 }, 634 },
635 { 635 {
636 "name": "邀请函-----7", 636 "name": "邀请函-----7",
637 "pathName": "pages/customer/detail_owner_invitation7", 637 "pathName": "pages/customer/detail_owner_invitation7",
638 - "query": "id=400386&hasInvitation=1&hasSellerShare=1&tplid=1", 638 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
  639 + "launchMode": "default",
  640 + "scene": null
  641 + },
  642 + {
  643 + "name": "邀请函-----8",
  644 + "pathName": "pages/customer/detail_owner_invitation8",
  645 + "query": "id=403783&hasInvitation=1&hasSellerShare=1&tplid=1",
639 "launchMode": "default", 646 "launchMode": "default",
640 "scene": null 647 "scene": null
641 }, 648 },