Commit 3932f0a01e72ee1740f4d9beb16d436dafb10cfe

Authored by Yolanda
1 parent 49716b94

no message

... ... @@ -6,6 +6,7 @@
"pages/customer/detail_customer",
"pages/customer/detail_invitation",
"pages/customer/detail_owner_invitation",
"pages/customer/discount",
"pages/customer/invite",
"pages/customer/list",
"pages/customer/remind",
... ...
... ... @@ -414,6 +414,7 @@ Page({
form.ddate = this.time;
form.ddate_solt=this.ddate_solt
form.is_set_ddate=1
form.uid=util.cache('seller_user').id
App.Reserve.SetReserveInfo(form).then(res => {
if (res.ret == 200) {
this.getCustomRemark()
... ...
... ... @@ -82,6 +82,10 @@ Page({
this.indexOpt=opt;
this.ReservesCountDay(util.unixtoTime(d,'YYYY-MM-DD'));
this.ReservesCountMonth(util.unixtoTime(d,'YYYY-MM'));
this.enter_params = util.cache('enter_params');
App.Reserve.SellerInfo(this.enter_params).then(res => {
wx.setStorageSync('seller_user',res.data.seller_user);
})
},
onShow:function(){
this.setData({
... ...
... ... @@ -24,6 +24,10 @@ Page({
options: {tplid: ''},
hasOwner: false,//是否为发起人
animation: 'animation',
selecthidden:true,
morehidden:true,
openid:getApp().openid,
showconfirm:true
},
id: null,
/**
... ... @@ -45,6 +49,7 @@ Page({
"statReachBottom": true,
"lauchOpts": options, //渠道分析
});
this.getreal();
},
/**
... ... @@ -77,6 +82,16 @@ Page({
})
this.getDetail();
},
getreal(){
console.log('yyyyy',this.data.openid,this.data.options.id)
App.Reserve.GetIsRelaSuccess({openid:this.data.openid,rid:this.data.options.id}).then((json)=>{
if(json.ret==200){
this.setData({
showconfirm:false
})
}
})
},
cloudsendmsg(){
// 'index.html?id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1&uid='+this.data.options.uid
// let query='id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1&uid='+this.data.options.uid;
... ... @@ -319,6 +334,7 @@ Page({
})
},
confirmed(){
wx.reportMonitor('1016', 1)
if (!this.data.detail.hasCanSuccess) {
let userInfo = util.cache('userInfo');
if (userInfo) {
... ... @@ -336,26 +352,30 @@ Page({
userinfo: userInfo
}).then(res => {
this.setData({
[`detail.hasCanSuccess`]: true
[`detail.hasCanSuccess`]: true,
showconfirm:false
})
App.Reserve.Detail({
openid: getApp().openid,
rid: this.id
}, 'clear')
util.toast('赴约成功', 'none')
let url='/pages/customer/list'
if(parseInt(this.data.detail.ddate)-(new Date()/1000)>3600){
if(this.data.detail.type==1){
if(this.data.detail.is_set_ddate==1){
url='/pages/customer/list?hasRelaTip=1'
}
}else{
url='/pages/customer/list?hasRelaTip=1'
}
}
wx.reLaunch({
url: url
})
this.setData({
showconfirm:false
})
// let url='/pages/customer/list'
// if(parseInt(this.data.detail.ddate)-(new Date()/1000)>3600){
// if(this.data.detail.type==1){
// if(this.data.detail.is_set_ddate==1){
// url='/pages/customer/list?hasRelaTip=1'
// }
// }else{
// url='/pages/customer/list?hasRelaTip=1'
// }
// }
// wx.reLaunch({
// url: url
// })
})
} else {
util.toast('赴约成功', 'none')
... ... @@ -402,4 +422,25 @@ Page({
url: '/pages/reserve/index'
})
},
showselect(){
this.setData({
selecthidden:false
})
},
closeselect(){
console.log('ttttt')
this.setData({
selecthidden:true
})
},
showmore(){
this.setData({
morehidden:false
})
},
closemore(){
this.setData({
morehidden:true
})
},
})
... ...
<!--pages/customer/detail_owner.wxml-->
<import src="../tpl/invitation"></import>
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
<block wx:if="{{detail && detail.type==0 && detail.channel==2}}">
<block wx:if="{{detail && detail.type==0 && detail.channel==5}}">
<!-- <view class="pages bg-1" style="max-height:{{height}}px;overflow-y: scroll;padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;padding-bottom: 60rpx;position: relative;">
<view class="book-image flex-cc"></view>
<view class="cover-conent flex-vc">
... ... @@ -50,8 +50,7 @@
<button class="font32r font-bold main-button book-button font-bold flex-cc" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
<view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
</view> -->
<scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<!-- <view class="last-book-title"></view> -->
<!-- <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="last-staff-info flex-lr">
<view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="last-staff-detail flex-vr" style="align-items: flex-end;">
... ... @@ -62,10 +61,6 @@
<image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
</view>
<!-- <button class="last-button-item flex-ll" open-type="contact" bindcontact="test" send-message-img="{{staffinfo.qrcode}}" show-message-card="{{true}}" send-message-path="pages/customer/index?qrcode={{staffinfo.qrcode}}&islover=customer">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
</button> -->
<button class="last-button-item flex-ll" bindtap="addwechat">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
... ... @@ -92,17 +87,108 @@
<view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
</view>
<button class="last-share-button font38r flex-cc font-bold" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
<!-- <block wx:elif="{{detail.hasCancel}}">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
</block>
<block wx:else="">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
</block> -->
<view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view>
<view style="height:40rpx;"></view>
<!-- <view bindtap="sendmsg" style="padding: 60px;" class="white-font font36r">测试发送短信息</view> -->
</scroll-view> -->
<scroll-view class="last-book-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="book-flower"></view>
<view style="padding-left: 40rpx;box-sizing: border-box;">
<view class="last-book-staff flex-vr" style="align-items: flex-end;">
<image src="{{staffinfo.photo}}" class="book-staff-headerimg" mode="aspectFit"></image>
<view class="flex-rr" style="margin-bottom: 20rpx;">
<view class="flex-rr font26r yellow-font">客户经理:{{staffinfo.name}}</view>
<view class="book-staff-item-button flex-cc" bindtap="addwechat">
<image src="http://nosqn.colorcun.com/book-wechat.png" class="book-header-icon"></image>
<view class="font22r brown-font">加我微信</view>
</view>
</view>
<view class="flex-rr" bindtap="call">
<view class="flex-rr font26r yellow-font">{{staffinfo.phone}}</view>
<view class="book-staff-item-button flex-cc">
<image src="http://nosqn.colorcun.com/book-phone.png" class="book-header-icon"></image>
<view class="font22r brown-font">拨打电话</view>
</view>
</view>
</view>
<view class="book-font"></view>
<view class="yellow-font font44r" style="margin-bottom: 60rpx;">{{seller.name}}</view>
<view>
<view class="font26r" style="color: #C9BD89;margin-bottom: 20rpx;">已为您安排在包间</view>
<view class="book-room-rect flex-cc">
<view class="font44r yellow-font">{{seller.room}}</view>
<view class="book-look-button brown-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
</view>
<view class="yellow-font font30r" style="margin-bottom: 24rpx;">时间:{{seller.date}}</view>
<view class="flex-lr" style="line-height: 1.2;padding-right: 40rpx;box-sizing: border-box;margin-bottom: 200rpx;">
<view class="yellow-font font30r">地址:{{seller.addr}}</view>
<view class="loaction-button black-font font22r flex-cc" bindtap="lookLocation">一键导航</view>
</view>
</view>
</view>
<view class="confirm-cover" wx:if="{{showconfirm}}">
<button class="book-share-button font38r flex-cc font-bold" catchtap="confirmed">确认收到</button>
<view class="confirm-notice flex-vc">
<view class="white-font font26r flex-cc">点击确认收到,可告知发起人已收到邀请</view>
<view class="angel"></view>
</view>
</view>
</scroll-view>
<view class="all-button flex-lr" wx:if="{{!showconfirm}}">
<block wx:if="{{detail.hasCancel}}">
<view class="book-item-font flex-cc">
<image src="http://nosqn.colorcun.com/book-share-nouse-button.png" class="button-item-icon"></image>
<view class="font30r" style="color: #999999;">转发好友</view>
</view>
</block>
<block wx:else>
<button class="book-item-font flex-cc" open-type="share">
<image src="http://nosqn.colorcun.com/book-share-button.png" class="button-item-icon"></image>
<view class="font30r">转发好友</view>
</button>
</block>
<view class="book-item-font second-book-button flex-cc" bindtap="secondbook">
<image src="http://nosqn.colorcun.com/second-book.png" class="button-item-icon"></image>
<view class="font30r">再次预订</view>
</view>
<view class="line-border"></view>
<block wx:if="{{list}}">
<view class="book-notice flex-vc">
<view class="white-font font26r flex-cc">再次预订可享“{{list[0].aname}}”优惠</view>
<view class="angel"></view>
</view>
</block>
</view>
<view class="book-mask" hidden="{{selecthidden}}" bindtap="closeselect"></view>
<view class="book-buttons">
<view class="select-button white-font font28r flex-cc" bindtap="showselect">选项</view>
<view hidden="{{selecthidden}}">
<navigator class="select-item-button flex-cc white-font font24r" style="left: 30rpx;bottom:328rpx;" open-type="redirect" url="/pages/customer/index?islove=custom">首页</navigator>
<navigator class="select-item-button flex-cc white-font font24r" style="left: 126rpx;bottom:242rpx;" open-type="redirect" url="/pages/me/index">我的</navigator>
<block wx:if="{{detail.hasCancel}}"><view class="select-item-button flex-cc gray-font font28r" style="left: 130rpx;bottom:110rpx;">取消订单</view>
<view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
</block>
<block wx:else>
<view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
</block>
<view class="select-item-button flex-cc white-font font24r" style="left: 42rpx;bottom:10rpx;" bindtap="closeselect">返回</view>
</view>
</view>
<view class="book-mask" hidden="{{morehidden}}" bindtap="closemore"></view>
<view class="service-buttons">
<view class="more-button white-font font28r flex-vc" bindtap="showmore">更多<view>服务</view></view>
<view hidden="{{morehidden}}">
<view class="select-item-button flex-cc gray-font font24r" style="right: 0rpx;bottom:724rpx;">酒水</view>
<view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:660rpx;">代驾</view>
<view class="select-item-button flex-cc gray-font font24r" style="right: 152rpx;bottom:546rpx;">酒店</view>
<view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:430rpx;">茶楼沐足</view>
<view class="select-item-button flex-cc white-font font24r" style="right: 0rpx;bottom:368rpx;" bindtap="closemore">返回</view>
</view>
</view>
<block wx:if="{{detail.hasCancel}}">
<view class="cancel-mark"></view>
</block>
</block>
<block wx:else>
... ... @@ -118,8 +204,9 @@
</view>
</view>
</block>
<view class="cancel-icon" wx:if="{{detail.status==4}}"></view>
</block>
<view class="opt-button flex-lr" wx:if="{{detail && detail.channel!=2}}">
<view class="opt-button flex-lr" wx:if="{{detail && detail.channel!=5}}">
<view bindtap="gotoHome" class="dingbaojian flex-vc">
<image src="http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114105901.png" class="icon"></image>
<view class="text">订包间</view>
... ... @@ -139,7 +226,6 @@
</button>
</view>
</view>
<view class="cancel-icon" wx:if="{{detail.status==4}}"></view>
<!--//商务-->
<template name="tpl-1">
<view class="flex-vc shangwu" bindtap="{{options.rid?'goEditor':''}}">
... ...
... ... @@ -28,6 +28,9 @@ Page({
couponhidden:true,
getcoupon:false,
menuhidden:true,
selecthidden:true,
morehidden:true,
openid:getApp().openid
},
id: null,
msgTpl:'',
... ... @@ -100,6 +103,7 @@ Page({
})
},
call(){
wx.reportMonitor('1012', 1)
wx.makePhoneCall({
phoneNumber: this.data.staffinfo.phone //仅为示例,并非真实的电话号码
})
... ... @@ -116,7 +120,8 @@ Page({
// wx.previewImage({
// current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
// urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
// })
// })
wx.reportMonitor('1011', 1)
util.cache('staffinfo',this.data.staffinfo);
wx.navigateTo({
url:'./wechat?qrcode='+this.data.staffinfo.qrcode
... ... @@ -155,9 +160,17 @@ Page({
})
},
secondbook(){
wx.redirectTo({
url:'../reserve/detail?id='+this.data.detail.seller.id
})
wx.reportMonitor('1013', 1)
if(this.data.list){
wx.navigateTo({
url:'./discount?sid='+this.data.detail.seller.id+'&id='+this.data.options.id
})
}else{
wx.redirectTo({
url:'../reserve/detail?id='+this.data.detail.seller.id
})
}
},
/**
* 生命周期函数--监听页面隐藏
... ... @@ -177,10 +190,10 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage: function () {
return this.shareSetting();
return this.sharesetting();
},
onShareTimeline(){
return this.shareSetting();
return this.sharesetting();
},
getDetail(fouce = false){
App.Reserve.Detail({
... ... @@ -270,7 +283,8 @@ Page({
}
},
lookLocation: function () {
looklocation: function () {
wx.reportMonitor('1015', 1)
wx.openLocation({
latitude: Number(this.data.detail.seller.lat),
longitude: Number(this.data.detail.seller.long),
... ... @@ -339,7 +353,8 @@ Page({
this.getDetail(true);
})
},
shareSetting(){
sharesetting(){
wx.reportMonitor('1017', 1)
let parmdata={
id:this.id,
fromid:getApp().openid,
... ... @@ -506,4 +521,56 @@ Page({
mask:true
})
},
showselect(){
wx.reportMonitor('1014', 1)
this.setData({
selecthidden:false
})
},
closeselect(){
console.log('ttttt')
this.setData({
selecthidden:true
})
},
showmore(){
this.setData({
morehidden:false
})
},
closemore(){
this.setData({
morehidden:true
})
},
cancelmodal(){
wx.showModal({
title:'取消预订',
content:'点击“确认取消”撤回当前预订,否则点击返回',
confirmColor:'#576B95',
confirmText:'确认取消',
cancelColor:'#999999',
cancelText:'返回',
success:(res)=>{
if(res.confirm){
this.cancelSubmit();
}
}
})
},
cancelSubmit(){
App.Reserve.Detail({
openid: getApp().openid,
rid: this.options.id
},'clear')
App.Customer.SetReserveStatusByUser({
rid:this.options.id,
desc:'',
}).then(res=>{
if(res.ret!=200){
return util.toast(res.msg,'none')
}
})
},
})
... ...
... ... @@ -11,7 +11,7 @@
-->
</nav>
<!-- 内部预定 -->
<block wx:if="{{detail && detail.type==0 && detail.channel==2}}">
<block wx:if="{{detail && detail.type==0 && detail.channel==5}}">
<!-- <view class="pages bg-1" style="max-height:{{height}}px;overflow-y: scroll;padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;padding-bottom: 60rpx;">
<view class="book-image flex-cc">
</view>
... ... @@ -67,8 +67,7 @@
</block>
<view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
</view> -->
<scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<!-- <view class="last-book-title"></view> -->
<!-- <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="last-staff-info flex-lr">
<view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
<view class="last-staff-detail flex-vr" style="align-items: flex-end;">
... ... @@ -79,10 +78,6 @@
<image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
</view>
<!-- <button class="last-button-item flex-ll" open-type="contact" bindcontact="test" send-message-img="{{staffinfo.qrcode}}" show-message-card="{{true}}" send-message-path="pages/customer/index?qrcode={{staffinfo.qrcode}}&islover=customer">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
</button> -->
<button class="last-button-item flex-ll" bindtap="addwechat">
<image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
<view class="black-font font22r last-button-content flex-cc" >加我微信</view>
... ... @@ -109,39 +104,120 @@
<view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
</view>
<button class="last-share-button font38r flex-cc font-bold" open-type="share" wx:if="{{!detail.hasOvered && !detail.hasCancel}}" catchtap="setUserInfoSuccess">转发好友</button>
<!-- <block wx:elif="{{detail.hasCancel}}">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>
</block>
<block wx:else="">
<view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>
</block> -->
<view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="sendmsg" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">短信通知</view>
<view style="height:40rpx;"></view>
</scroll-view> -->
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
<scroll-view class="last-book-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
<view class="book-flower"></view>
<view style="padding-left: 40rpx;box-sizing: border-box;">
<view class="last-book-staff flex-vr" style="align-items: flex-end;">
<image src="{{staffinfo.photo}}" class="book-staff-headerimg" mode="aspectFit"></image>
<view class="flex-rr" style="margin-bottom: 20rpx;">
<view class="flex-rr font26r yellow-font">客户经理:{{staffinfo.name}}</view>
<view class="book-staff-item-button flex-cc" bindtap="addwechat">
<image src="http://nosqn.colorcun.com/book-wechat.png" class="book-header-icon"></image>
<view class="font22r brown-font">加我微信</view>
</view>
</view>
<view class="flex-rr">
<view class="flex-rr font26r yellow-font">{{staffinfo.phone}}</view>
<view class="book-staff-item-button flex-cc" bindtap="call">
<image src="http://nosqn.colorcun.com/book-phone.png" class="book-header-icon"></image>
<view class="font22r brown-font">拨打电话</view>
</view>
</view>
</view>
<view class="book-font"></view>
<view class="flex-lr" style="padding-right: 40rpx;box-sizing: border-box;align-items: flex-start;">
<view class="yellow-font font44r" style="max-width:428rpx;margin-bottom: 60rpx;">{{seller.name}}</view>
<block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
<block wx:if="{{detail && detail.seller.is_open_order==1}}">
<view class="last-book-food flex-cc" bindtap="cookbook">
<view class="white-font font30r smooth" style="color: #043341;">提前点餐</view>
<image src="http://nosqn.colorcun.com/book-direction.png" style="width: 12rpx;height: 24rpx;margin-left: 10rpx;"></image>
</view>
</block>
<block wx:else>
<view class="last-book-food flex-ll" bindtap="noopen" data-mark="buy">
<view class="white-font font30r smooth">提前点餐</view>
<image src="http://nosqn.colorcun.com/book-direction.png" style="width: 12rpx;height: 24rpx;margin-left: 10rpx;"></image>
</view>
</block>
</block>
</view>
<view>
<view class="font26r" style="color: #C9BD89;margin-bottom: 20rpx;">已为您安排在包间</view>
<view class="book-room-rect flex-cc">
<view class="font44r yellow-font">{{seller.room}}</view>
<view class="book-look-button brown-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
</view>
<view class="yellow-font font30r" style="margin-bottom: 24rpx;">时间:{{seller.date}}</view>
<view class="flex-lr" style="line-height: 1.2;padding-right: 40rpx;box-sizing: border-box;">
<view class="yellow-font font30r">地址:{{seller.addr}}</view>
<view class="loaction-button black-font font22r flex-cc" bindtap="looklocation">一键导航</view>
</view>
</view>
</view>
</scroll-view>
<!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" -->
<!-- <view class="last-bottom flex-lr">
<view class="booking-button last-buts-text flex-cc font30r" bindtap="secondbook" style="width:{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel ? (detail && detail.seller.isopen_md==1 ? 33.33 : 50) : 100}}%;">
<image src="http://sellershare.colorcun.com/yuding.png" class="icon" style="width: 32rpx;height: 32rpx;"></image>
再次预订
<view class="all-button flex-lr">
<block wx:if="{{detail.hasCancel}}">
<view class="book-item-font flex-cc">
<image src="http://nosqn.colorcun.com/book-share-nouse-button.png" class="button-item-icon"></image>
<view class="font30r" style="color: #999999;">转发好友</view>
</view>
</block>
<block wx:else>
<button class="book-item-font flex-cc" open-type="share">
<image src="http://nosqn.colorcun.com/book-share-button.png" class="button-item-icon"></image>
<view class="font30r">转发好友</view>
</button>
</block>
<view class="book-item-font second-book-button flex-cc" bindtap="secondbook">
<image src="http://nosqn.colorcun.com/second-book.png" class="button-item-icon"></image>
<view class="font30r">再次预订</view>
</view>
<block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
<userinfo binduserinfo="cookbook" class="last-diancan flex-vc" style="width:{{detail && detail.seller.isopen_md==1 ? 33.33 : 50}}%;">
<view class="last-buts-text flex-cc font30r" style="border-left:2rpx solid #D3BF9C;height: 50rpx;">
<image src="http://sellershare.colorcun.com/diancan.png" class="icon" style="width: 34rpx;height: 28rpx;"></image>
提前点餐
</view>
</userinfo>
<userinfo class="last-pay flex-cc" binduserinfo="checkout" share="{{detail}}" share-act="invitation" wx:if="{{detail && detail.seller.isopen_md==1}}">
<view class="last-buts-text font30r flex-cc" style="border-left:2rpx solid #D3BF9C;height: 50rpx;">
<image src="http://sellershare.colorcun.com/maidan.png" class="icon" style="width:30rpx;height: 24rpx;"></image>
在线买单
</view>
</userinfo>
<view class="line-border"></view>
<block wx:if="{{list}}">
<view class="book-notice flex-vc">
<view class="white-font font26r flex-cc">再次预订可享“{{list[0].aname}}”优惠</view>
<view class="angel"></view>
</view>
</block>
</view> -->
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
<!-- <view bindtap="sendmsg">测试发送短信息</view> -->
</block>
</view>
<view class="book-mask" hidden="{{selecthidden}}" bindtap="closeselect"></view>
<view class="book-buttons">
<view class="select-button white-font font28r flex-cc" bindtap="showselect">选项</view>
<view hidden="{{selecthidden}}">
<navigator class="select-item-button flex-cc white-font font24r" style="left: 30rpx;bottom:328rpx;" open-type="redirect" url="/pages/customer/index?islove=custom">首页</navigator>
<navigator class="select-item-button flex-cc white-font font24r" style="left: 126rpx;bottom:242rpx;" open-type="redirect" url="/pages/me/index">我的</navigator>
<block wx:if="{{detail.hasCancel}}"><view class="select-item-button flex-cc gray-font font28r" style="left: 130rpx;bottom:110rpx;">取消订单</view>
<view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
</block>
<block wx:else>
<view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
</block>
<view class="select-item-button flex-cc white-font font24r" style="left: 42rpx;bottom:10rpx;" bindtap="closeselect">返回</view>
</view>
</view>
<view class="book-mask" hidden="{{morehidden}}" bindtap="closemore"></view>
<view class="service-buttons">
<view class="more-button white-font font28r flex-vc" bindtap="showmore">更多<view>服务</view></view>
<view hidden="{{morehidden}}">
<view class="select-item-button flex-cc gray-font font24r" style="right: 0rpx;bottom:724rpx;">酒水</view>
<view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:660rpx;">代驾</view>
<view class="select-item-button flex-cc gray-font font24r" style="right: 152rpx;bottom:546rpx;">酒店</view>
<view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:430rpx;">茶楼沐足</view>
<view class="select-item-button flex-cc white-font font24r" style="right: 0rpx;bottom:368rpx;" bindtap="closemore">返回</view>
</view>
</view>
<block wx:if="{{detail.hasCancel}}">
<view class="cancel-mark"></view>
</block>
</block>
<block wx:else>
<block wx:if="{{detail}}">
<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
... ... @@ -163,8 +239,8 @@
</block>
</block>
<view class="menu" wx:if="{{detail && detail.type==0 && detail.channel==2}}" bindtap="showmenu"></view>
<view class="menu-list flex-vl" style="justify-content: flex-end;" wx:if="{{detail && detail.type==0 && detail.channel==2}}" hidden="{{menuhidden}}" catchtap="hidemenu">
<!-- <view class="menu" wx:if="{{detail && detail.type==0 && detail.channel==2}}" bindtap="showmenu"></view> -->
<view class="menu-list flex-vl" style="justify-content: flex-end;" wx:if="{{detail && detail.type==0 && detail.channel==5}}" hidden="{{menuhidden}}" catchtap="hidemenu">
<view class="menu-item menu-seller-item flex-ll" catchtap="secondbook">
<view class="menu-item-image" style="background: url({{detail.seller.seller_image}}) center center no-repeat;background-size: cover;"></view>
<view class="white-font font30r smooth">{{seller.name}}</view>
... ... @@ -205,7 +281,7 @@
<view class="white-font font30r smooth">返回</view>
</view>
</view>
<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=2}}">
<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=5}}">
<view bindtap="gotoHome" class="dingbaojian flex-vc">
<image src="http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114105901.png" class="icon"></image>
... ...
... ... @@ -401,3 +401,9 @@ image{
.gray-font{
color: #999999;
}
.last-book-food{
width: 202rpx;
height: 62rpx;
background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
border-radius: 32rpx;
}
\ No newline at end of file
... ...
// pages/customer/detail_owner.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
data:{
list:[]
},
onLoad(options){
console.log(options)
this.options=options;
this.getactivity();
},
getactivity(){
App.Activity.GetActivityByRid({rid:this.options.id}).then((json)=>{
if(json.ret==200){
console.log(json.data);
this.setData({
list:json.data
})
}
})
},
secondbook(){
wx.redirectTo({
url:'../reserve/detail?id='+this.options.sid
})
},
})
\ No newline at end of file
... ...
{
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black",
"navigationBarTitleText":"邀请详情",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<wxs src="../../utils/util.wxs" module="util" />
<nav></nav>
<view class="list flex-vc">
<block wx:for="{{list}}">
<view class="list-item">
<view class="item-content flex-lr">
<view class="flex-vl" style="height: 100%;justify-content: center;">
<view class="font44r font-bold" style="color:#F05522;">{{item.aname}}</view>
<view class="font26r" style="color:#EF7249;">有效期:{{util.unixtoTime(item.stime,'YYYY.MM.DD HH:II')}}-{{util.unixtoTime(item.etime,'YYYY.MM.DD HH:II')}}</view>
</view>
<view class="use-button flex-vc font-bold font28r">使用</view>
<!-- <view class="circle-list">
<view class="circle bg_white"></view>
<view class="circle bg_white"></view>
<view class="circle bg_white"></view>
<view class="circle bg_white"></view>
</view> -->
</view>
<view class="bg-white gray-font font24r flex-vl" style="padding: 0 30rpx;box-sizing: border-box;min-height: 62rpx;line-height: 1.4;justify-content: center">说明:{{item.explain ? item.explain : ''}}</view>
</view>
</block>
</view>
<view class="second-button white-font font36r flex-cc" bindtap="secondbook">再次预订</view>
\ No newline at end of file
... ...
.list-item{
width: 670rpx;
border-radius: 20rpx;
overflow: hidden;
box-shadow: 0 4rpx 10rpx 0 #EEF0F2;
margin-bottom: 60rpx;
}
.item-content{
width: 100%;
height: 186rpx;
background: #FFF0E5;
padding: 0 30rpx;
box-sizing: border-box;
position: relative;
}
.use-button{
width: 116rpx;
height: 52rpx;
border-radius: 26rpx;
background: #FFE2D3;
color: #F05522;
}
.second-button{
width: 670rpx;
height: 84rpx;
border-radius: 42rpx;
background: linear-gradient(to right,#3BBFF5,#57A0FF);
position: fixed;
left: 0;
right: 0;
bottom:40rpx;
margin: 0 auto;
}
.circle-list{
position: absolute;
right: -16rpx;
top: 10rpx;
width: 30rpx;
height: 176rpx;
}
.circle{
width: 40rpx;
height: 40rpx;
border-radius: 50%;
/* margin-bottom: 4rpx; */
}
\ No newline at end of file
... ...
... ... @@ -131,7 +131,8 @@ Page({
App.Activity.SetIntegral({
uid:opt.uid,
type:0,
rid:opt.id
rid:opt.id,
openid:opt.openid
})
}
... ...
... ... @@ -590,4 +590,237 @@
padding: 5rpx 0;
box-sizing: border-box;
color: #7B512A;
}
.last-book-bg{
width: 100%;
box-sizing: border-box;
overflow-y: scroll;
background: url(http://nosqn.colorcun.com/last-book-bg.png) center center no-repeat;
background-size: 100% 100%;
padding-bottom: 10rpx;
position: relative;
padding-bottom: 240rpx;
}
.book-flower{
width: 340rpx;
height: 160rpx;
background: url(http://nosqn.colorcun.com/book-flower.png) center center no-repeat;
background-size: 100% 100%;
position: absolute;
left: -40rpx;
top: 0rpx;
}
.last-book-staff{
width: 100%;
padding-right:40rpx;
box-sizing: border-box;
margin-bottom: 60rpx;
/* padding-top: 20rpx; */
}
.book-staff-headerimg{
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background-color: #FFFFFF;
margin-bottom: 20rpx;
display: block;
}
.book-staff-item-button{
width: 172rpx;
height: 46rpx;
border-radius: 23rpx;
background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
margin-left: 20rpx;
}
.book-header-icon{
width: 34rpx;
height: 34rpx;
margin-right: 16rpx;
}
.book-font{
width: 330rpx;
height: 166rpx;
background: url(http://nosqn.colorcun.com/book-font.png) center center no-repeat;
background-size: 100% 100%;
margin-bottom: 60rpx;
}
.book-room-rect{
width: 300rpx;
min-height: 160rpx;
border: 4rpx solid #C9BD89;
padding: 30rpx 50rpx 48rpx;
color: #BA9953;
position: relative;
margin-bottom: 70rpx;
box-sizing: border-box;
line-height: 74rpx;
margin-bottom: 120rpx;
}
.book-look-button{
width: 156rpx;
height: 54rpx;
position: absolute;
left: 0;
right: 0;
bottom: -24rpx;
margin: 0 auto;
border-radius: 54rpx;
background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
}
.loaction-button{
width: 128rpx;
height: 46rpx;
background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
border-radius: 23rpx;
}
.all-button{
width: 100%;
height: 84rpx;
background: #FCE2B2;
position: fixed;
left: 0;
bottom: 0;
}
.book-item-font{
width: 50%;
height: 100%;
color: #043341;
background: transparent;
}
.button-item-icon{
width: 36rpx;
height: 36rpx;
margin-right: 20rpx;
}
.second-book-button{
}
.yellow-font{
color:#E8D47E;
}
.line-border{
width: 2rpx;
height: 48rpx;
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
background: #979797;
}
.book-mask{
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: rgba(0,0,0,.69);
z-index: 99;
}
.book-buttons{
position: fixed;
left: 0;
bottom: 0;
z-index: 100;
}
.select-button{
width: 120rpx;
height: 120rpx;
background: rgba(0,0,0,.5);
position: absolute;
left: -40rpx;
bottom: 160rpx;
border-radius: 50%;
margin-top:-60rpx;
border: 2rpx solid #FFFFFF;
padding-left: 30rpx;
box-sizing: border-box;
}
.select-item-button{
width: 100rpx;
height: 100rpx;
border:2rpx solid #FFFFFF;
border-radius: 50%;
background: rgba(0,0,0,.5);
position: absolute;
padding: 0 20rpx;
box-sizing: border-box;
}
.service-buttons{
position: fixed;
right: 0;
bottom: 0;
z-index: 100;
}
.more-button{
width: 120rpx;
height: 120rpx;
background: rgba(0,0,0,.5);
position: absolute;
right: -40rpx;
bottom: 536rpx;
border-radius: 50%;
margin-top:-60rpx;
border: 2rpx solid #FFFFFF;
padding-right: 30rpx;
box-sizing: border-box;
}
.cancel-mark{
width: 160rpx;
height: 140rpx;
background: url(http://nosqn.colorcun.com/cancel-image.png) center center no-repeat;
background-size: 100% 100%;
position: fixed;
right: 132rpx;
top: 0;
bottom: 0;
margin: auto 0;
}
.confirm-cover{
position: fixed;
left: 0;
right: 0;
bottom: 80rpx;
margin: 0 auto;
}
.book-share-button{
width: 364rpx;
height: 70rpx;
background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
border-radius: 35rpx;
}
.confirm-notice{
width: 528rpx;
height: 78rpx;
position: absolute;
left: 0;
right: 0;
bottom: 96rpx;
margin: 0 auto;
border-radius: 10rpx;
background: rgba(0,0,0,.7);
}
.angel{
width: 0;
height: 0;
border: 18rpx solid rgba(0,0,0,.7);
border-left: 16rpx solid transparent;
border-right: 16rpx solid transparent;
border-bottom: 16rpx solid transparent;
position: absolute;
left: 0;
right: 0;
top: 78rpx;
margin: 0 auto;
}
.book-notice{
min-width: 354rpx;
height: 78rpx;
position: absolute;
right: 40rpx;
bottom: 106rpx;
border-radius: 10rpx;
background: rgba(0,0,0,.7);
}
\ No newline at end of file
... ...
... ... @@ -602,6 +602,10 @@ export default {
//客户经理积分设置
'App.Activity.SetIntegral':{
openid:'openid'
},
//判断是否点击确认收到
'App.Reserve.GetIsRelaSuccess':{
openid:'openid'
}
}
\ No newline at end of file
... ...
... ... @@ -15,7 +15,7 @@
{
"name": "预订本-商家1",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1297&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612",
"query": "seller_id=1001&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ&manager_id=6986",
"scene": 1001
},
{
... ... @@ -655,6 +655,18 @@
"pathName": "pages/customer/wechat",
"query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311",
"scene": null
},
{
"name": "pages/customer/detail_invitation",
"pathName": "pages/customer/detail_invitation",
"query": "id=199122&hasInvitation=1&hasSellerShare=1&uid=2891",
"scene": null
},
{
"name": "pages/customer/discount",
"pathName": "pages/customer/discount",
"query": "id=199122&sid=4352",
"scene": null
}
]
}
... ...