xt / xcx-book · Commits

Go to a project

Commit e0604ee7bdec383bdbb53afa2e3c875a3a2e951d

Authored by yiren
1 parent 0e64c374
build: skipped

”新邀请函商家未设置样式修改”

Inline Side-by-side
Showing 3 changed files with 28 additions and 26 deletions
@@ -12,6 +12,7 @@ Page({ @@ -12,6 +12,7 @@ Page({
12 options: { 12 options: {
13 tplid: '' 13 tplid: ''
14 }, 14 },
  15 + detail:{},
15 between: false, 16 between: false,
16 id: null, 17 id: null,
17 msgTpl: '', 18 msgTpl: '',
@@ -146,7 +147,8 @@ Page({ @@ -146,7 +147,8 @@ Page({
146 soltName: reserev.soltName 147 soltName: reserev.soltName
147 } 148 }
148 }) 149 })
149 - console.log(this.data.detail); 150 + console.log(this.data.seller,'sellersellersellerseller');
  151 + console.log(this.data.detail,'detaildetaildetaildetail');
150 }) 152 })
151 }, 153 },
152 cookbook() { 154 cookbook() {
@@ -270,6 +272,9 @@ Page({ @@ -270,6 +272,9 @@ Page({
270 console.log('reserve', JSON.parse(res.data.reserve)); 272 console.log('reserve', JSON.parse(res.data.reserve));
271 console.log('signboard', JSON.parse(res.data.signboard)); 273 console.log('signboard', JSON.parse(res.data.signboard));
272 console.log('store', store); 274 console.log('store', store);
  275 + }).catch(res=>{
  276 + this.theme = 'green';
  277 +
273 }) 278 })
274 }, 279 },
275 secondbook() { 280 secondbook() {
@@ -6,39 +6,39 @@ @@ -6,39 +6,39 @@
6 <scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y> 6 <scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y>
7 <view class="titleImg" style="background: rgba({{homeColor}});"> 7 <view class="titleImg" style="background: rgba({{homeColor}});">
8 <image src="{{theme=='green'?'https://qn.colorcun.com/1571679628800_.pic.jpg':theme=='blue'?'https://qn.colorcun.com/1561679628784_.pic.jpg':theme=='blackGold'?'https://qn.colorcun.com/1551679628682_.pic.jpg':''}}" class="titleIcon"></image> 8 <image src="{{theme=='green'?'https://qn.colorcun.com/1571679628800_.pic.jpg':theme=='blue'?'https://qn.colorcun.com/1561679628784_.pic.jpg':theme=='blackGold'?'https://qn.colorcun.com/1551679628682_.pic.jpg':''}}" class="titleIcon"></image>
9 - <view class="title {{theme+'Title'}}">{{home.title}}</view> 9 + <view class="title {{theme+'Title'}}">{{home.title?home.title:seller.name}}</view>
10 <view class="info {{theme+'Info'}}"> 10 <view class="info {{theme+'Info'}}">
11 {{home.slogan}} 11 {{home.slogan}}
12 </view> 12 </view>
13 </view> 13 </view>
14 - <image src="{{home.image}}" class="homeImage" mode="widthFix"></image> 14 + <image src="{{home.image?home.image:detail.seller.seller_image}}" class="homeImage" mode="widthFix"></image>
15 <view class="reservationInfo flex-ll"> 15 <view class="reservationInfo flex-ll">
16 <view class="line"> 16 <view class="line">
17 </view> 17 </view>
18 <view class="infoRight"> 18 <view class="infoRight">
19 <view class="begin"> 19 <view class="begin">
20 <view>尊敬的贵宾，您好！</view> 20 <view>尊敬的贵宾，您好！</view>
21 - <view>非常感谢您选择{{reserve.seller_name}}！</view> 21 + <view>非常感谢您选择{{reserve.seller_name?reserve.seller_name:seller.name}}！</view>
22 </view> 22 </view>
23 <view class="flex-11"> 23 <view class="flex-11">
24 <view class="label">【日期】</view> 24 <view class="label">【日期】</view>
25 <view class="contentData">{{seller.date}}</view> 25 <view class="contentData">{{seller.date}}</view>
26 </view> 26 </view>
27 <view class="flex-11"> 27 <view class="flex-11">
28 - <view class="label">【市别】</view> 28 + <view class="label">【餐段】</view>
29 <view class="contentData">{{seller.soltName}}</view> 29 <view class="contentData">{{seller.soltName}}</view>
30 </view> 30 </view>
31 <view class="flex-11"> 31 <view class="flex-11">
32 <view class="label">【包间】</view> 32 <view class="label">【包间】</view>
33 <view class="contentData">{{seller.region}}{{seller.room}}</view> 33 <view class="contentData">{{seller.region}}{{seller.room}}</view>
34 </view> 34 </view>
35 - <view class="flex-11"> 35 + <!-- <view class="flex-11">
36 <view class="label">【人数】</view> 36 <view class="label">【人数】</view>
37 - <!-- <view class="contentData">{{reserve.numderPeople}}位</view> -->  
38 - </view> 37 + <view class="contentData">{{reserve.numderPeople}}位</view>
  38 + </view>-->
39 <view class="flex-11"> 39 <view class="flex-11">
40 <view class="label">【地址】</view> 40 <view class="label">【地址】</view>
41 - <view class="contentData">{{reserve.address}}</view> 41 + <view class="contentData">{{reserve.address?reserve.address:detail.seller.map_address}}</view>
42 </view> 42 </view>
43 <view class="flex-11"> 43 <view class="flex-11">
44 <view class="label">【停车】</view> 44 <view class="label">【停车】</view>
@@ -46,12 +46,12 @@ @@ -46,12 +46,12 @@
46 </view> 46 </view>
47 <view class="flex-11"> 47 <view class="flex-11">
48 <view class="label">【联系】</view> 48 <view class="label">【联系】</view>
49 - <view class="contentData">{{reserve.seller_phone}}</view> 49 + <view class="contentData">{{reserve.seller_phone?reserve.seller_phone:detail.seller.phone}}</view>
50 </view> 50 </view>
51 <view class="welcome"> 51 <view class="welcome">
52 欢迎垂询，恭候光临！ 52 欢迎垂询，恭候光临！
53 </view> 53 </view>
54 - <block wx:if="{{detail.sid!='677'}}"> 54 + <block wx:if="{{detail.sid!='677' && reserve.manager_phone && manager_wechat}}">
55 <view class="handleInfo"> 55 <view class="handleInfo">
56 <image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image> 56 <image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image>
57 <view class="handle"> 57 <view class="handle">
@@ -69,8 +69,8 @@ @@ -69,8 +69,8 @@
69 <view class="positioning" bindtap="looklocation"> 69 <view class="positioning" bindtap="looklocation">
70 <image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" /> 70 <image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" />
71 <view class="name"> 71 <view class="name">
72 - <text>{{reserve.seller_name}}</text>  
73 - <text>{{reserve.address}}</text> 72 + <text>{{reserve.seller_name?reserve.seller_name:detail.seller.sellername}}</text>
  73 + <text>{{reserve.address?reserve.address:detail.seller.map_address}}</text>
74 </view> 74 </view>
75 </view> 75 </view>
76 <!-- <view class="visitor"> 76 <!-- <view class="visitor">
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 </view> 85 </view>
86 </view> --> 86 </view> -->
87 <!-- 品牌介绍类型store.style 0无介绍 1图文合并 2图文分开 --> 87 <!-- 品牌介绍类型store.style 0无介绍 1图文合并 2图文分开 -->
88 - <view class="introduce" wx:if="{{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="" />
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 </view> 105 </view>
106 </view> 106 </view>
107 </view> 107 </view>
108 - <view class="introduce" wx:if="{{store.style=='2'}}"> 108 + <view class="introduce" wx:if="{{store && store.style=='2'}}">
109 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 109 <view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
110 <view class="imgMask"> 110 <view class="imgMask">
111 <view class="IntroduceColor styleSeparate" wx:if="{{arryIndex=='0'}}"> 111 <view class="IntroduceColor styleSeparate" wx:if="{{arryIndex=='0'}}">
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </view> 126 </view>
127 </view> 127 </view>
128 <!-- 知名主厨类型chef.style 0无介绍 1图文合并 2图文分开 --> 128 <!-- 知名主厨类型chef.style 0无介绍 1图文合并 2图文分开 -->
129 - <view class="introduce famousChefBox" wx:if="{{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="widthFix" />
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 </view> 146 </view>
147 </view> 147 </view>
148 </view> 148 </view>
149 - <view class="introduce famousChefBox" wx:if="{{chef.style=='2'}}"> 149 + <view class="introduce famousChefBox" wx:if="{{chef && chef.style=='2'}}">
150 <view class="IntroductionItems"> 150 <view class="IntroductionItems">
151 <view class="imgMask"> 151 <view class="imgMask">
152 <view class="IntroduceColor styleSeparate2"> 152 <view class="IntroduceColor styleSeparate2">
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
166 </view> 166 </view>
167 </view> 167 </view>
168 </view> 168 </view>
169 - <view class="introduce vegetableBox" wx:if="{{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="widthFix" />
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
199 </block> 199 </block>
200 </view> 200 </view>
201 </view> 201 </view>
202 - <view class="preferential" wx:if="{{marketing.is_coupon=='1' || marketing.is_recharge=='1'}}"> 202 + <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
203 <view class="rubric rubric1"> 203 <view class="rubric rubric1">
204 特别优惠 204 特别优惠
205 </view> 205 </view>
@@ -233,7 +233,7 @@ @@ -233,7 +233,7 @@
233 </view> 233 </view>
234 </view> 234 </view>
235 <view class="vips"> 235 <view class="vips">
236 - <image src="{{marketing.logo}}" mode="widthFix" /> 236 + <image src="{{marketing.logo?marketing.logo:detail.seller.seller_image}}" mode="widthFix" />
237 <view class="news"> 237 <view class="news">
238 {{marketing.wecomle}} 238 {{marketing.wecomle}}
239 </view> 239 </view>
@@ -241,11 +241,11 @@ @@ -241,11 +241,11 @@
241 点击了解更多会员优惠政策 241 点击了解更多会员优惠政策
242 </view> --> 242 </view> -->
243 <view class="text"> 243 <view class="text">
244 - {{reserve.seller_name}} 244 + {{reserve.seller_name?reserve.seller_name:seller.name}}
245 </view> 245 </view>
246 </view> 246 </view>
247 </scroll-view> 247 </scroll-view>
248 -<view class="{{between?'all-button flex-lr between':'all-button flex-lr'}}"> 248 +<view wx:if="{{marketing.is_transpond}}" class="{{between?'all-button flex-lr between':'all-button flex-lr'}}">
249 <!-- <view wx:if="{{marketing.is_online}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 249 <!-- <view wx:if="{{marketing.is_online}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订
250 </view> --> 250 </view> -->
251 <!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约 251 <!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 .blueTitleImg { 11 .blueTitleImg {
12 background: #0143A3; 12 background: #0143A3;
13 } 13 }
14 -  
15 .greenTitleImg { 14 .greenTitleImg {
16 background: #438E93; 15 background: #438E93;
17 } 16 }
@@ -410,11 +409,9 @@ @@ -410,11 +409,9 @@
410 409
411 .endStyle { 410 .endStyle {
412 display: flex; 411 display: flex;
  412 + justify-content: flex-end;
413 } 413 }
414 414
415 -.endStyle view:nth-of-type(1) {  
416 - flex: 1;  
417 -}  
418 415
419 .orderingFood { 416 .orderingFood {
420 padding: 4rpx 20rpx; 417 padding: 4rpx 20rpx;