diff --git a/.env.production b/.env.production index 4c267c0..336c7ab 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API='http://cz-hjjc.115.langye.net' -VUE_APP_UPLOAD_API='http://cz-hjjc.115.langye.net/api/admin/upload-file' +VUE_APP_BASE_API='https://cz-hjjc.115.langye.net' +VUE_APP_UPLOAD_API='https://cz-hjjc.115.langye.net/api/admin/upload-file' VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview diff --git a/src/assets/login/bkg.png b/src/assets/login/bkg.png index 7884f2b..b4997dc 100644 Binary files a/src/assets/login/bkg.png and b/src/assets/login/bkg.png differ diff --git a/src/assets/title.png b/src/assets/title.png new file mode 100644 index 0000000..900d143 Binary files /dev/null and b/src/assets/title.png differ diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue index 30c0d87..71ef92b 100644 --- a/src/components/ThemePicker/index.vue +++ b/src/components/ThemePicker/index.vue @@ -23,7 +23,7 @@ export default { }, mounted() { this.$nextTick(() => { - this.theme = Cookies.get("defaultTheme") + this.theme = Cookies.get("defaultTheme") || ORIGINAL_THEME document.body.style.setProperty('--theme-color', Cookies.get("defaultTheme")); }) }, diff --git a/src/icons/svg/model.svg b/src/icons/svg/model.svg new file mode 100644 index 0000000..0b5d2f3 --- /dev/null +++ b/src/icons/svg/model.svg @@ -0,0 +1 @@ + diff --git a/src/layout/components/Navbar/Icon.vue b/src/layout/components/Navbar/Icon.vue index 18dbf7a..e9a0343 100644 --- a/src/layout/components/Navbar/Icon.vue +++ b/src/layout/components/Navbar/Icon.vue @@ -1,5 +1,6 @@ diff --git a/src/views/wujie/index.vue b/src/views/wujie/index.vue index c95e909..18ce2bf 100644 --- a/src/views/wujie/index.vue +++ b/src/views/wujie/index.vue @@ -1,17 +1,30 @@ @@ -54,6 +88,21 @@ export default { right: 0; bottom: 0; } +#iframe-app { + overflow: hidden; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + height: 100%; + + iframe { + width: 100%; + height: 100%; + } +}