From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/categoryJkBanner.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/categoryJkBanner.vue b/admin/src/views/business/categoryJkBanner.vue
index 9a091d8..9d52097 100644
--- a/admin/src/views/business/categoryJkBanner.vue
+++ b/admin/src/views/business/categoryJkBanner.vue
@@ -13,7 +13,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:category:create','business:category:delete']">
- <li><el-button type="primary" @click="$refs.OperaCategoryFileWindow.open('鏂板缓骞垮憡')" icon="el-icon-plus" v-permissions="['business:category:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaCategoryJkBannerWindow.open('鏂板缓骞垮憡')" icon="el-icon-plus" v-permissions="['business:category:create']">鏂板缓</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:category:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -41,7 +41,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryFileWindow.open('缂栬緫骞垮憡',row)" v-permissions="['business:category:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryJkBannerWindow.open('缂栬緫骞垮憡',row)" v-permissions="['business:category:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:category:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -54,7 +54,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaCategoryFileWindow ref="OperaCategoryFileWindow" @success="handlePageChange"/>
+ <OperaCategoryJkBannerWindow ref="OperaCategoryJkBannerWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -62,17 +62,17 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaCategoryFileWindow from '@/components/business/OperaCategoryFileWindow'
+import OperaCategoryJkBannerWindow from '@/components/business/OperaCategoryJkBannerWindow'
export default {
name: 'areaSet',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaCategoryFileWindow },
+ components: { TableLayout, Pagination, OperaCategoryJkBannerWindow },
data () {
return {
// 鎼滅储
searchForm: {
name: '',
- type: 4
+ type: 3
}
}
},
--
Gitblit v1.9.3