diff --git a/package.json b/package.json index 9837435..2fee1aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "2.2.0", + "version": "2.3.2", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 39bdfb7..a9b8485 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -85,9 +85,25 @@ flex-direction: column; height: 100%; font-size: 15px; + .tHeader{ + display: flex; + align-items: center; + justify-content: flex-end; + height: 50px; + min-height: 50px; + width: 100%; + border-bottom: 1px solid; + .btn{ + user-select: none; + margin-right: 15px; + cursor: pointer; + font-size: 14px; + } + } .tBody{ flex: 1; border-bottom: 1px solid; + overflow: auto; ul{ list-style: none; padding: 0; diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index ecb5c70..f6bea28 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -34,6 +34,14 @@ } .zy-table{ color: var(--d-fc-2); + .tHeader{ + border-bottom-color: var(--d-c-3); + .btn{ + &:hover{ + color: var(--d-fc-3) + } + } + } .tBody{ border-bottom-color: var(--d-c-3); ul{ @@ -199,6 +207,7 @@ } &.last-tip { color: var(--d-fc-1); + font-size: 14px; } } } @@ -229,6 +238,9 @@ background-color: var(--d-c-2); color: var(--d-fc-3); } + &:hover{ + background-color: var(--d-c-3); + } } } .list-history{ @@ -324,4 +336,8 @@ background-color: var(--d-bgc-1); } } + .history{ + 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 29916c2..3a15159 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -34,6 +34,14 @@ } .zy-table{ color: var(--g-fc-2); + .tHeader{ + border-bottom-color: var(--g-c-3); + .btn{ + &:hover{ + color: var(--g-fc-3) + } + } + } .tBody{ border-bottom-color: var(--g-c-3); ul{ @@ -199,6 +207,7 @@ } &.last-tip { color: var(--g-fc-1); + font-size: 14px; } } } @@ -229,6 +238,9 @@ background-color: var(--g-c-2); color: var(--g-fc-3); } + &:hover{ + background-color: var(--d-c-3); + } } } .list-history{ diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index aa29192..77c0654 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -34,6 +34,14 @@ } .zy-table{ color: var(--l-fc-2); + .tHeader{ + border-bottom-color: var(--l-c-3); + .btn{ + &:hover{ + color: var(--l-fc-3) + } + } + } .tBody{ border-bottom-color: var(--l-c-3); ul{ @@ -199,6 +207,7 @@ } &.last-tip { color: var(--l-fc-1); + font-size: 14px; } } } @@ -229,6 +238,9 @@ background-color: var(--l-c-2); color: var(--l-fc-3); } + &:hover{ + background-color: var(--d-c-3); + } } } .list-history{ diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index f45b7b4..ee0e158 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -34,6 +34,14 @@ } .zy-table{ color: var(--p-fc-2); + .tHeader{ + border-bottom-color: var(--p-c-3); + .btn{ + &:hover{ + color: var(--p-fc-3) + } + } + } .tBody{ border-bottom-color: var(--p-c-3); ul{ @@ -199,6 +207,7 @@ } &.last-tip { color: var(--p-fc-1); + font-size: 14px; } } } @@ -229,6 +238,9 @@ background-color: var(--p-c-2); color: var(--p-fc-3); } + &:hover{ + background-color: var(--d-c-3); + } } } .list-history{ diff --git a/src/components/History.vue b/src/components/History.vue index 1c589ea..1cd87f9 100644 --- a/src/components/History.vue +++ b/src/components/History.vue @@ -2,9 +2,11 @@
-
+
+ 清空 +
+
    -
  • 清空
  • 无数据
  • {{i.name}} @@ -171,7 +173,6 @@ export default { .body{ width: 100%; height: 100%; - overflow: auto; } } diff --git a/src/components/Play.vue b/src/components/Play.vue index 599e4a5..96577a0 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -577,17 +577,17 @@ export default { } let m3u8Content = '#EXTM3U' for (const item of m3u8Arr) { - m3u8Content += `#EXTINF:-1, ${item.name}${item.link}` + m3u8Content += `#EXTINF:-1, ${item.name}\n${item.link}` } const blob = new Blob([m3u8Content], { type: 'application/vnd.apple.mpegurl' }) - const downloadElement = document.createElement('a') // 创建下载的链接 + const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) downloadElement.href = href - downloadElement.download = `${this.name}.m3u8` // 下载后的文件名 + downloadElement.download = `${this.name}.m3u8` document.body.appendChild(downloadElement) - downloadElement.click() // 下载 - document.body.removeChild(downloadElement) // 下载完成 移除 a - window.URL.revokeObjectURL(href) // 释放blob对象 + downloadElement.click() + document.body.removeChild(downloadElement) + window.URL.revokeObjectURL(href) }, clearAllHistory () { history.clear().then(res => { diff --git a/src/components/Star.vue b/src/components/Star.vue index afbf41c..71f342f 100644 --- a/src/components/Star.vue +++ b/src/components/Star.vue @@ -1,12 +1,12 @@