Skip to content

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

修改

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