From f423de3f703d9d190aa8cb2a7039b9a3565154f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Wed, 6 Nov 2024 11:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B4=BB=E5=8A=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/list/index.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index cf30ef9..7f23a67 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -270,7 +270,7 @@
             <el-option label="否" value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item label="活动订单：" prop="is_activities">
+        <!-- <el-form-item label="活动订单：" prop="is_activities">
           <el-select
             v-model="tableFrom.is_activities"
             clearable
@@ -297,7 +297,7 @@
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)"
             >搜索</el-button
@@ -384,6 +384,13 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="活动类型" min-width="100">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.activity_type_name ? scope.row.activity_type_name : ""
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="商品信息" min-width="330">
           <template slot-scope="scope">
             <div