Skip to content

A
Athena
Commit 59362baa authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 6c7da5b6 e5a35ad7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 713 additions and 211 deletions
src/App.vue
View file @ 59362baa
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_luoxdzztue.css';
@import '//at.alicdn.com/t/font_863923_9v70nlynbdt.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
src/assets/css/home.css
View file @ 59362baa
......@@ -5,7 +5,7 @@
.Home .ticket .el-form-item {
display: inline-block;
margin-bottom: 0;
width: 185px;
width: 182px;
}
.Home .el-tabs__item:hover {
color: #fd6473;
......@@ -53,12 +53,64 @@
padding: 5px 0;
text-align: center;
font-size: 14px;
font-weight: bold;
float: right;
font-family: "PingFangR"
}
.Home .Home_top .tag_right .el-form-item__label {
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 .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 .el-input__inner {
border-radius: 0px;
}
......@@ -66,6 +118,9 @@
font-size: 20px;
color: #ababab;
}
.Home ul,
p {
padding: 0;
......@@ -118,7 +173,7 @@ p {
font-family: "PingFang";
}
.Home .cztm_item_content p{
padding:1px 0;
padding:2px 0;
}
.Home .cztm_item_content .cztm_title{
color:#333333;
......@@ -155,14 +210,14 @@ p {
}
.Home .cztm .cztm_item{
position: relative;
width:220px;
width:215px;
height:130px;
font-size: 14px;
font-size: 12px;
background:rgba(255,255,255,1);
border:1px solid rgba(220,220,220,1);
display: inline-flex;
align-items:center;
margin:0 0 15px 15px;
margin:0 0 15px 22px;
box-sizing: border-box;
}
.Home #triangle-left{
......@@ -234,7 +289,7 @@ p {
position: relative;
}
.Home .Grouptour .tour_left{
width:220px;
width:216px;
box-sizing: border-box;
position: absolute;
left: 0;
......@@ -673,4 +728,21 @@ p {
.Home .visa .el-tabs__nav-wrap::after{
height: 1px;
background-color: #d8d8d8;
}
.Home .el-input__inner{
border: 1px solid #d8dadc;
}
.Home .tag_right .hotel_tabcontent .el-form-item {
margin-bottom: 13px;
}
.Home .cztm .el-tabs__item.is-active{
color:#ee4454;
}
.Home .cztm .el-tabs__active-bar{
height: 3px;
background: #ee4454;
}
.Home .cztm .el-tabs__nav-wrap::after{
height: 1px;
background-color: #ededed;
}
\ No newline at end of file
src/components/DependentTravel/IndependentList.vue
View file @ 59362baa
......@@ -227,7 +227,10 @@ export default {
}
},
created(){
if(this.$route.query.lineteamId){
this.listmsg.lineId=this.$route.query.lineteamId;
console.log("this.listmsg.lineId",this.listmsg.lineId)
}
},
mounted() {
// this.GetVisaCountry();
......@@ -350,6 +353,7 @@ export default {
if(this.companyId!=-1){
this.apipost('b2b_get_GetFreeSearchItem',{'companyId':this.companyId},r=>{
this.linesList=r.data.data.lineTeam;
console.log("this.linesList",this.linesList)
this.startCityList=r.data.data.startCity;
this.tripDayList=r.data.data.tripDay;
},null)
......@@ -381,8 +385,13 @@ export default {
this.total=res.data.data.count;
this.datalist.forEach(item=>{
item.imgCover=JSON.parse(item.imgCover)
item.imgCover=JSON.parse(item.imgCover);
if(item.priceTags){
item.priceTags=item.priceTags.split(",");
}
})
console.log(this.datalist)
}else{
this.Error(res.data.message);
}
......
src/components/Home.vue
View file @ 59362baa
This diff is collapsed.
src/components/mall/detailThree.vue
View file @ 59362baa
......@@ -81,8 +81,8 @@
<el-col :span='12'>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/heel',query:{} }">自由行</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName,'lineteamId':dataList.ltName} }">{{dataList.ltName}}</el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item> -->
<el-breadcrumb-item :to="{ path: '/IndependentList',query:{'lineteamId':dataList.lineteamId} }">{{dataList.ltName}}</el-breadcrumb-item>
<el-breadcrumb-item>{{dataList.title}}</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
......@@ -898,7 +898,6 @@ export default {
getData: function (msg) {
this.loadingDataList=true
this.apipost('b2b_get_GetB2BFreeInfo',msg,r=>{
if(r.data.resultCode==1){
let data = (r.data.data);
this.sonData = data;
......@@ -936,6 +935,7 @@ export default {
this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
this.dataList = data;
// console.log("deThree",this.dataList)
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null;
this.imgCover = JSON.parse(this.dataList.imgCover);
this.showType = this.feature.featureType;
......
src/components/newPersonalCenter/block/CustomizedList.vue
View file @ 59362baa
<template>
<div class="CustomizedList">
<el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="订单信息">
<el-form-item label="订单状态">
<el-select size="small" v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option>
<el-option label="已提交" :value="1"></el-option>
......@@ -10,7 +10,7 @@
<el-option label="下单" :value="4"></el-option>
<el-option label="已成团" :value="5"></el-option>
<el-option label="已关团" :value="6"></el-option>
<el-option label="已取消" :value="6"></el-option>
<el-option label="已取消" :value="7"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出发日期">
......@@ -57,12 +57,15 @@
label="人均预算">
</el-table-column>
<el-table-column
label="处理状态">
label="订单状态">
<template slot-scope="scope">
<span v-if="scope.row.orderStatus==1">未分配</span>
<span v-if="scope.row.orderStatus==2">处理中</span>
<span v-if="scope.row.orderStatus==3">处理完成</span>
<span v-if="scope.row.orderStatus==4">处理失败</span>
<span v-if="scope.row.orderStatus==1">已提交</span>
<span v-if="scope.row.orderStatus==2">方案设计</span>
<span v-if="scope.row.orderStatus==3">合同签订</span>
<span v-if="scope.row.orderStatus==4">下单</span>
<span v-if="scope.row.orderStatus==5">已成团</span>
<span v-if="scope.row.orderStatus==6">已关团</span>
<span v-if="scope.row.orderStatus==7">已取消</span>
</template>
</el-table-column>
<el-table-column
......@@ -131,7 +134,6 @@ export default {
getList(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomList',this.form,res=>{
this.loading=false;
console.log(res);
if(res.data.resultCode==1){
this.tableData=res.data.data.pageData;
this.totalCount=res.data.data.count;
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 59362baa
......@@ -7,8 +7,10 @@
<div>
<!-- 团订单 -->
<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'"/>
</div>
......@@ -16,6 +18,7 @@
<script>
import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder'
export default {
props:{
......@@ -25,6 +28,7 @@ export default {
TcOrder: TcOrder,
TdOrder: TdOrder,
TkOrder: TkOrder,
TzOrder: TzOrder,
},
data() {
return {
......
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @ 59362baa
......@@ -14,7 +14,7 @@
</template>
</ul>
<!-- 表格 -->
<TKTable :tableData="tableData"/>
<TCTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
......@@ -32,10 +32,10 @@
</el-row>
</template>
<script>
import TKTable from "./OrderInfoModel/TKTable";
import TCTable from "./OrderInfoModel/TCTable";
export default {
components: {
TKTable: TKTable
TCTable: TCTable
},
data() {
return {
......@@ -48,7 +48,7 @@ export default {
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 2,
orderType: 7,
queryDays: 0,
orderState: -1,
CustomerId: ""
......
src/components/newPersonalCenter/block/model/TzOrder.vue 0 → 100644
View file @ 59362baa
<style>
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
class="__cp"
@click="handleClick(item)"
:class="{_active: activeName === item.ID}"
>{{item.Type}}</li>
</template>
</ul>
<!-- 表格 -->
<TCTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template>
<script>
import TCTable from "./OrderInfoModel/TCTable";
export default {
components: {
TCTable: TCTable
},
data() {
return {
activeName: -1,
currentPage: 1,
rderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 2,
queryDays: 0,
orderState: -1,
CustomerId: ""
},
TitList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
// {
// val: 6,
// lable: '等待商家确认'
// },
// {
// val: 7,
// lable: '退款中'
// },
// {
// val: 8,
// lable: '退款成功'
// },
// {
// val: 9,
// lable: '交易完成'
// },
],
tableData: []
};
},
computed: {},
created() {
console.log("定制游订单");
},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
console.log("自由行订单",res);
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
},
null
);
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
}
};
</script>
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 59362baa
......@@ -63,7 +63,8 @@
<span>订单中心</span>
</template>
<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-4" @click="clickMenu('8-4')">签证订单</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