Skip to content

A
Athena
Commit 3d1f110c authored by zhengke's avatar zhengke
Browse files
Options

修改

parents 2cb102f0 2d24af82
Show whitespace changes
Inline Side-by-side
Showing with 555 additions and 525 deletions
src/components/FreeTravel/FreeDetail.vue
View file @ 3d1f110c
...@@ -469,8 +469,6 @@ export default { ...@@ -469,8 +469,6 @@ export default {
let today= moment().format("YYYY-MM-DD"); let today= moment().format("YYYY-MM-DD");
this.pkgsList=[]; this.pkgsList=[];
this.mealType=res.data.data; this.mealType=res.data.data;
console.log("this.mealType",this.mealType.pkgs)
console.log(moment('2019-08-29').isBefore(moment('2019-08-30')))
if(this.mealType.pkgs){ if(this.mealType.pkgs){
this.mealType.pkgs.forEach(item=>{ this.mealType.pkgs.forEach(item=>{
// //
......
src/components/FreeTravel/OrderConfirmation.vue
View file @ 3d1f110c
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<span class="f18 pfR">交通列表</span> <span class="f18 pfR">交通列表</span>
</div> </div>
<el-row class="trafficList" v-for="(item,index) in traffic.car" :key="index+100"> <el-row class="trafficList" v-for="(item,index) in traffic.car" :key="index+100">
<el-col :span="2" class="c88" style="text-align:center;padding-top:27px">{{index+1}}</el-col> <el-col :span="2" class="c88" style="text-align:center;padding-top:27px">第{{index+1}}天</el-col>
<el-col :span="20"> <el-col :span="20">
<div class="f12" style="padding:20px;padding-left:80px"> <div class="f12" style="padding:20px;padding-left:80px">
<el-form-item label="出发地" :prop="'car.'+index+'.s_location'" :rules="[{ required: true, message: '请填写出发地', trigger: 'blur' }]"> <el-form-item label="出发地" :prop="'car.'+index+'.s_location'" :rules="[{ required: true, message: '请填写出发地', trigger: 'blur' }]">
...@@ -287,10 +287,10 @@ ...@@ -287,10 +287,10 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<!-- <el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn"> <el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn">
下一步，支付 下一步，支付
</el-button> --> </el-button>
</div> </div>
</div> </div>
<div class="right" style="width:388px;box-sizing:border-box"> <div class="right" style="width:388px;box-sizing:border-box">
...@@ -381,8 +381,6 @@ export default { ...@@ -381,8 +381,6 @@ export default {
native_last_name:false,//本国姓 native_last_name:false,//本国姓
tel_country_code:false,//电话国号 tel_country_code:false,//电话国号
tel_number:false,//电话号码 tel_number:false,//电话号码
}, },
tel_country_code:[], tel_country_code:[],
guide_langList:[], guide_langList:[],
...@@ -432,8 +430,10 @@ export default { ...@@ -432,8 +430,10 @@ export default {
this.freeMsg.buyer_tel_country_code="86"; this.freeMsg.buyer_tel_country_code="86";
this.freeMsg.buyer_tel_number="13183813102"; // this.freeMsg.buyer_tel_number="13183813102";
this.freeMsg.buyer_email="13183813102@qq.com"; // this.freeMsg.buyer_email="13183813102@qq.com";
this.freeMsg.buyer_tel_number="";
this.freeMsg.buyer_email="";
this.freeMsg.pay={ this.freeMsg.pay={
type: "02", type: "02",
...@@ -774,7 +774,6 @@ export default { ...@@ -774,7 +774,6 @@ export default {
}) })
} }
console.log("this.traffic.car",this.traffic.car)
} }
} }
......
src/components/FreeTravel/payInfo.vue
View file @ 3d1f110c
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
CancelBy:'', CancelBy:'',
}, },
msg:{ msg:{
order_no:'', orderId:'',
}, },
payInfoObj:{}, payInfoObj:{},
oldModel:{}, oldModel:{},
...@@ -221,8 +221,8 @@ export default { ...@@ -221,8 +221,8 @@ export default {
} }
}, },
created(){ created(){
if(this.$route.query.ThirdOrderNo){ if(this.$route.query.OrderID){
this.msg.order_no=this.$route.query.ThirdOrderNo; this.msg.orderId=this.$route.query.OrderID;
} }
this.getPayInfo(); this.getPayInfo();
...@@ -257,9 +257,10 @@ export default { ...@@ -257,9 +257,10 @@ export default {
}, },
Exit(){ Exit(){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
// console.log(item);
this.dialogFormVisible=true; this.dialogFormVisible=true;
this.exitMsg.order_no=this.oldModel.ThirdOrderNo; this.exitMsg.orderId=this.oldModel.OrderID;
// console.log(item);
this.exitMsg.CancelBy=userInfo.name; this.exitMsg.CancelBy=userInfo.name;
}, },
ExitOrder(){ ExitOrder(){
...@@ -294,7 +295,7 @@ export default { ...@@ -294,7 +295,7 @@ export default {
"dmc_post_Get_KKDayOrderQueryOrderDtl", "dmc_post_Get_KKDayOrderQueryOrderDtl",
this.msg, this.msg,
res => { res => {
console.log("sfafg",res); // console.log("sfafg",res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.oldModel=res.data.data.oldModel; this.oldModel=res.data.data.oldModel;
this.jo=res.data.data.jo; this.jo=res.data.data.jo;
......
src/components/Hotel/HotelDetail.vue
View file @ 3d1f110c
<style> <style>
.HotelDetail { .HotelDetail{
width: 1200px; width:1200px;
height: auto; height:auto;
margin: auto; margin:auto;
margin-bottom: 34px; margin-bottom:34px;
} }
.clearfix:after { .clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
content: "\0020"; .HD_Top{
display: block; margin-top:20px;
height: 0; }
clear: both; .HD_Top_Left{
} width:878px;
.HD_Top { height:auto;
margin-top: 20px; float:left;
} }
.HD_Top_Left { .HD_Top_Right{
width: 878px; width:300px;
height: auto; float:left;
float: left; height:368px;
} margin-left:20px;
.HD_Top_Right { }
width: 300px; .HD_Top_Title{
float: left;
height: 368px;
margin-left: 20px;
}
.HD_Top_Title {
font-weight: bold; font-weight: bold;
color: #000000; color:#000000;
font-size: 16px; font-size:16px;
margin-bottom: 10px; margin-bottom:10px;
} }
.HD_Top_Address { .HD_Top_Address{
font-size: 14px; font-size:14px;
color: #999999; color:#999999;
} }
.HD_Top_Price { .HD_Top_Price{
width: 838px; width:838px;
height: 54px; height:54px;
margin: 20px 0; margin:20px 0;
background-color: #f5f5f5; background-color: #F5F5F5;
padding: 0 20px; padding:0 20px;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 12px; font-size:12px;
color: #888888; color:#888888;
position: relative; position: relative;
} }
.HD_Top_Pinfo { .HD_Top_Pinfo{
color: #ee4454; color:#EE4454;
font-size: 22px; font-size:22px;
font-weight: bold; font-weight: bold;
margin-top: -5px; margin-top:-5px;
} }
.HD_Top_Pinfo i { .HD_Top_Pinfo i{
margin-right: 10px; margin-right:10px;
font-style: normal; font-style:normal;
} }
.HD_Top_qi { .HD_Top_qi{
margin-right: 30px; margin-right:30px;
} }
.HD_SureBtn { .HD_SureBtn{
float: right; float:right;
width: 90px; width:90px;
height: 36px; height:36px;
background-color: #ee4454; background-color: #EE4454;
border-radius: 4px; border-radius:4px;
color: #fff; color:#fff;
outline: none; outline: none;
right: 20px; right:20px;
position: absolute; position: absolute;
border: none; border:none;
cursor: pointer; cursor: pointer;
} }
.HD_Top_ImgList { .HD_Top_ImgList{
width: 100%; width:100%;
height: auto; height:auto;
} }
.HD_Top_FirstImg { .HD_Top_FirstImg{
float: left; float:left;
width: 345px; width:345px;
height: 259px; height:259px;
} background-position: 50%;
.HD_Top_ImgList img { background-repeat: no-repeat;
width: 100%; }
height: 100%; .HD_Top_ImgList img{
} width:100%;
.HD_Top_rightImg { height:100%;
float: left; }
width: 526px; .HD_Top_rightImg{
margin-left: 7px; float:left;
} width:526px;
.HD_Top_ImgDiv { margin-left:7px;
width: 259px; }
height: 126px; .HD_Top_ImgDiv{
float: left; width:259px;
margin: 0 8px 8px 0; height:126px;
} float:left;
.HD_Top_ImgDiv:nth-child(2n + 2) { margin:0 8px 8px 0;
margin-right: 0; background-position: 50%;
} background-repeat: no-repeat;
.HD_btnContent { }
width: 100%; .HD_Top_ImgDiv:nth-child(2n+2){
height: auto; margin-right:0;
border: 1px solid #dcdcdc; }
margin-top: 49px; .HD_btnContent{
} width:100%;
.HD_checkTime, height:auto;
.HD_PeoPleNum { border:1px solid #DCDCDC;
margin: 20px; margin-top:49px;
font-size: 12px; }
color: #666666; .HD_checkTime,.HD_PeoPleNum{
margin:20px;
font-size:12px;
color:#666666;
position: relative; position: relative;
} }
.HD_warn { .HD_warn{
color: #ee4454; color:#EE4454;
font-size: 14px; font-size:14px;
font-weight: bold; font-weight:bold;
margin-left: 46px; margin-left:46px;
} }
.HD_warn i { .HD_warn i{
color: #ffa835; color:#FFA835;
} }
.HD_checkTime .el-input-number { .HD_checkTime .el-input-number{
width: 145px; width:145px;
line-height: 26px; line-height: 26px;
margin-right: 20px; margin-right:20px;
} }
.HD_checkTime .el-input__inner { .HD_checkTime .el-input__inner{
height: 28px; height:28px;
border-radius: 0; border-radius:0;
} }
.HD_PsureBtn { .HD_PsureBtn{
position: absolute; position: absolute;
right: 0; right:0;
width: 90px; width:90px;
height: 36px; height:36px;
background-color: #ee4454; background-color: #EE4454;
color: #fff; color:#fff;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
outline: none; outline: none;
border: none; border:none;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
.HD_fuhe { .HD_fuhe{
width: 1167px; width:1167px;
padding: 0 17px; padding:0 17px;
height: 30px; height:30px;
color: #fff; color:#fff;
font-size: 16px; font-size:16px;
display: flex; display: flex;
align-items: center; align-items: center;
font-weight: bold; font-weight: bold;
background-color: #ffa835; background-color: #FFA835;
} }
.HD_fuhe img { .HD_fuhe img{
margin-right: 10px; margin-right:10px;
} }
.HD_fangxing_List { .HD_fangxing_List{
width: 100%; width:100%;
height: 97px; height:97px;
position: relative; position: relative;
border-bottom: 1px solid #dcdcdc; border-bottom:1px solid #DCDCDC;
} }
.HD_fangxing { .HD_fangxing{
width: 100%; width:100%;
border-collapse: collapse; border-collapse: collapse;
} }
.HD_fangxing td { .HD_fangxing td{
padding: 0; padding:0
} }
.HD_LeftRoomInfo { .HD_LeftRoomInfo{
margin: 15px 10px 0 15px; margin:15px 10px 0 15px;
display: flex; display: flex;
} }
.HD_FuheIMG { .HD_FuheIMG{
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 70px; width:70px;
height: 70px; height:70px;
} }
.HD_FuheIMG img { .HD_FuheIMG img{
width: 100%; width:100%;
height: 100%; height:100%;
} }
.HD_FuheIMG div { .HD_FuheIMG div{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 0; right:0;
width: 40px; width:40px;
height: 20px; height:20px;
background: rgba(0, 0, 0, 0.5); background:rgba(0,0,0,0.5);
line-height: 20px; line-height: 20px;
text-align: center; text-align: center;
color: #fff; color:#fff;
font-size: 12px; font-size: 12px;
} }
.HD_Kefang { .HD_Kefang{
display: inline-block; display: inline-block;
margin-left: 10px; margin-left:10px;
color: #555555; color:#555555;
font-size: 12px; font-size:12px;
width: 123px; width:123px;
} }
.HD_Kefang span { .HD_Kefang span{
display: block; display: block;
} }
.HD_Kefang span:first-child { .HD_Kefang span:first-child{
font-size: 16px; font-size: 16px;
color: #111111; color:#111111;
} }
.HD_fangxing_List ul li { .HD_fangxing_List ul li{
float: left; float:left;
font-size: 13px; font-size:13px;
margin-right: 40px; margin-right:40px;
display: flex; display: flex;
align-items: center; align-items: center;
height: 98px; height:98px;
} }
.HD_ComDiJia { .HD_ComDiJia{
position: absolute; position: absolute;
top: 0; top:0;
left: 0; left:0;
width: 66px; width:66px;
height: 20px; height:20px;
color: #fff; color:#fff;
font-size: 12px; font-size:12px;
text-align: center; text-align: center;
line-height: 20px; line-height: 20px;
border-bottom-right-radius: 12px; border-bottom-right-radius: 12px;
} }
.HD_Black { .HD_Black{
background-color: black; background-color: black;
} }
.HD_Green { .HD_Green{
background-color: green; background-color: green;
} }
.HD_OneLi { .HD_OneLi{
color: #888888; color:#888888;
width: 170px; width:170px;
margin-left: 20px; margin-left:20px;
font-size: 14px; font-size:14px;
} }
.HD_FreeWifi { .HD_FreeWifi{
color: #ee4454; color:#EE4454;
} }
.HD_Lingprice { .HD_Lingprice{
color: #999999; color:#999999;
} }
.HD_Lingprice i { .HD_Lingprice i{
font-style: normal; font-style: normal;
margin-right: 2px; margin-right:2px;
} }
.HD_Lingprice span { .HD_Lingprice span{
color: #ee4454; color:#EE4454;
font-size: 22px; font-size:22px;
} }
.HD_Lingprice > div:last-child { .HD_Lingprice>div:last-child{
margin-top: 3px; margin-top:3px;
} }
.HD_letfTD { .HD_letfTD{
width: 238px; width:238px;
vertical-align: top; vertical-align:top;
border-right: 1px solid #d1d1d1; border-right:1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1; border-bottom:1px solid #d1d1d1;
} }
.HD_LastShowMore { .HD_LastShowMore{
width: 941px; width:941px;
height: 23px; height:23px;
background-color: #dcdcdc; background-color: #DCDCDC;
text-align: right; text-align: right;
padding-right: 20px; padding-right:20px;
font-size: 12px; font-size:12px;
color: #999999; color:#999999;
line-height: 23px; line-height: 23px;
border-bottom: 1px solid #dcdcdc; border-bottom:1px solid #DCDCDC;
} }
.HD_LastShowMore span { .HD_LastShowMore span{
cursor: pointer; cursor: pointer;
} }
.HD_LastShowMore i { .HD_LastShowMore i{
font-size: 12px; font-size:12px;
} }
.HD_HotelInfo { .HD_HotelInfo{
width: 100%; width:100%
} }
.HD_fangxing tr td:last-child { .HD_fangxing tr td:last-child{
border-bottom: 1px solid #dcdcdc; border-bottom:1px solid #DCDCDC;
} }
.HD_hotelComIntroduce { .HD_hotelComIntroduce{
margin: auto; margin:auto;
width: 1160px; width:1160px;
height: auto; height:auto;
padding: 20px 0 10px 0; padding:20px 0 10px 0;
border-bottom: 1px solid #dcdcdc; border-bottom:1px solid #DCDCDC;
font-size: 12px; font-size:12px;
color: #111111; color:#111111;
} }
.HD_hotelComIntroduce span { .HD_hotelComIntroduce span{
display: inline-block; display:inline-block;
margin-bottom: 10px; margin-bottom:10px;
} }
.HD_inTitle { .HD_inTitle{
font-size: 14px; font-size:14px;
font-weight: bold; font-weight: bold;
color: #111111; color:#111111;
margin-bottom: 20px; margin-bottom:20px;
} }
.HD_ServiceList span { .HD_ServiceList span{
display: inline-block;
margin: 0 30px 10px 0;
}
.HD_ComLeftTitle {
display: inline-block; display: inline-block;
width: 110px; margin:0 30px 10px 0;
}
.HD_ComLeftTitle{
display:inline-block;
width:110px;
text-align: left; text-align: left;
color: #666666; color:#666666;
vertical-align: top; vertical-align: top;
} }
.HD_Card img { .HD_Card img{
margin-right: 10px; margin-right:10px;
} }
.Ht_PopList { .Ht_PopList{
width: 170px; width:170px;
float: left; float:left;
height: auto; height:auto;
border-right: 1px solid #e9e9e9; border-right:1px solid #E9E9E9;
margin: 0 20px 20px 0; margin:0 20px 20px 0;
} }
.Ht_PopList:last-child { .Ht_PopList:last-child{
border-right: 0; border-right:0;
margin-right: 0; margin-right:0;
} }
.Ht_PopList > div { .Ht_PopList>div{
width: 94px; width:94px;
height: 26px; height:26px;
border: 1px solid #ee4454; border:1px solid #EE4454;
color: #ee4454; color:#EE4454;
text-align: center; text-align: center;
line-height: 26px; line-height: 26px;
border-radius: 3px; border-radius:3px;
margin-bottom: 20px; margin-bottom:20px;
} }
.Ht_PopList .el-input__inner { .Ht_PopList .el-input__inner{
width: 54px; width:54px;
height: 22px; height:22px;
} }
.Ht_PopList .el-input__icon { .Ht_PopList .el-input__icon{
line-height: 0; line-height: 0;
} }
.Ht_PopList tr td { .Ht_PopList tr td{
height: 35px; height:35px;
} }
.HotelDetail .Ht_ul { .HotelDetail .Ht_ul{
width: 400px; width:400px;
display: inline-block; display: inline-block;
} }
.HotelDetail .Ht_ul li { .HotelDetail .Ht_ul li{
display: inline-block; display: inline-block;
font-size: 14px; font-size:14px;
color: #333333; color:#333333;
margin-right: 15px; margin-right:15px;
} }
.HotelDetail .Ht_ulName { .HotelDetail .Ht_ulName{
position: relative; position: relative;
top: -1px; top:-1px;
} }
.HotelDetail .Ht_ulDian { .HotelDetail .Ht_ulDian{
position: relative; position: relative;
top: -5px; top:-5px;
} }
.Ht_ul li img { .Ht_ul li img{
position: relative; position: relative;
top: 1px; top:1px;
} }
.HD_Top_Right_Star { .HD_Top_Right_Star{
width: 262px; width:262px;
height: 122px; height:122px;
padding: 0 20px; padding:0 20px;
border: 1px solid #dddddd; border:1px solid #DDDDDD;
} }
.HD_TOP_Map { .HD_TOP_Map{
width: 100%; width:100%;
height: 244px; height:244px;
margin-top: 27px; margin-top:27px;
border: 1px solid #dddddd; border:1px solid #DDDDDD;
} }
.HD_TopScore { .HD_TopScore{
height: 60px; height:60px;
width: 100%; width:100%;
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
border-bottom: 1px solid #dddddd; border-bottom:1px solid #DDDDDD;
} }
.HD_Score_right { .HD_Score_right{
position: absolute; position: absolute;
right: 0; right:0;
color: #111111 !important; color:#111111!important;
} }
.HD_TopScore span { .HD_TopScore span{
display: inline-block; display:inline-block;
font-size: 16px; font-size:16px;
color: #ee4454; color:#EE4454;
} }
.HD_ScoreS { .HD_ScoreS{
color: #ee4454; color:#EE4454;
font-size: 24px !important; font-size:24px!important;
} }
.HD_xing { .HD_xing{
margin-top: 20px; margin-top:20px;
text-align: center; text-align: center;
} }
.blackColor { .blackColor{
color: black; color:black;
} }
.HD_minNight { .HD_minNight{
position: absolute; position: absolute;
display: inline-block; display: inline-block;
bottom: 3px; bottom:3px;
left: 20px; left:20px;
border: 1px solid #44b276; border:1px solid #44B276;
color: #44b276; color:#44B276;
padding: 1px; padding:1px;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size:12px;
} }
.HD_date_input .el-input__inner { .HD_date_input .el-input__inner{
border-radius: 0; border-radius: 0;
} }
.HD_fangxing_List:last-child { .HD_fangxing_List:last-child{
border-bottom: 0; border-bottom:0;
} }
.Ht_ulName .el-input__icon { .Ht_ulName .el-input__icon{
line-height: 0; line-height: 0;
} }
.hotel-details-table { .hotel-details-table {
margin-top: 15px; margin-top: 15px;
border: 1px solid #dcdcdc; border: 1px solid #DCDCDC;
border-collapse: collapse; border-collapse: collapse;
width: 680px; width:680px;
} }
.hotel-details-table .td01 { .hotel-details-table .td01 {
padding: 3px 15px; padding: 3px 15px;
background: #f7f7f7; background: #F7F7F7;
width: 226px; width: 226px;
height: 19px; height: 19px;
text-align: center; text-align: center;
} }
.hotel-details-table .td02 { .hotel-details-table .td02 {
padding: 3px 15px; padding: 3px 15px;
background: #fafafa; background: #FAFAFA;
width: 69px; width: 69px;
height: 19px; height: 19px;
text-align: center; text-align: center;
} }
.hotel-details-table td { .hotel-details-table td {
width: 439px; width: 439px;
padding: 10px 20px; padding: 10px 20px;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
border: 1px solid #dcdcdc; border: 1px solid #DCDCDC;
font-size: 14px; font-size: 14px;
box-sizing: border-box; box-sizing: border-box;
} }
</style> </style>
<template> <template>
...@@ -511,7 +509,7 @@ ...@@ -511,7 +509,7 @@
<div class="HD_TopScore"> <div class="HD_TopScore">
<span>棒极了</span> <span>棒极了</span>
<span class="HD_Score_right"> <span class="HD_Score_right">
<span class="HD_ScoreS">{{hotelDetails.roomReviewRating}}</span>/5.0 <span class="HD_ScoreS" v-if="hotelDetails.roomReviewRating">{{hotelDetails.roomReviewRating}}</span>/5.0
</span> </span>
</div> </div>
<div class="HD_xing"> <div class="HD_xing">
...@@ -790,6 +788,7 @@ ...@@ -790,6 +788,7 @@
</div> </div>
</div> </div>
</div> </div>
<a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
</div> </div>
</template> </template>
<script> <script>
...@@ -798,6 +797,12 @@ import moment from "moment"; ...@@ -798,6 +797,12 @@ import moment from "moment";
export default { export default {
data() { data() {
return { return {
blankUrl: '',
images:[],
imageOptions:{
navbar:false,
title:false
},
//查询条件 //查询条件
msg: { msg: {
hotelId: "", hotelId: "",
...@@ -1317,21 +1322,22 @@ export default { ...@@ -1317,21 +1322,22 @@ export default {
return Math.ceil(price / this.JapanIncrease); return Math.ceil(price / this.JapanIncrease);
}, },
//点击预订传递参数 //点击预订传递参数
bookHotel(roomOptionCd) { bookHotel(roomOptionCd){
if ( if(sessionStorage.getItem('OpenB2BCode')==null && !localStorage.userInfo){
sessionStorage.getItem("OpenB2BCode") == null && return this.Error('请登录！')
!localStorage.userInfo
) {
return this.Error("请登录！");
} }
let msg = this.SimilarMsg; let msg = this.SimilarMsg;
msg.roomOptionCd = roomOptionCd; msg.roomOptionCd = roomOptionCd;
msg.imgUrl = this.hotelDetails.hotelImageUrl1; msg.imgUrl = this.hotelDetails.hotelImageUrl1;
sessionStorage.setItem("HotelSure", JSON.stringify(msg)); sessionStorage.setItem("HotelSure", JSON.stringify(msg));
let dom = document.querySelector("#blankLink")
let fullPath = `/HotelSure`;
dom.href=`http://${window.location.host}/#${fullPath}`
dom.click()
return
this.$router.push({ this.$router.push({
path: "/HotelSure" path:"/HotelSure"
}); })
} }
} }
}; };
......
src/components/Hotel/HotelList.vue
View file @ 3d1f110c
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
float:left; float:left;
width:199px; width:199px;
height:148px; height:148px;
background-position: 50%;
} }
.HL_ListImg img{ .HL_ListImg img{
width:100%; width:100%;
...@@ -363,6 +364,10 @@ ...@@ -363,6 +364,10 @@
.HL_Two .icon-img-rili{ .HL_Two .icon-img-rili{
margin-left:0!important; margin-left:0!important;
} }
.HL_TitleSpan:hover{
text-decoration: underline;
cursor: pointer;
}
</style> </style>
<template> <template>
...@@ -575,12 +580,12 @@ ...@@ -575,12 +580,12 @@
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td> <td>
<div class="clearfix"> <div class="clearfix">
<div class="HL_ListImg"> <div class="HL_ListImg" :style="`background-image: url(${item.hotelImageUrl})`">
<img :src="item.hotelImageUrl" alt=""/> <!-- <img :src="item.hotelImageUrl" alt=""/> -->
</div> </div>
<div class="HL_ListContent"> <div class="HL_ListContent">
<div class="HL_ListTitle"> <div class="HL_ListTitle">
{{item.hotelName}} <span class="HL_TitleSpan" @click="goHotelDetail(item,'HotelDetail')">{{item.hotelName}}</span>
<span v-if="item.reviewRating"> <span v-if="item.reviewRating">
<el-rate <el-rate
v-model="item.reviewRating" v-model="item.reviewRating"
...@@ -608,7 +613,7 @@ ...@@ -608,7 +613,7 @@
<div class="HL_ListPrice"> <div class="HL_ListPrice">
<span><label>¥</label>{{getPrice(item.lowrateBySetCurrency)}}</span>起 <span><label>¥</label>{{getPrice(item.lowrateBySetCurrency)}}</span>起
</div> </div>
<input type="button" class="HL_ListBtn" @click="goHotelDetail(item)" value="查看详情"/> <input type="button" class="HL_ListBtn" @click="goHotelDetail(item,'HotelDetail')" value="查看详情"/>
</div> </div>
</div> </div>
</td> </td>
...@@ -1088,7 +1093,7 @@ export default { ...@@ -1088,7 +1093,7 @@ export default {
this.SearchHotel(); this.SearchHotel();
}, },
//跳转详情 //跳转详情
goHotelDetail(item){ goHotelDetail(item,path){
this.PassMsg.hotelId = item.hotelId, this.PassMsg.hotelId = item.hotelId,
this.PassMsg.arrivalDate=this.msg.arrivalDate; this.PassMsg.arrivalDate=this.msg.arrivalDate;
this.PassMsg.departureDate = this.msg.departureDate; this.PassMsg.departureDate = this.msg.departureDate;
...@@ -1098,9 +1103,13 @@ export default { ...@@ -1098,9 +1103,13 @@ export default {
this.PassMsg.room = this.room this.PassMsg.room = this.room
this.PassMsg.auditNum = this.auditNum; this.PassMsg.auditNum = this.auditNum;
sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg)); sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg));
this.$router.push({ // this.$router.push({
path:"/HotelDetail" // path:"/HotelDetail"
}) // })
let routeData = this.$router.resolve({
name: path,
});
window.open(routeData.href, "_blank");
}, },
//主题特色 //主题特色
getTravelFeature(feature){ getTravelFeature(feature){
......
src/components/Hotel/HotelSure.vue
View file @ 3d1f110c
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
<li style="width:680px;"> <li style="width:680px;">
<div class="HS_fangfei" v-for="subItem in item.rateGroup"> <div class="HS_fangfei" v-for="subItem in item.rateGroup">
<div class="HS_fangfei_Top">{{subItem.stayDate}}</div> <div class="HS_fangfei_Top">{{subItem.stayDate}}</div>
<div v-if="subItem.perAdultRateBySetCurrency">¥<span>{{subItem.perAdultRateBySetCurrency}}</span></div> <div v-if="subItem.perAdultRateBySetCurrency">¥<span>{{subItem.perAdultRateBySetCurrency}}/人</span></div>
</div> </div>
</li> </li>
</ul> </ul>
...@@ -492,19 +492,19 @@ ...@@ -492,19 +492,19 @@
<li class="HS2_title">房间{{item.roomCount}}</li> <li class="HS2_title">房间{{item.roomCount}}</li>
<li style="margin-left:20px;">成人男</li> <li style="margin-left:20px;">成人男</li>
<li> <li>
<el-select style="width:90px" v-model="item.roomMaleCount" :disabled="item.isShowMale" clearable placeholder="成人男"> <el-select style="width:90px" v-model="item.roomMaleCount" :disabled="item.isShowMale" placeholder="成人男">
<el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option> <el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option>
</el-select> </el-select>
</li> </li>
<li>成人女</li> <li>成人女</li>
<li> <li>
<el-select style="width:90px" v-model="item.roomFemaleCount" :disabled="item.isShowFemale" clearable placeholder="成人女"> <el-select style="width:90px" v-model="item.roomFemaleCount" :disabled="item.isShowFemale" placeholder="成人女">
<el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option> <el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option>
</el-select> </el-select>
</li> </li>
<li>儿童数</li> <li>儿童数</li>
<li> <li>
<el-select style="width:90px" v-model="item.roomChildCount" :disabled="item.isShowChild" clearable placeholder="儿童"> <el-select style="width:90px" v-model="item.roomChildCount" :disabled="item.isShowChild" placeholder="儿童">
<el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option> <el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option>
</el-select> </el-select>
</li> </li>
...@@ -889,20 +889,20 @@ export default { ...@@ -889,20 +889,20 @@ export default {
} }
} }
}) })
// AdultCount+=AdultTotalPrice*x.roomAdultCount; AdultCount+=AdultTotalPrice*x.roomAdultCount;
// childCount+=childToTalPrice*x.roomChildCount; childCount+=childToTalPrice*x.roomChildCount;
AdultCount+=AdultTotalPrice; // AdultCount+=AdultTotalPrice;
childCount+=childToTalPrice; // childCount+=childToTalPrice;
oldAount+=oldAuditPrice; oldAount+=oldAuditPrice;
childAount+=childAount; childAount+=childAount;
this.sureMsg.totalChargeableRateInfo += parseFloat(AdultCount+childCount); this.sureMsg.totalChargeableRateInfo += parseFloat(AdultCount+childCount);
this.sureMsg.OldTotalPrice+=parseFloat(oldAount+childAount); this.sureMsg.OldTotalPrice+=parseFloat(oldAount+childAount);
// AdultJapanCount+=AdultJapanPrice*x.roomAdultCount; AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
// childJapanCount+=ChildJapanPrice*x.roomChildCount; childJapanCount+=ChildJapanPrice*x.roomChildCount;
AdultJapanCount+=AdultJapanPrice; // AdultJapanCount+=AdultJapanPrice;
childJapanCount+=ChildJapanPrice; // childJapanCount+=ChildJapanPrice;
this.sureMsg.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount); this.sureMsg.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount);
}) })
......
src/components/newPersonalCenter/block/model/HotelOrder.vue
View file @ 3d1f110c
...@@ -166,6 +166,8 @@ export default { ...@@ -166,6 +166,8 @@ export default {
this.totalCount = res.data.data.pageCount; this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count; this.Count = res.data.data.count;
this.orderLoading = false; this.orderLoading = false;
console.log(res,'resss');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/newPersonalCenter/block/model/OrderInfoModel/FreeTable.vue
View file @ 3d1f110c
...@@ -56,6 +56,11 @@ ...@@ -56,6 +56,11 @@
background-color: gray; background-color: gray;
margin-right: 10px; margin-right: 10px;
display: inline-block; display: inline-block;
overflow: hidden;
}
.freetable tbody .info .tc_info ._left img{
height: 100%;
width: auto;
} }
.orderTable tbody .info .tc_info ._right{ .orderTable tbody .info .tc_info ._right{
color: #666666; color: #666666;
...@@ -159,7 +164,7 @@ ...@@ -159,7 +164,7 @@
</style> </style>
<template> <template>
<el-row> <el-row>
<table class="orderTable" border="0" cellspacing="0" cellpadding="0"> <table class="freetable orderTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<th width="328px"> <th width="328px">
...@@ -357,14 +362,14 @@ export default { ...@@ -357,14 +362,14 @@ export default {
Exit(item){ Exit(item){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.dialogFormVisible=true; this.dialogFormVisible=true;
this.exitMsg.order_no=item.ThirdOrderNo; this.exitMsg.order_no=item.OrderID;
this.exitMsg.CancelBy=userInfo.name; this.exitMsg.CancelBy=userInfo.name;
}, },
gopayInfo(item){ gopayInfo(item){
this.$router.push({ this.$router.push({
name: "payInfo", name: "payInfo",
query: { query: {
ThirdOrderNo:item.ThirdOrderNo, OrderID:item.OrderID,
} }
}); });
......
src/components/taskPage/JuanList.vue
View file @ 3d1f110c
...@@ -169,10 +169,12 @@ ...@@ -169,10 +169,12 @@
.juanList .MoreDiv .moreItem .dataImg{ .juanList .MoreDiv .moreItem .dataImg{
width:100%; width:100%;
height:100%; height:100%;
background-size:cover;
overflow: hidden;
} }
.juanList .MoreDiv .moreItem .dataImg img{ .juanList .MoreDiv .moreItem .dataImg img{
width:100%; width:100%;
height:100%; min-height:100%;
} }
.juanList .MoreDiv .moreItem .noneData{ .juanList .MoreDiv .moreItem .noneData{
background:rgba(224,224,224,1); background:rgba(224,224,224,1);
...@@ -319,6 +321,12 @@ ...@@ -319,6 +321,12 @@
background: rgba(255,255,255,0.2); background: rgba(255,255,255,0.2);
/* margin-bottom:10px; */ /* margin-bottom:10px; */
} }
.juanList .topImg{
width:100%;
height: 100%;
background-position: 50%;
/* background-size: cover; */
}
</style> </style>
<template> <template>
<div @click="getRef($event,1)" :data-self="0" class="juan juanList commonF"> <div @click="getRef($event,1)" :data-self="0" class="juan juanList commonF">
...@@ -372,7 +380,8 @@ ...@@ -372,7 +380,8 @@
<p v-show="TOPlist.length>0" class="f30 pfR" style="">探索<span style="color:#EE4454">. 热门体验</span></p> <p v-show="TOPlist.length>0" class="f30 pfR" style="">探索<span style="color:#EE4454">. 热门体验</span></p>
<div class="hotCity"> <div class="hotCity">
<div v-for="(item,index) in TOPlist" @click="Gourl(item)" :key="index" @mouseenter="mouseOver(index)" class="cityItem" :class="HoverIndex==index?'cityItemBig':''"> <div v-for="(item,index) in TOPlist" @click="Gourl(item)" :key="index" @mouseenter="mouseOver(index)" class="cityItem" :class="HoverIndex==index?'cityItemBig':''">
<img :src="item.imgs" :onerror="defaultImg" alt=""> <!-- <img :src="item.imgs" :onerror="defaultImg" alt=""> -->
<div class="topImg" :style="`background-image: url(${item.imgs})`"></div>
<p v-show="HoverIndex!=index" class="name text1">{{item.title}}</p> <p v-show="HoverIndex!=index" class="name text1">{{item.title}}</p>
<div v-show="HoverIndex==index" class="CityHover"> <div v-show="HoverIndex==index" class="CityHover">
<p class="f26 pfR text1">{{item.title}}</p> <p class="f26 pfR text1">{{item.title}}</p>
...@@ -387,7 +396,8 @@ ...@@ -387,7 +396,8 @@
<div v-loading="dataloading" v-show='dataList.length!=0' id="MoreDiv" ref="MoreDiv" class="MoreDiv"> <div v-loading="dataloading" v-show='dataList.length!=0' id="MoreDiv" ref="MoreDiv" class="MoreDiv">
<div @click="Gourl(item)" v-for="(item,index) in dataList" :key="index" class="moreItem"> <div @click="Gourl(item)" v-for="(item,index) in dataList" :key="index" class="moreItem">
<div class="itemImg"> <div class="itemImg">
<div class="dataImg" v-if="item.imgs&&item.imgs!=''"> <!-- :style="{background:'url(' + item.imgs + ') no-repeat center center'}" -->
<div class="dataImg" v-if="item.imgs&&item.imgs!=''" >
<img :src="item.imgs" :onerror="defaultImg" alt=""> <img :src="item.imgs" :onerror="defaultImg" alt="">
</div> </div>
<div v-else class="noneData"> <div v-else class="noneData">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment