xt / xcx-book · Commits

Go to a project

Commit cfc4402f197b562d1189f3884efc17feb069896f

Authored by pengye
1 parent 51dad142
build: skipped

邀请函再次预订、转发邀请函给客人、订金支付 按钮处理

Inline Side-by-side
Showing 25 changed files with 165 additions and 60 deletions
... ... @@ -63,6 +63,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -358,9 +361,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -698,6 +704,8 @@ Page({
themeSixteen,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -305,10 +305,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' &&isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -490,7 +490,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -500,6 +499,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ... @@ -721,7 +726,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ...
... ... @@ -63,6 +63,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -358,9 +361,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -653,6 +659,8 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -310,10 +310,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook" >再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -521,7 +521,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -531,6 +530,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ... @@ -752,7 +757,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ...
... ... @@ -63,6 +63,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -358,9 +361,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -653,6 +659,8 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -293,10 +293,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -511,7 +511,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -521,6 +520,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ... @@ -742,7 +747,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ...
... ... @@ -62,6 +62,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -357,9 +360,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -652,6 +658,8 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -292,10 +292,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -510,7 +510,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -520,6 +519,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ... @@ -741,7 +746,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ...
... ... @@ -64,6 +64,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
screenHeight: '',
attentionAnim: {},
... ... @@ -311,9 +314,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -608,6 +614,8 @@ Page({
whiteBj,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -279,10 +279,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="all-button flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="all-button flex-lr sharewidth">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -569,7 +569,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
}
.centerBtn {
... ... @@ -580,7 +580,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: #fafafa;
color: #0143A3;
border: 2rpx solid #0143A3;
... ... @@ -590,6 +589,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
... ...
... ... @@ -63,6 +63,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -358,9 +361,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -653,6 +659,8 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -305,10 +305,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -503,7 +503,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -513,6 +512,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ... @@ -734,7 +739,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ...
... ... @@ -63,6 +63,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -357,9 +360,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -652,6 +658,8 @@ Page({
themeColor,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -303,10 +303,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -512,7 +512,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -522,6 +521,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ... @@ -743,7 +748,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ...
... ... @@ -71,6 +71,9 @@ Page({
timeList: [],
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
isPaymenBtn:'',//支付定金按钮
isShareItem:'',//转发客人按钮
},
tablestr: '',
urlsValue: [],
... ... @@ -377,9 +380,12 @@ Page({
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let data = res.data[0];
let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
let options = this.data.options
this.setData({
paymentId: data.id,
paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0'
paymentStatus,
isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
})
}
})
... ... @@ -689,6 +695,8 @@ Page({
colors,
lite_style:data.lite_style,
timeList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
})
// 开启语音播报
if (reserve && reserve.swich_voice == '1') {
... ...
... ... @@ -303,10 +303,10 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth">
<view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn && isDeposit}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -484,7 +484,7 @@
padding: 0 40rpx;
box-sizing: border-box;
z-index: 100;
justify-content: flex-end;
justify-content: space-between;
width: 100%;
}
... ... @@ -513,7 +513,6 @@
.moreBtn,
.paymenBtn {
width: inherit;
margin: 0;
background: transparent;
color: #FFEFC5;
border: 2rpx solid #FFEFC5;
... ... @@ -523,6 +522,12 @@
margin-right: 20rpx;
}
.threeBtn{
width: auto;
padding: 0 24rpx;
flex-shrink: 0;
}
.shareItem {
margin-right: 0;
background: #FFEFC5;
... ...
... ... @@ -104,7 +104,8 @@ Page({
sid
}).then(res => {
let is_online_reserve = res.data.is_online_reserve;
this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve);
let isDeposit = res.data.is_show_notice_deposit;
this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve,isDeposit);
}).catch(res => {
console.log(res, '商家详情请求失败');
})
... ... @@ -117,7 +118,7 @@ Page({
return isorder;
},
// 获取商家设置营销信息
getSellerTemplateConfFun(sid, isOrder, status, is_online_reserve) {
getSellerTemplateConfFun(sid, isOrder, status, is_online_reserve, isDeposit) {
App.Seller.GetSellerTemplateConf({
sid
}).then(res => {
... ... @@ -130,8 +131,8 @@ Page({
} else {
url = '/pack-invitation/pages/detail_owner_invitation9';
}
// is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人
url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare;
// is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否
url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare + '&isDeposit=' + isDeposit;
// (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束
url += (isOrder == '1' || status == '3') ? '&isOrder=1' : '';
url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
... ...