Merge pull request #101 from WinterSoHot/master

fix(Play.vue):播放界面自适应窗口

.github/workflows/x86.yml

@@ -3,7 +3,7 @@ name: release-build
 on:
   push:
     tags:
-      - x86
+      - x86 *
 
 jobs:
   release:
@@ -25,3 +25,11 @@ jobs:
         shell: pwsh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist_electron
+          path: dist_electron/*.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -60,7 +60,13 @@
 
 2. [蓝奏云 -- 快速下载(老版本)](https://www.lanzous.com/b04s6a3re) 密码:95px
 
+3. 适用于32位操作系统的x86软件,在蓝奏云网盘里, 后缀名: ZY Player * 32位.exe
+
 #### 截图: 
+
+0. 分享 ⇣ ↓
+![share.gif](https://i.loli.net/2020/06/05/hbJwBXlx194umcO.gif)
+
 1. 浏览 ⇣ ↓
 ![01浏览.png](https://i.loli.net/2020/05/18/MshDLnXq2CTpoBy.png)
 2. 搜索 ⇣ ↓

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "private": true,
   "author": {
     "name": "Hunlongyu",

src/background.js

@@ -16,7 +16,7 @@ let mini
 // Scheme must be registered before the app is ready
 protocol.registerSchemesAsPrivileged([{ scheme: 'app', privileges: { secure: true, standard: true } }])
 
-function createWindow () {
+function createWindow() {
   win = new BrowserWindow({
     width: 1080,
     height: 720,
@@ -44,7 +44,7 @@ function createWindow () {
   })
 }
 
-function createMini () {
+function createMini() {
   mini = new BrowserWindow({
     width: 550,
     minWidth: 260,
@@ -74,6 +74,10 @@ function createMini () {
   })
 }
 
+if (process.platform === 'darwin') {
+  app.dock.show()
+}
+
 app.allowRendererProcessReuse = true
 app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
 if (process.platform === 'Linux') {
@@ -81,9 +85,7 @@ if (process.platform === 'Linux') {
 }
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
+  app.quit()
 })
 
 app.on('activate', () => {

src/components/Play.vue

@@ -125,8 +125,8 @@ export default {
         id: 'xg',
         lang: 'zh-cn',
         url: '',
-        width: 900,
-        height: 500,
+        width: '100%',
+        height: '100%',
         autoplay: false,
         videoInit: true,
         screenShot: true,
@@ -228,7 +228,6 @@ export default {
     },
     playVideo (index, time) {
       tools.detail_get(this.video.site, this.video.detail).then(res => {
-        console.log(res, 'res paly video')
         this.name = res.name
         this.right.listData = res.m3u8_urls
 
@@ -238,7 +237,6 @@ export default {
           arr.push(i.split('$')[1])
         }
         this.length = arr.length
-        console.log(index, 'play index')
         this.xg.src = arr[index]
         this.showNext = this.length > 1
 
@@ -503,8 +501,9 @@ export default {
       align-items: center;
     }
     .xgBox{
-      width: 900px;
+      width: 100%;
       height: 500px;
+      flex: 1;
     }
     .more{
       width: 100%;

src/components/Share.vue

@@ -32,7 +32,7 @@ export default {
         name: '',
         png: ''
       },
-      value: 'https://www.baidu.com',
+      value: '',
       loading: true
     }
   },