diff --git a/package.json b/package.json index 95fa098..77d18a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "2.6.4.1", + "version": "2.6.5", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/components/Film.vue b/src/components/Film.vue index 57cdf13..caa94b8 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -182,27 +182,27 @@ :filters="getFilters('type')" :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.type }" label="类型" - width="100"> + width="90"> + width="90"> + width="90"> + width="70"> - - { - if (res && res.length > 0 && res.dl && res.dl.dd) { + downloadEvent (site, row) { + zy.download(site.key, row.id).then(res => { + if (res && res.length > 0) { const text = res.dl.dd._t if (text) { const list = text.split('#') @@ -541,7 +534,7 @@ export default { } } else { let m3u8List = [] - const dd = res.dl.dd + const dd = row.dl.dd const type = Object.prototype.toString.call(dd) if (type === '[object Array]') { for (const i of dd) { @@ -552,7 +545,7 @@ export default { } else { m3u8List = dd._t.split('#') } - let downloadUrl = e.name + '\n' + let downloadUrl = row.name + '\n' for (const i of m3u8List) { const url = encodeURI(i.split('$')[1]) downloadUrl += (url + '\n') diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js index ca01db8..736cdda 100644 --- a/src/lib/site/tools.js +++ b/src/lib/site/tools.js @@ -250,8 +250,8 @@ const zy = { return new Promise((resolve, reject) => { this.getSite(key).then(res => { const site = res - const url = `${site.download}?ac=videolist&ids=${id}&ct=1` - if (url) { + if (site.download) { + const url = `${site.download}?ac=videolist&ids=${id}&ct=1` axios.post(url).then(res => { const data = res.data const json = parser.parse(data, this.xmlConfig)