From 0c116feb867192c5ba009cbf6dad1fb4bb9d9d38 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 12 Nov 2024 10:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/record/index.vue | 2 +-
 vue.config.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 3915715..e9adad9 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -74,7 +74,7 @@
                 <!--  -->
                 <el-button v-if="stateObj.login_id===scope.row.admin_id || stateObj.is_admin"
                   type="primary" size="small" @click="editIndex('editor',scope.row.id)">编辑</el-button>
-                <el-popconfirm v-if="stateObj.login_id===scope.row.admin_id || stateObj.roles.includes('admin')"
+                <el-popconfirm v-if="stateObj.login_id===scope.row.admin_id || stateObj.is_admin"
                   style="margin:0 10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
                   <el-button type="danger" size="small" slot="reference">删除</el-button>
                 </el-popconfirm>
diff --git a/vue.config.js b/vue.config.js
index c82404e..5201527 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项