Browse Source

酒景下单fix

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

1
pages/component/TitleHeader.js

@ -55,6 +55,7 @@ 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){
// 如果是登录页面的返回需要返回两层 // 如果是登录页面的返回需要返回两层

12
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,13 +302,15 @@ 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.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
if (false) {
if(app.globalData.createDate){ if(app.globalData.createDate){
app.globalData.createDate.product_list.push(data.product_list[0]) app.globalData.createDate.product_list.push(data.product_list[0])
}else{ }else{

Loading…
Cancel
Save