Authored by lzhy

调整部分页面

... ... @@ -9,15 +9,15 @@
</Row>
<br />
<Row>
<i-col span="4">订单号:{{ orderInfo.orderCode }}</i-col>
<i-col span="4">下单时间:{{ orderInfo.createTime | timeFormat }}</i-col>
<i-col span="4">发货时间:{{ orderInfo.shipmentTime | timeFormat }}</i-col>
<i-col span="6">订单号:{{ orderInfo.orderCode }}</i-col>
<i-col span="6">下单时间:{{ orderInfo.createTime | timeFormat }}</i-col>
<i-col span="6">发货时间:{{ orderInfo.shipmentTime | timeFormat }}</i-col>
</Row>
<br />
<Row>
<i-col span="4">订单状态:{{ orderStatus[orderInfo.orderStatus] }}</i-col>
<i-col span="4">提交时间:{{ orderInfo.checkTime | timeFormat }}</i-col>
<i-col span="4">成交时间:{{ orderInfo.deliveryTime | timeFormat }}</i-col>
<i-col span="6">订单状态:{{ orderStatus[orderInfo.orderStatus] }}</i-col>
<i-col span="6">提交时间:{{ orderInfo.checkTime | timeFormat }}</i-col>
<i-col span="6">成交时间:{{ orderInfo.deliveryTime | timeFormat }}</i-col>
</Row>
</div>
</div>
... ...
<template>
<div class="ivu-card">
<div class="ivu-card-head">
<h3>退款商品信息</h3>
<p slot="title">退款商品信息</p>
</div>
<div class="ivu-card-body">
<table cellspacing="0" cellpadding="0" class="order-detail">
... ... @@ -31,17 +31,6 @@
<td>{{ goods.giftCardAmount }}</td>
<td>{{ goods.activityDiscount }}</td>
<td>{{ returnedReason[goods.returnedReason] }}</td>
<template v-if="index == 0">
<td :rowspan="tableData.length">
{{ returnedInfo.realReturnedAmount }}
</td>
<td :rowspan="tableData.length">
{{ returnedInfo.returnShippingCost }}
</td>
<td :rowspan="tableData.length">
{{ returnedInfo.realReturnedAmount + returnedInfo.returnShippingCost }}
</td>
</template>
</tr>
<tr v-if="goods.remark || goods.imperfectImage" :key="index + '_1'" class="returned-remark">
<td colspan="14">
... ... @@ -64,7 +53,7 @@
import prodImage from 'util/prod-image';
export default {
name: 'ReturnedGoodsInfo',
props: ['tableData', 'returnedReason', 'returnedInfo'],
props: ['tableData', 'returnedReason'],
data() {
return {
tableCols: [
... ... @@ -79,9 +68,6 @@ export default {
{ title: '礼品卡', width: '6%' },
{ title: '活动优惠', width: '6%' },
{ title: '退款原因', width: '6%' },
{ title: '退货款金额', width: '6%' },
{ title: '退运费金额', width: '6%' },
{ title: '退款总金额', width: '6%' },
],
};
},
... ...
... ... @@ -2,17 +2,23 @@
<div class="ivu-row">
<div class="ivu-card">
<div class="ivu-card-head">
<h3>退货申请处理</h3>
<p slot="title">退货申请处理</p>
</div>
<div class="ivu-card-body">
<Row>
<i-col span="4">退货ID:{{ id }}</i-col>
<i-col span="4">退款申请时间:{{ returnedInfo.createTime | timeFormat }}</i-col>
<i-col span="4">退货状态:{{ returnedGoodsShopStatus[returnedInfo.shopStatus] }}</i-col>
<i-col span="6">退货ID:{{ id }}</i-col>
<i-col span="6">退款申请时间:{{ returnedInfo.createTime | timeFormat }}</i-col>
<i-col span="6">退货状态:{{ returnedGoodsShopStatus[returnedInfo.shopStatus] }}</i-col>
</Row>
<br />
<Row>
<i-col span="6">退货款金额:{{ returnedInfo.realReturnedAmount }}</i-col>
<i-col span="6">退运费金额:{{ returnedInfo.returnShippingCost }}</i-col>
<i-col span="6">退款总金额:{{ returnTotalAmount }}</i-col>
</Row>
<br />
<Row>
<i-col span="4">退款总金额:{{ returnTotalAmount }}</i-col>
<i-col span="4">
<i-col span="8">
退款成功时间:<span v-if="returnedInfo.refundTime">{{ returnedInfo.refundTime | timeFormat }}</span>
</i-col>
</Row>
... ... @@ -21,8 +27,7 @@
<!--订单基本信息-->
<order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
<!--退货商品信息-->
<returned-goods-info :table-data="returnGoods" :returned-reason="returnedReasonArr" :returned-info="returnedInfo">
</returned-goods-info>
<returned-goods-info :table-data="returnGoods" :returned-reason="returnedReasonArr"></returned-goods-info>
<div class="ivu-card">
<div class="ivu-card-head">
<h3>寄回物流信息</h3>
... ...