Skip to content

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

‘修改订单页面’

parent e99a5f0b
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 15 deletions
src/assets/mall/PsOrder.css
View file @ 7d0592a8
.PsOrder ._content table{ .PsOrder ._content table{
width: 100%; width: 100%;
border-collapse: collapse;
} }
.PsOrder ._content tbody td{ .PsOrder ._content tbody td{
padding: 6px 0; padding: 6px 0;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
border-bottom: 1px solid #E6E6E6; border: 1px solid #E6E6E6;
} }
.PsOrder ._el_tab{ .PsOrder ._el_tab{
margin: 20px 0 0 0; margin: 20px 0 0 0;
} }
.PsOrder ._el_tab ul{ .PsOrder ._el_tab ul{
padding: 0 80px; padding: 0 80px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #E6E6E6; border-bottom: 1px solid #E6E6E6;
} }
.PsOrder ._el_tab ul li{ .PsOrder ._el_tab ul li{
...@@ -33,4 +34,8 @@ ...@@ -33,4 +34,8 @@
color: #E73828; color: #E73828;
border-bottom: 2px solid #E73828; border-bottom: 2px solid #E73828;
} }
.PsOrder .hgh_table{margin-bottom: 20px;} .PsOrder .table_box{
\ No newline at end of file min-height: 565px;
}
.PsOrder .hgh_table{margin-bottom: 20px;}
.PsOrder .hgh_table tr td{line-height: 30px}
\ No newline at end of file
src/components/PersonalCenter/PsOrder.vue
View file @ 7d0592a8
<style> <style>
@import "../../assets/mall/PsOrder.css"; @import "../../assets/mall/PsOrder.css";
.TC_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}
.TC_tripDetails .popper__arrow::after {border-bottom-color: #ededed !important;}
.TC_tripDetails table { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
.TC_tripDetails table th { background-color: #ededed; padding: 5px;}
.TC_tripDetails table td { background-color: #ffffff; padding: 9px 15px;color: #333333;border: 1px solid #d2d2d2;}
.TC_tripDetails table td._d_name {background-color: #ededed;}
.TC_tripDetails table ._color_666 {color: #666666;}
.TC_tripDetails table tr._color_666 th { padding: 9px 15px;}
</style> </style>
<template> <template>
...@@ -7,21 +15,23 @@ ...@@ -7,21 +15,23 @@
<el-col :span="20" :offset="2" class="_content"> <el-col :span="20" :offset="2" class="_content">
<el-row class="_el_tab"> <el-row class="_el_tab">
<ul> <ul>
<li :class="active==0?'active':''" @click="active=0,getList(),resetPageIndex()">全部订单</li> <li :class="active==0?'active':''" @click="active=0,resetPageIndex(),getList()">全部订单</li>
<li :class="active==1?'active':''" @click="active=1,getList(),resetPageIndex()">待付款</li> <li :class="active==1?'active':''" @click="active=1,resetPageIndex(),getList()">待付款</li>
<li :class="active==2?'active':''" @click="active=2,getList(),resetPageIndex()">等待出团</li> <li :class="active==2?'active':''" @click="active=2,resetPageIndex(),getList()">等待出团</li>
<li :class="active==3?'active':''" @click="active=3,getList(),resetPageIndex()">已出团</li> <li :class="active==3?'active':''" @click="active=3,resetPageIndex(),getList()">已出团</li>
<li :class="active==4?'active':''" @click="active=4,getList(),resetPageIndex()">已取消</li> <li :class="active==4?'active':''" @click="active=4,resetPageIndex(),getList()">已取消</li>
</ul> </ul>
</el-row> </el-row>
<el-row class="_table_box" v-loading='dateLoading'> <el-row class="_table_box" v-loading='dateLoading'>
<table style="border:1px solid #E6E6E6;" class="hgh_table" border="0" cellspacing="0" cellpadding="0" v-if="MyOrderPageList.length"> <div class="table_box" v-if="MyOrderPageList.length">
<table class="hgh_table" border="0" cellspacing="0" cellpadding="0" >
<thead> <thead>
<tr> <tr>
<th >出发日期</th> <th >出发日期</th>
<th >订单号/来源</th> <th >订单号/来源</th>
<th >人数</th> <th >人数</th>
<th >总金额(元)</th> <th >总金额(元)</th>
<th >优惠金额(元)</th>
<th >实付金额</th> <th >实付金额</th>
<th >状态</th> <th >状态</th>
<th >下单时间</th> <th >下单时间</th>
...@@ -33,8 +43,42 @@ ...@@ -33,8 +43,42 @@
<td>{{item.startDate}}</td> <td>{{item.startDate}}</td>
<td>{{item.orderId}}</td> <td>{{item.orderId}}</td>
<td>{{item.guestNum}}</td> <td>{{item.guestNum}}</td>
<td class="hgh_font_color_org">{{item.preferPrice}}</td> <td class="hgh_font_color_org">{{moneyFormat(item.preferPrice)}}</td>
<td class="hgh_font_color_org">￥{{item.income}}</td> <td class="hgh_font_color_org">
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-for="(fItem,fIndex) in item.couponAllotList" :key="fIndex" style="text-align:center;">
<td>
{{fItem.couponsName}}
</td>
<td>
{{fItem.couponsType === 1 ? '抵用券' : '折扣券'}}
</td>
<td>
{{fItem.denomination}}
</td>
<td>
满{{fItem.useCondition}}使用
</td>
<td>{{fItem.accessType === 1 ? '抽奖' : '其他'}}</td>
<td>{{fItem.acessDate}}</td>
</tr>
</table>
<div slot="reference" style="cursor: pointer;text-decoration: underline;">
{{moneyFormat(item.discountMoney)}}
</div>
</el-popover>
</td>
<td class="hgh_font_color_org">￥{{moneyFormat(item.income)}}</td>
<td> <td>
<span v-if="item.orderType==1">待付款</span> <span v-if="item.orderType==1">待付款</span>
<span v-if="item.orderType==2">待出团</span> <span v-if="item.orderType==2">待出团</span>
...@@ -49,12 +93,14 @@ ...@@ -49,12 +93,14 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<div class="item-pager" v-if="MyOrderPageList.length"> <div class="item-pager" v-if="MyOrderPageList.length">
<el-pagination <el-pagination
background background
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="totalCount" :total="totalCount"
:page-size='pageSize' :page-size='pageSize'
:current-page.sync="currentPage"
@current-change='handleCurrentChange'> @current-change='handleCurrentChange'>
</el-pagination> </el-pagination>
</div> </div>
...@@ -79,11 +125,12 @@ export default { ...@@ -79,11 +125,12 @@ export default {
pageSize:1, pageSize:1,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:11, pageSize:12,
orderType:0, orderType:0,
}, },
MyOrderPageList:[], MyOrderPageList:[],
dateLoading:true, dateLoading:true,
currentPage: 1,
} }
}, },
computed: { computed: {
...@@ -137,6 +184,7 @@ export default { ...@@ -137,6 +184,7 @@ export default {
}, },
resetPageIndex() {//查询初始化页码 resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1;
}, },
} }
} }
......
src/components/global/head.vue
View file @ 7d0592a8
...@@ -65,7 +65,8 @@ color:rgba(51,51,51,1); ...@@ -65,7 +65,8 @@ color:rgba(51,51,51,1);
<el-menu-item index="3-2">中国（繁体）</el-menu-item> <el-menu-item index="3-2">中国（繁体）</el-menu-item>
<el-menu-item index="3-3">英语</el-menu-item> <el-menu-item index="3-3">英语</el-menu-item>
</el-submenu> --> </el-submenu> -->
<el-menu-item index="2" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">我的订单</a></el-menu-item> <!-- 我的订单 -->
<el-menu-item index="2" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人中心</a></el-menu-item>
<el-menu-item index="1" @click="goUrl('heel',true)"><a href="javascript:void(0);">首页</a></el-menu-item> <el-menu-item index="1" @click="goUrl('heel',true)"><a href="javascript:void(0);">首页</a></el-menu-item>
</el-menu> </el-menu>
</el-col> </el-col>
......
src/components/trade/order/indexTwo.vue
View file @ 7d0592a8
...@@ -389,12 +389,13 @@ ...@@ -389,12 +389,13 @@
</div> </div>
</div> --> </div> -->
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment' import moment from 'moment'
import bus from '../../../plugins/event-bus' import bus from '../../../plugins/event-bus'
import LuckDraw from '../../mall/LuckDraw'
export default { export default {
components: {LuckDraw},
props:['ID','tcid','numPeople'], props:['ID','tcid','numPeople'],
data () { data () {
let that=this let that=this
......
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