diff --git a/src/assets/css/main.css b/src/assets/css/main.css index e5a63d7..157baaa 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -39,6 +39,10 @@ body { background-color: #b6b7b9; } +.httpLoading{ + font-size: 22px; +} + /* #app { max-width: 1280px; margin: 0 auto; diff --git a/src/components/ArticleDetail/index.vue b/src/components/ArticleDetail/index.vue index 8a2cd97..ac77816 100644 --- a/src/components/ArticleDetail/index.vue +++ b/src/components/ArticleDetail/index.vue @@ -23,12 +23,14 @@
推荐文章
@@ -217,52 +219,63 @@ const goDetail = (id) => { } ul { - display: flex; - flex-wrap: wrap; + padding-top: 30px; - li { + li{ width: 100%; - padding-right: 30px; - display: flex; - margin-top: 30px; - - .img { - width: 260px; - height: 360px; + height: 408px; + background: #D6D6DD; + border-radius: 3px; + border: 5px solid #D6D6DD; + margin-bottom: 20px; + color: #333; + cursor: pointer; + .img{ + width: 100%; + height: 264px; + background-color: #666; overflow: hidden; - - img { - width: 260px; - height: 360px; + img{ + object-fit: cover; + display: block; + background-color: #666; + &[src='']{ + display: none; + } } } - - .info { - flex: 1; - margin-left: 15px; - height: 360px; + .rTitle{ + height: 80px; + width: 100%; + padding: 20px 10px; display: flex; - flex-direction: column; justify-content: space-between; - - h3 { - font-size: 32px; + align-items: center; + h2{ + height: 40px; font-weight: bold; - padding-bottom: 10px; - } - - p { - padding: 10px 0; - font-size: 26px; - line-height: 30px; + font-size: 28px; + line-height: 40px; + margin-right: 10px; flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + text-align: left; } - - span { - color: #999; + span{ + height: 40px; + line-height: 40px; + display: inline-block; font-size: 22px; } } + .desc{ + padding: 10px; + font-size: 22px; + font-weight: bold; + line-height: 30px; + } } } } diff --git a/src/io/httpConfig.js b/src/io/httpConfig.js index 7876eed..1657cbd 100755 --- a/src/io/httpConfig.js +++ b/src/io/httpConfig.js @@ -22,6 +22,7 @@ export default function () { const showLoading = ()=>{ if (requestCount === 0) { let renderDom = document.createElement('div'); + renderDom.className ='httpLoading'; renderDom.style.cssText = 'width:100%; height: 100%; position: absolute;left:0;top:0;z-index:9999;background-color: rgba(0,0,0,0.5);display: flex;justify-content: center; align-items: center;' renderDom.setAttribute('id', 'requestLoading'); renderDom.innerHTML = 'loading...'; @@ -76,7 +77,7 @@ export default function () { if (response.data.status != 0) { if (response.data.status == 401 ) { // token失效 - showToast('账号过期或异地登录, 请重新登录'); + // showToast('账号过期或异地登录, 请重新登录'); localCache.remove('auth'); localCache.remove('userInfo'); userInfo.updateUserInfo({}); @@ -97,7 +98,7 @@ export default function () { switch (error.response.data.status) { case 401: // token失效 - showToast('账号过期或异地登录, 请重新登录'); + // showToast('账号过期或异地登录, 请重新登录'); localCache.remove('auth'); localCache.remove('userInfo'); userInfo.updateUserInfo({}); diff --git a/src/layouts/Header.vue b/src/layouts/Header.vue index 424b9d5..32aa6db 100644 --- a/src/layouts/Header.vue +++ b/src/layouts/Header.vue @@ -3,7 +3,7 @@ -
{{$route.meta.title}}
+
{{pageTitle}}