Merge branch 'electron'

# Conflicts:
#	src/store/actions.js
#	src/store/mutations.js
This commit is contained in:
qier222 2020-11-23 16:48:18 +08:00
commit 7d32e8f3bf
291 changed files with 23897 additions and 161 deletions

View file

@ -35,6 +35,7 @@
<svg-icon icon-class="search" />
<div class="input">
<input
ref="searchInput"
:placeholder="inputFocus ? '' : $t('nav.search')"
v-model="keywords"
@keydown.enter="goToSearchPage"