From 5c805f1bddb51731d958c68b57b40a96e83c7f89 Mon Sep 17 00:00:00 2001 From: chenkainan Date: Thu, 4 Aug 2022 13:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A5=A8=E7=B1=BB=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/component/TitleHeader.js | 4 +++- pages/order/components/contact/index.js | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js index 971a913..06a72a9 100644 --- a/pages/component/TitleHeader.js +++ b/pages/component/TitleHeader.js @@ -49,11 +49,13 @@ Component({ */ methods: { back:function(){ - app.globalData.index = app.globalData.index -1 // if(this.properties.clickid){ // wx.uma.trackEvent(this.properties.clickid) // } const pages = getCurrentPages(); + if(pages[pages.length-1].route.indexOf('linkman/add')==-1){ + app.globalData.index = app.globalData.index -1 + } if(pages[pages.length-1].route.indexOf('login')!=-1 || pages[pages.length-1].route.indexOf('bindTel')!=-1){ // 如果是登录页面的返回需要返回两层 if(pages.length>2){ diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js index 709e918..57ad8ab 100644 --- a/pages/order/components/contact/index.js +++ b/pages/order/components/contact/index.js @@ -219,8 +219,10 @@ Component({ wx.hideLoading() }, selectIt:function(e){ + console.log(e,app.globalData.product) let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList,num = 0,traveller_limit_num = this.properties.maxNum!=-1?this.properties.maxNum:(app.globalData.product.sku.sku_model && app.globalData.product.sku.sku_model.limit_type!=0?app.globalData.product.sku.sku_model.traveller_limit_num:-1); // 先计算出全部选中的出行人 + console.log(111) linkmanList.map(linkman=>{ if(linkman.selected==1){ num++;