xt / xcx-book · Commits

Go to a project

Commit 560a602a12f9584e9031bf7051fe7b25ab49a237

Authored by pengye
1 parent 7a4e6a76
build: skipped

欢迎语修改

Inline Side-by-side
Showing 6 changed files with 9 additions and 7 deletions
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 </view> 49 </view>
50 </view> 50 </view>
51 </block> 51 </block>
52 - <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r"> 52 + <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
53 {{marketing.wecomle}} 53 {{marketing.wecomle}}
54 </view> 54 </view>
55 <view class="positioning"> 55 <view class="positioning">
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 </view> 46 </view>
47 </view> 47 </view>
48 </block> 48 </block>
49 - <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r"> 49 + <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
50 {{marketing.wecomle}} 50 {{marketing.wecomle}}
51 </view> 51 </view>
52 <view class="positioning"> 52 <view class="positioning">
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </view> 65 </view>
66 </view> 66 </view>
67 </block> 67 </block>
68 - <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font32r"> 68 + <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font32r">
69 {{marketing.wecomle}} 69 {{marketing.wecomle}}
70 </view> 70 </view>
71 <view class="positioning"> 71 <view class="positioning">
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </view> 61 </view>
62 </view> 62 </view>
63 </block> 63 </block>
64 - <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r"> 64 + <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
65 {{marketing.wecomle}} 65 {{marketing.wecomle}}
66 </view> 66 </view>
67 <view class="positioning"> 67 <view class="positioning">
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <view class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</view> 16 <view class="imgBottom font48r">【{{seller.name?seller.name:reserve.seller_name}}】</view>
17 </view> 17 </view>
18 <view class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}"> 18 <view class="begin font28r" wx:if="{{reserve && reserve.swich_booking=='1' && reserve.book_info}}">
19 - {{reserve && reserve.book_info}} 19 + {{reserve.book_info}}
20 </view> 20 </view>
21 <view class="infoItem" wx:if="{{seller.date}}"> 21 <view class="infoItem" wx:if="{{seller.date}}">
22 <view class="label font28r">【宴会日期】</view> 22 <view class="label font28r">【宴会日期】</view>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </view> 53 </view>
54 </view> 54 </view>
55 </block> 55 </block>
56 - <view wx:if="{{marketing && marketing.wecomle}}" class="welcome font36r"> 56 + <view wx:if="{{reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle}}" class="welcome font36r">
57 {{marketing.wecomle}} 57 {{marketing.wecomle}}
58 </view> 58 </view>
59 <view class="positioning"> 59 <view class="positioning">
@@ -67,7 +67,9 @@ Page({ @@ -67,7 +67,9 @@ Page({
67 }).then(res => { 67 }).then(res => {
68 let data = res.data 68 let data = res.data
69 let url = ''; 69 let url = '';
70 - if (data.type) { 70 + let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
  71 + let style =arr.includes(parseInt(data.type))
  72 + if (!style) {
71 url = '/pages/customer/detail_owner_invitation' + data.type; 73 url = '/pages/customer/detail_owner_invitation' + data.type;
72 } else { 74 } else {
73 url = '/pages/customer/detail_owner_invitation9'; 75 url = '/pages/customer/detail_owner_invitation9';