Skip to content

S
SuperMan
Commit 6211b39a authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 850528be
Show whitespace changes
Inline Side-by-side
Showing with 265 additions and 4 deletions
src/components/commonPage/newTripCommon.vue
View file @ 6211b39a
......@@ -11,6 +11,77 @@
width:100%;
height:100%;
}
.threeTripLeft{
float:left;
width:60%;
height:600px;
}
.threeTripLeft img{
width:100%;
height:100%;
}
.threeTripRight{
float:right;
width:39%;
}
.threeRightTop{
width:100%;
height:230px;
}
.threeRightBtm{
width:100%;
height:359px;
margin-top:10px;
}
.threeRightTop img,.threeRightBtm img{
width:100%;
height:100%;
}
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
.fourTripTop{
width:100%;
height:450px;
}
.fourTripImg img{
width:100%;
height:100%;
}
.fourBtmOne{
width:32%;
float:left;
margin-top:11px;
height:260px;
margin-right:11px;
}
.fourBtmOne:nth-child(2){
width:34%;
}
.fourBtmOne:last-child{
margin-right:0;
}
.fiveTripLeft{
float:left;
width:35%;
height:530px;
}
.fiveRight{
float:right;
width:64%;
}
.fiveTripImg img{
width:100%;
height:100%;
}
.fiveRightItem{
display: inline-block;
width:49%;
margin-right:4px;
height:260px;
margin-bottom:10px;
}
.fiveRightItem:nth-child(2){
margin-right:0;
}
</style>
<template>
<div class="newTripImgContent">
......@@ -21,10 +92,58 @@
<div class="newTripHalfImg">
<img :src="day[0].img" alt="">
</div>
<div class="newTripHalfImg">
<div class="newTripHalfImg" style="margin-left:5px;">
<img :src="day[1].img" alt="">
</div>
</div>
<div class="threeTripImg clearfix" v-if="day.length==3">
<div class="threeTripLeft">
<img :src="day[0].img" alt=""/>
</div>
<div class="threeTripRight">
<div class="threeRightTop">
<img :src="day[1].img" alt=""/>
</div>
<div class="threeRightBtm">
<img :src="day[2].img" alt=""/>
</div>
</div>
</div>
<div class="fourTripImg" v-if="day.length==4">
<div class="fourTripTop">
<img :src="day[0].img" alt=""/>
</div>
<div class="fourBtmContent clearfix">
<div class="fourBtmOne">
<img :src="day[1].img" alt=""/>
</div>
<div class="fourBtmOne">
<img :src="day[2].img" alt=""/>
</div>
<div class="fourBtmOne">
<img :src="day[3].img" alt=""/>
</div>
</div>
</div>
<div class="fiveTripImg clearfix" v-if="day.length==5">
<div class="fiveTripLeft">
<img :src="day[0].img" alt=""/>
</div>
<div class="fiveRight">
<div class="fiveRightItem">
<img :src="day[1].img" alt=""/>
</div>
<div class="fiveRightItem">
<img :src="day[2].img" alt=""/>
</div>
<div class="fiveRightItem">
<img :src="day[3].img" alt=""/>
</div>
<div class="fiveRightItem">
<img :src="day[4].img" alt=""/>
</div>
</div>
</div>
</div>
</template>
<script>
......
src/components/newConfimationOrder.vue
View file @ 6211b39a
......@@ -89,6 +89,52 @@
.newTripImgList{
width:100%;
}
.newTripFeiyong{
width:100%;
height:100%;
}
.newTripFeiyongtitle{
text-align: center;
font-size: 18px;
color: #333;
padding-top: 30px;
padding-bottom: 30px;
}
.newTripLine{
width: 32px;
height: 2px;
background: #e73e6d;
margin: 12px auto;
}
.newTripEnglish{
font-family: arial;
font-size: 12px;
color: #ccc;
}
.newTripExpense{
margin:0 auto;
width:100%;
}
.newTripleft{
display: inline-block;
text-align: left;
font-size: 18px;
font-family: Arial;
vertical-align: top;
margin-bottom: 15px;
}
.newTripRight{
width: 100%;
overflow: hidden;
font-size: 14px;
line-height: 25px;
color: #000000;
vertical-align: top;
font-family: '微软雅黑';
}
.newTripFeiyongtitle h2{
font-size:18px;
}
</style>
<template>
<div class="newTrip_Main">
......@@ -106,9 +152,7 @@
<div><span class="newtripComTitle">返回日期：</span>{{orderMsg.endDate}}</div>
<div><span class="newtripComTitle">行程天数：</span>{{orderMsg.dayNum}}</div>
</div>
<div class="newFeature" v-html="feature.featureHtml">
</div>
<div class="newFeature" v-html="feature.featureHtml"></div>
<div class="newtripList" v-for="(item,index) in tripList" :key="index">
<div class="newTripFly">DAY {{item.dayNum}}</div>
<div class="newTripDateTime">{{item.dateTime}}</div>
......@@ -155,6 +199,104 @@
</div>
</div>
</div>
<div class="newTripFeiyong">
<div>
<div class="newTripFeiyongtitle">
<h2>费用</h2>
<div class="newTripLine"></div>
<div class="newTripEnglish">Expense</div>
</div>
<div class="newTripExpense">
<div class="newTripleft">费用包含</div>
<div class="newTripRight">
<div v-html="feature.feeInclude"></div>
</div>
<div class="newTripleft" style="margin: 15px 0 15px 0;">费用不包含</div>
<div class="newTripRight">
<div v-html="feature.feeNonInclude"></div>
</div>
</div>
<div class="newTripFeiyongtitle">
<h2>购物说明</h2>
<div class="newTripLine"></div>
<div class="newTripEnglish">Expense</div>
</div>
<div class="newTripExpense">
<div class="newTripleft">
<!-- 购物协议 -->
</div>
<div class="newTripRight">
<div v-html="feature.shopRemark"></div>
</div>
</div>
</div>
<div>
<div class="newTripFeiyongtitle">
<h2>订单须知</h2>
<div class="newTripLine"></div>
<div class="newTripEnglish">Tips</div>
</div>
<div class="newTripExpense" v-if="feature.importantTip!=''">
<div class="newTripleft">重要提示</div>
<div class="newTripRight">
<div v-html="feature.importantTip"></div>
</div>
</div>
<div class="newTripExpense">
<div class="newTripleft">温馨提示</div>
<div class="newTripRight">
<div v-html="feature.warmTip"></div>
</div>
</div>
</div>
<div>
<div class="newTripFeiyongtitle">
<h2>签证</h2>
<div class="newTripLine"></div>
<div class="newTripEnglish">Visa</div>
</div>
<div class="newTripExpense">
<div class="newTripleft">签证须知</div>
<div class="newTripRight">
<div v-html="feature.visaRemark"></div>
</div>
</div>
<div class="newTripFeiyongtitle">
<h2>同行备注</h2>
<div class="newTripLine"></div>
<div class="newTripEnglish">Remark</div>
</div>
<div class="newTripExpense">
<div class="newTripleft"></div>
<div class="newTripRight">
<div v-html="feature.b2BRemark"></div>
</div>
</div>
<div class="newTripFeiyongtitle">
<h2>旅客信息</h2>
<div class="newTripLine"></div>
<div class="newTripEnglish">Passenger information</div>
</div>
<table class="Passenger-table" border="0" cellspacing="2" cellpadding="2">
<tr>
<td width="16.6%" class="thClass">姓名</td>
<td width="16.6%" class="thClass">英文姓名</td>
<td width="16.6%" class="thClass">性别</td>
<td width="16.6%" class="thClass">护照号</td>
<td width="16.6%" class="thClass">有效期</td>
<td width="16.6%" class="thClass">联系电话</td>
</tr>
<tr v-for="(item,i) in orderMsg.guestList" :key="i">
<td>{{item.name}}</td>
<td>{{item.eName}}</td>
<td>{{item.sex}}</td>
<td>{{item.passportNo}}</td>
<td>{{item.passportExpiry}}</td>
<td>{{item.mobilePhone}}</td>
</tr>
</table>
</div>
</div>
<div class="newTripCom_Img">
<img :src="lineTripFeatureBottomBg" alt=""/>
</div>
......
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