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({
options: {
tplid: ''
},
detail:{},
between: false,
id: null,
msgTpl: '',
... ... @@ -146,7 +147,8 @@ Page({
soltName: reserev.soltName
}
})
console.log(this.data.detail);
console.log(this.data.seller,'sellersellersellerseller');
console.log(this.data.detail,'detaildetaildetaildetail');
})
},
cookbook() {
... ... @@ -270,6 +272,9 @@ Page({
console.log('reserve', JSON.parse(res.data.reserve));
console.log('signboard', JSON.parse(res.data.signboard));
console.log('store', store);
}).catch(res=>{
this.theme = 'green';
})
},
secondbook() {
... ...
... ... @@ -6,39 +6,39 @@
<scroll-view class="last-book-bg" style="line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="titleImg" style="background: rgba({{homeColor}});">
<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>
<view class="title {{theme+'Title'}}">{{home.title}}</view>
<view class="title {{theme+'Title'}}">{{home.title?home.title:seller.name}}</view>
<view class="info {{theme+'Info'}}">
{{home.slogan}}
</view>
</view>
<image src="{{home.image}}" class="homeImage" mode="widthFix"></image>
<image src="{{home.image?home.image:detail.seller.seller_image}}" class="homeImage" mode="widthFix"></image>
<view class="reservationInfo flex-ll">
<view class="line">
</view>
<view class="infoRight">
<view class="begin">
<view>尊敬的贵宾，您好！</view>
<view>非常感谢您选择{{reserve.seller_name}}！</view>
<view>非常感谢您选择{{reserve.seller_name?reserve.seller_name:seller.name}}！</view>
</view>
<view class="flex-11">
<view class="label">【日期】</view>
<view class="contentData">{{seller.date}}</view>
</view>
<view class="flex-11">
<view class="label">【市别】</view>
<view class="label">【餐段】</view>
<view class="contentData">{{seller.soltName}}</view>
</view>
<view class="flex-11">
<view class="label">【包间】</view>
<view class="contentData">{{seller.region}}{{seller.room}}</view>
</view>
<view class="flex-11">
<!-- <view class="flex-11">
<view class="label">【人数】</view>
<!-- <view class="contentData">{{reserve.numderPeople}}位</view> -->
</view>
<view class="contentData">{{reserve.numderPeople}}位</view>
</view>-->
<view class="flex-11">
<view class="label">【地址】</view>
<view class="contentData">{{reserve.address}}</view>
<view class="contentData">{{reserve.address?reserve.address:detail.seller.map_address}}</view>
</view>
<view class="flex-11">
<view class="label">【停车】</view>
... ... @@ -46,12 +46,12 @@
</view>
<view class="flex-11">
<view class="label">【联系】</view>
<view class="contentData">{{reserve.seller_phone}}</view>
<view class="contentData">{{reserve.seller_phone?reserve.seller_phone:detail.seller.phone}}</view>
</view>
<view class="welcome">
欢迎垂询，恭候光临！
</view>
<block wx:if="{{detail.sid!='677'}}">
<block wx:if="{{detail.sid!='677' && reserve.manager_phone && manager_wechat}}">
<view class="handleInfo">
<image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image>
<view class="handle">
... ... @@ -69,8 +69,8 @@
<view class="positioning" bindtap="looklocation">
<image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" />
<view class="name">
<text>{{reserve.seller_name}}</text>
<text>{{reserve.address}}</text>
<text>{{reserve.seller_name?reserve.seller_name:detail.seller.sellername}}</text>
<text>{{reserve.address?reserve.address:detail.seller.map_address}}</text>
</view>
</view>
<!-- <view class="visitor">
... ... @@ -85,7 +85,7 @@
</view>
</view> -->
<!-- 品牌介绍类型store.style 0无介绍 1图文合并 2图文分开 -->
<view class="introduce" wx:if="{{store.style=='1'}}">
<view class="introduce" wx:if="{{store && store.style=='1'}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="" />
... ... @@ -105,7 +105,7 @@
</view>
</view>
</view>
<view class="introduce" wx:if="{{store.style=='2'}}">
<view class="introduce" wx:if="{{store && store.style=='2'}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<view class="IntroduceColor styleSeparate" wx:if="{{arryIndex=='0'}}">
... ... @@ -126,7 +126,7 @@
</view>
</view>
<!-- 知名主厨类型chef.style 0无介绍 1图文合并 2图文分开 -->
<view class="introduce famousChefBox" wx:if="{{chef.style=='1'}}">
<view class="introduce famousChefBox" wx:if="{{chef && chef.style=='1'}}">
<view class="IntroductionItems">
<view class="imgMask">
<image src="{{chef.image}}" mode="widthFix" />
... ... @@ -146,7 +146,7 @@
</view>
</view>
</view>
<view class="introduce famousChefBox" wx:if="{{chef.style=='2'}}">
<view class="introduce famousChefBox" wx:if="{{chef && chef.style=='2'}}">
<view class="IntroductionItems">
<view class="imgMask">
<view class="IntroduceColor styleSeparate2">
... ... @@ -166,7 +166,7 @@
</view>
</view>
</view>
<view class="introduce vegetableBox" wx:if="{{signboard.swich=='1'}}">
<view class="introduce vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}">
<view class="IntroductionItems" wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="widthFix" />
... ... @@ -199,7 +199,7 @@
</block>
</view>
</view>
<view class="preferential" wx:if="{{marketing.is_coupon=='1' || marketing.is_recharge=='1'}}">
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
特别优惠
</view>
... ... @@ -233,7 +233,7 @@
</view>
</view>
<view class="vips">
<image src="{{marketing.logo}}" mode="widthFix" />
<image src="{{marketing.logo?marketing.logo:detail.seller.seller_image}}" mode="widthFix" />
<view class="news">
{{marketing.wecomle}}
</view>
... ... @@ -241,11 +241,11 @@
点击了解更多会员优惠政策
</view> -->
<view class="text">
{{reserve.seller_name}}
{{reserve.seller_name?reserve.seller_name:seller.name}}
</view>
</view>
</scroll-view>
<view class="{{between?'all-button flex-lr between':'all-button flex-lr'}}">
<view wx:if="{{marketing.is_transpond}}" class="{{between?'all-button flex-lr between':'all-button flex-lr'}}">
<!-- <view wx:if="{{marketing.is_online}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订
</view> -->
<!-- <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 @@
.blueTitleImg {
background: #0143A3;
}
.greenTitleImg {
background: #438E93;
}
... ... @@ -410,11 +409,9 @@
.endStyle {
display: flex;
justify-content: flex-end;
}
.endStyle view:nth-of-type(1) {
flex: 1;
}
.orderingFood {
padding: 4rpx 20rpx;
... ...