diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index f432392..831bb45 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -276,6 +276,19 @@ text-align: center; transform: rotate(45deg); } + .site{ + position: absolute; + top: 0%; + left: 0%; + width: 100%; + background-color: #111111aa; + color:#2f90b9; + height: 30px; + line-height: 30px; + font-size: 14px; + font-weight: bolder; + text-align: center; + } .progress{ position: absolute; bottom: 10%; diff --git a/src/components/Film.vue b/src/components/Film.vue index caa94b8..eaa66a2 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -9,6 +9,8 @@ :value="item.name"> + - + + + + + + + + {{props.data.site.name}} + + + + + 播放 + 收藏 + 分享 + + + + {{props.data.name}} + + {{props.data.area}} + {{props.data.year}} + {{props.data.note}} + {{props.data.type}} + + + + + @@ -263,7 +306,8 @@ export default { searchGroup: '', searchGroups: [], // 福利片关键词 - r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番'] + r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番'], + searchViewMode: 'picture' } }, components: { @@ -338,6 +382,12 @@ export default { }, methods: { ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_SETTING']), + updateSearchViewMode () { + setting.find().then(res => { + res.searchViewMode = this.searchViewMode + setting.update(res) + }) + }, sortByLocaleCompare (a, b) { return a.localeCompare(b, 'zh') }, @@ -697,11 +747,17 @@ export default { this.searchGroup = this.setting.searchGroup if (this.searchGroup === undefined) setting.find().then(res => { this.searchGroup = res.searchGroup }) }) + }, + getSearchViewMode() { + setting.find().then(res => { + this.searchViewMode = res.searchViewMode === undefined ? 'picture' : res.searchViewMode + }) } }, created () { this.getAllSites() this.getSearchHistory() + this.getSearchViewMode() }, mounted () { window.addEventListener('resize', () => { diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js index 478a0cc..e0a3d0a 100644 --- a/src/lib/dexie/dexie.js +++ b/src/lib/dexie/dexie.js @@ -6,7 +6,7 @@ const db = new Dexie('zy') db.version(4).stores({ search: '++id, keywords', iptvSearch: '++id, keywords', - setting: 'id, theme, site, shortcut, view, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, password, proxy', + setting: 'id, theme, site, shortcut, view, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, searchViewMode, password, proxy', shortcut: 'name, key, desc', star: '++id, [key+ids], site, name, detail, index, rate, hasUpdate', recommendation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate', diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js index 6889237..ad7019e 100644 --- a/src/lib/dexie/initData.js +++ b/src/lib/dexie/initData.js @@ -12,6 +12,7 @@ const setting = [ starViewMode: 'picture', recommendationViewMode: 'picture', historyViewMode: 'picture', + searchViewMode: 'picture', password: '', proxy: { type: 'none',