From 81b15c1afe6a74612b28668db4d0a18c90b83ee8 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 19 Mar 2024 14:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order_manage/order_list.vue | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index 4e0766e..cb1449d 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -79,7 +79,7 @@
                         <div class="table_order_info">
                             <div class="order_no">{{ scope.row.orderNo }}</div>
                             <!-- <div>会员 {{ scope.row.orderNo }}</div> -->
-                            <div class="type">【{{ scope.row.orderType | orderTypeFilter }}{{ scope.row.sendType |
+                            <div class="type">【{{ scope.row.orderType | orderTypeFilter }} {{ scope.row.sendType |
             sendTypeFilter }}】</div>
                         </div>
                     </template>
@@ -110,12 +110,17 @@
                 </el-table-column>
                 <el-table-column label="状态">
                     <template v-slot="scope">
-                        <el-tag type="primary" v-if="scope.row.status == 'closed'">
-                            {{ scope.row.status | statusFilter }}
-                        </el-tag>
-                        <el-tag type="warning" v-if="scope.row.status != 'closed'">
-                            {{ scope.row.status | statusFilter }}
-                        </el-tag>
+                        <template v-if="scope.row.status == 'refund' && scope.row.orderType != 'return'">
+                            <el-tag type="primary">已完成</el-tag>
+                        </template>
+                        <template v-else>
+                            <el-tag type="primary" v-if="scope.row.status == 'closed'">
+                                {{ scope.row.status | statusFilter }}
+                            </el-tag>
+                            <el-tag type="warning" v-if="scope.row.status != 'closed'">
+                                {{ scope.row.status | statusFilter }}
+                            </el-tag>
+                        </template>
                     </template>
                 </el-table-column>
                 <el-table-column label="创建时间">
@@ -219,7 +224,7 @@ export default {
                 res.map(item => {
                     total += item.payAmount
                 })
-                this.payCountTotal = total
+                this.payCountTotal = Math.floor(total * 100) / 100
             } catch (error) {
                 console.log(error);
             }