|
|
@@ -10,7 +10,7 @@
|
|
|
<template slot="title">
|
|
|
<div class="title-status-wrap">
|
|
|
<div class="title-text">订单详情</div>
|
|
|
- <div class="title-status">
|
|
|
+ <div class="title-status" :class="{ success: orderOperate.status == 5 }">
|
|
|
<span>当前订单状态：</span>
|
|
|
<span>{{ orderOperate.status | constantfilter('ORDER_STATUS') }}</span>
|
|
|
</div>
|
|
|
@@ -28,8 +28,8 @@
|
|
|
width="280px"
|
|
|
></el-table-column>
|
|
|
<el-table-column property="sendCost" label="运费"></el-table-column>
|
|
|
- <el-table-column property="actPrice" label="原价"></el-table-column>
|
|
|
- <el-table-column property="prePrice" label="实付款"></el-table-column>
|
|
|
+ <el-table-column property="prePrice" label="原价"></el-table-column>
|
|
|
+ <el-table-column property="actPrice" label="实付款"></el-table-column>
|
|
|
<el-table-column
|
|
|
property="sourceType"
|
|
|
label="订单来源"
|
|
|
@@ -120,7 +120,7 @@
|
|
|
label="属性"
|
|
|
></el-table-column>
|
|
|
<el-table-column property="num" label="数量"></el-table-column>
|
|
|
- <el-table-column property="unitPrice" label="库存"></el-table-column>
|
|
|
+ <!-- <el-table-column property="unitPrice" label="库存"></el-table-column> -->
|
|
|
<el-table-column property="unitPrice" label="小计"></el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
@@ -130,24 +130,35 @@
|
|
|
<div class="card-tit">费用信息</div>
|
|
|
<div class="card-body">
|
|
|
<el-table :data="data">
|
|
|
- <el-table-column property="prePrice" label="商品合计"></el-table-column>
|
|
|
+ <el-table-column label="商品合计">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span class="app-price">{{
|
|
|
+ scope.row.prePrice - scope.row.sendCost
|
|
|
+ }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column property="sendCost" label="运费"></el-table-column>
|
|
|
<el-table-column property="prePrice" label="应付款"></el-table-column>
|
|
|
- <el-table-column property="growth" label="随机优惠"></el-table-column>
|
|
|
- </el-table>
|
|
|
- <el-table :data="data">
|
|
|
- <el-table-column
|
|
|
- property="totalExpend"
|
|
|
- label="会员优惠"
|
|
|
- ></el-table-column>
|
|
|
<el-table-column
|
|
|
- property="totalBuyNum"
|
|
|
- label="手动改价"
|
|
|
+ property="discountAmount"
|
|
|
+ label="随机优惠"
|
|
|
></el-table-column>
|
|
|
- <el-table-column property="balance" label="优惠券"></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-table :data="data">
|
|
|
+ <el-table-column label="会员优惠">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.discountType == 1 ? '有' : '无' }}</span>
|
|
|
+ </template></el-table-column
|
|
|
+ >
|
|
|
+ <el-table-column property="modPrice" label="手动改价"></el-table-column>
|
|
|
+ <el-table-column property="balance" label="优惠券">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.discountType == 0 ? '有' : '无' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="实付款">
|
|
|
<template slot-scope="scope">
|
|
|
- <span class="app-price">{{ scope.row.prePrice }}</span>
|
|
|
+ <span class="app-price">{{ scope.row.actPrice }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -211,6 +222,9 @@ export default {
|
|
|
}
|
|
|
.title-status {
|
|
|
color: red;
|
|
|
+ &.success {
|
|
|
+ color: green;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -226,7 +240,7 @@ export default {
|
|
|
// border-bottom: 0;
|
|
|
.card-tit {
|
|
|
font-size: 16px;
|
|
|
- margin-bottom: 6px;
|
|
|
+ margin-bottom: 8px;
|
|
|
}
|
|
|
.card-body {
|
|
|
border: 1px solid $borderColor;
|
lalala