From 0e94c2d8639c9ff503225941e74afbf8becf2b42 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: Mon, 8 Jul 2019 21:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=96=87=E6=A3=80=E7=B4=A2=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/yilia/layout/_partial/search.ejs | 37 +++++++------ themes/yilia/source-src/css/mobile.scss | 16 ++++++ themes/yilia/source-src/css/share.scss | 5 +- themes/yilia/source-src/css/tools.scss | 25 +++++---- themes/yilia/source-src/js/slider.js | 73 +++++++++++++++---------- 5 files changed, 97 insertions(+), 59 deletions(-) diff --git a/themes/yilia/layout/_partial/search.ejs b/themes/yilia/layout/_partial/search.ejs index 154c59b..5e6f08a 100644 --- a/themes/yilia/layout/_partial/search.ejs +++ b/themes/yilia/layout/_partial/search.ejs @@ -1,20 +1,25 @@ -
- -
-
- +
+
+ +
+
+ +
+
+ +
-
- -
-
-
-
- -
-
-
- +
+ +
+ +
+
+
+ +
+
\ No newline at end of file diff --git a/themes/yilia/source-src/css/mobile.scss b/themes/yilia/source-src/css/mobile.scss index 2378f4a..2ad7b0e 100644 --- a/themes/yilia/source-src/css/mobile.scss +++ b/themes/yilia/source-src/css/mobile.scss @@ -341,4 +341,20 @@ } } } +} +#search-panel { + width: 100%; + height: 100%; + top: 0; + left: 0; + transform: none; + .search-container { + display: flex; + width: 100%; + height: 100%; + flex-direction: column; + .search-result { + flex-grow: 1; + } + } } \ No newline at end of file diff --git a/themes/yilia/source-src/css/share.scss b/themes/yilia/source-src/css/share.scss index f36859b..4b46cf8 100644 --- a/themes/yilia/source-src/css/share.scss +++ b/themes/yilia/source-src/css/share.scss @@ -61,7 +61,6 @@ &.in { display: block; - visibility: visible; opacity: 1; } @@ -79,7 +78,7 @@ } .mask { - visibility: hidden; + display: none; position: fixed; top: 0; left: 0; @@ -93,7 +92,7 @@ pointer-events: none; transition: .3s ease-in-out; &.in { - visibility: visible; + display: block; pointer-events: auto; opacity: .3; } diff --git a/themes/yilia/source-src/css/tools.scss b/themes/yilia/source-src/css/tools.scss index 586050b..e7675da 100644 --- a/themes/yilia/source-src/css/tools.scss +++ b/themes/yilia/source-src/css/tools.scss @@ -245,13 +245,12 @@ label.bui-switch-label { } } -.js-search-box { +#search-panel { + width: 500px; + top: 10%; + transform: translate(-50%,0); .search { border-bottom: 1px solid #ccc; - background: #f5f5f5; - border-top-left-radius: 5px; - border-top-right-radius: 5px; - width: 500px; display: flex; line-height: 40px; .search-input-icon { @@ -269,9 +268,9 @@ label.bui-switch-label { } } .search-result { - height: 600px; - width: 500px; + max-height: 600px; overflow-y: auto; + position: relative; .search-result-item { text-align: left; border-bottom: 1px dashed $colorC; @@ -280,10 +279,16 @@ label.bui-switch-label { border-bottom-color: $colorA; } } + .tip { + text-align: center; + } .more-item { cursor: pointer; - text-align: center; - transform: rotate(180deg) - } + transform: rotate(180deg) translateY(60px); + background: linear-gradient(-180deg,$colorBg 10%,rgba(255, 255, 255, 0) 100%); + position: absolute; + height: 70px; + width: 100%; + } } } \ No newline at end of file diff --git a/themes/yilia/source-src/js/slider.js b/themes/yilia/source-src/js/slider.js index 772eece..1ac3fa7 100644 --- a/themes/yilia/source-src/js/slider.js +++ b/themes/yilia/source-src/js/slider.js @@ -31,9 +31,10 @@ new Vue({ fullTextSearch: { pageNum: 1, limit: 10, - words: null }, + fullTextSearchWords: null, fullTextSearchItems: [], + fullTextSearchTip: undefined, waifu: { tip: null, // 提示语文字 tipOpacity: 0, // 提示语框透明度 @@ -93,12 +94,26 @@ new Vue({ this.$refs.fullTextSearch.classList.add('in') this.$refs.mask.classList.add('in') }, - loadMoreSearchResult() { + loadSearchResult() { this.fullTextSearch.pageNum ++ - axios.get(window.themeConfig.root + 'api/common/search', {params: this.fullTextSearch}).then(res => { + this.fullTextSearchItems.isLoading = true + this.fullTextSearchTip = undefined + let params = Object.assign({}, this.fullTextSearch) + params.words = this.fullTextSearchWords + axios.get(/*window.themeConfig.root + 'api/common/search'*/ 'http://localhost:3301/common/search', {params}).then(res => { + this.fullTextSearchItems.isLoading = false + fullTextSearchTimer = null let result = res.data + if(!Array.isArray(result.data) || !result.data.length) { + this.fullTextSearchTip = '未搜索到匹配文章' + } else { + this.fullTextSearchItems.push(...result.data) + } this.fullTextSearchItems.hasMore = (result.total > this.fullTextSearch.pageNum * this.fullTextSearch.limit) - this.fullTextSearchItems.push(...result.data) + }).catch(err => { + this.fullTextSearchTip = '加载失败, 请刷新重试' + this.fullTextSearchItems.isLoading = false + throw err }) }, searchKeydown(event) { @@ -138,31 +153,29 @@ new Vue({ }) } }, - fullTextSearch: { - deep: true, - handler(newVal, oldVal) { - if(!newVal.words) { - return - } - if(fullTextSearchTimer) { - clearTimeout(fullTextSearchTimer) - } - fullTextSearchTimer = setTimeout(() => { - this.fullTextSearchItems.length = 0 - axios.get(window.themeConfig.root + 'api/common/search', {params: newVal}).then(res => { - let result = res.data - this.fullTextSearchItems.hasMore = (result.total > this.fullTextSearch.pageNum * this.fullTextSearch.limit) - this.fullTextSearchItems.push(...result.data) - }) - }, 1000) - } + fullTextSearchWords (newVal, oldVal) { + this.fullTextSearchItems.hasMore = false + this.fullTextSearchItems.isLoading = false + this.fullTextSearchTip = undefined + this.fullTextSearchItems.splice(0, this.fullTextSearchItems.length) + if(fullTextSearchTimer) { + clearTimeout(fullTextSearchTimer) + fullTextSearchTimer = null + } + if(!newVal) { + return + } + this.fullTextSearch.pageNum = 0 + fullTextSearchTimer = setTimeout(() => { + this.fullTextSearchItems.splice(0, this.fullTextSearchItems.length) + this.loadSearchResult() + }, 500) } }, mounted () { - axios.get(window.themeConfig.root + 'content.json?t=' + (+ new Date())) - .then((res)=>{ + axios.get(window.themeConfig.root + 'content.json').then((res)=>{ this.items = res.data - }).catch((err) => { + }).catch(err => { console.warn('加载文章列表失败') }) this.showMessage(welcomeMessage(), 6000) @@ -238,28 +251,28 @@ function welcomeMessage() { } const waifuTools = { - "tools.photo"() { + 'tools.photo'() { // 生成canvas快照 window.Live2D.captureName = 'Kesshouban.png' window.Live2D.captureFrame = true }, - "tools.close"() { + 'tools.close'() { // 隐藏看板娘 setTimeout(function() { document.querySelector('.waifu').style.display = 'none' localStorage.setItem('hideWaifu', true) }, 1300) }, - "tools.eye"() { + 'tools.eye'() { // 切换到夜间模式 document.querySelector('.mid-col').classList.remove('hide') let night = document.querySelector('body').classList.toggle('night') localStorage.setItem('night', night) }, - "tools.info"() { + 'tools.info'() { window.open('https://github.com/xiazeyu/live2d-widget.js') }, - "tools.chart"() { + 'tools.chart'() { // 一言 axios.get(`${window.themeConfig.root}api/common/hitokoto?length=40&format=json`).then(res => { this.showMessage(res.data.hitokoto + (res.data.from?`　　——${res.data.from}`:''))