From ecbda21ea2787a0855962651f2161e1e150aa04a Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Wed, 18 Mar 2020 21:45:05 +0800 Subject: [PATCH] chore: upgrade antd. (halo-dev/console#105) --- public/images/404.svg | 1 - public/images/500.svg | 1 - src/components/global.less | 40 --------------------------- src/core/lazy_lib/components_use.js | 4 ++- src/views/exception/ExceptionPage.vue | 22 ++++++--------- src/views/exception/type.js | 4 --- 6 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 public/images/404.svg delete mode 100644 public/images/500.svg diff --git a/public/images/404.svg b/public/images/404.svg deleted file mode 100644 index ef9ab0d3f..000000000 --- a/public/images/404.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/images/500.svg b/public/images/500.svg deleted file mode 100644 index 8578a300d..000000000 --- a/public/images/500.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/global.less b/src/components/global.less index e3e5c9ced..2b0f0c64f 100644 --- a/src/components/global.less +++ b/src/components/global.less @@ -832,51 +832,11 @@ body { align-items: center; text-align: center; margin-top: 150px; - - .img { - display: inline-block; - padding-right: 52px; - zoom: 1; - - img { - height: 360px; - max-width: 430px; - } - } - - .content { - display: inline-block; - flex: auto; - - h1 { - color: #434e59; - font-size: 72px; - font-weight: 600; - line-height: 72px; - margin-bottom: 24px; - } - - .desc { - color: rgba(0, 0, 0, 0.45); - font-size: 20px; - line-height: 28px; - margin-bottom: 16px; - } - } } .mobile { .exception { margin-top: 30px; - - .img { - padding-right: unset; - - img { - height: 40%; - max-width: 80%; - } - } } } diff --git a/src/core/lazy_lib/components_use.js b/src/core/lazy_lib/components_use.js index da5befa0f..26bdd39b8 100644 --- a/src/core/lazy_lib/components_use.js +++ b/src/core/lazy_lib/components_use.js @@ -47,7 +47,8 @@ import { ConfigProvider, Timeline, Steps, - Empty + Empty, + Result } from 'ant-design-vue' Vue.use(Anchor) @@ -96,6 +97,7 @@ Vue.use(ConfigProvider) Vue.use(Timeline) Vue.use(Steps) Vue.use(Empty) +Vue.use(Result) Vue.prototype.$message = message Vue.prototype.$notification = notification diff --git a/src/views/exception/ExceptionPage.vue b/src/views/exception/ExceptionPage.vue index 1f292cbe6..6b09405ea 100644 --- a/src/views/exception/ExceptionPage.vue +++ b/src/views/exception/ExceptionPage.vue @@ -1,18 +1,14 @@ diff --git a/src/views/exception/type.js b/src/views/exception/type.js index 1ec3be061..5f9bfa6a3 100644 --- a/src/views/exception/type.js +++ b/src/views/exception/type.js @@ -1,12 +1,8 @@ const types = { 404: { - img: '/images/404.svg', - title: '404', desc: '抱歉，你访问的页面不存在' }, 500: { - img: '/images/500.svg', - title: '500', desc: '抱歉，服务器出错了' } }