diff --git a/src/views/oms/order/orderDetail.vue b/src/views/oms/order/orderDetail.vue
index e3ce83f..18bbd28 100644
--- a/src/views/oms/order/orderDetail.vue
+++ b/src/views/oms/order/orderDetail.vue
@@ -78,6 +78,122 @@
{{order | formatAddress}}
+
+
+ 商品信息
+
+
+
+
+ ![]()
+
+
+
+
+ {{scope.row.productName}}
+ 品牌：{{scope.row.productBrand}}
+
+
+
+
+ 价格：￥{{scope.row.productPrice}}
+ 货号：{{scope.row.productSn}}
+
+
+
+
+ {{scope.row.productAttr | formatProductAttr}}
+
+
+
+
+ {{scope.row.productQuantity}}
+
+
+
+
+ ￥{{scope.row.productPrice*scope.row.productQuantity}}
+
+
+
+
+ 合计：￥{{order.totalAmount}}
+
+
+
+ 费用信息
+
+
+
+ 商品合计
+ 运费
+ 优惠券
+ 积分抵扣
+
+
+ ￥{{order.totalAmount}}
+ ￥{{order.freightAmount}}
+ -￥{{order.couponAmount}}
+ -￥{{order.integrationAmount}}
+
+
+ 活动优惠
+ 折扣金额
+ 订单总金额
+ 应付款金额
+
+
+ -￥{{order.promotionAmount}}
+ -￥{{order.discountAmount}}
+
+ ￥{{order.totalAmount+order.freightAmount}}
+
+
+ ￥{{order.payAmount}}
+
+
+
+
+
+ 操作信息
+
+
+
+
+ {{scope.row.operateMan}}
+
+
+
+
+ {{formatTime(scope.row.createTime)}}
+
+
+
+
+ {{scope.row.orderStatus | formatStatus}}
+
+
+
+
+ {{scope.row.orderStatus | formatPayStatus}}
+
+
+
+
+ {{scope.row.orderStatus | formatDeliverStatus}}
+
+
+
+
+ {{scope.row.note}}
+
+
+
@@ -131,6 +247,52 @@
str += " " + order.receiverRegion;
str += " " + order.receiverDetailAddress;
return str;
+ },
+ formatStatus(value) {
+ if (value === 1) {
+ return '待发货';
+ } else if (value === 2) {
+ return '已发货';
+ } else if (value === 3) {
+ return '已完成';
+ } else if (value === 4) {
+ return '已关闭';
+ } else if (value === 5) {
+ return '无效订单';
+ } else {
+ return '待付款';
+ }
+ },
+ formatPayStatus(value) {
+ if (value === 0) {
+ return '未支付';
+ } else if(value===4){
+ return '已退款';
+ }else{
+ return '已支付';
+ }
+ },
+ formatDeliverStatus(value) {
+ if (value === 0||value === 1) {
+ return '未发货';
+ } else {
+ return '已发货';
+ }
+ },
+ formatProductAttr(value){
+ if(value==null){
+ return '';
+ }else{
+ let attr = JSON.parse(value);
+ let result='';
+ for(let i=0;i