From 0d0e67818a45161af14114211f43aafd232a6da2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 27 一月 2026 10:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/activity.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/activity.vue b/admin/src/views/business/activity.vue
index a998206..46cceae 100644
--- a/admin/src/views/business/activity.vue
+++ b/admin/src/views/business/activity.vue
@@ -39,7 +39,7 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:activity:create', 'business:activity:delete']">
<li><el-button type="primary" @click="$refs.operaActivityWindow.open('鏂板缓')" icon="el-icon-plus" v-permissions="['business:activity:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:activity:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:activity:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -89,7 +89,7 @@
>
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaActivityWindow.open('缂栬緫', row)" icon="el-icon-edit" v-permissions="['business:activity:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:activity:delete']">鍒犻櫎</el-button>
+ <el-button type="text" style="color: red;" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:activity:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -126,7 +126,7 @@
endtime: '',
type: 1 //绫诲瀷0鍟嗗娲诲姩 1骞冲彴娲诲姩 2鎺㈠簵 3璧勮
},
-
+
activityStatus: [
// 0鏈紑濮� 1鎶ュ悕涓�,2鎶ュ悕缁撴潫,3娲诲姩杩涜涓�,4娲诲姩宸茬粨鏉�
{ label: '鏈紑濮�', id: 0 },
@@ -166,7 +166,7 @@
this.search()
},
shopDetail(row) {
-
+
}
},
}
--
Gitblit v1.9.3