xt / xcx-book · Commits

Go to a project

Commit c051ee0111043eadb3eaa7689b36d4886cb88c8a

Authored by pengye
1 parent dddb3ce4
build: skipped

邀请函2-22模板标题加预订安排、邀请函

Inline Side-by-side
Showing 9 changed files with 50 additions and 13 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 {{options.bookType ? 'birthdaySty' : 'noBirthday'}}"> 9 + <view class="reservationInfo {{options.bookType ? 'birthdaySty' : 'noBirthday'}} {{options.hasSellerShare == '1' ? 'noBirthday1' : '' }}">
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>
@@ -31,6 +31,11 @@ @@ -31,6 +31,11 @@
31 background-size: cover; 31 background-size: cover;
32 } 32 }
33 33
  34 +.noBirthday1 {
  35 + background: url('https://nosqn.colorcun.com/invitation10Bj_2.png') no-repeat;
  36 + background-size: cover;
  37 +}
  38 +
34 .infoTop { 39 .infoTop {
35 color: #000000; 40 color: #000000;
36 font-weight: 600; 41 font-weight: 600;
@@ -6,13 +6,13 @@ @@ -6,13 +6,13 @@
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="reservationInfoBox"> 9 + <view class="reservationInfoBox" wx:if="{{detail && detail.ddate}}">
10 <view class="reservationInfo reservationInfo{{make}}"> 10 <view class="reservationInfo reservationInfo{{make}}">
11 <view class="infoTop"> 11 <view class="infoTop">
12 - <image wx:if="{{bookType == '2'}}" class="infoTopImg1" src="https://nosqn.colorcun.com/invitation11Title2.png" mode=""/> 12 + <image wx:if="{{bookType == '2'}}" class="infoTopImg1 {{options.hasSellerShare == '1' ? 'infoTopImg2' :''}}" src="https://nosqn.colorcun.com/{{options.hasSellerShare == '1' ? 'invitation11Title2_1.png' : 'invitation11Title2.png'}}" mode=""/>
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 - <image wx:if="{{bookType == '1' && (!make || make=='2')}}" class="infoTopText4" src="https://nosqn.colorcun.com/invitation11Title.png" mode=""/> 15 + <image wx:if="{{bookType == '1' && (!make || make=='2')}}" class="infoTopText4 {{options.hasSellerShare == '1' ? 'infoTopText5' :''}}" src="https://nosqn.colorcun.com/{{options.hasSellerShare == '1' ? 'invitation11Title1.png' : 'invitation11Title.png'}}" mode=""/>
16 <image wx:if="{{bookType == '1' && make == '1'}}" class="infoTopBj2" src="https://qn.colorcun.com/invitation11Bg2.png" mode="" /> 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">
@@ -40,6 +40,11 @@ @@ -40,6 +40,11 @@
40 height: 188rpx; 40 height: 188rpx;
41 } 41 }
42 42
  43 +.infoTopBj3 {
  44 + width: 478rpx;
  45 + height: 164rpx;
  46 +}
  47 +
43 .informationBox { 48 .informationBox {
44 border-radius: 10rpx; 49 border-radius: 10rpx;
45 background: #FFEFD6; 50 background: #FFEFD6;
@@ -1070,6 +1075,12 @@ @@ -1070,6 +1075,12 @@
1070 margin-bottom: 40rpx; 1075 margin-bottom: 40rpx;
1071 } 1076 }
1072 1077
  1078 +.viewBox2 .infoTopImg2 {
  1079 + width: 478rpx;
  1080 + height: 164rpx;
  1081 + margin-bottom: 40rpx;
  1082 +}
  1083 +
1073 .viewBox2 .infoTopText3 { 1084 .viewBox2 .infoTopText3 {
1074 margin-bottom: 0; 1085 margin-bottom: 0;
1075 } 1086 }
@@ -1080,6 +1091,11 @@ @@ -1080,6 +1091,11 @@
1080 margin-bottom: 32rpx; 1091 margin-bottom: 32rpx;
1081 } 1092 }
1082 1093
  1094 +.infoTopText5 {
  1095 + width: 408rpx;
  1096 + height: 112rpx;
  1097 +}
  1098 +
1083 .viewBox2 .informationBox { 1099 .viewBox2 .informationBox {
1084 background: transparent; 1100 background: transparent;
1085 padding: 40rpx 0; 1101 padding: 40rpx 0;
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
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 reservationInfo{{make}}"> 9 + <view class="reservationInfo reservationInfo{{make}} {{options.hasSellerShare == '1' ? 'reservationInfo3' : '' }}">
10 <view wx:if="{{bookType == '2'}}" class="infoTop"> 10 <view wx:if="{{bookType == '2'}}" class="infoTop">
11 - <image class="infoTopImg" src="https://nosqn.colorcun.com/invitation11Title3.png" mode=""/> 11 + <image class="infoTopImg {{options.hasSellerShare == '1' ? 'infoTopImg1' :''}}" src="https://nosqn.colorcun.com/{{options.hasSellerShare == '1' ? 'invitation11Title3_1.png' : 'invitation11Title3.png'}}" mode=""/>
12 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text> 12 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text>
13 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text> 13 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text>
14 </view> 14 </view>
@@ -18,6 +18,11 @@ @@ -18,6 +18,11 @@
18 background-size: cover; 18 background-size: cover;
19 } 19 }
20 20
  21 +.viewBox1 .reservationInfo3 {
  22 + background: url('https://qn.colorcun.com/invitation13Bj1_2.png') no-repeat;
  23 + background-size: cover;
  24 +}
  25 +
21 .viewBox1 .reservationInfo1 { 26 .viewBox1 .reservationInfo1 {
22 background: url('https://qn.colorcun.com/invitation13Bj1.png') no-repeat; 27 background: url('https://qn.colorcun.com/invitation13Bj1.png') no-repeat;
23 background-size: cover; 28 background-size: cover;
@@ -1205,6 +1210,10 @@ @@ -1205,6 +1210,10 @@
1205 width: 670rpx; 1210 width: 670rpx;
1206 height: 96rpx; 1211 height: 96rpx;
1207 } 1212 }
  1213 +.viewBox2 .infoTopImg1 {
  1214 + width: 433rpx;
  1215 + height: 80rpx;
  1216 +}
1208 1217
1209 .viewBox2 .infoTopText2 { 1218 .viewBox2 .infoTopText2 {
1210 margin: 38rpx 0 20rpx 0; 1219 margin: 38rpx 0 20rpx 0;
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 src="https://nosqn.colorcun.com/sellerGift.png" mode=""/> 15 src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
18 - <view class="reservationInfo"> 18 + <view class="reservationInfo" wx:if="{{themeColor}}">
19 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" /> 19 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
20 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" /> 20 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
21 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" /> 21 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" />
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && seller.tel && seller.tel.length>0}}">预订台<block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view> 40 <view class="leftInfo font36r tables" wx:if="{{swich_phone!='0' && seller && seller.tel && seller.tel.length>0}}">预订台<block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" bindtap="call">{{item}}</text>{{index==(seller.tel.length-1)?'':','}}</block></view>
41 </view> 41 </view>
42 <view class="infoBoxRight"> 42 <view class="infoBoxRight">
43 - 邀请函 43 + {{options.hasSellerShare=='1'?'预订安排':'邀请函'}}
44 </view> 44 </view>
45 </view> 45 </view>
46 <view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing"> 46 <view wx:if="{{roomimage && roomimage.length>0}}" class="pageSpacing">
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" /> 20 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
21 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" /> 21 <image wx:else src="https://qn.colorcun.com/leaf.png" class="titleIcon" />
22 <view class="infoBox"> 22 <view class="infoBox">
23 - <view class="infoBoxRight">邀请函</view> 23 + <view class="infoBoxRight">{{options.hasSellerShare=='1'?'预订安排':'邀请函'}}</view>
24 <view class="boxLeft"> 24 <view class="boxLeft">
25 <text space="nbsp" class="sellerTitle font48r">{{seller.name}}</text> 25 <text space="nbsp" class="sellerTitle font48r">{{seller.name}}</text>
26 <text space="nbsp" class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text> 26 <text space="nbsp" class="info font40r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
@@ -657,11 +657,18 @@ Page({ @@ -657,11 +657,18 @@ Page({
657 home = util.determine(data.home); 657 home = util.determine(data.home);
658 themeColor = data.lite_class || 'ultramarine'; 658 themeColor = data.lite_class || 'ultramarine';
659 StyleType = data.type; 659 StyleType = data.type;
660 - if (StyleType == '9' || StyleType == '10' || StyleType == '11' || StyleType == '12') {  
661 - inviteImgUrl = 'https://nosqn.colorcun.com/inviteText.png';  
662 - } else {  
663 - inviteImgUrl = 'https://nosqn.colorcun.com/inviteText1.png'; 660 + let isSeller = this.data.options.hasSellerShare;
  661 + let imgUrl = '';
  662 + if (StyleType == '9' || StyleType == '10' || StyleType == '12' || StyleType == '13') {
  663 + imgUrl = isSeller == '1' ? 'inviteText2' : 'inviteText';
  664 + }
  665 + if (StyleType == '11' || StyleType == '14' || StyleType == '15' || StyleType == '16') {
  666 + imgUrl = isSeller == '1' ? 'inviteText5' : 'inviteText1';
  667 + }
  668 + if (StyleType == '17') {
  669 + imgUrl = isSeller == '1' ? 'inviteText3' : 'inviteText4';
664 } 670 }
  671 + inviteImgUrl = 'https://nosqn.colorcun.com/' + imgUrl + '.png';
665 settingUrl = StyleType == '12' ? 'https://nosqn.colorcun.com/template12.jpg' : 'https://nosqn.colorcun.com/template' + StyleType + '.png'; 672 settingUrl = StyleType == '12' ? 'https://nosqn.colorcun.com/template12.jpg' : 'https://nosqn.colorcun.com/template' + StyleType + '.png';
666 if (StyleType == '9') colors = "#0B0805"; 673 if (StyleType == '9') colors = "#0B0805";
667 if (StyleType == '10' || StyleType == '17') colors = "#750100"; 674 if (StyleType == '10' || StyleType == '17') colors = "#750100";