zhangdan hace 4 años
padre
commit
573339174a
Se han modificado 2 ficheros con 20 adiciones y 20 borrados
  1. 6 7
      src/views/Order/OrderCenter.vue
  2. 14 13
      src/views/Order/OrderDetailModal.vue

+ 6 - 7
src/views/Order/OrderCenter.vue

@@ -174,12 +174,12 @@ export default {
         }
 
       },
-      // {
-      //   title: '优惠(¥)',
-      //   dataIndex: 'couponAmount',
-      //   minWidth: '40',
-      //   align: 'center'
-      // },
+      {
+        title: '优惠(¥)',
+        dataIndex: 'couponAmount',
+        minWidth: '40',
+        align: 'center'
+      },
       {
         title: '状态',
         dataIndex: 'orderStatus',
@@ -215,7 +215,6 @@ export default {
       }
     }
   },
-
   methods: {
     moment,
     // 创建时间change

+ 14 - 13
src/views/Order/OrderDetailModal.vue

@@ -56,6 +56,20 @@
                 <span v-if=" orderDetailData.payStatus != 'PAID' ">{{ 0 }} 元</span>
               </a-form-item>
             </a-col>
+            <a-col :span="8">
+              <a-form-item label="优惠(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+                <span>{{ orderDetailData.couponAmount }}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="8">
+              <a-form-item label="使用优惠券" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
+                <!-- <span>{{ Coupons.couponTitle || '-' }}</span> -->
+                <span>{{ orderDetailData.orderCoupons ? orderDetailData.orderCoupons[0].couponTitle : '-' }}</span>
+
+              </a-form-item>
+            </a-col>
             <a-col :span="8">
               <a-form-item label="洗车照片" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
                 <div style="display: flex;">
@@ -78,18 +92,6 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
-            <!-- <a-col :span="8">
-              <a-form-item label="优惠(¥)" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-                <span>{{'-'}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="8">
-              <a-form-item label="优惠券名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-                <span>{{"-"}}</span>
-              </a-form-item>
-            </a-col> -->
-          </a-row>
           <a-row style="text-align: center;margin-top: 100px;">
             <a-col>
               <a-form-item>
@@ -174,7 +176,6 @@ export default {
             }, 500)
           }
           this.orderDetailData = res.data
-          // console.log(this.orderDetailData, '---')
         })
       }
     },