From 0ec30b080a48bab6d0e1bba774326bf2d43c1e51 Mon Sep 17 00:00:00 2001
From: lihaoyuan <18278596806@163.com>
Date: Thu, 20 Nov 2025 16:35:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=8C=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E7=A1=AE=E8=AE=A4=E7=8A=B6=E6=80=81=E7=A0=81=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/base/components/OnlineOrderItem.vue | 80 +++++++++++++------
 1 file changed, 54 insertions(+), 26 deletions(-)

diff --git a/src/views/order/base/components/OnlineOrderItem.vue b/src/views/order/base/components/OnlineOrderItem.vue
index 9f37829..ee23424 100644
--- a/src/views/order/base/components/OnlineOrderItem.vue
+++ b/src/views/order/base/components/OnlineOrderItem.vue
@@ -83,12 +83,20 @@
               align="center"
               :label="__('活动类型')"
               prop="activity_type_id"
-            />
+            >
+            <template slot-scope="scope">
+                {{ formatActivityType(scope.row.activity_type_id) }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               :label="__('用户是否确认')"
               prop="order_item_confirm_status"
-            />
+            >
+              <template slot-scope="scope">
+                {{ formatUserConfirmType(scope.row.order_item_confirm_status) }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               :label="__('确认设计稿')"
@@ -804,6 +812,28 @@
           trade_payment_redpack
         )
       },
+      formatActivityType() {
+        // 返回一个函数，供模板调用
+        return (val) => {
+          const map = {
+            0: '无活动',
+            1103: '限时折扣',
+            1135: '单件折',
+            // 后续再扩展
+          }
+          return map[val] ?? val   // 找不到就显示原值
+        }
+      },
+      formatUserConfirmType() {
+        // 返回一个函数，供模板调用
+        return (val) => {
+          const map = {
+            0: '已确认',
+            1: '未确认'
+          }
+          return map[val] ?? val   
+        }
+      },
     },
     created() {},
     methods: {
@@ -863,32 +893,30 @@
           : this.__('是')
       },
       // 统计
-      getSummaries(param) {
-        const { columns, data } = param
-        const sums = []
-        if (!data) return sums
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      if (!data || data.length === 0) return sums; 
 
-        columns.forEach((column, index) => {
-          if (index === 1) {
-            sums[index] = '合计'
-            return
+      columns.forEach((column, index) => {
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+        
+        if (index === 5 || index === 6) {
+          const values = data.map(item => Number(item[column.property]));
+          const validValues = values.filter(value => !isNaN(value));
+          if (validValues.length > 0) {
+            const total = validValues.reduce((prev, curr) => prev + curr, 0);
+            sums[index] = Number(total.toFixed(2)); 
+          } else {
+            sums[index] = 0; 
           }
-          if (index === 6 || index === 5) {
-            const values = data.map((item) => Number(item[column.property]))
-            if (!values.every((value) => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return prev + curr
-                } else {
-                  return prev
-                }
-              }, 0)
-            }
-          }
-        })
-        return sums
-      },
+        }
+      });
+      return sums;
+    },
       __,
       async showEdit(row) {
         this.dialogFormVisible = true