- - @@ -136,7 +137,7 @@ - @@ -154,7 +155,7 @@ - @@ -302,7 +303,7 @@ - + @@ -334,10 +335,10 @@ - + - - + @@ -363,7 +364,7 @@ - @@ -377,7 +378,7 @@ - diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js index 642090c..981fcb8 100644 --- a/pages/order/payresult/index.js +++ b/pages/order/payresult/index.js @@ -54,7 +54,7 @@ Page({ } - util.gotoDetail(item) + util.gotoDetail(item, false, "&sourceFrom=recommend") }, gotoOrderList:function(){ if(!this.data.info) return; diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index 9e48030..d00901b 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -29,7 +29,9 @@ Page({ sysm2:false, sysm2Text:'更多', imgLen:[], - ids:[] + ids:[], + + isPost: false, // 有没有邮寄产品 }, /** @@ -316,7 +318,8 @@ Page({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, product_model:"ticket"||res.data.order_product_list[0].product_model, - ids: proId.join(",") + ids: proId.join(","), + isPost: res.data.order_product_list.some(x=>x.product_model == 'post'), }) console.log(res.data); // debugger diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 40c9dd0..8c27714 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -246,7 +246,7 @@ 商品总价: ¥{{info.total_money/100}} - + 运费: diff --git a/utils/util.js b/utils/util.js index 5fe8ecd..35b9226 100644 --- a/utils/util.js +++ b/utils/util.js @@ -172,7 +172,7 @@ const checkLocation = function(){ }) }) } -const gotoDetail = (item,isPagePoint) =>{ +const gotoDetail = (item,isPagePoint,queryStr="") =>{ wx.removeStorageSync('prizeId'); let pagePointData = { param: { @@ -183,7 +183,7 @@ const gotoDetail = (item,isPagePoint) =>{ // 组合产品 跳线路 if (item.compose_product_id) { wx.navigateTo({ - url: '/pages/info/roadInfo/index?id='+item.compose_product_id + url: '/pages/info/roadInfo/index?id='+item.compose_product_id+queryStr }) return } @@ -191,12 +191,12 @@ const gotoDetail = (item,isPagePoint) =>{ if (item.is_package === 1) { wx.navigateTo({ - url: '/pages/info/postProductInfo/index?id='+item.id, + url: '/pages/info/postProductInfo/index?id='+item.id+queryStr, }) return }else if (item.is_package==2) { wx.navigateTo({ - url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id + url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id+queryStr }); return } @@ -207,7 +207,7 @@ const gotoDetail = (item,isPagePoint) =>{ case "tenscenic": wx.navigateTo({ - url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id) + url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id)+queryStr }) break; case "ticket": @@ -217,7 +217,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id) + url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)+queryStr }) break; case "hotel": @@ -227,7 +227,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id) + url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)+queryStr }) break; case "post": @@ -240,11 +240,11 @@ const gotoDetail = (item,isPagePoint) =>{ try { if (item.iShop) { wx.navigateTo({ - url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId + url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId+queryStr }) }else{ wx.navigateTo({ - url: '/pages/info/postProductInfo/index?id='+item.id + url: '/pages/info/postProductInfo/index?id='+item.id+queryStr }) } } catch (error) { @@ -260,7 +260,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/roadInfo/index?id='+item.id + url: '/pages/info/roadInfo/index?id='+item.id+queryStr }) break; case "coupon": @@ -271,7 +271,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/cardInfo/index?id='+item.id + url: '/pages/info/cardInfo/index?id='+item.id+queryStr }) break; case "show": @@ -282,24 +282,24 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/showInfo/index?id='+item.id + url: '/pages/info/showInfo/index?id='+item.id+queryStr }) break; case "food": // 产品 美食 wx.navigateTo({ - url: '/pages/info/foodProductInfo/index?id='+item.id + url: '/pages/info/foodProductInfo/index?id='+item.id+queryStr }) break; case "activity": // 活动 wx.navigateTo({ - url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id) + url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr }) break; case "movie": // 产品 电影票 - let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title + let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title+queryStr wx.navigateTo({ url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl), // url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title @@ -308,7 +308,7 @@ const gotoDetail = (item,isPagePoint) =>{ case "cinema": // 产品 电影票 wx.navigateTo({ - url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id+'&title='+item.title + url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id+'&title='+item.title+queryStr }) break; case "scenic": @@ -318,7 +318,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id) + url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)+queryStr }) break; case "room": @@ -328,7 +328,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id) + url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)+queryStr }) break; case "venue": @@ -338,7 +338,7 @@ const gotoDetail = (item,isPagePoint) =>{ pagePoint(pagePointData,1) } wx.navigateTo({ - url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id) + url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id)+queryStr }) break; } @@ -745,7 +745,7 @@ const goProdInOtherPlatform = function (item) { webUrl+= `/OneCardTourDetail?id=${item.scene_id || item.id}` } - + webUrl+="&sourceFrom=recommend" wx.navigateToMiniProgram({ appId: appIdObj[platform], path: "/subPackages/webPage/webPage?url="+encodeURIComponent(webUrl),