diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 2e808aa6cd2bec3c3e6f4c28974052f2fed9edb5..40af63de60c49b089e98adf518ac5b789ab3a7b9 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -51,11 +51,11 @@
placement="right"
:visible="addVisible"
@close="addDrawerClose"
- v-if="addBtn"
- :maskClosable="!!addBtn.maskClosable"
+ v-if="$slots.drawer"
+ :maskClosable="addBtn && !!addBtn.maskClosable"
:drawerStyle="drawerStyle"
:bodyStyle="bodyStyle"
- :width="addBtn.width || 600"
+ :width="(addBtn && addBtn.width) || 600"
destroyOnClose
>
diff --git a/src/pages/frame/components/footer/LayoutCopyrightFooter.vue b/src/pages/frame/components/footer/LayoutCopyrightFooter.vue
deleted file mode 100644
index 80b1dce1ec7e49fb8215c51a116f35694369c973..0000000000000000000000000000000000000000
--- a/src/pages/frame/components/footer/LayoutCopyrightFooter.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue
index 9a18ec1cd9f32eafb67590fd0b656044d25e7245..e5c4d66c06fb53203f8915d261270245700d39b2 100644
--- a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue
+++ b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue
@@ -1,12 +1,7 @@
-
+
{{ userInfo.userName }}
@@ -33,7 +28,9 @@ export default {
i18n: layoutTopHeaderI18n,
computed: {
...mapState(['userInfo']),
-
+ userAvatar() {
+ return this.userInfo.userAvatar ? `${this.$fileUrl}${this.userInfo.userAvatar}` : null;
+ },
profile() {
return this.$t('profile');
},
diff --git a/src/pages/frame/layouts/AdminLayout.vue b/src/pages/frame/layouts/AdminLayout.vue
index 78b4feda0e42f18375c25243782686ab0d06965f..ad47f973e7b380bfccab2241b7bc0a53eefbcb1c 100644
--- a/src/pages/frame/layouts/AdminLayout.vue
+++ b/src/pages/frame/layouts/AdminLayout.vue
@@ -52,16 +52,12 @@
-