From 7a4792e761e22edd26a56a41694dbe5f55b966dd Mon Sep 17 00:00:00 2001 From: shaojing <2901156235@qq.com> Date: Fri, 17 Nov 2023 16:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/component/proRec/proRec.js | 68 +++++++++++++++---- pages/index/index.js | 2 +- pages/info/postProductInfo/index.js | 3 +- pages/order/comment/index.js | 4 +- pages/order/pay/index.js | 15 +++- pages/order/payresult/index.js | 4 +- pages/user/order/activityOrderInfo/index.wxml | 2 +- pages/user/order/hotelOrderInfo/index.js | 10 ++- pages/user/order/hotelOrderInfo/index.wxml | 2 +- pages/user/order/lineOrderInfo/index.js | 10 ++- pages/user/order/lineOrderInfo/index.wxml | 4 +- pages/user/order/movieOrderInfo/index.js | 10 ++- pages/user/order/movieOrderInfo/index.wxml | 2 +- pages/user/order/museumOrderInfo/index.js | 10 ++- pages/user/order/museumOrderInfo/index.wxml | 4 +- pages/user/order/postOrderInfo/index.js | 10 ++- pages/user/order/postOrderInfo/index.wxml | 4 +- pages/user/order/sceneOrderInfo/index.js | 11 ++- pages/user/order/sceneOrderInfo/index.wxml | 4 +- project.private.config.json | 7 ++ 20 files changed, 141 insertions(+), 45 deletions(-) diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js index 1a34128..0150cb1 100644 --- a/pages/component/proRec/proRec.js +++ b/pages/component/proRec/proRec.js @@ -23,15 +23,62 @@ Component({ clickid: { type: String, value: "" + }, + ids:{ + type: String, + value: "" + } + }, + observers:{ + 'ids': function(newVal,oldVal){ + console.log('newVal--------',newVal) + console.log('oldVal--------',oldVal) + if (newVal) { + this.getTj(newVal) + } } }, lifetimes: { created() { - commonApi._post("product/get_product_by_type", { + this.data.tjList=[] + // commonApi._post("product/get_product_by_type", { + // offset: 0, + // limit: 6, + // rand: true, + // type: "venue,post,line,ticket", + // product_ids:this.data.ids + // }).then(res => { + // this.setData({ + // showLoading: false + // }) + // try { + // this.setData({ + // tjList: res.data.list + // }) + // } catch (error) { + // console.log(error); + // } + // }) + } + }, + /** + * 组件的初始数据 + */ + data: { + tjList: [], + }, + /** + * 组件的方法列表 + */ + methods: { + getTj() { + this.data.tjList = [] + commonApi._post("search/product_recommend", { offset: 0, limit: 6, rand: true, - type: "venue,post,line,ticket" + type: "venue,post,line,ticket", + product_ids:this.data.ids }).then(res => { this.setData({ showLoading: false @@ -43,19 +90,9 @@ Component({ } catch (error) { console.log(error); } + console.log('tjList',this.data.tjList); }) - } - }, - /** - * 组件的初始数据 - */ - data: { - tjList: [], - }, - /** - * 组件的方法列表 - */ - methods: { + }, gotoDetail: function (e) { let item = e.currentTarget.dataset.item; util.pagePoint({ @@ -74,5 +111,6 @@ Component({ util.gotoDetail(item); } }, - } + }, + }) \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index a6c88e5..0d6d7c9 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -122,7 +122,7 @@ Page({ this.getVideoPrize() }, goFeiyi: function () { - app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupon' + app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupons' wx.navigateTo({ url:"/pages/pbService/web/index" }) diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js index 5da8ee5..45b358c 100644 --- a/pages/info/postProductInfo/index.js +++ b/pages/info/postProductInfo/index.js @@ -121,7 +121,8 @@ Page({ offset: 0, limit: 6, rand: true, - type: 'post' + type: 'post', + product_ids:options.id, }).then(res => { try { this.setData({ diff --git a/pages/order/comment/index.js b/pages/order/comment/index.js index dbf3c12..2508d57 100644 --- a/pages/order/comment/index.js +++ b/pages/order/comment/index.js @@ -45,11 +45,13 @@ Page({ info: res.data }) }) + console.log('options.proId',options.proId); commonApi._post("search/product_recommend", { offset: 0, limit: 6, rand: true, - type: 'post' + type: 'post', + product_ids:options.proId, }).then(res => { try { this.setData({ diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js index 53f5e68..461a0ae 100644 --- a/pages/order/pay/index.js +++ b/pages/order/pay/index.js @@ -18,7 +18,8 @@ Page({ activePay:false,//是否活动支付 SUBWALLET:false, wxPay:false, - isBook:false + isBook:false, + ids:[], // 多产品id }, /** @@ -136,6 +137,14 @@ Page({ }) }, pay:function(){ + let arr = [] + this.data.info.order_product_list.forEach(item => { + arr.push(item.product_id) + }) + this.setData({ + ids:arr + }) + if (this.data.activePay) { let flag = false if (this.data.payList.length!=0 && !this.data.info.coupon_activity.pay_type.includes('SUBWALLET')) { @@ -185,7 +194,7 @@ Page({ }) setTimeout(()=>{ wx.redirectTo({ - url: '../payresult/index?tid='+_this.data.id + url: '../payresult/index?tid='+_this.data.id+'&ids='+_this.data.ids.join(',') }) },1000) }, @@ -218,7 +227,7 @@ Page({ }) setTimeout(()=>{ wx.redirectTo({ - url: '../payresult/index?tid='+this.data.id + url: '../payresult/index?tid='+this.data.id+'&ids='+_this.data.ids.join(',') }) },1000) } diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js index cc73a61..79d9fee 100644 --- a/pages/order/payresult/index.js +++ b/pages/order/payresult/index.js @@ -20,6 +20,7 @@ Page({ tid:options.tid, type:options.type }) + console.log('options.ids',options.ids); commonApi.user_post("order/query",{ order_id:options.tid }).then(res=>{ @@ -32,7 +33,8 @@ Page({ offset: 0, limit: 6, rand: true, - type: 'post' + type: 'post', + product_ids:options.ids, }).then(res => { try { this.setData({ diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml index fe34272..9c9fb0b 100644 --- a/pages/user/order/activityOrderInfo/index.wxml +++ b/pages/user/order/activityOrderInfo/index.wxml @@ -50,7 +50,7 @@ 再次购买 取消订单 取消订单 - 去评价 + 去评价 立即支付 diff --git a/pages/user/order/hotelOrderInfo/index.js b/pages/user/order/hotelOrderInfo/index.js index bb2da1a..aa83dc2 100644 --- a/pages/user/order/hotelOrderInfo/index.js +++ b/pages/user/order/hotelOrderInfo/index.js @@ -18,7 +18,8 @@ Page({ codeImgs:[], minute:"", second:"", - id:null + id:null, + ids:[] }, /** @@ -190,6 +191,10 @@ Page({ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); } + let proId = [] + res.data.order_product_list.forEach(item => { + proId.push(item.product_id) + }) let state = ""; res.data.order_product_list.map(order=>{ order.qrcode.map(item=>{ @@ -207,7 +212,8 @@ Page({ this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, - product_model:res.data.order_product_list[0].product_model + product_model:res.data.order_product_list[0].product_model, + ids: proId.join(",") }) this.getCodeImg() }) diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml index 4dc4ec0..e54ef76 100644 --- a/pages/user/order/hotelOrderInfo/index.wxml +++ b/pages/user/order/hotelOrderInfo/index.wxml @@ -40,7 +40,7 @@ 立即支付 - + diff --git a/pages/user/order/lineOrderInfo/index.js b/pages/user/order/lineOrderInfo/index.js index d1a9ea0..646eb5a 100644 --- a/pages/user/order/lineOrderInfo/index.js +++ b/pages/user/order/lineOrderInfo/index.js @@ -19,7 +19,8 @@ Page({ minute:"", second:"", id:"", - cardTypes:{} + cardTypes:{}, + ids:[] }, /** @@ -201,6 +202,10 @@ Page({ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); } + let proId = [] + res.data.order_product_list.forEach(item => { + proId.push(item.product_id) + }) let state = ""; res.data.order_product_list.map(order=>{ order.qrcode.map(item=>{ @@ -212,7 +217,8 @@ Page({ this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, - product_model:res.data.order_product_list[0].product_model + product_model:res.data.order_product_list[0].product_model, + ids: proId.join(",") }) this.getCodeImg() }) diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml index 47f7682..be5d0da 100644 --- a/pages/user/order/lineOrderInfo/index.wxml +++ b/pages/user/order/lineOrderInfo/index.wxml @@ -39,13 +39,13 @@ 再次购买 取消预订 取消订单 - 去评价 + 去评价 立即支付 - + diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js index 5b87f67..165a42c 100644 --- a/pages/user/order/movieOrderInfo/index.js +++ b/pages/user/order/movieOrderInfo/index.js @@ -19,7 +19,8 @@ Page({ codeImgs:[], id:null, minute:"", - second:"" + second:"", + ids:[] }, /** @@ -175,6 +176,10 @@ Page({ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); } + let proId = [] + res.data.order_product_list.forEach(item => { + proId.push(item.product_id) + }) let state = "" res.data.order_product_list.map(order=>{ order.qrcode.map(item=>{ @@ -186,7 +191,8 @@ Page({ this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, - product_model:res.data.order_product_list[0].product_model + product_model:res.data.order_product_list[0].product_model, + ids: proId.join(",") }) this.getCodeImg() }) diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml index 556623e..77c75b6 100644 --- a/pages/user/order/movieOrderInfo/index.wxml +++ b/pages/user/order/movieOrderInfo/index.wxml @@ -52,7 +52,7 @@ 退款详情 取消订单 取消订单 - 去评价 + 去评价 立即支付 diff --git a/pages/user/order/museumOrderInfo/index.js b/pages/user/order/museumOrderInfo/index.js index 3293767..582c3d3 100644 --- a/pages/user/order/museumOrderInfo/index.js +++ b/pages/user/order/museumOrderInfo/index.js @@ -19,7 +19,8 @@ Page({ codeImgs:[], id:null, minute:"", - second:"" + second:"", + ids:[] }, /** @@ -175,6 +176,10 @@ Page({ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); } + let proId = [] + res.data.order_product_list.forEach(item => { + proId.push(item.product_id) + }) let state = ""; res.data.order_product_list.map(order=>{ order.qrcode.map(item=>{ @@ -201,7 +206,8 @@ Page({ this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, - product_model:res.data.order_product_list[0].product_model + product_model:res.data.order_product_list[0].product_model, + ids: proId.join(",") }) this.getCodeImg() // 获取行程规划 diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml index 04d9025..be35fec 100644 --- a/pages/user/order/museumOrderInfo/index.wxml +++ b/pages/user/order/museumOrderInfo/index.wxml @@ -50,13 +50,13 @@ 再次购买 取消订单 取消订单 - 去评价 + 去评价 立即支付 - + {{info.order_product_list[0].scene_detail.title}} diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js index ae80367..5ad6b07 100644 --- a/pages/user/order/postOrderInfo/index.js +++ b/pages/user/order/postOrderInfo/index.js @@ -22,7 +22,8 @@ Page({ id:null, pay_methods:app.globalData.pay_methods, tjList:[], - showLoading:true + showLoading:true, + ids:[] }, /** @@ -240,6 +241,10 @@ Page({ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); } + let proId = [] + res.data.order_product_list.forEach(item => { + proId.push(item.product_id) + }) let state = ""; res.data.stateNums = {} res.data.order_product_list.map(order=>{ @@ -256,7 +261,8 @@ Page({ this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, - product_model:res.data.order_product_list[0].product_model + product_model:res.data.order_product_list[0].product_model, + ids: proId.join(",") }) this.getCodeImg() }) diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index e7a33ed..607af56 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -12,7 +12,7 @@ {{info.order_product_list[0].consignee_info.name}}{{info.order_product_list[0].consignee_info.tel}} {{info.order_product_list[0].consignee_info.address}} - + @@ -52,7 +52,7 @@ 确认收货 申请退款 取消订单 - 去评价 + 去评价 立即支付 查询快递 diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index 69f972d..a411574 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -28,7 +28,8 @@ Page({ sysmText:'更多', sysm2:false, sysm2Text:'更多', - imgLen:[] + imgLen:[], + ids:[] }, /** @@ -259,6 +260,10 @@ Page({ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); } + let proId = [] + res.data.order_product_list.forEach(item => { + proId.push(item.product_id) + }) let state = "" res.data.order_product_list.map(order=>{ order.qrcode.map(item=>{ @@ -270,8 +275,10 @@ Page({ this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, - product_model:"ticket"||res.data.order_product_list[0].product_model + product_model:"ticket"||res.data.order_product_list[0].product_model, + ids: proId.join(",") }) + console.log('ids',this.data.ids); this.getCodeImg() // 获取行程规划 let that = this; diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 3e1836f..6de2321 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -24,7 +24,7 @@ {{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}} - + @@ -49,7 +49,7 @@ 退款详情 取消预订 取消预订 - 去评价 + 去评价 立即支付 diff --git a/project.private.config.json b/project.private.config.json index 71b8843..acdc8dd 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -81,6 +81,13 @@ "query": "id=82342309051435565877", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "pages/user/order/activityOrderInfo/index", + "query": "", + "launchMode": "default", + "scene": null } ] }