From 36e381eb3b78dcd6afe252d7f73d5a97b36c77dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 3 Mar 2023 11:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue | 45 +++++++++++++++++----------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index e2179e1..d3d5af4 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -263,15 +263,6 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="订单金额" prop="totalPrice">
-          <el-input
-            v-model="orderList.totalPrice"
-            disabled
-            style="width: 240px"
-          />
-        </el-form-item>
-      
-        
         <el-form-item label="订单类型" prop="orderType">
           <el-select
             v-model="orderList.orderType"
@@ -288,13 +279,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="订单原始总金额" prop="originalTotalPrice"  v-if="orderList.orderType=='INTEGRAL_EXCHANGE'">
-          <el-input
-            v-model="orderList.originalTotalPrice"
-            disabled
-            style="width: 240px"
-          />
-        </el-form-item>
         <el-form-item label="兑换商品数量" prop="integralExchangeCount"  v-if="orderList.orderType=='INTEGRAL_EXCHANGE'">
           <el-input
             v-model="orderList.integralExchangeCount"
@@ -316,6 +300,35 @@
             style="width: 240px"
           />
         </el-form-item>
+        <el-form-item label="订单原始总金额" prop="originalTotalPrice"  v-if="orderList.orderType=='INTEGRAL_EXCHANGE'">
+          <el-input
+            v-model="orderList.originalTotalPrice"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item label="优惠券名称" prop="couponTitle">
+          <el-input
+            v-model="orderList.couponTitle"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item label="优惠金额" prop="discountPrice">
+          <el-input
+            v-model="orderList.discountPrice"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item label="订单应付总金额" prop="totalPrice">
+          <el-input
+            v-model="orderList.totalPrice"
+            disabled
+            style="width: 240px"
+          />
+        </el-form-item>
+      
         <el-form-item label="收货人" prop="receiveAddress">
           <el-input
             v-model="orderList.receiver"