Commit 3fcf5904 authored by huangyuanyuan's avatar huangyuanyuan

添加自由行订单

parent 15f87ec7
...@@ -53,12 +53,69 @@ ...@@ -53,12 +53,69 @@
padding: 5px 0; padding: 5px 0;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
font-weight: bold;
float: right; float: right;
font-family: "PingFangR"
} }
.Home .Home_top .tag_right .el-form-item__label { .Home .Home_top .tag_right .el-form-item__label {
color: #666666; color: #666666;
} }
/* 选择条件部分 */
.Home .Home_top .tag_right .chooseticketul li{
display: inline-block;
width:182px;
height:32px;
line-height: 32px;
border:1px solid rgba(216,218,220,1);
margin-bottom:10px;
}
.Home .Home_top .tag_right .chooseticketul li span:nth-child(1){
padding-left: 10px;
color:#666666;
}
.Home .Home_top .tag_right .chooseticketul li span .el-input{
width:98px!important;
position: relative;
}
.Home .Home_top .tag_right .chooseticketul li .el-input__prefix{
right: 5px;
width: 20px;
}
.Home .Home_top .tag_right .chooseticketul .el-input__inner{
border:none;
line-height: 30px;
background: transparent;
padding: 0;
}
.Home .Home_top .tag_right .visaul_li{
width:100%;
height:32px;
border:1px solid rgba(216,218,220,1);
line-height: 32px;
box-sizing: border-box;
}
.Home .Home_top .tag_right .visaul_li li{
float: left;
position: relative;
}
.Home .Home_top .tag_right .visaul_li li:nth-child(1){
padding-left: 10px;
color:#666666;
}
.Home .Home_top .tag_right .visaul_li li .el-input__inner{
border:none;
line-height: 30px;
background: transparent;
padding: 0;
}
.Home .Home_top .tag_right .visaul_li li .el-date-editor.el-input, .el-date-editor.el-input__inner {
width: 100px!important;
position: relative;
}
.Home .Home_top .tag_right .visaul_li li .el-input__prefix{
right:0px;
}
.Home .el-input__inner { .Home .el-input__inner {
border-radius: 0px; border-radius: 0px;
} }
...@@ -66,6 +123,9 @@ ...@@ -66,6 +123,9 @@
font-size: 20px; font-size: 20px;
color: #ababab; color: #ababab;
} }
.Home ul, .Home ul,
p { p {
padding: 0; padding: 0;
......
...@@ -159,7 +159,10 @@ ...@@ -159,7 +159,10 @@
<div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100"> <div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100">
<div style="padding-left:36px;margin-bottom:30px;"> <div style="padding-left:36px;margin-bottom:30px;">
<span class="dayindex">D{{item.dayNum}}</span> <span class="dayindex">D{{item.dayNum}}</span>
<span v-if="item.title.childItem.title" class="daytitle">{{item.title.childItem.title}}</span> <span v-if="item.title.childItem">
<span :class="item.title.childItem.title?'daytitle':''">{{item.title.childItem.title}}</span>
</span>
</div> </div>
<div class="common_left"> <div class="common_left">
<!-- 交通 --> <!-- 交通 -->
...@@ -182,7 +185,7 @@ ...@@ -182,7 +185,7 @@
<span>{{tra.arrivalCityName}}</span> <span>{{tra.arrivalCityName}}</span>
</span> </span>
<div style="font-size:14px;margin-top:20px"> <div style="font-size:14px;margin-top:20px">
<span style="color:#5F95E8;margin-left:5px">{{traff.childItem.descriptionText}}</span> <span>{{traff.childItem.descriptionText}}</span>
</div> </div>
...@@ -413,6 +416,7 @@ export default { ...@@ -413,6 +416,7 @@ export default {
} }
}) })
}); });
console.log("this.datades",this.datades)
}else{} }else{}
},err=>{}) },err=>{})
}, },
......
...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
<div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100"> <div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100">
<div style="padding-left:36px;margin-bottom:30px;"> <div style="padding-left:36px;margin-bottom:30px;">
<span class="dayindex">D{{item.dayNum}}</span> <span class="dayindex">D{{item.dayNum}}</span>
<span class="daytitle">{{item.title.childItem.title}}</span> <span v-if="item.title.childItem">
<span :class="item.title.childItem.title?'daytitle':''">{{item.title.childItem.title}}</span>
</span>
</div> </div>
<div class="common_left"> <div class="common_left">
<!-- 交通 --> <!-- 交通 -->
...@@ -72,7 +74,7 @@ ...@@ -72,7 +74,7 @@
<span>{{tra.arrivalCityName}}</span> <span>{{tra.arrivalCityName}}</span>
</span> </span>
<div style="font-size:14px;margin-top:20px"> <div style="font-size:14px;margin-top:20px">
<span style="color:#5F95E8;margin-left:5px">{{traff.childItem.descriptionText}}</span> <span>{{traff.childItem.descriptionText}}</span>
</div> </div>
......
This diff is collapsed.
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
<div> <div>
<!-- 团订单 --> <!-- 团订单 -->
<TcOrder v-if="data === '8-1'"/> <TcOrder v-if="data === '8-1'"/>
<!-- 自由行订单 -->
<TzOrder v-if="data === '8-2'"/>
<!-- 定制游订单 --> <!-- 定制游订单 -->
<TdOrder v-if="data === '8-2'"/> <TdOrder v-if="data === '8-7'"/>
<!-- 机票订单 --> <!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/> <TkOrder v-if="data === '8-5'"/>
</div> </div>
...@@ -16,6 +18,7 @@ ...@@ -16,6 +18,7 @@
<script> <script>
import TcOrder from './model/TcOrder' import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder' import TdOrder from './model/TdOrder'
import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder' import TkOrder from './model/TkOrder'
export default { export default {
props:{ props:{
...@@ -25,6 +28,7 @@ export default { ...@@ -25,6 +28,7 @@ export default {
TcOrder: TcOrder, TcOrder: TcOrder,
TdOrder: TdOrder, TdOrder: TdOrder,
TkOrder: TkOrder, TkOrder: TkOrder,
TzOrder: TzOrder,
}, },
data() { data() {
return { return {
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
getOrderMsg: { getOrderMsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
orderType: 2, orderType: 7,
queryDays: 0, queryDays: 0,
orderState: -1, orderState: -1,
CustomerId: "" CustomerId: ""
......
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
<span>订单中心</span> <span>订单中心</span>
</template> </template>
<el-menu-item index="8-1" @click="clickMenu('8-1')">跟团游订单</el-menu-item> <el-menu-item index="8-1" @click="clickMenu('8-1')">跟团游订单</el-menu-item>
<el-menu-item index="8-2" @click="clickMenu('8-2')">定制游订单</el-menu-item> <el-menu-item index="8-2" @click="clickMenu('8-2')">自由行订单</el-menu-item>
<el-menu-item index="8-7" @click="clickMenu('8-7')">定制游订单</el-menu-item>
<el-menu-item index="8-3" @click="clickMenu('8-3')">当地游订单</el-menu-item> <el-menu-item index="8-3" @click="clickMenu('8-3')">当地游订单</el-menu-item>
<el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item> <el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item>
<el-menu-item index="8-5" @click="clickMenu('8-5')">机票订单</el-menu-item> <el-menu-item index="8-5" @click="clickMenu('8-5')">机票订单</el-menu-item>
......
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