From b6d8996b65efa14f47301bd0acfa6356c9884f07 Mon Sep 17 00:00:00 2001
From: Mrtangl <1807746833@qq.com>
Date: Mon, 25 Apr 2022 18:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/layout/components/layout-aside/index.vue |  6 +++---
 admin/src/layout/components/layout-header.vue      |  2 +-
 admin/src/store/modules/user.ts                    |  4 +++-
 admin/src/views/setting/website/filing.vue         | 11 ++++++++++-
 admin/src/views/setting/website/information.vue    | 12 ++++++++++--
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/admin/src/layout/components/layout-aside/index.vue b/admin/src/layout/components/layout-aside/index.vue
index 56fa9144..c5c491a1 100644
--- a/admin/src/layout/components/layout-aside/index.vue
+++ b/admin/src/layout/components/layout-aside/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="layout-aside">
         <router-link to="/workbench" class="logo flex col-center">
-            <img class="logo-img" :src="config.web_logo" alt />
-            <div class="line-1">{{ config.web_name }}</div>
+            <img class="logo-img" :src="config.webLogo" alt />
+            <div class="line-1">{{ config.webName }}</div>
         </router-link>
         <div class="scrollbar-wrap">
             <el-scrollbar style="height: 100%" class="ls-scrollbar">
@@ -13,7 +13,7 @@
                     text-color="#E5E5E5"
                 >
                     <template v-for="(item, index) in sidebar" :key="index">
-                        <sub-menu :route="item" :path="item.path"/>
+                        <sub-menu :route="item" :path="item.path" />
                     </template>
                 </el-menu>
             </el-scrollbar>
diff --git a/admin/src/layout/components/layout-header.vue b/admin/src/layout/components/layout-header.vue
index 7668f2de..e8ece506 100644
--- a/admin/src/layout/components/layout-header.vue
+++ b/admin/src/layout/components/layout-header.vue
@@ -34,7 +34,7 @@ export default defineComponent({
     setup() {
         const { store, router } = useAdmin()
         const userInfo = computed(() => store.getters.userInfo)
-        console.log(userInfo, 'userInfo____')
+        console.log('____userInfo____', userInfo)
 
         const handleCommand = (command: string) => {
             switch (command) {
diff --git a/admin/src/store/modules/user.ts b/admin/src/store/modules/user.ts
index e90c3370..4d3b4319 100644
--- a/admin/src/store/modules/user.ts
+++ b/admin/src/store/modules/user.ts
@@ -66,8 +66,10 @@ const user: Module<UserModule, any> = {
             return new Promise((resolve, reject) => {
                 apiUserInfo()
                     .then((data: any) => {
-                        commit('setUser', data)
+                        commit('setUser', data.user)
                         commit('setPermission', data.permissions)
+                        console.log('___data.user___', data.user)
+
                         resolve(data)
                     })
                     .catch(error => {
diff --git a/admin/src/views/setting/website/filing.vue b/admin/src/views/setting/website/filing.vue
index 681d12e4..8a59c938 100644
--- a/admin/src/views/setting/website/filing.vue
+++ b/admin/src/views/setting/website/filing.vue
@@ -51,7 +51,13 @@
         </el-card>
 
         <footer-btns>
-            <el-button v-perm="['setting:setCopyright']" type="primary" size="small" @click="setCopyright">保存</el-button>
+            <el-button
+                v-perm="['setting:setCopyright']"
+                type="primary"
+                size="small"
+                @click="setCopyright"
+                >保存</el-button
+            >
         </footer-btns>
     </div>
 </template>
@@ -60,6 +66,8 @@
 import { defineComponent, reactive, onMounted } from 'vue'
 import { apiGetCopyright, apiSetCopyright } from '@/api/setting'
 import FooterBtns from '@/components/footer-btns/index.vue'
+import { ElMessage } from 'element-plus'
+
 export default defineComponent({
     components: {
         FooterBtns
@@ -110,6 +118,7 @@ export default defineComponent({
             })
                 .then((res: any) => {
                     console.log('res', res)
+                    ElMessage({ type: 'success', message: '保存成功' })
                     getCopyright()
                 })
                 .catch((err: any) => {
diff --git a/admin/src/views/setting/website/information.vue b/admin/src/views/setting/website/information.vue
index 8a0ba993..eb5fc288 100644
--- a/admin/src/views/setting/website/information.vue
+++ b/admin/src/views/setting/website/information.vue
@@ -64,17 +64,24 @@
         </el-card>
 
         <footer-btns>
-            <el-button v-perm="['setting:setWebsite']"  type="primary" size="small" @click="setWebsite">保存</el-button>
+            <el-button
+                v-perm="['setting:setWebsite']"
+                type="primary"
+                size="small"
+                @click="setWebsite"
+                >保存</el-button
+            >
         </footer-btns>
     </div>
 </template>
 
 <script lang="ts">
 import { defineComponent, reactive, onMounted, Ref, ref } from 'vue'
-import { ElInput, ElForm } from 'element-plus'
+import { ElInput, ElForm, ElMessage } from 'element-plus'
 import MaterialSelect from '@/components/material-select/index.vue'
 import FooterBtns from '@/components/footer-btns/index.vue'
 import { apiGetWebsite, apiSetWebsite } from '@/api/setting'
+
 export default defineComponent({
     components: {
         MaterialSelect,
@@ -126,6 +133,7 @@ export default defineComponent({
                 })
                     .then((res: any) => {
                         console.log('res', res)
+                        ElMessage({ type: 'success', message: '保存成功' })
                         getWebsite()
                     })
                     .catch((err: any) => {