diff --git a/package.json b/package.json index 4489d6b..11b5b28 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "mousetrap": "^1.6.5", "qrcode.vue": "^1.7.0", "randomstring": "^1.1.5", + "request": "^2.88.2", "v-fit-columns": "^0.2.0", "vue": "^2.6.12", "vue-infinite-loading": "^2.4.5", diff --git a/src/App.vue b/src/App.vue index b504fb7..a764ea7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,6 +10,7 @@ + @@ -43,6 +44,9 @@ export default { }, editSites () { return this.$store.getters.getEditSites + }, + recommandation () { + return this.$store.getters.recommandation } }, watch: { diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index e42a5c3..1161b45 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -170,7 +170,7 @@ } } } - .film{ + .pictureView{ .body{ background-color: var(--d-bgc-1); box-shadow: var(--d-bsc); @@ -286,10 +286,6 @@ } } } - .star{ - background-color: var(--d-bgc-1); - box-shadow: var(--d-bsc); - } .setting{ background-color: var(--d-bgc-1); box-shadow: var(--d-bsc); diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss index d950491..ef2515a 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -166,7 +166,7 @@ } } } - .film{ + .pictureView{ .body{ background-color: var(--g-bgc-1); box-shadow: var(--g-bsc); @@ -282,10 +282,6 @@ } } } - .star{ - background-color: var(--g-bgc-1); - box-shadow: var(--g-bsc); - } .setting{ background-color: var(--g-bgc-1); box-shadow: var(--g-bsc); diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index 933c9fe..4ea943c 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -166,7 +166,7 @@ } } } - .film{ + .pictureView{ .body{ background-color: var(--l-bgc-1); box-shadow: var(--l-bsc); @@ -282,10 +282,6 @@ } } } - .star{ - background-color: var(--l-bgc-1); - box-shadow: var(--l-bsc); - } .setting{ background-color: var(--l-bgc-1); box-shadow: var(--l-bsc); diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index a0ac56f..0973bec 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -165,7 +165,7 @@ } } } - .film{ + .pictureView{ .body{ background-color: var(--p-bgc-1); box-shadow: var(--p-bsc); @@ -281,10 +281,6 @@ } } } - .star{ - background-color: var(--p-bgc-1); - box-shadow: var(--p-bsc); - } .setting{ background-color: var(--p-bgc-1); box-shadow: var(--p-bsc); diff --git a/src/components/Aside.vue b/src/components/Aside.vue index c2e566b..2a814c8 100644 --- a/src/components/Aside.vue +++ b/src/components/Aside.vue @@ -21,6 +21,13 @@ + + + 影视推荐 + + + + 播放 diff --git a/src/components/Detail.vue b/src/components/Detail.vue index 558dea6..e115ff8 100644 --- a/src/components/Detail.vue +++ b/src/components/Detail.vue @@ -173,18 +173,19 @@ export default { }, async starEvent () { const db = await star.find({ key: this.detail.key, ids: this.info.id }) + const doc = { + key: this.detail.key, + ids: this.info.id, + site: this.detail.site, + name: this.info.name, + detail: this.info, + rate: this.info.rate + } if (db) { - this.$message.info('该影片已被收藏') + star.update(db.id, doc) + this.$message.success('收藏更新成功') } else { - const docs = { - key: this.detail.key, - ids: this.info.id, - site: this.detail.site, - name: this.info.name, - detail: this.info, - rate: this.info.rate - } - star.add(docs).then(res => { + star.add(doc).then(res => { this.$message.success('收藏成功') }) } diff --git a/src/components/Film.vue b/src/components/Film.vue index 3db3368..8f0c55b 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -1,5 +1,5 @@
+
{{site.name}}
diff --git a/src/components/Recommandation.vue b/src/components/Recommandation.vue new file mode 100644 index 0000000..8566878 --- /dev/null +++ b/src/components/Recommandation.vue @@ -0,0 +1,373 @@ + + + diff --git a/src/components/Setting.vue b/src/components/Setting.vue index e1c3b5a..243d866 100644 --- a/src/components/Setting.vue +++ b/src/components/Setting.vue @@ -210,17 +210,7 @@ export default { }, getSetting () { setting.find().then(res => { - this.d = { - id: res.id, - theme: res.theme, - shortcut: res.shortcut, - view: res.view, - externalPlayer: res.externalPlayer, - searchAllSites: res.searchAllSites, - excludeRootClasses: res.excludeRootClasses, - excludeR18Films: res.excludeR18Films, - forwardTimeInSec: res.forwardTimeInSec - } + this.d = res this.setting = this.d }) }, diff --git a/src/components/Star.vue b/src/components/Star.vue index 9d77d55..124f9b5 100644 --- a/src/components/Star.vue +++ b/src/components/Star.vue @@ -1,8 +1,8 @@