Skip to content

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

修改

parents 2cb102f0 2d24af82
Expand all 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
This diff is collapsed.
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