xt / xcx-book · Commits

Go to a project

Commit 5a32ba6200e93fd173f061ae1810020535a51e0f

Authored by yiren
1 parent 9d52ea64
build: skipped

”新邀请函”

Inline Side-by-side
Showing 3 changed files with 55 additions and 38 deletions
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 <view class="introduce" wx:if="{{store && store.style=='1'}}"> 88 <view class="introduce" wx:if="{{store && store.style=='1'}}">
89 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 89 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
90 <view class="imgMask"> 90 <view class="imgMask">
91 - <image src="{{item}}" mode="" /> 91 + <image src="{{item}}" mode="widthFix" />
92 <view class="IntroduceColor chief Introducepublic {{theme+'chief'}}" wx:if="{{arryIndex=='0'}}"> 92 <view class="IntroduceColor chief Introducepublic {{theme+'chief'}}" wx:if="{{arryIndex=='0'}}">
93 <view class="englishText">Introduce</view> 93 <view class="englishText">Introduce</view>
94 <view class="chefText">品牌介绍</view> 94 <view class="chefText">品牌介绍</view>
@@ -98,8 +98,8 @@ @@ -98,8 +98,8 @@
98 <view class="labelBox"> 98 <view class="labelBox">
99 <view class="line"> 99 <view class="line">
100 </view> 100 </view>
101 - <view class="label">{{store.introduce}}  
102 - </view> 101 + <text class="label">{{store.introduce}}
  102 + </text>
103 </view> 103 </view>
104 </view> 104 </view>
105 </view> 105 </view>
@@ -117,11 +117,11 @@ @@ -117,11 +117,11 @@
117 <view class="labelBox"> 117 <view class="labelBox">
118 <view class="line"> 118 <view class="line">
119 </view> 119 </view>
120 - <view class="label styleLabel">{{store.introduce}}  
121 - </view> 120 + <text class="label styleLabel">{{store.introduce}}
  121 + </text>
122 </view> 122 </view>
123 </view> 123 </view>
124 - <image src="{{item}}" mode="" /> 124 + <image src="{{item}}" mode="aspectFill"/>
125 </view> 125 </view>
126 </view> 126 </view>
127 </view> 127 </view>
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 <view class="introduce famousChefBox" wx:if="{{chef && chef.style=='1'}}"> 129 <view class="introduce famousChefBox" wx:if="{{chef && chef.style=='1'}}">
130 <view class="IntroductionItems"> 130 <view class="IntroductionItems">
131 <view class="imgMask"> 131 <view class="imgMask">
132 - <image src="{{chef.image}}" mode="widthFix" /> 132 + <image src="{{chef.image}}" mode="aspectFill" />
133 <view class="IntroduceColor Introducepublic {{theme+'chief'}}"> 133 <view class="IntroduceColor Introducepublic {{theme+'chief'}}">
134 <view class="englishText">Chief Cook</view> 134 <view class="englishText">Chief Cook</view>
135 <view class="chefText">知名主厨</view> 135 <view class="chefText">知名主厨</view>
@@ -137,8 +137,8 @@ @@ -137,8 +137,8 @@
137 {{chef.chef_name}} 137 {{chef.chef_name}}
138 </view> 138 </view>
139 <view class="labelBox labelBox1"> 139 <view class="labelBox labelBox1">
140 - <view class="label">{{chef.introduce}}  
141 - </view> 140 + <text class="label" >{{chef.introduce}}
  141 + </text>
142 <view class="line"> 142 <view class="line">
143 </view> 143 </view>
144 </view> 144 </view>
@@ -158,18 +158,18 @@ @@ -158,18 +158,18 @@
158 <view class="labelBox labelBox1"> 158 <view class="labelBox labelBox1">
159 <view class="line"> 159 <view class="line">
160 </view> 160 </view>
161 - <view class="label styleLabel">{{chef .introduce}}  
162 - </view> 161 + <text class="label styleLabel">{{chef .introduce}}
  162 + </text>
163 </view> 163 </view>
164 </view> 164 </view>
165 - <image src="{{chef.image}}" mode="" /> 165 + <image src="{{chef.image}}" mode="aspectFill" />
166 </view> 166 </view>
167 </view> 167 </view>
168 </view> 168 </view>
169 <view class="introduce vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}"> 169 <view class="introduce vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}">
170 <view class="IntroductionItems" wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 170 <view class="IntroductionItems" wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
171 <view class="imgMask"> 171 <view class="imgMask">
172 - <image src="{{item}}" mode="widthFix" /> 172 + <image src="{{item}}" mode="aspectFill" />
173 <view class="IntroduceColor Introducepublic {{theme+'chief'}}" wx:if="{{arryIndex=='0'}}"> 173 <view class="IntroduceColor Introducepublic {{theme+'chief'}}" wx:if="{{arryIndex=='0'}}">
174 <view class="englishText">Favorites</view> 174 <view class="englishText">Favorites</view>
175 <view class="chefText">菜品展示</view> 175 <view class="chefText">菜品展示</view>
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@
234 </view> 234 </view>
235 <view class="vips"> 235 <view class="vips">
236 <image src="{{marketing.logo?marketing.logo:detail.seller.seller_image}}" mode="heightFix" /> 236 <image src="{{marketing.logo?marketing.logo:detail.seller.seller_image}}" mode="heightFix" />
237 - <view class="news"> 237 + <view class="news" wx:if="{{marketing.wecomle}}">
238 {{marketing.wecomle}} 238 {{marketing.wecomle}}
239 </view> 239 </view>
240 <!-- <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy"> 240 <!-- <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy">
@@ -243,6 +243,10 @@ @@ -243,6 +243,10 @@
243 <view class="text"> 243 <view class="text">
244 {{seller.name?seller.name:reserve.seller_name}} 244 {{seller.name?seller.name:reserve.seller_name}}
245 </view> 245 </view>
  246 + <text style="color: #999; font-size: 26rpx;font-family: PingFang SC;">
  247 + \n
  248 + 周到安排提供技术支持 400 000 9690
  249 + </text>
246 </view> 250 </view>
247 </scroll-view> 251 </scroll-view>
248 <view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}"> 252 <view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
@@ -233,7 +233,10 @@ @@ -233,7 +233,10 @@
233 .imgMask { 233 .imgMask {
234 position: relative; 234 position: relative;
235 } 235 }
236 - 236 +.imgMask image{
  237 + height: calc(100vw * 353/430) !important;
  238 + margin-bottom: 18rpx;
  239 +}
237 .introduce .chief { 240 .introduce .chief {
238 top: 0; 241 top: 0;
239 left: 0; 242 left: 0;
@@ -267,6 +270,16 @@ @@ -267,6 +270,16 @@
267 color: #ffffff; 270 color: #ffffff;
268 font-family: FangSong; 271 font-family: FangSong;
269 font-size: 20rpx; 272 font-size: 20rpx;
  273 + height: 400rpx;
  274 + overflow: hidden;
  275 + white-space: nowrap;
  276 + word-wrap: break-word;
  277 + overflow: hidden;
  278 + word-break: break-all;
  279 + text-overflow: ellipsis;
  280 + display: -webkit-box;
  281 + -webkit-box-orient: vertical;
  282 + -webkit-line-clamp: 10;
270 } 283 }
271 284
272 .labelBox .styleLabel { 285 .labelBox .styleLabel {
@@ -290,9 +303,6 @@ @@ -290,9 +303,6 @@
290 display: block; 303 display: block;
291 } 304 }
292 305
293 -.IntroductionItems {  
294 - margin-bottom: 18rpx;  
295 -}  
296 306
297 .famousChefBox { 307 .famousChefBox {
298 position: relative; 308 position: relative;
@@ -323,7 +333,9 @@ @@ -323,7 +333,9 @@
323 text-align: right; 333 text-align: right;
324 box-sizing: border-box; 334 box-sizing: border-box;
325 } 335 }
326 - 336 +.famousChefBox .styleSeparate2 image{
  337 + width: 100%;
  338 +}
327 .vegetableBox .IntroduceColor { 339 .vegetableBox .IntroduceColor {
328 top: 0; 340 top: 0;
329 right: 0; 341 right: 0;
@@ -124,39 +124,40 @@ Page({ @@ -124,39 +124,40 @@ Page({
124 openid: opt.openid, 124 openid: opt.openid,
125 fromid: opt.fromid ? opt.fromid : '' 125 fromid: opt.fromid ? opt.fromid : ''
126 }) 126 })
127 - if(opt.uid && opt.uid!=''){  
128 - App.Activity.SetRelation({  
129 - uid:opt.uid,  
130 - })  
131 - App.Activity.SetIntegral({  
132 - uid:opt.uid,  
133 - type:0,  
134 - rid:opt.id,  
135 - openid:opt.openid  
136 - })  
137 - }  
138 - let sid=res.data.sid  
139 - console.log(sid,'sidsidsidsidsidsidsidsidsid');  
140 - console.log(res.data.openid,'resdataopenidopenidopenidopenid');  
141 - console.log(opt.hasInvitation,'hasInvitation');  
142 - console.log(opt.openid,'optopenidoptopenidopt.openid'); 127 + if(opt.uid && opt.uid!=''){
  128 + App.Activity.SetRelation({
  129 + uid:opt.uid,
  130 + })
  131 + App.Activity.SetIntegral({
  132 + uid:opt.uid,
  133 + type:0,
  134 + rid:opt.id,
  135 + openid:opt.openid
  136 + })
  137 + }
  138 + //is_new_template为1 显示新邀请函detail_owner_invitation_new 0显示旧邀请函detail_owner_invitation
  139 + let is_new=res.data.seller.is_new_template;
  140 + console.log(res.data.seller.is_new_template,'is_new_templateis_new_template');
  141 + console.log(res.data.openid,'resdataopenidopenidopenidopenid');
  142 + console.log(opt.hasInvitation,'hasInvitation');
  143 + console.log(opt.openid,'optopenidoptopenidopt.openid');
143 if (!res.data.openid) {//无预订人 144 if (!res.data.openid) {//无预订人
144 url = '/pages/customer/detail_owner'; 145 url = '/pages/customer/detail_owner';
145 - if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) { 146 + if (opt.hasInvitation == 1 && is_new=='1') {
146 url = '/pages/customer/detail_owner_invitation_new'; 147 url = '/pages/customer/detail_owner_invitation_new';
147 }else{ 148 }else{
148 url = '/pages/customer/detail_owner_invitation'; 149 url = '/pages/customer/detail_owner_invitation';
149 } 150 }
150 } else { 151 } else {
151 url = '/pages/customer/detail_customer'; 152 url = '/pages/customer/detail_customer';
152 - if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) { 153 + if (opt.hasInvitation == 1 && is_new=='1') {
153 url = '/pages/customer/detail_owner_invitation_new'; 154 url = '/pages/customer/detail_owner_invitation_new';
154 }else{ 155 }else{
155 url = '/pages/customer/detail_invitation'; 156 url = '/pages/customer/detail_invitation';
156 } 157 }
157 if (res.data.openid == opt.openid) { 158 if (res.data.openid == opt.openid) {
158 url = '/pages/customer/detail_owner'; 159 url = '/pages/customer/detail_owner';
159 - if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) { 160 + if (opt.hasInvitation == 1 && is_new=='1') {
160 url = '/pages/customer/detail_owner_invitation_new'; 161 url = '/pages/customer/detail_owner_invitation_new';
161 }else{ 162 }else{
162 url = '/pages/customer/detail_owner_invitation'; 163 url = '/pages/customer/detail_owner_invitation';