xt / xcx-book · Commits

Go to a project

Commit 9add71b85fb39b0a7ca1b1c9e82e9288055ef0b8

Authored by pengye
1 parent b1c5f15d

邀请函新增201/202/203

Inline Side-by-side
Showing 4 changed files with 100 additions and 4 deletions
@@ -770,12 +770,16 @@ Page({ @@ -770,12 +770,16 @@ Page({
770 imgUrl = isSeller == '1' ? 'inviteText3' : 'inviteText4'; 770 imgUrl = isSeller == '1' ? 'inviteText3' : 'inviteText4';
771 } 771 }
772 inviteImgUrl = 'https://nosqn.colorcun.com/' + imgUrl + '.png'; 772 inviteImgUrl = 'https://nosqn.colorcun.com/' + imgUrl + '.png';
  773 + if (StyleType == '201' || StyleType == '202' || StyleType == '203') {
  774 + inviteImgUrl = '';
  775 + }
773 settingUrl = StyleType == '12' ? 'https://nosqn.colorcun.com/template12.jpg' : 'https://nosqn.colorcun.com/template' + StyleType + '.png'; 776 settingUrl = StyleType == '12' ? 'https://nosqn.colorcun.com/template12.jpg' : 'https://nosqn.colorcun.com/template' + StyleType + '.png';
774 if (StyleType == '9') colors = "#0B0805"; 777 if (StyleType == '9') colors = "#0B0805";
775 if (StyleType == '10' || StyleType == '17') colors = "#750100"; 778 if (StyleType == '10' || StyleType == '17') colors = "#750100";
776 if (StyleType == '11' || StyleType == '12') colors = "#0B1A67"; 779 if (StyleType == '11' || StyleType == '12') colors = "#0B1A67";
777 if (StyleType == '13' || StyleType == '15') colors = "#0B3133"; 780 if (StyleType == '13' || StyleType == '15') colors = "#0B3133";
778 if (StyleType == '14' || StyleType == '16') colors = "#1B1A23"; 781 if (StyleType == '14' || StyleType == '16') colors = "#1B1A23";
  782 + if (StyleType == '201' || StyleType == '202' || StyleType == '203') colors = "#750100";
779 titleType = data.title_class || '1'; 783 titleType = data.title_class || '1';
780 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : ''; 784 swich_phone = reserve && reserve.swich_phone ? reserve.swich_phone : '';
781 if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : ''; 785 if (store) store.content = (store.is_introduce_all == '1' && store.content) ? util.determine(store.content) : '';
@@ -52,17 +52,20 @@ @@ -52,17 +52,20 @@
52 <view class="label font28r">用餐位置:</view> 52 <view class="label font28r">用餐位置:</view>
53 <view class="contentData font36r">{{seller.tablesText}}</view> 53 <view class="contentData font36r">{{seller.tablesText}}</view>
54 </view> 54 </view>
  55 + <text space="nbsp" class="welcomeMsg font28r" wx:if="{{(StyleType == '201' || StyleType == '202' || StyleType == '203') && reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}">
  56 + {{marketing.wecomle}}
  57 + </text>
55 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}"> 58 <view wx:if="{{roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
56 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}"> 59 <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="lookroom" data-item="{{item}}">
57 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image> 60 <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
58 <text>{{item.name}}</text> 61 <text>{{item.name}}</text>
59 </view> 62 </view>
60 </view> 63 </view>
61 - <text space="nbsp" class="welcomeMsg font28r" wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}"> 64 + <text space="nbsp" class="welcomeMsg font28r" wx:if="{{StyleType != '201' && StyleType != '202' && StyleType != '203' && reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}">
62 {{marketing.wecomle}} 65 {{marketing.wecomle}}
63 </text> 66 </text>
64 </view> 67 </view>
65 - <view wx:if="{{titleType == '1'}}" class="separatrixOne"> 68 + <view wx:if="{{titleType == '1' && StyleType != '201' && StyleType != '202' && StyleType != '203'}}" class="separatrixOne">
66 <block wx:for="{{num1}}" wx:key="index"><text class="text{{item}}"></text></block> 69 <block wx:for="{{num1}}" wx:key="index"><text class="text{{item}}"></text></block>
67 <text class="text9"></text> 70 <text class="text9"></text>
68 <block wx:for="{{num2}}" wx:key="index"><text class="text{{item}}"></text></block> 71 <block wx:for="{{num2}}" wx:key="index"><text class="text{{item}}"></text></block>
@@ -302,7 +305,7 @@ @@ -302,7 +305,7 @@
302 </view> 305 </view>
303 </view> 306 </view>
304 </view> 307 </view>
305 - <view class="introduce rechargeBox {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}"> 308 + <view class="introduce rechargeBox {{(hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data) ? 'introduce' : 'introduce introduce1'}} {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
306 <block wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}"> 309 <block wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">
307 <block wx:if="{{titleType}}"> 310 <block wx:if="{{titleType}}">
308 <titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 311 <titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
@@ -278,6 +278,10 @@ @@ -278,6 +278,10 @@
278 margin: 0 20rpx 20rpx 20rpx; 278 margin: 0 20rpx 20rpx 20rpx;
279 } 279 }
280 280
  281 +.introduce1 {
  282 + padding: 0 0 20rpx 0;
  283 +}
  284 +
281 .introduceBottom { 285 .introduceBottom {
282 margin-bottom: 220rpx; 286 margin-bottom: 220rpx;
283 } 287 }
@@ -1433,4 +1437,89 @@ @@ -1433,4 +1437,89 @@
1433 1437
1434 .viewBox17 .infoTopName { 1438 .viewBox17 .infoTopName {
1435 background: rgba(117, 1, 0, 0.75); 1439 background: rgba(117, 1, 0, 0.75);
  1440 +}
  1441 +
  1442 +/* 模板201 模板202 */
  1443 +.viewBox201 .reservationInfo,
  1444 +.viewBox202 .reservationInfo,
  1445 +.viewBox203 .reservationInfo {
  1446 + background-size: contain !important;
  1447 +}
  1448 +
  1449 +.viewBox201,
  1450 +.viewBox202 {
  1451 + background: #910100;
  1452 +}
  1453 +
  1454 +.viewBox201 .introduce,
  1455 +.viewBox201 .reserveBox,
  1456 +.viewBox202 .introduce,
  1457 +.viewBox202 .reserveBox,
  1458 +.viewBox203 .introduce,
  1459 +.viewBox203 .reserveBox {
  1460 + background: #750100;
  1461 +}
  1462 +
  1463 +.viewBox201 .bookInfo,
  1464 +.viewBox201 .centerBox,
  1465 +.viewBox202 .bookInfo,
  1466 +.viewBox202 .centerBox,
  1467 +.viewBox203 .bookInfo,
  1468 +.viewBox203 .centerBox {
  1469 + background: rgba(117, 1, 0, 0.7);
  1470 +}
  1471 +
  1472 +.viewBox201 .bookInfo,
  1473 +.viewBox202 .bookInfo {
  1474 + margin-top: 60rpx;
  1475 +}
  1476 +
  1477 +.viewBox201 .evaluateBox,
  1478 +.viewBox202 .evaluateBox,
  1479 +.viewBox203 .evaluateBox {
  1480 + background: #750100;
  1481 + margin: 30rpx 20rpx 20rpx 20rpx;
  1482 + padding: 42rpx 84rpx 42rpx 40rpx;
  1483 + flex: 1;
  1484 +}
  1485 +
  1486 +.viewBox201 .centerBox,
  1487 +.viewBox202 .centerBox,
  1488 +.viewBox203 .centerBox {
  1489 + margin: 26rpx 0 0 0;
  1490 + padding: 26rpx 60rpx 20rpx 60rpx;
  1491 + border-radius: 0;
  1492 +}
  1493 +
  1494 +.viewBox201 .rechargeBox .btns text,
  1495 +.viewBox201 .rechargeBox .bottom,
  1496 +.viewBox201 .itemBottom,
  1497 +.viewBox201+.sharewidth .shareItem,
  1498 +.viewBox202 .rechargeBox .btns text,
  1499 +.viewBox202 .rechargeBox .bottom,
  1500 +.viewBox202 .itemBottom,
  1501 +.viewBox202+.sharewidth .shareItem,
  1502 +.viewBox203 .rechargeBox .btns text,
  1503 +.viewBox203 .rechargeBox .bottom,
  1504 +.viewBox203 .itemBottom,
  1505 +.viewBox203+.sharewidth .shareItem {
  1506 + color: #750100;
  1507 +}
  1508 +
  1509 +.viewBox201 .orderingFood,
  1510 +.viewBox202 .orderingFood,
  1511 +.viewBox203 .orderingFood {
  1512 + color: #750100;
  1513 + border: 2rpx solid #750100;
  1514 +}
  1515 +
  1516 +.viewBox201+.sharewidth,
  1517 +.viewBox202+.sharewidth,
  1518 +.viewBox203+.sharewidth {
  1519 + background: #750100;
  1520 +}
  1521 +
  1522 +/* 模板203 */
  1523 +.viewBox203 {
  1524 + background: #A42118;
1436 } 1525 }
@@ -163,7 +163,7 @@ Page({ @@ -163,7 +163,7 @@ Page({
163 }).then(res => { 163 }).then(res => {
164 let data = res.data 164 let data = res.data
165 let url = ''; 165 let url = '';
166 - let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17]; 166 + let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17, 201, 202, 203];
167 let style =arr.includes(parseInt(data.type)) 167 let style =arr.includes(parseInt(data.type))
168 if (!style) { 168 if (!style) {
169 url = '/pack-invitation/pages/detail_owner_invitation' + data.type; 169 url = '/pack-invitation/pages/detail_owner_invitation' + data.type;