xt / xcx-book · Commits

Go to a project

Commit 4069d6d17ce7f208be2b8b8ba1168d4969e465c9

Authored by pengye
1 parent fc677882

商家配置邀请函是否显示性别

Inline Side-by-side
Showing 13 changed files with 48 additions and 16 deletions
... ... @@ -832,7 +832,9 @@ Page({
}
details.rname = details.rname.trim()
if (details.rname && details.sex != 3) {
details.rnameStr = details.rname + (details.sex == 1 ? '先生' : details.sex == 2 ? '女士' : details.sex == 4 ? '贵宾' : '')
let sexStr = details.sex == 1 ? '先生' : details.sex == 2 ? '女士' : details.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
details.rnameStr = details.rname + str
} else if (!details.rname && details.sex == 4) {
details.rnameStr = '贵宾'
} else {
... ...
... ... @@ -850,7 +850,9 @@ Page({
}
details.rname = details.rname.trim()
if (details.rname && details.sex != 3) {
details.rnameStr = details.rname + (details.sex == 1 ? '先生' : details.sex == 2 ? '女士' : details.sex == 4 ? '贵宾' : '')
let sexStr = details.sex == 1 ? '先生' : details.sex == 2 ? '女士' : details.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
details.rnameStr = details.rname + str
} else if (!details.rname && details.sex == 4) {
details.rnameStr = '贵宾'
} else {
... ...
... ... @@ -855,7 +855,9 @@ Page({
}
details.rname = details.rname.trim()
if (details.rname && details.sex != 3) {
details.rnameStr = details.rname + (details.sex == 1 ? '先生' : details.sex == 2 ? '女士' : details.sex == 4 ? '贵宾' : '')
let sexStr = details.sex == 1 ? '先生' : details.sex == 2 ? '女士' : details.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
details.rnameStr = details.rname + str
} else if (!details.rname && details.sex == 4) {
details.rnameStr = '贵宾'
} else {
... ...
... ... @@ -677,7 +677,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -866,7 +866,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -818,7 +818,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -818,7 +818,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -817,7 +817,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -770,7 +770,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -818,7 +818,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -817,7 +817,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -837,7 +837,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
let sexStr = detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '';
let str = this.data.options.showSex == '2' ? '' : sexStr;
detail.rnameStr = detail.rname + str
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
... ...
... ... @@ -132,19 +132,26 @@ Page({
const month = date.getMonth() + 1;
const day = date.getDate();
let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1)
this.getSellerDetail(reserev.sid, isOrder, reserev)
this.getSellerInfo(reserev.sid, isOrder, reserev)
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
getSellerInfo(sid, isOrder, reserev) {
App.Seller.GetDzSellerConf({
sid
}).then(res => {
this.getSellerDetail(sid, isOrder, reserev, res.data.is_show_sex)
})
},
// 获取店铺详情
getSellerDetail(sid, isOrder, reserev) {
getSellerDetail(sid, isOrder, reserev, is_show_sex) {
App.Customer.GetSellerDetail({
sid
}).then(res => {
let is_online_reserve = res.data.is_online_reserve;
let isDeposit = res.data.seller_config_info?res.data.seller_config_info.is_show_notice_deposit:'0';
this.getSellerTemplateConfFun(sid, isOrder, reserev,is_online_reserve,isDeposit);
this.getSellerTemplateConfFun(sid, isOrder, reserev,is_online_reserve,isDeposit,is_show_sex);
}).catch(res => {
console.log(res, '商家详情请求失败');
})
... ... @@ -157,7 +164,7 @@ Page({
return isorder;
},
// 获取商家设置营销信息
getSellerTemplateConfFun(sid, isOrder, reserev, is_online_reserve, isDeposit,isMeeting) {
getSellerTemplateConfFun(sid, isOrder, reserev, is_online_reserve, isDeposit,is_show_sex) {
App.Seller.GetSellerTemplateConf({
sid
}).then(res => {
... ... @@ -190,6 +197,7 @@ Page({
url += (isOrder == '1' || reserev.status == '3') ? '&isOrder=1' : '';
url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
if(data.type == '1') url+= '&uid='+this.data.options.uid
if(is_show_sex != '1') url+= '&showSex=2'
console.log('跳转路径url', url);
wx.redirectTo({
url
... ...