From afc370d2843ecd9dd4905a59f13cf4dd17d5b925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=93=E5=8F=91=E5=8F=97=E9=95=BF=E7=94=9F?= Date: Sun, 12 May 2019 14:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=85=A7=E7=89=87=E5=A2=99=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/_posts/前端杂烩/博客部署调整记录.md | 5 +- source/images/前端杂烩/gulp-2x.png | Bin 0 -> 16249 bytes source/photo_wall/index.md | 2 +- .../yilia/source-src/css/article-inner.scss | 2 +- themes/yilia/source-src/css/left.scss | 2 +- .../yilia/source-src/css/mobile-slider.scss | 2 +- .../yilia/source-src/css/page/photo-wall.scss | 5 ++ themes/yilia/source-src/js/aside.js | 3 +- themes/yilia/source-src/js/comment.js | 2 +- themes/yilia/source-src/js/main.js | 14 ++-- themes/yilia/source-src/js/photo-wall.js | 60 ++++++++++++++---- 11 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 source/images/前端杂烩/gulp-2x.png diff --git a/source/_posts/前端杂烩/博客部署调整记录.md b/source/_posts/前端杂烩/博客部署调整记录.md index e0c4a97..e3713d3 100644 --- a/source/_posts/前端杂烩/博客部署调整记录.md +++ b/source/_posts/前端杂烩/博客部署调整记录.md @@ -15,7 +15,7 @@ categories: 2. hexo clean && hexo generate 3. 图片与对象存储仓库同步 4. 生成的html文件的压缩 -5. public目录中所有内容的拷贝发布 +5. public目录中所有文件的拷贝发布 因为不想把主题和内容过多整合, 这样会导致将来更换主题困难 所以计划是把2 3 4 5步骤在构建过程中一键完成 @@ -58,9 +58,10 @@ try { */ ``` 上面的写法就如同是在命令行执行`hexo clean && hexo generate` -正好gulp配置任务的时候也需要返回Promise对象( 下面会提到 ), 正好能结合, 不需要二次封装了, 不错 +正好gulp配置任务的时候也需要返回Promise对象( 下面会提到 ), 可以直接结合, 不需要二次封装了, 不错 ### gulp +![gulp](/images/前端杂烩/gulp-2x.png) 之前没用过这个前端构建工具, 因为跟webpack的作用有不少的重合, 前端实在学不完 这里使用一下它的任务自动管理的功能, 整体的体验挺好 diff --git a/source/images/前端杂烩/gulp-2x.png b/source/images/前端杂烩/gulp-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2c2ccbe5bf890ad118b04e84a9026cdf2c81c7fa GIT binary patch literal 16249 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 D6~Nhg literal 0 HcmV?d00001 diff --git a/source/photo_wall/index.md b/source/photo_wall/index.md index 7d574af..e170495 100644 --- a/source/photo_wall/index.md +++ b/source/photo_wall/index.md @@ -4,4 +4,4 @@ date: 2018-5-24 10:05:28 pageid: PhotoWall --- -
+
正在加载ԅ( ¯་། ¯ԅ)
diff --git a/themes/yilia/source-src/css/article-inner.scss b/themes/yilia/source-src/css/article-inner.scss index 89a1bda..032d8f8 100644 --- a/themes/yilia/source-src/css/article-inner.scss +++ b/themes/yilia/source-src/css/article-inner.scss @@ -99,7 +99,7 @@ content: ""; width: 6px; height: 6px; - border: 1px solid #999; + border: 1px solid $color9; border-radius: 10px; background: #aaa; display: inline-block; diff --git a/themes/yilia/source-src/css/left.scss b/themes/yilia/source-src/css/left.scss index f2ba9d8..2d43eab 100644 --- a/themes/yilia/source-src/css/left.scss +++ b/themes/yilia/source-src/css/left.scss @@ -35,7 +35,7 @@ } .header-subtitle{ text-align: center; - color:#999; + color:$color9; font-size: 14px; line-height: 25px; overflow: hidden; diff --git a/themes/yilia/source-src/css/mobile-slider.scss b/themes/yilia/source-src/css/mobile-slider.scss index ea9da91..1ec058c 100644 --- a/themes/yilia/source-src/css/mobile-slider.scss +++ b/themes/yilia/source-src/css/mobile-slider.scss @@ -20,7 +20,7 @@ } .header-subtitle { text-align: center; - color: #999; + color: $color9; font-size: 14px; line-height: 25px; overflow: hidden; diff --git a/themes/yilia/source-src/css/page/photo-wall.scss b/themes/yilia/source-src/css/page/photo-wall.scss index 0bcf3e5..2c39a52 100644 --- a/themes/yilia/source-src/css/page/photo-wall.scss +++ b/themes/yilia/source-src/css/page/photo-wall.scss @@ -19,3 +19,8 @@ vertical-align: middle; } } +#load-top { + color: $color9; + text-align: center; + display: none; +} \ No newline at end of file diff --git a/themes/yilia/source-src/js/aside.js b/themes/yilia/source-src/js/aside.js index fb2778d..17a5e61 100644 --- a/themes/yilia/source-src/js/aside.js +++ b/themes/yilia/source-src/js/aside.js @@ -1,7 +1,7 @@ var backTop = function (domE, ctn, distance) { if (!domE) return; var timer = null; - var _onscroll = window.onscroll, + var _onscroll = (ctn || window).onscroll, _onclick = domE.onclick; (ctn || window).onscroll = throttle(function () { typeof _onscroll === 'function' && _onscroll.apply(this, arguments); @@ -9,7 +9,6 @@ var backTop = function (domE, ctn, distance) { }, 100); domE.onclick = function () { typeof _onclick === 'function' && _onclick.apply(this, arguments); - var baseCt = ctn.scrollTop || document.documentElement.scrollTop || document.body.scrollTop; timer = setInterval(function () { //设置一个计时器 var ct = ctn.scrollTop || document.documentElement.scrollTop || document.body.scrollTop; //获取距离顶部的距离 var diff = Math.max(10, ct / 6); diff --git a/themes/yilia/source-src/js/comment.js b/themes/yilia/source-src/js/comment.js index 350172d..75c6844 100644 --- a/themes/yilia/source-src/js/comment.js +++ b/themes/yilia/source-src/js/comment.js @@ -9,7 +9,7 @@ window.AV = require('leancloud-storage') // 评论配置 const commentConfig = require("../config/comment.json") -import(/* webpackChunkName: "valine" */ '../lib/Valine.min').then(({ default: Valine }) => { +import(/* webpackChunkName: "valine" */ '../lib/Valine.min').then((: Valine }) => { commentConfig.valine.config.path = window.location.pathname // commentConfig.valine.config.av = AV new Valine(commentConfig.valine.config) diff --git a/themes/yilia/source-src/js/main.js b/themes/yilia/source-src/js/main.js index 4bdf3fd..edc3d62 100644 --- a/themes/yilia/source-src/js/main.js +++ b/themes/yilia/source-src/js/main.js @@ -12,15 +12,17 @@ import Util from './util' Util.addLoadEvent(function() { Share.init() // Viewer.init() - Aside.init() + Aside.init() + if(window.themeConfig.pageid === 'PhotoWall') { + // 自定义的照片墙页面 + import(/* webpackChunkName: "photo-wall" */ './photo-wall').then(PhotoWall => { + // PhotoWall.default.init() + }) + } }) + const commentConfig = require("../config/comment.json") if(window.themeConfig.isPost && commentConfig.valine.enable) { // 文章详情页面, 并且启用了评论, 则加载评论相关代码 import(/* webpackChunkName: "comment" */ './comment') -} - -if(window.themeConfig.pageid === 'PhotoWall') { - // 自定义的照片墙页面 - import(/* webpackChunkName: "photo-wall" */ './photo-wall') } \ No newline at end of file diff --git a/themes/yilia/source-src/js/photo-wall.js b/themes/yilia/source-src/js/photo-wall.js index e8ee072..78cd9d9 100644 --- a/themes/yilia/source-src/js/photo-wall.js +++ b/themes/yilia/source-src/js/photo-wall.js @@ -1,36 +1,70 @@ import axios from 'axios' -var groupid = 1, currentIndex = 0 +var groupid = 1, currentIndex = 0, defaultStep = 20, scrollLock = false -function loadMore(step) { +// 滚动区域DOM +const scrollDom = document.getElementById('container') +// 作为底部标记的DOM +const markDom = document.getElementById('footer') +// 加载提示文字 +const loadTip = document.getElementById('load-top') + +function loadMoreItems(step) { + scrollLock = true //加载过程中锁定滚动加载 + loadTip.style.display = 'block' // 滚动到底部时调用 axios.get(`${themeConfig.pictureCdn}/photo-wall/${groupid}/list.json`).then(res => { var itemContainer = document.createElement('div') var imgItems = '', index = currentIndex for( ; index + imgItems += `
-
- ` + ` } if(index >= res.data.files.length) { // 已到达当前分组列表的末尾 groupid++ if(index{ + scrollLock = false + }, 2000) }).catch(res => { // 未加载到文件列表, 代表已经没有更多图片 - // TODO 显示已没有更多内容 - // console.log(res) + scrollLock = true + loadTip.textContent = '没有更多图片啦/(ㄒoㄒ)/~~' }) } -loadMore(20) -//TODO 在滚动到底部时调用loadMore \ No newline at end of file + +//检测是否具备滚动条加载数据块的条件 +function checkScrollSlide(){ + var scrollH = scrollDom.scrollTop || document.body.scrollTop || document.documentElement.scrollTop + var clientHeight = document.body.clientHeight || document.documentElement.clientHeight + var footerOffetTop = markDom.offsetTop + return scrollH + clientHeight > footerOffetTop +} + +function init() { + var _onscroll = scrollDom.onscroll + var timer = null + scrollDom.onscroll = function () { + typeof _onscroll === 'function' && _onscroll.apply(this, arguments) + if(scrollLock) return + if(timer) clearTimeout(timer) + timer = setTimeout(()=>{ + if(checkScrollSlide()) { + loadMoreItems(defaultStep) + } + timer = null + }, 200) + } + loadMoreItems(defaultStep) +} +export default { init } \ No newline at end of file