diff --git a/package-lock.json b/package-lock.json index de74c76..002f7ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12498,6 +12498,11 @@ } } }, + "vue-infinite-scroll": { + "version": "2.0.2", + "resolved": "https://registry.npm.taobao.org/vue-infinite-scroll/download/vue-infinite-scroll-2.0.2.tgz", + "integrity": "sha1-yjepH+ku4K07dKz4aCwAkXFEtxE=" + }, "vue-loader": { "version": "15.9.1", "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.1.tgz?cache=0&sync_timestamp=1584584267698&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.1.tgz", diff --git a/package.json b/package.json index 30dbc4d..febf5e4 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "vue-axios": "^2.1.5", "vue-clipboard2": "^0.3.1", "vue-i18n": "^8.17.3", + "vue-infinite-scroll": "^2.0.2", "vue-router": "^3.1.6", "vue2-ace-editor": "0.0.15", "vuex": "^3.4.0" diff --git a/src/assets/style/theme/acrou/index.scss b/src/assets/style/theme/acrou/index.scss index 7b7b620..bb99d83 100644 --- a/src/assets/style/theme/acrou/index.scss +++ b/src/assets/style/theme/acrou/index.scss @@ -54,8 +54,8 @@ body { td span { vertical-align: middle; } - td .g2-file-desc{ - font-size:12px; + td .g2-file-desc { + font-size: 12px; } } @@ -87,6 +87,11 @@ body { } } +// 搜索框 +.search-input,.search-input::-webkit-input-placeholder { + color: whitesmoke; +} + .golist { min-height: 240px; position: relative; diff --git a/src/locales/en.json b/src/locales/en.json index 85d924f..07180f1 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -23,10 +23,12 @@ "copy": "Copy link", "newTab": "Open a new tab", "download": "Download" - } + }, + "total": "Total", + "item": "item" }, "search": { - "placeholder": "Search or jump to…" + "placeholder": "Search resources..." }, "page": { "video": { diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index f2db110..47bec7a 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -23,7 +23,9 @@ "copy": "复制链接", "newTab": "打开新的标签页", "download": "下载" - } + }, + "total": "共", + "item": "项" }, "search": { "placeholder": "搜索..." diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json index 282827d..adf6529 100644 --- a/src/locales/zh-cht.json +++ b/src/locales/zh-cht.json @@ -23,7 +23,9 @@ "copy": "復制鏈接", "newTab": "打開新的標簽頁", "download": "下載" - } + }, + "total": "共", + "item": "項" }, "search": { "placeholder": "搜索..." diff --git a/src/main.js b/src/main.js index 7cb8518..9dede23 100644 --- a/src/main.js +++ b/src/main.js @@ -11,12 +11,14 @@ import i18n from './i18n' // store import store from '@/store/index' import VueClipboard from 'vue-clipboard2' +import infiniteScroll from 'vue-infinite-scroll' import "@/assets/style/theme/register.scss" Vue.config.productionTip = false Vue.use(ElementUI) Vue.use(VueAxios,axios) Vue.use(VueClipboard) +Vue.use(infiniteScroll) new Vue({ router, diff --git a/src/views/common/Navbar.vue b/src/views/common/Navbar.vue index 8f59e76..dd9f404 100644 --- a/src/views/common/Navbar.vue +++ b/src/views/common/Navbar.vue @@ -44,16 +44,18 @@