Skip to content

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

新增订单

parent 8ebb48fa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1175 additions and 85 deletions
src/components/LocalTour/Localtourhome.vue
View file @ 3b44b49a
......@@ -75,7 +75,7 @@
<div class="dayConDiv1">
<div @click="goOneDayDetail(item)" v-if="index<2" v-for="(item,index) in abroadList" :key="index+300">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src="img.url" alt="">
<span class="daydes">{{item.lineName}}</span>
<span class="daydes">{{item.title}}</span>
<span class="price">￥<span class="pfR font18">{{item.b2BPrice}}</span>起</span>
</div>
</div>
......@@ -327,6 +327,7 @@ export default {
goOneDayDetail(item){
let path = 'OneDayDetailTwo';
path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
this.$router.push({ path })
},
GoTicket(item){
......
src/components/Ticket/EditTicketOrder.vue
View file @ 3b44b49a
......@@ -265,7 +265,13 @@ export default {
if(res.data.resultCode==1){
this.$message.success(res.data.message);
this.personNum={};
this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
this.$router.push({
name: "Pay",
query: {
id: res.data.data,
}
});
// this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
}else{
this.$message.error(res.data.message)
}
......
src/components/Ticket/FillItinerary.vue
View file @ 3b44b49a
......@@ -387,7 +387,13 @@ export default {
if(res.data.resultCode==1){
this.$message.success(res.data.message);
this.personNum={};
this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
this.$router.push({
name: "Pay",
query: {
id: res.data.data,
}
});
// this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
}else{
this.$message.error(res.data.message)
}
......
src/components/Ticket/OrderDetails.vue
View file @ 3b44b49a
......@@ -283,7 +283,13 @@ export default {
if(res.data.resultCode==1){
this.$message.success(res.data.message);
this.personNum={};
this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
this.$router.push({
name: "Pay",
query: {
id: res.data.data,
}
});
// this.$router.push({ path: `/ticket/Pay/${res.data.data}`})
}else{
this.$message.error(res.data.message)
}
......
src/components/Ticket/Pay.vue
View file @ 3b44b49a
......@@ -167,7 +167,7 @@ export default {
};
},
created() {
if(this.$route.params.id==-1){
if(this.$route.query.id==-1){
this.visa=true;
let Visainfo=JSON.parse(sessionStorage.Visainfo);
this.Commoditydetails=Visainfo;
......@@ -177,12 +177,13 @@ export default {
this.code.body=Visainfo.description;
this.code.attach=`${Visainfo.costType}|${Visainfo.customerName}|${Visainfo.AirOrderId}|${Visainfo.customerId}|${Visainfo.outBranchId}`
}else{
this.AirOrderId=this.$route.params.id;
this.AirOrderId=this.$route.query.id;
this.TimeDjs();
}
},
methods: {
// 机票订单获取数据
TimeDjs() {
this.apiJavaPost(
"/api/dmc/airticket/GetB2BAirtickOrderPayInfo",
......
src/components/mall/OneDayDetailTwo.vue
View file @ 3b44b49a
......@@ -633,6 +633,7 @@ export default {
showFlight: false,
FlightList: [],
city: -1,
routed:"b2b_get_GetB2BTravelInfoV1",
}
},watch: { // 监听参数变化
changeCity: {
......@@ -661,7 +662,8 @@ export default {
},
methods: {
orderChosen: function (date) {
let day = date.split('-')[0] + '-' + date.split('-')[1]
let day = date.split('-')[0] + '-' + date.split('-')[1];
console.log("this.calendarTit",this.calendarTit)
this.calendarTit.forEach((x, index)=>{
if (x.dateStrS === day) {
this.selectMonth = index;
......@@ -755,7 +757,7 @@ export default {
for ( let i = 0; i < data.length; i++) {
if (word===data[i].startDate){
this.priceListIndex = i;
let msg = {configId:data[i].configIDDes, cityId:this.city, preview:this.pre, tcid:data[i].tcid}
let msg = {configId:data[i].configIDDes, cityId:this.city, preview:this.pre, tcid:data[i].tcid,teamType:2}
bus.$emit('chosen-tripdate', word)
this.getData(msg)
}
......@@ -782,14 +784,14 @@ export default {
break
}
}
let msg = {configId:this.ID,cityId:city,preview:this.pre,tcid:this.tcid}
let msg = {configId:this.ID,cityId:city,preview:this.pre,tcid:this.tcid,teamType:2}
this.getData(msg)
})
},
getData: function (msg) {
this.loadingDataList=true
// console.log('api',msg)
this.apipost('b2b_get_GetB2BTravelInfoV1',msg,r=>{
this.apipost(this.routed,msg,r=>{
if(r.data.resultCode==1){
let data = (r.data.data);
this.sonData = data;
......@@ -827,7 +829,6 @@ 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("dataList",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/mall/detailTwo.vue
View file @ 3b44b49a
......@@ -894,6 +894,7 @@ export default {
this.apipost('b2b_get_GetB2BTravelInfoV1',msg,r=>{
if(r.data.resultCode==1){
let data = (r.data.data);
console.log("data",data)
this.sonData = data;
this.dayList = data.dayList;
this.feature = data.feature;
......@@ -966,6 +967,8 @@ export default {
},null)
},
creatCalendar(list){ // 创建日历
console.log("list",list)
let dateList = [];
if(list && list.length>0){
list.forEach((x,index)=>{
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 3b44b49a
......@@ -9,6 +9,8 @@
<TcOrder v-if="data === '8-1'"/>
<!-- 自由行订单 -->
<TzOrder v-if="data === '8-2'"/>
<!-- 当地游订单 -->
<TDDOrder v-if="data === '8-3'"/>
<!-- 定制游订单 -->
<TdOrder v-if="data === '8-7'"/>
<!-- 签证订单 -->
......@@ -16,7 +18,9 @@
<!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/>
<!-- 景点门票订单 -->
<ScenOrder v-if="data === '8-8'"/>
<TscenOrder v-if="data === '8-8'"/>
<!-- <ScenOrder v-if="data === '8-8'"/> -->
</div>
</template>
<script>
......@@ -25,7 +29,9 @@ import TdOrder from './model/TdOrder'
import TQOrder from './model/TQOrder'
import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder'
import ScenOrder from './model/ScenOrder'
import TscenOrder from './model/TscenOrder'
import TDDOrder from './model/TDDOrder'
export default {
props:{
data: ''
......@@ -35,8 +41,9 @@ export default {
TdOrder: TdOrder,
TkOrder: TkOrder,
TzOrder: TzOrder,
ScenOrder:ScenOrder,
TscenOrder:TscenOrder,
TQOrder:TQOrder,
TDDOrder:TDDOrder
},
data() {
return {
......
src/components/newPersonalCenter/block/model/OrderInfoModel/NewTKtable.vue
View file @ 3b44b49a
......@@ -49,17 +49,20 @@
box-sizing: border-box;
}
.orderTable tbody .info .tc_info{
display: flex;
/* display: flex; */
}
.orderTable tbody .info .tc_info ._left{
width:64px;
height:64px;
background-color: gray;
margin-right: 10px;
display: inline-block;
}
.orderTable tbody .info .tc_info ._right{
color: #666666;
font-size: 12px;
display: inline-block;
width: 230px;
}
.color333{
color: #333333;
......
src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue 0 → 100644
View file @ 3b44b49a
<style scoped>
.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: 20px;
}
.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;
}
.orderTable tbody .info .tc_info{
display: flex;
align-items: center;
}
.orderTable tbody .info .tc_info ._left{
width:64px;
height:64px;
background-color: gray;
margin-right: 10px;display: inline-block;
}
.orderTable tbody .info .tc_info ._right{
color: #666666;
font-size: 12px;
display: inline-block;
width: 230px;
}
.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
}
.orderTable .colo33{
color:#666666;
}
</style>
<template>
<el-row>
<table class="orderTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th width="328px">
<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 in dayList">
<el-dropdown-item :command="item" :key="item.Day">{{item.Day}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
</th>
<th width="159px">
订单详情
</th>
<th width="120px">
客户信息
</th>
<th width="170px">
金额
</th>
<th width="140px">
订单状态
</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.createDate}}</span>
<span class="num">订单号：<span>{{item.id}}</span></span>
<!-- <span class="contacts"><i class="iconfont icon-dianhua"></i> <span>{{item.salesName}} {{item.salesMobile}}</span></span> -->
</td>
</tr>
<tr class="info" @mouseenter="enter(index)" :key="index+100" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
<td>
<div class="tc_info">
<div class="_left">
<img style="width:100%;height:100%" :src="item.coverImgs[0]" alt="">
</div>
<div class="_right">
<p class="color333 font-size14">{{item.couponsName}}</p>
<p>{{item.ticketName}}</p>
<!-- <p>团号：{{item.tcid}}</p> -->
</div>
</div>
</td>
<td class="name_list">
<p>数量：{{item.purchaseQuantity}}</p>
<p>使用日期：</p>
<p>{{item.useDate}}</p>
<!-- <p>婴儿：0</p> -->
</td>
<td>
<p>{{item.contactCNName}}</p>
<p style="margin-top:6px">{{item.contactMobile}}</p>
</td>
<td class="money">
<p>{{item.preferPrice | priceFormat}}</p>
<p style="color:#999999">已优惠：{{item.discountMoney | priceFormat}}</p>
</td>
<td class="color333 font-size12">
<span v-if="item.status === 1">正常</span>
<span v-else-if="item.status === 2">取消</span>
<span v-else-if="item.status === 3">待付款</span>
</td>
<td>
<p v-if="item.status === 3" style="margin-bottom:10px;">
<el-button @click="Pay(item)" size="mini" type="danger">查看详情</el-button>
</p>
<p v-if="item.status === 1 || item.status === 3" style="margin-bottom:10px;">
<el-button size="mini">取消订单</el-button>
</p>
<p class="font-size12 colo33" v-if="item.status==2">
取消
</p>
<p class="font-size12 colo33" v-if="item.refundStatus==2">
待退款
</p>
<p class="font-size12 colo33" v-if="item.refundStatus==3">
已退款
</p>
</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:[],
dayList: [
{
Day: "10天",
Number: 10,
ID: 1
},
{
Day: "30天",
Number: 30,
ID: 1
},
{
Day: "60天",
Number: 60,
ID: 1
}
],
};
},
mounted() {
// console.log("tableData",this.tableData)
},
methods: {
Pay(item){
let data={};
data=item.payInfo;
data.AirOrderId=item.payInfo.airOrderId;
sessionStorage.Visainfo=JSON.stringify(item.payInfo)
this.$router.push({
name: "Pay",
query: {
id:-1,
}
});
},
enter: function (t) {
if (t+1) {
this.activeRow = t
} else {
this.activeRow = ''
}
},
handleCommandTwo(command) {
this.dropTitTwo = command.Day;
let queryDays = command.Number;
this.$emit('queryDays', queryDays)
// 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 @ 3b44b49a
......@@ -48,17 +48,20 @@
padding: 20px 15px;
}
.orderTable tbody .info .tc_info{
display: flex;
/* display: flex; */
}
.orderTable tbody .info .tc_info ._left{
width:64px;
height:64px;
background-color: gray;
margin-right: 10px;
display: inline-block;
}
.orderTable tbody .info .tc_info ._right{
color: #666666;
font-size: 12px;
display: inline-block;
width: 230px;
}
.color333{
color: #333333;
......@@ -193,17 +196,19 @@
<tr class="info" @mouseenter="enter(index)" @mouseleave="enter()" :class="{hover_bg: activeRow === index}">
<td>
<div class="tc_info">
<div class="_left"></div>
<div class="_left">
<img style="width:100%;height:100%" :src="item.imgCover[0].url" alt="">
</div>
<div class="_right">
<p class="color333 font-size14">{{item.title}}</p>
<p>系列名称系列名称系列名称...</p>
<p>{{item.ltName}}</p>
<p>团号：{{item.tcid}}</p>
</div>
</div>
</td>
<td class="name_list">
<p>成人：5 [ <span class="__cp">上传名单</span> ]</p>
<p>儿童：5
<!-- <p>成人：5 [ <span class="__cp">上传名单</span> ]</p> -->
<p>旅客：{{item.guestNum}}
<el-popover
popper-class='list_details'
placement="bottom"
......@@ -221,36 +226,17 @@
<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>
<span slot="reference" v-if="item.guestList.length>0">[ <span class="__cp">名单详情</span> ]</span>
</el-popover>
</p>
<p>婴儿：0</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>
<p class="__cp pay_no" v-if="!item.payShow" @click="item.payShow = true">已付总额 ¥{{item.income | priceFormat}} <i class="iconfont icon-xia"></i></p>
<p class="__cp pay_no" v-if="item.payShow" @click="item.payShow = false">已付总额 ¥{{item.income | priceFormat}} <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>
......@@ -333,7 +319,7 @@ export default {
};
},
mounted() {
console.log("tableData",this.tableData)
// console.log("tableData",this.tableData)
},
methods: {
enter: function (t) {
......@@ -345,8 +331,8 @@ export default {
},
handleCommandTwo(command) {
this.dropTitTwo = command.Day;
// this.getOrderMsg.queryDays = command.Number;
// this.gerOrderList();
let queryDays = command.Number;
this.$emit('queryDays', queryDays)
},
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
......
src/components/newPersonalCenter/block/model/ScenOrder.vue → src/components/newPersonalCenter/block/model/ScenOrder(废).vue
View file @ 3b44b49a
......@@ -27,7 +27,7 @@
border
style="width: 100%">
<el-table-column
<el-table-column width="250px"
prop="couponsName"
label="景区名称">
</el-table-column>
......@@ -66,7 +66,7 @@
<el-button v-if="scope.row.status==3"
size="mini"
type="danger">付款</el-button>
<el-button v-if="scope.row.status!=2"
<el-button @click="Exit(scope.row)" v-if="scope.row.status!=2"
size="mini"
>取消订单</el-button>
</template>
......@@ -105,6 +105,23 @@ export default {
},
methods: {
Exit(row){
this.$confirm("确认取消订单?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apiJavaPost('/api/b2b/scenic/cancelTicketCouponsOrder',{orderId:row.id},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message);
}
},null)
}).catch(() => {
});
},
gourl(scope){
let path = 'CustomizedTourism'
this.$router.push({
......
src/components/newPersonalCenter/block/model/TDDOrder.vue 0 → 100644
View file @ 3b44b49a
<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" v-on:queryDays="queryDays"/>
<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: 3,
queryDays: 10,
orderState: -1,
CustomerId: ""
},
TitList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
],
tableData: []
};
},
computed: {},
created() {
},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
queryDays(val){
this.getOrderMsg.queryDays=val;
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
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
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/TQOrder.vue
View file @ 3b44b49a
......@@ -15,14 +15,14 @@
</template>
</ul>
<!-- 表格 -->
<TCTable :tableData="tableData"/>
<VisaTable v-loading="orderLoading" :tableData="tableData" v-on:queryDays="queryDays"/>
<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-row class="_pagination" v-if="totalCount > 0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
......@@ -34,53 +34,55 @@
</el-row>
</template>
<script>
import TCTable from "./OrderInfoModel/TCTable";
import VisaTable from "./OrderInfoModel/VisaTable";
export default {
components: {
TCTable: TCTable
VisaTable: VisaTable
},
data() {
return {
activeName: -1,
activeName: 0,
currentPage: 1,
rderLoading: false,
totalCount: 1,
orderLoading: false,
totalCount: 0,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 5,
queryDays: 0,
orderState: -1,
CustomerId: ""
queryDays:10,
visaOrderStatus: 0,
},
TitList: [
{
Type: "全部",
ID: -1
ID: 0
},
{
Type: "待付定金",
Type: "正常",
ID: 1
},
{
Type: "待付尾款",
Type: "取消",
ID: 2
},
{
Type: "待发团",
Type: "待付款",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
// {
// Type: "待发团",
// ID: 3
// },
// {
// Type: "交易完成",
// ID: 4
// },
// {
// Type: "取消",
// ID: 5
// }
// {
// val: 6,
// lable: '等待商家确认'
// },
......@@ -107,11 +109,17 @@ export default {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
// this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
// this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
queryDays(val){
this.getOrderMsg.queryDays=val;
this.gerOrderList();
},
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
......@@ -134,12 +142,11 @@ export default {
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
"/api/b2b/visa/getVisaOrderList",
this.getOrderMsg,
res => {
// console.log("sss",res)
if (res.data.resultCode == 1) {
this.tableData = res.data.data;
this.tableData = res.data.data.pageData;
console.log("签证订单",this.tableData)
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
......@@ -154,7 +161,7 @@ export default {
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.getOrderMsg.visaOrderStatus = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
......
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @ 3b44b49a
......@@ -15,7 +15,7 @@
</template>
</ul>
<!-- 表格 -->
<TCTable :tableData="tableData"/>
<TCTable :tableData="tableData" v-on:queryDays="queryDays"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
......@@ -51,7 +51,7 @@ export default {
pageIndex: 1,
pageSize: 10,
orderType: 7,
queryDays: 0,
queryDays: 10,
orderState: -1,
CustomerId: ""
},
......@@ -112,6 +112,13 @@ export default {
this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
queryDays(val){
console.log("val",val)
this.getOrderMsg.queryDays=val;
this.gerOrderList();
},
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
......@@ -139,7 +146,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
console.log("this.tableData",this.tableData)
console.log("定制游订单",this.tableData)
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
......
src/components/newPersonalCenter/block/model/TscenOrder.vue 0 → 100644
View file @ 3b44b49a
<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>
<!-- 表格 -->
<ScenTable v-loading="orderLoading" :tableData="tableData" v-on:queryDays="queryDays"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 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 ScenTable from "./OrderInfoModel/ScenTable";
export default {
components: {
ScenTable: ScenTable
},
data() {
return {
activeName: 0,
currentPage: 1,
orderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
queryDays:10,
visaOrderStatus: 0,
},
TitList: [
{
Type: "全部",
ID: 0
},
{
Type: "正常",
ID: 1
},
{
Type: "取消",
ID: 2
},
{
Type: "待付款",
ID: 3
}
],
tableData: []
};
},
computed: {},
created() {
},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
// this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
queryDays(val){
this.getOrderMsg.queryDays=val;
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
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/scenic/getTicketCouponsOrder",
this.getOrderMsg,
res => {
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
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.visaOrderStatus = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
}
};
</script>
src/components/newPersonalCenter/block/model/TzOrder.vue
View file @ 3b44b49a
......@@ -100,7 +100,6 @@ export default {
},
computed: {},
created() {
console.log("定制游订单");
},
mounted() {
let userInfo = localStorage.userInfo
......
src/components/visa/SchedProduct.vue
View file @ 3b44b49a
......@@ -365,7 +365,13 @@ export default {
if(res.data.resultCode==1){
that.Success(res.data.message);
sessionStorage.Visainfo=JSON.stringify(res.data.data)
this.$router.push({ path: `/ticket/Pay/${-1}`})
this.$router.push({
name: "Pay",
query: {
id: -1,
}
});
// this.$router.push({ path: `/ticket/Pay/${-1}`})
}else{
that.Error(res.data.message);
}
......
src/router.js
View file @ 3b44b49a
......@@ -319,8 +319,17 @@ export default new Router({
title: "行程填写"
}
},
// {
// path: "/ticket/Pay/:id",
// name: "Pay",
// component: resolve =>
// require(["@/components/Ticket/Pay"], resolve),
// meta: {
// title: "支付"
// }
// },
{
path: "/ticket/Pay/:id",
path: "/Pay",
name: "Pay",
component: resolve =>
require(["@/components/Ticket/Pay"], resolve),
......@@ -328,7 +337,6 @@ export default new Router({
title: "支付"
}
},
{
path: "/EditTicketOrder/:id",
name: "EditTicketOrder",
......
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