diff --git a/package.json b/package.json index 14d8037..c71d20a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "2.6.5", + "version": "2.6.6", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -21,11 +21,11 @@ "cheerio": "^1.0.0-rc.3", "core-js": "^3.7.0", "cors": "^2.8.5", - "dexie": "^3.0.2", + "dexie": "^3.0.3", "electron-localshortcut": "^3.2.1", "electron-proxy-agent": "^1.2.0", "electron-updater": "^4.3.5", - "element-ui": "^2.14.0", + "element-ui": "^2.14.1", "express": "^4.17.1", "fast-xml-parser": "^3.17.4", "html2canvas": "^1.0.0-rc.7", @@ -47,28 +47,28 @@ "vue-waterfall-plugin": "^1.1.0", "vuedraggable": "^2.24.3", "vuex": "^3.5.1", - "xgplayer": "^2.13.0", + "xgplayer": "^2.13.1", "xgplayer-hls.js": "^2.2.5" }, "devDependencies": { - "@vue/cli-plugin-babel": "~4.4.0", - "@vue/cli-plugin-eslint": "~4.4.0", - "@vue/cli-plugin-vuex": "~4.4.0", - "@vue/cli-service": "~4.4.0", + "@vue/cli-plugin-babel": "~4.5.9", + "@vue/cli-plugin-eslint": "~4.5.9", + "@vue/cli-plugin-vuex": "~4.5.9", + "@vue/cli-service": "~4.5.9", "@vue/eslint-config-standard": "^5.1.2", "babel-eslint": "^10.1.0", "babel-plugin-component": "^1.1.1", - "electron": "^10.1.5", - "electron-devtools-installer": "^3.1.0", - "eslint": "^6.7.2", + "electron": "^11.0.2", + "electron-devtools-installer": "^3.1.1", + "eslint": "^7.14.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.2", - "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-standard": "^4.1.0", + "eslint-plugin-vue": "^7.1.0", "sass": "^1.29.0", - "sass-loader": "^8.0.2", - "vue-cli-plugin-electron-builder": "2.0.0-rc.4", + "sass-loader": "^10.1.0", + "vue-cli-plugin-electron-builder": "2.0.0-rc.5", "vue-template-compiler": "^2.6.12" } } diff --git a/src/components/Film.vue b/src/components/Film.vue index e0c19d3..69fa930 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -425,7 +425,6 @@ export default { this.classList = [] this.type = {} this.getClass().then(res => { - this.infiniteId += 1 this.classClick(this.classList[0].name) }) } @@ -494,7 +493,7 @@ export default { const type = this.type.tid const page = this.pagecount this.statusText = ' ' - if (key && page < 1) { // OK资源前几类硬是去不掉 + if (key === undefined || page < 1 || type === undefined) { // OK资源前几类硬是去不掉 $state.complete() this.statusText = '暂无数据' return false @@ -612,9 +611,6 @@ export default { if (this.$refs.filmWaterfall) { this.$refs.filmWaterfall.refresh() } - this.getPage().then(() => { - this.infiniteId += 1 - }) } } }, diff --git a/src/components/Frame.vue b/src/components/Frame.vue index 7e81e9b..02471c9 100644 --- a/src/components/Frame.vue +++ b/src/components/Frame.vue @@ -1,7 +1,7 @@