diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js index 31dd347..9da6b3a 100644 --- a/pages/component/TitleHeader.js +++ b/pages/component/TitleHeader.js @@ -54,7 +54,8 @@ Component({ // } const pages = getCurrentPages(); 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){ // 如果是登录页面的返回需要返回两层 diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js index a8df32e..94defbc 100644 --- a/pages/order/WineSceneOrder/index.js +++ b/pages/order/WineSceneOrder/index.js @@ -63,7 +63,7 @@ Page({ console.log('-------',this.data.showYhq,this.data.time); // debugger - + console.log(app.globalData.list, app.globalData.index,'list---index') if (!this.data.product) { util.back(); return; @@ -302,25 +302,27 @@ Page({ // postData.team_name = this.data.groupName // postData.type = 1; // } - if(app.globalData.list){ - app.globalData.list[app.globalData.index] = this.data.product - } + // if(app.globalData.list){ + // app.globalData.list[app.globalData.index] = this.data.product + // } // 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; console.log(app.globalData); - if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){ - if(app.globalData.createDate){ - app.globalData.createDate.product_list.push(data.product_list[0]) - }else{ - app.globalData.createDate = data - } - console.log(app.globalData.createDate); - app.globalData.index = app.globalData.index + 1 - app.globalData.product = app.globalData.list[app.globalData.index] - wx.redirectTo({ - url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar, - }) - return + + // if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){ + if (false) { + if(app.globalData.createDate){ + app.globalData.createDate.product_list.push(data.product_list[0]) + }else{ + app.globalData.createDate = data + } + console.log(app.globalData.createDate); + app.globalData.index = app.globalData.index + 1 + app.globalData.product = app.globalData.list[app.globalData.index] + wx.redirectTo({ + url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar, + }) + return }else{ // if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){ if (false) {