diff --git a/package.json b/package.json index 66f87a5..e7e0704 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "1.0.4", + "version": "1.0.5", "private": true, "author": { "name": "Hunlongyu", diff --git a/src/background.js b/src/background.js index 01f7cfe..60caccb 100644 --- a/src/background.js +++ b/src/background.js @@ -8,7 +8,7 @@ import { import path from 'path' import { autoUpdater } from 'electron-updater' const isDevelopment = process.env.NODE_ENV !== 'production' -const globalShortcut = require('electron').globalShortcut +const globalShortcut = require('electron').globalShortcut let win let mini @@ -75,6 +75,7 @@ function createMini () { } app.allowRendererProcessReuse = true +app.commandLine.appendSwitch('--no-sandbox') app.on('window-all-closed', () => { if (process.platform !== 'darwin') { diff --git a/src/components/Detail.vue b/src/components/Detail.vue index f455ef9..fa52db6 100644 --- a/src/components/Detail.vue +++ b/src/components/Detail.vue @@ -136,10 +136,10 @@ export default { left: 0; bottom: 0; width: 100%; - height: 680px; + height: calc(100% - 40px); z-index: 999; .detail-content{ - height: 680px; + height: calc(100% - 10px); padding: 0 60px; position: relative; .detail-header{ @@ -157,14 +157,14 @@ export default { } } .detail-body{ - height: 630px; + height: calc(100% - 50px); overflow-y: auto; .info{ display: flex; justify-content: flex-start; align-items: flex-start; flex-wrap: wrap; - width: 955px; + width: 100%; padding: 10px; border: 1px solid; border-radius: 2px; @@ -256,7 +256,7 @@ export default { .desc{ border: 1px solid; padding: 10px; - width: 955px; + width: 100%; margin-bottom: 10px; border-radius: 2px; font-size: 14px; @@ -265,7 +265,7 @@ export default { .m3u8_urls, .mp4_urls{ border: 1px solid; padding: 10px; - width: 955px; + width: 100%; margin-bottom: 10px; border-radius: 2px; .title{ @@ -295,10 +295,11 @@ export default { } } .detail-mask{ - width: 980px; - height: 600px; position: absolute; top: 50px; + left: 0; + width: 100%; + height: calc(100 - 50px); display: flex; justify-content: center; align-items: center; diff --git a/src/components/Play.vue b/src/components/Play.vue index b4a4080..5fbfc32 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -1,7 +1,8 @@