From 1c349817b350dad6d8684663720e71f10bc654d8 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 11 Sep 2024 14:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/.editorconfig                      |  2 +-
 .../src/views/order/order/orderDetail.vue     | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jsowell-ui/.editorconfig b/jsowell-ui/.editorconfig
index 412d608c3..7034f9bf3 100644
--- a/jsowell-ui/.editorconfig
+++ b/jsowell-ui/.editorconfig
@@ -8,7 +8,7 @@ charset = utf-8
 # 缩进风格，可选space、tab
 indent_style = space
 # 缩进的空格数
-indent_size = 4
+indent_size = 2
 # 结尾换行符，可选lf、cr、crlf
 end_of_line = lf
 # 在文件结尾插入新行
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 8858de1f5..53845475a 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -202,7 +202,7 @@
     <el-card class="cardStyle">
       <h3>支付信息</h3>
       <template v-if="payDetail.length !== 0">
-        <el-descriptions
+        <!--<el-descriptions
           direction="vertical"
           :column="6"
           border
@@ -217,21 +217,28 @@
           <el-descriptions-item label="支付方式"
             >{{ item.payModeDesc }}
           </el-descriptions-item>
-          <!--<el-descriptions-item label="支付状态">{{
+          &lt;!&ndash;<el-descriptions-item label="支付状态">{{
                       item.payStatus === "1" ? "支付完成" : "待支付"
                     }}
-                    </el-descriptions-item>-->
+                    </el-descriptions-item>&ndash;&gt;
           <el-descriptions-item label="支付时间"
             >{{ item.payTime }}
           </el-descriptions-item>
           <el-descriptions-item label="支付流水号"
             >{{ item.outTradeNo }}
           </el-descriptions-item>
-          <!--<el-descriptions-item label="退款金额">{{
+          &lt;!&ndash;<el-descriptions-item label="退款金额">{{
                             item.refundAmount
                         }}
-                    </el-descriptions-item>-->
-        </el-descriptions>
+                    </el-descriptions-item>&ndash;&gt;
+        </el-descriptions>-->
+
+          <el-table style="width: 100%" :data="payDetail" border>
+              <el-table-column prop="payAmount" label="支付金额" align="center" />
+              <el-table-column prop="payModeDesc" label="支付方式" align="center" />
+              <el-table-column prop="payTime" label="支付时间" align="center" />
+              <el-table-column prop="outTradeNo" label="支付流水号" align="center" />
+          </el-table>
       </template>
       <div v-else style="text-align: center">暂无数据</div>
       <div class="marginTop"></div>