Skip to content

A
Athena
Commit d6539d19 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

订单

parent 9fbecbac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1109 additions and 1 deletion
src/components/FreeTravel/OrderConfirmation.vue
View file @ d6539d19
...@@ -386,6 +386,7 @@ export default { ...@@ -386,6 +386,7 @@ export default {
msg.total_fee=data.TotalPrice; msg.total_fee=data.TotalPrice;
msg.body=data.Describe; msg.body=data.Describe;
msg.orderId=data.orderId; msg.orderId=data.orderId;
msg.costType=data.costType;
msg.attach=`${data.costType}|${userInfo.name}|${data.orderId}|${userInfo.customerId}|${data.RB_Branch_id}`; msg.attach=`${data.costType}|${userInfo.name}|${data.orderId}|${userInfo.customerId}|${data.RB_Branch_id}`;
sessionStorage.setItem("FreePay",JSON.stringify(msg)); sessionStorage.setItem("FreePay",JSON.stringify(msg));
this.$router.push({name:'FreePayBefore'}) this.$router.push({name:'FreePayBefore'})
......
src/components/FreeTravel/payInfo.vue 0 → 100644
View file @ d6539d19
This diff is collapsed.
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ d6539d19
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
<div> <div>
<!-- 团订单 --> <!-- 团订单 -->
<TcOrder v-if="data === '8-1'"/> <TcOrder v-if="data === '8-1'"/>
<!-- 新自由行订单 -->
<FreeOrder v-if="data === '8-2'"/>
<!-- 自由行订单 --> <!-- 自由行订单 -->
<TzOrder v-if="data === '8-2'"/> <!-- <TzOrder v-if="data === '8-2'"/> -->
<!-- 当地游订单 --> <!-- 当地游订单 -->
<TDDOrder v-if="data === '8-3'"/> <TDDOrder v-if="data === '8-3'"/>
<!-- 定制游订单 --> <!-- 定制游订单 -->
...@@ -31,6 +33,7 @@ ...@@ -31,6 +33,7 @@
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 TQOrder from './model/TQOrder'
import FreeOrder from './model/FreeOrder'
import TzOrder from './model/TzOrder' import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder' import TkOrder from './model/TkOrder'
import TscenOrder from './model/TscenOrder' import TscenOrder from './model/TscenOrder'
...@@ -47,6 +50,7 @@ export default { ...@@ -47,6 +50,7 @@ export default {
TdOrder: TdOrder, TdOrder: TdOrder,
TkOrder: TkOrder, TkOrder: TkOrder,
TzOrder: TzOrder, TzOrder: TzOrder,
FreeOrder: FreeOrder,
TscenOrder:TscenOrder, TscenOrder:TscenOrder,
TQOrder:TQOrder, TQOrder:TQOrder,
TDDOrder:TDDOrder, TDDOrder:TDDOrder,
......
src/components/newPersonalCenter/block/model/FreeOrder.vue 0 → 100644
View file @ d6539d19
<style>
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
.FreeOrder .PlaceLi{
float: right;
padding:0;
}
.FreeOrder .PlaceLi .el-input__inner{
border-radius: 0;
}
.FreeOrder .PlaceLi .el-button{
background: #dddddd;
border-radius: 0;
outline: none;
}
</style>
<template>
<el-row class="OrderCenter FreeOrder">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
class="__cp"
@click="handleClick(item)" :key="item.ID"
:class="{_active: activeName === item.ID}"
>{{item.Type}}</li>
</template>
<li class="PlaceLi">
<el-input style="display:inline-block;width:150px" v-model="getOrderMsg.ProductName" size="mini" placeholder="商品名称"></el-input>
<el-button @click="SearchInput" size="mini" icon="el-icon-search"></el-button>
</li>
</ul>
<!-- 表格 -->
<FreeTable 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="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 FreeTable from "./OrderInfoModel/FreeTable";
export default {
components: {
FreeTable: FreeTable
},
data() {
return {
activeName: -1,
currentPage: 1,
orderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 5,
queryDays: 0,
ProductType:"",
B2BSelectOrderState:0,
RB_Branch_Id:-1,
RB_Department_Id:0,
CreateBy:0,
ProductName:"",
StartTime:"",
EndTime:"",
CStartTime:"",
CEndTime:"",
CustomerId: "",
},
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: {
SearchInput(){
this.gerOrderList();
},
queryDays(){
this.gerOrderList();
},
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
this.getOrderMsg,
res => {
if (r.data.resultCode == 1) {
console.log(res);
} else {
this.$message.error(r.data.message);
}
},
null
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apipost(
"sellorder_post_GetB2BKKDayOrderList",
this.getOrderMsg,
res => {
this.orderLoading = false;
if (res.data.resultCode == 1) {
console.log("reasfafs",res);
this.tableData=res.data.data.pageData;
console.log(" this.tableData", this.tableData);
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
} else {
this.$message.error(res.data.message);
}
},
null
);
},
handleClick(item) {
console.log(item);
this.activeName = item.ID;
this.getOrderMsg.B2BSelectOrderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
}
};
</script>
src/components/taskPage/Img5.vue
View file @ d6539d19
...@@ -86,6 +86,12 @@ height: 100%; ...@@ -86,6 +86,12 @@ height: 100%;
width: 34%; width: 34%;
} }
.TuanDivPc{
position: absolute;
bottom: 100px;
left: 0;
width: 100%;
}
</style> </style>
...@@ -116,6 +122,46 @@ height: 100%; ...@@ -116,6 +122,46 @@ height: 100%;
<source src="../../assets/media/mhb.mp4" type="video/webm"> <source src="../../assets/media/mhb.mp4" type="video/webm">
</video> </video>
</div> </div>
<div class="TuanDivPc" style="bottom:6px;font-size:12px">
<div style="width:90%;margin:0 auto;z-index:200">
<el-row style="padding:4px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/nvnRDgcd%2FPI%3D/4170/preview"> 土耳其+希腊13天</a>
</el-col>
<el-col :span="12" style="text-align:center">出团日期：9月26日</el-col>
</el-row>
<el-row style="padding:4px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/56HVNdIExFI%3D/5705/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="12" style="text-align:center">出团日期： 10月05日</el-col>
</el-row>
<el-row style="padding:4px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/orsYR2%2B%2B9ps%3D/5661/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="12" style="text-align:center">出团日期： 10月10日</el-col>
</el-row>
<el-row style="padding:4px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/6vbZ9iLhhM0%3D/5697/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="12" style="text-align:center">出团日期： 10月11日</el-col>
</el-row>
<el-row style="padding:4px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/te1%2B4I7a7vY%3D/5702/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="12" style="text-align:center">出团日期： 10月12日</el-col>
</el-row>
<!-- <el-row style="padding:4px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/8c5Ehbo3dUY%3D/5698/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="12" style="text-align:center">出团日期： 10月25日</el-col>
</el-row> -->
</div>
</div>
</div> </div>
</div> </div>
<div style="position: relative;" v-show="!isPhone"> <div style="position: relative;" v-show="!isPhone">
...@@ -143,6 +189,50 @@ height: 100%; ...@@ -143,6 +189,50 @@ height: 100%;
<source src="../../assets/media/mhb.mp4" type="video/webm"> <source src="../../assets/media/mhb.mp4" type="video/webm">
</video> </video>
</div> </div>
<div class="TuanDivPc">
<div style="width:90%;margin:0 auto;z-index:200">
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;margin-left:100px;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/nvnRDgcd%2FPI%3D/4170/preview"> 土耳其+希腊13天</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期：9月26日</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;margin-left:100px;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/56HVNdIExFI%3D/5705/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期： 10月05日</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;margin-left:100px;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/orsYR2%2B%2B9ps%3D/5661/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期： 10月10日</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;margin-left:100px;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/6vbZ9iLhhM0%3D/5697/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期： 10月11日</el-col>
</el-row>
<el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;margin-left:100px;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/te1%2B4I7a7vY%3D/5702/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期： 10月12日</el-col>
</el-row>
<!-- <el-row style="padding:15px 0;cursor:pointer" :gutter="20">
<el-col :span="12" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align: center;margin-left:100px;">
<a target="_blank" href="http://www.oytour.com/#/detailTwo/8c5Ehbo3dUY%3D/5698/preview"> 土耳其希腊</a>
</el-col>
<el-col :span="8" style="text-align:center">出团日期： 10月25日</el-col>
</el-row> -->
</div>
</div>
</div> </div>
</div> </div>
......
src/router.js
View file @ d6539d19
...@@ -727,6 +727,15 @@ export default new Router({ ...@@ -727,6 +727,15 @@ export default new Router({
title: "自由行-支付" title: "自由行-支付"
} }
}, },
{
path: "/payInfo",
name: "payInfo",
component: resolve =>
require(["@/components/FreeTravel/payInfo.vue"], resolve),
meta: {
title: "自由行-订单详情"
}
},
] ]
}, },
{ {
......
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