xt / xcx-book · Commits

Go to a project

Commit 989c722dd14ea271292eda6a3793448fa1b21856

Authored by yiren
1 parent 70429364
build: skipped

提前点餐已点餐页面分享参数修改

Inline Side-by-side
Showing 6 changed files with 45 additions and 40 deletions
... ... @@ -144,14 +144,13 @@ Page({
url = '/pages/customer/detail_owner_invitation_new?id=' + that.data.opt.detail.oid;
}
if (that.data.opt.types == '2') {
let cookbookObj = {
sid: that.data.opt.sid,
sellerName: that.data.opt.sellerName,
oid: that.data.opt.oid,
hasSuccess: '1',
rid: that.data.opt.rid?that.data.opt.rid:''
}
url = `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`;
let data={}
data.sid=that.data.opt.sid;
data.sellerName=that.data.opt.sellerName;
data.oid=that.data.opt.oid;
data.hasSuccess='1'
data.rid=that.data.opt.rid?that.data.opt.rid:''
url = `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`;
}
if (that.data.opt.types == '3') {
url = '/pages/reserve/index';
... ... @@ -339,14 +338,14 @@ Page({
})
}
if (this.data.opt.types == '2') {
let cookbookObj = {
sid: this.data.opt.sid,
sellerName: this.data.opt.sellerName,
oid: this.data.opt.oid,
hasSuccess: '1',
rid: this.data.opt.rid?this.data.opt.rid:''
}
let url = `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`;
let data={}
data.oid=this.data.opt.oid;
data.sid=this.data.opt.sid;
data.sellerName=this.data.opt.sellerName;
data.hasSuccess='1';
data.identity='1';
data.rid=this.data.opt.rid?this.data.opt.rid:''
let url = `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`;
return wx.reLaunch({
url
})
... ...
... ... @@ -327,12 +327,12 @@ Page({
// 确认下单
determineFun() {
if (!this.data.noData) {
let cookbookObj = {
let data = {
...this.data.options
}
cookbookObj.hasSuccess = 1
delete cookbookObj.navColor
delete cookbookObj.themeColor
data.hasSuccess = 1
delete data.navColor
delete data.themeColor
App.Advance.PlaceOrder({
orderid: this.data.options.oid,
rid: this.data.options.rid,
... ... @@ -340,7 +340,7 @@ Page({
remark:this.data.notes+''
}).then(res => {
wx.navigateTo({
url: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,
url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`
})
})
}
... ...
... ... @@ -243,15 +243,15 @@ Page({
let orderItemCount = 0;
res.data.cookbooklist.forEach(cb => {
if (this.data.options.identity == 1 && cb.status > 0) {
let cookbookObj = {
let data={
...this.data.options
}
cookbookObj.hasSuccess='1'
cookbookObj.sellerName=res.data.seller.sellername;
cookbookObj.oid=res.data.id;
console.log('跳转到下单页携带参数',{...cookbookObj});
data.hasSuccess='1'
data.sellerName=res.data.seller.sellername;
data.oid=res.data.id;
console.log('跳转到下单页携带参数',{...data});
wx.navigateTo({
url: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,
url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`,
})
return false;
}
... ...
... ... @@ -33,13 +33,19 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let obj = util.determine(options.cookbookObj);
this.setData({
options: obj,
options:{
rid:options.rid,
oid:options.oid,
sellerName:options.sellerName,
sid:options.sid,
identity:options.identity,
hasSuccess:options.hasSuccess
},
tpls: [TP.tpls(1)],
})
console.log('options', {
...obj
...options
});
this.getCheckCookList()
this.getDetail()
... ... @@ -437,15 +443,15 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage() {
let cookbookObj = {
let data={
...this.data.options,
hasOnlyShow: 1
};
console.log(cookbookObj);
delete cookbookObj.hasSuccess
console.log(data);
delete data.hasSuccess
return {
title: '菜品已点好，快来看看都点了什么~',
path: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,
path: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`,
imageUrl: 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
}
},
... ...
... ... @@ -226,17 +226,17 @@ Page({
},
cookbook() {
if (this.data.detail.order && this.data.detail.order.cookbooklist.length > 0) {
let cookbookObj = {
let data = {
rid: this.id,
oid: this.data.detail.order.id,
sellerName:this.detail.seller.sellername,
sid:this.detail.seller.id,
identity: '1',
hasSuccess:'1',
}
console.log('跳转到下单页携带参数',{...cookbookObj});
}
console.log('跳转到下单页携带参数',{...data});
wx.navigateTo({
url: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,
url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`,
})
} else {
App.Advance.CreateOrder({
... ...
... ... @@ -206,7 +206,7 @@ Page({
},
cookbook() {
if (this.data.detail.order && this.data.detail.order.cookbooklist.length > 0) {
let cookbookObj = {
let data = {
rid: this.id,
oid: this.data.detail.order.id,
sellerName: this.data.seller.name,
... ... @@ -215,7 +215,7 @@ Page({
hasSuccess:'1',
}
wx.navigateTo({
url: `/pack-cookbook/pages/success_new?cookbookObj=${JSON.stringify(cookbookObj)}`,
url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`,
})
} else {
App.Advance.CreateOrder({
... ...