xt / xcx-book · Commits

Go to a project

Commit 7b0bd5095b63902062c9bdde0830930949e1dd66

Authored by pengye
1 parent a03d3a8e
build: skipped

生日宴按钮、样式调整

Inline Side-by-side
Showing 3 changed files with 212 additions and 36 deletions
... ... @@ -31,6 +31,7 @@ Page({
certificate: '',
dataStr: Date.now() * 1 / 1000,
swich_phone: '0', //是否显示前台电话
is_comments: '0',
is_user_comments: false, //是否评价过 true有评价 false没评价
tableinfo: [], //桌子列表
roomimage: [], //包间图片列表
... ... @@ -324,6 +325,7 @@ Page({
deskStr,
dateStrDivide: dateStrDivide == '00分' ? '' : dateStrDivide,
seller_tel: reserev.seller.seller_tel,
phone:reserev.phone,
}
})
console.log('reserev信息', reserev);
... ... @@ -533,19 +535,29 @@ Page({
sharesetting() {
wx.reportMonitor('1017', 1)
this.closeModal()
let parmdata = {
id: this.id,
fromid: getApp().openid,
hasInvitation: 1,
tplid: this.data.options.tplid
}
if (this.data.options.uid) {
parmdata.uid = this.data.options.uid;
}
return {
title: '我已订好' + this.data.seller.name + '，点击可查看详情并导航到店',
path: util.http_build_query(parmdata, '/pages/customer/detail_owner_invitation_new'),
imageUrl: this.data.imgSrc || 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png',
if(this.data.options.isOrder == '1' && this.data.detail.status !='4'){
return {
title: '推荐' + this.data.seller.name + '，点击可查看详情并导航到店',
path: util.http_build_query({
id: this.data.detail.seller.id
}, '/pages/reserve/shopHome'),
imageUrl: this.data.detail.seller.seller_image || 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png',
}
}else{
let parmdata = {
id: this.id,
fromid: getApp().openid,
hasInvitation: 1,
tplid: this.data.options.tplid
}
if (this.data.options.uid) {
parmdata.uid = this.data.options.uid;
}
return {
title: '我已订好' + this.data.seller.name + '，点击可查看详情并导航到店',
path: util.http_build_query(parmdata, '/pages/customer/detail_owner_invitation_new'),
imageUrl: this.data.imgSrc || 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png',
}
}
},
// 修改detail数据
... ... @@ -652,11 +664,12 @@ Page({
StyleType,
lite_style: data.lite_style,
timeList,
is_comments,
isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond == '1',
isComments: is_comments == '1' && marketing && marketing.is_comments_coupon == '1',
}
console.log('GetSellerTemplateConf----------获取数据', {
console.log('获取数据--------------------GetSellerTemplateConf', {
...obj
});
this.setData({
... ... @@ -872,6 +885,8 @@ Page({
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
detail.use = detail.use ? util.determine(detail.use) : '';
detail.stimeStr = util.unixtoTime(detail.stime, 'YYYY-MM-DD HH:II' )
detail.etimeStr = util.unixtoTime(detail.etime, 'YYYY-MM-DD HH:II' )
coupon_dataList.push(detail);
if (length === coupon_dataList.length) {
coupon_dataList = coupon_dataList.filter(item => {
... ... @@ -1023,8 +1038,8 @@ Page({
}));
if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') {
intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n');
intel.imgsInfo = intel.content.filter(item => item.type === "1").map(item => item.content);
intel.videoImgsInfo = intel.content.filter(item => (item.type === "1" || item.type === "3"));
intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content);
intel.videoImgsInfo = intel.content.filter(item => ((item.type === "1" || item.type === "3") && item.content));
}
return intel
},
... ...
... ... @@ -71,27 +71,43 @@
</view>
</view>
<!-- 优惠券 -->
<view class="publicModule preferentialCoupon" wx:if="{{hasValueCertificate && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<view class="publicModule preferentialCoupon couponBox" wx:if="{{hasValueCertificate && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" />
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
<view class="preferentialItems">
<view class="certificateInfo">
<text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':''}}</text>
<view class="ticketName font36r">{{item.aname}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
<view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">
会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
<view class="purchase">
<view class="priceText" wx:if="{{item.price}}">
<view class="icons">￥<text class="priceText">{{item.price}}</text></view>
<view class="descBox" wx:if="{{item.price == '0' && item.desc}}">{{item.desc}}</view>
</view>
<image class="certificateImg" src="https://qn.colorcun.com/invitation10certificate.png" mode="" />
</view>
<view class="purchase font40r">
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font40r">￥</view>{{item.price}}
<view class="certificateInfo">
<view class="preferentialDetails">
<view class="information">
<text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':''}}</text>
<text class="ticketName font24r">{{item.aname}}</text>
</view>
<block wx:if="{{item.price != '0'}}">
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
<view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">
会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
</view>
</block>
<block wx:else>
<text class="limitation font24r">开始时间：{{item.stimeStr}}</text>
<text class="limitation font24r">结束时间：{{item.etimeStr}}</text>
</block>
</view>
<view class="limitationBtn">
<view class="font24r {{item.price == '0' ? 'couponBtn couponBtn1' : 'couponBtn'}}">{{item.price == '0' ? '免费领取' : '立即购买'}}</view>
<view class="font24r limitationText" wx:if="{{item.price == '0'}}">已被领取</view>
<view class="font24r limitationText" wx:if="{{item.price == '0'}}"><text>{{(item.grant_num*1) - (item.grant_last*1)}}</text>张</view>
</view>
<view class="font24r couponBtn">立即购买</view>
</view>
</view>
</navigator>
... ... @@ -123,8 +139,9 @@
</view>
</view>
<!-- 评价券 -->
<view class="publicModule evaluateCoupon" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
<view class="publicModule" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
<image class="titleImg4" src="https://qn.colorcun.com/invitation10Title3.png" mode="" />
<view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view>
<view class="preferentialItems" bindtap="evaluateFun">
<view class="certificateInfo">
<text class="discountText font20r">评价有礼</text>
... ... @@ -145,6 +162,18 @@
</view>
</view>
</view>
<!-- 评价没有券 -->
<view class="publicModule evaluateCoupon" wx:if="{{is_comments=='1' && (marketing.is_comments_coupon!='1' || couponData.showCoupon!='1')}}">
<image class="titleImg4" src="https://qn.colorcun.com/invitation10Title3.png" mode="" />
<view class="preferentialItems" bindtap="evaluateFun">
<image class="evaluateImg" src="https://qn.colorcun.com/invitation10Union.png" mode="" />
<view class="evaluateText">
<text>期待您的声音</text>
<text>帮助我们持续改进</text>
</view>
<view class="font24r couponBtn">去评价</view>
</view>
</view>
<!-- 停车指引 -->
<view class="publicModule" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}">
<image class="titleImg4" src="https://qn.colorcun.com/invitation10Title4.png" mode="" />
... ... @@ -215,10 +244,14 @@
{{toastText}}
</view>
</scroll-view>
<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}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<!-- (开启在线预订 显示在线预订) || (未开启在线预订 显示再次预订（打商家电话）) -->
<!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) || (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
<view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (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) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
<view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
<view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
<button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r shareItem" data-type="2" open-type="share">转发店铺给好友</button>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<my-modal id="payModal" fadeStyle="slideUp" height="240px">
... ...
... ... @@ -104,7 +104,7 @@
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
font-weight: 400;
font-weight: 600;
-webkit-box-orient: vertical;
}
... ... @@ -368,6 +368,107 @@
text-align: center;
}
.couponBox .certificateInfo {
flex-direction: row;
}
.couponBox .couponBtn {
width: 100%;
height: fit-content;
background: #CC9B6A;
color: #fff;
}
.couponBox .couponBtn1 {
color: #CC9B6A;
border: 2rpx solid #CC9B6A;
background: transparent;
margin-bottom: 20rpx;
}
.couponBox .certificateInfo .preferentialDetails {
width: 100%;
display: flex;
flex-direction: column;
}
.couponBox .information {
display: flex;
}
.couponBox .discountText {
position: relative;
height: max-content;
left: 0;
margin-right: 8rpx;
min-width: 90rpx;
}
.couponBox .ticketName {
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
margin-top: 16rpx;
}
.couponBox .purchase {
width: 22%;
position: relative;
}
.couponBox .certificateImg {
position: absolute;
top: 0;
left: 0;
width: 100rpx;
height: 28rpx;
}
.couponBox .icons {
font-size: 20rpx;
display: flex;
align-items: baseline;
}
.couponBox .priceText {
font-size: 52rpx;
}
.couponBox .priceText {
display: flex;
flex-direction: column;
}
.couponBox .descBox {
font-size: 20rpx;
}
.couponBox .limitationBtn {
width: 40%;
display: flex;
flex-direction: column;
align-items: center;
}
.couponBox .limitationText {
color: #666;
}
.couponBox .limitationText text {
color: #CC9B6A;
margin-right: 4rpx;
}
.evaluateTitleText {
font-weight: 600;
font-size: 28rpx;
font-family: PingFang SC;
margin: 40rpx 0;
}
.labelBox {
width: 100%;
margin-top: 20rpx;
... ... @@ -386,7 +487,7 @@
background: #CC9B6A;
border-radius: 10rpx;
color: #fff;
padding: 18rpx 40rpx;
padding: 26rpx 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
... ... @@ -402,6 +503,33 @@
padding: 4rpx 36rpx;
}
.evaluateCoupon .evaluateImg {
width: 62rpx;
height: 60rpx;
}
.evaluateCoupon .preferentialItems {
background: #CC9B6A;
align-items: center;
padding: 0 44rpx 0 40rpx;
box-sizing: border-box;
border-radius: 10rpx;
}
.evaluateCoupon .couponBtn {
width: max-content;
height: max-content;
padding: 4rpx 20rpx;
margin-top: 0;
}
.evaluateCoupon .evaluateText {
display: flex;
flex-direction: column;
color: #fff;
margin: 0 28% 0 40rpx;
}
.detailBanner {
width: 100%;
height: 500rpx;
... ...