diff --git a/app.js b/app.js index 6adc98f..d9c428b 100644 --- a/app.js +++ b/app.js @@ -31,6 +31,7 @@ App({ obj[item.id] = item.image }); this.globalData.configJson.indexSeason = obj + this.globalData.loadIndexSeason = true }) }) @@ -253,6 +254,7 @@ App({ prizeId: null, loginPageEvent: { "pages/list/message/index": 'message_login_' - } + }, + loadIndexSeason:false } }) \ No newline at end of file diff --git a/app.json b/app.json index 23d26ac..7de07ea 100644 --- a/app.json +++ b/app.json @@ -104,6 +104,7 @@ "pages/list/movieticket/list/seats/index", "pages/list/movieticket/list/cinema/index", "pages/list/movieticket/list/ticket/index", + "pages/list/movieticket/list/web/index", "pages/list/movieticket/list/info/index", "pages/list/theatre/index", "pages/list/card/index", diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js index 6aaafbf..31dd347 100644 --- a/pages/component/TitleHeader.js +++ b/pages/component/TitleHeader.js @@ -83,6 +83,10 @@ Component({ wx.switchTab({ url: '/pages/user/user' }) + } else if (pages[pages.length-1].route.indexOf('pages/user/cartlist/list') != -1){ + wx.switchTab({ + url: '/pages/user/user' + }) } diff --git a/pages/index/index.js b/pages/index/index.js index 71f024e..f7d1ec7 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -206,6 +206,16 @@ Page({ }) }, + //获取季节配置 + getIndexSeason(){ + this.setData({ + indexHot: app.globalData.configJson.indexHot, + isTest: app.globalData.configJson.isTest, + otherPlat: app.globalData.configJson.otherPlats, + indexSeason: app.globalData.configJson.indexSeason + }) + this.getFourProduct() + }, //关闭弹窗广告 closeAdv: function () { this.setData({ @@ -735,20 +745,8 @@ Page({ return }, onReady: function () { - if (app.globalData.configJson) { - this.setData({ - indexHot: app.globalData.configJson.indexHot, - isTest: app.globalData.configJson.isTest, - otherPlat: app.globalData.configJson.otherPlats, - indexSeason: app.globalData.configJson.indexSeason - }) - console.log(app.globalData.configJson) - this.getFourProduct() - } else { - setTimeout(() => { - this.onReady() - }, 300) - } + + }, gotoOther: function (e) { let item = e.currentTarget.dataset.item; @@ -772,6 +770,14 @@ Page({ util.pagePoint(e, type) }, onShow: function () { + if (app.globalData.loadIndexSeason) { + this.getIndexSeason() + } else { + setTimeout(() => { + this.getIndexSeason() + }, 500) + } + this.pagePoint({ event: 'home_view' }, 1) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 5bf0986..307b4d7 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -216,11 +216,11 @@ 书香借阅 - 文化配送 - + --> diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js index f85a2fe..412a43e 100644 --- a/pages/info/groupOrderInfo/index.js +++ b/pages/info/groupOrderInfo/index.js @@ -14,7 +14,8 @@ Page({ restTime:null, countdown:0, codeImg:null, - showShareMask:false + showShareMask:false, + from:null }, /** @@ -22,25 +23,26 @@ Page({ */ onLoad: function (options) { this.setData({ - id:options.id + id:options.id, + from:options.from }) // 获取二维码 - commonApi.user_post("team_order/get_qrcode",{ - url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id - }).then(res=>{ - this.setData({ - codeImg:res.data - }) - }) - if(options.from=='order'){ - wx.showModal({ - title:"提示", - content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。", - success:function(){ + // commonApi.user_post("team_order/get_qrcode",{ + // url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id + // }).then(res=>{ + // this.setData({ + // codeImg:res.data + // }) + // }) + // if(options.from=='order'){ + // wx.showModal({ + // title:"提示", + // content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。", + // success:function(){ - } - }) - } + // } + // }) + // } }, showShare(){ this.setData({ @@ -107,7 +109,24 @@ Page({ } }) }, - + getQrcode(id){ + commonApi.user_post("team_order/get_qrcode",{ + url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+id + }).then(res=>{ + this.setData({ + codeImg:res.data + }) + }) + if(this.data.from=='order'){ + wx.showModal({ + title:"提示", + content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。", + success:function(){ + + } + }) + } + }, /** * 生命周期函数--监听页面初次渲染完成 */ @@ -123,6 +142,7 @@ Page({ order_id:this.data.id }).then(res=>{ if(res.code==1){ + this.getQrcode(res.data.list.id) res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null; res.data.list.members.reverse() this.setData({ @@ -141,6 +161,7 @@ Page({ } }) + }, setTime(){ if(this.data.countdown && this.data.countdown>0){ diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 0981ea2..ab71a71 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -32,41 +32,7 @@ Page({ cartTop: 0, top: 0, skuList: [], //立即预定的列表 - sku_ids: [ - 353954, - 353950, - 353949, - 353951, - 353947, - 353953, - 353685, - 353684, - 353952, - 353686, - 353948, - 354730, - 354409, - 354359, - 345343, - 354756, - 354385, - 354360, - 354361, - 354362, - 355466, - 355465, - 356230, - 356223, - 356207, - 346648, - 357518, - 356233, - 354381, - 354384, - 356324, - 354737, - 355467, - ] + sku_ids: [] }, /** @@ -89,6 +55,7 @@ Page({ commonApi._post("scene/detail", { id: options.id }).then(res => { + let flag = false if (!res.data) { wx.showToast({ title: '产品已下架', @@ -122,22 +89,58 @@ Page({ if (pItem) { res.data.product = [pItem]; } - - } else if (options.zhuanti_type == "yihuFree") { - - let skuArr = this.data.sku_ids - let newArr = [] - for (let i = 0; i < res.data.product.length; i++) { //3 - for (let j = 0; j < res.data.product[i].sku.length; j++) { //4 - for (let k = 0; k < skuArr.length; k++) { - if (res.data.product[i].sku[j].id == skuArr[k]) { - newArr.push(res.data.product[i].sku[j]) + } else if (options.zhuanti_type) { + flag = true + commonApi._post("theme/getYihuFreeList", { + zhuanti_type: options.zhuanti_type + }).then(res1 => { + let skuArr = res1.data.sku_ids + let newArr = [] + for (let i = 0; i < res.data.product.length; i++) { //3 + for (let j = 0; j < res.data.product[i].sku.length; j++) { //4 + for (let k = 0; k < skuArr.length; k++) { + if (res.data.product[i].sku[j].id == skuArr[k]) { + newArr.push(res.data.product[i].sku[j]) + } } } + res.data.product[i].sku = newArr; } - res.data.product[i].sku = newArr; - } + res.data.product.map(product => { + product.sku.map(sku => { + sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2); + }) + }) + this.setData({ + info: res.data + }) + var arr = [] + res.data.product.forEach((item, index) => { + item.sku.forEach(itemB => { + itemB.proIndex = index + arr.push(itemB) + }) + }); + this.setData({ + skuList: arr + }) + util.pagePoint({ + event: 'scene_view', + param: { + type: res.data.type, + id: res.data.id + } + }, 1) + this.BroswerRecord() + }) + } + console.log(res.data.product); + if (flag) { + return + } + + // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[]; res.data.product.map(product => { product.sku.map(sku => { diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js index acb4921..2e38e77 100644 --- a/pages/list/activitynew/index.js +++ b/pages/list/activitynew/index.js @@ -14,7 +14,7 @@ Page({ types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other'], weeks: [], pageNo: 1, - sort: "", + sort: "distance", list: [], date: null, total: 1, diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index 65c01e8..887a8eb 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -19,10 +19,6 @@ 全部 - - - 展览 - 景区 @@ -31,14 +27,19 @@ 演出 - 电影 + + + 展览 + + + 其他 @@ -95,15 +96,18 @@ - + {{item.title}} 导演：{{item.director}} 主演：{{item.leading_role}} + + {{movieType==1?'购买':'查看'}} + - + {{item.title}} {{item.address}} diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss index c53c97a..50ae31f 100644 --- a/pages/list/activitynew/index.wxss +++ b/pages/list/activitynew/index.wxss @@ -290,4 +290,13 @@ background: rgba(11, 137, 142, .1); .new-top-search-box { display: flex; justify-content: space-between; +} +.btn{ +flex-shrink: 0; + color: #fff; + background: #f55; + font-size: 26rpx; + padding: 6rpx 20rpx; + border-radius: 40rpx; + margin-left: 10rpx; } \ No newline at end of file diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js index 072bcb5..e00b4b3 100644 --- a/pages/list/movieticket/list/cinema/index.js +++ b/pages/list/movieticket/list/cinema/index.js @@ -1,4 +1,5 @@ // pages/list/movieticket/list/cinema/index.js +let app = getApp() import commonApi from "../../../../../utils/https/common" import util from "../../../../../utils/util" Page({ @@ -13,7 +14,8 @@ Page({ dates:[], dateIndex:0, list:[], - name:"" + name:"", + invoiceId:null, }, /** @@ -97,6 +99,49 @@ Page({ console.log(res) }) }, + selectMovieSeat(e){ + let info = e.currentTarget.dataset.info + const areaInfo = JSON.parse(info.schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId})); + let planData = { + areaInfo, + fee:info.service_fee, + movieName: this.data.movie[this.data.currentNum].title, + planId : info.schedule_id, + planTime : info.show_time, + type:'WECHATXCX', + remake : '' + } + let show_id = info.show_id + let cinema_id = info.cinema_id + // let schedule_id = info.schedule_id + console.log(info); + commonApi._post('Cinema/getProductAndSku',{ + show_id, + cinema_id, + }).then(res=>{ + this.setData({ + productInfo:res.data + }) + app.globalData.product ={ + product:this.data.productInfo, + info:{ + hallName:info.hall_name, + cinemaName:this.data.name, + show_date:info.show_date, + show_time:info.show_time, + close_time:info.close_time, + movieName:this.data.movie[this.data.currentNum].title, + show_version:info.show_version, + selectSeatInfo:null, + schedule_id:info.schedule_id, + start_end_time:info.show_time + } + } + wx.navigateTo({ + url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData), + }) + }) + }, onChange:function(e){ console.log(e) this.setData({ @@ -140,7 +185,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + console.log(123123123213); }, /** diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml index 8c03f56..30ab097 100644 --- a/pages/list/movieticket/list/cinema/index.wxml +++ b/pages/list/movieticket/list/cinema/index.wxml @@ -16,7 +16,7 @@ {{item.name}} - +
{{item.show_time}} {{item.close_time}}散场 @@ -25,11 +25,11 @@ {{item.show_version}} {{item.hall_name}} - ￥{{item.price/100}} + ￥{{item.price}} 起 购票 - +
暂无内容 diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml index 8076186..4910bdb 100644 --- a/pages/list/movieticket/list/info/index.wxml +++ b/pages/list/movieticket/list/info/index.wxml @@ -25,5 +25,5 @@ - + 立即购票 \ No newline at end of file diff --git a/pages/list/movieticket/list/info/index.wxss b/pages/list/movieticket/list/info/index.wxss index 8bb62ff..a35a1b3 100644 --- a/pages/list/movieticket/list/info/index.wxss +++ b/pages/list/movieticket/list/info/index.wxss @@ -34,6 +34,7 @@ box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.06); border-radius: 27rpx 27rpx 0px 0px; padding: 0 40rpx; + padding-bottom: 60rpx; } .content .title { font-size: 33rpx; diff --git a/pages/list/movieticket/list/seats/index.js b/pages/list/movieticket/list/seats/index.js index a44f10f..6e885ba 100644 --- a/pages/list/movieticket/list/seats/index.js +++ b/pages/list/movieticket/list/seats/index.js @@ -137,6 +137,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + console.log(options); this.setData({ options:options }) @@ -147,13 +148,16 @@ Page({ this.setData({ productInfo:res.data }) + wx.navigateTo({ + url:"/pages/list/movieticket/list/web/index?planData="+options.planData, + }) }) - let that = this; - let sys = wx.getSystemInfoSync() - that.setData({ - seatArea: sys.screenHeight - sys.statusBarHeight - (500 * sys.screenWidth / 750), - rpxToPx: sys.screenWidth / 750 - }); + // let that = this; + // let sys = wx.getSystemInfoSync() + // that.setData({ + // seatArea: sys.screenHeight - sys.statusBarHeight - (500 * sys.screenWidth / 750), + // rpxToPx: sys.screenWidth / 750 + // }); }, /** @@ -167,12 +171,12 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - commonApi.user_post("Cinema/getLockSeatInfo",{ - schedule_id:this.data.options.schedule_id - }).then(res=>{ - console.log(res) - this.getInfo(); - }) + // commonApi.user_post("Cinema/getLockSeatInfo",{ + // schedule_id:this.data.options.schedule_id + // }).then(res=>{ + // console.log(res) + // this.getInfo(); + // }) //---这此替换成自己的接口请求成功后--end-- diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js index a368215..1767689 100644 --- a/pages/list/movieticket/list/ticket/index.js +++ b/pages/list/movieticket/list/ticket/index.js @@ -1,4 +1,5 @@ // pages/list/movieticket/list/ticket/index.js +let app = getApp() import commonApi from "../../../../../utils/https/common" import util from "../../../../../utils/util" Page({ @@ -159,7 +160,50 @@ Page({ console.log(res) }) }, - + selectMovieSeat(e){ + let info = e.currentTarget.dataset.info + 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})); + let planData = { + areaInfo, + fee:info.schedules[index].service_fee, + movieName: this.data.title, + planId : info.schedules[index].schedule_id, + planTime : info.schedules[index].show_time, + type:'WECHATXCX', + remake : '' + } + let show_id = info.schedules[index].show_id + let cinema_id = info.schedules[index].cinema_id + // let schedule_id = info.schedule_id + console.log(info); + commonApi._post('Cinema/getProductAndSku',{ + show_id, + cinema_id, + }).then(res=>{ + app.globalData.product ={ + product:res.data, + info:{ + hallName:info.schedules[index].hall_name, + cinemaName:info.title, + show_date:info.schedules[index].show_date, + show_time:info.schedules[index].show_time, + close_time:info.schedules[index].close_time, + movieName:this.data.title, + start_end_time:info.schedules[index].show_time, + show_version:info.schedules[index].show_version, + selectSeatInfo:null, + schedule_id:info.schedules[index].schedule_id + } + } + console.log(planData); + wx.navigateTo({ + url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData), + }) + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml index de209c1..d24b82e 100644 --- a/pages/list/movieticket/list/ticket/index.wxml +++ b/pages/list/movieticket/list/ticket/index.wxml @@ -32,11 +32,11 @@ {{item.distanceText}} - + {{schedule.show_time}} {{schedule.show_version}} - ¥{{schedule.price/100}} - + ¥{{schedule.price}} + diff --git a/pages/list/movieticket/list/web/index.js b/pages/list/movieticket/list/web/index.js new file mode 100644 index 0000000..0dcf23c --- /dev/null +++ b/pages/list/movieticket/list/web/index.js @@ -0,0 +1,79 @@ +// pages/pbService/web/index.js +let app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + webUrl:"" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + webUrl:'https://online.suiyuaninfo.com/?planData='+options.planData + }) + console.log(this.data.webUrl); + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + handleGetMessage: function(e) { + console.log(e.target.data) + console.log(app.globalData.product); + return + app.globalData.product ={ + product:this.data.productInfo, + info:{ + hallName:this.data.hallName, + show_date:this.data.show_date, + start_end_time:this.data.start_end_time, + cinema_title:this.data.cinema_title, + movieName:this.data.movieName, + show_version:this.data.show_version, + selectSeatInfo:selectSeatInfo, + schedule_id:this.data.schedule_id + } + } + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + } +}) \ No newline at end of file diff --git a/pages/list/movieticket/list/web/index.json b/pages/list/movieticket/list/web/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/list/movieticket/list/web/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/list/movieticket/list/web/index.wxml b/pages/list/movieticket/list/web/index.wxml new file mode 100644 index 0000000..5d9fd35 --- /dev/null +++ b/pages/list/movieticket/list/web/index.wxml @@ -0,0 +1,4 @@ + + + + diff --git a/pages/list/movieticket/list/web/index.wxss b/pages/list/movieticket/list/web/index.wxss new file mode 100644 index 0000000..3d9e18a --- /dev/null +++ b/pages/list/movieticket/list/web/index.wxss @@ -0,0 +1 @@ +/* pages/pbService/web/index.wxss */ \ No newline at end of file diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss index 88ee367..41f26cf 100644 --- a/pages/list/museum/index.wxss +++ b/pages/list/museum/index.wxss @@ -55,6 +55,7 @@ page { } .info .address { margin-bottom: 15rpx; + max-width: 320rpx; } .info .com-flex { width: 240rpx; diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml index 9d8e3df..5ba68e6 100644 --- a/pages/list/techan/index.wxml +++ b/pages/list/techan/index.wxml @@ -17,7 +17,7 @@ {{item}} - {{item.address}} + {{item.address}} ￥{{(item.start_price/100)}}起 diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js index ac70388..1b7c0c3 100644 --- a/pages/order/coupon/index.js +++ b/pages/order/coupon/index.js @@ -71,7 +71,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + app.globalData.couponInfo = null; }, /** diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml index 704ff1e..6ee7140 100644 --- a/pages/order/coupon/index.wxml +++ b/pages/order/coupon/index.wxml @@ -5,7 +5,7 @@ {{item.activity.money/100}} 满{{item.activity.mini_money/100}}元可用 - {{item.activity.end_time}}到期 + {{item.end_time}}到期 diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml index 694fdbd..f59a916 100644 --- a/pages/order/hotel/index.wxml +++ b/pages/order/hotel/index.wxml @@ -68,7 +68,7 @@ - + diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js index 21a32fc..a3e29d8 100644 --- a/pages/order/movie/index.js +++ b/pages/order/movie/index.js @@ -14,29 +14,27 @@ Page({ product:null, price:0, coupon:null, - prizeId:null + prizeId:null, }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { - let key = options.key; - if(!key){ - util.back() - return; - } + onLoad: function (options) { + console.log(options); this.setData({ prizeId:wx.getStorageSync('prizeId') }) let product = app.globalData.product,price=0; - product.info.selectSeatInfo.map(item=>{ - price = Number(item.price) + Number(price) - }) + 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 + }) + console.log(product); + console.log(price); this.setData({ product:product, - key:key, - price:price + price:price*100 }) userApi.user_post("user/getMyInfo").then(res=>{ this.setData({ @@ -63,30 +61,30 @@ Page({ }) return; } - let product = this.data.product,seats_list=[],seats_ids=[]; - product.info.selectSeatInfo.map(item=>{ - seats_list.push(item.name); - seats_ids.push({ - ext_id:item.ext_id, - area:item.area || "", - flag:Number(item.flag) - }) - }) + let product = this.data.product + // product.info.selectSeatInfo.map(item=>{ + // seats_list.push(item.name); + // seats_ids.push({ + // ext_id:item.ext_id, + // area:item.area || "", + // flag:Number(item.flag) + // }) + // }) let product_list = [{ "type" : "movie",//电影,必填 "product_id": product.product.id, "sku_id": product.product.sku_info.id, - "product_num": product.info.selectSeatInfo.length,//也就是锁定的座位数,必填 + "product_num": product.info.selectSeatInfo.seatInfo.length,//也就是锁定的座位数,必填 "reserve_mobile": this.data.tel, "use_date": product.info.show_date,//使用日期，Y-m-d日期格式字符串,必填 - "use_time": product.info.start_end_time,//场次时间,直接传字符串,必填 + "use_time": product.info.show_time+'-'+product.info.close_time,//场次时间,直接传字符串,必填 "show_version": product.info.show_version,//场次版本,必填 "scene_id": product.product.scene_id,//场景id，我方系统的场景id,必填 "schedules_name": product.info.hallName,//放映厅名称,必填 - "seats_list": seats_list.join(","),//座位中文名称,多个座位逗号分隔,必填 - "key": this.data.key,//锁座返回的key,必填 + "seats_list": product.info.selectSeatInfo.seatInfo.join(","),//座位中文名称,多个座位逗号分隔,必填 + // "key": this.data.key,//锁座返回的key,必填 "schedules_id": product.info.schedule_id,//淘票票场次id,必填 - "seats_ids": seats_ids + "seats_ids": product.info.selectSeatInfo.seatPriceInfo }]; let data = { product_list:product_list, @@ -110,6 +108,7 @@ Page({ data:JSON.stringify(data) }).then(res=>{ console.log(res) + }) }, @@ -120,13 +119,14 @@ Page({ this.setData({ coupon:app.globalData.couponInfo }) + console.log(this.coupon); }, /** * 生命周期函数--监听页面隐藏 */ onHide: function () { - + app.globalData.couponInfo = null }, /** diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml index 7ad82ae..96ec340 100644 --- a/pages/order/movie/index.wxml +++ b/pages/order/movie/index.wxml @@ -5,9 +5,10 @@ {{product.info.movieName}} - {{product.info.show_date}} {{product.info.start_end_time}}{{product.info.show_version}} - {{product.info.cinema_title}} - {{product.info.hallName}} {{item.name}} + {{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}} + + {{product.info.cinemaName}} + {{product.info.hallName}} {{product.info.selectSeatInfo.seatInfo}} diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss index 11ba0af..c2c042b 100644 --- a/pages/order/movie/index.wxss +++ b/pages/order/movie/index.wxss @@ -34,7 +34,6 @@ page { font-size: 35rpx; color: #000; font-weight: 500; - margin-bottom: 20rpx; } .tel-box { display: flex; diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js index 16f787c..220d57c 100644 --- a/pages/order/orderList/index.js +++ b/pages/order/orderList/index.js @@ -21,6 +21,7 @@ Page({ select_allowance: false, allowance_data: null, allowance_price: 0, + flag:null }, /** @@ -32,7 +33,9 @@ Page({ ticketList: app.globalData.list, kjId: app.globalData.kjId, gp_id: app.globalData.gp_id || app.globalData.team_id, + flag:options.flag }) + console.log(this.data.flag); console.log(app.globalData); let price = 0, sku_id = [] ,postFee= 0; app.globalData.postProduct.map(item => { diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index fe628a0..b9a3b52 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -52,7 +52,7 @@ 订单备注： - + diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js index c99612d..7481d63 100644 --- a/pages/order/pay/index.js +++ b/pages/order/pay/index.js @@ -13,8 +13,11 @@ Page({ second:"00", minute:"00", payIndex:-1, - numIndex: 0, - showNumMask: false + numIndex:0, + showNumMask: false, + activePay:false,//是否活动支付 + SUBWALLET:false, + wxPay:false }, /** @@ -85,9 +88,24 @@ Page({ else { util.back() } - this.setData({ - info:res.data - }) + if (Object.keys(res.data.coupon_activity).length != 0) { + this.setData({ + info:res.data, + activePay: Object.keys(res.data.coupon_activity).length === 0 ?false:true, + SUBWALLET:res.data.coupon_activity.pay_type.includes('SUBWALLET') || !res.data.coupon_activity.pay_type, + wxPay:res.data.coupon_activity.pay_type.includes('WEIXIN') || !res.data.coupon_activity.pay_type, + payIndex:Object.keys(res.data.coupon_activity).length === 0 ?-1:0, + }) + console.log(this.data.wxPay); + }else{ + this.setData({ + info:res.data, + }) + } + + + console.log(this.data.ERMB); + }) this.checkPay(); @@ -111,6 +129,28 @@ Page({ }) }, pay:function(){ + if (this.data.activePay) { + let flag = false + if (this.data.payList.length!=0 && !this.data.info.coupon_activity.pay_type.includes('SUBWALLET')) { + flag = true + } + if (this.data.activePay && flag && !this.data.wxPay) { + wx.showToast({ + title: '暂无支付方式请前往其它端付款', + icon:'none' + }) + return + } + console.log(this.data.payIndex); + if (this.data.payIndex===0) { + wx.showToast({ + title: '请选择支付方式', + icon:'none' + }) + return + } + } + let _this = this; if(this.data.payIndex==1) { this.setData({ diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml index 44d2fb9..834cbb6 100644 --- a/pages/order/pay/index.wxml +++ b/pages/order/pay/index.wxml @@ -8,7 +8,25 @@ ¥{{info.paid_money/100}} - + + 支付方式： + + + 微信支付 + + + + + 数字人民币 + + + + + 君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权 + + + + 支付方式： diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js index 5248ae4..be9edfe 100644 --- a/pages/order/postOrder/index.js +++ b/pages/order/postOrder/index.js @@ -22,6 +22,7 @@ Page({ allowance_price: 0, showAllowance: false, flag:null, + isCar:'single' }, /** @@ -33,7 +34,8 @@ Page({ kjId: app.globalData.kjId, gp_id: app.globalData.gp_id || app.globalData.team_id, prizeId: wx.getStorageSync('prizeId'), - flag:options.flag + flag:options.flag, + isCar:options.isCar }) let price = 0, sku_id = []; app.globalData.postProduct.map(item => { @@ -191,7 +193,7 @@ Page({ app.globalData.product = app.globalData.list[0] } wx.redirectTo({ - url: '/pages/order/scene/index?flag='+this.data.flag, + url: '/pages/order/scene/index?flag='+this.data.flag+'&isCar='+this.data.isCar, }) } }, diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index f159d0f..e388033 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -28,15 +28,16 @@ Page({ allowance_price: 0, pIndex: 0, flag:null, - ticket_type:1 + ticket_type:1, + isCar:'single' }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - console.log(app.globalData.product); - console.log(this.data.date); + console.log(app.globalData.product); + console.log(options.isCar); this.setData({ product: app.globalData.product, type: options.type, @@ -45,8 +46,9 @@ Page({ prizeId: wx.getStorageSync('prizeId'), flag:options.flag, date:null, - ticket_type:app.globalData.product.sku.ticket_type || 1 - }) + ticket_type:app.globalData.product.sku.ticket_type || 1, + isCar:options.isCar + }) if (!app.globalData.product) { util.back(); return; @@ -285,7 +287,7 @@ Page({ app.globalData.index = app.globalData.index + 1 app.globalData.product = app.globalData.list[app.globalData.index] wx.redirectTo({ - url: '/pages/order/scene/index?flag='+ this.data.flag, + url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar, }) return }else{ @@ -294,7 +296,7 @@ Page({ app.globalData.createDate.product_list.push(data.product_list[0]) } wx.redirectTo({ - url: '/pages/order/orderList/index' + url: '/pages/order/orderList/index?flag='+ this.data.flag }) }else{ commonApi.user_post(service, postData).then(res => { diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index 69dd90f..a454ed2 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -34,8 +34,10 @@ - + 订单备注 diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js index 97bbea4..f5c5555 100644 --- a/pages/pbService/web/index.js +++ b/pages/pbService/web/index.js @@ -51,7 +51,6 @@ Page({ }) } }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js index 3065686..ad38fe5 100644 --- a/pages/user/cartlist/list.js +++ b/pages/user/cartlist/list.js @@ -20,7 +20,8 @@ Page({ allPrice: 0, productType: '', manageFlag: false, - flag: false, //判断订单是否同时有商品和票 + flag: false, //判断订单是否同时有商品和票 + isCar:'single',//判断是否购物车 }, /** @@ -175,9 +176,20 @@ Page({ } if (product.length > 0 && product1.length > 0) { this.setData({ - flag: 'mix' + flag: 'mix', + isCar:'multiple' }) - } + } + if ( product1.length > 1) { + this.setData({ + isCar:'multiple' + }) + }else{ + this.setData({ + isCar:'single' + }) + } + console.log(product1); app.globalData.postProduct = product; if (app.globalData.list) { app.globalData.product = app.globalData.list[app.globalData.index] @@ -189,7 +201,7 @@ Page({ }) } else { wx.navigateTo({ - url: '/pages/order/scene/index', + url: '/pages/order/scene/index?isCar=' + this.data.isCar, }) } }, diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml index c5db573..8d46f82 100644 --- a/pages/user/coupon/index.wxml +++ b/pages/user/coupon/index.wxml @@ -12,7 +12,7 @@ ￥{{item.activity.money/100}} 使用条件：满{{item.activity.mini_money/100}}元 - 有效期：{{item.activity.end_time}} + 有效期：{{item.end_time}} 优惠码：{{item.key}} 使用规则