|
...
|
...
|
@@ -178,9 +178,9 @@ Page({ |
|
|
|
long:reserev.seller.long,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
console.log('reserevreserevreserevreserevreserev',reserev);
|
|
|
|
console.log('sellersellersellerseller',this.data.seller);
|
|
|
|
console.log('detaildetaildetaildetail',this.data.detail);
|
|
|
|
console.log('reserev reserev',reserev);
|
|
|
|
console.log('seller seller',this.data.seller);
|
|
|
|
console.log('detail detail',this.data.detail);
|
|
|
|
setTimeout(() => {
|
|
|
|
this.getSellerTemplateConfFun(reserev.sid);
|
|
|
|
this.getstaffinfo(res.data.uid)
|
|
...
|
...
|
@@ -190,7 +190,6 @@ Page({ |
|
|
|
})
|
|
|
|
},
|
|
|
|
getstaffinfo(uid){
|
|
|
|
console.log('Baseinfo__uid',uid);
|
|
|
|
console.log('sellerid',this.data.detail.seller.id);
|
|
|
|
App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid}).then((json)=>{
|
|
|
|
if(json.ret==200){
|
|
...
|
...
|
@@ -282,24 +281,27 @@ Page({ |
|
|
|
let data=res.data
|
|
|
|
console.log('data',data);
|
|
|
|
let home,chef,marketing,reserve,signboard,store,homeColor,coupon_data,priceInfo,certificate,scoreInfo,recharge_list,stringifyUse;
|
|
|
|
chef = data.chef ? JSON.parse(data.chef) : '';
|
|
|
|
reserve = data.reserve ? JSON.parse(data.reserve) : '';
|
|
|
|
marketing = data.marketing ? JSON.parse(data.marketing) : '';
|
|
|
|
signboard = data.signboard ? JSON.parse(data.signboard) : '';
|
|
|
|
store = data.store ? JSON.parse(data.store) : '';
|
|
|
|
home = data.home ? JSON.parse(data.home) : '';
|
|
|
|
console.log('chef', chef);
|
|
|
|
console.log('reserve', reserve);
|
|
|
|
console.log('marketing', marketing);
|
|
|
|
console.log('signboard', signboard);
|
|
|
|
console.log('store', store);
|
|
|
|
console.log('home', home);
|
|
|
|
chef = util.determine(data.chef);
|
|
|
|
reserve = util.determine(data.reserve);
|
|
|
|
marketing = util.determine(data.marketing);
|
|
|
|
signboard = util.determine(data.signboard);
|
|
|
|
store = util.determine(data.store);
|
|
|
|
home = util.determine(data.home);
|
|
|
|
if(marketing.coupon_data){
|
|
|
|
coupon_data=marketing.coupon_data;
|
|
|
|
stringifyUse=JSON.stringify(marketing.coupon_data.use)
|
|
|
|
}
|
|
|
|
console.log('coupon_data', coupon_data);
|
|
|
|
console.log('stringifyUse', stringifyUse);
|
|
|
|
let obj={
|
|
|
|
chef,
|
|
|
|
reserve,
|
|
|
|
marketing,
|
|
|
|
signboard,
|
|
|
|
store,
|
|
|
|
home,
|
|
|
|
stringifyUse,
|
|
|
|
coupon_data
|
|
|
|
}
|
|
|
|
console.log('获取数据', {...obj});
|
|
|
|
if(marketing.is_recharge=='1' && marketing.recharge_data){
|
|
|
|
let recharge_data=marketing.recharge_data
|
|
|
|
recharge_list=marketing.recharge_data.recharge_list
|
|
...
|
...
|
@@ -330,8 +332,8 @@ Page({ |
|
|
|
discount
|
|
|
|
})
|
|
|
|
}
|
|
|
|
if(store && store.images.length>0) store.images =store.images?JSON.parse(store.images):'';
|
|
|
|
if(signboard && signboard.images) signboard.images = signboard.images?JSON.parse(signboard.images):'';
|
|
|
|
if(store && store.images.length>0) store.images =util.determine(store.images);
|
|
|
|
if(signboard && signboard.images) signboard.images = util.determine(signboard.images);
|
|
|
|
if (marketing && marketing.is_online_book=='1' && marketing.is_transpond =='1') {
|
|
|
|
this.setData({
|
|
|
|
between: true
|
...
|
...
|
|