Skip to content

A
Athena
Commit 3fcf5904 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

添加自由行订单

parent 15f87ec7
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 26 deletions
src/assets/css/home.css
View file @ 3fcf5904
...@@ -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;
......
src/components/DependentTravel/CustomizedTourism.vue
View file @ 3fcf5904
...@@ -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=>{})
}, },
......
src/components/DependentTravel/DesignScheme.vue
View file @ 3fcf5904
...@@ -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>
......
src/components/Home.vue
View file @ 3fcf5904
...@@ -40,10 +40,17 @@ ...@@ -40,10 +40,17 @@
<!-- 签证 --> <!-- 签证 -->
<div style="width:394px" v-show="tag=='visa'" class="visa"> <div style="width:394px" v-show="tag=='visa'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px"> <el-form ref="visa_form" :model="visa_form" label-width="90px">
<el-form-item label="国家/地区" style="margin-bottom:10px"> <!-- <el-form-item label="国家/地区" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input> <el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
</el-form-item> </el-form-item> -->
<div style="overflow:auto"> <ul class="visaul_li">
<li>国家/地区</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
</li>
</ul>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span> <span class="form_btn">立即搜索</span>
</div> </div>
...@@ -63,10 +70,11 @@ ...@@ -63,10 +70,11 @@
</el-form> </el-form>
</div> </div>
<!-- 机票 --> <!-- 机票 -->
<div style="width:394px" v-show="tag=='ticket'" class="ticket"> <div style="width:394px;margin-top: -15px;" v-show="tag=='ticket'" class="ticket">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="国际机票" name="first"> <el-tab-pane label="国际机票" name="first">
<el-form ref="ticket_form" :model="ticket_form" label-width="70px">
<!-- <el-form ref="ticket_form" :model="ticket_form" label-width="70px">
<p style="margin-bottom:5px"> <p style="margin-bottom:5px">
<el-radio v-model="ticket_form.radio" label="1">单程</el-radio> <el-radio v-model="ticket_form.radio" label="1">单程</el-radio>
<el-radio v-model="ticket_form.radio" label="2">往返</el-radio> <el-radio v-model="ticket_form.radio" label="2">往返</el-radio>
...@@ -74,14 +82,14 @@ ...@@ -74,14 +82,14 @@
<el-form-item label="出发地"> <el-form-item label="出发地">
<el-input size="small" v-model="ticket_form.name" placeholder="出发地"></el-input> <el-input size="small" v-model="ticket_form.name" placeholder="出发地"></el-input>
</el-form-item> </el-form-item>
<span style=";margin-left:12px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span> <span style=";margin-left:5px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<el-form-item label="目的地"> <el-form-item label="目的地" style="margin-left:5px;">
<el-input size="small" v-model="ticket_form.name" placeholder="目的地"></el-input> <el-input size="small" v-model="ticket_form.name" placeholder="目的地"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出发日期"> <el-form-item label="出发日期">
<el-input size="small" v-model="ticket_form.name" placeholder="出发日期"></el-input> <el-input size="small" v-model="ticket_form.name" placeholder="出发日期"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-left:32px;" label="返回日期"> <el-form-item style="margin-left:30px;" label="返回日期">
<el-input size="small" v-model="ticket_form.name" placeholder="返回日期"></el-input> <el-input size="small" v-model="ticket_form.name" placeholder="返回日期"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="成人"> <el-form-item label="成人">
...@@ -94,7 +102,7 @@ ...@@ -94,7 +102,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="儿童" style="margin-left:32px;"> <el-form-item label="儿童" style="margin-left:30px;">
<el-select size="small" v-model="ticket_form.value" placeholder="请选择"> <el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-option <el-option
v-for="item in person" v-for="item in person"
...@@ -105,17 +113,97 @@ ...@@ -105,17 +113,97 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<span class="form_btn" style="padding:6px 0">立即搜索</span> <span class="form_btn" style="padding:6px 0">立即搜索</span>
</el-form> </el-form> -->
<p style="margin-bottom:5px">
<el-radio v-model="ticket_form.radio" label="1">单程</el-radio>
<el-radio v-model="ticket_form.radio" label="2">往返</el-radio>
</p>
<div style="margin-top:15px;">
<ul class="chooseticketul">
<li>
<span>出发地</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-input size="small" v-model="visa_form.name" placeholder="出发地"></el-input>
</span>
</li>
<span style="margin:0 3px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<li>
<span>目的地</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</span>
</li>
<li>
<span>出发日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker clear-icon="" style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</span>
</li>
<li style="margin-left:26px;">
<span>返回日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</span>
</li>
<li>
<span>成人</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-option
v-for="item in person"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</span>
</li>
<li style="margin-left:26px;">
<span>儿童</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-option
v-for="item in person"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</span>
</li>
</ul>
</div>
<div style="overflow:auto;">
<span class="form_btn">立即搜索</span>
</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="国内机票" name="second">国内机票</el-tab-pane> <el-tab-pane label="国内机票" name="second">国内机票</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<!-- 酒店 --> <!-- 酒店 -->
<div style="width:394px" v-show="tag=='hotel'" class="visa hotel_tabcontent"> <div style="width:394px;margin-top: -15px;" v-show="tag=='hotel'" class="visa hotel_tabcontent">
<el-tabs v-model="hotel_tab" @tab-click="handleClick"> <el-tabs v-model="hotel_tab" @tab-click="handleClick">
<el-tab-pane label="国际酒店" name="gjjd"> <el-tab-pane label="国际酒店" name="gjjd">
<el-form ref="visa_form" :model="visa_form" label-width="60px"> <el-form ref="visa_form" :model="visa_form" label-width="60px">
<el-form-item label="目的地"> <!-- <el-form-item label="目的地">
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input> <el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="display:inline-block;width:50%;" label="入住日"> <el-form-item style="display:inline-block;width:50%;" label="入住日">
...@@ -133,8 +221,48 @@ ...@@ -133,8 +221,48 @@
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
<div style="overflow:auto">
<ul class="visaul_li">
<li>目的地</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</li>
</ul>
<div style="margin-top:16px;overflow:auto">
<div style="float:left;width:182px">
<ul class="visaul_li">
<li>入住日</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-date-picker style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</li>
</ul>
</div>
<div style="float:right;width:182px">
<ul class="visaul_li">
<li>离店日</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-date-picker style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</li>
</ul>
</div>
</div>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span> <span class="form_btn">立即搜索</span>
</div> </div>
...@@ -146,10 +274,17 @@ ...@@ -146,10 +274,17 @@
<!-- 门票 --> <!-- 门票 -->
<div style="width:394px" v-show="tag=='admticket'" class="visa"> <div style="width:394px" v-show="tag=='admticket'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px"> <el-form ref="visa_form" :model="visa_form" label-width="90px">
<el-form-item label="关键词搜索" style="margin-bottom:10px"> <!-- <el-form-item label="关键词搜索" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input> <el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
</el-form-item> </el-form-item> -->
<div style="overflow:auto"> <ul class="visaul_li">
<li>关键词搜索</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
</li>
</ul>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span> <span class="form_btn">立即搜索</span>
</div> </div>
...@@ -994,7 +1129,7 @@ export default { ...@@ -994,7 +1129,7 @@ export default {
banner_height: "0px", banner_height: "0px",
visa_form: {}, visa_form: {},
ticket_form: {}, ticket_form: {},
tag: "visa", tag: "ticket",
activecontent1: "first", activecontent1: "first",
activeName: "first", activeName: "first",
hotel_tab: "gjjd", hotel_tab: "gjjd",
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 3fcf5904
...@@ -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 {
......
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @ 3fcf5904
...@@ -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: ""
......
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 3fcf5904
...@@ -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