Skip to content

S
SuperMan
Commit 9645855c authored by zhengke's avatar zhengke
Browse files
Options

修改样式

parent 4c609355
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 18 deletions
src/components/SalesconfirmationOrder.vue
View file @ 9645855c
......@@ -16,6 +16,20 @@
color:#999;
font-size:12px;
}
.timeline-item .Arrayleft{
width: 51px;
height: 25px;
background-color: #fff;
margin-right: 20px;
text-align: center;
font-size: 12px;
padding: 5px 0;
}
.timeline-item .Arrayleft i{
position: relative;
left:-4px;
top:-4px;
}
</style>
<template>
......@@ -279,10 +293,16 @@
<!-- <traffice :tripItem='son' v-if="son.type==1"></traffice> -->
<template v-if="son.type==1">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-feiji"></i>
<div class="Arrayleft">
<!-- <i class="iconfont icon-feiji"></i> -->
<!-- <span v-if="dns.startTime!=''" style="margin-right:20px;">{{dns.startTime}} </span><span v-if="dns.endTime!=''">-{{dns.endTime}}</span> -->
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
<span v-if="dns.startTime!=''" style="margin-right:20px;">{{dns.startTime}} </span><span v-if="dns.endTime!=''">-{{dns.endTime}}</span>
</span>
</div>
<div class="new_right">
<span class="time" v-if="dataList.trafficList[0].airportPickUp==1">接早</span>
<span class="time" v-if="dataList.trafficList[0].airportPickUp==2">送机</span>
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
......@@ -294,9 +314,9 @@
<i v-if="dns.arrivalType==3" class="iconfont icon-icon31"></i>
<i v-if="dns.arrivalType==4" class="iconfont icon-gaotiedongche"></i>
<span v-if="o+1==son.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
<div class="commonTimeStr" style="margin-top:5px;">
<!-- <div class="commonTimeStr" style="margin-top:5px;">
<span v-if="dns.startTime!=''" style="margin-right:20px;">出发时间:{{dns.startTime}} </span><span v-if="dns.endTime!=''">到达时间{{dns.endTime}}</span>
</div>
</div> -->
</span>
</span>
<span class="content" v-html="son.childItem.description"></span>
......@@ -306,13 +326,13 @@
<template v-if="son.type==2">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-zuji"></i>
<div class="Arrayleft">
<!-- <i class="iconfont icon-zuji"></i> -->
<template v-if="son.childItem.timeStr!=''">
{{son.childItem.timeStr}}
</template>
</div>
<div class="new_right">
<div class="commonTimeStr" v-if="son.childItem.timeStr!=''">
预计到达时间：{{son.childItem.timeStr}}
</div>
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
......@@ -335,7 +355,7 @@
<template v-if="son.type==3">
<div class="timeline-item">
<div class="left">
<div class="Arrayleft">
<i class="iconfont icon-jiudian"></i>
</div>
<div class="new_right">
......@@ -356,13 +376,16 @@
</template>
<template v-if="son.type==4">
<div class="timeline-item">
<div class="left">
<i class="iconfont icon-yongcan"></i>
<div class="Arrayleft">
<!-- <i class="iconfont icon-yongcan"></i> -->
<span v-if="son.childItem.timeStr!=''">
{{son.childItem.timeStr}}
</span>
</div>
<div class="new_right">
<div class="commonTimeStr" v-if="son.childItem.timeStr!=''">
<!-- <div class="commonTimeStr" v-if="son.childItem.timeStr!=''">
预计到达时间：{{son.childItem.timeStr}}
</div>
</div> -->
<span class="time" v-if="son.childItem.timeType==1">上午</span>
<span class="time" v-if="son.childItem.timeType==2">下午</span>
<span class="time" v-if="son.childItem.timeType==0">全天</span>
......@@ -370,8 +393,8 @@
{{son.childItem.dinnerName+son.childItem.mealName}}
</span>
<div class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span
v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span
v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></div>
v-if="son.childItem.useTimeHour!=null&&son.childItem.useTimeHour!=''">{{son.childItem.useTimeHour+'小时'}}</span><span
v-if="son.childItem.useTimeMinutes!=null&&son.childItem.useTimeMinutes!=''">{{son.childItem.useTimeMinutes+'分钟'}}</span></div>
<div class="content" v-html="son.childItem.description"></div>
<div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
<div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
......@@ -383,7 +406,7 @@
</template>
<template v-if="son.type==5">
<div class="timeline-item">
<div class="left">
<div class="Arrayleft">
<i class="iconfont icon-huodong"></i>
</div>
<div class="new_right">
......@@ -396,7 +419,7 @@
</template>
<template v-if="son.type==6">
<div class="timeline-item">
<div class="left">
<div class="Arrayleft">
<i class="iconfont icon-tishi"></i>
</div>
<div class="new_right">
......@@ -1050,6 +1073,7 @@
isClick:1//不算统计
}, res => {
if (res.data.resultCode == 1) {
console.log(JSON.parse(JSON.stringify(res)),'rereere');
let data = (res.data.data);
this.orderTripdiff = data.orderTripdiff;
this.orderMsg = data.orderMsg;
......@@ -1369,6 +1393,8 @@
x.islast = (j + 1) == this.tripList.length
this.$set(this.tripList, j, x)
x.dateTime = this.setDate(j);
console.log(this.dataList,'datalist');
})
},
......
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