提交

1

src/views/oms/order/orderDetail.vue

@@ -40,9 +40,9 @@
             >修改收货人信息</el-button
           >
           <el-button size="mini">修改商品信息</el-button>
-          <el-button size="mini" @click="showUpdateMoneyDialog"
+          <!-- <el-button size="mini" @click="showUpdateMoneyDialog"
             >修改费用信息</el-button
-          >
+          > -->
           <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
           <!-- <el-button size="mini" @click="showCloseOrderDialog"
             >关闭订单</el-button
@@ -249,16 +249,16 @@
         </el-row>
         <el-row>
           <el-col :span="6" class="table-cell-title">活动优惠</el-col>
-          <el-col :span="6" class="table-cell-title">折扣金额</el-col>
-          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
           <el-col :span="6" class="table-cell-title">应付款金额</el-col>
+          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
+          <el-col :span="6" class="table-cell-title">现金金额</el-col>
         </el-row>
         <el-row>
           <el-col :span="6" class="table-cell"
             >-￥{{ order.promotionAmount }}</el-col
           >
           <el-col :span="6" class="table-cell"
-            >-￥{{ order.discountAmount }}</el-col
+            >-￥{{  order.payAmount+ order.integrationAmount }}</el-col
           >
           <el-col :span="6" class="table-cell">
             <span class="color-danger"
@@ -268,7 +268,7 @@
           <el-col :span="6" class="table-cell">
             <span class="color-danger"
               >￥{{
-                order.payAmount + order.freightAmount - order.discountAmount
+                order.payAmount
               }}</span
             >
           </el-col>
@@ -393,9 +393,9 @@
         </el-row>
         <el-row>
           <el-col :span="6" class="table-cell-title">活动优惠</el-col>
-          <el-col :span="6" class="table-cell-title">折扣金额</el-col>
-          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
           <el-col :span="6" class="table-cell-title">应付款金额</el-col>
+          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
+          <el-col :span="6" class="table-cell-title">现金金额</el-col>
         </el-row>
         <el-row>
           <el-col :span="6" class="table-cell"
@@ -708,6 +708,7 @@ export default {
       });
     },
     showUpdateMoneyDialog() {
+      return
       this.moneyDialogVisible = true;
       this.moneyInfo.orderId = this.order.id;
       this.moneyInfo.freightAmount = this.order.freightAmount;