Skip to content

A
Athena
Commit 41d830dd authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 9c92dc6a
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 209 deletions
src/components/Ticket/NewChooseCity1.vue
View file @ 41d830dd
......@@ -3,119 +3,15 @@
<div class="ChooseCity">
<i @click="CloseCityComp" class="iconfont icon-cha"></i>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="first" name="first">
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[0]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList1" v-if="item.Code==zmArr[0]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[1]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList1" v-if="item.Code==zmArr[1]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[2]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList1" v-if="item.Code==zmArr[2]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[3]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList1" v-if="item.Code==zmArr[3]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[4]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList1" v-if="item.Code==zmArr[4]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[5]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList1" v-if="item.Code==zmArr[5]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<el-tab-pane label="国家" name="first">
<ul class="flex_box">
<li @click="getProvince(item)" v-for="item in countryList" :key="item.CountryName">{{item.CountryName}}</li>
</ul>
</el-tab-pane>
<el-tab-pane :label="second" name="second">
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[6]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList2" v-if="item.Code==zmArr[6]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[7]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList2" v-if="item.Code==zmArr[7]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[8]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList2" v-if="item.Code==zmArr[8]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[9]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList2" v-if="item.Code==zmArr[9]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
</el-tab-pane>
<el-tab-pane :label="third" name="third">
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[10]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList3" v-if="item.Code==zmArr[10]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[11]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList3" v-if="item.Code==zmArr[11]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[12]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList3" v-if="item.Code==zmArr[12]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[13]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList3" v-if="item.Code==zmArr[13]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
</el-tab-pane>
<el-tab-pane :label="fourth" name="fourth">
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[14]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[14]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[15]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[15]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[16]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[16]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[17]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[17]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[18]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[18]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[19]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[19]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[20]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[20]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[21]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[21]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[22]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList4" v-if="item.Code==zmArr[22]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
</el-tab-pane>
<el-tab-pane :label="fifth" name="fifth">
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[23]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList5" v-if="item.Code==zmArr[23]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[24]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList5" v-if="item.Code==zmArr[24]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<div class="city_item_in">
<span class="city_item_letter">{{zmArr[25]}}</span>
<span class="city_item_inner" @click="getCity(item)" v-for="item in dataList5" v-if="item.Code==zmArr[25]" :key="item.DepartureCityName">{{item.DepartureCityName}}</span>
</div>
<el-tab-pane label="市区" name="second" :disabled="provincetab">
<ul class="flex_box">
<li @click="GetCity(city)" v-for="city in CityList" :key="city.ArrivalCityName">{{city.ArrivalCityName}}</li>
</ul>
</el-tab-pane>
</el-tabs>
</div>
......@@ -129,23 +25,11 @@ export default {
activeName:"first",
countryList:[],
msg:{},
provinceList:[],
cityList:[],
CityList:[],
provincetab:true,
citytab:true,
msg:{},
cityInfo:{},
first:'ABCDEF',
second:'GHIJ',
third:'KLMN',
fourth:'PQRSTUVW',
fifth:'XYZ',
dataList1:[],
dataList2:[],
dataList3:[],
dataList4:[],
dataList5:[],
zmArr:['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
}
},
created() {
......@@ -153,14 +37,10 @@ export default {
},
methods: {
getCity(city){
let msg={
ID:city.Departure_city,
Name:city.DepartureCityName
}
this.$emit("CityInfo1",msg);
this.$emit("CityCompClose1",'close');
},
GetCity(city){
this.$emit("CityInfo1",city);
this.$emit("CityCompClose1",'close');
},
CloseCityComp(){
this.$emit("CityCompClose1",'close');
},
......@@ -168,41 +48,24 @@ export default {
},
getCountryList() { //获取国家
let msg = {};
let msg = {
Type:2
};
this.apipost('sellorder_get_GetAirTicketAllCity', msg, res => {
let dataList=res.data.data;
this.countryList = res.data.data;
dataList.forEach(x => {
let str= x.PYName.substr(0,1);
if(this.first.indexOf(str)!=-1){
x.Code=str;
this.dataList1.push(x);
}
if(this.second.indexOf(str)!=-1){
x.Code=str;
this.dataList2.push(x);
}
if(this.third.indexOf(str)!=-1){
x.Code=str;
this.dataList3.push(x);
}
if(this.fourth.indexOf(str)!=-1){
x.Code=str;
this.dataList4.push(x);
}
if(this.fifth.indexOf(str)!=-1){
x.Code=str;
this.dataList5.push(x);
}
});
this.countryList = res.data.data;
}, err => {})
},
getProvince(item){
this.CityList = item.CityList;
this.activeName="second";
this.provincetab=false;
},
}
}
</script>
<style>
#ChooseCity .ChooseCity .icon-cha:hover{
/* #ChooseCity .ChooseCity .icon-cha:hover{
color: #EE4454;
}
#ChooseCity .ChooseCity .icon-cha{
......@@ -235,7 +98,7 @@ export default {
justify-content: flex-start;
margin:0;
padding:0;
color: #000000;
color: #333333;
}
#ChooseCity .ChooseCity .el-tabs__item:hover{
......@@ -248,45 +111,14 @@ export default {
color: #EE4454;
}
#ChooseCity .ChooseCity{
width: 507px;
background: #ffffff;
z-index:2000;
padding:10px;
width: 600px;
/* height: 300px; */
/* background: #ffffff; */
/* box-shadow:0px 1px 8px 0px rgba(153,153,153,0.6); */
/* z-index:2000; */
/* padding:10px 15px;
box-sizing: border-box;
position: relative;
font-size: 12px;
font-family: "MicrosoftYaHei"
}
#ChooseCity .city_item_in{
width:100%;
float:left;
padding-left:30px;
}
#ChooseCity .city_item_letter{
float: left;
width: 30px;
height: 22px;
margin-left: -30px;
line-height: 22px;
text-align: center;
color: rgb(229,103,0);
}
#ChooseCity .city_item_inner{
float: left;
display: inline-block;
width: 55px;
height: 24px;
margin: 0 0px 2px 0;
padding-left: 8px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
line-height: 24px;
color: #333;
}
#ChooseCity .city_item_inner:hover{
background-color: #EE4454;
color: #fff;
cursor: pointer;
}
position: relative; */
/* overflow-y: scroll; */
/* } */
</style>
src/components/Ticket/TicketHome.vue
View file @ 41d830dd
......@@ -284,7 +284,8 @@
</template>
<script>
import ChooseCity from "@/components/Ticket/NewChooseCity.vue";
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue";
import ChooseCity1 from "@/components/Ticket/NewChooseCity1.vue";
import moment from "moment";
export default {
components: {
......@@ -387,8 +388,8 @@ export default {
},
// 目的地城市信息
CityInfo1(val) {
this.choose_info.arrival_city = val.ID;
this.choose_info.arrival_cityname = val.Name;
this.choose_info.arrival_city = val.Arrival_city;
this.choose_info.arrival_cityname = val.ArrivalCityName;
},
// 目的地关闭子组件
CityCompClose1(val) {
......
src/components/Ticket/TicketList.vue
View file @ 41d830dd
......@@ -319,7 +319,7 @@
</template>
<script>
import ChooseCity from "@/components/Ticket/NewChooseCity.vue";
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue";
import ChooseCity1 from "@/components/Ticket/NewChooseCity1.vue";
import moment from "moment";
import calendar from "@/components/mall/newcalendar.vue";
export default {
......@@ -436,8 +436,8 @@ export default {
methods: {
// 目的地城市信息
CityInfo1(val) {
this.choose_info.arrival_city = val.ID;
this.choose_info.arrival_cityname = val.Name;
this.choose_info.arrival_city = val.Arrival_city;
this.choose_info.arrival_cityname = val.ArrivalCityName;
},
// 目的地关闭子组件
CityCompClose1(val) {
......
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