From 14bf3f4ac8881b7b490bf88d005c094d0df99b63 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 26 Jun 2024 09:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_forms.vue                     |  9 +++++++--
 src/views/order_manage/components/orderDetail.vue |  2 +-
 src/views/order_manage/order_list.vue             | 14 ++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue
index c43bc34..86f3373 100644
--- a/src/views/home/data_forms.vue
+++ b/src/views/home/data_forms.vue
@@ -63,12 +63,12 @@
         <el-table-column label="日期" prop="tradeDay"></el-table-column>
         <el-table-column label="营业额" prop="total">
           <template v-slot="scope">
-            ￥{{ scope.row.total  }}
+            ￥{{ scope.row.total }}
           </template>
         </el-table-column>
         <el-table-column label="销售额" prop="total">
           <template v-slot="scope">
-            ￥{{ scope.row.total + scope.row.refund }}
+            ￥{{ scope.row.total | totalfilter(scope.row.refund) }}
           </template>
         </el-table-column>
         <el-table-column label="微信小程序支付" prop="wxLite">
@@ -106,6 +106,7 @@
         <el-table-column label="商品名称" prop="productName"></el-table-column>
         <el-table-column label="商品分类" prop="cateName"></el-table-column>
         <el-table-column label="商品描述" prop="productSkuName"></el-table-column>
+        <el-table-column label="单价" prop="price"></el-table-column>
         <el-table-column label="销量" prop="salesNum"></el-table-column>
         <el-table-column label="退单量" prop="refNum"></el-table-column>
         <el-table-column label="销售金额" prop="salesAmount">
@@ -161,6 +162,10 @@ export default {
   filters: {
     timeFilter(time) {
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
+    },
+    totalfilter(item,d) {
+      let num = item + d
+      return num.toFixed(2)
     }
   },
   mounted() {
diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index d61a119..117490d 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -142,7 +142,7 @@
                   </div>
                 </div>
               </div>
-              <div class="foot">退款：￥-{{ item.refundAmount }}</div>
+              <div class="foot">退款：￥-{{ item.orderAmount }}</div>
             </div>
           </div>
         </el-tab-pane>
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index de42361..cd3afe0 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -123,10 +123,8 @@
                     {{ item.productName }}
                     <span
                       class="refund"
-                      v-if="
-                        item.status == 'refunding' || item.status == 'refund'
-                      "
-                      >(退 - {{ item.num }})</span
+                      v-if="item.refundNumber"
+                      >(退 - {{ item.refundNumber }})</span
                     >
                   </div>
                   <div class="sku">{{ item.productSkuName }}</div>
@@ -140,13 +138,13 @@
             <div>{{ scope.row.orderType | orderTypeFilter }}</div>
             <div
               class="refund"
-              v-if="
-                scope.row.status == 'refunding' || scope.row.status == 'refund'
+              v-if="  
+                scope.row.orderType == 'return'
               "
             >
-              退款：-￥{{ scope.row.refundAmount }}
+              退款：-￥{{ scope.row.orderAmount }}
             </div>
-            <div>￥{{ scope.row.orderAmount }}</div>
+            <div v-else>￥{{ scope.row.orderAmount }}</div>
           </template>
         </el-table-column>
         <el-table-column label="状态">