xt / xcx-book · Commits

Go to a project

Commit 55270053d1924e531e3ea3dc14a2a83de4febf4a

Authored by pengye
1 parent 270d6895
build: skipped

新邀请函通用模板18-22

Inline Side-by-side
Showing 9 changed files with 86 additions and 49 deletions
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <image class="giftImg" bindtap="gotoSellerGift" data-form="1" wx:if="{{(hasValueCertificate && coupon_dataList.length>0) || (!is_user_comments && isComments =='1' && couponData.showCoupon =='1') || (hasValueRecharge && marketing.is_recharge=='1' && recharge_data)}}" src="https://nosqn.colorcun.com/sellerGift.png" mode="" /> 6 <image class="giftImg" bindtap="gotoSellerGift" data-form="1" wx:if="{{(hasValueCertificate && coupon_dataList.length>0) || (!is_user_comments && isComments =='1' && couponData.showCoupon =='1') || (hasValueRecharge && marketing.is_recharge=='1' && recharge_data)}}" src="https://nosqn.colorcun.com/sellerGift.png" mode="" />
7 <image wx:if="{{detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 7 <image wx:if="{{detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
9 - <view class="reservationInfo"> 9 + <view class="reservationInfo {{options.bookType ? 'birthdaySty' : 'noBirthday'}}">
10 <view class="infoTop"> 10 <view class="infoTop">
11 <text space="nbsp" class="font48r">{{seller.name||reserve.seller_name}}</text> 11 <text space="nbsp" class="font48r">{{seller.name||reserve.seller_name}}</text>
12 <text space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}" class="font28r">{{home.slogan}}</text> 12 <text space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}" class="font28r">{{home.slogan}}</text>
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <image src="https://qn.colorcun.com/invitation10Phone1.png" mode="" /><text>联系我</text> 65 <image src="https://qn.colorcun.com/invitation10Phone1.png" mode="" /><text>联系我</text>
66 </view> 66 </view>
67 <view wx:if="{{staffinfo.wechat}}" class="font22r brownFont" bindtap="copyWeChat"> 67 <view wx:if="{{staffinfo.wechat}}" class="font22r brownFont" bindtap="copyWeChat">
68 - <image src="https://qn.colorcun.com/invitation10Wx1.png" mode="" /><text>加微信</text> 68 + <image src="https://qn.colorcun.com/invitation10Wx2.png" mode="" /><text>加微信</text>
69 </view> 69 </view>
70 </view> 70 </view>
71 </view> 71 </view>
@@ -82,6 +82,7 @@ @@ -82,6 +82,7 @@
82 </view> 82 </view>
83 <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" /> 83 <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />
84 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text> 84 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>
  85 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
85 </view> 86 </view>
86 <view class="certificateInfo"> 87 <view class="certificateInfo">
87 <view class="preferentialDetails"> 88 <view class="preferentialDetails">
@@ -231,7 +232,7 @@ @@ -231,7 +232,7 @@
231 <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 232 <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
232 <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index"> 233 <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index">
233 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 234 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
234 - <image wx:if="{{item.type=='1'}}" mode="scaleToFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{reserve.imgsInfo}}"></image> 235 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{reserve.imgsInfo}}"></image>
235 </swiper-item> 236 </swiper-item>
236 </swiper> 237 </swiper>
237 </view> 238 </view>
@@ -244,7 +245,7 @@ @@ -244,7 +245,7 @@
244 <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 245 <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
245 <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index"> 246 <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index">
246 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 247 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
247 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image> 248 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image>
248 </swiper-item> 249 </swiper-item>
249 </swiper> 250 </swiper>
250 </view> 251 </view>
@@ -257,7 +258,7 @@ @@ -257,7 +258,7 @@
257 <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 258 <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
258 <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index"> 259 <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index">
259 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 260 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
260 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image> 261 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image>
261 </swiper-item> 262 </swiper-item>
262 </swiper> 263 </swiper>
263 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}"> 264 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}">
@@ -276,7 +277,7 @@ @@ -276,7 +277,7 @@
276 <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 277 <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
277 <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index"> 278 <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index">
278 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 279 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
279 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image> 280 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image>
280 </swiper-item> 281 </swiper-item>
281 </swiper> 282 </swiper>
282 </view> 283 </view>
@@ -19,10 +19,18 @@ @@ -19,10 +19,18 @@
19 box-sizing: border-box; 19 box-sizing: border-box;
20 position: relative; 20 position: relative;
21 color: #000; 21 color: #000;
  22 +}
  23 +
  24 +.birthdaySty{
22 background: url('https://qn.colorcun.com/invitation10Bj.png') no-repeat; 25 background: url('https://qn.colorcun.com/invitation10Bj.png') no-repeat;
23 background-size: cover; 26 background-size: cover;
24 } 27 }
25 28
  29 +.noBirthday{
  30 + background: url('https://qn.colorcun.com/invitation10Bj_1.png') no-repeat;
  31 + background-size: cover;
  32 +}
  33 +
26 .infoTop { 34 .infoTop {
27 color: #000000; 35 color: #000000;
28 font-weight: 600; 36 font-weight: 600;
@@ -244,7 +252,7 @@ @@ -244,7 +252,7 @@
244 flex-direction: column; 252 flex-direction: column;
245 } 253 }
246 254
247 -.priceText .icons { 255 +.icons {
248 font-family: PingFang SC; 256 font-family: PingFang SC;
249 color: #fff; 257 color: #fff;
250 font-size: 20rpx; 258 font-size: 20rpx;
@@ -289,9 +297,9 @@ @@ -289,9 +297,9 @@
289 width: max-content; 297 width: max-content;
290 margin-top: 24rpx; 298 margin-top: 24rpx;
291 flex-shrink: 0; 299 flex-shrink: 0;
292 - border: 2rpx solid #999; 300 + border: 2rpx solid #CC9B6A;
293 background: transparent; 301 background: transparent;
294 - color: #999; 302 + color: #CC9B6A;
295 } 303 }
296 304
297 .grantNum { 305 .grantNum {
@@ -558,7 +566,8 @@ @@ -558,7 +566,8 @@
558 display: flex; 566 display: flex;
559 flex-direction: column; 567 flex-direction: column;
560 color: #fff; 568 color: #fff;
561 - margin: 0 28% 0 40rpx; 569 + margin-left: 40rpx;
  570 + flex: 1;
562 } 571 }
563 572
564 .detailBanner { 573 .detailBanner {
@@ -61,7 +61,8 @@ Page({ @@ -61,7 +61,8 @@ Page({
61 isVoice: '', //播报按钮 61 isVoice: '', //播报按钮
62 openOrder: '', //点餐 62 openOrder: '', //点餐
63 isComments: '', //券和充值 63 isComments: '', //券和充值
64 - bookType: '', //用餐类型 1婚宴模板1 2商务宴模板1 64 + bookType: '', //模板18为1，模板21为2
  65 + make:'',//用餐类型 1婚宴模板1 2商务宴模板1
65 urlsArr: [], //包间预览图片、餐厅logo、餐厅首图列表 66 urlsArr: [], //包间预览图片、餐厅logo、餐厅首图列表
66 roomimage: [], //包间信息列表 67 roomimage: [], //包间信息列表
67 activeTitle: '1', //选择的标题 1优惠券 2充值 3评价 68 activeTitle: '1', //选择的标题 1优惠券 2充值 3评价
@@ -88,11 +89,13 @@ Page({ @@ -88,11 +89,13 @@ Page({
88 } 89 }
89 param.tpls = [TP.tpls(options.tplid)] 90 param.tpls = [TP.tpls(options.tplid)]
90 let bookType = options.bookType; 91 let bookType = options.bookType;
  92 + let make = options.make || '';
91 console.log('param', param); 93 console.log('param', param);
92 console.log('options', options); 94 console.log('options', options);
93 this.setData({ 95 this.setData({
94 ...param, 96 ...param,
95 - bookType 97 + bookType,
  98 + make,
96 }) 99 })
97 mta.Page.init({ 100 mta.Page.init({
98 "appID": "500667280", 101 "appID": "500667280",
@@ -7,13 +7,13 @@ @@ -7,13 +7,13 @@
7 <image wx:if="{{detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 7 <image wx:if="{{detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
9 <view class="reservationInfoBox"> 9 <view class="reservationInfoBox">
10 - <view class="reservationInfo"> 10 + <view class="reservationInfo reservationInfo{{make}}">
11 <view class="infoTop"> 11 <view class="infoTop">
12 <text wx:if="{{bookType == '2'}}" class="infoTopText1" space="nbsp">INVITATION</text> 12 <text wx:if="{{bookType == '2'}}" class="infoTopText1" space="nbsp">INVITATION</text>
13 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text> 13 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text>
14 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text> 14 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text>
15 - <text wx:if="{{bookType == '2'}}" class="infoTopText4 font44r" space="nbsp">邀请函</text>  
16 - <image wx:if="{{bookType == '1'}}" class="infoTopBj2" src="https://qn.colorcun.com/invitation11Bg2.png" mode="" /> 15 + <text wx:if="{{!make || make=='2'}}" class="infoTopText4 font44r" space="nbsp">邀请函</text>
  16 + <image wx:if="{{bookType == '1' && make == '1'}}" class="infoTopBj2" src="https://qn.colorcun.com/invitation11Bg2.png" mode="" />
17 </view> 17 </view>
18 <view class="informationBox"> 18 <view class="informationBox">
19 <view class="infoItem"> 19 <view class="infoItem">
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 </view> 78 </view>
79 <swiper wx:if="{{bookType == '1' && urlsArr.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 79 <swiper wx:if="{{bookType == '1' && urlsArr.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
80 <swiper-item wx:for="{{urlsArr}}" wx:key="index"> 80 <swiper-item wx:for="{{urlsArr}}" wx:key="index">
81 - <image mode="" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{urlsArr}}"></image> 81 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{urlsArr}}"></image>
82 </swiper-item> 82 </swiper-item>
83 </swiper> 83 </swiper>
84 <text space="nbsp" wx:if="{{bookType == '1' && marketing.wecomle}}" class="welcomeInfo font32r">{{marketing.wecomle}}</text> 84 <text space="nbsp" wx:if="{{bookType == '1' && marketing.wecomle}}" class="welcomeInfo font32r">{{marketing.wecomle}}</text>
@@ -119,6 +119,7 @@ @@ -119,6 +119,7 @@
119 </view> 119 </view>
120 <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" /> 120 <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />
121 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text> 121 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>
  122 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
122 </view> 123 </view>
123 <view class="certificateInfo"> 124 <view class="certificateInfo">
124 <view class="preferentialDetails"> 125 <view class="preferentialDetails">
@@ -284,7 +285,7 @@ @@ -284,7 +285,7 @@
284 <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 285 <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
285 <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index"> 286 <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index">
286 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 287 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
287 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{reserve.imgsInfo}}"></image> 288 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{reserve.imgsInfo}}"></image>
288 </swiper-item> 289 </swiper-item>
289 </swiper> 290 </swiper>
290 </view> 291 </view>
@@ -301,7 +302,7 @@ @@ -301,7 +302,7 @@
301 <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 302 <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
302 <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index"> 303 <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index">
303 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 304 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
304 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image> 305 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image>
305 </swiper-item> 306 </swiper-item>
306 </swiper> 307 </swiper>
307 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}"> 308 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}">
@@ -324,7 +325,7 @@ @@ -324,7 +325,7 @@
324 <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 325 <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
325 <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index"> 326 <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index">
326 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 327 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
327 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image> 328 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image>
328 </swiper-item> 329 </swiper-item>
329 </swiper> 330 </swiper>
330 </view> 331 </view>
@@ -341,7 +342,7 @@ @@ -341,7 +342,7 @@
341 <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> 342 <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
342 <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index"> 343 <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index">
343 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> 344 <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
344 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image> 345 + <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image>
345 </swiper-item> 346 </swiper-item>
346 </swiper> 347 </swiper>
347 </view> 348 </view>
@@ -11,11 +11,14 @@ @@ -11,11 +11,14 @@
11 } 11 }
12 12
13 .viewBox1 .reservationInfo { 13 .viewBox1 .reservationInfo {
14 - background: url('https://qn.colorcun.com/invitation11Bg1.png') no-repeat;  
15 padding: 220rpx 20rpx 24rpx; 14 padding: 220rpx 20rpx 24rpx;
16 box-sizing: border-box; 15 box-sizing: border-box;
17 position: relative; 16 position: relative;
18 color: #000; 17 color: #000;
  18 +}
  19 +
  20 +.viewBox1 .reservationInfo1 {
  21 + background: url('https://qn.colorcun.com/invitation11Bg1.png') no-repeat;
19 background-size: cover; 22 background-size: cover;
20 } 23 }
21 24
@@ -251,6 +254,7 @@ @@ -251,6 +254,7 @@
251 display: flex; 254 display: flex;
252 justify-content: space-between; 255 justify-content: space-between;
253 align-items: center; 256 align-items: center;
  257 + margin-bottom: 10rpx;
254 } 258 }
255 259
256 .chefText .line { 260 .chefText .line {
@@ -327,7 +331,7 @@ @@ -327,7 +331,7 @@
327 flex-direction: column; 331 flex-direction: column;
328 } 332 }
329 333
330 -.priceText .icons { 334 +.icons {
331 font-family: PingFang SC; 335 font-family: PingFang SC;
332 color: #F6231B; 336 color: #F6231B;
333 font-size: 20rpx; 337 font-size: 20rpx;
@@ -374,9 +378,9 @@ @@ -374,9 +378,9 @@
374 width: max-content; 378 width: max-content;
375 margin-top: 24rpx; 379 margin-top: 24rpx;
376 flex-shrink: 0; 380 flex-shrink: 0;
377 - border: 2rpx solid #999; 381 + border: 2rpx solid #AE2D2D;
378 background: transparent; 382 background: transparent;
379 - color: #999; 383 + color: #AE2D2D;
380 } 384 }
381 385
382 .grantNum { 386 .grantNum {
@@ -388,7 +392,7 @@ @@ -388,7 +392,7 @@
388 } 392 }
389 393
390 .grantNum text { 394 .grantNum text {
391 - color: #CC9B6A; 395 + color: #F6231B;
392 margin-right: 10rpx; 396 margin-right: 10rpx;
393 } 397 }
394 398
@@ -1036,6 +1040,7 @@ @@ -1036,6 +1040,7 @@
1036 1040
1037 .viewBox2 .reservationInfo { 1041 .viewBox2 .reservationInfo {
1038 background: url('https://qn.colorcun.com/invitation12Bj.png') no-repeat; 1042 background: url('https://qn.colorcun.com/invitation12Bj.png') no-repeat;
  1043 +
1039 padding: 220rpx 20rpx 120rpx; 1044 padding: 220rpx 20rpx 120rpx;
1040 box-sizing: border-box; 1045 box-sizing: border-box;
1041 position: relative; 1046 position: relative;
@@ -1052,10 +1057,11 @@ @@ -1052,10 +1057,11 @@
1052 margin-bottom: 40rpx; 1057 margin-bottom: 40rpx;
1053 } 1058 }
1054 1059
1055 -.viewBox2 .infoTopText4 {  
1056 - font-size: 100rpx;  
1057 - line-height: 100rpx; 1060 +.infoTopText4 {
  1061 + font-size: 120rpx;
  1062 + line-height: 120rpx;
1058 letter-spacing: 20rpx; 1063 letter-spacing: 20rpx;
  1064 + margin-bottom: 32rpx;
1059 } 1065 }
1060 1066
1061 .viewBox2 .informationBox { 1067 .viewBox2 .informationBox {
@@ -1078,6 +1084,11 @@ @@ -1078,6 +1084,11 @@
1078 border: 2rpx solid #fff; 1084 border: 2rpx solid #fff;
1079 } 1085 }
1080 1086
  1087 +.viewBox2 .orderingFood {
  1088 + color: #000;
  1089 + border: 2rpx solid #000;
  1090 +}
  1091 +
1081 .viewBox2 .positioning { 1092 .viewBox2 .positioning {
1082 background: #E8CEA8; 1093 background: #E8CEA8;
1083 color: #000; 1094 color: #000;
@@ -61,7 +61,8 @@ Page({ @@ -61,7 +61,8 @@ Page({
61 isVoice: '', //播报按钮 61 isVoice: '', //播报按钮
62 openOrder: '', //点餐 62 openOrder: '', //点餐
63 isComments: '', //券和充值 63 isComments: '', //券和充值
64 - bookType: '', //用餐类型 1婚宴模板1 2商务宴模板1 64 + bookType: '', //模板19为1，模板22为2
  65 + make:'',//用餐类型 1婚宴模板1 2商务宴模板1
65 urlsArr: [], //包间预览图片、餐厅logo、餐厅首图列表 66 urlsArr: [], //包间预览图片、餐厅logo、餐厅首图列表
66 roomimage: [], //包间信息列表 67 roomimage: [], //包间信息列表
67 activeTitle: '1', //选择的标题 1优惠券 2充值 3评价 68 activeTitle: '1', //选择的标题 1优惠券 2充值 3评价
@@ -91,11 +92,13 @@ Page({ @@ -91,11 +92,13 @@ Page({
91 } 92 }
92 param.tpls = [TP.tpls(options.tplid)] 93 param.tpls = [TP.tpls(options.tplid)]
93 let bookType = options.bookType; 94 let bookType = options.bookType;
  95 + let make = options.make || '';
94 console.log('param', param); 96 console.log('param', param);
95 console.log('options', options); 97 console.log('options', options);
96 this.setData({ 98 this.setData({
97 ...param, 99 ...param,
98 - bookType 100 + bookType,
  101 + make,
99 }) 102 })
100 mta.Page.init({ 103 mta.Page.init({
101 "appID": "500667280", 104 "appID": "500667280",
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <image class="giftImg" bindtap="gotoSellerGift" data-form="1" wx:if="{{(hasValueCertificate && coupon_dataList.length>0) || (!is_user_comments && isComments =='1' && couponData.showCoupon =='1') || (hasValueRecharge && marketing.is_recharge=='1' && recharge_data)}}" src="https://nosqn.colorcun.com/sellerGift.png" mode="" /> 6 <image class="giftImg" bindtap="gotoSellerGift" data-form="1" wx:if="{{(hasValueCertificate && coupon_dataList.length>0) || (!is_user_comments && isComments =='1' && couponData.showCoupon =='1') || (hasValueRecharge && marketing.is_recharge=='1' && recharge_data)}}" src="https://nosqn.colorcun.com/sellerGift.png" mode="" />
7 <image wx:if="{{detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 7 <image wx:if="{{detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
9 - <view class="reservationInfo"> 9 + <view class="reservationInfo reservationInfo{{make}}">
10 <view wx:if="{{bookType == '2'}}" class="infoTop"> 10 <view wx:if="{{bookType == '2'}}" class="infoTop">
11 <text class="infoTopText4 font44r" space="nbsp">邀请函</text> 11 <text class="infoTopText4 font44r" space="nbsp">邀请函</text>
12 <text class="infoTopText1" space="nbsp">INVITATION</text> 12 <text class="infoTopText1" space="nbsp">INVITATION</text>
@@ -163,6 +163,7 @@ @@ -163,6 +163,7 @@
163 </view> 163 </view>
164 <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" /> 164 <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />
165 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text> 165 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>
  166 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
166 </view> 167 </view>
167 <view class="certificateInfo"> 168 <view class="certificateInfo">
168 <view class="preferentialDetails"> 169 <view class="preferentialDetails">
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 } 10 }
11 11
12 .viewBox1 .reservationInfo { 12 .viewBox1 .reservationInfo {
13 - background: url('https://qn.colorcun.com/invitation13Bj1.png') no-repeat; 13 + background: url('https://qn.colorcun.com/invitation13Bj1_1.png') no-repeat;
14 padding: 460rpx 20rpx 24rpx; 14 padding: 460rpx 20rpx 24rpx;
15 box-sizing: border-box; 15 box-sizing: border-box;
16 position: relative; 16 position: relative;
@@ -18,6 +18,11 @@ @@ -18,6 +18,11 @@
18 background-size: cover; 18 background-size: cover;
19 } 19 }
20 20
  21 +.viewBox1 .reservationInfo1 {
  22 + background: url('https://qn.colorcun.com/invitation13Bj1.png') no-repeat;
  23 + background-size: cover;
  24 +}
  25 +
21 .infoTop { 26 .infoTop {
22 color: #D2541C; 27 color: #D2541C;
23 font-weight: 600; 28 font-weight: 600;
@@ -364,7 +369,7 @@ @@ -364,7 +369,7 @@
364 flex-direction: column; 369 flex-direction: column;
365 } 370 }
366 371
367 -.priceText .icons { 372 +.icons {
368 font-family: PingFang SC; 373 font-family: PingFang SC;
369 color: #fff; 374 color: #fff;
370 font-size: 20rpx; 375 font-size: 20rpx;
@@ -409,9 +414,9 @@ @@ -409,9 +414,9 @@
409 width: max-content; 414 width: max-content;
410 margin-top: 24rpx; 415 margin-top: 24rpx;
411 flex-shrink: 0; 416 flex-shrink: 0;
412 - border: 2rpx solid #999; 417 + border: 2rpx solid #D2541C;
413 background: transparent; 418 background: transparent;
414 - color: #999; 419 + color: #D2541C;
415 } 420 }
416 421
417 .grantNum { 422 .grantNum {
@@ -423,7 +428,7 @@ @@ -423,7 +428,7 @@
423 } 428 }
424 429
425 .grantNum text { 430 .grantNum text {
426 - color: #CC9B6A; 431 + color: #D2541C;
427 margin-right: 10rpx; 432 margin-right: 10rpx;
428 } 433 }
429 434
@@ -1240,6 +1245,12 @@ @@ -1240,6 +1245,12 @@
1240 color: #fff; 1245 color: #fff;
1241 } 1246 }
1242 1247
1243 -.publicModalBox2 .cook { 1248 +.publicModalBox2 .cook,
  1249 +.publicModalBox2 .grantNum text {
  1250 + color: #854F1E;
  1251 +}
  1252 +
  1253 +.publicModalBox2 .orderingFood {
1244 color: #854F1E; 1254 color: #854F1E;
  1255 + border: 2rpx solid #854F1E;
1245 } 1256 }
@@ -131,20 +131,17 @@ Page({ @@ -131,20 +131,17 @@ Page({
131 } else { 131 } else {
132 url = '/pack-invitation/pages/detail_owner_invitation9'; 132 url = '/pack-invitation/pages/detail_owner_invitation9';
133 } 133 }
134 - // console.log('宴会类型-------------',reserev.reserve_type);  
135 - // if(reserev.reserve_type == '生日宴'){  
136 - // url = '/pack-invitation/pages/detail_owner_invitation10';  
137 - // }  
138 - // if((reserev.reserve_type == '婚宴' || reserev.reserve_type == '商务宴请') && reserev.cusdem == '1'){  
139 - // url = '/pack-invitation/pages/detail_owner_invitation11';  
140 - // }  
141 - // if((reserev.reserve_type == '婚宴' || reserev.reserve_type == '商务宴请') && reserev.cusdem == '2'){  
142 - // url = '/pack-invitation/pages/detail_owner_invitation12';  
143 - // } 134 + if(data.type == '18' || data.type == '21') url = '/pack-invitation/pages/detail_owner_invitation11';
  135 + if(data.type == '19' || data.type == '22') url = '/pack-invitation/pages/detail_owner_invitation12';
  136 + if(data.type == '20') url = '/pack-invitation/pages/detail_owner_invitation10';
144 // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否 137 // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否
145 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare + '&isDeposit=' + isDeposit; 138 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare + '&isDeposit=' + isDeposit;
146 - // if(reserev.reserve_type == '婚宴') url += '&bookType=1'  
147 - // if(reserev.reserve_type == '商务宴请') url += '&bookType=2' 139 + if(data.type == '18' || data.type == '19') url += '&bookType=1';
  140 + if(data.type == '21' || data.type == '22') url += '&bookType=2';
  141 + // console.log('宴会类型-------------',reserev.reserve_type);
  142 + // if(reserev.reserve_type == '生日宴') url += '&bookType=1'
  143 + // if(reserev.reserve_type == '婚宴' && (data.type == '18' || data.type == '19')) url += '&make=1'
  144 + // if(reserev.reserve_type == '商务宴请' && (data.type == '21' || data.type == '22')) url += '&make=2'
148 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束 145 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束
149 url += (isOrder == '1' || reserev.status == '3') ? '&isOrder=1' : ''; 146 url += (isOrder == '1' || reserev.status == '3') ? '&isOrder=1' : '';
150 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ; 147 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;