xt / xcx-book · Commits

Go to a project

Commit 3932f0a01e72ee1740f4d9beb16d436dafb10cfe

Authored by Yolanda
1 parent 49716b94
build: skipped

no message

Inline Side-by-side
Showing 16 changed files with 717 additions and 79 deletions
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "pages/customer/detail_customer", 6 "pages/customer/detail_customer",
7 "pages/customer/detail_invitation", 7 "pages/customer/detail_invitation",
8 "pages/customer/detail_owner_invitation", 8 "pages/customer/detail_owner_invitation",
  9 + "pages/customer/discount",
9 "pages/customer/invite", 10 "pages/customer/invite",
10 "pages/customer/list", 11 "pages/customer/list",
11 "pages/customer/remind", 12 "pages/customer/remind",
@@ -414,6 +414,7 @@ Page({ @@ -414,6 +414,7 @@ Page({
414 form.ddate = this.time; 414 form.ddate = this.time;
415 form.ddate_solt=this.ddate_solt 415 form.ddate_solt=this.ddate_solt
416 form.is_set_ddate=1 416 form.is_set_ddate=1
  417 + form.uid=util.cache('seller_user').id
417 App.Reserve.SetReserveInfo(form).then(res => { 418 App.Reserve.SetReserveInfo(form).then(res => {
418 if (res.ret == 200) { 419 if (res.ret == 200) {
419 this.getCustomRemark() 420 this.getCustomRemark()
@@ -82,6 +82,10 @@ Page({ @@ -82,6 +82,10 @@ Page({
82 this.indexOpt=opt; 82 this.indexOpt=opt;
83 this.ReservesCountDay(util.unixtoTime(d,'YYYY-MM-DD')); 83 this.ReservesCountDay(util.unixtoTime(d,'YYYY-MM-DD'));
84 this.ReservesCountMonth(util.unixtoTime(d,'YYYY-MM')); 84 this.ReservesCountMonth(util.unixtoTime(d,'YYYY-MM'));
  85 + this.enter_params = util.cache('enter_params');
  86 + App.Reserve.SellerInfo(this.enter_params).then(res => {
  87 + wx.setStorageSync('seller_user',res.data.seller_user);
  88 + })
85 }, 89 },
86 onShow:function(){ 90 onShow:function(){
87 this.setData({ 91 this.setData({
@@ -24,6 +24,10 @@ Page({ @@ -24,6 +24,10 @@ Page({
24 options: {tplid: ''}, 24 options: {tplid: ''},
25 hasOwner: false,//是否为发起人 25 hasOwner: false,//是否为发起人
26 animation: 'animation', 26 animation: 'animation',
  27 + selecthidden:true,
  28 + morehidden:true,
  29 + openid:getApp().openid,
  30 + showconfirm:true
27 }, 31 },
28 id: null, 32 id: null,
29 /** 33 /**
@@ -45,6 +49,7 @@ Page({ @@ -45,6 +49,7 @@ Page({
45 "statReachBottom": true, 49 "statReachBottom": true,
46 "lauchOpts": options, //渠道分析 50 "lauchOpts": options, //渠道分析
47 }); 51 });
  52 + this.getreal();
48 }, 53 },
49 54
50 /** 55 /**
@@ -77,6 +82,16 @@ Page({ @@ -77,6 +82,16 @@ Page({
77 }) 82 })
78 this.getDetail(); 83 this.getDetail();
79 }, 84 },
  85 + getreal(){
  86 + console.log('yyyyy',this.data.openid,this.data.options.id)
  87 + App.Reserve.GetIsRelaSuccess({openid:this.data.openid,rid:this.data.options.id}).then((json)=>{
  88 + if(json.ret==200){
  89 + this.setData({
  90 + showconfirm:false
  91 + })
  92 + }
  93 + })
  94 + },
80 cloudsendmsg(){ 95 cloudsendmsg(){
81 // 'index.html?id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1&uid='+this.data.options.uid 96 // 'index.html?id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1&uid='+this.data.options.uid
82 // let query='id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1&uid='+this.data.options.uid; 97 // let query='id='+this.data.options.id+'&hasInvation=1&hasSellerShare=1&uid='+this.data.options.uid;
@@ -319,6 +334,7 @@ Page({ @@ -319,6 +334,7 @@ Page({
319 }) 334 })
320 }, 335 },
321 confirmed(){ 336 confirmed(){
  337 + wx.reportMonitor('1016', 1)
322 if (!this.data.detail.hasCanSuccess) { 338 if (!this.data.detail.hasCanSuccess) {
323 let userInfo = util.cache('userInfo'); 339 let userInfo = util.cache('userInfo');
324 if (userInfo) { 340 if (userInfo) {
@@ -336,26 +352,30 @@ Page({ @@ -336,26 +352,30 @@ Page({
336 userinfo: userInfo 352 userinfo: userInfo
337 }).then(res => { 353 }).then(res => {
338 this.setData({ 354 this.setData({
339 - [`detail.hasCanSuccess`]: true 355 + [`detail.hasCanSuccess`]: true,
  356 + showconfirm:false
340 }) 357 })
341 App.Reserve.Detail({ 358 App.Reserve.Detail({
342 openid: getApp().openid, 359 openid: getApp().openid,
343 rid: this.id 360 rid: this.id
344 }, 'clear') 361 }, 'clear')
345 util.toast('赴约成功', 'none') 362 util.toast('赴约成功', 'none')
346 - let url='/pages/customer/list'  
347 - if(parseInt(this.data.detail.ddate)-(new Date()/1000)>3600){  
348 - if(this.data.detail.type==1){  
349 - if(this.data.detail.is_set_ddate==1){  
350 - url='/pages/customer/list?hasRelaTip=1'  
351 - }  
352 - }else{  
353 - url='/pages/customer/list?hasRelaTip=1'  
354 - }  
355 - }  
356 - wx.reLaunch({  
357 - url: url  
358 - }) 363 + this.setData({
  364 + showconfirm:false
  365 + })
  366 + // let url='/pages/customer/list'
  367 + // if(parseInt(this.data.detail.ddate)-(new Date()/1000)>3600){
  368 + // if(this.data.detail.type==1){
  369 + // if(this.data.detail.is_set_ddate==1){
  370 + // url='/pages/customer/list?hasRelaTip=1'
  371 + // }
  372 + // }else{
  373 + // url='/pages/customer/list?hasRelaTip=1'
  374 + // }
  375 + // }
  376 + // wx.reLaunch({
  377 + // url: url
  378 + // })
359 }) 379 })
360 } else { 380 } else {
361 util.toast('赴约成功', 'none') 381 util.toast('赴约成功', 'none')
@@ -402,4 +422,25 @@ Page({ @@ -402,4 +422,25 @@ Page({
402 url: '/pages/reserve/index' 422 url: '/pages/reserve/index'
403 }) 423 })
404 }, 424 },
  425 + showselect(){
  426 + this.setData({
  427 + selecthidden:false
  428 + })
  429 + },
  430 + closeselect(){
  431 + console.log('ttttt')
  432 + this.setData({
  433 + selecthidden:true
  434 + })
  435 + },
  436 + showmore(){
  437 + this.setData({
  438 + morehidden:false
  439 + })
  440 + },
  441 + closemore(){
  442 + this.setData({
  443 + morehidden:true
  444 + })
  445 + },
405 }) 446 })
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav> 3 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome" place="{{true}}"></nav>
4 -<block wx:if="{{detail && detail.type==0 && detail.channel==2}}"> 4 +<block wx:if="{{detail && detail.type==0 && detail.channel==5}}">
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;"> 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;">
6 <view class="book-image flex-cc"></view> 6 <view class="book-image flex-cc"></view>
7 <view class="cover-conent flex-vc"> 7 <view class="cover-conent flex-vc">
@@ -50,8 +50,7 @@ @@ -50,8 +50,7 @@
50 <button class="font32r font-bold main-button book-button font-bold flex-cc" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button> 50 <button class="font32r font-bold main-button book-button font-bold flex-cc" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
51 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view> 51 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
52 </view> --> 52 </view> -->
53 - <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>  
54 - <!-- <view class="last-book-title"></view> --> 53 + <!-- <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
55 <view class="last-staff-info flex-lr"> 54 <view class="last-staff-info flex-lr">
56 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view> 55 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
57 <view class="last-staff-detail flex-vr" style="align-items: flex-end;"> 56 <view class="last-staff-detail flex-vr" style="align-items: flex-end;">
@@ -62,10 +61,6 @@ @@ -62,10 +61,6 @@
62 <image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image> 61 <image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
63 <view class="black-font font22r last-button-content flex-cc" >拨打电话</view> 62 <view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
64 </view> 63 </view>
65 - <!-- <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">  
66 - <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>  
67 - <view class="black-font font22r last-button-content flex-cc" >加我微信</view>  
68 - </button> -->  
69 <button class="last-button-item flex-ll" bindtap="addwechat"> 64 <button class="last-button-item flex-ll" bindtap="addwechat">
70 <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image> 65 <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
71 <view class="black-font font22r last-button-content flex-cc" >加我微信</view> 66 <view class="black-font font22r last-button-content flex-cc" >加我微信</view>
@@ -92,17 +87,108 @@ @@ -92,17 +87,108 @@
92 <view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view> 87 <view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
93 </view> 88 </view>
94 <button class="last-share-button font38r flex-cc font-bold" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button> 89 <button class="last-share-button font38r flex-cc font-bold" wx:if="{{!detail.hasCanSuccess && detail.status!=4}}" catchtap="confirmed">确认收到</button>
95 - <!-- <block wx:elif="{{detail.hasCancel}}">  
96 - <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>  
97 - </block>  
98 - <block wx:else="">  
99 - <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>  
100 - </block> -->  
101 <view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view> 90 <view class="font24r last-yellow-font" style="width:140rpx;padding: 0 20rpx;box-sizing: border-box;margin: 0 auto;" bindtap="secondbook">再次预订</view>
102 <view style="height:40rpx;"></view> 91 <view style="height:40rpx;"></view>
103 - <!-- <view bindtap="sendmsg" style="padding: 60px;" class="white-font font36r">测试发送短信息</view> --> 92 + </scroll-view> -->
  93 + <scroll-view class="last-book-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
  94 + <view class="book-flower"></view>
  95 + <view style="padding-left: 40rpx;box-sizing: border-box;">
  96 + <view class="last-book-staff flex-vr" style="align-items: flex-end;">
  97 + <image src="{{staffinfo.photo}}" class="book-staff-headerimg" mode="aspectFit"></image>
  98 + <view class="flex-rr" style="margin-bottom: 20rpx;">
  99 + <view class="flex-rr font26r yellow-font">客户经理：{{staffinfo.name}}</view>
  100 + <view class="book-staff-item-button flex-cc" bindtap="addwechat">
  101 + <image src="http://nosqn.colorcun.com/book-wechat.png" class="book-header-icon"></image>
  102 + <view class="font22r brown-font">加我微信</view>
  103 + </view>
  104 + </view>
  105 + <view class="flex-rr" bindtap="call">
  106 + <view class="flex-rr font26r yellow-font">{{staffinfo.phone}}</view>
  107 + <view class="book-staff-item-button flex-cc">
  108 + <image src="http://nosqn.colorcun.com/book-phone.png" class="book-header-icon"></image>
  109 + <view class="font22r brown-font">拨打电话</view>
  110 + </view>
  111 + </view>
  112 + </view>
  113 + <view class="book-font"></view>
  114 + <view class="yellow-font font44r" style="margin-bottom: 60rpx;">{{seller.name}}</view>
  115 + <view>
  116 + <view class="font26r" style="color: #C9BD89;margin-bottom: 20rpx;">已为您安排在包间</view>
  117 + <view class="book-room-rect flex-cc">
  118 + <view class="font44r yellow-font">{{seller.room}}</view>
  119 + <view class="book-look-button brown-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
  120 + </view>
  121 + <view class="yellow-font font30r" style="margin-bottom: 24rpx;">时间：{{seller.date}}</view>
  122 + <view class="flex-lr" style="line-height: 1.2;padding-right: 40rpx;box-sizing: border-box;margin-bottom: 200rpx;">
  123 + <view class="yellow-font font30r">地址：{{seller.addr}}</view>
  124 + <view class="loaction-button black-font font22r flex-cc" bindtap="lookLocation">一键导航</view>
  125 + </view>
  126 +
  127 + </view>
  128 + </view>
  129 + <view class="confirm-cover" wx:if="{{showconfirm}}">
  130 + <button class="book-share-button font38r flex-cc font-bold" catchtap="confirmed">确认收到</button>
  131 + <view class="confirm-notice flex-vc">
  132 + <view class="white-font font26r flex-cc">点击确认收到，可告知发起人已收到邀请</view>
  133 + <view class="angel"></view>
  134 + </view>
  135 + </view>
  136 +
104 </scroll-view> 137 </scroll-view>
105 - 138 + <view class="all-button flex-lr" wx:if="{{!showconfirm}}">
  139 + <block wx:if="{{detail.hasCancel}}">
  140 + <view class="book-item-font flex-cc">
  141 + <image src="http://nosqn.colorcun.com/book-share-nouse-button.png" class="button-item-icon"></image>
  142 + <view class="font30r" style="color: #999999;">转发好友</view>
  143 + </view>
  144 + </block>
  145 + <block wx:else>
  146 + <button class="book-item-font flex-cc" open-type="share">
  147 + <image src="http://nosqn.colorcun.com/book-share-button.png" class="button-item-icon"></image>
  148 + <view class="font30r">转发好友</view>
  149 + </button>
  150 + </block>
  151 + <view class="book-item-font second-book-button flex-cc" bindtap="secondbook">
  152 + <image src="http://nosqn.colorcun.com/second-book.png" class="button-item-icon"></image>
  153 + <view class="font30r">再次预订</view>
  154 + </view>
  155 + <view class="line-border"></view>
  156 + <block wx:if="{{list}}">
  157 + <view class="book-notice flex-vc">
  158 + <view class="white-font font26r flex-cc">再次预订可享“{{list[0].aname}}”优惠</view>
  159 + <view class="angel"></view>
  160 + </view>
  161 + </block>
  162 + </view>
  163 + <view class="book-mask" hidden="{{selecthidden}}" bindtap="closeselect"></view>
  164 + <view class="book-buttons">
  165 + <view class="select-button white-font font28r flex-cc" bindtap="showselect">选项</view>
  166 + <view hidden="{{selecthidden}}">
  167 + <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>
  168 + <navigator class="select-item-button flex-cc white-font font24r" style="left: 126rpx;bottom:242rpx;" open-type="redirect" url="/pages/me/index">我的</navigator>
  169 + <block wx:if="{{detail.hasCancel}}"><view class="select-item-button flex-cc gray-font font28r" style="left: 130rpx;bottom:110rpx;">取消订单</view>
  170 + <view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
  171 + </block>
  172 + <block wx:else>
  173 + <view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
  174 + </block>
  175 + <view class="select-item-button flex-cc white-font font24r" style="left: 42rpx;bottom:10rpx;" bindtap="closeselect">返回</view>
  176 + </view>
  177 + </view>
  178 + <view class="book-mask" hidden="{{morehidden}}" bindtap="closemore"></view>
  179 + <view class="service-buttons">
  180 + <view class="more-button white-font font28r flex-vc" bindtap="showmore">更多<view>服务</view></view>
  181 + <view hidden="{{morehidden}}">
  182 + <view class="select-item-button flex-cc gray-font font24r" style="right: 0rpx;bottom:724rpx;">酒水</view>
  183 + <view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:660rpx;">代驾</view>
  184 + <view class="select-item-button flex-cc gray-font font24r" style="right: 152rpx;bottom:546rpx;">酒店</view>
  185 + <view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:430rpx;">茶楼沐足</view>
  186 + <view class="select-item-button flex-cc white-font font24r" style="right: 0rpx;bottom:368rpx;" bindtap="closemore">返回</view>
  187 + </view>
  188 + </view>
  189 + <block wx:if="{{detail.hasCancel}}">
  190 + <view class="cancel-mark"></view>
  191 + </block>
106 192
107 </block> 193 </block>
108 <block wx:else> 194 <block wx:else>
@@ -118,8 +204,9 @@ @@ -118,8 +204,9 @@
118 </view> 204 </view>
119 </view> 205 </view>
120 </block> 206 </block>
  207 + <view class="cancel-icon" wx:if="{{detail.status==4}}"></view>
121 </block> 208 </block>
122 -<view class="opt-button flex-lr" wx:if="{{detail && detail.channel!=2}}"> 209 +<view class="opt-button flex-lr" wx:if="{{detail && detail.channel!=5}}">
123 <view bindtap="gotoHome" class="dingbaojian flex-vc"> 210 <view bindtap="gotoHome" class="dingbaojian flex-vc">
124 <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> 211 <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>
125 <view class="text">订包间</view> 212 <view class="text">订包间</view>
@@ -139,7 +226,6 @@ @@ -139,7 +226,6 @@
139 </button> 226 </button>
140 </view> 227 </view>
141 </view> 228 </view>
142 -<view class="cancel-icon" wx:if="{{detail.status==4}}"></view>  
143 <!--//商务--> 229 <!--//商务-->
144 <template name="tpl-1"> 230 <template name="tpl-1">
145 <view class="flex-vc shangwu" bindtap="{{options.rid?'goEditor':''}}"> 231 <view class="flex-vc shangwu" bindtap="{{options.rid?'goEditor':''}}">
@@ -28,6 +28,9 @@ Page({ @@ -28,6 +28,9 @@ Page({
28 couponhidden:true, 28 couponhidden:true,
29 getcoupon:false, 29 getcoupon:false,
30 menuhidden:true, 30 menuhidden:true,
  31 + selecthidden:true,
  32 + morehidden:true,
  33 + openid:getApp().openid
31 }, 34 },
32 id: null, 35 id: null,
33 msgTpl:'', 36 msgTpl:'',
@@ -100,6 +103,7 @@ Page({ @@ -100,6 +103,7 @@ Page({
100 }) 103 })
101 }, 104 },
102 call(){ 105 call(){
  106 + wx.reportMonitor('1012', 1)
103 wx.makePhoneCall({ 107 wx.makePhoneCall({
104 phoneNumber: this.data.staffinfo.phone //仅为示例，并非真实的电话号码 108 phoneNumber: this.data.staffinfo.phone //仅为示例，并非真实的电话号码
105 }) 109 })
@@ -116,7 +120,8 @@ Page({ @@ -116,7 +120,8 @@ Page({
116 // wx.previewImage({ 120 // wx.previewImage({
117 // current: this.data.staffinfo.qrcode, // 当前显示图片的http链接 121 // current: this.data.staffinfo.qrcode, // 当前显示图片的http链接
118 // urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表 122 // urls: [this.data.staffinfo.qrcode] // 需要预览的图片http链接列表
119 - // }) 123 + // })
  124 + wx.reportMonitor('1011', 1)
120 util.cache('staffinfo',this.data.staffinfo); 125 util.cache('staffinfo',this.data.staffinfo);
121 wx.navigateTo({ 126 wx.navigateTo({
122 url:'./wechat?qrcode='+this.data.staffinfo.qrcode 127 url:'./wechat?qrcode='+this.data.staffinfo.qrcode
@@ -155,9 +160,17 @@ Page({ @@ -155,9 +160,17 @@ Page({
155 }) 160 })
156 }, 161 },
157 secondbook(){ 162 secondbook(){
158 - wx.redirectTo({  
159 - url:'../reserve/detail?id='+this.data.detail.seller.id  
160 - }) 163 + wx.reportMonitor('1013', 1)
  164 + if(this.data.list){
  165 + wx.navigateTo({
  166 + url:'./discount?sid='+this.data.detail.seller.id+'&id='+this.data.options.id
  167 + })
  168 + }else{
  169 + wx.redirectTo({
  170 + url:'../reserve/detail?id='+this.data.detail.seller.id
  171 + })
  172 + }
  173 +
161 }, 174 },
162 /** 175 /**
163 * 生命周期函数--监听页面隐藏 176 * 生命周期函数--监听页面隐藏
@@ -177,10 +190,10 @@ Page({ @@ -177,10 +190,10 @@ Page({
177 * 用户点击右上角分享 190 * 用户点击右上角分享
178 */ 191 */
179 onShareAppMessage: function () { 192 onShareAppMessage: function () {
180 - return this.shareSetting(); 193 + return this.sharesetting();
181 }, 194 },
182 onShareTimeline(){ 195 onShareTimeline(){
183 - return this.shareSetting(); 196 + return this.sharesetting();
184 }, 197 },
185 getDetail(fouce = false){ 198 getDetail(fouce = false){
186 App.Reserve.Detail({ 199 App.Reserve.Detail({
@@ -270,7 +283,8 @@ Page({ @@ -270,7 +283,8 @@ Page({
270 } 283 }
271 284
272 }, 285 },
273 - lookLocation: function () { 286 + looklocation: function () {
  287 + wx.reportMonitor('1015', 1)
274 wx.openLocation({ 288 wx.openLocation({
275 latitude: Number(this.data.detail.seller.lat), 289 latitude: Number(this.data.detail.seller.lat),
276 longitude: Number(this.data.detail.seller.long), 290 longitude: Number(this.data.detail.seller.long),
@@ -339,7 +353,8 @@ Page({ @@ -339,7 +353,8 @@ Page({
339 this.getDetail(true); 353 this.getDetail(true);
340 }) 354 })
341 }, 355 },
342 - shareSetting(){ 356 + sharesetting(){
  357 + wx.reportMonitor('1017', 1)
343 let parmdata={ 358 let parmdata={
344 id:this.id, 359 id:this.id,
345 fromid:getApp().openid, 360 fromid:getApp().openid,
@@ -506,4 +521,56 @@ Page({ @@ -506,4 +521,56 @@ Page({
506 mask:true 521 mask:true
507 }) 522 })
508 }, 523 },
  524 + showselect(){
  525 + wx.reportMonitor('1014', 1)
  526 + this.setData({
  527 + selecthidden:false
  528 + })
  529 + },
  530 + closeselect(){
  531 + console.log('ttttt')
  532 + this.setData({
  533 + selecthidden:true
  534 + })
  535 + },
  536 + showmore(){
  537 + this.setData({
  538 + morehidden:false
  539 + })
  540 + },
  541 + closemore(){
  542 + this.setData({
  543 + morehidden:true
  544 + })
  545 + },
  546 + cancelmodal(){
  547 + wx.showModal({
  548 + title:'取消预订',
  549 + content:'点击“确认取消”撤回当前预订，否则点击返回',
  550 + confirmColor:'#576B95',
  551 + confirmText:'确认取消',
  552 + cancelColor:'#999999',
  553 + cancelText:'返回',
  554 + success:(res)=>{
  555 + if(res.confirm){
  556 + this.cancelSubmit();
  557 + }
  558 + }
  559 +
  560 + })
  561 + },
  562 + cancelSubmit(){
  563 + App.Reserve.Detail({
  564 + openid: getApp().openid,
  565 + rid: this.options.id
  566 + },'clear')
  567 + App.Customer.SetReserveStatusByUser({
  568 + rid:this.options.id,
  569 + desc:'',
  570 + }).then(res=>{
  571 + if(res.ret!=200){
  572 + return util.toast(res.msg,'none')
  573 + }
  574 + })
  575 + },
509 }) 576 })
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 --> 11 -->
12 </nav> 12 </nav>
13 <!-- 内部预定 --> 13 <!-- 内部预定 -->
14 -<block wx:if="{{detail && detail.type==0 && detail.channel==2}}"> 14 +<block wx:if="{{detail && detail.type==0 && detail.channel==5}}">
15 <!-- <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;"> 15 <!-- <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;">
16 <view class="book-image flex-cc"> 16 <view class="book-image flex-cc">
17 </view> 17 </view>
@@ -67,8 +67,7 @@ @@ -67,8 +67,7 @@
67 </block> 67 </block>
68 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view> 68 <view class="font34r smooth flex-cc font-bold" style="width:140rpx;color:#ECC88F;margin: 0 auto;" bindtap="secondbook">再次预订</view>
69 </view> --> 69 </view> -->
70 - <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>  
71 - <!-- <view class="last-book-title"></view> --> 70 + <!-- <scroll-view class="last-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
72 <view class="last-staff-info flex-lr"> 71 <view class="last-staff-info flex-lr">
73 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view> 72 <view class="last-staff-image" style="background: url({{staffinfo.photo}}) center center no-repeat;background-size: 100% auto;"></view>
74 <view class="last-staff-detail flex-vr" style="align-items: flex-end;"> 73 <view class="last-staff-detail flex-vr" style="align-items: flex-end;">
@@ -79,10 +78,6 @@ @@ -79,10 +78,6 @@
79 <image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image> 78 <image src="http://sellershare.colorcun.com/last-book-call.png" class="last-icon"></image>
80 <view class="black-font font22r last-button-content flex-cc" >拨打电话</view> 79 <view class="black-font font22r last-button-content flex-cc" >拨打电话</view>
81 </view> 80 </view>
82 - <!-- <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">  
83 - <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>  
84 - <view class="black-font font22r last-button-content flex-cc" >加我微信</view>  
85 - </button> -->  
86 <button class="last-button-item flex-ll" bindtap="addwechat"> 81 <button class="last-button-item flex-ll" bindtap="addwechat">
87 <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image> 82 <image src="http://sellershare.colorcun.com/last-book-wechat.png" class="last-icon"></image>
88 <view class="black-font font22r last-button-content flex-cc" >加我微信</view> 83 <view class="black-font font22r last-button-content flex-cc" >加我微信</view>
@@ -109,39 +104,120 @@ @@ -109,39 +104,120 @@
109 <view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view> 104 <view class="last-comoon-button black-font font22r flex-cc" style="margin-bottom: 60rpx;" bindtap="lookLocation">一键导航</view>
110 </view> 105 </view>
111 <button class="last-share-button font38r flex-cc font-bold" open-type="share" wx:if="{{!detail.hasOvered && !detail.hasCancel}}" catchtap="setUserInfoSuccess">转发好友</button> 106 <button class="last-share-button font38r flex-cc font-bold" open-type="share" wx:if="{{!detail.hasOvered && !detail.hasCancel}}" catchtap="setUserInfoSuccess">转发好友</button>
112 - <!-- <block wx:elif="{{detail.hasCancel}}">  
113 - <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已取消</view>  
114 - </block>  
115 - <block wx:else="">  
116 - <view class="font32r white-font flex-cc" style="margin-bottom: 30rpx;">订座已完成</view>  
117 - </block> -->  
118 <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> 107 <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>
119 <view style="height:40rpx;"></view> 108 <view style="height:40rpx;"></view>
  109 + </scroll-view> -->
  110 + <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
  111 + <scroll-view class="last-book-bg" style="padding-top: {{statusBarHeight+titleBarHeight}}px;line-height: 1.4;height:{{height}}px;" scroll-y>
  112 + <view class="book-flower"></view>
  113 + <view style="padding-left: 40rpx;box-sizing: border-box;">
  114 + <view class="last-book-staff flex-vr" style="align-items: flex-end;">
  115 + <image src="{{staffinfo.photo}}" class="book-staff-headerimg" mode="aspectFit"></image>
  116 + <view class="flex-rr" style="margin-bottom: 20rpx;">
  117 + <view class="flex-rr font26r yellow-font">客户经理：{{staffinfo.name}}</view>
  118 + <view class="book-staff-item-button flex-cc" bindtap="addwechat">
  119 + <image src="http://nosqn.colorcun.com/book-wechat.png" class="book-header-icon"></image>
  120 + <view class="font22r brown-font">加我微信</view>
  121 + </view>
  122 + </view>
  123 + <view class="flex-rr">
  124 + <view class="flex-rr font26r yellow-font">{{staffinfo.phone}}</view>
  125 + <view class="book-staff-item-button flex-cc" bindtap="call">
  126 + <image src="http://nosqn.colorcun.com/book-phone.png" class="book-header-icon"></image>
  127 + <view class="font22r brown-font">拨打电话</view>
  128 + </view>
  129 + </view>
  130 + </view>
  131 + <view class="book-font"></view>
  132 + <view class="flex-lr" style="padding-right: 40rpx;box-sizing: border-box;align-items: flex-start;">
  133 + <view class="yellow-font font44r" style="max-width:428rpx;margin-bottom: 60rpx;">{{seller.name}}</view>
  134 + <block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">
  135 + <block wx:if="{{detail && detail.seller.is_open_order==1}}">
  136 + <view class="last-book-food flex-cc" bindtap="cookbook">
  137 + <view class="white-font font30r smooth" style="color: #043341;">提前点餐</view>
  138 + <image src="http://nosqn.colorcun.com/book-direction.png" style="width: 12rpx;height: 24rpx;margin-left: 10rpx;"></image>
  139 + </view>
  140 + </block>
  141 + <block wx:else>
  142 + <view class="last-book-food flex-ll" bindtap="noopen" data-mark="buy">
  143 + <view class="white-font font30r smooth">提前点餐</view>
  144 + <image src="http://nosqn.colorcun.com/book-direction.png" style="width: 12rpx;height: 24rpx;margin-left: 10rpx;"></image>
  145 + </view>
  146 + </block>
  147 + </block>
  148 + </view>
  149 +
  150 + <view>
  151 + <view class="font26r" style="color: #C9BD89;margin-bottom: 20rpx;">已为您安排在包间</view>
  152 + <view class="book-room-rect flex-cc">
  153 + <view class="font44r yellow-font">{{seller.room}}</view>
  154 + <view class="book-look-button brown-font font22r flex-cc" wx:if="{{roomimage && roomimage.length>0}}" bindtap="lookroom">浏览照片</view>
  155 + </view>
  156 + <view class="yellow-font font30r" style="margin-bottom: 24rpx;">时间：{{seller.date}}</view>
  157 + <view class="flex-lr" style="line-height: 1.2;padding-right: 40rpx;box-sizing: border-box;">
  158 + <view class="yellow-font font30r">地址：{{seller.addr}}</view>
  159 + <view class="loaction-button black-font font22r flex-cc" bindtap="looklocation">一键导航</view>
  160 + </view>
  161 +
  162 + </view>
  163 + </view>
  164 +
120 </scroll-view> 165 </scroll-view>
121 - <!-- wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}" -->  
122 - <!-- <view class="last-bottom flex-lr">  
123 - <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}}%;">  
124 - <image src="http://sellershare.colorcun.com/yuding.png" class="icon" style="width: 32rpx;height: 32rpx;"></image>  
125 - 再次预订 166 + <view class="all-button flex-lr">
  167 + <block wx:if="{{detail.hasCancel}}">
  168 + <view class="book-item-font flex-cc">
  169 + <image src="http://nosqn.colorcun.com/book-share-nouse-button.png" class="button-item-icon"></image>
  170 + <view class="font30r" style="color: #999999;">转发好友</view>
  171 + </view>
  172 + </block>
  173 + <block wx:else>
  174 + <button class="book-item-font flex-cc" open-type="share">
  175 + <image src="http://nosqn.colorcun.com/book-share-button.png" class="button-item-icon"></image>
  176 + <view class="font30r">转发好友</view>
  177 + </button>
  178 + </block>
  179 + <view class="book-item-font second-book-button flex-cc" bindtap="secondbook">
  180 + <image src="http://nosqn.colorcun.com/second-book.png" class="button-item-icon"></image>
  181 + <view class="font30r">再次预订</view>
126 </view> 182 </view>
127 - <block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">  
128 - <userinfo binduserinfo="cookbook" class="last-diancan flex-vc" style="width:{{detail && detail.seller.isopen_md==1 ? 33.33 : 50}}%;">  
129 - <view class="last-buts-text flex-cc font30r" style="border-left:2rpx solid #D3BF9C;height: 50rpx;">  
130 - <image src="http://sellershare.colorcun.com/diancan.png" class="icon" style="width: 34rpx;height: 28rpx;"></image>  
131 - 提前点餐  
132 - </view>  
133 - </userinfo>  
134 - <userinfo class="last-pay flex-cc" binduserinfo="checkout" share="{{detail}}" share-act="invitation" wx:if="{{detail && detail.seller.isopen_md==1}}">  
135 - <view class="last-buts-text font30r flex-cc" style="border-left:2rpx solid #D3BF9C;height: 50rpx;">  
136 - <image src="http://sellershare.colorcun.com/maidan.png" class="icon" style="width:30rpx;height: 24rpx;"></image>  
137 - 在线买单  
138 - </view>  
139 - </userinfo> 183 + <view class="line-border"></view>
  184 + <block wx:if="{{list}}">
  185 + <view class="book-notice flex-vc">
  186 + <view class="white-font font26r flex-cc">再次预订可享“{{list[0].aname}}”优惠</view>
  187 + <view class="angel"></view>
  188 + </view>
140 </block> 189 </block>
141 - </view> -->  
142 - <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>  
143 - <!-- <view bindtap="sendmsg">测试发送短信息</view> -->  
144 -</block> 190 + </view>
  191 + <view class="book-mask" hidden="{{selecthidden}}" bindtap="closeselect"></view>
  192 + <view class="book-buttons">
  193 + <view class="select-button white-font font28r flex-cc" bindtap="showselect">选项</view>
  194 + <view hidden="{{selecthidden}}">
  195 + <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>
  196 + <navigator class="select-item-button flex-cc white-font font24r" style="left: 126rpx;bottom:242rpx;" open-type="redirect" url="/pages/me/index">我的</navigator>
  197 + <block wx:if="{{detail.hasCancel}}"><view class="select-item-button flex-cc gray-font font28r" style="left: 130rpx;bottom:110rpx;">取消订单</view>
  198 + <view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
  199 + </block>
  200 + <block wx:else>
  201 + <view class="select-item-button flex-cc white-font font24r" style="left: 130rpx;bottom:110rpx;" bindtap="cancelmodal">取消订单</view>
  202 + </block>
  203 + <view class="select-item-button flex-cc white-font font24r" style="left: 42rpx;bottom:10rpx;" bindtap="closeselect">返回</view>
  204 + </view>
  205 + </view>
  206 + <view class="book-mask" hidden="{{morehidden}}" bindtap="closemore"></view>
  207 + <view class="service-buttons">
  208 + <view class="more-button white-font font28r flex-vc" bindtap="showmore">更多<view>服务</view></view>
  209 + <view hidden="{{morehidden}}">
  210 + <view class="select-item-button flex-cc gray-font font24r" style="right: 0rpx;bottom:724rpx;">酒水</view>
  211 + <view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:660rpx;">代驾</view>
  212 + <view class="select-item-button flex-cc gray-font font24r" style="right: 152rpx;bottom:546rpx;">酒店</view>
  213 + <view class="select-item-button flex-cc gray-font font24r" style="right: 112rpx;bottom:430rpx;">茶楼沐足</view>
  214 + <view class="select-item-button flex-cc white-font font24r" style="right: 0rpx;bottom:368rpx;" bindtap="closemore">返回</view>
  215 + </view>
  216 + </view>
  217 + <block wx:if="{{detail.hasCancel}}">
  218 + <view class="cancel-mark"></view>
  219 + </block>
  220 +</block>
145 <block wx:else> 221 <block wx:else>
146 <block wx:if="{{detail}}"> 222 <block wx:if="{{detail}}">
147 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> 223 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
@@ -163,8 +239,8 @@ @@ -163,8 +239,8 @@
163 </block> 239 </block>
164 240
165 </block> 241 </block>
166 -<view class="menu" wx:if="{{detail && detail.type==0 && detail.channel==2}}" bindtap="showmenu"></view>  
167 -<view class="menu-list flex-vl" style="justify-content: flex-end;" wx:if="{{detail && detail.type==0 && detail.channel==2}}" hidden="{{menuhidden}}" catchtap="hidemenu"> 242 +<!-- <view class="menu" wx:if="{{detail && detail.type==0 && detail.channel==2}}" bindtap="showmenu"></view> -->
  243 +<view class="menu-list flex-vl" style="justify-content: flex-end;" wx:if="{{detail && detail.type==0 && detail.channel==5}}" hidden="{{menuhidden}}" catchtap="hidemenu">
168 <view class="menu-item menu-seller-item flex-ll" catchtap="secondbook"> 244 <view class="menu-item menu-seller-item flex-ll" catchtap="secondbook">
169 <view class="menu-item-image" style="background: url({{detail.seller.seller_image}}) center center no-repeat;background-size: cover;"></view> 245 <view class="menu-item-image" style="background: url({{detail.seller.seller_image}}) center center no-repeat;background-size: cover;"></view>
170 <view class="white-font font30r smooth">{{seller.name}}</view> 246 <view class="white-font font30r smooth">{{seller.name}}</view>
@@ -205,7 +281,7 @@ @@ -205,7 +281,7 @@
205 <view class="white-font font30r smooth">返回</view> 281 <view class="white-font font30r smooth">返回</view>
206 </view> 282 </view>
207 </view> 283 </view>
208 -<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=2}}"> 284 +<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel && detail.channel!=5}}">
209 285
210 <view bindtap="gotoHome" class="dingbaojian flex-vc"> 286 <view bindtap="gotoHome" class="dingbaojian flex-vc">
211 <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> 287 <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{ @@ -401,3 +401,9 @@ image{
401 .gray-font{ 401 .gray-font{
402 color: #999999; 402 color: #999999;
403 } 403 }
  404 +.last-book-food{
  405 + width: 202rpx;
  406 + height: 62rpx;
  407 + background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
  408 + border-radius: 32rpx;
  409 +}
  1 +// pages/customer/detail_owner.js
  2 +import util from '../../utils/util';
  3 +import App from '../../utils/api';
  4 +Page({
  5 + data:{
  6 + list:[]
  7 + },
  8 + onLoad(options){
  9 + console.log(options)
  10 + this.options=options;
  11 + this.getactivity();
  12 + },
  13 + getactivity(){
  14 + App.Activity.GetActivityByRid({rid:this.options.id}).then((json)=>{
  15 + if(json.ret==200){
  16 + console.log(json.data);
  17 + this.setData({
  18 + list:json.data
  19 + })
  20 + }
  21 + })
  22 + },
  23 + secondbook(){
  24 + wx.redirectTo({
  25 + url:'../reserve/detail?id='+this.options.sid
  26 + })
  27 + },
  28 +})
  1 +{
  2 + "navigationBarBackgroundColor": "#ffffff",
  3 + "navigationBarTextStyle": "black",
  4 + "navigationBarTitleText":"邀请详情",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav"
  7 + }
  8 +}
  1 +<wxs src="../../utils/util.wxs" module="util" />
  2 +<nav></nav>
  3 +<view class="list flex-vc">
  4 + <block wx:for="{{list}}">
  5 + <view class="list-item">
  6 + <view class="item-content flex-lr">
  7 + <view class="flex-vl" style="height: 100%;justify-content: center;">
  8 + <view class="font44r font-bold" style="color:#F05522;">{{item.aname}}</view>
  9 + <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>
  10 + </view>
  11 + <view class="use-button flex-vc font-bold font28r">使用</view>
  12 + <!-- <view class="circle-list">
  13 + <view class="circle bg_white"></view>
  14 + <view class="circle bg_white"></view>
  15 + <view class="circle bg_white"></view>
  16 + <view class="circle bg_white"></view>
  17 + </view> -->
  18 + </view>
  19 + <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>
  20 + </view>
  21 + </block>
  22 +
  23 +</view>
  24 +<view class="second-button white-font font36r flex-cc" bindtap="secondbook">再次预订</view>
  1 +.list-item{
  2 + width: 670rpx;
  3 + border-radius: 20rpx;
  4 + overflow: hidden;
  5 + box-shadow: 0 4rpx 10rpx 0 #EEF0F2;
  6 + margin-bottom: 60rpx;
  7 +}
  8 +.item-content{
  9 + width: 100%;
  10 + height: 186rpx;
  11 + background: #FFF0E5;
  12 + padding: 0 30rpx;
  13 + box-sizing: border-box;
  14 + position: relative;
  15 +}
  16 +.use-button{
  17 + width: 116rpx;
  18 + height: 52rpx;
  19 + border-radius: 26rpx;
  20 + background: #FFE2D3;
  21 + color: #F05522;
  22 +}
  23 +.second-button{
  24 + width: 670rpx;
  25 + height: 84rpx;
  26 + border-radius: 42rpx;
  27 + background: linear-gradient(to right,#3BBFF5,#57A0FF);
  28 + position: fixed;
  29 + left: 0;
  30 + right: 0;
  31 + bottom:40rpx;
  32 + margin: 0 auto;
  33 +}
  34 +.circle-list{
  35 + position: absolute;
  36 + right: -16rpx;
  37 + top: 10rpx;
  38 + width: 30rpx;
  39 + height: 176rpx;
  40 +}
  41 +.circle{
  42 + width: 40rpx;
  43 + height: 40rpx;
  44 + border-radius: 50%;
  45 + /* margin-bottom: 4rpx; */
  46 +}
@@ -131,7 +131,8 @@ Page({ @@ -131,7 +131,8 @@ Page({
131 App.Activity.SetIntegral({ 131 App.Activity.SetIntegral({
132 uid:opt.uid, 132 uid:opt.uid,
133 type:0, 133 type:0,
134 - rid:opt.id 134 + rid:opt.id,
  135 + openid:opt.openid
135 }) 136 })
136 } 137 }
137 138
@@ -590,4 +590,237 @@ @@ -590,4 +590,237 @@
590 padding: 5rpx 0; 590 padding: 5rpx 0;
591 box-sizing: border-box; 591 box-sizing: border-box;
592 color: #7B512A; 592 color: #7B512A;
  593 +}
  594 +.last-book-bg{
  595 + width: 100%;
  596 + box-sizing: border-box;
  597 + overflow-y: scroll;
  598 + background: url(http://nosqn.colorcun.com/last-book-bg.png) center center no-repeat;
  599 + background-size: 100% 100%;
  600 + padding-bottom: 10rpx;
  601 + position: relative;
  602 + padding-bottom: 240rpx;
  603 +}
  604 +.book-flower{
  605 + width: 340rpx;
  606 + height: 160rpx;
  607 + background: url(http://nosqn.colorcun.com/book-flower.png) center center no-repeat;
  608 + background-size: 100% 100%;
  609 + position: absolute;
  610 + left: -40rpx;
  611 + top: 0rpx;
  612 +}
  613 +.last-book-staff{
  614 + width: 100%;
  615 + padding-right:40rpx;
  616 + box-sizing: border-box;
  617 + margin-bottom: 60rpx;
  618 + /* padding-top: 20rpx; */
  619 +}
  620 +.book-staff-headerimg{
  621 + width: 140rpx;
  622 + height: 140rpx;
  623 + border-radius: 50%;
  624 + background-color: #FFFFFF;
  625 + margin-bottom: 20rpx;
  626 + display: block;
  627 +
  628 +}
  629 +.book-staff-item-button{
  630 + width: 172rpx;
  631 + height: 46rpx;
  632 + border-radius: 23rpx;
  633 + background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
  634 + margin-left: 20rpx;
  635 +}
  636 +.book-header-icon{
  637 + width: 34rpx;
  638 + height: 34rpx;
  639 + margin-right: 16rpx;
  640 +}
  641 +.book-font{
  642 + width: 330rpx;
  643 + height: 166rpx;
  644 + background: url(http://nosqn.colorcun.com/book-font.png) center center no-repeat;
  645 + background-size: 100% 100%;
  646 + margin-bottom: 60rpx;
  647 +}
  648 +.book-room-rect{
  649 + width: 300rpx;
  650 + min-height: 160rpx;
  651 + border: 4rpx solid #C9BD89;
  652 + padding: 30rpx 50rpx 48rpx;
  653 + color: #BA9953;
  654 + position: relative;
  655 + margin-bottom: 70rpx;
  656 + box-sizing: border-box;
  657 + line-height: 74rpx;
  658 + margin-bottom: 120rpx;
  659 +}
  660 +.book-look-button{
  661 + width: 156rpx;
  662 + height: 54rpx;
  663 + position: absolute;
  664 + left: 0;
  665 + right: 0;
  666 + bottom: -24rpx;
  667 + margin: 0 auto;
  668 + border-radius: 54rpx;
  669 + background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
  670 +}
  671 +.loaction-button{
  672 + width: 128rpx;
  673 + height: 46rpx;
  674 + background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
  675 + border-radius: 23rpx;
  676 +}
  677 +.all-button{
  678 + width: 100%;
  679 + height: 84rpx;
  680 + background: #FCE2B2;
  681 + position: fixed;
  682 + left: 0;
  683 + bottom: 0;
  684 +}
  685 +.book-item-font{
  686 + width: 50%;
  687 + height: 100%;
  688 + color: #043341;
  689 + background: transparent;
  690 +}
  691 +.button-item-icon{
  692 + width: 36rpx;
  693 + height: 36rpx;
  694 + margin-right: 20rpx;
  695 +}
  696 +.second-book-button{
  697 +
  698 +}
  699 +.yellow-font{
  700 + color:#E8D47E;
  701 +}
  702 +.line-border{
  703 + width: 2rpx;
  704 + height: 48rpx;
  705 + position: absolute;
  706 + left: 0;
  707 + right: 0;
  708 + top: 0;
  709 + bottom: 0;
  710 + margin: auto;
  711 + background: #979797;
  712 +}
  713 +.book-mask{
  714 + position: fixed;
  715 + left: 0;
  716 + right: 0;
  717 + top: 0;
  718 + bottom: 0;
  719 + background: rgba(0,0,0,.69);
  720 + z-index: 99;
  721 +}
  722 +.book-buttons{
  723 + position: fixed;
  724 + left: 0;
  725 + bottom: 0;
  726 + z-index: 100;
  727 +}
  728 +.select-button{
  729 + width: 120rpx;
  730 + height: 120rpx;
  731 + background: rgba(0,0,0,.5);
  732 + position: absolute;
  733 + left: -40rpx;
  734 + bottom: 160rpx;
  735 + border-radius: 50%;
  736 + margin-top:-60rpx;
  737 + border: 2rpx solid #FFFFFF;
  738 + padding-left: 30rpx;
  739 + box-sizing: border-box;
  740 +}
  741 +.select-item-button{
  742 + width: 100rpx;
  743 + height: 100rpx;
  744 + border:2rpx solid #FFFFFF;
  745 + border-radius: 50%;
  746 + background: rgba(0,0,0,.5);
  747 + position: absolute;
  748 + padding: 0 20rpx;
  749 + box-sizing: border-box;
  750 +}
  751 +.service-buttons{
  752 + position: fixed;
  753 + right: 0;
  754 + bottom: 0;
  755 + z-index: 100;
  756 +}
  757 +.more-button{
  758 + width: 120rpx;
  759 + height: 120rpx;
  760 + background: rgba(0,0,0,.5);
  761 + position: absolute;
  762 + right: -40rpx;
  763 + bottom: 536rpx;
  764 + border-radius: 50%;
  765 + margin-top:-60rpx;
  766 + border: 2rpx solid #FFFFFF;
  767 + padding-right: 30rpx;
  768 + box-sizing: border-box;
  769 +}
  770 +.cancel-mark{
  771 + width: 160rpx;
  772 + height: 140rpx;
  773 + background: url(http://nosqn.colorcun.com/cancel-image.png) center center no-repeat;
  774 + background-size: 100% 100%;
  775 + position: fixed;
  776 + right: 132rpx;
  777 + top: 0;
  778 + bottom: 0;
  779 + margin: auto 0;
  780 +}
  781 +.confirm-cover{
  782 + position: fixed;
  783 + left: 0;
  784 + right: 0;
  785 + bottom: 80rpx;
  786 + margin: 0 auto;
  787 +}
  788 +.book-share-button{
  789 + width: 364rpx;
  790 + height: 70rpx;
  791 + background: linear-gradient(to right,#E1B275,#FEEFBC,#E1B275);
  792 + border-radius: 35rpx;
  793 +}
  794 +.confirm-notice{
  795 + width: 528rpx;
  796 + height: 78rpx;
  797 + position: absolute;
  798 + left: 0;
  799 + right: 0;
  800 + bottom: 96rpx;
  801 + margin: 0 auto;
  802 + border-radius: 10rpx;
  803 + background: rgba(0,0,0,.7);
  804 +}
  805 +.angel{
  806 + width: 0;
  807 + height: 0;
  808 + border: 18rpx solid rgba(0,0,0,.7);
  809 + border-left: 16rpx solid transparent;
  810 + border-right: 16rpx solid transparent;
  811 + border-bottom: 16rpx solid transparent;
  812 + position: absolute;
  813 + left: 0;
  814 + right: 0;
  815 + top: 78rpx;
  816 + margin: 0 auto;
  817 +}
  818 +.book-notice{
  819 + min-width: 354rpx;
  820 + height: 78rpx;
  821 + position: absolute;
  822 + right: 40rpx;
  823 + bottom: 106rpx;
  824 + border-radius: 10rpx;
  825 + background: rgba(0,0,0,.7);
593 } 826 }
@@ -602,6 +602,10 @@ export default { @@ -602,6 +602,10 @@ export default {
602 //客户经理积分设置 602 //客户经理积分设置
603 'App.Activity.SetIntegral':{ 603 'App.Activity.SetIntegral':{
604 openid:'openid' 604 openid:'openid'
  605 + },
  606 + //判断是否点击确认收到
  607 + 'App.Reserve.GetIsRelaSuccess':{
  608 + openid:'openid'
605 } 609 }
606 610
607 } 611 }
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 { 15 {
16 "name": "预订本-商家1", 16 "name": "预订本-商家1",
17 "pathName": "pack-book/pages/book/b_index", 17 "pathName": "pack-book/pages/book/b_index",
18 - "query": "seller_id=1297&seller_openid= oZc-q05hV2N-knHfpxKg5dDUp5vU&manager_id=20612", 18 + "query": "seller_id=1001&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ&manager_id=6986",
19 "scene": 1001 19 "scene": 1001
20 }, 20 },
21 { 21 {
@@ -655,6 +655,18 @@ @@ -655,6 +655,18 @@
655 "pathName": "pages/customer/wechat", 655 "pathName": "pages/customer/wechat",
656 "query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311", 656 "query": "id=178777&hasSellerShare=1&hasInvitation=1&uid=311",
657 "scene": null 657 "scene": null
  658 + },
  659 + {
  660 + "name": "pages/customer/detail_invitation",
  661 + "pathName": "pages/customer/detail_invitation",
  662 + "query": "id=199122&hasInvitation=1&hasSellerShare=1&uid=2891",
  663 + "scene": null
  664 + },
  665 + {
  666 + "name": "pages/customer/discount",
  667 + "pathName": "pages/customer/discount",
  668 + "query": "id=199122&sid=4352",
  669 + "scene": null
658 } 670 }
659 ] 671 ]
660 } 672 }