Skip to content

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

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

parents a67f9eba 01db7628
Show whitespace changes
Inline Side-by-side
Showing with 799 additions and 21 deletions
src/App.vue
View file @ 8ebb48fa
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
<style> <style>
@import './assets/global/font.css'; @import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_naoz0fqofi.css'; @import '//at.alicdn.com/t/font_863923_8f4ml296bz3.css';
@import './assets/global/global.css'; @import './assets/global/global.css';
body,html{ body,html{
padding: 0px; padding: 0px;
......
src/components/LocalTour/Appointment.vue
View file @ 8ebb48fa
...@@ -172,7 +172,6 @@ export default { ...@@ -172,7 +172,6 @@ export default {
created(){ created(){
let userInfo=JSON.parse(localStorage.userInfo); let userInfo=JSON.parse(localStorage.userInfo);
this.form.customerId=userInfo.customerId; this.form.customerId=userInfo.customerId;
// console.log("StorageInfo.customerId",userInfo.customerId);
this.dataDes=JSON.parse(sessionStorage.dataDes); this.dataDes=JSON.parse(sessionStorage.dataDes);
this.Ticketinfo=JSON.parse(sessionStorage.Ticketinfo); this.Ticketinfo=JSON.parse(sessionStorage.Ticketinfo);
this.price=(this.Ticketinfo.b2bPrice*this.form.purchaseQuantity).toFixed(2); this.price=(this.Ticketinfo.b2bPrice*this.form.purchaseQuantity).toFixed(2);
...@@ -270,7 +269,6 @@ export default { ...@@ -270,7 +269,6 @@ export default {
} else { } else {
this.SettlementPrice = this.price this.SettlementPrice = this.price
} }
console.log("SettlementPrice",this.SettlementPrice)
// this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2); // this.SettlementPrice=parseInt(this.SettlementPrice).toFixed(2);
let allmonney=this.price - this.SettlementPrice; let allmonney=this.price - this.SettlementPrice;
this.form.discountMoney = (this.price - this.SettlementPrice).toFixed(2); this.form.discountMoney = (this.price - this.SettlementPrice).toFixed(2);
...@@ -374,10 +372,16 @@ export default { ...@@ -374,10 +372,16 @@ export default {
} }
let DayList=[]; let DayList=[];
// this.timeStr.forEach(time=>{ // this.timeStr.forEach(time=>{
// console.log("time",time) let len=this.timeStr.length;
MonthdayList.forEach(item=>{ MonthdayList.forEach(item=>{
if(moment(this.timeStr[len-1].endDate).isBefore(MonthdayList[0].dateStr)){
let msg={
dateStr:item.dateStr,
};
DayList.push(msg)
}
this.timeStr.forEach(time=>{ this.timeStr.forEach(time=>{
if(moment(time.startDate).isBefore(item.dateStr) && moment(item.dateStr).isBefore(time.endDate)){ if(moment(time.startDate).isBefore(item.dateStr) && moment(item.dateStr).isBefore(time.endDate)){
let msg={ let msg={
price:time.b2bPrice, price:time.b2bPrice,
...@@ -389,15 +393,17 @@ export default { ...@@ -389,15 +393,17 @@ export default {
}; };
DayList.push(msg) DayList.push(msg)
} }
// else{
// let date={
// dateStr:item.dateStr,
// }
// DayList.push(date)
// }
}) })
if(this.timeStr.length<1){
let msg={
dateStr:item.dateStr,
};
DayList.push(msg)
}
}) })
console.log("DayList",DayList)
this.creatCalendar(DayList); this.creatCalendar(DayList);
}, },
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 8ebb48fa
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<TzOrder v-if="data === '8-2'"/> <TzOrder v-if="data === '8-2'"/>
<!-- 定制游订单 --> <!-- 定制游订单 -->
<TdOrder v-if="data === '8-7'"/> <TdOrder v-if="data === '8-7'"/>
<!-- 签证订单 -->
<TQOrder v-if="data === '8-4'"/>
<!-- 机票订单 --> <!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/> <TkOrder v-if="data === '8-5'"/>
<!-- 景点门票订单 --> <!-- 景点门票订单 -->
...@@ -20,6 +22,7 @@ ...@@ -20,6 +22,7 @@
<script> <script>
import TcOrder from './model/TcOrder' import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder' import TdOrder from './model/TdOrder'
import TQOrder from './model/TQOrder'
import TzOrder from './model/TzOrder' import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder' import TkOrder from './model/TkOrder'
import ScenOrder from './model/ScenOrder' import ScenOrder from './model/ScenOrder'
...@@ -33,6 +36,7 @@ export default { ...@@ -33,6 +36,7 @@ export default {
TkOrder: TkOrder, TkOrder: TkOrder,
TzOrder: TzOrder, TzOrder: TzOrder,
ScenOrder:ScenOrder, ScenOrder:ScenOrder,
TQOrder:TQOrder,
}, },
data() { data() {
return { return {
......
src/components/newPersonalCenter/block/model/OrderInfoModel/NewTKtable.vue 0 → 100644
View file @ 8ebb48fa
<style>
.orderTable{
width: 100%;
border: solid 1px #EDEDED;
border-collapse: collapse;
}
.orderTable thead tr {
}
.orderTable thead tr th{
padding: 15px 0;
font-size: 12px;
color: #666666;
font-weight: initial;
}
.orderTable thead tr th:nth-child(1){
text-align: left;
padding-left: 10px;
}
.orderTable tbody tr td{
border: solid 1px #EDEDED;
}
.orderTable tbody .top td{
padding: 7px 20px;
font-size: 14px;
border: 1px solid #EDEDED;
}
.orderTable tbody .top td .time{
color: #999999;
padding-right: 20px;
}
.orderTable tbody .top td .num{
color: #666666;
padding-right: 20px;
}
.orderTable tbody .top td .num span{
color: #999999;
}
.orderTable tbody .top td .contacts{
color: #333333;
}
.orderTable tbody .top td .contacts .iconfont{
color: #5290FF;
padding-right: 10px;
}
.orderTable tbody .info td{
padding: 20px 15px;
box-sizing: border-box;
}
.orderTable tbody .info .tc_info{
display: flex;
}
.orderTable tbody .info .tc_info ._left{
width:64px;
height:64px;
background-color: gray;
margin-right: 10px;
}
.orderTable tbody .info .tc_info ._right{
color: #666666;
font-size: 12px;
}
.color333{
color: #333333;
}
.color666{
color: #666666;
}
.font-size14{
font-size: 14px
}
.font-size12{
font-size: 12px
}
.orderTable tbody .info .tc_info ._right p:nth-child(2){
margin: 8px 0;
}
.orderTable tbody .info .name_list{
font-size: 12px;
text-align: center;
}
.orderTable tbody .info .name_list .__cp:hover{
color: #2299EE;
}
.orderTable tbody .info .name_list p{
margin-bottom: 5px;
}
.orderTable tbody .info .money{
font-size: 12px;
text-align: center;
}
.orderTable tbody .info .money p{
margin-bottom: 4px
}
.orderTable tbody .info .money .pay_ok{
color: #52BF7D;
padding-bottom: 2px;
}
.orderTable tbody .info .money .pay_no{
color: #FF8800 !important;
}
.orderTable tbody .info .money .pay_ok .iconfont{
color: #333333
}
.orderTable tbody .info .money .pay_list{
border-top: 1px solid #E6E6E6;
padding-top: 5px;
color: #666666;
/* height: 0;
overflow: hidden;
transition: all linear .5s; */
}
.orderTable tbody .info .money .pay_list.height_aotu{
height: 66px;
}
.shang{
transform: rotate(180deg);
display: inline-block;
}
.hover_bg{
background: rgba(255,240,240,1);
}
.list_details ul{
margin-top: 0px;
padding-top: 15px;
border-top: 1px solid #E6E6E6;
}
.list_details .__item{
display: flex;
font-size: 12px;
margin-bottom: 15px;
}
.list_details .__item .img{
height: 54px;
width: 72px;
background-color: gray;
margin-right: 10px;
}
.list_details .__item .img{
height: 54px;
width: 72px;
}
.list_details .__item .__name .iconfont{
color: #3EABFF
}
.list_details .__item .__name .icon-shiliangzhinengduixiang1{
color: #FF5151
}
.TicketOrder .ticketDes{
width: 100%;
background: #EBEBEB;
padding: 20px;
box-sizing: border-box;
transition: all 0.2s linear;
}
.TicketOrder .ticketDes .orderDiv{
color: #333333;
background: #fff;
padding: 15px 0;
/* box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18); */
}
.TicketOrder .pfR{
font-family: "PingFangR"
}
.TicketOrder .Green{
display: inline-block;
width:30px;
height:30px;
background:rgba(73,192,161,1);
font-size: 12px;
color: #fff;
text-align: center;
line-height: 30px;
}
.TicketOrder .ticketDes .grey{
background: #F5F5F5;
font-size: 12px;
padding: 12px 10px;
position: relative;
box-sizing: border-box;
width: 280px;
}
.TicketOrder .ticketDes .imgTop{
align-items: center;
display: flex;
font-size: 12px;
margin-top:15px;
}
.TicketOrder .ticketDes .imgTop span{
margin-left: 8px;
}
.TicketOrder .ticketDes .grey span:nth-child(1){
display: inline-block;
width: 105px;
border-right: 1px solid #999999;
}
.TicketOrder .ticketDes .grey .air{
margin-left: 10px;
}
.TicketOrder .ticketDes .grey .circle{
display: inline-block;
width: 5px;
height: 5px;
border-radius: 50%;
background: #333333;
position: relative;
left: -3px;
top: -3px;
}
.TicketOrder .ticketDes .grey .bg_back{
display: inline-block;
border-right: 1px dashed #999999;
height: 70px;
position: absolute;
left: 115px;
z-index: 100;
top:22px;
}
.TicketOrder .ticketDes .threeDiv{
border-left: 1px dashed #AAAAAA;
font-size: 12px;
padding-left: 20px;
box-sizing: border-box;
height: 185px;
position: relative;
}
.TicketOrder .ticketDes .threeDiv .otherinfo span:nth-child(1){
color:#8590A0;
display: inline-block;
width: 65px
}
.TicketOrder .ticketDes .threeDiv .otherinfo span:nth-child(2){
color:#666666;
}
.TicketOrder .ticketDes .threeDiv .otherinfo p{
padding-top: 10px;
}
.TicketOrder .ticketDes .threeDiv .firstCircle{
position: absolute;
width: 30px;
height: 15px;
background-color: #EBEBEB;
border-radius: 30px 30px 0 0;
bottom:-18px;
left: -15px;
}
.TicketOrder .ticketDes .threeDiv .SecondCircle{
position: absolute;
width: 30px;
height: 15px;
background-color: #EBEBEB;
border-radius: 0 0 30px 30px;
top:-18px;
left: -15px;
}
.TicketOrder .icon-xiangzuo-copy{
cursor: pointer;
color: #EE4454;
display: inline-block;
}
.TicketOrder .rotate{
transform: rotateX(180deg);
}
</style>
<template>
<el-row>
<table class="orderTable TicketOrder" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th width="85px">
<div class="__cp _drop">
<el-dropdown trigger="click" @command="handleCommandTwo">
<span class="el-dropdown-link">
{{dropTitTwo}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<template v-for="(item,index) in dayList">
<el-dropdown-item :key="index+100" :command="item">{{item.Day}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
</th>
<th width="400px"></th>
<th width="100px">
订单详情
</th>
<th width="220px">
金额
</th>
<th width="150">
订单状态
</th>
<th width="159px">
操作
</th>
</tr>
</thead>
<tbody>
<template v-for="(item, index) in tableData">
<tr class="top" :key="index" :class="{hover_bg: activeRow === index}" @mouseenter="enter(index)" @mouseleave="enter()">
<td colspan="6">
<span class="time">{{item.startDate}}</span>
<span class="num">订单号：<span>{{item.orderId}}</span></span>
<span class="contacts"><i class="iconfont icon-dianhua"></i> <span>{{item.serviceName}} {{item.servicePhone}}</span></span>
</td>
</tr>
<tr :key="index+1000" class="info" @mouseenter="enter(index)" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
<td width="20">
<i :class="tab==index?'rotate':''" @click="ShowDes(index)" class="iconfont icon-xiangzuo-copy"></i>
</td>
<td>
<div class="tc_info">
<div class="_left"></div>
<div class="_right">
<p class="color333 font-size14">系列名称系列名称系列名称...</p>
<p>系列名称系列名称系列名称...</p>
<p>团号：123456</p>
</div>
</div>
</td>
<td width="400" class="name_list">
<p>成人：5 [ <span class="__cp">上传名单</span> ]</p>
<p>儿童：5
<el-popover
popper-class='list_details'
placement="bottom"
title="名单详情"
width="200"
trigger="click">
<ul>
<li class="__item">
<div class="img">
</div>
<div class="__info">
<p class="__name color333">李健国 <i class="iconfont icon-nan"></i></p>
<p class="color666">13880879660</p>
<p class="color666">房号：403 单人间</p>
</div>
</li>
<li class="__item">
<div class="img">
</div>
<div class="__info">
<p class="__name color333">李健国 <i class="iconfont icon-shiliangzhinengduixiang1"></i></p>
<p class="color666">13880879660</p>
<p class="color666">房号：403 单人间</p>
</div>
</li>
<li class="__item">
<div class="img">
</div>
<div class="__info">
<p class="__name color333">李健国 <i class="iconfont icon-nan"></i></p>
<p class="color666">13880879660</p>
<p class="color666">房号：403 单人间</p>
</div>
</li>
</ul>
<span slot="reference">[ <span class="__cp">名单详情</span> ]</span>
</el-popover>
</p>
<p>婴儿：0</p>
</td>
<td class="money">
<p>总额 ¥{{item.preferPrice | priceFormat}}</p>
<p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥8680.00 <i class="iconfont icon-xia"></i></p>
<p class="__cp pay_no" v-if="item.payShow" @click="item.payShow = false">已付总额 ¥8680.00 <i class="iconfont icon-xia shang"></i></p>
<!-- :class="{height_aotu: item.payShow}" -->
<div class="pay_list" v-if="item.payShow">
<p>04-18 ¥8680.00 支付宝</p>
<p>04-18 ¥8680.00 支付宝</p>
<p>04-18 ¥8680.00 支付宝</p>
</div>
</td>
<td class="color333 font-size14">
<span v-if="item.orderState === 1">待付定金</span>
<span v-else-if="item.orderState === 2">待付尾款</span>
<span v-else-if="item.orderState === 3">待发团</span>
<span v-else-if="item.orderState === 4">交易完成</span>
<span v-else-if="item.orderState === 0">取消</span>
</td>
<td>
<payurlItem
v-if="item.orderState !== 0 && item.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="item"
></payurlItem>
</td>
</tr>
<tr v-show="tab==index" :key="index+2000">
<td colspan="6">
<div class="ticketDes">
<el-row class="orderDiv">
<el-col :span="9" style="padding-left:20px">
<p>
<span class="Green">去程</span>
<span class="pfR" style="margin-left:10px">2019-02-19</span>
<span class="pfR">成都-泰国</span>
</p>
<div style="margin-top:10px">
<p class="imgTop">
<img style="width:24px;height:24px;" src="../../../../../assets/img/ps/jifencha.png" alt="">
<span>中国航空</span>
</p>
<p class="grey">
<span>02月19日 15:30</span>
<span class="circle"></span>
<span class="bg_back"></span>
<span class="air">成都 CTU 双流国际机场</span>
</p>
<p class="imgTop">
<img style="width:24px;height:24px;" src="../../../../../assets/img/ps/jifencha.png" alt="">
<span>中国航空</span>
</p>
<p class="grey">
<span>02月19日 15:30</span>
<span class="circle"></span>
<span class="air">成都 CTU 双流国际机场</span>
</p>
</div>
</el-col>
<el-col :span="9" style="padding-left:20px">
<p>
<span class="Green">去程</span>
<span class="pfR" style="margin-left:10px">2019-02-19</span>
<span class="pfR">成都-泰国</span>
</p>
<div style="margin-top:10px">
<p class="imgTop">
<img style="width:24px;height:24px;" src="../../../../../assets/img/ps/jifencha.png" alt="">
<span>中国航空</span>
</p>
<p class="grey">
<span>02月19日 15:30</span>
<span class="circle"></span>
<span class="bg_back"></span>
<span class="air">成都 CTU 双流国际机场</span>
</p>
<p class="imgTop">
<img style="width:24px;height:24px;" src="../../../../../assets/img/ps/jifencha.png" alt="">
<span>中国航空</span>
</p>
<p class="grey">
<span>02月19日 15:30</span>
<span class="circle"></span>
<span class="air">成都 CTU 双流国际机场</span>
</p>
</div>
</el-col>
<el-col class="threeDiv" :span="6">
<p class="pfR" style="font-size:14px">其他信息</p>
<div class="otherinfo">
<p>
<span>团号</span>
<span>256</span>
</p>
<p>
<span>销售名称</span>
<span>256</span>
</p>
<p>
<span>销售电话</span>
<span>256</span>
</p>
<p>
<span>已收金额</span>
<span>¥5680.00</span>
</p>
<p>
<span>出团公司</span>
<span>四川何平</span>
</p>
<p>
<span>报入时间</span>
<span>2019-4-12 13:15:30</span>
</p>
</div>
<div class="firstCircle"></div>
<div class="SecondCircle"></div>
</el-col>
</el-row>
</div>
</td>
</tr>
</template>
</tbody>
</table>
</el-row>
</template>
<script>
import payURL from "../../../../global/pay.vue";
export default {
components: {
payurlItem: payURL,
},
props:["tableData"],
data() {
return {
activeRow: '',
activeNames: ['1'],
dropTitTwo: "10天内",
dataList:[],
// tableData: [
// {
// title: '111',
// payShow: false,
// orderState: 1
// },{
// title: '222',
// payShow: false,
// orderState: 0
// },
// {
// title: '333',
// payShow: false,
// orderState: 2
// },
// {
// title: '444',
// payShow: false,
// orderState: 3
// }
// ],
dayList: [
{
Day: "10天",
Number: 10,
ID: 1
},
{
Day: "30天",
Number: 30,
ID: 1
},
{
Day: "60天",
Number: 60,
ID: 1
}
],
tab:-1,
};
},
mounted() {
console.log("机票122",this.tableData)
},
methods: {
ShowDes(index){
if(this.tab==index){
this.tab=-1;
}else{
this.tab=index;
}
},
enter: function (t) {
if (t+1) {
this.activeRow = t
} else {
this.activeRow = ''
}
},
handleCommandTwo(command) {
this.dropTitTwo = command.Day;
// this.getOrderMsg.queryDays = command.Number;
// this.gerOrderList();
},
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
);
},
}
};
</script>
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue
View file @ 8ebb48fa
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
<p>婴儿：0</p> <p>婴儿：0</p>
</td> </td>
<td class="money"> <td class="money">
<p>总额 ¥8680.00</p> <p>总额 ¥{{item.preferPrice | priceFormat}}</p>
<p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥8680.00 <i class="iconfont icon-xia"></i></p> <p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥8680.00 <i class="iconfont icon-xia"></i></p>
<p class="__cp pay_no" v-if="item.payShow" @click="item.payShow = false">已付总额 ¥8680.00 <i class="iconfont icon-xia shang"></i></p> <p class="__cp pay_no" v-if="item.payShow" @click="item.payShow = false">已付总额 ¥8680.00 <i class="iconfont icon-xia shang"></i></p>
<!-- :class="{height_aotu: item.payShow}" --> <!-- :class="{height_aotu: item.payShow}" -->
......
src/components/newPersonalCenter/block/model/TQOrder.vue 0 → 100644
View file @ 8ebb48fa
<style>
/* 定制游订单 */
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li :key="item.ID"
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: 5,
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() {
},
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("sss",res)
if (res.data.resultCode == 1) {
this.tableData = res.data.data;
console.log("签证订单",this.tableData)
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/block/model/TdOrder.vue
View file @ 8ebb48fa
<style> <style>
/* 定制游订单 */
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css"; @import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style> </style>
<template> <template>
......
src/components/newPersonalCenter/block/model/TkOrder.vue
View file @ 8ebb48fa
<style> <style>
/* 机票订单 */
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css"; @import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style> </style>
<template> <template>
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
</template> </template>
</ul> </ul>
<!-- 表格 --> <!-- 表格 -->
<TKTable :tableData="tableData"/> <NewTKtable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1"> <div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
...@@ -32,10 +33,10 @@ ...@@ -32,10 +33,10 @@
</el-row> </el-row>
</template> </template>
<script> <script>
import TKTable from "./OrderInfoModel/TKTable"; import NewTKtable from "./OrderInfoModel/NewTKtable";
export default { export default {
components: { components: {
TKTable: TKTable NewTKtable: NewTKtable
}, },
data() { data() {
return { return {
...@@ -136,6 +137,7 @@ export default { ...@@ -136,6 +137,7 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData; this.tableData = res.data.data.pageData;
console.log("机票订单",this.tableData)
this.totalCount = res.data.data.pageCount; this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count; this.Count = res.data.data.count;
this.orderLoading = false; this.orderLoading = false;
......
src/plugins/index.js
View file @ 8ebb48fa
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
// let domainUrl = "https://reborn.oytour.com"; //刘东主域名 // let domainUrl = "https://reborn.oytour.com"; //刘东主域名
let domainUrl = "https://reborn.oytour.com"; let domainUrl = "https://reborn.oytour.com";
// var domainUrl = "http://test.viitto.com" // var domainUrl = "http://test.viitto.com"
// domainUrl = "http://192.168.2.214:8082" domainUrl = "http://192.168.2.214:8082"
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('viitto.com') != -1) if (window.location.host.indexOf('viitto.com') != -1)
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
DomainUrl: domainUrl, DomainUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000", javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
var key = ""; var key = "";
if (this.getLocalStorage() != null) { if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token; token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey; key = this.getLocalStorage().secretKey;
} }
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase(); var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`); var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
var key = ""; var key = "";
if (this.getLocalStorage() != null) { if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token; token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey; key = this.getLocalStorage().secretKey;
} }
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase(); var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
...@@ -219,7 +219,7 @@ export default { ...@@ -219,7 +219,7 @@ export default {
// let uid = userInfo.accountId ? userInfo.accountId : 0 // let uid = userInfo.accountId ? userInfo.accountId : 0
if (this.getLocalStorage() != null) { if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token; token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey; key = this.getLocalStorage().secretKey;
} }
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase(); var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`); var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
......
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