Browse Source

酒景下单fix

master
jiazhipeng 2 years ago
parent
commit
9db1dd2fc7
  1. 3
      pages/component/TitleHeader.js
  2. 36
      pages/order/WineSceneOrder/index.js

3
pages/component/TitleHeader.js

@ -54,7 +54,8 @@ Component({
// } // }
const pages = getCurrentPages(); const pages = getCurrentPages();
if(pages[pages.length-1].route.indexOf('linkman/add')==-1){ if(pages[pages.length-1].route.indexOf('linkman/add')==-1){
app.globalData.index = app.globalData.index -1 app.globalData.index = app.globalData.index -1
console.log(app.globalData.index, 'appGlobalIndex')
} }
if(pages[pages.length-1].route.indexOf('login')!=-1 || pages[pages.length-1].route.indexOf('bindTel')!=-1){ if(pages[pages.length-1].route.indexOf('login')!=-1 || pages[pages.length-1].route.indexOf('bindTel')!=-1){
// 如果是登录页面的返回需要返回两层 // 如果是登录页面的返回需要返回两层

36
pages/order/WineSceneOrder/index.js

@ -63,7 +63,7 @@ Page({
console.log('-------',this.data.showYhq,this.data.time); console.log('-------',this.data.showYhq,this.data.time);
// debugger // debugger
console.log(app.globalData.list, app.globalData.index,'list---index')
if (!this.data.product) { if (!this.data.product) {
util.back(); util.back();
return; return;
@ -302,25 +302,27 @@ Page({
// postData.team_name = this.data.groupName // postData.team_name = this.data.groupName
// postData.type = 1; // postData.type = 1;
// } // }
if(app.globalData.list){ // if(app.globalData.list){
app.globalData.list[app.globalData.index] = this.data.product // app.globalData.list[app.globalData.index] = this.data.product
} // }
// app.globalData.linkmanList = this.data.linkmanList // app.globalData.linkmanList = this.data.linkmanList
app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100; app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
console.log(app.globalData); console.log(app.globalData);
if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
if(app.globalData.createDate){ // if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
app.globalData.createDate.product_list.push(data.product_list[0]) if (false) {
}else{ if(app.globalData.createDate){
app.globalData.createDate = data app.globalData.createDate.product_list.push(data.product_list[0])
} }else{
console.log(app.globalData.createDate); app.globalData.createDate = data
app.globalData.index = app.globalData.index + 1 }
app.globalData.product = app.globalData.list[app.globalData.index] console.log(app.globalData.createDate);
wx.redirectTo({ app.globalData.index = app.globalData.index + 1
url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar, app.globalData.product = app.globalData.list[app.globalData.index]
}) wx.redirectTo({
return url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
})
return
}else{ }else{
// if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){ // if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
if (false) { if (false) {

Loading…
Cancel
Save