Commit c9a2ba1163802d04912e6afce0c4ce2626e4e9b6

Authored by pengye
1 parent 20d8b53a

邀请函入口页跳转婚宴、生日宴、商务宴

@@ -92,20 +92,20 @@ Page({ @@ -92,20 +92,20 @@ Page({
92 const month = date.getMonth() + 1; 92 const month = date.getMonth() + 1;
93 const day = date.getDate(); 93 const day = date.getDate();
94 let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1) 94 let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1)
95 - this.getSellerDetail(RS.reserve(res.data).sid, isOrder, reserev.status) 95 + this.getSellerDetail(RS.reserve(res.data).sid, isOrder, reserev)
96 }).catch(res => { 96 }).catch(res => {
97 console.log(res, '详情请求失败'); 97 console.log(res, '详情请求失败');
98 }) 98 })
99 }, 99 },
100 // 获取店铺详情 100 // 获取店铺详情
101 - getSellerDetail(sid, isOrder, status) { 101 + getSellerDetail(sid, isOrder, reserev) {
102 App.Customer.GetSellerDetail({ 102 App.Customer.GetSellerDetail({
103 openid: getApp().openid, 103 openid: getApp().openid,
104 sid 104 sid
105 }).then(res => { 105 }).then(res => {
106 let is_online_reserve = res.data.is_online_reserve; 106 let is_online_reserve = res.data.is_online_reserve;
107 let isDeposit = res.data.seller_config_info?res.data.seller_config_info.is_show_notice_deposit:'0'; 107 let isDeposit = res.data.seller_config_info?res.data.seller_config_info.is_show_notice_deposit:'0';
108 - this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve,isDeposit); 108 + this.getSellerTemplateConfFun(sid, isOrder, reserev,is_online_reserve,isDeposit);
109 }).catch(res => { 109 }).catch(res => {
110 console.log(res, '商家详情请求失败'); 110 console.log(res, '商家详情请求失败');
111 }) 111 })
@@ -118,7 +118,7 @@ Page({ @@ -118,7 +118,7 @@ Page({
118 return isorder; 118 return isorder;
119 }, 119 },
120 // 获取商家设置营销信息 120 // 获取商家设置营销信息
121 - getSellerTemplateConfFun(sid, isOrder, status, is_online_reserve, isDeposit) { 121 + getSellerTemplateConfFun(sid, isOrder, reserev, is_online_reserve, isDeposit) {
122 App.Seller.GetSellerTemplateConf({ 122 App.Seller.GetSellerTemplateConf({
123 sid 123 sid
124 }).then(res => { 124 }).then(res => {
@@ -131,10 +131,22 @@ Page({ @@ -131,10 +131,22 @@ Page({
131 } else { 131 } else {
132 url = '/pack-invitation/pages/detail_owner_invitation9'; 132 url = '/pack-invitation/pages/detail_owner_invitation9';
133 } 133 }
  134 + console.log('宴会类型-------------',reserev.reserve_type);
  135 + if(reserev.reserve_type == '生日宴'){
  136 + url = '/pack-invitation/pages/detail_owner_invitation10';
  137 + }
  138 + if((reserev.reserve_type == '婚宴' || reserev.reserve_type == '商务宴请') && reserev.cusdem == '1'){
  139 + url = '/pack-invitation/pages/detail_owner_invitation11';
  140 + }
  141 + if((reserev.reserve_type == '婚宴' || reserev.reserve_type == '商务宴请') && reserev.cusdem == '2'){
  142 + url = '/pack-invitation/pages/detail_owner_invitation12';
  143 + }
134 // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否 144 // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否
135 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare + '&isDeposit=' + isDeposit; 145 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare + '&isDeposit=' + isDeposit;
  146 + if(reserev.reserve_type == '婚宴') url += '&bookType=1'
  147 + if(reserev.reserve_type == '商务宴请') url += '&bookType=2'
136 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束 148 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束
137 - url += (isOrder == '1' || status == '3') ? '&isOrder=1' : ''; 149 + url += (isOrder == '1' || reserev.status == '3') ? '&isOrder=1' : '';
138 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ; 150 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
139 console.log('跳转路径url', url); 151 console.log('跳转路径url', url);
140 wx.redirectTo({ 152 wx.redirectTo({