diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index 41ce496..6c831a6 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -31,10 +31,10 @@ 展览 - + 文化惠民 diff --git a/pages/list/movieticket/list/info/index.js b/pages/list/movieticket/list/info/index.js index e49d467..9c359bd 100644 --- a/pages/list/movieticket/list/info/index.js +++ b/pages/list/movieticket/list/info/index.js @@ -36,13 +36,6 @@ Page({ console.log(showFlag) }) }, - gotoWeb:function(e){ - let item = e.currentTarget.dataset.item; - // app.globalData.weburl = 'https://m.cloud.sz-trip.com/MovieDetail?id='+item.third_id - wx.navigateTo({ - url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://test.m.cloud.sz-trip.com/MovieDetail?id='+item.third_id+'&token='+this.data.token), - }) - }, BroswerRecord:function(){ setTimeout(()=>{ if(app.globalData.uuid){ diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml index dc708c0..651fcac 100644 --- a/pages/list/movieticket/list/info/index.wxml +++ b/pages/list/movieticket/list/info/index.wxml @@ -24,9 +24,6 @@ - - - 立即购票 - \ No newline at end of file + \ No newline at end of file diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js index 7fdd246..e61f784 100644 --- a/pages/list/movieticket/list/ticket/index.js +++ b/pages/list/movieticket/list/ticket/index.js @@ -177,13 +177,13 @@ Page({ let index = e.currentTarget.dataset.index console.log(index); console.log(info.schedules); - const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({ - ...item, - price: item.areaPrice, - areaId: item.seatAreaId - })); + // const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({ + // ...item, + // price: item.areaPrice, + // areaId: item.seatAreaId + // })); let planData = { - areaInfo, + // areaInfo, fee: info.schedules[index].service_fee, movieName: this.data.title, planId: info.schedules[index].schedule_id, @@ -215,9 +215,12 @@ Page({ } } console.log(planData); - wx.navigateTo({ - url: "/pages/list/movieticket/list/web/index?planData=" + JSON.stringify(planData), - }) + // wx.navigateTo({ + // url: "/pages/list/movieticket/list/web/index?planData=" + JSON.stringify(planData), + // }) + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://film.jstqsdy.com/?appkey=TQS65aa175129fd2&jump=&type=WECHATXCX&featureAppNo=' + info.schedules[index].schedule_id), + }) }) }}) }, diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js index 8235937..5162893 100644 --- a/pages/order/movie/index.js +++ b/pages/order/movie/index.js @@ -26,7 +26,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - console.log(JSON.parse(options)); app.globalData.couponInfo = null this.setData({ coupon:app.globalData.couponInfo @@ -36,12 +35,11 @@ Page({ }) let product = app.globalData.product,price=0,num=0,sPrice=0; product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo) - product.info.selectSeatInfo.seatPriceInfo.map(item=>{ - price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100 + product.info.selectSeatInfo.price.map(item=>{ + price =price +Math.ceil(Number(item)*1.006 * 100) / 100 num = num + 1 - sPrice = Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100 + sPrice = Math.ceil(Number(item)*1.006 * 100) / 100 }) - console.log(price*100); this.setData({ product:product, @@ -49,7 +47,6 @@ Page({ num:num, sPrice:sPrice }) - console.log(this.data.price); userApi.user_post("user/getMyInfo").then(res=>{ this.setData({ tel:res.data.mobile @@ -105,7 +102,8 @@ Page({ "seats_list": product.info.selectSeatInfo.seatInfo.join(","),//座位中文名称,多个座位逗号分隔,必填 // "key": this.data.key,//锁座返回的key,必填 "schedules_id": product.info.schedule_id,//淘票票场次id,必填 - "seats_ids": product.info.selectSeatInfo.seatPriceInfo + "seats_ids": product.info.selectSeatInfo.seatPriceInfo, + "seatnames": product.info.selectSeatInfo.seatInfo.join("|") }]; let data = { product_list:product_list, diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js index 33f5e7c..606ae97 100644 --- a/pages/pbService/web/index.js +++ b/pages/pbService/web/index.js @@ -16,7 +16,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - console.log('options',decodeURIComponent(options.weburl)) options.weburl = decodeURIComponent(options.weburl) // if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){ // userApi.user_post("user/getMyInfo").then(res=>{ @@ -53,15 +52,14 @@ Page({ this.setData({ webUrl:options.weburl }) - console.log('打印',this.data.webUrl); // } }, handleMessage(data) { - console.log(data) - this.setData({ - shareTitle:data.shareTitle, - shareUrl:data.shareUrl - }) + // this.setData({ + // shareTitle:data.shareTitle, + // shareUrl:data.shareUrl + // }) + console.log('打印22222',data); }, /** * 生命周期函数--监听页面初次渲染完成