Skip to content

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

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

parents d18a8adc c3c76787
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 813 additions and 34 deletions
src/assets/css/home.css
View file @ bd1b9704
...@@ -15,12 +15,16 @@ ...@@ -15,12 +15,16 @@
} }
.Home .el-tabs__item.is-active { .Home .el-tabs__item.is-active {
color: #fd6473; color: #fd6473;
font-family: "PingFangR";
} }
.Home .tag_active { .Home .tag_active {
background: #fff; background: #fff;
color: #fd6473 !important; color: #fd6473 !important;
font-weight: bold; font-weight: bold;
} }
.Home .tag_active .iconfont{
color: #fd6473 !important;
}
.Home .form_ul { .Home .form_ul {
overflow: auto; overflow: auto;
} }
...@@ -60,6 +64,7 @@ ...@@ -60,6 +64,7 @@
} }
.Home .Home_top .tag_left li .iconfont { .Home .Home_top .tag_left li .iconfont {
font-size: 20px; font-size: 20px;
color: #ababab;
} }
.Home ul, .Home ul,
p { p {
...@@ -78,7 +83,7 @@ p { ...@@ -78,7 +83,7 @@ p {
font-size: 12px; font-size: 12px;
padding-top: 12px; padding-top: 12px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px dashed #aaaaaa; border-bottom: 1px dashed #737373;
cursor: pointer; cursor: pointer;
} }
.Home .Home_top .tag_left { .Home .Home_top .tag_left {
...@@ -661,4 +666,11 @@ p { ...@@ -661,4 +666,11 @@ p {
line-height: 34px; line-height: 34px;
background: url('../img/home/qipao.png') no-repeat; background: url('../img/home/qipao.png') no-repeat;
background-size:100% 100%; background-size:100% 100%;
}
/* 修改样式 */
.Home .visa .el-tabs__nav-wrap::after{
height: 1px;
background-color: #d8d8d8;
} }
\ No newline at end of file
src/components/DependentTravel/DesignScheme.vue
View file @ bd1b9704
...@@ -60,8 +60,9 @@ ...@@ -60,8 +60,9 @@
</span> </span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{des.childItem.hotelName}}</span></p> <p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{des.childItem.hotelName}}</span></p>
<div style="font-size:14px;margin-top:20px"> <div v-if="des.childItem.description" style="font-size:14px;margin-top:20px">
{{des.childItem.description}} <div v-html="des.childItem.description">
</div>
</div> </div>
...@@ -131,11 +132,11 @@ ...@@ -131,11 +132,11 @@
<span class="iconfont icon-Shape4"></span> <span class="iconfont icon-Shape4"></span>
</span> </span>
<p style="font-size:16px;"><span>景点</span><span style="margin-left:5px;font-size:12px;">（3个）</span></p> <p style="font-size:16px;"><span>景点</span></p>
<div v-for="img in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto"> <div v-if="index==0" v-for="(img,index) in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt=""> <img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px"> <div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<!-- <p>晚餐</p> --> <p v-html="des.childItem.description"></p>
</div> </div>
</div> </div>
...@@ -151,11 +152,11 @@ ...@@ -151,11 +152,11 @@
<span class="iconfont icon-Shape5"></span> <span class="iconfont icon-Shape5"></span>
</span> </span>
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一兰拉面(道顿堀店)(大阪)</span></p> <p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一{{des.childItem.dinnerName}}</span></p>
<div v-for="img in des.childItem.imaArray" style="font-size:14px;margin-top:20px;overflow:auto"> <div v-if="index==0" v-for="(img,index) in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img src="../../assets/img/visa/activy.jpg" style="width:200px;height:133px;float:left;" alt=""> <img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px"> <div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<p>晚餐</p> <p v-html="des.childItem.description"></p>
</div> </div>
</div> </div>
...@@ -255,6 +256,7 @@ export default { ...@@ -255,6 +256,7 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message); this.Success(res.data.message);
this.GetData(); this.GetData();
this.$parent.GetStatus();
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -276,12 +278,14 @@ export default { ...@@ -276,12 +278,14 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.datades=res.data.data; this.datades=res.data.data;
}else{} }else{}
},err=>{}) },err=>{})
}, },
GetData(){ GetData(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomPlanList',this.msg,res=>{ this.apiJavaPost('/api/b2b/free/getTravelCoupomPlanList',this.msg,res=>{
// console.log(res)
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList=res.data.data.pageData; this.dataList=res.data.data.pageData;
......
src/components/DependentTravel/PersonalTailor.vue
View file @ bd1b9704
...@@ -428,10 +428,12 @@ export default { ...@@ -428,10 +428,12 @@ export default {
}, },
methods: { methods: {
goUrl(path,id,tcid){ goUrl(path,id,tcid){
// detailTwo this.$router.push({
path = 'CustomizedTourism' name: "CustomizedTourism",
// path=`${path}/${encodeURIComponent(id)}/`+tcid query: {
this.$router.push({ path }) customId: this.OrderId,
}
});
}, },
dateChange(val){ dateChange(val){
if(val){ if(val){
......
src/components/Home.vue
View file @ bd1b9704
<template> <template>
<div class="Home"> <div class="Home">
<div class="Home_top"> <div class="Home_top">
<el-carousel arrow="always" :height="banner_height" :interval="10000" trigger="click" :style="{'background':'#ddd'}"> <el-carousel arrow="always" height="300px" :interval="10000" trigger="click" :style="{'background':'#ddd'}">
<el-carousel-item> <el-carousel-item>
<img src='../assets/img/ticket/banner01.jpg'> <img src='../assets/img/ticket/banner01.jpg'>
</el-carousel-item> </el-carousel-item>
......
src/components/global/newHead.vue
View file @ bd1b9704
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<el-dropdown-menu class="changelanguage" slot="dropdown"> <el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '1')">个人中心</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '1')">个人中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '2')">会员中心</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '2')">会员中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '9-1')">定制游</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '8-1')">订单中心</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '8-1')">订单中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-1')">个人信息</el-dropdown-item> <el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-1')">个人信息</el-dropdown-item>
<el-dropdown-item @click.native="">我的积分</el-dropdown-item> <el-dropdown-item @click.native="">我的积分</el-dropdown-item>
......
src/components/newPersonalCenter/block/CustomizedList.vue 0 → 100644
View file @ bd1b9704
<template>
<div class="CustomizedList">
<el-form class="choose_form" ref="form" :model="form" label-width="80px">
<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>
<el-option label="方案设计" :value="2"></el-option>
<el-option label="合同签订" :value="3"></el-option>
<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-select>
</el-form-item>
<el-form-item label="出发日期">
<el-date-picker size="small" type="date" v-model="form.startDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="返回日期">
<el-date-picker size="small" type="date" v-model="form.backDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="需要提供">
<el-select size="small" @change="ProvideChange" multiple collapse-tags v-model="provideItem" placeholder="请选择内容">
<el-option label="线路设计" value="线路设计"></el-option>
<el-option label="机票" value="机票"></el-option>
<el-option label="酒店" value="酒店"></el-option>
<el-option label="用车" value="用车"></el-option>
<el-option label="用餐" value="用餐"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getList" type="danger" size="small">查询</el-button>
</el-form-item>
</el-form>
<div>
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column
prop="customId"
label="单号">
</el-table-column>
<el-table-column
prop="departureName"
label="出发地">
</el-table-column>
<el-table-column
prop="destinationNames"
label="目的地">
</el-table-column>
<el-table-column
prop="budget"
label="人均预算">
</el-table-column>
<el-table-column
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>
</template>
</el-table-column>
<el-table-column
prop="provideItem"
label="需要提供">
</el-table-column>
<el-table-column
label="人数">
<template slot-scope="scope">
<span>{{scope.row.audltNumber+scope.row.childrenNumber}}</span>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="120">
<template slot-scope="scope">
<el-button
@click.native.prevent="gourl(scope.row)"
type="danger"
size="mini">
查看订单
</el-button>
</template>
</el-table-column>
</el-table>
<el-row class="_pagination" v-if="totalCount > 1">
<el-pagination
:page-size="form.pageSize"
layout="total, prev, pager, next"
:total="totalCount"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</div>
</div>
</template>
<script>
export default {
data () {
return {
totalCount:0,
provideItem:[],
form:{
pageIndex:1,
pageSize:10,
},
tableData:[],
}
},
mounted() {
this.getList();
},
methods: {
gourl(scope){
let path = 'CustomizedTourism'
this.$router.push({
name:path,
query: {
customId: scope.customId,
blank: "y"
}
});
},
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;
}else{
this.Error(res.data.message);
}
},null)
},
ProvideChange(val){
this.form.provideItem=val.join(',');
},
handleCurrentChange(val) {
// 翻页
this.form.pageIndex = parseInt(val);
this.getList();
}
}
}
</script>
<style>
.CustomizedList ._pagination{
height: 45px;
background-color: #EBEBEB;
display: flex;
align-items: center;
justify-content: flex-end;
}
.CustomizedList .el-pagination .btn-next,.CustomizedList .el-pagination .btn-prev{
width:40px !important;
height:20px !important;
border:1px solid rgba(238,68,84,1);
border-radius:10px;
color: #f56c6c;
}
.CustomizedList .el-form-item{
display: inline-block;
}
.CustomizedList .el-pagination{
display: flex;
align-items: center;
}
.CustomizedList .el-pager li{
background: transparent;
font-weight: initial;
}
.CustomizedList .el-pager li:hover{
color: #f56c6c;
}
.CustomizedList .el-pager li.active{
color: #f56c6c;
}
.CustomizedList ._row_2{
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
}
</style>
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ bd1b9704
...@@ -7,12 +7,15 @@ ...@@ -7,12 +7,15 @@
<div> <div>
<!-- 团订单 --> <!-- 团订单 -->
<TcOrder v-if="data === '8-1'"/> <TcOrder v-if="data === '8-1'"/>
<!-- 定制游订单 -->
<TdOrder v-if="data === '8-2'"/>
<!-- 机票订单 --> <!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/> <TkOrder v-if="data === '8-5'"/>
</div> </div>
</template> </template>
<script> <script>
import TcOrder from './model/TcOrder' import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TkOrder from './model/TkOrder' import TkOrder from './model/TkOrder'
export default { export default {
props:{ props:{
...@@ -20,6 +23,7 @@ export default { ...@@ -20,6 +23,7 @@ export default {
}, },
components: { components: {
TcOrder: TcOrder, TcOrder: TcOrder,
TdOrder: TdOrder,
TkOrder: TkOrder, TkOrder: TkOrder,
}, },
data() { data() {
......
src/components/newPersonalCenter/block/model/TdOrder.vue 0 → 100644
View file @ bd1b9704
<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>
<!-- 表格 -->
<TKTable :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 TKTable from "./OrderInfoModel/TKTable";
export default {
components: {
TKTable: TKTable
},
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 @ bd1b9704
...@@ -50,10 +50,13 @@ ...@@ -50,10 +50,13 @@
<i class="iconfont icon-huiyuanicon"></i> <i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span> <span slot="title">会员中心</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="9" @click="clickMenu('9')"> <el-submenu index="3">
<i class="iconfont icon-huiyuanicon"></i> <template slot="title">
<span slot="title">定制游</span> <i class="iconfont icon-huiyuanicon"></i>
</el-menu-item> <span>定制游</span>
</template>
<el-menu-item index="9-1" @click="clickMenu('9-1')">定制游列表</el-menu-item>
</el-submenu>
<el-submenu index="8"> <el-submenu index="8">
<template slot="title"> <template slot="title">
<i class="iconfont icon-dingdanicon"></i> <i class="iconfont icon-dingdanicon"></i>
...@@ -107,6 +110,8 @@ ...@@ -107,6 +110,8 @@
<MemberCenter v-else-if="active === '2'" :data="active"/> <MemberCenter v-else-if="active === '2'" :data="active"/>
<!-- 个人信息 --> <!-- 个人信息 -->
<Information v-else-if="active.indexOf('3-') !== -1" :data="active"/> <Information v-else-if="active.indexOf('3-') !== -1" :data="active"/>
<!-- 定制游 -->
<CustomizedList v-else-if="active.indexOf('9-') !== -1" :data="active"/>
<!-- 订单中心 --> <!-- 订单中心 -->
<OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/> <OrderCenter v-else-if="active.indexOf('8-') !== -1" :data="active"/>
<!-- 优惠券 --> <!-- 优惠券 -->
...@@ -122,6 +127,7 @@ ...@@ -122,6 +127,7 @@
<script> <script>
import HomePage from '@/components/newPersonalCenter/block/HomePage' import HomePage from '@/components/newPersonalCenter/block/HomePage'
import Information from '@/components/newPersonalCenter/block/Information' import Information from '@/components/newPersonalCenter/block/Information'
import CustomizedList from '@/components/newPersonalCenter/block/CustomizedList'
import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter' import MemberCenter from '@/components/newPersonalCenter/block/MemberCenter'
import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter' import OrderCenter from '@/components/newPersonalCenter/block/OrderCenter'
import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon' import MyCoupon from '@/components/newPersonalCenter/block/MyCoupon'
...@@ -133,7 +139,8 @@ export default { ...@@ -133,7 +139,8 @@ export default {
MemberCenter, MemberCenter,
OrderCenter, OrderCenter,
MyCoupon, MyCoupon,
Integral Integral,
CustomizedList
}, },
data () { data () {
return { return {
...@@ -142,14 +149,14 @@ export default { ...@@ -142,14 +149,14 @@ export default {
}, },
methods: { methods: {
handleOpen(key, keyPath) { handleOpen(key, keyPath) {
console.log(key, keyPath); // console.log(key, keyPath);
}, },
handleClose(key, keyPath) { handleClose(key, keyPath) {
console.log(key, keyPath); // console.log(key, keyPath);
}, },
clickMenu: function (key) { clickMenu: function (key) {
this.active = key this.active = key
console.log(key) // console.log(key)
}, },
setActive: function(t){ setActive: function(t){
if (t) { if (t) {
......
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