From 0cabdb18b95a0e184986eca94f973fdc56d45f13 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 16 Sep 2022 15:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/channel/weapp.vue             |   2 +-
 admin/src/views/channel/wx_dev.vue            |   2 +-
 .../channel/wx_oa/reply/default_reply.vue     | 105 +++++-------
 admin/src/views/channel/wx_oa/reply/edit.vue  | 153 ++++++++----------
 .../channel/wx_oa/reply/follow_reply.vue      | 105 +++++-------
 .../channel/wx_oa/reply/keyword_reply.vue     | 113 +++++--------
 admin/src/views/setting/search/index.vue      |   2 +-
 admin/src/views/setting/system/journal.vue    |   1 -
 .../src/views/setting/user/login_register.vue |   2 +-
 admin/src/views/setting/user/setup.vue        |  13 +-
 10 files changed, 190 insertions(+), 308 deletions(-)

diff --git a/admin/src/views/channel/weapp.vue b/admin/src/views/channel/weapp.vue
index dbe531b0..54508576 100644
--- a/admin/src/views/channel/weapp.vue
+++ b/admin/src/views/channel/weapp.vue
@@ -135,7 +135,7 @@
                 </el-form-item>
             </el-card>
         </el-form>
-        <footer-btns v-perms="['channel:h5:save']">
+        <footer-btns v-perms="['channel:mp:save']">
             <el-button type="primary" @click="handelSave">保存</el-button>
         </footer-btns>
     </div>
diff --git a/admin/src/views/channel/wx_dev.vue b/admin/src/views/channel/wx_dev.vue
index f6b934a8..9a5e7f8c 100644
--- a/admin/src/views/channel/wx_dev.vue
+++ b/admin/src/views/channel/wx_dev.vue
@@ -30,7 +30,7 @@
                 </el-form-item>
             </el-card>
         </el-form>
-        <footer-btns v-perms="['channel:h5:save']">
+        <footer-btns v-perms="['channel:wx:save']">
             <el-button type="primary" @click="handelSave">保存</el-button>
         </footer-btns>
     </div>
diff --git a/admin/src/views/channel/wx_oa/reply/default_reply.vue b/admin/src/views/channel/wx_oa/reply/default_reply.vue
index ec4f9572..f5eaa3bd 100644
--- a/admin/src/views/channel/wx_oa/reply/default_reply.vue
+++ b/admin/src/views/channel/wx_oa/reply/default_reply.vue
@@ -10,16 +10,11 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button
-                    class="mb-4"
-                    v-perms="['article:cate:add']"
-                    type="primary"
-                    @click="handleAdd()"
-                >
+                <el-button class="mb-4" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
-                    新增默认回复
+                    新增
                 </el-button>
             </div>
             <el-table size="large" :data="lists">
@@ -29,15 +24,10 @@
                         {{ getContentType(1) }}
                     </template>
                 </el-table-column>
-                <el-table-column
-                    label="回复内容"
-                    prop="content"
-                    min-width="120"
-                />
+                <el-table-column label="回复内容" prop="content" min-width="120" />
                 <el-table-column label="状态" min-width="120">
                     <template #default="{ row }">
                         <el-switch
-                            v-perms="['article:cate:change']"
                             v-model="row.status"
                             :active-value="1"
                             :inactive-value="0"
@@ -48,88 +38,67 @@
                 <el-table-column label="排序" prop="sort" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button
-                            v-perms="['article:cate:edit']"
-                            type="primary"
-                            link
-                            @click="handleEdit(row)"
-                        >
-                            编辑
-                        </el-button>
-                        <el-button
-                            v-perms="['article:cate:del']"
-                            type="danger"
-                            link
-                            @click="handleDelete(row.id)"
-                        >
+                        <el-button type="primary" link @click="handleEdit(row)"> 编辑 </el-button>
+                        <el-button type="danger" link @click="handleDelete(row.id)">
                             删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
         </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            @success="getLists"
-            @close="showEdit = false"
-        />
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 <script lang="ts" setup>
-import {
-    oaReplyDel,
-    getOaReplyList,
-    changeOaReplyStatus,
-} from "@/api/channel/wx_oa";
-import feedback from "@/utils/feedback";
-import EditPopup from "./edit.vue";
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
-const showEdit = ref(false);
-const lists = ref();
+import { oaReplyDel, getOaReplyList, changeOaReplyStatus } from '@/api/channel/wx_oa'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const showEdit = ref(false)
+const lists = ref()
 
 const getContentType = computed(() => {
     return (val: number) => {
         switch (val) {
             case 1:
-                return "文本";
+                return '文本'
         }
-    };
-});
+    }
+})
 
 const getLists = async () => {
-    lists.value = await getOaReplyList({ type: "default" });
-};
+    lists.value = await getOaReplyList({ type: 'default' })
+}
 
 const handleAdd = async () => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("add", "default");
-};
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add', 'default')
+}
 
 const handleEdit = async (data: any) => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("edit", "default");
-    editRef.value?.getDetail(data);
-};
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit', 'default')
+    editRef.value?.getDetail(data)
+}
 
 const handleDelete = async (id: number) => {
-    await feedback.confirm("确定要删除？");
-    await oaReplyDel({ id });
-    feedback.msgSuccess("删除成功");
-    getLists();
-};
+    await feedback.confirm('确定要删除？')
+    await oaReplyDel({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
 
 const changeStatus = async (id: number) => {
     try {
-        await changeOaReplyStatus({ id });
-        feedback.msgSuccess("修改成功");
-        getLists();
+        await changeOaReplyStatus({ id })
+        feedback.msgSuccess('修改成功')
+        getLists()
     } catch (error) {
-        getLists();
+        getLists()
     }
-};
+}
 
-getLists();
+getLists()
 </script>
diff --git a/admin/src/views/channel/wx_oa/reply/edit.vue b/admin/src/views/channel/wx_oa/reply/edit.vue
index da41d295..fcc7bff7 100644
--- a/admin/src/views/channel/wx_oa/reply/edit.vue
+++ b/admin/src/views/channel/wx_oa/reply/edit.vue
@@ -18,28 +18,14 @@
             >
                 <el-form-item label="规则名称" prop="name">
                     <div class="flex-1">
-                        <el-input
-                            v-model="formData.name"
-                            placeholder="请输入规则名称"
-                        />
-                        <div class="form-tips">
-                            方便通过名称管理关注回复内容
-                        </div>
+                        <el-input v-model="formData.name" placeholder="请输入规则名称" />
+                        <div class="form-tips">方便通过名称管理关注回复内容</div>
                     </div>
                 </el-form-item>
-                <el-form-item
-                    label="关键词"
-                    prop="keyword"
-                    v-if="formData.type == 'keyword'"
-                >
+                <el-form-item label="关键词" prop="keyword" v-if="formData.type == 'keyword'">
                     <div class="flex-1">
-                        <el-input
-                            v-model="formData.keyword"
-                            placeholder="请输入关键词"
-                        />
-                        <div class="form-tips">
-                            方便通过名称管理关注回复内容
-                        </div>
+                        <el-input v-model="formData.keyword" placeholder="请输入关键词" />
+                        <div class="form-tips">方便通过名称管理关注回复内容</div>
                     </div>
                 </el-form-item>
                 <el-form-item
@@ -53,9 +39,7 @@
                             <el-radio :label="1">全匹配</el-radio>
                             <el-radio :label="2">模糊匹配</el-radio>
                         </el-radio-group>
-                        <div class="form-tips">
-                            模糊匹配时，关键词部分匹配用户输入的内容即可
-                        </div>
+                        <div class="form-tips">模糊匹配时，关键词部分匹配用户输入的内容即可</div>
                     </div>
                 </el-form-item>
                 <el-form-item label="回复类型" prop="contentType" :min="0">
@@ -86,127 +70,118 @@
                 </el-form-item> -->
                 <el-form-item label="排序">
                     <div class="flex-1">
-                        <el-input
-                            v-model="formData.sort"
-                            placeholder="请输入"
-                        />
+                        <el-input v-model="formData.sort" placeholder="请输入" />
                     </div>
                 </el-form-item>
                 <el-form-item label="启用状态">
-                    <el-switch
-                        v-model="formData.status"
-                        :active-value="1"
-                        :inactive-value="0"
-                    />
+                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
                 </el-form-item>
             </el-form>
         </popup>
     </div>
 </template>
 <script lang="ts" setup>
-import type { FormInstance } from "element-plus";
-import { oaReplyEdit, oaReplyAdd, getOaReplyDetail } from "@/api/channel/wx_oa";
-import Popup from "@/components/popup/index.vue";
-import feedback from "@/utils/feedback";
-import type { FormRules } from "element-plus";
+import type { FormInstance } from 'element-plus'
+import { oaReplyEdit, oaReplyAdd, getOaReplyDetail } from '@/api/channel/wx_oa'
+import Popup from '@/components/popup/index.vue'
+import feedback from '@/utils/feedback'
+import type { FormRules } from 'element-plus'
 
-const emit = defineEmits(["success", "close"]);
+const emit = defineEmits(['success', 'close'])
 
-const formRef = shallowRef<FormInstance>();
-const popupRef = shallowRef<InstanceType<typeof Popup>>();
-const mode = ref("add");
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
 const popupTitle = computed(() => {
-    return mode.value == "edit" ? "编辑栏目" : "新增栏目";
-});
+    return mode.value == 'edit' ? '编辑栏目' : '新增栏目'
+})
 const formData = reactive({
-    id: "",
-    name: "",
-    type: "",
+    id: '',
+    name: '',
+    type: '',
     contentType: 1,
-    keyword: "",
-    content: "",
+    keyword: '',
+    content: '',
     matchingType: 1,
     status: 1,
-    sort: 0,
-});
+    sort: 0
+})
 
 const formRules: FormRules = {
     name: [
         {
             required: true,
-            message: "请输入规则名称",
-            trigger: ["blur"],
-        },
+            message: '请输入规则名称',
+            trigger: ['blur']
+        }
     ],
     keyword: [
         {
             required: true,
-            message: "请输入关键词",
-            trigger: ["blur"],
-        },
+            message: '请输入关键词',
+            trigger: ['blur']
+        }
     ],
     matchingType: [
         {
             required: true,
-            message: "请选择匹配方式",
-            trigger: ["blur"],
-        },
+            message: '请选择匹配方式',
+            trigger: ['blur']
+        }
     ],
     contentType: [
         {
             required: true,
-            message: "请选择回复类型",
-            trigger: ["blur"],
-        },
+            message: '请选择回复类型',
+            trigger: ['blur']
+        }
     ],
     content: [
         {
             required: true,
-            message: "请输入回复内容",
-            trigger: ["blur"],
-        },
-    ],
-};
+            message: '请输入回复内容',
+            trigger: ['blur']
+        }
+    ]
+}
 
 const handleSubmit = async () => {
-    await formRef.value?.validate();
-    mode.value == "edit"
-        ? await oaReplyEdit(formData)
-        : await oaReplyAdd(formData);
-    feedback.msgSuccess("操作成功");
-    popupRef.value?.close();
-    emit("success");
-};
+    await formRef.value?.validate()
+    mode.value == 'edit' ? await oaReplyEdit(formData) : await oaReplyAdd(formData)
+    feedback.msgSuccess('操作成功')
+    popupRef.value?.close()
+    emit('success')
+}
 
-const open = (modes = "add", type = "") => {
-    mode.value = modes;
-    formData.type = type;
-    popupRef.value?.open();
-};
+const open = (modes = 'add', type = '') => {
+    mode.value = modes
+    formData.type = type
+    popupRef.value?.open()
+}
 
 const setFormData = (data: Record<any, any>) => {
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
-            formData[key] = data[key];
+            formData[key] = data[key]
         }
     }
-};
+}
 
 const getDetail = async (row: Record<string, any>) => {
     const data = await getOaReplyDetail({
-        id: row.id,
-    });
-    setFormData(data);
-};
+        id: row.id
+    })
+    setFormData(data)
+}
 
 const handleClose = () => {
-    emit("close");
-};
+    emit('close')
+}
 
 defineExpose({
     open,
     setFormData,
-    getDetail,
-});
+    getDetail
+})
 </script>
diff --git a/admin/src/views/channel/wx_oa/reply/follow_reply.vue b/admin/src/views/channel/wx_oa/reply/follow_reply.vue
index a8fa47b3..20b32201 100644
--- a/admin/src/views/channel/wx_oa/reply/follow_reply.vue
+++ b/admin/src/views/channel/wx_oa/reply/follow_reply.vue
@@ -10,16 +10,11 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button
-                    class="mb-4"
-                    v-perms="['article:cate:add']"
-                    type="primary"
-                    @click="handleAdd()"
-                >
+                <el-button class="mb-4" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
-                    新增关注回复
+                    新增
                 </el-button>
             </div>
             <el-table size="large" :data="lists">
@@ -29,15 +24,10 @@
                         {{ getContentType(row.contentType) }}
                     </template>
                 </el-table-column>
-                <el-table-column
-                    label="回复内容"
-                    prop="content"
-                    min-width="120"
-                />
+                <el-table-column label="回复内容" prop="content" min-width="120" />
                 <el-table-column label="状态" min-width="120">
                     <template #default="{ row }">
                         <el-switch
-                            v-perms="['article:cate:change']"
                             v-model="row.status"
                             :active-value="1"
                             :inactive-value="0"
@@ -48,88 +38,67 @@
                 <el-table-column label="排序" prop="sort" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button
-                            v-perms="['article:cate:edit']"
-                            type="primary"
-                            link
-                            @click="handleEdit(row)"
-                        >
-                            编辑
-                        </el-button>
-                        <el-button
-                            v-perms="['article:cate:del']"
-                            type="danger"
-                            link
-                            @click="handleDelete(row.id)"
-                        >
+                        <el-button type="primary" link @click="handleEdit(row)"> 编辑 </el-button>
+                        <el-button type="danger" link @click="handleDelete(row.id)">
                             删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
         </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            @success="getLists"
-            @close="showEdit = false"
-        />
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 <script lang="ts" setup>
-import {
-    oaReplyDel,
-    getOaReplyList,
-    changeOaReplyStatus,
-} from "@/api/channel/wx_oa";
-import feedback from "@/utils/feedback";
-import EditPopup from "./edit.vue";
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
-const showEdit = ref(false);
-const lists = ref();
+import { oaReplyDel, getOaReplyList, changeOaReplyStatus } from '@/api/channel/wx_oa'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const showEdit = ref(false)
+const lists = ref()
 
 const getContentType = computed(() => {
     return (val: number) => {
         switch (val) {
             case 1:
-                return "文本";
+                return '文本'
         }
-    };
-});
+    }
+})
 
 const getLists = async () => {
-    lists.value = await getOaReplyList({ type: "follow" });
-};
+    lists.value = await getOaReplyList({ type: 'follow' })
+}
 
 const handleAdd = async () => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("add", "follow");
-};
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add', 'follow')
+}
 
 const handleEdit = async (data: any) => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("edit", "follow");
-    editRef.value?.getDetail(data);
-};
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit', 'follow')
+    editRef.value?.getDetail(data)
+}
 
 const handleDelete = async (id: number) => {
-    await feedback.confirm("确定要删除？");
-    await oaReplyDel({ id });
-    feedback.msgSuccess("删除成功");
-    getLists();
-};
+    await feedback.confirm('确定要删除？')
+    await oaReplyDel({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
 
 const changeStatus = async (id: number) => {
     try {
-        await changeOaReplyStatus({ id });
-        feedback.msgSuccess("修改成功");
-        getLists();
+        await changeOaReplyStatus({ id })
+        feedback.msgSuccess('修改成功')
+        getLists()
     } catch (error) {
-        getLists();
+        getLists()
     }
-};
+}
 
-getLists();
+getLists()
 </script>
diff --git a/admin/src/views/channel/wx_oa/reply/keyword_reply.vue b/admin/src/views/channel/wx_oa/reply/keyword_reply.vue
index 9e0eab25..c272c921 100644
--- a/admin/src/views/channel/wx_oa/reply/keyword_reply.vue
+++ b/admin/src/views/channel/wx_oa/reply/keyword_reply.vue
@@ -10,26 +10,17 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button
-                    class="mb-4"
-                    v-perms="['article:cate:add']"
-                    type="primary"
-                    @click="handleAdd()"
-                >
+                <el-button class="mb-4" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
-                    新增关键字回复
+                    新增
                 </el-button>
             </div>
             <el-table size="large" :data="lists">
                 <el-table-column label="规则名称" prop="name" min-width="120" />
 
-                <el-table-column
-                    label="关键词"
-                    prop="keyword"
-                    min-width="120"
-                />
+                <el-table-column label="关键词" prop="keyword" min-width="120" />
                 <el-table-column label="匹配方式" min-width="120">
                     <template #default="{ row }">
                         {{ getMatchingType(row.matchingType) }}
@@ -43,7 +34,6 @@
                 <el-table-column label="状态" min-width="120">
                     <template #default="{ row }">
                         <el-switch
-                            v-perms="['article:cate:change']"
                             v-model="row.status"
                             :active-value="1"
                             :inactive-value="0"
@@ -54,99 +44,78 @@
                 <el-table-column label="排序" prop="sort" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
-                        <el-button
-                            v-perms="['article:cate:edit']"
-                            type="primary"
-                            link
-                            @click="handleEdit(row)"
-                        >
-                            编辑
-                        </el-button>
-                        <el-button
-                            v-perms="['article:cate:del']"
-                            type="danger"
-                            link
-                            @click="handleDelete(row.id)"
-                        >
+                        <el-button type="primary" link @click="handleEdit(row)"> 编辑 </el-button>
+                        <el-button type="danger" link @click="handleDelete(row.id)">
                             删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
         </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            @success="getLists"
-            @close="showEdit = false"
-        />
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 <script lang="ts" setup>
-import {
-    oaReplyDel,
-    getOaReplyList,
-    changeOaReplyStatus,
-} from "@/api/channel/wx_oa";
-import feedback from "@/utils/feedback";
-import EditPopup from "./edit.vue";
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
-const showEdit = ref(false);
-const lists = ref();
+import { oaReplyDel, getOaReplyList, changeOaReplyStatus } from '@/api/channel/wx_oa'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const showEdit = ref(false)
+const lists = ref()
 
 const getMatchingType = computed(() => {
     return (val: number) => {
         switch (val) {
             case 1:
-                return "全匹配";
+                return '全匹配'
             case 2:
-                return "模糊匹配";
+                return '模糊匹配'
         }
-    };
-});
+    }
+})
 
 const getContentType = computed(() => {
     return (val: number) => {
         switch (val) {
             case 1:
-                return "文本";
+                return '文本'
         }
-    };
-});
+    }
+})
 
 const getLists = async () => {
-    lists.value = await getOaReplyList({ type: "keyword" });
-};
+    lists.value = await getOaReplyList({ type: 'keyword' })
+}
 
 const handleAdd = async () => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("add", "keyword");
-};
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add', 'keyword')
+}
 
 const handleEdit = async (data: any) => {
-    showEdit.value = true;
-    await nextTick();
-    editRef.value?.open("edit", "keyword");
-    editRef.value?.getDetail(data);
-};
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit', 'keyword')
+    editRef.value?.getDetail(data)
+}
 
 const handleDelete = async (id: number) => {
-    await feedback.confirm("确定要删除？");
-    await oaReplyDel({ id });
-    feedback.msgSuccess("删除成功");
-    getLists();
-};
+    await feedback.confirm('确定要删除？')
+    await oaReplyDel({ id })
+    feedback.msgSuccess('删除成功')
+    getLists()
+}
 
 const changeStatus = async (id: number) => {
     try {
-        await changeOaReplyStatus({ id });
-        feedback.msgSuccess("修改成功");
-        getLists();
+        await changeOaReplyStatus({ id })
+        feedback.msgSuccess('修改成功')
+        getLists()
     } catch (error) {
-        getLists();
+        getLists()
     }
-};
+}
 
-getLists();
+getLists()
 </script>
diff --git a/admin/src/views/setting/search/index.vue b/admin/src/views/setting/search/index.vue
index 89471f4e..6bb34a5c 100644
--- a/admin/src/views/setting/search/index.vue
+++ b/admin/src/views/setting/search/index.vue
@@ -70,7 +70,7 @@
             </div>
         </el-card>
 
-        <footer-btns v-perms="['setting:website:save']">
+        <footer-btns v-perms="['setting:search:save']">
             <el-button type="primary" @click="handleSave">保存</el-button>
         </footer-btns>
     </div>
diff --git a/admin/src/views/setting/system/journal.vue b/admin/src/views/setting/system/journal.vue
index 32700993..73294c85 100644
--- a/admin/src/views/setting/system/journal.vue
+++ b/admin/src/views/setting/system/journal.vue
@@ -50,7 +50,6 @@
                     <el-table-column label="访问方式" prop="type" min-width="100" />
                     <el-table-column label="来源IP" prop="ip" min-width="160" />
                     <el-table-column label="错误信息" prop="error" min-width="160" />
-                    <el-table-column label="IP" prop="address" min-width="160" />
                     <el-table-column label="执行耗时(毫秒)" prop="taskTime" min-width="100" />
                     <el-table-column label="日志时间" prop="createTime" min-width="180" />
                 </el-table>
diff --git a/admin/src/views/setting/user/login_register.vue b/admin/src/views/setting/user/login_register.vue
index 16ded33a..2bfb0682 100644
--- a/admin/src/views/setting/user/login_register.vue
+++ b/admin/src/views/setting/user/login_register.vue
@@ -92,7 +92,7 @@
             </el-card>
         </el-form>
 
-        <footer-btns v-perms="['setting:website:save']">
+        <footer-btns v-perms="['setting:login:save']">
             <el-button type="primary" @click="handleSubmit">保存</el-button>
         </footer-btns>
     </div>
diff --git a/admin/src/views/setting/user/setup.vue b/admin/src/views/setting/user/setup.vue
index c79b2787..db07e955 100644
--- a/admin/src/views/setting/user/setup.vue
+++ b/admin/src/views/setting/user/setup.vue
@@ -2,7 +2,7 @@
 <template>
     <div class="user-setup">
         <el-card shadow="never" class="!border-none">
-            <div class="font-medium mb-7">服务器域名</div>
+            <div class="font-medium mb-7">基本设置</div>
             <el-form ref="formRef" :model="formData" label-width="120px">
                 <el-form-item label="用户默认头像">
                     <div>
@@ -11,13 +11,15 @@
                 </el-form-item>
                 <el-form-item>
                     <div>
-                        <div class="form-tips">用户注册时给的默认头像，建议尺寸：400*400像素，支持jpg，jpeg，png格式</div>
+                        <div class="form-tips">
+                            用户注册时给的默认头像，建议尺寸：400*400像素，支持jpg，jpeg，png格式
+                        </div>
                     </div>
                 </el-form-item>
             </el-form>
         </el-card>
 
-        <footer-btns v-perms="['setting:website:save']">
+        <footer-btns v-perms="['setting:user:save']">
             <el-button type="primary" @click="handleSubmit">保存</el-button>
         </footer-btns>
     </div>
@@ -30,7 +32,7 @@ import feedback from '@/utils/feedback'
 
 // 表单数据
 const formData = reactive({
-    defaultAvatar: '', // 用户默认头像
+    defaultAvatar: '' // 用户默认头像
 })
 
 // 获取用户设置数据
@@ -60,5 +62,4 @@ const handleSubmit = async () => {
 getData()
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>