Commit 8663fb0c authored by 黄媛媛's avatar 黄媛媛

修改

parent 03065c12
...@@ -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=>{
// //
......
...@@ -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)
} }
} }
......
...@@ -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();
...@@ -294,7 +294,7 @@ export default { ...@@ -294,7 +294,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;
......
...@@ -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,
} }
}); });
......
...@@ -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