diff --git a/app.js b/app.js
index 70097da..cca10f2 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest74? true : false;
+ data.isTest = data.isTest75? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
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 6cc988f..887a8eb 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -102,7 +102,7 @@
主演：{{item.leading_role}}
- 查看
+ {{movieType==1?'购买':'查看'}}
diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js
index c84d836..e00b4b3 100644
--- a/pages/list/movieticket/list/cinema/index.js
+++ b/pages/list/movieticket/list/cinema/index.js
@@ -113,8 +113,8 @@ Page({
}
let show_id = info.show_id
let cinema_id = info.cinema_id
- // let schedule_id = info.schedule_id
-
+ // let schedule_id = info.schedule_id
+ console.log(info);
commonApi._post('Cinema/getProductAndSku',{
show_id,
cinema_id,
@@ -125,22 +125,22 @@ Page({
app.globalData.product ={
product:this.data.productInfo,
info:{
- hallName:this.data.name,
+ hallName:info.hall_name,
+ cinemaName:this.data.name,
show_date:info.show_date,
- start_end_time:info.show_time,
+ 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
+ schedule_id:info.schedule_id,
+ start_end_time:info.show_time
}
}
wx.navigateTo({
url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
})
})
- // wx.navigateTo({
- // url: '/pages/list/movieticket/list/seats/index?show_id='+show_id+'&cinema_id='+cinema_id+'&schedule_id='+schedule_id+'&planData='+JSON.stringify(planData),
- // })
},
onChange:function(e){
console.log(e)
diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml
index a1a90d9..30ab097 100644
--- a/pages/list/movieticket/list/cinema/index.wxml
+++ b/pages/list/movieticket/list/cinema/index.wxml
@@ -25,7 +25,7 @@
{{item.show_version}}
{{item.hall_name}}
- ￥{{item.price}}
+ ￥{{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/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/order/movie/index.js b/pages/order/movie/index.js
index efa2c54..a3e29d8 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -14,14 +14,14 @@ Page({
product:null,
price:0,
coupon:null,
- prizeId:null
+ prizeId:null,
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
- console.log(options.selectSeatInfo);
+ onLoad: function (options) {
+ console.log(options);
this.setData({
prizeId:wx.getStorageSync('prizeId')
})
@@ -29,7 +29,8 @@ Page({
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,
@@ -76,7 +77,7 @@ Page({
"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,//放映厅名称,必填
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.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/scene/index.js b/pages/order/scene/index.js
index 64ce73a..84b6aea 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;
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/user/cartlist/list.js b/pages/user/cartlist/list.js
index 3065686..bd08800 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',//判断是否购物车
},
/**
@@ -177,7 +178,17 @@ Page({
this.setData({
flag: 'mix'
})
- }
+ }
+ 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 +200,7 @@ Page({
})
} else {
wx.navigateTo({
- url: '/pages/order/scene/index',
+ url: '/pages/order/scene/index?isCar=' + this.data.isCar,
})
}
},