v0.7.22 优化更新

.env

@@ -1 +1 @@
-GH_TOKEN=bf20e1fde476eafdc8d67c0cd7b9fe8bf3c063fe
+GH_TOKEN=7d2166f485858c3b2f90f784dd3c8213c996c380

README.md

@@ -1,4 +1,7 @@
 <p align="center">
+<img src="https://i.loli.net/2020/01/20/WEj3Yw8rPXqTcHe.png" >
+</p>
+<p align="center">
 <img src="https://forthebadge.com/images/badges/built-with-love.svg">
 <img src="https://forthebadge.com/images/badges/made-with-vue.svg">
 <p>
@@ -15,6 +18,8 @@
 ### 截图: 
 主界面 ⬇
 ![film.png](https://i.loli.net/2020/01/19/U1EPzoJHhTDnuxA.png)
+暗黑主题 ⬇
+![dark.png](https://i.loli.net/2020/01/20/eU6J3EFcPTXnjlK.png)
 搜索 ⬇
 ![search.png](https://i.loli.net/2020/01/19/BPvJKxlnNfquRI4.png)
 搜索结果 ⬇
@@ -31,9 +36,8 @@
 [下载地址](https://github.com/Hunlongyu/ZY-Player/releases)
 
 ### 未完成:
-1. 主题: 暗黑主题
-2. 更新: 自动更新
-3. 图标: 求一个 zy 的logo, 256x256 像素的
+1. 更新: 手动检测更新
+2. 图标: 求一个 zy 的logo, 256x256 像素的
 
 ### 重要: 
 所有资源来自网上, 该软件不参与任何制作, 上传, 储存, 下载等内容. 该软件仅供学习参考, 请于安装后24小时内删除.

package.json

@@ -1,6 +1,8 @@
 {
   "name": "zy",
-  "version": "0.7.18",
+  "version": "0.7.22",
+  "author": "Hunlongyu",
+  "description": "ZY Player 资源播放器",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/App.vue

@@ -88,6 +88,7 @@ export default Vue.extend({
 })
 </script>
 <style lang="scss">
+@import './assets/theme/global.scss';
 @import './assets/theme/dark.scss';
 @import './assets/theme/light.scss';
 *{

src/assets/theme/dark.scss

@@ -1,7 +1,51 @@
-@import './global.scss';
 .theme-dark{
-  color: var(--d-c);  
+  color: var(--d-c); 
   background-color: var(--d-bgc);
+  .el-button, input, select, .el-select{
+    color: var(--d-c);
+    background-color: var(--d-bgc);
+    border-color: var(--d-bdc);
+  }
+  .el-button--text{
+    border: none;
+  }
+  .el-tabs__item, .el-tabs__nav-wrap::after{
+    color: var(--d-c);
+    background-color: var(--d-bgc);
+    border-color: var(--d-dbc);
+  }
+  .el-table, .el-table th, .el-table tr,
+  .el-table--striped .el-table__body tr.el-table__row--striped td,
+  .el-table--enable-row-hover .el-table__body tr:hover>td,
+  .el-table td, .el-table th.is-leaf{
+    color: var(--d-c);
+    background-color: var(--d-bgc);
+    border-color: var(--d-dbc);
+  }
+  .el-pagination, .el-pagination .el-pagination__total, .el-pagination .el-pagination__jump,
+  .el-pagination .btn-next, .el-pagination .btn-prev, .el-pager li{
+    color: var(--d-c);
+    background-color: var(--d-bgc);
+  }
+  .el-input__inner,
+  .el-input-group__append, .el-input-group__prepend{
+    background-color: var(--d-bgc);
+    border-color: var(--d-dbc);
+  }
+  .el-select-dropdown{
+    color: var(--d-c);
+  }
+  .el-drawer{
+    background-color: var(--d-bgc) !important;
+    overflow: auto;
+    &::-webkit-scrollbar{
+      width: 0px;
+    }
+  }
+  .el-loading-mask{
+    background-color: var(--d-bgc);
+    opacity: 0.9;
+  }
   .Header, .Aside{
     i{
       color: var(--d-icon);
@@ -20,4 +64,45 @@
       }
     }
   }
+  .Main{
+    .film, .search, .star, .player{
+      .table-box{
+        &::-webkit-scrollbar-track {
+          box-shadow: inset 0 0 6px var(--d-bdc);
+        }
+        &::-webkit-scrollbar-thumb {
+          background-color: var(--d-icon);
+          outline: 1px solid var(--d-icon);
+        }
+      }
+    }
+    .setting{
+      .el-link, .card{
+        color: var(--d-c);
+        background-color: var(--d-bgc);
+        border-color: var(--d-bdc);
+      }
+    }
+  }
+  .detail{
+    color: var(--d-c);
+    &::-webkit-scrollbar-track {
+      box-shadow: inset 0 0 6px var(--d-bdc);
+    }
+    &::-webkit-scrollbar-thumb {
+      background-color: var(--d-icon);
+      outline: 1px solid var(--d-icon);
+    }
+    .box, .info, .urls{
+      border: 1px solid var(--d-bdc);
+    }
+    .vodInfo{
+      li, span, a{
+        color: var(--d-c);
+      }
+      label{
+        color: #f90;
+      }
+    }
+  }
 }

src/assets/theme/global.scss

@@ -15,5 +15,5 @@
   --d-icon-h: #919191;
   --d-bgc: #242424;
   --d-bgc-h: #454545;
-  --d-bdc: #dcdee2;
+  --d-bdc: #7a7a7a;
 }

src/assets/theme/light.scss

@@ -1,4 +1,3 @@
-@import './global.scss';
 .theme-light{
   color: var(--l-c); 
   background-color: var(--l-bgc);

src/page/film.vue

@@ -32,6 +32,7 @@
         small
         layout="total, prev, pager, next, jumper"
         :current-page="filmPage"
+        @current-change="pageChange"
         :page-size="50"
         :total="filmTotal">
       </el-pagination>
@@ -84,6 +85,7 @@ export default Vue.extend({
   methods: {
     ...mapMutations(['SET_SITE', 'SET_DETAIL', 'SET_MAIN', 'SET_VIDEO']),
     tabClick (tab:any) {
+      this.filmPage = 1
       this.getFilmList(this.site, this.filmPage, tab.name)
     },
     selectSite (e:any) {
@@ -92,6 +94,10 @@ export default Vue.extend({
       this.filmPage = 1
       this.getFilmList(e, 1, '0')
     },
+    pageChange (e:number) {
+      this.filmPage = e
+      this.getFilmList(this.site, this.filmPage, this.tabs)
+    },
     getFilmList (n: number = 0, p: number = 1, type: string = '0') {
       this.loading = true
       this.filmData = []

src/page/setting.vue

@@ -21,11 +21,23 @@
           <span size="mini">Light</span>
         </el-card>
         <el-card shadow="hover" class="card">
-          <img src="@/assets/image/light.png" class="image" @click="selectTheme('dark')">
+          <img src="@/assets/image/dark.png" class="image" @click="selectTheme('dark')">
           <span size="mini">Dark</span>
         </el-card>
       </el-row>
     </el-row>
+    <el-row class="item update about">
+      <el-row class="title"><i class="el-icon-refresh"></i><span>更新</span></el-row>
+      <el-row class="info">
+        <ul>
+          <li>当前版本: {{oldVersion}}</li>
+          <li>最新版本: {{newVersion}}</li>
+        </ul>
+      </el-row>
+      <el-row class="btns">
+        <el-button v-show="download" size="small" @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/releases/latest')">下载更新</el-button>
+      </el-row>
+    </el-row>
     <el-row class="item about">
       <el-row class="title"><i class="el-icon-view"></i><span>关于</span></el-row>
       <el-row class="info">
@@ -35,12 +47,6 @@
         </ul>
       </el-row>
     </el-row>
-    <!-- <el-row class="item update">
-      <el-row class="title"><i class="el-icon-refresh"></i><span>更新</span></el-row>
-      <el-row class="btns">
-        <el-button size="small">检查更新</el-button>
-      </el-row>
-    </el-row> -->
   </el-row>
 </template>
 <script lang="ts">
@@ -50,12 +56,16 @@ import { mapMutations } from 'vuex'
 import { shell } from 'electron'
 import site from '@/plugins/dexie/site'
 import theme from '@/plugins/dexie/theme'
+import fly from 'flyio'
 export default Vue.extend({
   name: 'setting',
   data () {
     return {
       sites: sites,
-      dbSite: 0
+      dbSite: 0,
+      oldVersion: 'v0.7.22',
+      newVersion: '',
+      download: false
     }
   },
   computed: {
@@ -115,10 +125,21 @@ export default Vue.extend({
       }).catch(() => {
         this.$message.warning('切换主题失败~')
       })
+    },
+    checkUpdate () {
+      fly.get('https://api.github.com/repos/Hunlongyu/ZY-Player/releases/latest').then(res => {
+        if (res.data.tag_name !== this.oldVersion) {
+          this.newVersion = res.data.tag_name
+          this.download = true
+        } else {
+          this.download = false
+        }
+      })
     }
   },
   created () {
     this.initSetting()
+    this.checkUpdate()
   }
 })
 </script>