diff --git a/common/api.js b/common/api.js index 2855811..47f4c8b 100644 --- a/common/api.js +++ b/common/api.js @@ -1,7 +1,7 @@ // appId: 正式 null | 测试 wxeb58570b5e04d147 -export const DEV = "prod"; // dev 测试 | prod 正式 +export const DEV = "dev"; // dev 测试 | prod 正式 export const VERSION = '1.0.0'; // 版本号 -export const DEVURL = 'https://hainan.lanzulive.com'; // 测试服请求地址 +export const DEVURL = 'https://yytx.eugyl.com'; // 测试服请求地址 // export const DEVURL = 'http://hainan.com'; // 测试服请求地址 export const PRODURL = 'https://yytx.eugyl.com'; // 正式服请求地址 diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index ba1a85b..8aad609 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -77,26 +77,26 @@ - - ¥{{ goods_detail.spec[type_index].original_price }} + + ¥{{ choose_date_orangilprice || goods_detail.spec[type_index].original_price }} - 开始时间：{{ choose_date }} + 使用时间：{{ choose_date }} 套餐类型 - {{item.product_spec.name}} + {{item.name}} - 开始时间 + 使用时间 - 开始时间 + 使用时间 - + {{ choose_date }} @@ -166,8 +166,8 @@ - - ¥{{ goods_detail.spec[type_index].original_price }} + + ¥{{ total_hotel_orginalprice || goods_detail.spec[type_index].original_price }} 酒店住房日期：{{live_date}}~{{leave_date}} @@ -175,20 +175,16 @@ 套餐类型 - {{item.product_spec.name}} + {{item.name}} - - 酒店住房日期 - 共{{totalLive}}晚 - 入住时间 - + {{ live_date }} @@ -200,7 +196,7 @@ 离店时间 - + {{ leave_date }} @@ -212,7 +208,7 @@ 到店日期 - + {{ arrive_date }} @@ -270,28 +266,25 @@ - - ¥{{ goods_detail.spec[type_index].original_price }} + + ¥{{ choose_date_orangilprice || goods_detail.spec[type_index].original_price }} - 套餐类型：{{goods_detail.spec[type_index].product_spec.name}} + 套餐类型：{{goods_detail.spec[type_index].name}} 套餐类型 - {{item.product_spec.name}} + {{item.name}} - - 出行日期 - - 开始时间 + 使用时间 - + {{ go_date }} @@ -308,11 +301,11 @@ - - ¥{{ goods_detail.spec[type_index].original_price }} + + ¥{{ choose_date_orangilprice || goods_detail.spec[type_index].original_price }} - 套餐类型：{{goods_detail.spec[type_index].product_spec.name}} + 套餐类型：{{goods_detail.spec[type_index].name}} 套餐类型 @@ -321,15 +314,12 @@ - - 出行日期 - - 开始时间 + 使用时间 - + {{ go_date }} @@ -346,16 +336,16 @@ - - ¥{{ goods_detail.spec[type_index].original_price }} + + ¥{{ choose_date_orangilprice || goods_detail.spec[type_index].original_price }} - 套餐类型：{{goods_detail.spec[type_index].product_spec.name}} + 套餐类型：{{goods_detail.spec[type_index].name}} 套餐类型 - {{item.product_spec.name}} + {{item.name}} @@ -364,10 +354,10 @@ - 开始时间 + 使用时间 - + {{ go_date }} @@ -438,7 +428,7 @@ //景区类型相关 scenic_spot: false, type_index: 0, - choose_date: '请选择开始时间', + choose_date: '请选择使用时间', //酒店相关 hotel: false, live_date: '请选择入住日期', @@ -448,12 +438,21 @@ totalLive: '',//住宿时间 //旅游路线相关 travel_route: false, - go_date: '请选择开始时间', + go_date: '请选择使用时间', back_date: '请选择回程日期', //餐厅 canteen: false, car: false, single:false, + choose_date_price: '', + choose_date_orangilprice: '', + choose_date_specid: '', + //酒店 + total_hotel_price: 0, + total_hotel_orginalprice: 0, + live_index: 0, + leave_index: 0, + hotel_specid: [] } }, components: {zwyCalendar}, @@ -484,14 +483,32 @@ var nowTime = new Date(new Date().toLocaleDateString()).getTime(); let oldTime = new Date(new Date(e.detail.value).toLocaleDateString()).getTime(); if(oldTime { + if(item.date == this.choose_date) { + this.choose_date_price = this.goods_detail.spec[this.type_index].list[index].price; + this.choose_date_orangilprice = this.goods_detail.spec[this.type_index].list[index].original_price; + this.choose_date_specid = this.goods_detail.spec[this.type_index].list[index].id; + } + }) return }else { this.choose_date = e.detail.value; + let differrentList = this.goods_detail.spec[this.type_index].list; + console.log(differrentList) + differrentList.forEach((item,index) => { + if(item.date == this.choose_date) { + this.choose_date_price = this.goods_detail.spec[this.type_index].list[index].price; + this.choose_date_orangilprice = this.goods_detail.spec[this.type_index].list[index].original_price; + this.choose_date_specid = this.goods_detail.spec[this.type_index].list[index].id; + } + }) } }, arriveChange(e) { @@ -510,24 +527,43 @@ this.arrive_time = e.detail.value; }, goChange(e) { - this.go_date = e.detail.value; - // var nowTime = new Date(new Date().toLocaleDateString()).getTime(); - // let oldTime = new Date(new Date(e.detail.value).toLocaleDateString()).getTime(); - // if(oldTime { + if(item.date == this.go_date) { + this.choose_date_price = this.goods_detail.spec[this.type_index].list[index].price; + this.choose_date_orangilprice = this.goods_detail.spec[this.type_index].list[index].original_price; + this.choose_date_specid = this.goods_detail.spec[this.type_index].list[index].id; + } + }) + return + }else { + this.go_date = e.detail.value; + let differrentList = this.goods_detail.spec[this.type_index].list; + console.log(differrentList) + differrentList.forEach((item,index) => { + if(item.date == this.go_date) { + this.choose_date_price = this.goods_detail.spec[this.type_index].list[index].price; + this.choose_date_orangilprice = this.goods_detail.spec[this.type_index].list[index].original_price; + this.choose_date_specid = this.goods_detail.spec[this.type_index].list[index].id; + } + }) + } }, backChange(e) { this.back_date = e.detail.value; }, liveChange(e) { + this.total_hotel_price = 0; + this.total_hotel_orginalprice = 0; let compateDate = this.compareDate(e.detail.value); if(compateDate) { this.live_date = e.detail.value; @@ -537,9 +573,28 @@ }else { this.$msg('入住时间要大于当前时间!'); } + + let differrentList = this.goods_detail.spec[this.type_index].list; + differrentList.forEach((item,index) => { + if(item.date == e.detail.value) { + this.live_index = index; + }else if(item.date == this.leave_date) { + this.leave_index = index; + } + }) + let total_date = differrentList.slice(this.live_index,this.leave_index); + this.hotel_specid = []; + total_date.reduce((list, item)=>{ + this.total_hotel_price += parseInt(item.price); + this.total_hotel_orginalprice += parseInt(item.original_price); + this.hotel_specid.push(item.id); + console.log(this.hotel_specid); + }, []); }, leaveChange(e) { + this.total_hotel_price = 0; + this.total_hotel_orginalprice = 0; let live_date = new Date(new Date(this.live_date).toLocaleDateString()).getTime(); let leave_date = new Date(new Date(e.detail.value).toLocaleDateString()).getTime(); if(leave_date>live_date || leave_date==live_date) { @@ -552,12 +607,39 @@ this.leave_date = this.$shared.recordTime(date2, '-', 'date') return } - this.totalLive = parseInt(Math.abs(leave_date - live_date) / 1000 / 60 / 60 / 24); + let differrentList = this.goods_detail.spec[this.type_index].list; + console.log(differrentList) + differrentList.forEach((item,index) => { + if(item.date == this.live_date) { + this.live_index = index; + }else if(item.date == e.detail.value) { + this.leave_index = index; + } + }) + let total_date = differrentList.slice(this.live_index,this.leave_index); + this.hotel_specid = []; + total_date.reduce((list, item)=>{ + this.total_hotel_price += parseInt(item.price); + this.total_hotel_orginalprice += parseInt(item.original_price); + this.hotel_specid.push(item.id); + console.log(this.hotel_specid); + }, []); }, chooseType(index) { this.type_index = index; + let differrentList = this.goods_detail.spec[this.type_index].list; + differrentList.forEach((item,index) => { + if(item.date == this.choose_date) { + this.choose_date_price = this.goods_detail.spec[this.type_index].list[index].price; + this.choose_date_orangilprice = this.goods_detail.spec[this.type_index].list[index].original_price; + this.choose_date_specid = this.goods_detail.spec[this.type_index].list[index].id; + } + }) + }, + chooseTypehotel(index) { + this.type_index = index; }, changePop(type) { if(type == 2) { @@ -636,21 +718,21 @@ //0旅游路线1酒店2景区3餐厅 if(this.goods_detail.product.type == 2) { //景区 - if(this.choose_date != '请选择开始时间') { + if(this.choose_date != '请选择使用时间') { let date_compare = this.compareDate(this.choose_date); console.log(date_compare) if(date_compare){ let goods_id = this.goods_detail.id; let godds_type = this.goods_detail.product.type; let enter_time = this.choose_date; - let spec_id = this.goods_detail.spec[this.type_index].id; - let type_text = this.goods_detail.spec[this.type_index].product_spec.name; + let spec_id = this.choose_date_specid; + let type_text = this.goods_detail.spec[this.type_index].name; this.$url('/pages/order/confirm_order?goods_id='+ goods_id+ '&spec_id='+ spec_id +'&goods_type='+godds_type+'&enter_time='+enter_time+'&goods_typetext='+type_text); }else { - this.$msg('请选择正确的开始时间!'); + this.$msg('请选择正确的使用时间!'); } }else { - this.$msg('请选择开始时间!'); + this.$msg('请选择使用时间!'); } }else if(this.goods_detail.product.type == 1) { let date1 = false; @@ -701,8 +783,8 @@ console.log(arrival_time) let goods_id = this.goods_detail.id; let godds_type = this.goods_detail.product.type; - let spec_id = this.goods_detail.spec[this.type_index].id; - let type_text = this.goods_detail.spec[this.type_index].product_spec.name; + let spec_id = this.hotel_specid; + let type_text = this.goods_detail.spec[this.type_index].name; //酒店 let check_in_time = this.live_date; let check_out_time = this.leave_date; @@ -711,21 +793,21 @@ this.$url('/pages/order/confirm_order?goods_id='+ goods_id+ '&spec_id='+ spec_id +'&goods_type='+godds_type+'&check_in_time='+check_in_time+'&goods_typetext='+type_text+'&check_out_time='+check_out_time+'&arrival_time='+arrival_time+'&totalLive='+totalLive); } }else if(this.goods_detail.product.type == 0 || this.goods_detail.product.type == 4 || this.goods_detail.product.type == 5) { - if(this.go_date != '请选择开始时间') { + if(this.go_date != '请选择使用时间') { let date_compare = this.compareDate(this.go_date); console.log(date_compare) if(date_compare){ let goods_id = this.goods_detail.id; let godds_type = this.goods_detail.product.type; let departure_time = this.go_date; - let spec_id = this.goods_detail.spec[this.type_index].id; - let type_text = this.goods_detail.spec[this.type_index].product_spec.name; + let spec_id = this.choose_date_specid; + let type_text = this.goods_detail.spec[this.type_index].name; this.$url('/pages/order/confirm_order?goods_id='+ goods_id+ '&spec_id='+ spec_id +'&goods_type='+godds_type+'&departure_time='+departure_time+'&goods_typetext='+type_text); }else { - this.$msg('请选择正确的开始时间!'); + this.$msg('请选择正确的使用时间!'); } }else { - this.$msg('请选择开始时间!'); + this.$msg('请选择使用时间!'); } } diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue index dc8ec1c..469723d 100644 --- a/pages/order/order_details.vue +++ b/pages/order/order_details.vue @@ -55,6 +55,35 @@ 电话 {{orderDetails.mobile}} + + + 年龄 + {{orderDetails.info.age}} + + + 到店时间 + {{orderDetails.info.arrival_time}} + + + 使用时间 + {{orderDetails.info.departure_time}} + + + 入住时间 + {{orderDetails.info.check_in_time}} + + + 离店时间 + {{orderDetails.info.check_out_time}} + + + 身份证号 + {{orderDetails.info.id_card}} + + + 性别 + {{orderDetails.info.sex}} + @@ -62,10 +91,10 @@ style="padding-bottom: 140rpx;"> - +