From 02399754818b61aac70271b371218215a104bb53 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 14 Nov 2022 16:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue | 66 ++++++++++++++++-----------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index f0c8bf1..1871521 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -242,25 +242,7 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="地址" prop="receiveAddress">
-          <el-input
-            v-model="orderList.receiveAddress"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
-            style="width: 240px"
-          />
-        </el-form-item>
-        <el-form-item label="收货人" prop="receiveAddress">
-          <el-input
-            v-model="orderList.receiver"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
-            style="width: 240px"
-          />
-        </el-form-item>
-        <el-form-item label="商品名称" prop="goodsName">
+         <el-form-item label="商品名称" prop="goodsName">
           <el-input
             v-model="orderList.goodsName"
             clearable
@@ -269,25 +251,25 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="商品属性" prop="goodsAttributeName">
+         <el-form-item label="订单金额" prop="totalPrice">
           <el-input
-            v-model="orderList.goodsAttributeName"
+            v-model="orderList.totalPrice"
             clearable
             @keyup.enter.native="handleQuery"
             :disabled="true"
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="商品价格" prop="goodsPrice">
+          <el-form-item label="收货人" prop="receiveAddress">
           <el-input
-            v-model="orderList.goodsPrice"
+            v-model="orderList.receiver"
             clearable
             @keyup.enter.native="handleQuery"
             :disabled="true"
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="地址" prop="receiveAddress">
+        <el-form-item label="收货地址" prop="receiveAddress">
           <el-input
             v-model="orderList.receiveAddress"
             clearable
@@ -296,7 +278,7 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="手机号" prop="phone">
+          <el-form-item label="手机号" prop="phone">
           <el-input
             v-model="orderList.phone"
             clearable
@@ -305,6 +287,36 @@
             style="width: 240px"
           />
         </el-form-item>
+      
+       
+        <!-- <el-form-item label="商品属性" prop="goodsAttributeName">
+          <el-input
+            v-model="orderList.goodsAttributeName"
+            clearable
+            @keyup.enter.native="handleQuery"
+            :disabled="true"
+            style="width: 240px"
+          />
+        </el-form-item> -->
+        <!-- <el-form-item label="商品价格" prop="goodsPrice">
+          <el-input
+            v-model="orderList.goodsPrice"
+            clearable
+            @keyup.enter.native="handleQuery"
+            :disabled="true"
+            style="width: 240px"
+          />
+        </el-form-item> -->
+        <!-- <el-form-item label="地址" prop="receiveAddress">
+          <el-input
+            v-model="orderList.receiveAddress"
+            clearable
+            @keyup.enter.native="handleQuery"
+            :disabled="true"
+            style="width: 240px"
+          />
+        </el-form-item> -->
+      
         <el-form-item label="订单状态" prop="orderStatus">
           <!-- <el-form-item label="退款类型" prop="refundType">
           <el-input
@@ -722,10 +734,10 @@ export default {
           return "待收货";
         case "RECEIVED_GOODS":
           return "已收货";
-        case "REFUNDED":
+        case "WAIT_REFUND":
           return "退款中";
         case "REFUNDED":
-          return "已退款";
+          return "退款成功";
         case "WAIT_RETURNED_GOODS":
           return "待退货";
         case "RETURNED_GOODS":