v2.5.1

添加额外在线直播源文件
修复无法正确导入直播源的问题
2026-02-14 16:06:48 +08:00 · 2020-10-04 16:59:17 +02:00 · 2020-10-04 16:55:50 +02:00 · 2020-10-04 16:53:11 +02:00 · 2020-10-04 12:49:21 +02:00 · 2020-10-04 12:29:10 +02:00
77 changed files with 16580 additions and 3870 deletions
--- a/.github/workflows/x86.yml
+++ b/.github/workflows/x86.yml
@@ -0,0 +1,35 @@
+name: release-build
+
+on:
+  push:
+    tags:
+      - x86-v*
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - run: |
+          yarn
+          yarn dist
+        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 }}
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ node_modules
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*

 # Editor directories and files
 .idea
--- a/README.md
+++ b/README.md
@@ -22,61 +22,71 @@
 <p>


-## ZY Player 资源播放器
+<h1 align="center">ZY Player 资源播放器</h1>

-1. 全平台支持. Windows, Mac, Linux
-2. 12个视频源. 未来更新更多的视频源
-3. 新增历史播放记录, 并记录播放进度
-4. 新增分享功能. 一键分享海报图片
-5. 新增精简模式. 支持修改透明度
-6. 收藏夹同步更新视频追剧
-7. 支持演员名称搜索
-8. 更详细的视频分类
-9. 后台自动更新
-10. 全新布局配色
-11. 新增多语言
-12. 全局快捷键
-13. 下载功能
-14. ...

-觉得软件不错的, 点击右上角 star 收藏关注一波呀~

-> Tips: 资源加载不出来时, 点击列表下方链接, 浏览器打开一下网站. 原理是需要通过网站的人机检测.
+### ✨特性

-#### 全局快捷键:
+- 🍕 全平台支持. Windows, Mac, Linux
+- 🍔 视频源支持自定义, 支持导入, 导出
+- 🍟 支持海报模式和列表模式浏览资源
+- 🌭 播放历史, 自动跳转历史进度
+- 🍿 收藏夹支持导入,导出, 支持同步追剧
+- 🥙 支持精简模式, 摸鱼划水
+- 🥪 一键搜索所有资源, 支持历史搜索记录
+- 🌮 导出资源下载链接
+- 🍣 支持第三方播放器播放
+- 🍤 显示豆瓣评分

-|          快捷键          | 说明       | 主界面 | 小窗口 |
-| :----------------------: | ---------- | :----: | :----: |
-| `⌘ + →`  或  `Ctrl + →` | 下一集     |   √    |   √    |
-| `⌘ + ←`  或  `Ctrl + ←` | 上一集     |   √    |   √    |
-| `⌘ + ↑`  或  `Ctrl + ↑` | 减少透明度 |        |   √    |
-| `⌘ + ↓`  或  `Ctrl + ↓` | 增加透明度 |        |   √    |
-| `Shift + ↑` | 增加倍速 + 0.25 |    √    |   √    |
-| `Shift + ↓` | 减少倍速 - 0.25 |    √    |   √    |
+### 🌴 下载

-#### 下载:
+- 🍓 [Github -- 官方下载](https://github.com/Hunlongyu/ZY-Player/releases)
+- 🍉 [蓝奏云 -- 快速下载](https://www.lanzoux.com/b04s6a3re) 密码:95px
+- 🍒 适用于32位操作系统的x86软件,在蓝奏云网盘里, 后缀名: ZY Player * 32位.exe

-1. [Github -- 官方下载](https://github.com/Hunlongyu/ZY-Player/releases)
+### 🚀 快捷键

-2. [蓝奏云 -- 快速下载](https://www.lanzous.com/b04s6a3re) 密码:95px
+播放窗口 和 Mini窗口

-#### 截图: 
-1. 浏览 ⇣ ↓
-![01浏览.png](https://i.loli.net/2020/05/18/MshDLnXq2CTpoBy.png)
-2. 搜索 ⇣ ↓
-![02搜索.png](https://i.loli.net/2020/05/20/QgJqDkcjpeiRvBb.png)
-3. 详情 ⇣ ↓
-![03详情.png](https://i.loli.net/2020/05/18/s7gUj6unEfyYb4Z.png)
-4. 播放 ⇣ ↓
-![04播放.png](https://i.loli.net/2020/05/18/WqgnOw3mHd6e5uU.png)
-5. 收藏 ⇣ ↓
-![05收藏.png](https://i.loli.net/2020/05/18/bhIgeGMTPWmrdYi.png)
-6. 白色主题皮肤 ⇣ ↓
-![06白色.png](https://i.loli.net/2020/05/18/UgiVZ89dhkuxDBI.png)
-7. 绿色主题皮肤 ⇣ ↓
-![07绿色.png](https://i.loli.net/2020/05/18/4d2UnFRECm7vyJQ.png)
-8. 粉色色主题皮肤 ⇣ ↓
-![08粉色.png](https://i.loli.net/2020/05/18/PLlEfzd8mSC9vMW.png)
+|    快捷键     | 说明                         |  快捷键   | 说明              |
+| :-----------: | ---------------------------- | :-------: | ----------------- |
+| `Alt + Space` | 聚焦或取消聚焦（全局快捷键） |           |                   |
+|      `→`      | 快进 5 秒                    |    `←`    | 快退 5 秒         |
+|      `↑`      | 音量调高                     |    `↓`    | 音量调低          |
+|      `m`      | 静音                         |    `t`    | 置顶或退出置顶    |
+|      `f`      | 进入或退出全屏               |   `esc`   | 退出全屏          |
+|   `Alt + →`   | 下一集                       | `Alt + ←` | 上一集            |
+|   `Alt + ↑`   | 透明度调高                   | `Alt + ↓` | 透明度调低        |
+|    `home`     | 跳到视频开始位置             |   `end`   | 跳到视频结束位置  |
+|    `pgUp`     | 播放倍速加快 0.25            | `pgDown`  | 播放倍速减慢 0.25 |
+|   `Alt + m`   | 进入或退出 Mini 模式         |  `space`  | 播放或暂停        |

-### 重要: 
-所有资源来自网上, 该软件不参与任何制作, 上传, 储存, 下载等内容. 该软件仅供学习参考, 请于安装后24小时内删除.
+### 🎨 截图
+
+|                      🥼 浏览 (海报模式)                       |                      🧥 浏览 (列表模式)                       |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+| ![海报.png](https://i.loli.net/2020/09/02/ZAfGjcqLxoslpWQ.png) | ![列表.png](https://i.loli.net/2020/09/02/jrEkX3yiOGPFazs.png) |
+|                            👔 搜索                            |                            👕 详情                            |
+| ![搜索.png](https://i.loli.net/2020/09/02/HdMos8gent4kTmW.png) | ![详情.png](https://i.loli.net/2020/09/02/S2Np4GAmBz8Rj6P.png) |
+|                      👖 播放 (普通模式)                       |                      🩳 播放 (精简模式)                       |
+| ![播放.png](https://i.loli.net/2020/09/02/RLBoaZyuS2DCkJ3.png) | ![精简.png](https://i.loli.net/2020/09/02/f21SNdiVFHmeh6b.png) |
+|                          🧣 历史记录                          |                           🧤 收藏夹                           |
+| ![历史.png](https://i.loli.net/2020/09/02/ZhNXatyJi9Dvr3d.png) | ![收藏.png](https://i.loli.net/2020/09/02/wy4H76m2sQ8YdKi.png) |
+|                          👗 白色主题                          |                          🥻 黑色主题                          |
+| ![白色.png](https://i.loli.net/2020/09/02/gslBIYvTaSZRwfU.png) | ![黑色.png](https://i.loli.net/2020/09/02/dMmETUq1ACuGsI6.png) |
+|                          👘 绿色主题                          |                          👚 粉色主题                          |
+| ![绿色.png](https://i.loli.net/2020/09/02/nxJF71b3qusUclZ.png) | ![粉色.png](https://i.loli.net/2020/09/02/8rGL45p6kSqRCOz.png) |
+
+### 🍭 开发者
+
+|          [Hunlongyu](https://github.com/Hunlongyu)           |           [cuiocean](https://github.com/cuiocean)            |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+| <img width="120" src="https://avatars2.githubusercontent.com/u/15273630?s=460&u=48cf3299e2a842c0252233d8be42ef4c5d792138&v=4"/> | <img width="120" src="https://avatars0.githubusercontent.com/u/5760235?s=460&u=9d969dd8d83f069ce7ebd60516770c93ac07a330&v=4" /> |
+|                            💻 🎨 🐛                             |                             💻 🐛                              |
+
+
+
+### 🧧 赞助
+
+[![LATOPAY](https://latopay.com/w/lt-bg-2062.png)](https://latopay.com/@Hunlongyu)
--- a/docs/doc/404.html
+++ b/docs/doc/404.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>ZY PLAYER</title>
+    <meta name="generator" content="VuePress 1.5.2">
+    
+    <meta name="description" content="ZY PLAYER 文档">
+    <link rel="preload" href="/doc/assets/css/0.styles.7cdd3ee2.css" as="style"><link rel="preload" href="/doc/assets/js/app.441507e8.js" as="script"><link rel="preload" href="/doc/assets/js/4.023f7c55.js" as="script"><link rel="prefetch" href="/doc/assets/js/2.b7bb5685.js"><link rel="prefetch" href="/doc/assets/js/3.0958b336.js"><link rel="prefetch" href="/doc/assets/js/5.445cad31.js"><link rel="prefetch" href="/doc/assets/js/6.32cb0422.js"><link rel="prefetch" href="/doc/assets/js/7.e50f21bc.js"><link rel="prefetch" href="/doc/assets/js/8.d2479dad.js">
+    <link rel="stylesheet" href="/doc/assets/css/0.styles.7cdd3ee2.css">
+  </head>
+  <body>
+    <div id="app" data-server-rendered="true"><div class="theme-container"><div class="theme-default-content"><h1>404</h1> <blockquote>Looks like we've got some broken links.</blockquote> <a href="/doc/" class="router-link-active">
+      Take me home.
+    </a></div></div><div class="global-ui"></div></div>
+    <script src="/doc/assets/js/app.441507e8.js" defer></script><script src="/doc/assets/js/4.023f7c55.js" defer></script>
+  </body>
+</html>
--- a/docs/doc/assets/css/0.styles.7cdd3ee2.css
+++ b/docs/doc/assets/css/0.styles.7cdd3ee2.css
--- a/docs/doc/assets/css/0.styles.a0babdbb.css
+++ b/docs/doc/assets/css/0.styles.a0babdbb.css
--- a/docs/doc/assets/img/search.83621669.svg
+++ b/docs/doc/assets/img/search.83621669.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"><g stroke-width="2" stroke="#aaa" fill="none"><path d="M11.29 11.71l-4-4"/><circle cx="5" cy="5" r="4"/></g></svg>
--- a/docs/doc/assets/js/2.b7bb5685.js
+++ b/docs/doc/assets/js/2.b7bb5685.js
--- a/docs/doc/assets/js/3.0958b336.js
+++ b/docs/doc/assets/js/3.0958b336.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[3],{317:function(t,e,n){},348:function(t,e,n){"use strict";var i=n(317);n.n(i).a},355:function(t,e,n){"use strict";n.r(e);var i={functional:!0,props:{type:{type:String,default:"tip"},text:String,vertical:{type:String,default:"top"}},render:function(t,e){var n=e.props,i=e.slots;return t("span",{class:["badge",n.type],style:{verticalAlign:n.vertical}},n.text||i().default)}},r=(n(348),n(42)),a=Object(r.a)(i,void 0,void 0,!1,null,"50e657c5",null);e.default=a.exports}}]);
--- a/docs/doc/assets/js/3.4e0fa3d9.js
+++ b/docs/doc/assets/js/3.4e0fa3d9.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[3],{317:function(t,e,n){},348:function(t,e,n){"use strict";var i=n(317);n.n(i).a},356:function(t,e,n){"use strict";n.r(e);var i={functional:!0,props:{type:{type:String,default:"tip"},text:String,vertical:{type:String,default:"top"}},render:function(t,e){var n=e.props,i=e.slots;return t("span",{class:["badge",n.type],style:{verticalAlign:n.vertical}},n.text||i().default)}},r=(n(348),n(42)),a=Object(r.a)(i,void 0,void 0,!1,null,"50e657c5",null);e.default=a.exports}}]);
--- a/docs/doc/assets/js/4.023f7c55.js
+++ b/docs/doc/assets/js/4.023f7c55.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{350:function(t,e,s){"use strict";s.r(e);var n=["There's nothing here.","How did we get here?","That's a Four-Oh-Four.","Looks like we've got some broken links."],o={methods:{getMsg:function(){return n[Math.floor(Math.random()*n.length)]}}},i=s(42),h=Object(i.a)(o,(function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"theme-container"},[e("div",{staticClass:"theme-default-content"},[e("h1",[this._v("404")]),this._v(" "),e("blockquote",[this._v(this._s(this.getMsg()))]),this._v(" "),e("RouterLink",{attrs:{to:"/"}},[this._v("\n      Take me home.\n    ")])],1)])}),[],!1,null,null,null);e.default=h.exports}}]);
--- a/docs/doc/assets/js/5.445cad31.js
+++ b/docs/doc/assets/js/5.445cad31.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[5],{351:function(t,e,n){"use strict";n.r(e);var s=n(42),l=Object(s.a)({},(function(){var t=this.$createElement;return(this._self._c||t)("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}})}),[],!1,null,null,null);e.default=l.exports}}]);
--- a/docs/doc/assets/js/5.d90b4340.js
+++ b/docs/doc/assets/js/5.d90b4340.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[5],{354:function(t,e,n){"use strict";n.r(e);var s=n(42),l=Object(s.a)({},(function(){var t=this.$createElement;return(this._self._c||t)("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}})}),[],!1,null,null,null);e.default=l.exports}}]);
--- a/docs/doc/assets/js/6.32cb0422.js
+++ b/docs/doc/assets/js/6.32cb0422.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{352:function(t,s,e){"use strict";e.r(s);var n=e(42),r=Object(n.a)({},(function(){var t=this.$createElement,s=this._self._c||t;return s("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}},[s("h2",{attrs:{id:"常见问题"}},[s("a",{staticClass:"header-anchor",attrs:{href:"#常见问题"}},[this._v("#")]),this._v(" 常见问题")]),this._v(" "),s("ol",[s("li")])])}),[],!1,null,null,null);s.default=r.exports}}]);
--- a/docs/doc/assets/js/6.f276a306.js
+++ b/docs/doc/assets/js/6.f276a306.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{351:function(t,e,n){"use strict";n.r(e);var s=n(42),l=Object(s.a)({},(function(){var t=this.$createElement;return(this._self._c||t)("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}})}),[],!1,null,null,null);e.default=l.exports}}]);
--- a/docs/doc/assets/js/7.d3eb66c2.js
+++ b/docs/doc/assets/js/7.d3eb66c2.js
@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[7],{353:function(t,s,e){"use strict";e.r(s);var n=e(42),r=Object(n.a)({},(function(){var t=this.$createElement,s=this._self._c||t;return s("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}},[s("h2",{attrs:{id:"常见问题"}},[s("a",{staticClass:"header-anchor",attrs:{href:"#常见问题"}},[this._v("#")]),this._v(" 常见问题")]),this._v(" "),s("ol",[s("li")])])}),[],!1,null,null,null);s.default=r.exports}}]);
--- a/docs/doc/assets/js/7.e50f21bc.js
+++ b/docs/doc/assets/js/7.e50f21bc.js
--- a/docs/doc/assets/js/8.d2479dad.js
+++ b/docs/doc/assets/js/8.d2479dad.js
--- a/docs/doc/assets/js/8.e8a88c5e.js
+++ b/docs/doc/assets/js/8.e8a88c5e.js
--- a/docs/doc/assets/js/9.10e938e4.js
+++ b/docs/doc/assets/js/9.10e938e4.js
--- a/docs/doc/assets/js/app.441507e8.js
+++ b/docs/doc/assets/js/app.441507e8.js
--- a/docs/doc/assets/js/app.bfbedbef.js
+++ b/docs/doc/assets/js/app.bfbedbef.js
--- a/docs/doc/index.html
+++ b/docs/doc/index.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>ZY PLAYER</title>
+    <meta name="generator" content="VuePress 1.5.2">
+    
+    <meta name="description" content="ZY PLAYER 文档">
+    <link rel="preload" href="/doc/assets/css/0.styles.7cdd3ee2.css" as="style"><link rel="preload" href="/doc/assets/js/app.441507e8.js" as="script"><link rel="preload" href="/doc/assets/js/2.b7bb5685.js" as="script"><link rel="preload" href="/doc/assets/js/5.445cad31.js" as="script"><link rel="prefetch" href="/doc/assets/js/3.0958b336.js"><link rel="prefetch" href="/doc/assets/js/4.023f7c55.js"><link rel="prefetch" href="/doc/assets/js/6.32cb0422.js"><link rel="prefetch" href="/doc/assets/js/7.e50f21bc.js"><link rel="prefetch" href="/doc/assets/js/8.d2479dad.js">
+    <link rel="stylesheet" href="/doc/assets/css/0.styles.7cdd3ee2.css">
+  </head>
+  <body>
+    <div id="app" data-server-rendered="true"><div class="theme-container no-sidebar"><header class="navbar"><div class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/doc/" aria-current="page" class="home-link router-link-exact-active router-link-active"><!----> <span class="site-name">ZY PLAYER</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/doc/" aria-current="page" class="nav-link router-link-exact-active router-link-active">
+  主页
+</a></div><div class="nav-item"><a href="/doc/sites/" class="nav-link">
+  管理源
+</a></div><div class="nav-item"><a href="/doc/shortcut/" class="nav-link">
+  快捷键
+</a></div><div class="nav-item"><a href="/doc/question/" class="nav-link">
+  常见问题
+</a></div> <!----></nav></div></header> <div class="sidebar-mask"></div> <aside class="sidebar"><nav class="nav-links"><div class="nav-item"><a href="/doc/" aria-current="page" class="nav-link router-link-exact-active router-link-active">
+  主页
+</a></div><div class="nav-item"><a href="/doc/sites/" class="nav-link">
+  管理源
+</a></div><div class="nav-item"><a href="/doc/shortcut/" class="nav-link">
+  快捷键
+</a></div><div class="nav-item"><a href="/doc/question/" class="nav-link">
+  常见问题
+</a></div> <!----></nav>  <ul class="sidebar-links"><li><section class="sidebar-group depth-0"><p class="sidebar-heading open"><span>Home</span> <!----></p> <!----></section></li></ul> </aside> <main aria-labelledby="main-title" class="home"><header class="hero"><!----> <h1 id="main-title">
+      ZY PLAYER
+    </h1> <p class="description">
+      ZY PLAYER 文档
+    </p> <p class="action"><a href="/doc/sites/" class="nav-link action-button">
+  开始阅读
+</a></p></header> <div class="features"><div class="feature"><h2>管理源</h2> <p>导入, 导出, 编辑源</p></div><div class="feature"><h2>快捷键</h2> <p>导入, 导出, 编辑快捷键</p></div><div class="feature"><h2>常见问题问答</h2> <p>一些常见问题问答</p></div></div> <div class="theme-default-content custom content__default"></div> <div class="footer">
+    MIT Licensed | Copyright  © 2020 Hunlongyu
+  </div></main></div><div class="global-ui"></div></div>
+    <script src="/doc/assets/js/app.441507e8.js" defer></script><script src="/doc/assets/js/2.b7bb5685.js" defer></script><script src="/doc/assets/js/5.445cad31.js" defer></script>
+  </body>
+</html>
--- a/docs/doc/question/index.html
+++ b/docs/doc/question/index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>常见问题 | ZY PLAYER</title>
+    <meta name="generator" content="VuePress 1.5.2">
+    
+    <meta name="description" content="ZY PLAYER 文档">
+    <link rel="preload" href="/doc/assets/css/0.styles.7cdd3ee2.css" as="style"><link rel="preload" href="/doc/assets/js/app.441507e8.js" as="script"><link rel="preload" href="/doc/assets/js/2.b7bb5685.js" as="script"><link rel="preload" href="/doc/assets/js/6.32cb0422.js" as="script"><link rel="prefetch" href="/doc/assets/js/3.0958b336.js"><link rel="prefetch" href="/doc/assets/js/4.023f7c55.js"><link rel="prefetch" href="/doc/assets/js/5.445cad31.js"><link rel="prefetch" href="/doc/assets/js/7.e50f21bc.js"><link rel="prefetch" href="/doc/assets/js/8.d2479dad.js">
+    <link rel="stylesheet" href="/doc/assets/css/0.styles.7cdd3ee2.css">
+  </head>
+  <body>
+    <div id="app" data-server-rendered="true"><div class="theme-container"><header class="navbar"><div class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/doc/" class="home-link router-link-active"><!----> <span class="site-name">ZY PLAYER</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/doc/" class="nav-link">
+  主页
+</a></div><div class="nav-item"><a href="/doc/sites/" class="nav-link">
+  管理源
+</a></div><div class="nav-item"><a href="/doc/shortcut/" class="nav-link">
+  快捷键
+</a></div><div class="nav-item"><a href="/doc/question/" aria-current="page" class="nav-link router-link-exact-active router-link-active">
+  常见问题
+</a></div> <!----></nav></div></header> <div class="sidebar-mask"></div> <aside class="sidebar"><nav class="nav-links"><div class="nav-item"><a href="/doc/" class="nav-link">
+  主页
+</a></div><div class="nav-item"><a href="/doc/sites/" class="nav-link">
+  管理源
+</a></div><div class="nav-item"><a href="/doc/shortcut/" class="nav-link">
+  快捷键
+</a></div><div class="nav-item"><a href="/doc/question/" aria-current="page" class="nav-link router-link-exact-active router-link-active">
+  常见问题
+</a></div> <!----></nav>  <ul class="sidebar-links"><li><section class="sidebar-group depth-0"><p class="sidebar-heading open"><span>常见问题</span> <!----></p> <ul class="sidebar-links sidebar-group-items"><li><a href="/doc/question/#常见问题" class="sidebar-link">常见问题</a><ul class="sidebar-sub-headers"></ul></li></ul></section></li></ul> </aside> <main class="page"> <div class="theme-default-content content__default"><h2 id="常见问题"><a href="#常见问题" class="header-anchor">#</a> 常见问题</h2> <ol><li></li></ol></div> <footer class="page-edit"><!----> <!----></footer> <!----> </main></div><div class="global-ui"></div></div>
+    <script src="/doc/assets/js/app.441507e8.js" defer></script><script src="/doc/assets/js/2.b7bb5685.js" defer></script><script src="/doc/assets/js/6.32cb0422.js" defer></script>
+  </body>
+</html>
--- a/docs/doc/shortcut/index.html
+++ b/docs/doc/shortcut/index.html
--- a/docs/doc/sites/index.html
+++ b/docs/doc/sites/index.html
--- a/docs/index.html
+++ b/docs/index.html
@@ -50,6 +50,7 @@
      <nav class="nav-menu d-none d-lg-block">
        <ul>
          <li class="active"><a href="#header">Home</a></li>
+          <li><a href="http://zyplayer.fun/doc/">文档</a></li>
          <li><a href="#features">特色</a></li>
          <li><a href="#gallery">截图</a></li>
          <li><a href="#faq">常见问题</a></li>
@@ -234,6 +235,7 @@
            <ul>
              <li><i class="bx bx-chevron-right"></i> <a target="_blank" href="#">Home</a></li>
              <li><i class="bx bx-chevron-right"></i> <a target="_blank" href="https://www.ghpym.com/zyplayer.html">果核剥壳</a></li>
+              <li><i class="bx bx-chevron-right"></i> <a target="_blank" href="https://www.iplaysoft.com/zy-player.html">异次元软件世界</a></li>
            </ul>
          </div>

@@ -278,4 +280,4 @@

 </body>

-</html>
+</html>
--- a/extraResources/在线直播源_1.m3u
+++ b/extraResources/在线直播源_1.m3u
@@ -0,0 +1,723 @@
+#EXTM3U
+#EXTINF:-1 ,====== =北京移动= ======
+http://0/0.m3u8
+#EXTINF:-1 ,咪咕4K
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226399/1.m3u8
+#EXTINF:-1 ,咪咕4K
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226400/1.m3u8
+#EXTINF:-1 ,北京IPTV4K超清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226550/1.m3u8
+#EXTINF:-1 ,北京IPTV淘BABY CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226554/1.m3u8
+#EXTINF:-1 ,北京IPTV淘剧场 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226553/1.m3u8
+#EXTINF:-1 ,北京IPTV淘娱乐 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226551/1.m3u8
+#EXTINF:-1 ,北京IPTV淘电影 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226552/1.m3u8
+#EXTINF:-1 ,北京IPTV萌宠TV CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226555/1.m3u8
+#EXTINF:-1 ,老伙计-laoguy.com
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226555/1.m3u8
+#EXTINF:-1 ,大健康 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226556/1.m3u8
+#EXTINF:-1 ,凤凰中文 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225942/1.m3u8
+#EXTINF:-1 ,凤凰中文 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225948/1.m3u8
+#EXTINF:-1 ,凤凰资讯 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225949/1.m3u8
+#EXTINF:-1 ,CCTV1 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225924/1.m3u8
+#EXTINF:-1 ,CCTV1 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226154/1.m3u8
+#EXTINF:-1 ,CCTV1 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226155/1.m3u8
+#EXTINF:-1 ,CCTV1 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226226/1.m3u8
+#EXTINF:-1 ,CCTV1 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226346/1.m3u8
+#EXTINF:-1 ,CCTV1 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226431/1.m3u8
+#EXTINF:-1 ,CCTV2 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226230/1.m3u8
+#EXTINF:-1 ,CCTV2 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226371/1.m3u8
+#EXTINF:-1 ,CCTV2 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226472/1.m3u8
+#EXTINF:-1 ,CCTV3 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226471/1.m3u8
+#EXTINF:-1 ,CCTV4 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226314/1.m3u8
+#EXTINF:-1 ,CCTV4 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226335/1.m3u8
+#EXTINF:-1 ,CCTV4 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226470/1.m3u8
+#EXTINF:-1 ,CCTV5 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226469/1.m3u8
+#EXTINF:-1 ,CCTV5+ HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226225/1.m3u8
+#EXTINF:-1 ,CCTV5+ CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226349/1.m3u8
+#EXTINF:-1 ,CCTV5+ CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226458/1.m3u8
+#EXTINF:-1 ,CCTV6 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226468/1.m3u8
+#EXTINF:-1 ,CCTV7 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226234/1.m3u8
+#EXTINF:-1 ,CCTV7 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226467/1.m3u8
+#EXTINF:-1 ,CCTV8 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226485/1.m3u8
+#EXTINF:-1 ,CCTV9 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226236/1.m3u8
+#EXTINF:-1 ,CCTV9 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226465/1.m3u8
+#EXTINF:-1 ,CCTV10 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226227/1.m3u8
+#EXTINF:-1 ,CCTV10 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226464/1.m3u8
+#EXTINF:-1 ,CCTV11 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226334/1.m3u8
+#EXTINF:-1 ,CCTV11 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226315/1.m3u8
+#EXTINF:-1 ,CCTV11 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226463/1.m3u8
+#EXTINF:-1 ,CCTV12 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226228/1.m3u8
+#EXTINF:-1 ,CCTV12 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226462/1.m3u8
+#EXTINF:-1 ,CCTV13 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226316/1.m3u8
+#EXTINF:-1 ,CCTV14 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226229/1.m3u8
+#EXTINF:-1 ,CCTV14 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226461/1.m3u8
+#EXTINF:-1 ,CCTV15 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226460/1.m3u8
+#EXTINF:-1 ,CCTV15 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226317/1.m3u8
+#EXTINF:-1 ,CCTV15 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226333/1.m3u8
+#EXTINF:-1 ,CCTV17 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226318/1.m3u8
+#EXTINF:-1 ,CCTV17 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226459/1.m3u8
+#EXTINF:-1 ,中国教育1 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226494/1.m3u8
+#EXTINF:-1 ,东南卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226406/1.m3u8
+#EXTINF:-1 ,东南卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226496/1.m3u8
+#EXTINF:-1 ,东方卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226237/1.m3u8
+#EXTINF:-1 ,东方卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226364/1.m3u8
+#EXTINF:-1 ,东方卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226505/1.m3u8
+#EXTINF:-1 ,北京卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226224/1.m3u8
+#EXTINF:-1 ,北京卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226367/1.m3u8
+#EXTINF:-1 ,北京卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226441/1.m3u8
+#EXTINF:-1 ,天津卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226246/1.m3u8
+#EXTINF:-1 ,天津卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226502/1.m3u8
+#EXTINF:-1 ,安徽卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226223/1.m3u8
+#EXTINF:-1 ,安徽卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226499/1.m3u8
+#EXTINF:-1 ,山东卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225894/1.m3u8
+#EXTINF:-1 ,山东卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226244/1.m3u8
+#EXTINF:-1 ,山东卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226308/1.m3u8
+#EXTINF:-1 ,山东卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226501/1.m3u8
+#EXTINF:-1 ,广东卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225878/1.m3u8
+#EXTINF:-1 ,广东卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226238/1.m3u8
+#EXTINF:-1 ,广东卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226508/1.m3u8
+#EXTINF:-1 ,江苏卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226242/1.m3u8
+#EXTINF:-1 ,江苏卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226366/1.m3u8
+#EXTINF:-1 ,江苏卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226506/1.m3u8
+#EXTINF:-1 ,江西卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226243/1.m3u8
+#EXTINF:-1 ,河北卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226507/1.m3u8
+#EXTINF:-1 ,浙江卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226247/1.m3u8
+#EXTINF:-1 ,浙江卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226365/1.m3u8
+#EXTINF:-1 ,浙江卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226504/1.m3u8
+#EXTINF:-1 ,深圳卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225897/1.m3u8
+#EXTINF:-1 ,深圳卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226245/1.m3u8
+#EXTINF:-1 ,深圳卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226495/1.m3u8
+#EXTINF:-1 ,湖北卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226240/1.m3u8
+#EXTINF:-1 ,湖北卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226310/1.m3u8
+#EXTINF:-1 ,湖北卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226503/1.m3u8
+#EXTINF:-1 ,湖南卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226241/1.m3u8
+#EXTINF:-1 ,湖南卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226509/1.m3u8
+#EXTINF:-1 ,贵州卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226497/1.m3u8
+#EXTINF:-1 ,辽宁卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226500/1.m3u8
+#EXTINF:-1 ,黑龙江卫视 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226239/1.m3u8
+#EXTINF:-1 ,黑龙江卫视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226498/1.m3u8
+#EXTINF:-1 ,北京冬奥纪实 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226438/1.m3u8
+#EXTINF:-1 ,北京影视 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226486/1.m3u8
+#EXTINF:-1 ,北京文艺 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226440/1.m3u8
+#EXTINF:-1 ,北京新闻 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226437/1.m3u8
+#EXTINF:-1 ,北京卡酷少儿 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226558/1.m3u8
+#EXTINF:-1 ,湖南快乐垂钓 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226549/1.m3u8
+#EXTINF:-1 ,湖南茶频道 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226548/1.m3u8
+#EXTINF:-1 ,黑莓动画 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225914/1.m3u8
+#EXTINF:-1 ,黑莓动画 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226289/1.m3u8
+#EXTINF:-1 ,黑莓电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225927/1.m3u8
+#EXTINF:-1 ,黑莓电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226292/1.m3u8
+#EXTINF:-1 ,黑莓电竞 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225931/1.m3u8
+#EXTINF:-1 ,黑莓电竞 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226250/1.m3u8
+#EXTINF:-1 ,黑莓电竞 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226262/1.m3u8
+#EXTINF:-1 ,黑莓电竞 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226307/1.m3u8
+#EXTINF:-1 ,NewTV中国功夫 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225951/1.m3u8
+#EXTINF:-1 ,NewTV中国功夫 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226298/1.m3u8
+#EXTINF:-1 ,NewTV中国功夫 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226321/1.m3u8
+#EXTINF:-1 ,NewTV怡伴健康 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225919/1.m3u8
+#EXTINF:-1 ,NewTV怡伴健康 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226306/1.m3u8
+#EXTINF:-1 ,NewTV怡伴健康 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226327/1.m3u8
+#EXTINF:-1 ,NewTV军事评论 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225926/1.m3u8
+#EXTINF:-1 ,NewTV军事评论 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226303/1.m3u8
+#EXTINF:-1 ,NewTV军事评论 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226326/1.m3u8
+#EXTINF:-1 ,NewTV军旅剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225923/1.m3u8
+#EXTINF:-1 ,NewTV军旅剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226301/1.m3u8
+#EXTINF:-1 ,NewTV军旅剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226324/1.m3u8
+#EXTINF:-1 ,NewTV农业致富 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225930/1.m3u8
+#EXTINF:-1 ,NewTV农业致富 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226304/1.m3u8
+#EXTINF:-1 ,NewTV动作电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225915/1.m3u8
+#EXTINF:-1 ,NewTV动作电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226288/1.m3u8
+#EXTINF:-1 ,NewTV动作电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226329/1.m3u8
+#EXTINF:-1 ,NewTV古装剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225916/1.m3u8
+#EXTINF:-1 ,NewTV古装剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226300/1.m3u8
+#EXTINF:-1 ,NewTV古装剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226323/1.m3u8
+#EXTINF:-1 ,NewTV家庭剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225918/1.m3u8
+#EXTINF:-1 ,NewTV家庭剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226290/1.m3u8
+#EXTINF:-1 ,NewTV家庭剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226330/1.m3u8
+#EXTINF:-1 ,NewTV惊悚悬疑 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225921/1.m3u8
+#EXTINF:-1 ,NewTV惊悚悬疑 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226294/1.m3u8
+#EXTINF:-1 ,NewTV惊悚悬疑 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226423/1.m3u8
+#EXTINF:-1 ,NewTV明星大片 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225929/1.m3u8
+#EXTINF:-1 ,NewTV明星大片 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226295/1.m3u8
+#EXTINF:-1 ,NewTV明星大片 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226425/1.m3u8
+#EXTINF:-1 ,NewTV武搏世界 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226171/1.m3u8
+#EXTINF:-1 ,NewTV武搏世界 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226297/1.m3u8
+#EXTINF:-1 ,NewTV武搏世界 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226320/1.m3u8
+#EXTINF:-1 ,NewTV海外剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225917/1.m3u8
+#EXTINF:-1 ,NewTV海外剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226302/1.m3u8
+#EXTINF:-1 ,NewTV海外剧场 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226325/1.m3u8
+#EXTINF:-1 ,NewTV潮妈辣婆 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225957/1.m3u8
+#EXTINF:-1 ,NewTV潮妈辣婆 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226286/1.m3u8
+#EXTINF:-1 ,NewTV炫舞未来 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226248/1.m3u8
+#EXTINF:-1 ,NewTV爱情喜剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225913/1.m3u8
+#EXTINF:-1 ,NewTV爱情喜剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226299/1.m3u8
+#EXTINF:-1 ,NewTV爱情喜剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226322/1.m3u8
+#EXTINF:-1 ,NewTV精品体育 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226287/1.m3u8
+#EXTINF:-1 ,NewTV精品体育 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226328/1.m3u8
+#EXTINF:-1 ,NewTV精品体育 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225922/1.m3u8
+#EXTINF:-1 ,NewTV精品大剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225925/1.m3u8
+#EXTINF:-1 ,NewTV精品大剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226291/1.m3u8
+#EXTINF:-1 ,NewTV精品大剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226331/1.m3u8
+#EXTINF:-1 ,NewTV精品纪录 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226293/1.m3u8
+#EXTINF:-1 ,NewTV精品纪录 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226332/1.m3u8
+#EXTINF:-1 ,NewTV超级体育 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226157/1.m3u8
+#EXTINF:-1 ,NewTV超级体育 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226158/1.m3u8
+#EXTINF:-1 ,NewTV超级体育 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226232/1.m3u8
+#EXTINF:-1 ,NewTV超级体育 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226348/1.m3u8
+#EXTINF:-1 ,NewTV超级电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226133/1.m3u8
+#EXTINF:-1 ,NewTV超级电影 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226233/1.m3u8
+#EXTINF:-1 ,NewTV超级电影 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226369/1.m3u8
+#EXTINF:-1 ,NewTV超级电视剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225864/1.m3u8
+#EXTINF:-1 ,NewTV超级电视剧 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226253/1.m3u8
+#EXTINF:-1 ,NewTV超级电视剧 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226368/1.m3u8
+#EXTINF:-1 ,NewTV超级综艺 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226127/1.m3u8
+#EXTINF:-1 ,NewTV超级综艺 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226231/1.m3u8
+#EXTINF:-1 ,NewTV超级综艺 CQ
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226370/1.m3u8
+#EXTINF:-1 ,NewTV金牌综艺 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225920/1.m3u8
+#EXTINF:-1 ,NewTV金牌综艺 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226296/1.m3u8
+#EXTINF:-1 ,NewTV金牌综艺 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226347/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226374/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226375/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226377/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226378/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226379/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226380/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226381/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226382/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226394/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226395/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226396/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226397/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226398/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226393/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226392/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226391/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226390/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226372/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226373/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226376/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226383/1.m3u8
+#EXTINF:-1 ,咪咕视频 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226384/1.m3u8
+#EXTINF:-1 ,北京家有购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226429/1.m3u8
+#EXTINF:-1 ,山西优购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226386/1.m3u8
+#EXTINF:-1 ,中视购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226547/1.m3u8
+#EXTINF:-1 ,央广购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226319/1.m3u8
+#EXTINF:-1 ,央广购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226363/1.m3u8
+#EXTINF:-1 ,江苏好享购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226312/1.m3u8
+#EXTINF:-1 ,江苏好享购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226344/1.m3u8
+#EXTINF:-1 ,湖南快乐购 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226341/1.m3u8
+#EXTINF:-1 ,江西风尚购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225911/1.m3u8
+#EXTINF:-1 ,江西风尚购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226305/1.m3u8
+#EXTINF:-1 ,江西风尚购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226342/1.m3u8
+#EXTINF:-1 ,江苏好享购物 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226313/1.m3u8
+#EXTINF:-1 ,5GO美妆个护 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226387/1.m3u8
+#EXTINF:-1 ,5GO美妆个护 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226389/1.m3u8
+#EXTINF:-1 ,5GO服饰内衣 HD
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226388/1.m3u8
+#EXTINF:-1 ,CCTV1 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226432/1.m3u8
+#EXTINF:-1 ,CCTV1 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226338/1.m3u8
+#EXTINF:-1 ,CCTV2 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225934/1.m3u8
+#EXTINF:-1 ,CCTV2 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226457/1.m3u8
+#EXTINF:-1 ,CCTV3 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226456/1.m3u8
+#EXTINF:-1 ,CCTV4 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226156/1.m3u8
+#EXTINF:-1 ,CCTV4 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226455/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226454/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226256/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226257/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226258/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226259/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226260/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226261/1.m3u8
+#EXTINF:-1 ,CCTV5 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226340/1.m3u8
+#EXTINF:-1 ,CCTV5+ 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225938/1.m3u8
+#EXTINF:-1 ,CCTV6 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226453/1.m3u8
+#EXTINF:-1 ,CCTV7 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225863/1.m3u8
+#EXTINF:-1 ,CCTV7 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226452/1.m3u8
+#EXTINF:-1 ,CCTV8 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226451/1.m3u8
+#EXTINF:-1 ,CCTV9 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226450/1.m3u8
+#EXTINF:-1 ,CCTV9 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225865/1.m3u8
+#EXTINF:-1 ,CCTV10 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225868/1.m3u8
+#EXTINF:-1 ,CCTV10 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226449/1.m3u8
+#EXTINF:-1 ,CCTV11 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225869/1.m3u8
+#EXTINF:-1 ,CCTV11 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226448/1.m3u8
+#EXTINF:-1 ,CCTV12 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225870/1.m3u8
+#EXTINF:-1 ,CCTV12 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226447/1.m3u8
+#EXTINF:-1 ,CCTV13 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226446/1.m3u8
+#EXTINF:-1 ,CCTV13 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226159/1.m3u8
+#EXTINF:-1 ,CCTV13 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226339/1.m3u8
+#EXTINF:-1 ,CCTV14 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225872/1.m3u8
+#EXTINF:-1 ,CCTV14 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226445/1.m3u8
+#EXTINF:-1 ,CCTV14 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225928/1.m3u8
+#EXTINF:-1 ,CCTV15 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225940/1.m3u8
+#EXTINF:-1 ,CCTV15 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226444/1.m3u8
+#EXTINF:-1 ,CCTV17 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226442/1.m3u8
+#EXTINF:-1 ,CGTN 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226404/1.m3u8
+#EXTINF:-1 ,CGTN 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225867/1.m3u8
+#EXTINF:-1 ,CGTN 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226443/1.m3u8
+#EXTINF:-1 ,CGTN纪录 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226403/1.m3u8
+#EXTINF:-1 ,CGTN纪录 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225866/1.m3u8
+#EXTINF:-1 ,中国教育1 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226417/1.m3u8
+#EXTINF:-1 ,中国教育1 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226538/1.m3u8
+#EXTINF:-1 ,中国教育1 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225905/1.m3u8
+#EXTINF:-1 ,中国教育2 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226537/1.m3u8
+#EXTINF:-1 ,中国教育4 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226362/1.m3u8
+#EXTINF:-1 ,中国教育4 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226557/1.m3u8
+#EXTINF:-1 ,东南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226517/1.m3u8
+#EXTINF:-1 ,东南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225876/1.m3u8
+#EXTINF:-1 ,东方卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226519/1.m3u8
+#EXTINF:-1 ,东方卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226161/1.m3u8
+#EXTINF:-1 ,云南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226424/1.m3u8
+#EXTINF:-1 ,云南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225902/1.m3u8
+#EXTINF:-1 ,云南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226543/1.m3u8
+#EXTINF:-1 ,内蒙古卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226415/1.m3u8
+#EXTINF:-1 ,内蒙古卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226530/1.m3u8
+#EXTINF:-1 ,内蒙古卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225891/1.m3u8
+#EXTINF:-1 ,北京卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226436/1.m3u8
+#EXTINF:-1 ,北京卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226160/1.m3u8
+#EXTINF:-1 ,厦门卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226542/1.m3u8
+#EXTINF:-1 ,吉林卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226426/1.m3u8
+#EXTINF:-1 ,吉林卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226533/1.m3u8
+#EXTINF:-1 ,吉林卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225886/1.m3u8
+#EXTINF:-1 ,四川卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226407/1.m3u8
+#EXTINF:-1 ,四川卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225898/1.m3u8
+#EXTINF:-1 ,四川卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226523/1.m3u8
+#EXTINF:-1 ,天津卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226489/1.m3u8
+#EXTINF:-1 ,天津卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225899/1.m3u8
+#EXTINF:-1 ,宁夏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226413/1.m3u8
+#EXTINF:-1 ,宁夏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226528/1.m3u8
+#EXTINF:-1 ,宁夏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225892/1.m3u8
+#EXTINF:-1 ,安徽卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225873/1.m3u8
+#EXTINF:-1 ,安徽卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226490/1.m3u8
+#EXTINF:-1 ,山东卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226487/1.m3u8
+#EXTINF:-1 ,山西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226410/1.m3u8
+#EXTINF:-1 ,山西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225895/1.m3u8
+#EXTINF:-1 ,山西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226531/1.m3u8
+#EXTINF:-1 ,广东卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226535/1.m3u8
+#EXTINF:-1 ,广西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226408/1.m3u8
+#EXTINF:-1 ,广西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225879/1.m3u8
+#EXTINF:-1 ,广西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226534/1.m3u8
+#EXTINF:-1 ,新疆卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226422/1.m3u8
+#EXTINF:-1 ,新疆卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225901/1.m3u8
+#EXTINF:-1 ,新疆卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226546/1.m3u8
+#EXTINF:-1 ,江苏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226491/1.m3u8
+#EXTINF:-1 ,江苏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225887/1.m3u8
+#EXTINF:-1 ,江西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226522/1.m3u8
+#EXTINF:-1 ,江西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225888/1.m3u8
+#EXTINF:-1 ,河北卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226409/1.m3u8
+#EXTINF:-1 ,河北卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225881/1.m3u8
+#EXTINF:-1 ,河北卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226536/1.m3u8
+#EXTINF:-1 ,河南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225882/1.m3u8
+#EXTINF:-1 ,河南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226525/1.m3u8
+#EXTINF:-1 ,浙江卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226492/1.m3u8
+#EXTINF:-1 ,浙江卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225903/1.m3u8
+#EXTINF:-1 ,海南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226427/1.m3u8
+#EXTINF:-1 ,海南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225890/1.m3u8
+#EXTINF:-1 ,湖北卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226520/1.m3u8
+#EXTINF:-1 ,湖北卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225884/1.m3u8
+#EXTINF:-1 ,湖南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226493/1.m3u8
+#EXTINF:-1 ,湖南卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226162/1.m3u8
+#EXTINF:-1 ,甘肃卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226414/1.m3u8
+#EXTINF:-1 ,甘肃卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225877/1.m3u8
+#EXTINF:-1 ,甘肃卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226545/1.m3u8
+#EXTINF:-1 ,西藏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226428/1.m3u8
+#EXTINF:-1 ,西藏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225900/1.m3u8
+#EXTINF:-1 ,西藏卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226527/1.m3u8
+#EXTINF:-1 ,贵州卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226405/1.m3u8
+#EXTINF:-1 ,贵州卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225880/1.m3u8
+#EXTINF:-1 ,贵州卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226521/1.m3u8
+#EXTINF:-1 ,辽宁卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226488/1.m3u8
+#EXTINF:-1 ,辽宁卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226336/1.m3u8
+#EXTINF:-1 ,辽宁卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225889/1.m3u8
+#EXTINF:-1 ,重庆卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225904/1.m3u8
+#EXTINF:-1 ,重庆卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226337/1.m3u8
+#EXTINF:-1 ,重庆卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226518/1.m3u8
+#EXTINF:-1 ,陕西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226411/1.m3u8
+#EXTINF:-1 ,陕西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225896/1.m3u8
+#EXTINF:-1 ,陕西卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226532/1.m3u8
+#EXTINF:-1 ,青海卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226412/1.m3u8
+#EXTINF:-1 ,青海卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225893/1.m3u8
+#EXTINF:-1 ,青海卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226529/1.m3u8
+#EXTINF:-1 ,黑龙江卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226524/1.m3u8
+#EXTINF:-1 ,黑龙江卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225883/1.m3u8
+#EXTINF:-1 ,山东教育卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226419/1.m3u8
+#EXTINF:-1 ,山东教育卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225908/1.m3u8
+#EXTINF:-1 ,山东教育卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226526/1.m3u8
+#EXTINF:-1 ,广东南方卫视地面 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226540/1.m3u8
+#EXTINF:-1 ,新疆兵团卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226541/1.m3u8
+#EXTINF:-1 ,海南三沙卫视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226544/1.m3u8
+#EXTINF:-1 ,北京卡酷少儿 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225907/1.m3u8
+#EXTINF:-1 ,北京卡酷少儿 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226511/1.m3u8
+#EXTINF:-1 ,北京国际 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226510/1.m3u8
+#EXTINF:-1 ,北京影视 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226433/1.m3u8
+#EXTINF:-1 ,北京文艺 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226435/1.m3u8
+#EXTINF:-1 ,北京新闻 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226512/1.m3u8
+#EXTINF:-1 ,北京生活 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226514/1.m3u8
+#EXTINF:-1 ,北京科教 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226434/1.m3u8
+#EXTINF:-1 ,北京财经 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226516/1.m3u8
+#EXTINF:-1 ,北京青年 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226513/1.m3u8
+#EXTINF:-1 ,上海哈哈炫动 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226421/1.m3u8
+#EXTINF:-1 ,上海哈哈炫动 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225909/1.m3u8
+#EXTINF:-1 ,广东嘉佳卡通 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226539/1.m3u8
+#EXTINF:-1 ,江苏优漫卡通 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226420/1.m3u8
+#EXTINF:-1 ,江苏优漫卡通 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225910/1.m3u8
+#EXTINF:-1 ,湖南金鹰卡通 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225906/1.m3u8
+#EXTINF:-1 ,CCTV中视购物 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226385/1.m3u8
+#EXTINF:-1 ,北京家有购物 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221225912/1.m3u8
+#EXTINF:-1 ,北京家有购物 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226343/1.m3u8
+#EXTINF:-1 ,聚鲨环球精选 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226311/1.m3u8
+#EXTINF:-1 ,聚鲨环球精选 标清
+http://221.179.217.9/otttv.bj.chinamobile.com/PLTV/88888888/224/3221226345/1.m3u8
--- a/package.json
+++ b/package.json
@@ -1,18 +1,14 @@
 {
  "name": "zy",
-  "version": "1.0.16",
+  "version": "2.5.1",
  "private": true,
-  "author": {
-    "name": "Hunlongyu",
-    "email": "hunlongyu@gmail.com"
-  },
-  "description": "ZY Player 资源播放器",
  "scripts": {
    "serve": "vue-cli-service serve",
    "build": "vue-cli-service build",
    "lint": "vue-cli-service lint",
-    "electron:build": "vue-cli-service electron:build",
    "dev": "vue-cli-service electron:serve",
+    "electron:build": "vue-cli-service electron:build",
+    "electron:serve": "vue-cli-service electron:serve",
    "postinstall": "electron-builder install-app-deps",
    "postuninstall": "electron-builder install-app-deps",
    "electron:generate-icons": "electron-icon-builder --input=./public/icon.png --output=build --flatten",
@@ -22,39 +18,48 @@
  "main": "background.js",
  "dependencies": {
    "axios": "^0.19.2",
+    "cheerio": "^1.0.0-rc.3",
+    "child_process": "^1.0.2",
    "core-js": "^3.6.5",
-    "dexie": "^2.0.4",
-    "electron-updater": "^4.3.1",
+    "cors": "^2.8.5",
+    "dexie": "^3.0.1",
+    "electron-localshortcut": "^3.2.1",
    "element-ui": "^2.13.2",
+    "express": "^4.17.1",
+    "fast-xml-parser": "^3.17.4",
    "html2canvas": "^1.0.0-rc.5",
-    "leancloud-storage": "^4.5.3",
-    "macaddress": "^0.5.1",
+    "iptv-playlist-parser": "^0.5.0",
    "modern-normalize": "^0.6.0",
+    "mousetrap": "^1.6.5",
    "qrcode.vue": "^1.7.0",
+    "randomstring": "^1.1.5",
    "vue": "^2.6.11",
-    "vue-i18n": "^8.17.7",
+    "vue-infinite-loading": "^2.4.5",
+    "vue-waterfall-plugin": "^1.0.7",
+    "vuedraggable": "^2.24.1",
    "vuex": "^3.4.0",
-    "xgplayer": "^2.7.1",
-    "xgplayer-hls.js": "^2.2.2"
+    "xgplayer": "^2.9.10",
+    "xgplayer-hls.js": "^2.2.3"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.3.0",
-    "@vue/cli-plugin-eslint": "~4.3.0",
-    "@vue/cli-plugin-vuex": "~4.3.0",
-    "@vue/cli-service": "~4.3.0",
+    "@vue/cli-plugin-babel": "~4.4.0",
+    "@vue/cli-plugin-eslint": "~4.4.0",
+    "@vue/cli-plugin-vuex": "~4.4.0",
+    "@vue/cli-service": "~4.4.0",
    "@vue/eslint-config-standard": "^5.1.2",
    "babel-eslint": "^10.1.0",
    "babel-plugin-component": "^1.1.1",
-    "electron": "^9.0.0",
+    "electron": "^9.0.5",
+    "electron-devtools-installer": "^3.1.0",
    "eslint": "^6.7.2",
    "eslint-plugin-import": "^2.20.2",
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-promise": "^4.2.1",
    "eslint-plugin-standard": "^4.0.0",
    "eslint-plugin-vue": "^6.2.2",
-    "sass": "^1.26.3",
+    "sass": "^1.26.5",
    "sass-loader": "^8.0.2",
-    "vue-cli-plugin-electron-builder": "2.0.0-beta.6",
+    "vue-cli-plugin-electron-builder": "2.0.0-rc.4",
    "vue-template-compiler": "^2.6.11"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -4,17 +4,8 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>icon.png">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title><%= htmlWebpackPlugin.options.title %></title>
-    <script>
-      var _hmt = _hmt || [];
-      (function() {
-        var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?62aeb2505bfa26a2461d2a7a3b485096";
-        var s = document.getElementsByTagName("script")[0]; 
-        s.parentNode.insertBefore(hm, s);
-      })();
-    </script>
  </head>
  <body>
    <noscript>
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,9 @@
      <Frame />
      <Film v-show="view === 'Film'" />
      <Play v-show="view === 'Play'" />
+      <IPTV v-show="view === 'IPTV'" />
      <Star v-show="view === 'Star'" />
+      <History v-show="view === 'History'" />
      <Setting v-show="view === 'Setting'" />
    </div>
    <transition name="slide">
@@ -14,14 +16,68 @@
    <transition name="slide">
      <Share v-if="share.show"/>
    </transition>
+    <transition name="slide">
+      <EditSites v-if="editSites.show"/>
+    </transition>
  </div>
 </template>
+
 <script>
+import { setting } from './lib/dexie'
+const { remote } = require('electron')
 export default {
  name: 'App',
  data () {
    return {
-      appTheme: 'theme-light'
+      appTheme: 'theme-light',
+      winSizePosition: {
+        x: 0,
+        y: 0,
+        width: 0,
+        height: 0
+      }
+    }
+  },
+  created () {
+    // 窗口创建口，检查是否有窗口大小位置的记录，如果有的话，更新窗口位置及大小
+    setting.find().then(res => {
+      if (res.windowSizePosition) {
+        var win = remote.getCurrentWindow()
+        win.setBounds({
+          x: res.windowSizePosition.x,
+          y: res.windowSizePosition.y,
+          width: res.windowSizePosition.width,
+          height: res.windowSizePosition.height
+        })
+      }
+    })
+    var win = remote.getCurrentWindow()
+    this.winSizePosition = {
+      x: win.getPosition()[0],
+      y: win.getPosition()[1],
+      width: win.getSize()[0],
+      height: win.getSize()[1]
+    }
+  },
+  updated () {
+    // 本来想hook up到beforedestroy， 但不工作
+    // 每当窗口更新时，检查窗口大小及位置，记录到setting数据库中
+    const win = remote.getCurrentWindow()
+    var newWinSizePosition = {
+      x: win.getPosition()[0],
+      y: win.getPosition()[1],
+      width: win.getSize()[0],
+      height: win.getSize()[1]
+    }
+    if (newWinSizePosition.x !== this.winSizePosition.x ||
+        newWinSizePosition.y !== this.winSizePosition.y ||
+        newWinSizePosition.width !== this.winSizePosition.width ||
+        newWinSizePosition.height !== this.winSizePosition.height) {
+      this.winSizePosition = newWinSizePosition
+      setting.find().then(res => {
+        res.windowSizePosition = newWinSizePosition
+        setting.update(res)
+      })
    }
  },
  computed: {
@@ -34,18 +90,24 @@ export default {
    share () {
      return this.$store.getters.getShare
    },
-    theme () {
-      return this.$store.getters.getTheme
+    setting () {
+      return this.$store.getters.getSetting
+    },
+    editSites () {
+      return this.$store.getters.getEditSites
    }
  },
  watch: {
-    theme () {
-      this.changeTheme()
+    setting: {
+      handler () {
+        this.changeSetting()
+      },
+      deep: true
    }
  },
  methods: {
-    changeTheme () {
-      this.appTheme = `theme-${this.theme}`
+    changeSetting () {
+      this.appTheme = `theme-${this.setting.theme}`
    }
  }
 }
@@ -55,7 +117,7 @@ export default {
@import './assets/scss/theme.scss';
 html, body, #app{
  height: 100%;
-  border-radius: 6px;
+  border-radius: 0px;
 }
 #app {
  font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', SimSun, sans-serif;
--- a/src/assets/image/wepay_cuiocean.jpg
+++ b/src/assets/image/wepay_cuiocean.jpg
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -42,6 +42,22 @@
      border-left: .3em solid transparent;
    }
  }
+  .vs-input{
+    height: 30px;
+    input{
+      border: none;
+      width: 200px;
+      height: 30px;
+      text-indent: 22px;
+      background-color: #ffffff00;
+      outline: none;
+    }
+  }
+  .vs-noAfter{
+    &::after{
+      display: none;
+    }
+  }
  .vs-options{
    z-index: 2;
    width: 100%;
@@ -62,45 +78,52 @@
    }
  }
 }
-
+.zy-input{
+  position: relative;
+  display: inline-block;
+  white-space: nowrap;
+  width: 200px;
+  height: 30px;
+  cursor: pointer;
+  input{
+    vertical-align: bottom;
+    position: relative;
+    border: none;
+    width: 20px;
+    height: 15px;
+    background-color: #ffffff00;
+    text-indent: 10px;
+  }
+}
+.zy-highlighted{
+  color: var(--highlight-color);
+}
 // table
 .zy-table{
  display: flex;
  flex-direction: column;
  height: 100%;
  font-size: 15px;
-  .tHead{
-    height: 50px;
-    width: 100%;
+  .tHeader{
    display: flex;
-    justify-content: flex-start;
    align-items: center;
+    justify-content: space-between;
+    height: 50px;
+    min-height: 50px;
+    width: 100%;
    border-bottom: 1px solid;
-    padding: 0 5px 0 0;
-    font-weight: 600;
-    span{
-      display: flex;
-      width: 180px;
-      font-size: 16px;
-      &.name{
-        flex: 1;
-        padding-left: 15px;
-      }
-      &.type{
-        width: 120px;
-      }
-      &.from{
-        width: 120px;
-      }
-      &.operate{
-        width: 170px;
-      }
+    .btn{
+      user-select: none;
+      margin-left: 15px;
+      margin-right: 15px;
+      cursor: pointer;
+      font-size: 14px;
    }
  }
  .tBody{
    flex: 1;
-    overflow-y: scroll;
    border-bottom: 1px solid;
+    overflow: auto;
    ul{
      list-style: none;
      padding: 0;
@@ -115,48 +138,42 @@
        cursor: pointer;
        span{
          display: flex;
-          width: 180px;
          font-size: 13px;
          height: 50px;
          line-height: 50px;
+          overflow: hidden;
+          margin-right: 5px;
          &.name{
            flex: 1;
-            padding-left: 15px;
-            overflow: hidden;
-            text-overflow: ellipsis;
+            min-width: 100px;
            white-space: nowrap;
+            margin-left: 10px;
          }
          &.type{
-            width: 120px;
+            width: 10%;
          }
-          &.from{
-            width: 120px;
+          &.time{
+            width: 10%;
+          }
+          &.last{
+            width: 10%;
+          }
+          &.site{
+            width: 10%;
+          }
+          &.note{
+            width: 10%;
          }
          &.operate{
-            width: 170px;
+            .btn{
+              width: 40px;
+            }
          }
        }
      }
    }
  }
-  .tFooter{
-    width: 100%;
-    height: 40px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-direction: row;
-    padding-right: 10px;
-    .tFooter-span{
-      padding-left: 10px;
-      font-size: 12px;
-    }
-    .btn{
-      cursor: pointer;
-    }
-  }
 }
-
 // scroll
 .zy-scroll{
  &::-webkit-scrollbar{
@@ -172,7 +189,6 @@
    position: absolute;
  }
 }
-
 // loading
 .zy-loading{
  width: 100%;
--- a/src/assets/scss/theme.scss
+++ b/src/assets/scss/theme.scss
@@ -1,4 +1,6 @@
 :root{
+  // general
+  --highlight-color: #38dd77;
  // light
  --l-c-0: #823aa0;
  --l-c-1: #823aa011;
@@ -12,10 +14,10 @@
  --l-fc-3: #823aa0;
  --l-bgc-1: #ffffff;
  --l-bgc-2: #f2f6f9;
-  --l-bsc: 0 3px 1px -2px #8e8da233, 0 2px 2px 0 #8e8da224, 0 1px 5px 0 #8e8da21f;
+  --l-bsc: 0 1px 3px #8e8da233, 0 1px 2px #8e8da244;
+  --l-bsc-hover: 0 14px 28px #8e8da255, 0 10px 10px #8e8da244;
  --l-bsc-2: 0 -4px 23px 0 #8e8da233;
-  --l-bsc-hover: 0 14px 26px -12px #8e8da26b, 0 4px 23px 0 #8e8da21f, 0 8px 10px -5px #8e8da233;
-  --l-bsc-scroll: inset 0 0 5px #823aa005;
+  --l-bsc-scroll: inset 0 0 5px #823aa000;

  // dark
  --d-c-0: #38dd77;
@@ -30,9 +32,9 @@
  --d-fc-3: #38dd77;
  --d-bgc-1: #222222;
  --d-bgc-2: #2f2f2f;
-  --d-bsc: 0 3px 1px -2px #38dd7733, 0 2px 2px 0 #38dd7722, 0 1px 5px 0 #38dd7711;
+  --d-bsc: 0 1px 3px #38dd7733, 0 1px 2px #38dd7744;
+  --d-bsc-hover: 0 14px 28px #38dd7755, 0 10px 10px #38dd7744;
  --d-bsc-2: 0 -4px 23px 0 #38dd7733;
-  --d-bsc-hover: 0 14px 26px -12px #38dd7733, 0 4px 23px 0 #38dd7722, 0 8px 10px -5px #38dd7711;
  --d-bsc-scroll: inset 0 0 5px #38dd7705;

  // green
@@ -48,9 +50,9 @@
  --g-fc-3: #C1D95C;
  --g-bgc-1: #4baea0;
  --g-bgc-2: #74b4ac;
-  --g-bsc: 0 3px 1px -2px #e1ebe033, 0 2px 2px 0 #e1ebe022, 0 1px 5px 0 #e1ebe011;
+  --g-bsc: 0 1px 3px #e1ebe033, 0 1px 2px #e1ebe044;
+  --g-bsc-hover: 0 14px 28px #e1ebe055, 0 10px 10px #e1ebe044;
  --g-bsc-2: 0 -4px 23px 0 #e1ebe033;
-  --g-bsc-hover: 0 14px 26px -12px #e1ebe033, 0 4px 23px 0 #e1ebe022, 0 8px 10px -5px #e1ebe011;
  --g-bsc-scroll: inset 0 0 5px #e1ebe005;

  // pink
@@ -66,9 +68,9 @@
  --p-fc-3: #f15c5c;
  --p-bgc-1: #ff8499;
  --p-bgc-2: #fea1b2;
-  --p-bsc: 0 3px 1px -2px #ef528533, 0 2px 2px 0 #ef528522, 0 1px 5px 0 #ef528511;
+  --p-bsc: 0 1px 3px #ef528533, 0 1px 2px #ef528544;
+  --p-bsc-hover: 0 14px 28px #ef528555, 0 10px 10px #ef528544;
  --p-bsc-2: 0 -4px 23px 0 #ef528533;
-  --p-bsc-hover: 0 14px 26px -12px #ef528533, 0 4px 23px 0 #ef528522, 0 8px 10px -5px #ef528511;
  --p-bsc-scroll: inset 0 0 5px #ef528505;
 }

--- a/src/assets/scss/theme/dark.scss
+++ b/src/assets/scss/theme/dark.scss
@@ -1,37 +1,10 @@
 .theme-dark{
  background-color: var(--d-bgc-1);
-  .el-pagination{
-    background-color: var(--d-bgc-1);
-    color: var(--d-fc-1);
-    .el-pagination__total, .el-pagination__jump, .el-input__inner{
-      color: var(--d-fc-1);
-      background-color: var(--d-bgc-1);
-    }
-    .el-input__inner{
-      border-color: var(--d-c-3);
-    }
-    .el-pager{
-      .number{
-        background-color: var(--d-bgc-1);
-      }
-      .number:hover{
-        color: var(--d-c-8);
-      }
-      .active{
-        color: var(--d-c-9);
-      }
-    }
-    .more, .btn-next, .btn-prev{
-      background-color: var(--d-bgc-1);
-      &:hover{
-        color: var(--d-c-8);
-      }
-    }
-  }
  .zy-select{
    color: var(--d-fc-1);
    background-color: var(--d-bgc-1);
    box-shadow: var(--d-bsc);
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
    &:hover{
      box-shadow: var(--d-bsc-hover);
    }
@@ -39,6 +12,7 @@
      background-color: var(--d-bgc-1);
      box-shadow: var(--d-bsc);
      ul{
+        overflow-y: scroll;
        li{
          &:hover{
            background-color: var(--d-c-1);
@@ -49,25 +23,46 @@
        }
      }
    }
+    .vs-input{
+      color: var(--d-fc-1);
+      background-color: var(--d-bgc-1);
+      input{
+        color: var(--d-fc-1);
+        &::-webkit-input-placeholder{
+          color: var(--d-fc-1);
+        }
+      }
+    }
+  }
+  .zy-input{
+    color: var(--d-fc-1);
+    background-color: var(--d-bgc-1);
+    input{
+      color: var(--d-fc-1);
+    }
+  }
+  .zy-checkbox{
+    color: var(--d-fc-1);
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
  }
  .zy-table{
    color: var(--d-fc-2);
-    .tHead{
-      background-color: var(--d-bgc-1);
+    .tHeader{
      border-bottom-color: var(--d-c-3);
+      .btn{
+        &:hover{
+          color: var(--d-fc-3)
+        }
+      }
    }
    .tBody{
      border-bottom-color: var(--d-c-3);
      ul{
        li{
          border-bottom-color: var(--d-c-2);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
-            animation: d-tableHoverAni 0.2s ease both;
-            @keyframes d-tableHoverAni {
-              to{
-                box-shadow: var(--d-bsc-hover);
-              }
-            }
+            box-shadow: var(--d-bsc-hover);
          }
          span{
            &.btn:hover{
@@ -77,21 +72,16 @@
        }
      }
    }
-    .tFooter{
-      .tFooter-span{
-        color: var(--d-fc-1);
-      }
-    }
  }
  .zy-scroll{
    &:hover{
      &::-webkit-scrollbar-thumb {
        box-shadow: var(--d-bsc-scroll);
-        background: var(--d-c-3);
+        background: var(--d-c-5);
      }
      &::-webkit-scrollbar-track {
        box-shadow: var(--d-bsc-scroll);
-        background: var(--bgc);
+        background: var(--d-bgc-1);
      }
    }
  }
@@ -112,6 +102,7 @@
        background-color: var(--d-c-2);
      }
      &.active{
+        background-color: var(--d-bgc-2);
        svg{
          stroke: var(--d-c-0);
          stroke-width: 2;
@@ -123,11 +114,17 @@
  .frame{
    span{
      &.min{
+        background-color: #32dc36;
+      }
+      &.max{
        background-color: #ffbe2a;
      }
      &.close{
        background-color: #ff5f56;
      }
+      &.top{
+        background-color: #f3bab7;
+      }
    }
  }
  .detail{
@@ -146,10 +143,17 @@
        }
      }
      .detail-body{
-        .info, .desc, .m3u8_urls, .mp4_urls{
+        .info, .desc, .m3u8, .operate{
          border-color: var(--d-c-2);
        }
-        .m3u8_urls, .mp4_urls{
+        .operate{
+          span{
+            &:hover{
+              color: var(--d-fc-2);
+            }
+          }
+        }
+        .m3u8{
          .box{
            span{
              border-color: var(--d-c-5);
@@ -165,36 +169,20 @@
    }
  }
  .film{
-    .top{
-      .search{
-        background-color: var(--d-bgc-1);
-        box-shadow: var(--d-bsc);
-        &:hover{
-          box-shadow: var(--d-bsc-hover);
-        }
-        svg{
-          stroke: var(--d-c-0);
-          stroke-width: 1;
-          fill: none;
-        }
-        .search-box{
-          background-color: var(--d-bgc-1);
-        }
-        &.active{
-          box-shadow: var(--d-bsc-hover);
-          svg{
-            stroke-width: 1.5;
-            fill: var(--d-c-2);
-          }
-        }
-        input{
-          color: var(--d-fc-1);
-        }
-      }
-    }
-    .middle{
+    .body{
      background-color: var(--d-bgc-1);
      box-shadow: var(--d-bsc);
+      .show-img{
+        color: var(--d-fc-1);
+        .card{
+          background-color: var(--d-bgc-1);
+          box-shadow: var(--d-bsc);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+          &:hover{
+            box-shadow: var(--d-bsc-hover);
+          }
+        }
+      }
    }
  }
  .play{
@@ -202,6 +190,11 @@
    box-shadow: var(--d-bsc);
    .title{
      color: var(--d-fc-1);
+      .right {
+        svg {
+          fill: var(--d-fc-1);
+        }
+      }
    }
    .box{
      .more{
@@ -225,6 +218,10 @@
              fill: var(--d-c-3);
            }
          }
+          &.last-tip {
+            color: var(--d-fc-1);
+            font-size: 14px;
+          }
        }
      }
    }
@@ -254,6 +251,9 @@
              background-color: var(--d-c-2);
              color: var(--d-fc-3);
            }
+            &:hover{
+              background-color: var(--d-c-3);
+            }
          }
        }
        .list-history{
@@ -283,10 +283,6 @@
        }
      }
    }
-    .play-mask{
-      background-color: var(--d-bgc-1);
-      color: var(--d-fc-1);
-    }
  }
  .star{
    background-color: var(--d-bgc-1);
@@ -303,12 +299,18 @@
        }
      }
    }
+    .view, .search, .shortcut, .site{
+      .title{
+        color: var(--d-fc-1);
+      }
+    }
    .theme{
      .title{
        color: var(--d-fc-1);
      }
      .theme-item{
        box-shadow: var(--d-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
        &:hover{
          box-shadow: var(--d-bsc-hover);
          .theme-name{
@@ -326,6 +328,10 @@
      }
      .qrcode-item{
        box-shadow: var(--d-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+        &:hover{
+          box-shadow: var(--d-bsc-hover);
+        }
      }
    }
  }
@@ -343,4 +349,8 @@
      background-color: var(--d-bgc-1);
    }
  }
+  .history{
+    background-color: var(--d-bgc-1);
+    box-shadow: var(--d-bsc);
+  }
 }
--- a/src/assets/scss/theme/green.scss
+++ b/src/assets/scss/theme/green.scss
@@ -1,37 +1,10 @@
 .theme-green{
  background-color: var(--g-bgc-1);
-  .el-pagination{
-    background-color: var(--g-bgc-1);
-    color: var(--g-fc-1);
-    .el-pagination__total, .el-pagination__jump, .el-input__inner{
-      color: var(--g-fc-1);
-      background-color: var(--g-bgc-1);
-    }
-    .el-input__inner{
-      border-color: var(--g-c-3);
-    }
-    .el-pager{
-      .number{
-        background-color: var(--g-bgc-1);
-      }
-      .number:hover{
-        color: var(--g-c-8);
-      }
-      .active{
-        color: var(--g-c-9);
-      }
-    }
-    .more, .btn-next, .btn-prev{
-      background-color: var(--g-bgc-1);
-      &:hover{
-        color: var(--g-c-8);
-      }
-    }
-  }
  .zy-select{
    color: var(--g-fc-1);
    background-color: var(--g-bgc-1);
    box-shadow: var(--g-bsc);
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
    &:hover{
      box-shadow: var(--g-bsc-hover);
    }
@@ -39,6 +12,7 @@
      background-color: var(--g-bgc-1);
      box-shadow: var(--g-bsc);
      ul{
+        overflow-y: scroll;
        li{
          &:hover{
            background-color: var(--g-c-1);
@@ -49,25 +23,44 @@
        }
      }
    }
+    .vs-input{
+      input{
+        color: var(--g-fc-1);
+        &::-webkit-input-placeholder{
+          color: var(--g-fc-1);
+        }
+      }
+    }
+  }
+  .zy-input{
+    color: var(--g-fc-1);
+    background-color: var(--g-bgc-1);
+    input{
+      color: var(--g-fc-1);
+      background-color: var(--g-bgc-1);
+    }
+  }
+  .zy-checkbox{
+    color: var(--g-fc-1);
  }
  .zy-table{
    color: var(--g-fc-2);
-    .tHead{
-      background-color: var(--g-bgc-1);
+    .tHeader{
      border-bottom-color: var(--g-c-3);
+      .btn{
+        &:hover{
+          color: var(--g-fc-3)
+        }
+      }
    }
    .tBody{
      border-bottom-color: var(--g-c-3);
      ul{
        li{
          border-bottom-color: var(--g-c-2);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
-            animation: d-tableHoverAni 0.2s ease both;
-            @keyframes d-tableHoverAni {
-              to{
-                box-shadow: var(--g-bsc-hover);
-              }
-            }
+            box-shadow: var(--g-bsc-hover);
          }
          span{
            &.btn:hover{
@@ -77,21 +70,16 @@
        }
      }
    }
-    .tFooter{
-      .tFooter-span{
-        color: var(--g-fc-1);
-      }
-    }
  }
  .zy-scroll{
    &:hover{
      &::-webkit-scrollbar-thumb {
        box-shadow: var(--g-bsc-scroll);
-        background: var(--g-c-3);
+        background: var(--g-c-5);
      }
      &::-webkit-scrollbar-track {
        box-shadow: var(--g-bsc-scroll);
-        background: var(--bgc);
+        background: var(--g-bgc-1);
      }
    }
  }
@@ -112,6 +100,7 @@
        background-color: var(--g-c-2);
      }
      &.active{
+        background-color: var(--g-bgc-2);
        svg{
          stroke: var(--g-c-0);
          stroke-width: 2;
@@ -123,15 +112,21 @@
  .frame{
    span{
      &.min{
+        background-color: #32dc36;
+      }
+      &.max{
        background-color: #ffbe2a;
      }
      &.close{
        background-color: #ff5f56;
      }
+      &.top{
+        background-color: #f3bab7;
+      }
    }
  }
  .detail{
-    color: var(--g-fc-1);
+    color: var(--g-fc-1) !important;
    background-color:var(--g-bgc-1);
    box-shadow: var(--g-bsc-2);
    .detail-content{
@@ -146,10 +141,17 @@
        }
      }
      .detail-body{
-        .info, .desc, .m3u8_urls, .mp4_urls{
+        .info, .desc, .m3u8, .operate{
          border-color: var(--g-c-2);
        }
-        .m3u8_urls, .mp4_urls{
+        .operate{
+          span{
+            &:hover{
+              color: var(--g-fc-2);
+            }
+          }
+        }
+        .m3u8{
          .box{
            span{
              border-color: var(--g-c-5);
@@ -165,36 +167,20 @@
    }
  }
  .film{
-    .top{
-      .search{
-        background-color: var(--g-bgc-1);
-        box-shadow: var(--g-bsc);
-        &:hover{
-          box-shadow: var(--g-bsc-hover);
-        }
-        svg{
-          stroke: var(--g-c-0);
-          stroke-width: 1;
-          fill: none;
-        }
-        .search-box{
-          background-color: var(--g-bgc-1);
-        }
-        &.active{
-          box-shadow: var(--g-bsc-hover);
-          svg{
-            stroke-width: 1.5;
-            fill: var(--g-c-2);
-          }
-        }
-        input{
-          color: var(--g-fc-1);
-        }
-      }
-    }
-    .middle{
+    .body{
      background-color: var(--g-bgc-1);
      box-shadow: var(--g-bsc);
+      .show-img{
+        color: var(--g-fc-1);
+        .card{
+          background-color: var(--g-bgc-1);
+          box-shadow: var(--g-bsc);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+          &:hover{
+            box-shadow: var(--g-bsc-hover);
+          }
+        }
+      }
    }
  }
  .play{
@@ -202,6 +188,11 @@
    box-shadow: var(--g-bsc);
    .title{
      color: var(--g-fc-1);
+      .right {
+        svg {
+          fill: var(--g-fc-1);
+        }
+      }
    }
    .box{
      .more{
@@ -225,6 +216,10 @@
              fill: var(--g-c-3);
            }
          }
+          &.last-tip {
+            color: var(--g-fc-1);
+            font-size: 14px;
+          }
        }
      }
    }
@@ -254,6 +249,9 @@
              background-color: var(--g-c-2);
              color: var(--g-fc-3);
            }
+            &:hover{
+              background-color: var(--d-c-3);
+            }
          }
        }
        .list-history{
@@ -283,10 +281,6 @@
        }
      }
    }
-    .play-mask{
-      background-color: var(--g-bgc-1);
-      color: var(--g-fc-1);
-    }
  }
  .star{
    background-color: var(--g-bgc-1);
@@ -303,12 +297,18 @@
        }
      }
    }
+    .view, .search, .shortcut, .site{
+      .title{
+        color: var(--g-fc-1);
+      }
+    }
    .theme{
      .title{
        color: var(--g-fc-1);
      }
      .theme-item{
        box-shadow: var(--g-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
        &:hover{
          box-shadow: var(--g-bsc-hover);
          .theme-name{
@@ -326,6 +326,10 @@
      }
      .qrcode-item{
        box-shadow: var(--g-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+        &:hover{
+          box-shadow: var(--g-bsc-hover);
+        }
      }
    }
  }
@@ -343,4 +347,8 @@
      background-color: var(--g-bgc-1);
    }
  }
+  .history{
+    background-color: var(--g-bgc-1);
+    box-shadow: var(--g-bsc);
+  }
 }
--- a/src/assets/scss/theme/light.scss
+++ b/src/assets/scss/theme/light.scss
@@ -1,28 +1,10 @@
 .theme-light{
  background-color: var(--l-bgc-1);
-  .el-pagination{
-    color: var(--l-fc-1);
-    .el-pagination__total, .el-pagination__jump, .el-input__inner{
-      color: var(--l-fc-1);
-    }
-    .el-pager{
-      .number:hover{
-        color: var(--l-c-8);
-      }
-      .active{
-        color: var(--l-c-9);
-      }
-    }
-    .more, .btn-next, .btn-prev{
-      &:hover{
-        color: var(--l-c-8);
-      }
-    }
-  }
  .zy-select{
    color: var(--l-fc-1);
    background-color: var(--l-bgc-1);
    box-shadow: var(--l-bsc);
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
    &:hover{
      box-shadow: var(--l-bsc-hover);
    }
@@ -30,6 +12,7 @@
      background-color: var(--l-bgc-1);
      box-shadow: var(--l-bsc);
      ul{
+        overflow-y: scroll;
        li{
          &:hover{
            background-color: var(--l-c-1);
@@ -40,25 +23,44 @@
        }
      }
    }
+    .vs-input{
+      input{
+        color: var(--l-fc-1);
+        &::-webkit-input-placeholder{
+          color: var(--l-fc-1);
+        }
+      }
+    }
+  }
+  .zy-input{
+    color: var(--l-fc-1);
+    background-color: var(--l-bgc-1);
+    input{
+      color: var(--l-fc-1);
+      background-color: var(--l-bgc-1);
+    }
+  }
+  .zy-checkbox{
+    color: var(--l-fc-1);
  }
  .zy-table{
    color: var(--l-fc-2);
-    .tHead{
-      background-color: var(--l-bgc-1);
+    .tHeader{
      border-bottom-color: var(--l-c-3);
+      .btn{
+        &:hover{
+          color: var(--l-fc-3)
+        }
+      }
    }
    .tBody{
      border-bottom-color: var(--l-c-3);
      ul{
        li{
          border-bottom-color: var(--l-c-2);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
-            animation: l-tableHoverAni 0.2s ease both;
-            @keyframes l-tableHoverAni {
-              to{
-                box-shadow: var(--l-bsc-hover);
-              }
-            }
+            box-shadow: var(--l-bsc-hover);
          }
          span{
            &.btn:hover{
@@ -68,21 +70,16 @@
        }
      }
    }
-    .tFooter{
-      .tFooter-span{
-        color: var(--l-fc-1);
-      }
-    }
  }
  .zy-scroll{
    &:hover{
      &::-webkit-scrollbar-thumb {
        box-shadow: var(--l-bsc-scroll);
-        background: var(--l-c-3);
+        background: var(--l-c-5);
      }
      &::-webkit-scrollbar-track {
        box-shadow: var(--l-bsc-scroll);
-        background: var(--bgc);
+        background: var(--l-bgc-1);
      }
    }
  }
@@ -103,6 +100,7 @@
        background-color: var(--l-c-2);
      }
      &.active{
+        background-color: var(--l-bgc-2);
        svg{
          stroke: var(--l-c-0);
          stroke-width: 2;
@@ -114,15 +112,21 @@
  .frame{
    span{
      &.min{
+        background-color: #32dc36;
+      }
+      &.max{
        background-color: #ffbe2a;
      }
      &.close{
        background-color: #ff5f56;
      }
+      &.top{
+        background-color: #f3bab7;
+      }
    }
  }
  .detail{
-    color: var(--l-fc-1);
+    color: var(--l-fc-1) !important;
    background-color:var(--l-bgc-1);
    box-shadow: var(--l-bsc-2);
    .detail-content{
@@ -137,10 +141,17 @@
        }
      }
      .detail-body{
-        .info, .desc, .m3u8_urls, .mp4_urls{
+        .info, .desc, .m3u8, .operate{
          border-color: var(--l-c-2);
        }
-        .m3u8_urls, .mp4_urls{
+        .operate{
+          span{
+            &:hover{
+              color: var(--l-fc-2);
+            }
+          }
+        }
+        .m3u8{
          .box{
            span{
              border-color: var(--l-c-5);
@@ -156,43 +167,32 @@
    }
  }
  .film{
-    .top{
-      .search{
-        background-color: var(--l-bgc-1);
-        box-shadow: var(--l-bsc);
-        &:hover{
-          box-shadow: var(--l-bsc-hover);
-        }
-        svg{
-          stroke: #823aa099;
-          stroke-width: 1;
-          fill: none;
-        }
-        .search-box{
-          background-color: none;
-        }
-        &.active{
-          box-shadow: var(--l-bsc-hover);
-          svg{
-            stroke-width: 1.5;
-            fill: var(--l-c-2);
-          }
-        }
-        input{
-          color: var(--l-fc-1);
-        }
-      }
-    }
-    .middle{
+    .body{
      background-color: var(--l-bgc-1);
      box-shadow: var(--l-bsc);
+      .show-img{
+        color: var(--l-fc-1);
+        .card{
+          background-color: var(--l-bgc-1);
+          box-shadow: var(--l-bsc);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+          &:hover{
+            box-shadow: var(--l-bsc-hover);
+          }
+        }
+      }
    }
  }
  .play{
    background-color: var(--l-bgc-1);
    box-shadow: var(--l-bsc);
    .title{
-      color: var(--d-fc-1);
+      color: var(--l-fc-1);
+      .right {
+        svg {
+          fill: var(--l-fc-1);
+        }
+      }
    }
    .box{
      .more{
@@ -216,11 +216,12 @@
              fill: var(--l-c-3);
            }
          }
+          &.last-tip {
+            color: var(--l-fc-1);
+            font-size: 14px;
+          }
        }
      }
-      .mask{
-        background-color: var(--l-bgc-1);
-      }
    }
    .list{
      border: 1px solid var(--l-c-3);
@@ -248,6 +249,9 @@
              background-color: var(--l-c-2);
              color: var(--l-fc-3);
            }
+            &:hover{
+              background-color: var(--d-c-3);
+            }
          }
        }
        .list-history{
@@ -277,10 +281,6 @@
        }
      }
    }
-    .play-mask{
-      background-color: var(--l-bgc-1);
-      color: var(--l-fc-1);
-    }
  }
  .star{
    background-color: var(--l-bgc-1);
@@ -297,12 +297,18 @@
        }
      }
    }
+    .view, .search, .shortcut, .site{
+      .title{
+        color: var(--l-fc-1);
+      }
+    }
    .theme{
      .title{
        color: var(--l-fc-1);
      }
      .theme-item{
        box-shadow: var(--l-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
        &:hover{
          box-shadow: var(--l-bsc-hover);
          .theme-name{
@@ -320,6 +326,10 @@
      }
      .qrcode-item{
        box-shadow: var(--l-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+        &:hover{
+          box-shadow: var(--l-bsc-hover);
+        }
      }
    }
  }
@@ -337,4 +347,8 @@
      background-color: var(--l-bgc-1);
    }
  }
+  .history{
+    background-color: var(--l-bgc-1);
+    box-shadow: var(--l-bsc);
+  }
 }
--- a/src/assets/scss/theme/pink.scss
+++ b/src/assets/scss/theme/pink.scss
@@ -1,37 +1,10 @@
 .theme-pink{
  background-color: var(--p-bgc-1);
-  .el-pagination{
-    background-color: var(--p-bgc-1);
-    color: var(--p-fc-1);
-    .el-pagination__total, .el-pagination__jump, .el-input__inner{
-      color: var(--p-fc-1);
-      background-color: var(--p-bgc-1);
-    }
-    .el-input__inner{
-      border-color: var(--p-c-3);
-    }
-    .el-pager{
-      .number{
-        background-color: var(--p-bgc-1);
-      }
-      .number:hover{
-        color: var(--p-c-8);
-      }
-      .active{
-        color: var(--p-c-9);
-      }
-    }
-    .more, .btn-next, .btn-prev{
-      background-color: var(--p-bgc-1);
-      &:hover{
-        color: var(--p-c-8);
-      }
-    }
-  }
  .zy-select{
    color: var(--p-fc-1);
    background-color: var(--p-bgc-1);
    box-shadow: var(--p-bsc);
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
    &:hover{
      box-shadow: var(--p-bsc-hover);
    }
@@ -39,6 +12,7 @@
      background-color: var(--p-bgc-1);
      box-shadow: var(--p-bsc);
      ul{
+        overflow-y: scroll;
        li{
          &:hover{
            background-color: var(--p-c-1);
@@ -49,25 +23,43 @@
        }
      }
    }
+    .vs-input{
+      input{
+        color: var(--p-fc-1);
+        &::-webkit-input-placeholder{
+          color: var(--p-fc-1);
+        }
+      }
+    }
+  }
+  .zy-input{
+    color: var(--p-fc-1);
+    background-color: var(--p-bgc-1);
+    input{
+      color: var(--p-fc-1);
+    }
+  }
+  .zy-checkbox{
+    color: var(--p-fc-1);
  }
  .zy-table{
    color: var(--p-fc-2);
-    .tHead{
-      background-color: var(--p-bgc-1);
+    .tHeader{
      border-bottom-color: var(--p-c-3);
+      .btn{
+        &:hover{
+          color: var(--p-fc-3)
+        }
+      }
    }
    .tBody{
      border-bottom-color: var(--p-c-3);
      ul{
        li{
          border-bottom-color: var(--p-c-2);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
          &:hover{
-            animation: d-tableHoverAni 0.2s ease both;
-            @keyframes d-tableHoverAni {
-              to{
-                box-shadow: var(--p-bsc-hover);
-              }
-            }
+            box-shadow: var(--p-bsc-hover);
          }
          span{
            &.btn:hover{
@@ -77,21 +69,16 @@
        }
      }
    }
-    .tFooter{
-      .tFooter-span{
-        color: var(--p-fc-1);
-      }
-    }
  }
  .zy-scroll{
    &:hover{
      &::-webkit-scrollbar-thumb {
        box-shadow: var(--p-bsc-scroll);
-        background: var(--p-c-3);
+        background: var(--p-c-5);
      }
      &::-webkit-scrollbar-track {
        box-shadow: var(--p-bsc-scroll);
-        background: var(--bgc);
+        background: var(--p-bgc-1);
      }
    }
  }
@@ -112,6 +99,7 @@
        background-color: var(--p-c-2);
      }
      &.active{
+        background-color: var(--p-bgc-2);
        svg{
          stroke: var(--p-c-0);
          stroke-width: 2;
@@ -123,15 +111,21 @@
  .frame{
    span{
      &.min{
+        background-color: #32dc36;
+      }
+      &.max{
        background-color: #ffbe2a;
      }
      &.close{
        background-color: #ff5f56;
      }
+      &.top{
+        background-color: #f3bab7;
+      }
    }
  }
  .detail{
-    color: var(--p-fc-1);
+    color: var(--p-fc-1) !important;
    background-color:var(--p-bgc-1);
    box-shadow: var(--p-bsc-2);
    .detail-content{
@@ -146,10 +140,17 @@
        }
      }
      .detail-body{
-        .info, .desc, .m3u8_urls, .mp4_urls{
+        .info, .desc, .m3u8, .operate{
          border-color: var(--p-c-2);
        }
-        .m3u8_urls, .mp4_urls{
+        .operate{
+          span{
+            &:hover{
+              color: var(--p-fc-2);
+            }
+          }
+        }
+        .m3u8{
          .box{
            span{
              border-color: var(--p-c-5);
@@ -165,36 +166,20 @@
    }
  }
  .film{
-    .top{
-      .search{
-        background-color: var(--p-bgc-1);
-        box-shadow: var(--p-bsc);
-        &:hover{
-          box-shadow: var(--p-bsc-hover);
-        }
-        svg{
-          stroke: var(--p-c-0);
-          stroke-width: 1;
-          fill: none;
-        }
-        .search-box{
-          background-color: var(--p-bgc-1);
-        }
-        &.active{
-          box-shadow: var(--p-bsc-hover);
-          svg{
-            stroke-width: 1.5;
-            fill: var(--p-c-2);
-          }
-        }
-        input{
-          color: var(--p-fc-1);
-        }
-      }
-    }
-    .middle{
+    .body{
      background-color: var(--p-bgc-1);
      box-shadow: var(--p-bsc);
+      .show-img{
+        color: var(--p-fc-1);
+        .card{
+          background-color: var(--p-bgc-1);
+          box-shadow: var(--p-bsc);
+          transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+          &:hover{
+            box-shadow: var(--p-bsc-hover);
+          }
+        }
+      }
    }
  }
  .play{
@@ -202,6 +187,11 @@
    box-shadow: var(--p-bsc);
    .title{
      color: var(--p-fc-1);
+      .right {
+        svg {
+          fill: var(--p-fc-1);
+        }
+      }
    }
    .box{
      .more{
@@ -225,6 +215,10 @@
              fill: var(--p-c-3);
            }
          }
+          &.last-tip {
+            color: var(--p-fc-1);
+            font-size: 14px;
+          }
        }
      }
    }
@@ -254,6 +248,9 @@
              background-color: var(--p-c-2);
              color: var(--p-fc-3);
            }
+            &:hover{
+              background-color: var(--d-c-3);
+            }
          }
        }
        .list-history{
@@ -283,10 +280,6 @@
        }
      }
    }
-    .play-mask{
-      background-color: var(--p-bgc-1);
-      color: var(--p-fc-1);
-    }
  }
  .star{
    background-color: var(--p-bgc-1);
@@ -303,12 +296,18 @@
        }
      }
    }
+    .view, .search, .shortcut, .site{
+      .title{
+        color: var(--p-fc-1);
+      }
+    }
    .theme{
      .title{
        color: var(--p-fc-1);
      }
      .theme-item{
        box-shadow: var(--p-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
        &:hover{
          box-shadow: var(--p-bsc-hover);
          .theme-name{
@@ -326,6 +325,10 @@
      }
      .qrcode-item{
        box-shadow: var(--p-bsc);
+        transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+        &:hover{
+          box-shadow: var(--p-bsc-hover);
+        }
      }
    }
  }
@@ -343,4 +346,8 @@
      background-color: var(--p-bgc-1);
    }
  }
+  .history{
+    background-color: var(--p-bgc-1);
+    box-shadow: var(--p-bsc);
+  }
 }
--- a/src/background.js
+++ b/src/background.js
@@ -1,19 +1,17 @@
 'use strict'

-import { app, ipcMain, protocol, BrowserWindow } from 'electron'
-import {
-  createProtocol
-  // installVueDevtools
-} from 'vue-cli-plugin-electron-builder/lib'
-import path from 'path'
-import { autoUpdater } from 'electron-updater'
+import './lib/site/server'
+import { app, protocol, BrowserWindow, globalShortcut, ipcMain } from 'electron'
+import { createProtocol } from 'vue-cli-plugin-electron-builder/lib'
+import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
 const isDevelopment = process.env.NODE_ENV !== 'production'
-const globalShortcut = require('electron').globalShortcut
+
+// 允许跨域
+app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')

 let win
 let mini

-// Scheme must be registered before the app is ready
 protocol.registerSchemesAsPrivileged([{ scheme: 'app', privileges: { secure: true, standard: true } }])

 function createWindow () {
@@ -22,21 +20,18 @@ function createWindow () {
    height: 720,
    frame: false,
    resizable: true,
-    transparent: true,
    webPreferences: {
      webSecurity: false,
      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
-    },
-    // eslint-disable-next-line
-    icon: path.join(__static, 'icon.png')
+    }
  })

  if (process.env.WEBPACK_DEV_SERVER_URL) {
    win.loadURL(process.env.WEBPACK_DEV_SERVER_URL)
    if (!process.env.IS_TEST) win.webContents.openDevTools()
  } else {
+    createProtocol('app')
    win.loadURL('app://./index.html')
-    autoUpdater.checkForUpdatesAndNotify()
  }

  win.on('closed', () => {
@@ -47,25 +42,22 @@ function createWindow () {
 function createMini () {
  mini = new BrowserWindow({
    width: 550,
-    minWidth: 260,
+    miniWidth: 860,
    height: 340,
-    minHeight: 180,
+    miniHeight: 180,
    frame: false,
    resizable: true,
-    transparent: true,
-    alwaysOnTop: true,
    webPreferences: {
      webSecurity: false,
      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
-    },
-    // eslint-disable-next-line
-    icon: path.join(__static, 'icon.png')
+    }
  })

  if (process.env.WEBPACK_DEV_SERVER_URL) {
    mini.loadURL(process.env.WEBPACK_DEV_SERVER_URL + 'mini')
    if (!process.env.IS_TEST) mini.webContents.openDevTools()
  } else {
+    createProtocol('app')
    mini.loadURL('app://./mini.html')
  }

@@ -74,47 +66,33 @@ function createMini () {
  })
 }

-app.allowRendererProcessReuse = true
-app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
+if (process.platform === 'darwin') {
+  app.dock.show()
+}
 if (process.platform === 'Linux') {
  app.disableHardwareAcceleration()
 }
+app.allowRendererProcessReuse = true

 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
+  app.quit()
 })

 app.on('activate', () => {
  if (win === null) {
    createWindow()
  }
-  if (mini === null) {
-    createMini()
-  }
-})
-
-ipcMain.on('min', () => {
-  win.minimize()
-})
-ipcMain.on('close', () => {
-  win.close()
 })

 ipcMain.on('mini', () => {
  createMini()
-  win.close()
+  win.hide()
 })
-ipcMain.on('miniMin', () => {
-  mini.minimize()
-})
-ipcMain.on('miniClose', () => {
-  mini.close()
-  createWindow()
-})
-ipcMain.on('miniOpacity', (e, arg) => {
-  mini.setOpacity(arg)
+
+ipcMain.on('win', () => {
+  mini.destroy()
+  win.show()
+  win.webContents.send('miniClosed')
 })

 const gotTheLock = app.requestSingleInstanceLock()
@@ -122,65 +100,31 @@ if (!gotTheLock) {
  app.quit()
 } else {
  app.on('second-instance', (event, commandLine, workingDirectory) => {
-    // 当运行第二个实例时,将会聚焦到win这个窗口
    if (win) {
      if (win.isMinimized()) win.restore()
      win.focus()
    }
  })
-
-  // 创建 win, 加载应用的其余部分, etc...
-  app.on('ready', () => {
-    globalShortcut.register('CommandOrControl+right', function () {
-      if (win) {
-        win.webContents.send('next', 0)
+  app.on('ready', async () => {
+    if (isDevelopment && !process.env.IS_TEST) {
+      try {
+        await installExtension(VUEJS_DEVTOOLS)
+      } catch (e) {
+        console.error('Vue Devtools failed to install:', e.toString())
      }
-      if (mini) {
-        mini.webContents.send('next', 0)
-      }
-    })
-    globalShortcut.register('CommandOrControl+left', function () {
-      if (win) {
-        win.webContents.send('prev', 0)
-      }
-      if (mini) {
-        mini.webContents.send('prev', 0)
-      }
-    })
-    globalShortcut.register('CommandOrControl+up', function () {
-      if (mini) {
-        mini.webContents.send('up', 0)
-      }
-    })
-    globalShortcut.register('CommandOrControl+down', function () {
-      if (mini) {
-        mini.webContents.send('down', 0)
-      }
-    })
-    globalShortcut.register('shift+up', function () {
-      if (win) {
-        win.webContents.send('playbackRateUp', 0)
-      }
-      if (mini) {
-        mini.webContents.send('playbackRateUp', 0)
-      }
-    })
-    globalShortcut.register('shift+down', function () {
-      if (win) {
-        win.webContents.send('playbackRateDown', 0)
-      }
-      if (mini) {
-        mini.webContents.send('playbackRateDown', 0)
-      }
-    })
-    if (!process.env.WEBPACK_DEV_SERVER_URL) {
-      createProtocol('app')
    }
    createWindow()
+    globalShortcut.register('Alt+Space', () => {
+      if (win) {
+        win.isFocused() ? win.blur() : win.focus()
+      }
+      if (mini) {
+        mini.isFocused() ? mini.blur() : mini.focus()
+      }
+    })
  })
 }

-// Exit cleanly on request from parent process in development mode.
 if (isDevelopment) {
  if (process.platform === 'win32') {
    process.on('message', data => {
--- a/src/components/Aside.vue
+++ b/src/components/Aside.vue
@@ -2,7 +2,7 @@
  <div class="aside">
    <span :class="[view === 'Film' ? 'active ': ''] + 'zy-svg'" @click="changeView('Film')">
      <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="apertureIconTitle">
-        <title id="apertureIconTitle">{{$t('view')}}</title>
+        <title id="apertureIconTitle">电影</title>
        <path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"></path>
        <g stroke-linecap="round">
          <path d="M3 16H14.3164"></path>
@@ -16,19 +16,33 @@
    </span>
    <span :class="[view === 'Play' ? 'active ': ''] + 'zy-svg'" @click="changeView('Play')">
      <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="playIconTitle">
-        <title id="playIconTitle">{{$t('play')}}</title>
+        <title id="playIconTitle">播放</title>
        <path d="M20 12L5 21V3z"></path>
      </svg>
    </span>
    <span :class="[view === 'Star' ? 'active ': ''] + 'zy-svg'" @click="changeView('Star')">
      <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="favouriteIconTitle">
-        <title id="favouriteIconTitle">{{$t('star')}}</title>
+        <title id="favouriteIconTitle">star</title>
        <path d="M12,21 L10.55,19.7051771 C5.4,15.1242507 2,12.1029973 2,8.39509537 C2,5.37384196 4.42,3 7.5,3 C9.24,3 10.91,3.79455041 12,5.05013624 C13.09,3.79455041 14.76,3 16.5,3 C19.58,3 22,5.37384196 22,8.39509537 C22,12.1029973 18.6,15.1242507 13.45,19.7149864 L12,21 Z"></path>
      </svg>
    </span>
+    <span :class="[view === 'IPTV' ? 'active ': ''] + 'zy-svg'" @click="changeView('IPTV')">
+          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="tvIconTitle">
+            <title id="tvIconTitle">IPTV</title>
+            <polygon points="20 8 20 20 4 20 4 8"></polygon>
+            <polyline stroke-linejoin="round" points="8 4 12 7.917 16 4"></polyline>
+          </svg>
+    </span>
+    <span :class="[view === 'History' ? 'active ': ''] + 'zy-svg'" @click="changeView('History')">
+          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="timeIconTitle">
+            <title id="timeIconTitle">历史记录</title>
+            <circle cx="12" cy="12" r="10"></circle>
+            <polyline points="12 5 12 12 16 16"></polyline>
+          </svg>
+    </span>
    <span :class="[view === 'Setting' ? 'active ': ''] + 'zy-svg'" @click="changeView('Setting')">
      <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="settingsIconTitle">
-        <title id="settingsIconTitle">{{$t('setting')}}</title>
+        <title id="settingsIconTitle">设置</title>
        <path d="M5.03506429,12.7050339 C5.01187484,12.4731696 5,12.2379716 5,12 C5,11.7620284 5.01187484,11.5268304 5.03506429,11.2949661 L3.20577137,9.23205081 L5.20577137,5.76794919 L7.9069713,6.32070904 C8.28729123,6.0461342 8.69629298,5.80882212 9.12862533,5.61412402 L10,3 L14,3 L14.8713747,5.61412402 C15.303707,5.80882212 15.7127088,6.0461342 16.0930287,6.32070904 L18.7942286,5.76794919 L20.7942286,9.23205081 L18.9649357,11.2949661 C18.9881252,11.5268304 19,11.7620284 19,12 C19,12.2379716 18.9881252,12.4731696 18.9649357,12.7050339 L20.7942286,14.7679492 L18.7942286,18.2320508 L16.0930287,17.679291 C15.7127088,17.9538658 15.303707,18.1911779 14.8713747,18.385876 L14,21 L10,21 L9.12862533,18.385876 C8.69629298,18.1911779 8.28729123,17.9538658 7.9069713,17.679291 L5.20577137,18.2320508 L3.20577137,14.7679492 L5.03506429,12.7050339 Z"></path>
        <circle cx="12" cy="12" r="1"></circle>
      </svg>
@@ -47,12 +61,37 @@ export default {
      set (val) {
        this.SET_VIEW(val)
      }
+    },
+    detail: {
+      get () {
+        return this.$store.getters.getDetail
+      },
+      set (val) {
+        this.SET_DETAIL(val)
+      }
+    },
+    editSites: {
+      get () {
+        return this.$store.getters.getEditSites
+      },
+      set (val) {
+        this.SET_EDITSITES(val)
+      }
    }
  },
  methods: {
-    ...mapMutations(['SET_VIEW']),
+    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_EDITSITES']),
    changeView (e) {
      this.view = e
+      // ChangeView 的时候关闭Detail和EditSites页面
+      this.detail = {
+        show: false
+      }
+      if (this.editSites.show === true) {
+        this.editSites = {
+          show: false
+        }
+      }
    }
  }
 }
@@ -61,17 +100,17 @@ export default {
 .aside{
  width: 60px;
  height: 100%;
-  user-select: none;
-  -webkit-app-region: drag;
  display: flex;
-  justify-content: center;
+  user-select: none;
  align-items: center;
  flex-direction: column;
+  justify-content: center;
+  -webkit-app-region: drag;
  span{
-    -webkit-app-region: no-drag;
    width: 60px;
    height: 60px;
    cursor: pointer;
+    -webkit-app-region: no-drag;
  }
 }
 </style>
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -2,28 +2,52 @@
  <div class="detail">
    <div class="detail-content">
      <div class="detail-header">
-        <span class="detail-title">{{$t('detail')}}</span>
-        <span class="detail-close zy-svg" @click="closeDetail">
+        <span class="detail-title">详情</span>
+        <span class="detail-close zy-svg" @click="close">
          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="closeIconTitle">
-            <title id="closeIconTitle">{{$t('close')}}</title>
+            <title id="closeIconTitle">关闭</title>
            <path d="M6.34314575 6.34314575L17.6568542 17.6568542M6.34314575 17.6568542L17.6568542 6.34314575"></path>
          </svg>
        </span>
      </div>
-      <div class="detail-body zy-scroll" v-show="!loading" :style="{overflowY:scroll? 'auto' : 'hidden',paddingRight: scroll ? '0': '5px' }" @mouseenter="scroll = true" @mouseleave="scroll = false">
-        <div class="info" v-html="vDetail.info"></div>
-        <div class="desc" v-html="vDetail.desc" v-if="show.desc"></div>
-        <div class="m3u8_urls">
-          <div class="title">{{$t('play')}}:</div>
-          <div class="box">
-            <span v-for="(i, j) in vDetail.m3u8_urls" :key="j" @click="playEvent(j)">{{i | ftName}}</span>
+      <div class="detail-body zy-scroll" v-show="!loading">
+        <div class="info">
+          <div class="info-left">
+            <img :src="info.pic" alt="">
+          </div>
+          <div class="info-right">
+            <div class="name">{{info.name}}</div>
+            <div class="director" v-show="info.director">导演: {{info.director}}</div>
+            <div class="actor" v-show="info.actor">主演: {{info.actor}}</div>
+            <div class="type" v-show="info.type">类型: {{info.type}}</div>
+            <div class="area" v-show="info.area">地区: {{info.area}}</div>
+            <div class="lang" v-show="info.lang">语言: {{info.lang}}</div>
+            <div class="year" v-show="info.year">上映: {{info.year}}</div>
+            <div class="last" v-show="info.last">更新: {{info.last}}</div>
+            <div class="note" v-show="info.note">备注: {{info.note}}</div>
+            <div class="rate" v-show="info.rate">豆瓣评分: {{info.rate}}</div>
          </div>
        </div>
-        <div class="mp4_urls" v-if="show.download">
-          <div class="title">{{$t('download')}}:</div>
+        <div class="operate">
+          <span @click="playEvent(0)">播放</span>
+          <span @click="starEvent">收藏</span>
+          <span @click="downloadEvent">下载</span>
+          <span @click="shareEvent">分享</span>
+          <span @click="doubanLinkEvent">豆瓣</span>
+          <span @click="togglePlayOnlineEvent">
+            <input type="checkbox" v-model="playOnline"> 播放在线高清视频
+          </span>
+          <span>
+            <select v-model="selectedOnlineSite" class="vs-options">
+              <option disabled value="">Please select one</option>
+              <option v-for="(i, j) in onlineSites" :key="j">{{i}}</option>
+            </select>
+          </span>
+        </div>
+        <div class="desc" v-show="info.des">{{info.des}}</div>
+        <div class="m3u8">
          <div class="box">
-            <span v-for="(i, j) in vDetail.mp4_urls" :key="j" @click="download(i)">{{i | ftName}}</span>
-            <span @click="allDownload" v-show="vDetail.mp4_urls.length > 1">{{$t('all_download')}}</span>
+            <span v-for="(i, j) in m3u8List" :key="j" @click="playEvent(j)">{{i | ftName}}</span>
          </div>
        </div>
      </div>
@@ -35,19 +59,20 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import tools from '../lib/site/tools'
+import zy from '../lib/site/tools'
+import onlineVideo from '../lib/site/onlineVideo'
+import { star, history } from '../lib/dexie'
 const { clipboard } = require('electron')
 export default {
  name: 'detail',
  data () {
    return {
-      scroll: false,
      loading: true,
-      vDetail: {},
-      show: {
-        desc: false,
-        download: false
-      }
+      m3u8List: [],
+      info: {},
+      playOnline: false,
+      selectedOnlineSite: '哔嘀',
+      onlineSites: ['哔嘀', '素白白', '简影', '1080影视']
    }
  },
  filters: {
@@ -65,6 +90,14 @@ export default {
        this.SET_VIEW(val)
      }
    },
+    detail: {
+      get () {
+        return this.$store.getters.getDetail
+      },
+      set (val) {
+        this.SET_DETAIL(val)
+      }
+    },
    video: {
      get () {
        return this.$store.getters.getVideo
@@ -73,71 +106,234 @@ export default {
        this.SET_VIDEO(val)
      }
    },
-    detail: {
+    share: {
      get () {
-        return this.$store.getters.getDetail
+        return this.$store.getters.getShare
      },
      set (val) {
-        this.SET_DETAIL(val)
+        this.SET_SHARE(val)
      }
    }
  },
  methods: {
-    ...mapMutations(['SET_VIEW', 'SET_VIDEO', 'SET_DETAIL']),
-    closeDetail () {
+    ...mapMutations(['SET_VIEW', 'SET_VIDEO', 'SET_DETAIL', 'SET_SHARE']),
+    close () {
      this.detail.show = false
    },
-    getDetail () {
-      tools.detail_get(this.detail.v.site, this.detail.v.detail).then(res => {
-        this.vDetail = res
-        if (res.desc.length > 0) {
-          this.show.desc = true
+    m3u8Parse (e) {
+      const dd = e.dl.dd
+      const type = Object.prototype.toString.call(dd)
+      if (type === '[object Array]') {
+        for (const i of dd) {
+          if (i._flag.indexOf('m3u8') >= 0) {
+            this.m3u8List = i._t.split('#')
+          }
        }
-        if (res.mp4_urls.length > 0) {
-          this.show.download = true
-        }
-        this.$nextTick(() => {
-          this.loading = false
-        })
-      })
+      } else {
+        this.m3u8List = dd._t.split('#')
+      }
    },
    playEvent (n) {
-      const v = { ...this.detail.v }
-      v.index = n
-      this.video = v
-      this.detail.show = false
-      this.view = 'Play'
-    },
-    download (e) {
-      const name = e.split('$')[0]
-      const txt = encodeURI(e.split('$')[1])
-      clipboard.writeText(txt)
-      this.$m.success(name + this.$t('copy_success'))
-    },
-    allDownload () {
-      const urls = [...this.vDetail.mp4_urls]
-      let txt = ''
-      for (const i of urls) {
-        const url = encodeURI(i.split('$')[1])
-        txt += (url + '\n')
+      if (!this.playOnline) {
+        history.find({ site: this.detail.key, ids: this.detail.info.id }).then(res => {
+          if (res) {
+            this.video = { key: res.site, info: { id: res.ids, name: res.name, index: n, site: this.detail.site } }
+          } else {
+            this.video = { key: this.detail.key, info: { id: this.detail.info.id, name: this.detail.info.name, index: n, site: this.detail.site } }
+          }
+        })
+        this.view = 'Play'
+        this.detail.show = false
+      } else {
+        history.find({ site: this.detail.key, ids: this.detail.info.id }).then(res => {
+          if (res) {
+            res.index = n
+            history.update(res.id, res)
+          } else {
+            const doc = {
+              site: this.detail.key,
+              ids: this.detail.info.id,
+              name: this.detail.info.name,
+              type: this.detail.info.type,
+              year: this.detail.info.year,
+              index: n,
+              time: ''
+            }
+            history.add(doc)
+          }
+        })
+        this.playVideoOnline(this.detail.info.name, n)
      }
-      clipboard.writeText(txt)
-      this.$m.success(this.$t('copy_success'))
+    },
+    starEvent () {
+      star.find({ key: this.detail.key, ids: this.info.id }).then(res => {
+        if (res) {
+          this.$message.info('该影片已被收藏')
+        } else {
+          const docs = {
+            key: this.detail.key,
+            ids: this.info.id,
+            name: this.info.name,
+            type: this.info.type,
+            year: this.info.year,
+            last: this.info.last,
+            note: this.info.note
+          }
+          star.add(docs).then(res => {
+            this.$message.success('收藏成功')
+          })
+        }
+      }).catch(() => {
+        this.$message.warning('收藏失败')
+      })
+    },
+    togglePlayOnlineEvent () {
+      this.playOnline = !this.playOnline
+    },
+    playVideoOnline (videoName, videoIndex) {
+      switch (this.selectedOnlineSite) {
+        case '哔嘀':
+          onlineVideo.playVideoOnBde4(videoName, videoIndex)
+          break
+        case '1080影视':
+          onlineVideo.playVideoOnK1080(videoName, videoIndex)
+          break
+        case '素白白':
+          onlineVideo.playVideoOnSubaibai(videoName, videoIndex)
+          break
+        case '哆咪动漫':
+          onlineVideo.playVideoOndmdm2020(videoName, videoIndex)
+          break
+        case '樱花动漫':
+          onlineVideo.playVideoOnYhdm(videoName, videoIndex)
+          break
+        case '简影':
+          onlineVideo.playVideoOnSyrme(videoName, videoIndex)
+          break
+        default:
+          this.$message.console.error(`不支持该网站：${this.selectedOnlineSite}`)
+      }
+    },
+    downloadEvent () {
+      zy.download(this.detail.key, this.info.id).then(res => {
+        if (res && res.dl && res.dl.dd) {
+          const text = res.dl.dd._t
+          if (text) {
+            const list = text.split('#')
+            let downloadUrl = res.name + '\n'
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『MP4』格式的链接已复制, 快去下载吧!')
+          } else {
+            this.$message.warning('没有查询到下载链接.')
+          }
+        } else {
+          const list = [...this.m3u8List]
+          let downloadUrl = this.detail.info.name + '\n'
+          for (const i of list) {
+            const url = encodeURI(i.split('$')[1])
+            downloadUrl += (url + '\n')
+          }
+          clipboard.writeText(downloadUrl)
+          this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
+        }
+      })
+    },
+    shareEvent () {
+      this.share = {
+        show: true,
+        key: this.detail.key,
+        info: this.detail.info
+      }
+    },
+    doubanLinkEvent () {
+      const open = require('open')
+      const axios = require('axios')
+      const cheerio = require('cheerio')
+      const name = this.detail.info.name.trim()
+      // 豆瓣搜索链接
+      var doubanSearchLink = 'https://www.douban.com/search?q=' + name
+      var link = doubanSearchLink
+      axios.get(doubanSearchLink).then(res => {
+        const $ = cheerio.load(res.data)
+        // 比较第一和第二豆瓣搜索结果, 如果名字相符， 就打开该链接，否则打开搜索页面
+        var nameInDouban = $($('div.result')[0]).find('div>div>h3>a').first()
+        if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+          link = nameInDouban.attr('href')
+        } else {
+          nameInDouban = $($('div.result')[1]).find('div>div>h3>a').first()
+          if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+            link = nameInDouban.attr('href')
+          }
+        }
+        open(link)
+      })
+    },
+    getDoubanRate () {
+      const axios = require('axios')
+      const cheerio = require('cheerio')
+      const name = this.detail.info.name.trim()
+      // 豆瓣搜索链接
+      var doubanSearchLink = 'https://www.douban.com/search?q=' + name
+      axios.get(doubanSearchLink).then(res => {
+        const $ = cheerio.load(res.data)
+        // 比较第一和第二给豆瓣搜索结果, 看名字是否相符
+        var link = ''
+        var nameInDouban = $($('div.result')[0]).find('div>div>h3>a').first()
+        if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+          link = nameInDouban.attr('href')
+        } else {
+          nameInDouban = $($('div.result')[1]).find('div>div>h3>a').first()
+          if (name.replace(/\s/g, '') === nameInDouban.text().replace(/\s/g, '')) {
+            link = nameInDouban.attr('href')
+          }
+        }
+        // 如果找到链接，就打开该链接获取评分
+        if (link) {
+          axios.get(link).then(response => {
+            const parsedHtml = cheerio.load(response.data)
+            var rating = parsedHtml('body').find('#interest_sectl').first().find('strong').first()
+            if (rating.text()) {
+              this.info.rate = rating.text()
+            } else {
+              this.info.rate = '暂无评分'
+            }
+          })
+        } else {
+          this.info.rate = '暂无评分'
+        }
+      })
+    },
+    getDetailInfo () {
+      const id = this.detail.info.ids || this.detail.info.id
+      zy.detail(this.detail.key, id).then(res => {
+        if (res) {
+          this.info = res
+          this.$set(this.info, 'rate', '')
+          this.m3u8Parse(res)
+          this.getDoubanRate()
+          this.loading = false
+        }
+      })
    }
  },
  created () {
-    this.getDetail()
+    this.getDetailInfo()
  }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .detail{
  position: absolute;
-  left: 0;
+  left: 80px;
+  right: 20px;
  bottom: 0;
-  width: 100%;
+  width: calc(100% - 100px);
  height: calc(100% - 40px);
-  z-index: 999;
+  z-index: 888;
  .detail-content{
    height: calc(100% - 10px);
    padding: 0 60px;
@@ -146,9 +342,8 @@ export default {
      width: 100%;
      height: 40px;
      display: flex;
-      justify-content: space-between;
      align-items: center;
-      padding: 0 -40px;
+      justify-content: space-between;
      .detail-title{
        font-size: 16px;
      }
@@ -156,191 +351,136 @@ export default {
        cursor: pointer;
      }
    }
-    .detail-body{
-      height: calc(100% - 50px);
-      overflow-y: auto;
-      .info{
-        display: flex;
-        justify-content: flex-start;
-        align-items: flex-start;
-        flex-wrap: wrap;
-        width: 100%;
-        padding: 10px;
-        border: 1px solid;
-        border-radius: 2px;
-        margin-bottom: 10px;
-        .vodImg{
-          width: 200px;
-          img{
-            width: 100%;
-            height: auto;
-          }
-        }
-        .vodAd{
-          display: none;
-        }
-        .vodInfo{
-          flex: 1;
-          margin-left: 20px;
-          overflow: hidden;
-          .vodh{
-            margin-bottom: 6px;
-            h2{
-              display: inline-block;
-              margin: 0;
-            }
-            span{
-              font-size: 12px;
-              margin-left: 10px;
-            }
-            label{
-              font-size: 20px;
-              font-weight: bold;
-              margin-left: 20px;
-            }
-          }
-          .cont, .tags{
-            display: none;
-          }
-          ul{
-            padding: 0;
-            margin: 0;
-          }
-          a{
-            display: none;
-            pointer-events: none;
-          }
-          li{
-            list-style: none;
-            font-size: 14px;
-            line-height: 18px;
-            height: 18px;
-            overflow: hidden;
-            span{
-              word-wrap: nowrap;
-            }
-          }
-        }
-        .whitetitle{
+  }
+  .detail-body{
+    height: calc(100% - 50px);
+    overflow-y: auto;
+    .info{
+      width: 100%;
+      padding: 10px;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: flex-start;
+      justify-content: flex-start;
+      border: 1px solid;
+      border-radius: 2px;
+      margin-bottom: 10px;
+      height: auto;
+      .info-left{
+        width: 200px;
+        height: 100%;
+        img{
          width: 100%;
-          font-size: 22px;
+          height: auto;
+        }
+      }
+      .info-right{
+        flex: 1;
+        margin-left: 20px;
+        .name{
+          font-size: 20px;
+          margin-bottom: 10px;
          font-weight: bold;
-          margin: 4px 0;
        }
-        .people{
-          display: flex;
-          justify-content: flex-start;
-          align-items: flex-start;
-          flex-wrap: wrap;
-          .left{
-            width: 200px;
-            img{
-              width: 100%;
-              height: auto;
-            }
-          }
-          .right{
-            flex: 1;
-            margin-left: 20px;
-            overflow: hidden;
-            p{
-              font-size: 14px;
-            }
-            a{
-              pointer-events: none;
-              text-decoration: none;
-            }
-          }
+        .director, .actor, .type, .area, .lang, .year, .last, .note{
+          font-size: 14px;
+          line-height: 26px;
        }
-      }
-      .desc{
-        border: 1px solid;
-        padding: 10px;
-        width: 100%;
-        margin-bottom: 10px;
-        border-radius: 2px;
-        font-size: 14px;
-        line-height: 20px;
-      }
-      .m3u8_urls, .mp4_urls{
-        border: 1px solid;
-        padding: 10px;
-        width: 100%;
-        margin-bottom: 10px;
-        border-radius: 2px;
-        .title{
+        .rate{
          font-size: 16px;
+          line-height: 26px;
+          font-weight: bolder;
        }
-        .box{
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          flex-wrap: wrap;
-          span{
-            font-size: 12px;
-            border: 1px solid;
-            border-radius: 2px;
-            cursor: pointer;
-            margin: 6px 6px 0px 0px;
-            padding: 8px 22px;
-          }
-          &::after {
-            content: '';
-            flex: 1;
-          }
-        }
-      }
-      .mp4_urls{
-        margin-bottom: 10px;
      }
    }
-    .detail-mask{
-      position: absolute;
-      top: 50px;
-      left: 0;
+    .operate{
+      border: 1px solid;
+      padding: 10px;
      width: 100%;
-      height: calc(100% - 50px);
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      .loader {
-        font-size: 8px;
-        width: 1em;
-        height: 1em;
-        border-radius: 50%;
-        position: relative;
-        text-indent: -9999em;
-        animation: load4 1.3s infinite linear;
-        transform: translateZ(0);
+      margin-bottom: 10px;
+      border-radius: 2px;
+      span{
+        margin-right: 20px;
+        font-size: 14px;
+        cursor: pointer;
+        user-select: none;
      }
-      @keyframes load4 {
-        0%,
-        100% {
-          box-shadow: 0 -3em 0 0.2em, 2em -2em 0 0em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 -1em, -3em 0 0 -1em, -2em -2em 0 0;
-        }
-        12.5% {
-          box-shadow: 0 -3em 0 0, 2em -2em 0 0.2em, 3em 0 0 0, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 -1em, -3em 0 0 -1em, -2em -2em 0 -1em;
-        }
-        25% {
-          box-shadow: 0 -3em 0 -0.5em, 2em -2em 0 0, 3em 0 0 0.2em, 2em 2em 0 0, 0 3em 0 -1em, -2em 2em 0 -1em, -3em 0 0 -1em, -2em -2em 0 -1em;
-        }
-        37.5% {
-          box-shadow: 0 -3em 0 -1em, 2em -2em 0 -1em, 3em 0em 0 0, 2em 2em 0 0.2em, 0 3em 0 0em, -2em 2em 0 -1em, -3em 0em 0 -1em, -2em -2em 0 -1em;
-        }
-        50% {
-          box-shadow: 0 -3em 0 -1em, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 0em, 0 3em 0 0.2em, -2em 2em 0 0, -3em 0em 0 -1em, -2em -2em 0 -1em;
-        }
-        62.5% {
-          box-shadow: 0 -3em 0 -1em, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 0, -2em 2em 0 0.2em, -3em 0 0 0, -2em -2em 0 -1em;
-        }
-        75% {
-          box-shadow: 0em -3em 0 -1em, 2em -2em 0 -1em, 3em 0em 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 0, -3em 0em 0 0.2em, -2em -2em 0 0;
-        }
-        87.5% {
-          box-shadow: 0em -3em 0 0, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 0, -3em 0em 0 0, -2em -2em 0 0.2em;
+    }
+    .desc{
+      border: 1px solid;
+      padding: 10px;
+      width: 100%;
+      margin-bottom: 10px;
+      border-radius: 2px;
+      font-size: 14px;
+      line-height: 20px;
+    }
+    .m3u8{
+      border: 1px solid;
+      padding: 10px 0 10px 10px;
+      width: 100%;
+      margin-bottom: 10px;
+      border-radius: 2px;
+      .box{
+        width: 100%;
+        span{
+          display: inline-block;
+          font-size: 12px;
+          border: 1px solid;
+          border-radius: 2px;
+          cursor: pointer;
+          margin: 6px 10px 0px 0px;
+          padding: 8px 22px;
        }
      }
    }
  }
+  .detail-mask{
+    position: absolute;
+    top: 50px;
+    left: 0;
+    width: 100%;
+    height: calc(100% - 50px);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .loader {
+      font-size: 8px;
+      width: 1em;
+      height: 1em;
+      border-radius: 50%;
+      position: relative;
+      text-indent: -9999em;
+      animation: load4 1.3s infinite linear;
+      transform: translateZ(0);
+    }
+    @keyframes load4 {
+      0%,
+      100% {
+        box-shadow: 0 -3em 0 0.2em, 2em -2em 0 0em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 -1em, -3em 0 0 -1em, -2em -2em 0 0;
+      }
+      12.5% {
+        box-shadow: 0 -3em 0 0, 2em -2em 0 0.2em, 3em 0 0 0, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 -1em, -3em 0 0 -1em, -2em -2em 0 -1em;
+      }
+      25% {
+        box-shadow: 0 -3em 0 -0.5em, 2em -2em 0 0, 3em 0 0 0.2em, 2em 2em 0 0, 0 3em 0 -1em, -2em 2em 0 -1em, -3em 0 0 -1em, -2em -2em 0 -1em;
+      }
+      37.5% {
+        box-shadow: 0 -3em 0 -1em, 2em -2em 0 -1em, 3em 0em 0 0, 2em 2em 0 0.2em, 0 3em 0 0em, -2em 2em 0 -1em, -3em 0em 0 -1em, -2em -2em 0 -1em;
+      }
+      50% {
+        box-shadow: 0 -3em 0 -1em, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 0em, 0 3em 0 0.2em, -2em 2em 0 0, -3em 0em 0 -1em, -2em -2em 0 -1em;
+      }
+      62.5% {
+        box-shadow: 0 -3em 0 -1em, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 0, -2em 2em 0 0.2em, -3em 0 0 0, -2em -2em 0 -1em;
+      }
+      75% {
+        box-shadow: 0em -3em 0 -1em, 2em -2em 0 -1em, 3em 0em 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 0, -3em 0em 0 0.2em, -2em -2em 0 0;
+      }
+      87.5% {
+        box-shadow: 0em -3em 0 0, 2em -2em 0 -1em, 3em 0 0 -1em, 2em 2em 0 -1em, 0 3em 0 -1em, -2em 2em 0 0, -3em 0em 0 0, -2em -2em 0 0.2em;
+      }
+    }
+  }
 }
 </style>
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -0,0 +1,200 @@
+<template>
+  <div class="detail">
+    <div class="detail-content">
+      <div class="detail-header">
+        <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="openAddSite">添加新源</div>
+        </div>
+        <span class="detail-close zy-svg" @click="close">
+          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="closeIconTitle">
+            <title id="closeIconTitle">关闭</title>
+            <path d="M6.34314575 6.34314575L17.6568542 17.6568542M6.34314575 17.6568542L17.6568542 6.34314575"></path>
+          </svg>
+        </span>
+      </div>
+      <div class="detail-body zy-scroll">
+        <div class="zy-table">
+          <div class="tBody zy-scroll">
+            <div class="addSites-box zy-scroll" v-show="showAddSite">
+              <ul>
+                <li >
+                  <span class="name">源名称</span>
+                  <span class="name">API接口</span>
+                  <span class="name">DOWNLOAD接口</span>
+                  <span class="operate">
+                    <span class="btn"></span>
+                    <span class="btn"></span>
+                  </span>
+                 </li>
+                 <li>
+                  <span class="name" style="display:inline-block;vertical-align:middle">
+                    <input style="height: 30px" v-model="newSite.name">
+                  </span>
+                  <span class="name" style="display:inline-block;vertical-align:middle">
+                    <input style="height: 30px" v-model="newSite.api">
+                  </span>
+                   <span class="name" style="display:inline-block;vertical-align:middle">
+                     <input style="height: 30px" v-model="newSite.download" placeholder="可以为空">
+                   </span>
+                  <span class="operate">
+                    <span class="btn" @click="addNewSite">添加</span>
+                    <span class="btn" @click="closeAddSite">关闭</span>
+                  </span>
+                 </li>
+                 <li ></li>
+               </ul>
+             </div>
+            <ul>
+              <draggable v-model="sites" @change="listUpdatedEvent">
+                <transition-group>
+                  <li v-for="(i, j) in sites" :key="j">
+                    <span class="name">{{i.name}}</span>
+                    <span class="operate">
+                      <span class="btn" @click.stop="removeEvent(i)">删除</span>
+                    </span>
+                  </li>
+                </transition-group>
+              </draggable>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapMutations } from 'vuex'
+import { sites } from '../lib/dexie'
+import draggable from 'vuedraggable'
+export default {
+  name: 'editSites',
+  data () {
+    return {
+      show: false,
+      sites: [],
+      showAddSite: false,
+      newSite: {
+        name: '',
+        api: '',
+        download: ''
+      }
+    }
+  },
+  components: {
+    draggable
+  },
+  computed: {
+    setting: {
+      get () {
+        return this.$store.getters.getSetting
+      },
+      set (val) {
+        this.SET_SETTING(val)
+      }
+    },
+    editSites: {
+      get () {
+        return this.$store.getters.getEditSites
+      },
+      set (val) {
+        this.SET_EDITSITES(val)
+      }
+    }
+  },
+  methods: {
+    ...mapMutations(['SET_SETTING', 'SET_EDITSITES']),
+    close () {
+      this.editSites.show = false
+    },
+    getSites () {
+      sites.all().then(res => {
+        this.sites = res
+      })
+    },
+    removeEvent (e) {
+      sites.remove(e.id).then(res => {
+        this.getSites()
+      }).catch(err => {
+        this.$message.warning('删除源失败, 错误信息: ' + err)
+      })
+    },
+    listUpdatedEvent () {
+      sites.clear().then(res1 => {
+        // 重新排序
+        var id = 1
+        this.sites.forEach(element => {
+          element.id = id
+          sites.add(element)
+          id += 1
+        })
+      })
+    },
+    openAddSite () {
+      this.showAddSite = true
+    },
+    closeAddSite () {
+      this.showAddSite = false
+    },
+    addNewSite () {
+      if (!this.newSite.name || !this.newSite.api) {
+        this.$message.error('名称和API接口不能为空。')
+        return
+      }
+      var randomstring = require('randomstring')
+      var doc = {
+        key: randomstring.generate(6),
+        id: this.sites[this.sites.length - 1].id + 1,
+        name: this.newSite.name,
+        api: this.newSite.api,
+        download: this.newSite.download
+      }
+      sites.add(doc).then(res => {
+        this.newSite = {
+          name: '',
+          api: '',
+          download: ''
+        }
+        this.$message.success('添加新源成功！')
+        this.getSites()
+      })
+    }
+  },
+  created () {
+    this.getSites()
+  }
+}
+
+</script>
+<style lang="scss" scoped>
+.detail{
+  position: absolute;
+  left: 80px;
+  right: 20px;
+  bottom: 0;
+  width: calc(100% - 100px);
+  height: calc(100% - 40px);
+  z-index: 888;
+  .detail-content{
+    height: calc(100% - 10px);
+    padding: 0 60px;
+    position: relative;
+    .detail-header{
+      width: 100%;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .detail-title{
+        font-size: 16px;
+      }
+      .detail-close{
+        cursor: pointer;
+      }
+    }
+  }
+  .detail-body{
+    height: calc(100% - 50px);
+    overflow-y: auto;
+  }
+}
+</style>
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -1,76 +1,106 @@
 <template>
  <div class="film">
-    <div class="top" v-if="top">
-      <!-- site -->
+    <div class="header">
      <div class="zy-select" @mouseleave="show.site = false">
        <div class="vs-placeholder" @click="show.site = true">{{site.name}}</div>
        <div class="vs-options" v-show="show.site">
-          <ul>
-            <li :class="site === j ? 'active' : ''" v-for="(i, j) in sites" :key="j" @click="siteClick(i)">{{ i.name }}</li>
+          <ul class="zy-scroll" style="max-height: 600px;">
+            <li :class="site.key === i.key ? 'active' : ''" v-for="i in sites" :key="i.key" @click="siteClick(i)">{{ i.name }}</li>
          </ul>
        </div>
      </div>
-      <!-- tags -->
-      <div class="zy-select" @mouseleave="show.tags = false" v-if="site.tags.length > 0 && keywords.length <= 0">
-        <div class="vs-placeholder" @click="show.tags = true">{{site.tags[tag].title}}</div>
-        <div class="vs-options" v-show="show.tags">
-          <ul>
-            <li :class="tag === j ? 'active' : ''" v-for="(i, j) in site.tags" :key="j" @click="tagClick(i, j)">{{ i.title }}</li>
+      <div class="zy-select" @mouseleave="show.classList = false" v-show="show.class">
+        <div class="vs-placeholder" @click="show.classList = true">{{type.name}}</div>
+        <div class="vs-options" v-show="show.classList">
+          <ul class="zy-scroll" style="max-height: 600px;">
+            <li :class="type.tid === i.tid ? 'active' : ''" v-for="i in classList" :key="i.tid" @click="classClick(i)">{{ i.name }}</li>
          </ul>
        </div>
      </div>
-      <!-- type -->
-      <div class="zy-select" @mouseleave="show.type = false" v-if="site.tags[tag].children.length > 0 && keywords.length <= 0">
-        <div class="vs-placeholder" @click="show.type = true">{{typeName}}</div>
-        <div class="vs-options" v-show="show.type">
-          <ul>
-            <li :class="type === j ? 'active' : ''" v-for="(i, j) in site.tags[tag].children" :key="j" @click="typeClick(i, j)">{{ i.title }}</li>
+      <div class="zy-select" @mouseleave="show.search = false">
+        <div class="vs-input" @click="show.search = true"><input v-model.trim="searchTxt" type="text" placeholder="搜索" @keyup.enter="searchEvent(searchTxt)"></div>
+        <div class="vs-options" v-show="show.search">
+          <ul class="zy-scroll" style="max-height: 600px">
+            <li v-for="(i, j) in searchList" :key="j" @click="searchEvent(i.keywords)">{{i.keywords}}</li>
+            <li v-show="searchList.length >= 1" @click="clearSearch">清空历史记录</li>
          </ul>
        </div>
      </div>
-      <div :class="[inputFocus ? 'active ': ''] + 'search'" @mouseover="inputFocus = true" @mouseleave="inputFocus = false">
-        <div class="search-icon">
-          <span class="zy-svg">
-            <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="searchIconTitle">
-              <title id="searchIconTitle">Search</title>
-              <path d="M14.4121122,14.4121122 L20,20"></path>
-              <circle cx="10" cy="10" r="6"></circle>
-            </svg>
-          </span>
-        </div>
-        <input type="text" class="search-box" v-model="keywords" @keypress.enter="searchEvent">
-      </div>
    </div>
-    <div class="middle">
-      <div class="zy-table">
-        <div class="tHead">
-          <span class="name">{{$t('videoName')}}</span>
-          <span class="type">{{$t('type')}}</span>
-          <span class="time">{{$t('time')}}</span>
-          <span class="operate">{{$t('operate')}}</span>
+    <div class="body zy-scroll" infinite-wrapper>
+      <div class="body-box" v-show="!show.find">
+        <div class="show-img" v-if="setting.view === 'picture'">
+          <Waterfall ref="waterfall" :list="list" :gutter="20" :width="240"
+          :breakpoints="{ 1200: { rowPerView: 4 } }"
+          animationEffect="fadeInUp"
+          backgroundColor="rgba(0, 0, 0, 0)">
+            <template slot="item" slot-scope="props">
+              <div class="card" v-show="!setting.excludeR18Films || !containsR18Keywords(props.data.type)">
+                <div class="img">
+                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(site, props.data)">
+                  <div class="operate">
+                    <div class="operate-wrap">
+                      <span class="o-play" @click="playEvent(site, props.data)">播放</span>
+                      <span class="o-star" @click="starEvent(site, props.data)">收藏</span>
+                      <span class="o-share" @click="shareEvent(site, props.data)">分享</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="name" @click="detailEvent(site, props.data)">{{props.data.name}}</div>
+                <div class="info">
+                  <span>{{props.data.year}}</span>
+                  <span>{{props.data.note}}</span>
+                  <span>{{props.data.type}}</span>
+                </div>
+              </div>
+            </template>
+          </Waterfall>
+          <infinite-loading force-use-infinite-wrapper :identifier="infiniteId" @infinite="infiniteHandler"></infinite-loading>
        </div>
-        <div class="tBody zy-scroll">
-          <ul v-show="!tb.loading">
-            <li v-for="(i, j) in tb.list" :key="j" @click="detailEvent(i)">
-              <span class="name">{{i.name}}</span>
-              <span class="type">{{i.type}}</span>
-              <span class="time">{{i.time}}</span>
-              <span class="operate">
-                <span class="btn" @click.stop="playEvent(i)">{{$t('play')}}</span>
-                <span class="btn" @click.stop="starEvent(i)">{{$t('star')}}</span>
-                <span class="btn" @click.stop="shareEvent(i)">{{$t('share')}}</span>
-                <span class="btn" @click.stop="downloadEvent(i)">{{$t('download')}}</span>
-              </span>
-            </li>
-          </ul>
-          <div class="tBody-mask zy-loading" v-show="tb.loading">
-            <div class="loader"></div>
+        <div class="show-table" v-if="setting.view === 'table'">
+          <div class="zy-table">
+            <div class="tBody">
+              <ul>
+                <li v-for="(i, j) in list" :key="j" @click="detailEvent(site, i)" v-show="!setting.excludeR18Films || !containsR18Keywords(i.type)">
+                  <span class="name">{{i.name}}</span>
+                  <span class="type">{{i.type}}</span>
+                  <span class="time">{{i.year}}</span>
+                  <span class="time">{{i.note}}</span>
+                  <span class="last">{{i.last}}</span>
+                  <span class="operate">
+                    <span class="btn" @click.stop="playEvent(site, i)">播放</span>
+                    <span class="btn" @click.stop="starEvent(site, i)">收藏</span>
+                    <span class="btn" @click.stop="shareEvent(site, i)">分享</span>
+                    <span class="btn" @click.stop="downloadEvent(site, i)">下载</span>
+                  </span>
+                </li>
+              </ul>
+              <infinite-loading force-use-infinite-wrapper="tBody" :identifier="infiniteId" @infinite="infiniteHandler"></infinite-loading>
+            </div>
          </div>
        </div>
-        <div class="tFooter">
-          <span class="tFooter-span">今日更新: {{ tb.update }} 条</span>
-          <span class="tFooter-span btn" @click="goWebsite">加载不出来,点这里</span>
-          <el-pagination small :page-size="tb.size" :total="tb.total" :current-page="tb.page" @current-change="tbPageChange" layout="total, prev, pager, next, jumper"></el-pagination>
+      </div>
+      <div class="body-box" v-show="show.find">
+        <div class="show-table">
+          <div class="zy-table">
+            <div class="tBody zy-scroll">
+              <ul>
+                <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i.site, i)">
+                  <span class="name">{{i.name}}</span>
+                  <span class="type">{{i.type}}</span>
+                  <span class="last">{{i.last}}</span>
+                  <span class="site">{{i.site.name}}</span>
+                  <span class="note">{{i.note}}</span>
+                  <span class="operate">
+                    <span class="btn" @click.stop="playEvent(i.site, i)">播放</span>
+                    <span class="btn" @click.stop="starEvent(i.site, i)">收藏</span>
+                    <span class="btn" @click.stop="shareEvent(i.site, i)">分享</span>
+                    <span class="btn" @click.stop="downloadEvent(i.site, i)">下载</span>
+                  </span>
+                </li>
+              </ul>
+            </div>
+          </div>
        </div>
      </div>
    </div>
@@ -78,40 +108,43 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { sites, getSite } from '../lib/site/sites'
-import tools from '../lib/site/tools'
-import video from '../lib/dexie/video'
-import setting from '../lib/dexie/setting'
-import { shell } from 'electron'
+import { star, history, search, sites } from '../lib/dexie'
+import zy from '../lib/site/tools'
+import Waterfall from 'vue-waterfall-plugin'
+import InfiniteLoading from 'vue-infinite-loading'
 const { clipboard } = require('electron')
 export default {
  name: 'film',
  data () {
    return {
-      sites: sites,
-      site: {},
-      top: false,
-      tag: 0,
-      type: 0,
-      typeName: '',
-      keywords: '',
-      id: '',
      show: {
+        body: false,
        site: false,
-        tags: false,
-        type: false
+        class: false,
+        classList: false,
+        search: false,
+        img: true,
+        table: false,
+        find: false
      },
-      inputFocus: false,
-      tb: {
-        list: [],
-        page: 1,
-        size: 50,
-        total: 0,
-        update: 0,
-        loading: true
-      }
+      sites: [],
+      site: {},
+      classList: [],
+      type: {},
+      pagecount: 0,
+      list: [],
+      infiniteId: +new Date(),
+      searchList: [],
+      searchTxt: '',
+      searchContents: [],
+      // 福利片关键词
+      r18KeyWords: ['伦理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番']
    }
  },
+  components: {
+    Waterfall,
+    InfiniteLoading
+  },
  computed: {
    view: {
      get () {
@@ -121,12 +154,12 @@ export default {
        this.SET_VIEW(val)
      }
    },
-    gSite: {
+    video: {
      get () {
-        return this.$store.getters.getSite
+        return this.$store.getters.getVideo
      },
      set (val) {
-        this.SET_SITE(val)
+        this.SET_VIDEO(val)
      }
    },
    detail: {
@@ -137,14 +170,6 @@ export default {
        this.SET_DETAIL(val)
      }
    },
-    video: {
-      get () {
-        return this.$store.getters.getVideo
-      },
-      set (val) {
-        this.SET_VIDEO(val)
-      }
-    },
    share: {
      get () {
        return this.$store.getters.getShare
@@ -152,160 +177,327 @@ export default {
      set (val) {
        this.SET_SHARE(val)
      }
+    },
+    setting () {
+      return this.$store.getters.getSetting
    }
  },
  watch: {
-    gSite (n, o) {
-      const s = getSite(n)
-      this.siteClick(s)
+    view () {
+      this.changeView()
+    },
+    searchTxt () {
+      this.searchChangeEvent()
+    },
+    'setting.sitesList': {
+      handler (nv) {
+        this.getAllsites()
+      },
+      deep: true
+    },
+    '$store.state.editSites.sites': function () {
+      this.getAllsites()
    }
  },
  methods: {
-    ...mapMutations(['SET_VIEW', 'SET_SITE', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
-    init () {
-      setting.find().then(res => {
-        this.site = getSite(res.site)
-        this.top = true
-        tools.film_get(res.site).then(tRes => {
-          this.tb.list = tRes.list
-          this.tb.total = tRes.total
-          this.tb.update = tRes.update
-          this.tb.loading = false
-        })
-      })
-    },
+    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
    siteClick (e) {
+      this.list = []
      this.site = e
-      this.tag = 0
-      this.id = e.tags[0].id
      this.show.site = false
-      if (this.keywords.length > 0) {
-        this.searchEvent()
+      this.show.class = false
+      if (this.searchTxt.length > 0) {
+        this.searchSingleSiteEvent(this.site, this.searchTxt)
      } else {
-        this.tb.update = 0
-        this.tb.total = 0
-        this.tb.loading = true
-        tools.film_get(e.key, this.id).then(res => {
-          this.tb.list = res.list
-          this.tb.total = res.total
-          this.tb.update = res.update
-          this.tb.loading = false
+        this.classList = []
+        this.type = {}
+        this.getClass().then(res => {
+          if (res) {
+            this.show.class = true
+            this.infiniteId += 1
+          }
        })
      }
    },
-    tagClick (e, n) {
-      this.tb.update = 0
-      this.tb.total = 0
-      this.tag = n
-      this.id = e.id
-      this.typeName = 'All'
-      this.tb.loading = true
-      this.show.tags = false
-      tools.film_get(this.site.key, this.id).then(res => {
-        this.tb.list = res.list
-        this.tb.total = res.total
-        this.tb.update = res.update
-        this.tb.loading = false
+    classClick (e) {
+      this.show.classList = false
+      this.list = []
+      this.type = e
+      this.getPage().then(res => {
+        if (res) {
+          this.infiniteId += 1
+        }
      })
    },
-    typeClick (e, n) {
-      this.tb.update = 0
-      this.tb.total = 0
-      this.type = n
-      this.typeName = e.title
-      this.id = e.id
-      this.tb.loading = true
-      this.show.type = false
-      tools.film_get(this.site.key, this.id).then(res => {
-        this.tb.list = res.list
-        this.tb.total = res.total
-        this.tb.update = res.update
-        this.tb.loading = false
+    getClass () {
+      return new Promise((resolve, reject) => {
+        const key = this.site.key
+        // 屏蔽主分类
+        const classToHide = ['电影', '电影片', '电视剧', '连续剧', '综艺', '动漫']
+        zy.class(key).then(res => {
+          var allClass = [{ name: '最新', tid: 0 }]
+          res.class.forEach(element => {
+            if (!classToHide.includes(element.name)) {
+              if (this.setting.excludeR18Films) {
+                const containKeyWord = this.containsR18Keywords(element.name)
+                if (!containKeyWord) {
+                  allClass.push(element)
+                }
+              } else {
+                allClass.push(element)
+              }
+            }
+          })
+          this.classList = allClass
+          this.show.class = true
+          this.pagecount = res.pagecount
+          this.type = this.classList[0]
+          resolve(true)
+        }).catch(err => {
+          reject(err)
+        })
      })
    },
-    searchEvent () {
-      const flag = this.site.search
-      if (flag === '') {
-        this.$m.warning(this.$t('not_support_search'))
+    containsR18Keywords (name) {
+      var containKeyWord = false
+      if (!name) {
+        return containKeyWord
+      }
+      return this.r18KeyWords.some(v => name.includes(v))
+    },
+    getPage () {
+      return new Promise((resolve, reject) => {
+        const key = this.site.key
+        const type = this.type.tid
+        zy.page(key, type).then(res => {
+          this.pagecount = res.pagecount
+          this.show.body = true
+          resolve(true)
+        }).catch(err => {
+          reject(err)
+        })
+      })
+    },
+    infiniteHandler ($state) {
+      const key = this.site.key
+      const type = this.type.tid
+      const page = this.pagecount
+      if (page < 1) {
+        $state.complete()
        return false
      }
-      this.tb.loading = true
-      this.tb.update = 0
-      this.tb.total = 0
-      tools.search_get(this.site.key, this.keywords).then(res => {
-        this.tb.list = res.list
-        this.tb.total = res.total
-        this.tb.loading = false
+      zy.list(key, page, type).then(res => {
+        if (res) {
+          this.pagecount -= 1
+          const type = Object.prototype.toString.call(res)
+          if (type === '[object Undefined]') {
+            $state.complete()
+          }
+          if (type === '[object Array]') {
+            // zy.list 返回的是按时间从旧到新排列, 我门需要翻转为从新到旧
+            this.list.push(...res.reverse())
+          }
+          if (type === '[object Object]') {
+            this.list.push(res)
+          }
+          $state.loaded()
+        } else {
+          $state.complete()
+        }
      })
    },
-    detailEvent (e) {
+    detailEvent (site, e) {
      this.detail = {
        show: true,
-        v: e
+        key: site.key,
+        site: site,
+        info: e
      }
    },
-    playEvent (e) {
-      this.video = e
+    playEvent (site, e) {
+      history.find({ site: site.key, ids: e.id }).then(res => {
+        if (res) {
+          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index, site: site } }
+        } else {
+          this.video = { key: site.key, info: { id: e.id, name: e.name, index: 0, site: site } }
+        }
+      })
      this.view = 'Play'
    },
-    starEvent (e) {
-      video.find({ detail: e.detail }).then(res => {
+    starEvent (site, e) {
+      star.find({ key: site.key, ids: e.id }).then(res => {
        if (res) {
-          this.$m.warning(this.$t('exists'))
+          this.$message.info('已存在')
        } else {
-          video.add(e).then(res => {
-            this.$m.success(this.$t('star_success'))
+          const docs = {
+            key: site.key,
+            ids: e.id,
+            name: e.name,
+            type: e.type,
+            year: e.year,
+            last: e.last,
+            note: e.note
+          }
+          star.add(docs).then(res => {
+            this.$message.success('收藏成功')
          })
        }
+      }).catch(() => {
+        this.$message.warning('收藏失败')
      })
    },
-    shareEvent (e) {
+    shareEvent (site, e) {
      this.share = {
        show: true,
-        v: e
+        key: site.key,
+        info: e
      }
    },
-    downloadEvent (e) {
-      tools.detail_get(e.site, e.detail).then(res => {
-        if (res.mp4_urls.length > 0) {
-          const urls = [...res.mp4_urls]
-          let txt = `${e.name}\n`
-          for (const i of urls) {
-            const name = i.split('$')[0]
-            const url = encodeURI(i.split('$')[1])
-            txt += (name + ': ' + url + '\n')
+    downloadEvent (site, e) {
+      zy.download(site.key, e.id).then(res => {
+        if (res && res.length > 0 && res.dl && res.dl.dd) {
+          const text = res.dl.dd._t
+          if (text) {
+            const list = text.split('#')
+            let downloadUrl = res.name + '\n'
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『MP4』格式的链接已复制, 快去下载吧!')
+          } else {
+            this.$message.warning('没有查询到下载链接.')
          }
-          clipboard.writeText(txt)
-          this.$m.success('〖MP4〗: ' + this.$t('copy_success'))
-          return false
-        }
-        if (res.m3u8_urls.length > 0) {
-          const urls = [...res.m3u8_urls]
-          let txt = `${e.name}\n`
-          for (const i of urls) {
-            const name = i.split('$')[0]
-            const url = encodeURI(i.split('$')[1])
-            txt += (name + ': ' + url + '\n')
+        } else {
+          let m3u8List = []
+          const dd = res.dl.dd
+          const type = Object.prototype.toString.call(dd)
+          if (type === '[object Array]') {
+            for (const i of dd) {
+              if (i._flag.indexOf('m3u8') >= 0) {
+                m3u8List = i._t.split('#')
+              }
+            }
+          } else {
+            m3u8List = dd._t.split('#')
          }
-          clipboard.writeText(txt)
-          this.$m.success('〖M3U8〗: ' + this.$t('copy_success'))
+          let downloadUrl = e.name + '\n'
+          for (const i of m3u8List) {
+            const url = encodeURI(i.split('$')[1])
+            downloadUrl += (url + '\n')
+          }
+          clipboard.writeText(downloadUrl)
+          this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
        }
      })
    },
-    tbPageChange (e) {
-      this.tb.loading = true
-      this.tb.page = e
-      tools.film_get(this.site.key, this.id, this.tb.page).then(res => {
-        this.tb.list = res.list
-        this.tb.loading = false
+    changeView () {
+      if (this.view === 'Film') {
+        if (this.show.img) {
+          this.$refs.waterfall.refresh()
+        }
+        this.getPage().then(() => {
+          this.infiniteId += 1
+          if (this.show.img || this.show.table) {
+          }
+        })
+      }
+    },
+    getAllSearch () {
+      search.all().then(res => {
+        this.searchList = res.reverse()
      })
    },
-    goWebsite () {
-      shell.openExternal(this.site.url)
+    searchAllSitesEvent (sites, wd) {
+      this.searchTxt = wd
+      this.searchContents = []
+      this.pagecount = 0
+      this.show.search = false
+      this.show.find = true
+      if (wd) {
+        search.find({ keywords: wd }).then(res => {
+          if (!res) {
+            search.add({ keywords: wd })
+          }
+          this.getAllSearch()
+        })
+        sites.forEach(site => {
+          zy.search(site.key, wd).then(res => {
+            const type = Object.prototype.toString.call(res)
+            if (type === '[object Array]') {
+              res.forEach(element => {
+                element.site = site
+                this.searchContents.push(element)
+              })
+            }
+            if (type === '[object Object]') {
+              res.site = site
+              this.searchContents.push(res)
+            }
+          })
+        })
+      } else {
+        this.show.find = false
+        this.getClass().then(res => {
+          if (res) {
+            this.infiniteId += 1
+          }
+        })
+      }
+    },
+    searchEvent (wd) {
+      if (this.setting.searchAllSites) {
+        this.searchAllSitesEvent(this.sites, wd)
+      } else {
+        this.searchSingleSiteEvent(this.site, wd)
+      }
+    },
+    searchSingleSiteEvent (site, wd) {
+      var sites = []
+      sites.push(this.site)
+      this.searchAllSitesEvent(sites, wd)
+    },
+    clearSearch () {
+      search.clear().then(res => {
+        this.getAllSearch()
+      })
+    },
+    searchChangeEvent () {
+      if (this.searchTxt.length >= 1) {
+        this.show.class = false
+      } else {
+        this.show.class = true
+        this.searchContents = []
+        this.show.find = false
+        if (this.show.img) {
+          this.$refs.waterfall.refresh()
+        }
+      }
+    },
+    getAllsites (nv) {
+      if (nv) {
+        sites.all().then(res => {
+          this.sites = res
+          for (const i of res) {
+            if (i.key === nv) {
+              this.site = i
+              this.siteClick(this.site)
+              return false
+            }
+          }
+        })
+      } else {
+        sites.all().then(res => {
+          this.sites = res
+          this.site = this.sites[0]
+          this.siteClick(this.site)
+        })
+      }
    }
  },
  created () {
-    this.init()
+    this.getAllSearch()
  }
 }
 </script>
@@ -315,53 +507,98 @@ export default {
  width: 100%;
  display: flex;
  flex-direction: column;
-  animation: viewFadeIn 1s ease-in both;
-  .top{
-    width: 100%;
+  .header{
    height: 30px;
+    width: 100%;
    display: flex;
-    justify-content: space-between;
    align-items: center;
-    .search{
-      width: 200px;
-      height: 30px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      border-radius: 15px;
-      svg{
-        width: 20px;
-        height: 20px;
-        stroke-linecap: round;
-        stroke-linejoin: round;
-      }
-      .search-icon{
-        width: 40px;
-        height: 30px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-      .search-box{
-        width: 160px;
-        height: 30px;
-        border-radius: 20px;
-        border: none;
-        text-indent: 2px;
-        font-size: 14px;
-        &:focus{
-          outline: none;
-          border: none;
+    justify-content: space-between;
+    z-index: 10;
+  }
+  .body{
+    margin-top: 20px;
+    flex: 1;
+    width: 100%;
+    border-radius: 0 0 5px 5px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar{
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      position: absolute;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      position: absolute;
+    }
+    .body-box{
+      height: 100%;
+      width: 100%;
+    }
+    .show-img{
+      height: 100%;
+      width: 100%;
+      padding: 10px;
+      .card{
+        border-radius: 6px;
+        overflow: hidden;
+        .img{
+          position: relative;
+          min-height: 40px;
+          img{
+            width: 100%;
+            height: auto;
+            cursor: pointer;
+          }
+          .operate{
+            display: none;
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            background-color: #111111aa;
+            width: 100%;
+            font-size: 13px;
+            .operate-wrap{
+              display: flex;
+              justify-content: space-between;
+              .o-play, .o-star, .o-share{
+                cursor: pointer;
+                display: inline-block;
+                width: 80px;
+                height: 36px;
+                text-align: center;
+                line-height: 36px;
+                color: #cdcdcd;
+                &:hover{
+                  background-color: #111;
+                }
+              }
+            }
+          }
+        }
+        .name{
+          font-size: 16px;
+          padding: 10px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          cursor: pointer;
+        }
+        .info{
+          display: flex;
+          justify-content: space-between;
+          font-size: 12px;
+          padding: 10px;
+        }
+        &:hover{
+          .operate{
+            display: block;
+          }
        }
      }
    }
  }
-  .middle{
-    height: calc(100% - 40px);
-    width: 100%;
-    margin-top: 10px;
-    padding-bottom: 0px;
-    border-radius: 5px;
-  }
 }
 </style>
--- a/src/components/Frame.vue
+++ b/src/components/Frame.vue
@@ -1,16 +1,45 @@
 <template>
  <div class="frame">
-    <span class="min" @click="frameClickEvent('min')"></span>
-    <span class="close" @click="frameClickEvent('close')"></span>
+    <span class="top" @click="frameClickEvent('top')" title="置顶">
+      <svg t="1595919317571" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1188" style="width:10px;height:14px"><path d="M43.072 974.72l380.864-301.952 151.936 161.6c0 0 63.424 17.28 67.328-30.72l-3.904-163.584 225.088-259.648 98.048-5.696c0 0 76.928-15.488 21.184-82.752l-275.072-276.928c0 0-74.944-9.6-69.248 59.584l0 75.008L383.552 367.104 225.856 376.64c0 0-57.728 19.2-36.608 69.248l148.16 146.176L43.072 974.72 43.072 974.72z" p-id="1189" :fill="isAlwaysOnTop ? '#555555' : '#ffffff'"></path></svg>
+    </span>
+    <span class="min" @click="frameClickEvent('min')" title="最小化">
+      <svg t="1595917239849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1155" style="width:8px;height:14px"><path d="M0 479.936C0 444.64 28.448 416 64.064 416L959.936 416C995.328 416 1024 444.736 1024 479.936L1024 544.064C1024 579.392 995.552 608 959.936 608L64.064 608C28.672 608 0 579.264 0 544.064L0 479.936Z" p-id="1156" fill="#ffffff"></path></svg>
+    </span>
+    <span class="max" @click="frameClickEvent('max')" title="最大化">
+      <svg t="1595917343956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1540" style="width:8px;height:14px"><path d="M416 416 64.064 416C28.448 416 0 444.64 0 479.936L0 544.064C0 579.264 28.672 608 64.064 608L416 608 416 959.936C416 995.552 444.64 1024 479.936 1024L544.064 1024C579.264 1024 608 995.328 608 959.936L608 608 959.936 608C995.552 608 1024 579.36 1024 544.064L1024 479.936C1024 444.736 995.328 416 959.936 416L608 416 608 64.064C608 28.448 579.36 0 544.064 0L479.936 0C444.736 0 416 28.672 416 64.064L416 416Z" p-id="1541" fill="#ffffff"></path></svg>
+    </span>
+    <span class="close" @click="frameClickEvent('close')" title="关闭">
+      <svg t="1595917372551" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1685" style="width:8px;height:14px"><path d="M511.968 376.224 796.096 92.096C833.536 54.624 894.4 54.624 931.84 92.096 969.312 129.568 969.312 190.4 931.84 227.872L647.744 512 931.84 796.096C969.312 833.568 969.312 894.4 931.84 931.872 894.4 969.344 833.536 969.344 796.096 931.872L511.968 647.744 227.84 931.872C190.4 969.344 129.536 969.344 92.096 931.872 54.624 894.4 54.624 833.568 92.096 796.096L376.224 512 92.096 227.872C54.624 190.4 54.624 129.568 92.096 92.096 129.536 54.624 190.4 54.624 227.84 92.096L511.968 376.224Z" p-id="1686" fill="#ffffff"></path></svg>
+    </span>
  </div>
 </template>
 <script>
-const ipc = require('electron').ipcRenderer
+const { remote } = require('electron')
 export default {
  name: 'frame',
+  data () {
+    const win = remote.getCurrentWindow()
+    return {
+      isAlwaysOnTop: win.isAlwaysOnTop()
+    }
+  },
  methods: {
    frameClickEvent (e) {
-      ipc.send(e)
+      const win = remote.getCurrentWindow()
+      if (e === 'min') {
+        win.minimize()
+      }
+      if (e === 'max') {
+        win.isMaximized() ? win.unmaximize() : win.maximize()
+      }
+      if (e === 'close') {
+        win.destroy()
+      }
+      if (e === 'top') {
+        this.isAlwaysOnTop = !this.isAlwaysOnTop
+        win.setAlwaysOnTop(this.isAlwaysOnTop)
+      }
    }
  }
 }
@@ -20,46 +49,20 @@ export default {
  width: 100%;
  height: 40px;
  display: flex;
-  justify-content: flex-end;
-  align-items: center;
  user-select: none;
+  align-items: center;
+  justify-content: flex-end;
  -webkit-app-region: drag;
  span{
-    -webkit-app-region: no-drag;
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    margin-left: 10px;
+    width: 14px;
+    height: 14px;
    cursor: pointer;
-    opacity: 0.5;
-    &:hover{
-      animation: heartbeat 3s ease-in-out infinite both;
-    }
-    @keyframes heartbeat {
-      from {
-        transform: scale(1);
-        transform-origin: center center;
-        animation-timing-function: ease-out;
-      }
-      10% {
-        opacity: 1;
-        transform: scale(0.91);
-        animation-timing-function: ease-in;
-      }
-      17% {
-        transform: scale(0.98);
-        animation-timing-function: ease-out;
-      }
-      33% {
-        transform: scale(0.87);
-        animation-timing-function: ease-in;
-      }
-      45% {
-        transform: scale(1);
-        animation-timing-function: ease-out;
-      }
-    }
+    margin-left: 10px;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 14px;
+    display: inline-block;
+    -webkit-app-region: no-drag;
  }
 }
 </style>
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="history">
+    <div class="body zy-scroll">
+      <div class="zy-table">
+        <div class="tHeader">
+          <span class="btn"></span>
+          <span class="btn" @click="clearAllHistory">清空</span>
+        </div>
+        <div class="tBody zy-scroll">
+          <ul>
+            <li v-show="this.history.length === 0">无数据</li>
+            <li v-show="this.history.length > 0">
+              <span class="name">名字</span>
+              <span class="site">片源</span>
+              <span class="note">观看至</span>
+              <span class="operate">
+                <span class="btn"></span>
+                <span class="btn"></span>
+                <span class="btn"></span>
+                <span class="btn"></span>
+              </span>
+            </li>
+            <li v-for="(i, j) in history" :key="j" @click="historyItemEvent(i)">
+              <span class="name" @click.stop="detailEvent(i)">{{i.name}}</span>
+              <span class="site">{{getSiteName(i.site)}}</span>
+              <span class="note">第{{i.index+1}}集</span>
+              <span class="operate">
+                <span class="btn" @click.stop="playEvent(i)">播放</span>
+                <span class="btn" @click.stop="shareEvent(i)">分享</span>
+                <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                <span class="btn" @click.stop="removeHistoryItem(i)">删除</span>
+              </span>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapMutations } from 'vuex'
+import { history, sites } from '../lib/dexie'
+import zy from '../lib/site/tools'
+const { clipboard } = require('electron')
+export default {
+  name: 'history',
+  data () {
+    return {
+      history: history,
+      sites: []
+    }
+  },
+  computed: {
+    view: {
+      get () {
+        return this.$store.getters.getView
+      },
+      set (val) {
+        this.SET_VIEW(val)
+      }
+    },
+    video: {
+      get () {
+        return this.$store.getters.getVideo
+      },
+      set (val) {
+        this.SET_VIDEO(val)
+      }
+    },
+    detail: {
+      get () {
+        return this.$store.getters.getDetail
+      },
+      set (val) {
+        this.SET_DETAIL(val)
+      }
+    },
+    share: {
+      get () {
+        return this.$store.getters.getShare
+      },
+      set (val) {
+        this.SET_SHARE(val)
+      }
+    }
+  },
+  watch: {
+    view () {
+      this.getAllhistory()
+      this.getAllsites()
+    }
+  },
+  methods: {
+    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    detailEvent (e) {
+      this.detail = {
+        show: true,
+        key: e.site,
+        info: {
+          id: e.ids,
+          name: e.name
+        }
+      }
+    },
+    playEvent (e) {
+      history.find({ site: e.site, ids: e.ids }).then(res => {
+        if (res) {
+          this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index } }
+        } else {
+          this.video = { key: e.site, info: { id: e.ids, name: e.name, index: 0 } }
+        }
+      })
+      this.view = 'Play'
+    },
+    shareEvent (e) {
+      this.share = {
+        show: true,
+        key: e.site,
+        info: e
+      }
+    },
+    downloadEvent (e) {
+      zy.download(e.site, e.ids).then(res => {
+        if (res && res.dl && res.dl.dd) {
+          const text = res.dl.dd._t
+          if (text) {
+            const list = text.split('#')
+            let downloadUrl = ''
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『MP4』格式的链接已复制, 快去下载吧!')
+          } else {
+            this.$message.warning('没有查询到下载链接.')
+          }
+        } else {
+          var m3u8List = {}
+          zy.detail(e.site, e.ids).then(res => {
+            const dd = res.dl.dd
+            const type = Object.prototype.toString.call(dd)
+            if (type === '[object Array]') {
+              for (const i of dd) {
+                if (i._flag.indexOf('m3u8') >= 0) {
+                  m3u8List = i._t.split('#')
+                }
+              }
+            } else {
+              m3u8List = dd._t.split('#')
+            }
+            const list = [...m3u8List]
+            let downloadUrl = ''
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
+          })
+        }
+      })
+    },
+    clearAllHistory () {
+      history.clear().then(res => {
+        this.history = []
+      })
+    },
+    getAllhistory () {
+      history.all().then(res => {
+        this.history = res.reverse()
+      })
+    },
+    getAllsites () {
+      sites.all().then(res => {
+        this.sites = res
+      })
+    },
+    getSiteName (key) {
+      var site = this.sites.find(e => e.key === key)
+      if (site) {
+        return site.name
+      }
+    },
+    historyItemEvent (e) {
+      this.video = {
+        key: e.site,
+        info: {
+          id: e.ids,
+          name: e.name,
+          type: e.type,
+          year: e.year,
+          index: e.index,
+          time: e.time
+        }
+      }
+    },
+    removeHistoryItem (e) {
+      history.remove(e.id).then(res => {
+        this.getAllhistory()
+      }).catch(err => {
+        this.$message.warning('删除历史记录失败, 错误信息: ' + err)
+      })
+    }
+  },
+  created () {
+    this.getAllhistory()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.history{
+  position: relative;
+  height: calc(100% - 40px);
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+  .body{
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="detail">
+    <div class="detail-content">
+      <div class="detail-header">
+        <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="openAddSite">添加新频道</div>
+        </div>
+        <div class="zy-select">
+          <div class="vs-placeholder vs-noAfter" @click="exportSites">导出</div>
+        </div>
+        <div class="zy-select">
+          <div class="vs-placeholder vs-noAfter" @click="importSites">导入</div>
+        </div>
+        <div class="zy-select">
+          <div class="vs-placeholder vs-noAfter" @click="resetSites">重置</div>
+        </div>
+      </div>
+      <div class="detail-body zy-scroll">
+        <div class="zy-table">
+          <div class="tBody zy-scroll">
+            <div class="iptv-box zy-scroll" v-show="showAddSite">
+              <ul>
+                <li >
+                  <span class="name">频道名</span>
+                  <span class="name">Url</span>
+                  <span class="operate">
+                    <span class="btn"></span>
+                    <span class="btn"></span>
+                  </span>
+                 </li>
+                 <li>
+                  <span class="name" style="display:inline-block;vertical-align:middle">
+                    <input style="height: 30px" v-model="newSite.name">
+                  </span>
+                  <span class="name" style="display:inline-block;vertical-align:middle">
+                    <input style="height: 30px" v-model="newSite.url">
+                  </span>
+                  <span class="operate">
+                    <span class="btn" @click="addNewSite">添加</span>
+                    <span class="btn" @click="closeAddSite">关闭</span>
+                  </span>
+                 </li>
+                 <li ></li>
+               </ul>
+             </div>
+            <ul>
+              <draggable v-model="iptvList" @change="listUpdatedEvent">
+                <transition-group>
+                  <li v-for="(i, j) in iptvList" :key="j" @click.stop="playEvent(i)">
+                    <span class="name">{{i.name}}</span>
+                    <span class="operate">
+                      <span class="btn" @click.stop="playEvent(i)">播放</span>
+                      <span class="btn" @click.stop="removeEvent(i)">删除</span>
+                    </span>
+                  </li>
+                </transition-group>
+              </draggable>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapMutations } from 'vuex'
+import { iptv } from '../lib/dexie'
+import draggable from 'vuedraggable'
+import { iptv as defaultSites } from '../lib/dexie/initData'
+import { remote } from 'electron'
+import fs from 'fs'
+export default {
+  name: 'iptv',
+  data () {
+    return {
+      iptvList: [],
+      showAddSite: false,
+      newSite:
+      {
+        name: '',
+        site: ''
+      }
+    }
+  },
+  components: {
+    draggable
+  },
+  computed: {
+    view: {
+      get () {
+        return this.$store.getters.getView
+      },
+      set (val) {
+        this.SET_VIEW(val)
+      }
+    },
+    setting () {
+      return this.$store.getters.getSetting
+    },
+    video: {
+      get () {
+        return this.$store.getters.getVideo
+      },
+      set (val) {
+        this.SET_VIDEO(val)
+      }
+    }
+  },
+  watch: {
+    view () {
+      this.getAllSites()
+    }
+  },
+  methods: {
+    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    playEvent (e) {
+      this.video = { info: { url: e.url } }
+      this.view = 'Play'
+    },
+    removeEvent (e) {
+      iptv.remove(e.id).then(res => {
+        this.getAllSites()
+      }).catch(err => {
+        this.$message.warning('删除频道失败, 错误信息: ' + err)
+      })
+    },
+    closeAddSite () {
+      this.showAddSite = false
+    },
+    openAddSite () {
+      this.showAddSite = true
+    },
+    addNewSite () {
+      if (!this.newSite.name || !this.newSite.url) {
+        this.$message.error('名称和API接口不能为空。')
+        return
+      }
+      var doc = {
+        name: this.newSite.name,
+        url: this.newSite.url
+      }
+      iptv.add(doc).then(res => {
+        this.newSite = {
+          name: '',
+          url: ''
+        }
+        this.$message.success('添加新源成功！')
+        this.getAllSites()
+      })
+    },
+    listUpdatedEvent () {
+      iptv.clear().then(res1 => {
+        // 重新排序
+        var id = 1
+        this.iptvList.forEach(element => {
+          element.id = id
+          iptv.add(element)
+          id += 1
+        })
+      })
+    },
+    exportSites () {
+      this.getAllSites()
+      const arr = [...this.iptvList]
+      const str = JSON.stringify(arr, null, 4)
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ]
+      }
+      remote.dialog.showSaveDialog(options).then(result => {
+        if (!result.canceled) {
+          fs.writeFileSync(result.filePath, str)
+          this.$message.success('已保存成功')
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    importSites () {
+      const options = {
+        filters: [
+          { name: 'm3u file', extensions: ['m3u'] },
+          { name: 'JSON file', extensions: ['json'] }
+        ],
+        properties: ['openFile']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          result.filePaths.forEach(file => {
+            if (file.endsWith('json')) {
+              var str = fs.readFileSync(file)
+              const json = JSON.parse(str)
+              iptv.clear().then(res => {
+                iptv.bulkAdd(json).then(e => {
+                  this.getAllSites()
+                  this.$message.success('导入成功')
+                })
+              })
+            } else if (file.endsWith('m3u')) {
+              const parser = require('iptv-playlist-parser')
+              const playlist = fs.readFileSync(file, { encoding: 'utf-8' })
+              const result = parser.parse(playlist)
+              var docs = []
+              result.items.forEach(ele => {
+                if (ele.name && ele.url && ele.url.endsWith('m3u8')) {
+                  var doc = {
+                    name: ele.name,
+                    url: ele.url
+                  }
+                  docs.push(doc)
+                }
+              })
+              if (docs) {
+                iptv.clear().then(res => {
+                  iptv.bulkAdd(docs).then(e => {
+                    this.getAllSites()
+                    this.$message.success('导入成功')
+                  })
+                })
+              } else {
+                this.$message.error('m3u文件没有读取到可用源数据')
+              }
+            }
+          })
+        }
+      })
+    },
+    resetSites () {
+      iptv.clear()
+      iptv.bulkAdd(defaultSites).then(e => {
+        this.getAllSites()
+        this.$message.success('重置成功')
+      })
+    },
+    getAllSites () {
+      iptv.all().then(res => {
+        this.iptvList = res
+      })
+    }
+  },
+  created () {
+    this.getAllSites()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail{
+  position: absolute;
+  left: 80px;
+  right: 20px;
+  bottom: 0;
+  width: calc(100% - 100px);
+  height: calc(100% - 40px);
+  z-index: 888;
+  .detail-content{
+    height: calc(100% - 10px);
+    padding: 0 60px;
+    position: relative;
+    .detail-header{
+      width: 100%;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .detail-title{
+        font-size: 16px;
+      }
+      .detail-close{
+        cursor: pointer;
+      }
+    }
+  }
+  .detail-body{
+    height: calc(100% - 50px);
+    overflow-y: auto;
+  }
+}
+</style>
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -1,31 +1,97 @@
 <template>
  <div class="setting">
-    <div class="setting-box zy-scroll" v-if="show.setting">
-      <div class="logo"><img src="@/assets/image/logo.png"></div>
+    <div class="setting-box zy-scroll">
+      <div class="logo"><img src="@/assets/image/logo.png" alt=""></div>
      <div class="info">
-        <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player')">{{$t('website')}}</a>
-        <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/issues')">v{{pkg.version}} {{$t('issues')}}</a>
+        <a @click="linkOpen('http://zyplayer.fun/')">官网</a>
+        <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player')">Github</a>
+        <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/issues')">当前版本v{{pkg.version}} 反馈</a>
+        <a style="color:#38dd77" @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/releases/tag/v' + latestVersion)" v-show="latestVersion !== pkg.version" >最新版本v{{latestVersion}}</a>
      </div>
-      <div class="change">
-        <div class="zy-select" @mouseleave="show.language = false">
-          <div class="vs-placeholder" @click="show.language = true">{{$t('language')}}</div>
-          <div class="vs-options" v-show="show.language">
-            <ul>
-              <li :class="s.language === i.key ? 'active' : ''" v-for="(i, j) in languages" :key="j" @click="languageClick(i.key)">{{ i.name }}</li>
-            </ul>
+      <div class="view">
+        <div class="title">视图</div>
+        <div class="view-box">
+          <div class="zy-select" @mouseleave="show.view = false">
+            <div class="vs-placeholder" @click="show.view = true">默认视图</div>
+            <div class="vs-options" v-show="show.view">
+              <ul class="zy-scroll">
+                <li :class="d.view === 'picture' ? 'active' : ''" @click="changeView('picture')">海报</li>
+                <li :class="d.view === 'table' ? 'active' : ''" @click="changeView('table')">列表</li>
+              </ul>
+            </div>
          </div>
        </div>
-        <div class="zy-select" @mouseleave="show.site = false">
-          <div class="vs-placeholder" @click="show.site = true">{{$t('default_site')}}</div>
-          <div class="vs-options" v-show="show.site">
-            <ul>
-              <li :class="s.site === i.key ? 'active' : ''" v-for="(i, j) in sites" :key="j" @click="siteClick(i.key)">{{ i.name }}</li>
-            </ul>
+      </div>
+      <div class="shortcut">
+        <div class="title">快捷键</div>
+        <div class="shortcut-box">
+          <div class="zy-select" @mouseleave="show.shortcut = false">
+            <div class="vs-placeholder" @click="show.shortcut = true">快捷键</div>
+            <div class="vs-options" v-show="show.shortcut">
+              <ul class="zy-scroll">
+                <li :class="d.shortcut === true ? 'active' : ''" @click="changeShortcut(true)">开启</li>
+                <li :class="d.shortcut === false ? 'active' : ''" @click="changeShortcut(false)">关闭</li>
+              </ul>
+            </div>
          </div>
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="expShortcut">导出</div>
+          </div>
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="impShortcut">导入</div>
+          </div>
+        </div>
+      </div>
+      <div class="site">
+        <div class="title">定位时间设置</div>
+        <div class="zy-input">
+          左/右方向键:<input style="width:50px" type="number" v-model = "d.forwardTimeInSec" @change="updateSettingEvent($event)">秒
+        </div>
+      </div>
+      <div class='search'>
+         <div class="title">搜索</div>
+          <div class="zy-input" @click="toggleSearchAllSites">
+            <input type="checkbox" v-model="d.searchAllSites" @change="updateSettingEvent($event)"> 搜索所有资源
+         </div>
+      </div>
+      <div class='site'>
+         <div class="title">第三方播放</div>
+         <div class="site-box">
+            <div class="zy-select">
+              <div class="vs-placeholder vs-noAfter" @click="selectLocalPlayer">选择本地播放器</div>
+            </div>
+            <div class="zy-select" @click = "editPlayerPath = true">
+              <div class="vs-placeholder vs-noAfter" v-show = "editPlayerPath == false">
+                <label>编辑</label>
+              </div>
+              <input class="zy-input" v-show = "editPlayerPath == true" v-model = "d.externalPlayer"
+                @blur= "updateSettingEvent"
+                @keyup.enter = "updateSettingEvent">
+            </div>
+          </div>
+      </div>
+      <div class="site">
+        <div class="title">源管理</div>
+        <div class="site-box">
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="exportSites">导出</div>
+          </div>
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="importSites">导入</div>
+          </div>
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="editSitesEvent">编辑源</div>
+          </div>
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="resetSites">重置源</div>
+          </div>
+          <div class="zy-input" @click="toggleExcludeR18Films">
+           <input type="checkbox" v-model="d.excludeR18Films" @change="updateSettingEvent($event)"> 屏蔽福利片
+         </div>
        </div>
      </div>
      <div class="theme">
-        <div class="title">{{$t('theme')}}</div>
+        <div class="title">主题</div>
        <div class="theme-box">
          <div @click="changeTheme('light')" class="theme-item light">
            <div class="theme-image">
@@ -54,121 +120,313 @@
        </div>
      </div>
      <div class="qrcode">
-        <div class="title">{{$t('donate')}}</div>
+        <div class="title">请作者吃辣条</div>
        <div class="qrcode-box">
          <img class="qrcode-item" src="../assets/image/alipay.png">
          <img class="qrcode-item" src="../assets/image/wepay.jpg">
+          <img class="qrcode-item" src="../assets/image/wepay_cuiocean.jpg">
        </div>
      </div>
      <div class="clearDB">
-        <span @click="clearDBEvent" class="clearBtn">{{$t('clearDB')}}</span>
-        <span class="clearTips">{{$t('clearTips')}}</span>
+        <span @click="clearDBEvent" class="clearBtn">软件重置</span>
+        <span class="clearTips">如果新安装用户, 无法显示资源, 请点击软件重置. 如非必要, 切勿点击. 会清空用户数据, 恢复默认设置. 点击即软件重置, 并关闭软件.</span>
+      </div>
+      <div class="Tips">
+        <span>所有资源来自网上, 该软件不参与任何制作, 上传, 储存等内容, 禁止传播违法资源. 该软件仅供学习参考, 请于安装后24小时内删除.</span>
      </div>
    </div>
  </div>
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import setting from '../lib/dexie/setting'
-import { sites } from '../lib/site/sites'
-import db from '../lib/dexie/index'
-import '../lib/cloud/index.js'
-import { shell } from 'electron'
 import pkg from '../../package.json'
-const ipc = require('electron').ipcRenderer
+import { setting, sites, shortcut, star } from '../lib/dexie'
+import { shell, clipboard, remote } from 'electron'
+import db from '../lib/dexie/dexie'
+import { sites as defaultSites } from '../lib/dexie/initData'
+import fs from 'fs'
 export default {
  name: 'setting',
  data () {
    return {
      pkg: pkg,
-      s: {},
-      languages: [
-        {
-          key: 'zhCn',
-          name: '中文'
-        },
-        {
-          key: 'en',
-          name: 'English'
-        }
-      ],
-      sites: sites,
+      sitesList: [],
+      shortcutList: [],
+      favoritesList: [],
      show: {
-        setting: false,
-        language: false,
-        site: false
+        site: false,
+        shortcut: false,
+        view: false
+      },
+      externalPlayer: '',
+      editPlayerPath: false,
+      excludeR18Films: false,
+      latestVersion: pkg.version,
+      forwardTimeInSec: 5,
+      d: {
+        id: 0,
+        site: '',
+        theme: '',
+        shortcut: true,
+        searchAllSites: true,
+        view: 'picture',
+        externalPlayer: '',
+        editPlayerPath: false,
+        excludeR18Films: true,
+        forwardTimeInSec: 5
      }
    }
  },
  computed: {
-    theme: {
+    setting: {
      get () {
-        return this.$store.getters.getTheme
+        return this.$store.getters.getSetting
      },
      set (val) {
-        this.SET_THEME(val)
+        this.SET_SETTING(val)
      }
    },
-    language: {
+    editSites: {
      get () {
-        return this.$store.getters.getLanguage
+        return this.$store.getters.getEditSites
      },
      set (val) {
-        this.SET_LANGUAGE(val)
-      }
-    },
-    site: {
-      get () {
-        return this.$store.getters.getSite
-      },
-      set (val) {
-        this.SET_SITE(val)
+        this.SET_EDITSITES(val)
      }
    }
  },
  methods: {
-    ...mapMutations(['SET_THEME', 'SET_LANGUAGE', 'SET_SITE']),
+    ...mapMutations(['SET_SETTING', 'SET_EDITSITES']),
    linkOpen (e) {
      shell.openExternal(e)
    },
-    languageClick (e) {
-      this.language = e
-      this.show.language = false
-      this.$i18n.locale = e
-      this.s.language = e
-      setting.update(this.s).then(res => {
-        this.$m.success(this.$t('set_success'))
+    getSetting () {
+      setting.find().then(res => {
+        this.d = {
+          id: res.id,
+          site: res.site,
+          theme: res.theme,
+          shortcut: res.shortcut,
+          view: res.view,
+          searchAllSites: res.searchAllSites ? res.searchAllSites : true,
+          externalPlayer: res.externalPlayer,
+          editPlayerPath: false,
+          excludeR18Films: res.excludeR18Films ? res.excludeR18Films : true,
+          forwardTimeInSec: res.forwardTimeInSec ? res.forwardTimeInSec : 5
+        }
+        this.setting = this.d
+      })
+    },
+    getSites () {
+      sites.all().then(res => {
+        this.sitesList = res
+      })
+    },
+    getShortcut () {
+      shortcut.all().then(res => {
+        this.shortcutList = res
+      })
+    },
+    getFavorites () {
+      star.all().then(res => {
+        this.favoritesList = res
+      })
+    },
+    changeView (e) {
+      this.d.view = e
+      setting.update(this.d).then(res => {
+        this.$message.success('修改成功')
+        this.show.view = false
+        this.setting = this.d
      })
    },
    siteClick (e) {
-      this.site = e
-      this.show.site = false
-      this.s.site = e
-      setting.update(this.s).then(res => {
-        this.$m.success(this.$t('set_success'))
+      this.d.site = e
+      setting.update(this.d).then(res => {
+        this.$message.success('修改默认源成功')
+        this.setting = this.d
+        this.show.site = false
+      })
+    },
+    updateSettingEvent (e) {
+      this.editPlayerPath = false
+      setting.update(this.d)
+    },
+    toggleSearchAllSites () {
+      this.d.searchAllSites = !this.d.searchAllSites
+      setting.update(this.d)
+    },
+    toggleExcludeR18Films () {
+      this.d.excludeR18Films = !this.d.excludeR18Films
+      setting.update(this.d)
+    },
+    selectLocalPlayer () {
+      const options = {
+        filters: [
+          { name: 'Executable file', extensions: ['exe'] },
+          { name: 'All types', extensions: ['*'] }
+        ],
+        properties: ['openFile']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          var playerPath = result.filePaths[0].replace(/\\/g, '/')
+          this.$message.success('设定第三方播放器路径为：' + result.filePaths[0])
+          this.d.externalPlayer = playerPath
+          setting.update(this.d).then(res => {
+            this.setting = this.d
+          })
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    resetLocalPlayer () {
+      this.d.externalPlayer = ''
+      setting.update(this.d).then(res => {
+        this.setting = this.d
+        this.$message.success('重置第三方播放器成功')
+      })
+    },
+    updatePlayerPath () {
+      this.$message.success('设定第三方播放器路径为：' + this.d.externalPlayer)
+      this.editPlayerPath = false
+      setting.update(this.d).then(res => {
+        this.setting = this.d
+      })
+    },
+    exportSites () {
+      this.getSites()
+      const arr = [...this.sitesList]
+      const str = JSON.stringify(arr, null, 4)
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ]
+      }
+      remote.dialog.showSaveDialog(options).then(result => {
+        if (!result.canceled) {
+          fs.writeFileSync(result.filePath, str)
+          this.$message.success('已保存成功')
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    importSites () {
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ],
+        properties: ['openFile']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          sites.clear()
+          result.filePaths.forEach(file => {
+            var str = fs.readFileSync(file)
+            const json = JSON.parse(str)
+            sites.bulkAdd(json).then(e => {
+              this.getSites()
+              this.d.site = json[0].key
+              setting.update(this.d).then(res => {
+                this.setting = this.d
+              })
+            })
+            this.$message.success('导入成功')
+          }).catch(err => {
+            this.$message.error(err)
+          })
+        }
+      })
+    },
+    editSitesEvent () {
+      this.editSites = {
+        show: true,
+        sites: this.sitesList
+      }
+    },
+    resetSites () {
+      sites.clear()
+      sites.bulkAdd(defaultSites).then(e => {
+        this.getSites()
+        this.d.site = defaultSites[0].key
+        setting.update(this.d).then(res => {
+          this.setting = this.d
+          this.$message.success('重置源成功')
+        })
      })
    },
    changeTheme (e) {
-      this.theme = e
-      this.s.theme = e
-      setting.update(this.s).then(res => {
-        this.$m.success(this.$t('set_success'))
+      this.d.theme = e
+      setting.update(this.d).then(res => {
+        this.$message.success('修改成功')
+      })
+    },
+    changeShortcut (e) {
+      this.d.shortcut = e
+      setting.update(this.d).then(res => {
+        this.$message.success('修改成功')
+        this.setting = this.d
+        this.show.shortcut = false
+      })
+    },
+    expShortcut () {
+      const arr = [...this.shortcutList]
+      const str = JSON.stringify(arr, null, 4)
+      clipboard.writeText(str)
+      this.$message.success('已复制到剪贴板')
+    },
+    impShortcut () {
+      const str = clipboard.readText()
+      const json = JSON.parse(str)
+      shortcut.clear().then(res => {
+        this.$message.info('已清空原数据')
+        shortcut.add(json).then(e => {
+          this.$message.success('已添加成功')
+          this.getSites()
+        })
      })
    },
    clearDBEvent () {
      db.delete().then(res => {
-        this.$m.success(this.$t('set_success'))
-        ipc.send('close')
+        this.$message.success('重置成功')
+        const win = remote.getCurrentWindow()
+        win.destroy()
+      })
+    },
+    openDoc (e) {
+      if (e === 'sites') {
+        this.linkOpen('http://zyplayer.fun/doc/sites/')
+        return false
+      }
+      if (e === 'shortcut') {
+        this.linkOpen('http://zyplayer.fun/doc/shortcut/')
+        return false
+      }
+    },
+    getLatestVersion () {
+      const cheerio = require('cheerio')
+      const axios = require('axios')
+      var url = 'https://github.com/Hunlongyu/ZY-Player/releases'
+      axios.get(url).then(res => {
+        const $ = cheerio.load(res.data)
+        var e = $('div.release-header')[0]
+        var firstResult = $(e).find('div>div>a')
+        this.latestVersion = firstResult.text()
      })
    }
  },
  created () {
-    setting.find().then(res => {
-      this.s = res
-      this.theme = res.theme
-      this.$i18n.locale = this.s.language
-      this.show.setting = true
-    })
+    this.getSetting()
+    this.getSites()
+    this.getShortcut()
+    this.getFavorites()
+    this.getLatestVersion()
  }
 }
 </script>
@@ -176,16 +434,16 @@ export default {
 .setting{
  height: calc(100% - 40px);
  width: 100%;
+  border-radius: 5px;
  padding: 20px 0;
  .setting-box{
    width: 100%;
    height: 100%;
    display: flex;
    flex-direction: column;
-    border-radius: 5px;
    overflow-y: auto;
  }
- .logo{
+  .logo{
    margin-top: 10px;
    width: 100%;
    text-align: center;
@@ -205,14 +463,42 @@ export default {
      cursor: pointer;
    }
  }
-  .change{
+  .view{
    width: 100%;
-    display: flex;
-    justify-content: flex-start;
-    padding-left: 20px;
-    margin-top: 40px;
-    .zy-select{
-      margin-right: 20px;
+    padding: 20px;
+    margin-top: 20px;
+    .view-box{
+      margin-top: 10px;
+      .zy-select{
+        margin-right: 20px;
+      }
+    }
+  }
+  .search{
+    width: 100%;
+    padding: 20px;
+    margin-top: 20px;
+  }
+  .site{
+    width: 100%;
+    padding: 20px;
+    margin-top: 20px;
+    .site-box{
+      margin-top: 10px;
+      .zy-select{
+        margin-right: 20px;
+      }
+    }
+  }
+  .shortcut{
+    width: 100%;
+    padding: 20px;
+    margin-top: 20px;
+    .shortcut-box{
+      margin-top: 10px;
+      .zy-select{
+        margin-right: 20px;
+      }
    }
  }
  .theme{
@@ -221,6 +507,7 @@ export default {
    margin-top: 20px;
    .theme-box{
      display: flex;
+      flex-wrap: wrap;
      justify-content: flex-start;
      margin-top: 10px;
      .theme-item{
@@ -281,5 +568,10 @@ export default {
      margin-left: 10px;
    }
  }
+  .Tips{
+    margin: 20px;
+    font-size: 12px;
+    color: #ff000066;
+  }
 }
 </style>
--- a/src/components/Share.vue
+++ b/src/components/Share.vue
@@ -1,15 +1,15 @@
 <template>
  <div class="share" id="share" @click="shareClickEvent">
    <div class="left">
-      <img :src="this.card.img" alt="">
+      <img :src="pic" alt="" @load="picLoadEvent">
    </div>
-    <div class="right">
-      <div class="title">{{ card.name }}</div>
-      <qrcode-vue id="qr" :value="value" :size="160" level="L" />
+    <div class="right" id="right">
+      <div class="title">{{ share.info.name }}</div>
+      <qrcode-vue id="qr" :value="link" :size="160" level="L" />
      <div class="tips">
-        <p>{{$t('qr_tips')}}</p>
+        <p>长按二维码，识别播放。</p>
        <p><img src="@/assets/image/logo.png"></p>
-        <p class="zy">{{$t('zy_tips')}}</p>
+        <p class="zy">『ZY Player』技术支持，严禁传播违法资源。</p>
      </div>
    </div>
    <div class="share-mask" v-show="loading">
@@ -19,21 +19,18 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import tools from '../lib/site/tools'
 import QrcodeVue from 'qrcode.vue'
 import html2canvas from 'html2canvas'
+import zy from '../lib/site/tools'
 const { clipboard, nativeImage } = require('electron')
 export default {
  name: 'share',
  data () {
    return {
-      card: {
-        img: '',
-        name: '',
-        png: ''
-      },
-      value: 'https://www.baidu.com',
-      loading: true
+      pic: '',
+      png: '',
+      link: '',
+      loading: false
    }
  },
  components: {
@@ -52,46 +49,56 @@ export default {
  watch: {
    share: {
      handler () {
-        this.getDetail()
+        this.getDetail(
+          this.loading = true
+        )
      },
      deep: true
    }
  },
  methods: {
    ...mapMutations(['SET_SHARE']),
-    getDetail () {
-      this.loading = true
-      tools.detail_get(this.share.v.site, this.share.v.detail).then(res => {
-        const info = res.info
-        const parser = new DOMParser()
-        const html = parser.parseFromString(info, 'text/html')
-        const img = html.querySelector('img').src
-        this.card.img = img
-        this.card.name = this.share.v.name
-        const urls = res.m3u8_urls
-        const url = urls[this.share.v.index].split('$')[1]
-        this.value = 'http://zyplayer.fun/player/player.html?url=' + url + '&title=' + this.share.v.name
-        this.loading = false
-        this.$nextTick(() => {
-          const dom = document.getElementById('share')
-          html2canvas(dom, { allowTaint: true, useCORS: true }).then(res => {
-            const png = res.toDataURL('image/png')
-            const p = nativeImage.createFromDataURL(png)
-            clipboard.writeImage(p)
-            this.$m.success(this.$t('share_tips'))
-            this.share.show = true
-          })
-        })
-      })
-    },
    shareClickEvent () {
      this.share = {
        show: false,
-        v: {}
+        info: {}
      }
+    },
+    getDetail () {
+      this.loading = true
+      const id = this.share.info.ids || this.share.info.id
+      zy.detail(this.share.key, id).then(res => {
+        if (res) {
+          this.pic = res.pic
+          var m3u8List = {}
+          const dd = res.dl.dd
+          const type = Object.prototype.toString.call(dd)
+          if (type === '[object Array]') {
+            for (const i of dd) {
+              if (i._flag.indexOf('m3u8') >= 0) {
+                m3u8List = i._t.split('#')
+              }
+            }
+          } else {
+            m3u8List = dd._t.split('#')
+          }
+          const url = m3u8List[1]
+          this.link = 'http://zyplayer.fun/player/player.html?url=' + url + '&title=' + this.share.info.name
+        }
+        this.loading = false
+      })
+    },
+    picLoadEvent () {
+      const dom = document.getElementById('right')
+      html2canvas(dom, { useCORS: true, allowTaint: true }).then(res => {
+        const png = res.toDataURL('image/png')
+        const p = nativeImage.createFromDataURL(png)
+        clipboard.writeImage(p)
+        this.$message.success('已复制到剪贴板，快去分享吧~ 严禁传播违法资源!!!')
+      })
    }
  },
-  created () {
+  mounted () {
    this.getDetail()
  }
 }
@@ -107,8 +114,8 @@ export default {
  display: flex;
  justify-content: space-between;
  align-items: center;
-  padding: 20px;
-  z-index: 888;
+  padding: 0px;
+  z-index: 999;
  .left, .right{
    width: 50%;
    height: 100%;
@@ -124,6 +131,7 @@ export default {
    }
  }
  .right{
+    padding: 10px;
    .title{
      font-size: 18px;
      margin-bottom: 10px;
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -1,55 +1,76 @@
 <template>
  <div class="star">
-    <div class="zy-table">
-      <div class="tHead">
-        <span class="name">{{$t('videoName')}}</span>
-        <span class="type">{{$t('type')}}</span>
-        <span class="time">{{$t('time')}}</span>
-        <span class="from">{{$t('from')}}</span>
-        <span class="operate" style="width: 220px">{{$t('operate')}}</span>
-      </div>
-      <div class="tBody zy-scroll">
-        <ul v-show="!loading">
-          <li v-for="(i, j) in data" :key="j" @click="detailEvent(i)">
-            <span class="name">{{i.name}}</span>
-            <span class="type">{{i.type}}</span>
-            <span class="time">{{i.time}}</span>
-            <span class="from">{{i.site | ftSite}}</span>
-            <span class="operate" style="width: 220px">
-              <span class="btn" @click.stop="playEvent(i)">{{$t('play')}}</span>
-              <span class="btn" @click.stop="deleteEvent(i)">{{$t('delete')}}</span>
-              <span class="btn" @click.stop="shareEvent(i)">{{$t('share')}}</span>
-              <span class="btn" @click.stop="updateEvent(i)">{{$t('sync')}}</span>
-              <span class="btn" @click.stop="downloadEvent(i)">{{$t('download')}}</span>
-            </span>
-          </li>
-        </ul>
-        <div class="tBody-mask" v-show="loading">
-          <div class="loader"></div>
+    <div class="body">
+      <div class="zy-table">
+        <div class="tHeader">
+          <span class="btn" @click="exportFavoritesEvent()">导出</span>
+          <span class="btn" @click="importFavoritesEvent()">导入</span>
+          <span class="btn" @click="clearFavoritesEvent()">清空</span>
+          <span class="btn"></span>
+          <span class="btn" @click="updateAllEvent()">同步所有收藏</span>
+        </div>
+        <div class="tBody zy-scroll">
+          <ul>
+            <li v-show="this.list.length > 0">
+              <span class="name">名字</span>
+              <span class="type">类型</span>
+              <span class="time">上映</span>
+              <span class="site">片源</span>
+              <span class="note">备注</span>
+              <span class="note">观看至</span>
+              <span class="operate">
+                <span class="btn"></span>
+                <span class="btn"></span>
+                <span class="btn"></span>
+                <span class="btn"></span>
+                <span class="btn"></span>
+              </span>
+            </li>
+            <draggable v-model="list" @change="listUpdatedEvent">
+              <transition-group>
+                <li v-for="(i, j) in list" :key="j" @click="detailEvent(i)" :class="[i.hasUpdate ? 'zy-highlighted': '']">
+                  <span class="name">{{i.name}}</span>
+                  <span class="type">{{i.type}}</span>
+                  <span class="time">{{i.year}}</span>
+                  <span class="site">{{getSiteName(i.key)}}</span>
+                  <span class="note">{{i.note}}</span>
+                  <span class="note">{{getHistoryNote(i.index)}}</span>
+                  <span class="operate">
+                    <span class="btn" @click.stop="playEvent(i)">播放</span>
+                    <span class="btn" @click.stop="shareEvent(i)">分享</span>
+                    <span class="btn" @click.stop="updateEvent(i)">同步</span>
+                    <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                    <span class="btn" @click.stop="deleteEvent(i)">删除</span>
+                  </span>
+                </li>
+              </transition-group>
+            </draggable>
+          </ul>
        </div>
-      </div>
-      <div class="tFooter">
-        <span class="tFooter-span">{{data.length}} {{$t('total')}}</span>
      </div>
    </div>
  </div>
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import tools from '../lib/site/tools'
-import video from '../lib/dexie/video'
-import { sites, getSite } from '../lib/site/sites'
+import { star, history, sites } from '../lib/dexie'
+import zy from '../lib/site/tools'
+import draggable from 'vuedraggable'
+import { remote } from 'electron'
+import fs from 'fs'
+
 const { clipboard } = require('electron')
 export default {
  name: 'star',
  data () {
    return {
-      sites: sites,
-      data: [],
-      loading: true,
-      checkFlag: false
+      list: [],
+      sites: []
    }
  },
+  components: {
+    draggable
+  },
  computed: {
    view: {
      get () {
@@ -59,14 +80,6 @@ export default {
        this.SET_VIEW(val)
      }
    },
-    detail: {
-      get () {
-        return this.$store.getters.getDetail
-      },
-      set (val) {
-        this.SET_DETAIL(val)
-      }
-    },
    video: {
      get () {
        return this.$store.getters.getVideo
@@ -75,6 +88,14 @@ export default {
        this.SET_VIDEO(val)
      }
    },
+    detail: {
+      get () {
+        return this.$store.getters.getDetail
+      },
+      set (val) {
+        this.SET_DETAIL(val)
+      }
+    },
    share: {
      get () {
        return this.$store.getters.getShare
@@ -84,15 +105,10 @@ export default {
      }
    }
  },
-  filters: {
-    ftSite (e) {
-      const name = getSite(e).name
-      return name
-    }
-  },
  watch: {
    view () {
-      this.getAllStar()
+      this.getFavorites()
+      this.getAllsites()
    }
  },
  methods: {
@@ -100,89 +116,255 @@ export default {
    detailEvent (e) {
      this.detail = {
        show: true,
-        v: e
+        key: e.key,
+        info: {
+          id: e.ids,
+          name: e.name
+        }
+      }
+      if (e.hasUpdate) {
+        this.clearHasUpdateFlag(e)
      }
    },
    playEvent (e) {
-      this.video = e
+      history.find({ site: e.key, ids: e.ids }).then(res => {
+        if (res) {
+          this.video = { key: e.key, info: { id: res.ids, name: res.name, index: res.index } }
+        } else {
+          this.video = { key: e.key, info: { id: e.ids, name: e.name, index: 0 } }
+        }
+      })
+      if (e.hasUpdate) {
+        this.clearHasUpdateFlag(e)
+      }
      this.view = 'Play'
    },
    deleteEvent (e) {
-      video.remove(e.id).then(res => {
+      star.remove(e.id).then(res => {
        if (res) {
-          this.$m.warning(this.$t('delete_failed'))
+          this.$message.warning('删除失败')
        } else {
-          this.$m.success(this.$t('delete_success'))
+          this.$message.success('删除成功')
        }
-        this.getAllStar()
+        this.getFavorites()
      })
    },
    shareEvent (e) {
      this.share = {
        show: true,
-        v: e
+        key: e.key,
+        info: e
      }
    },
+    clearHasUpdateFlag (e) {
+      star.find({ id: e.id }).then(res => {
+        res.hasUpdate = false
+        star.update(e.id, res)
+        this.getFavorites()
+      })
+    },
+    listUpdatedEvent () {
+      star.clear().then(res1 => {
+        // 重新排序
+        var id = this.list.length
+        this.list.forEach(element => {
+          element.id = id
+          star.add(element)
+          id -= 1
+        })
+      })
+    },
    updateEvent (e) {
-      tools.detail_get(e.site, e.detail).then(res => {
-        const nameOne = e.name.replace(/\s*/g, '')
-        const nameTwo = res.name.replace(/\s*/g, '')
-        if (nameOne === nameTwo) {
-          this.$m.info(this.$t('async_failed'))
+      zy.detail(e.key, e.ids).then(res => {
+        var doc = {
+          key: e.key,
+          id: e.id,
+          ids: res.id,
+          last: res.last,
+          name: res.name,
+          type: res.type,
+          year: res.year,
+          note: res.note
+        }
+        star.get(e.id).then(resStar => {
+          doc.hasUpdate = resStar.hasUpdate
+          var msg = ''
+          if (e.last === res.last) {
+            msg = `同步"${e.name}"成功, 未查询到更新。`
+            this.$message.info(msg)
+          } else {
+            doc.hasUpdate = true
+            msg = `同步"${e.name}"成功, 检查到更新。`
+            this.$message.success(msg)
+          }
+          star.update(e.id, doc)
+          this.getFavorites()
+        })
+      }).catch(err => {
+        var msg = `同步"${e.name}"失败, 请重试。`
+        this.$message.warning(msg, err)
+      })
+    },
+    updateAllEvent () {
+      this.list.forEach(e => {
+        this.updateEvent(e)
+      })
+    },
+    downloadEvent (e) {
+      zy.download(e.key, e.ids).then(res => {
+        if (res && res.dl && res.dl.dd) {
+          const text = res.dl.dd._t
+          if (text) {
+            const list = text.split('#')
+            let downloadUrl = ''
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『MP4』格式的链接已复制, 快去下载吧!')
+          } else {
+            this.$message.warning('没有查询到下载链接.')
+          }
        } else {
-          const h = e
-          h.name = res.name
-          video.update(h.id, h).then(res => {
-            this.$m.success(this.$t('async_success'))
+          var m3u8List = {}
+          zy.detail(e.key, e.ids).then(res => {
+            const dd = res.dl.dd
+            const type = Object.prototype.toString.call(dd)
+            if (type === '[object Array]') {
+              for (const i of dd) {
+                if (i._flag.indexOf('m3u8') >= 0) {
+                  m3u8List = i._t.split('#')
+                }
+              }
+            } else {
+              m3u8List = dd._t.split('#')
+            }
+            const list = [...m3u8List]
+            let downloadUrl = ''
+            for (const i of list) {
+              const url = encodeURI(i.split('$')[1])
+              downloadUrl += (url + '\n')
+            }
+            clipboard.writeText(downloadUrl)
+            this.$message.success('『M3U8』格式的链接已复制, 快去下载吧!')
          })
        }
      })
    },
-    downloadEvent (e) {
-      tools.detail_get(e.site, e.detail).then(res => {
-        if (res.mp4_urls.length > 0) {
-          const urls = [...res.mp4_urls]
-          let txt = `${e.name}\n`
-          for (const i of urls) {
-            const name = i.split('$')[0]
-            const url = encodeURI(i.split('$')[1])
-            txt += (name + ': ' + url + '\n')
-          }
-          clipboard.writeText(txt)
-          this.$m.success('〖MP4〗: ' + this.$t('copy_success'))
-          return false
-        }
-        if (res.m3u8_urls.length > 0) {
-          const urls = [...res.m3u8_urls]
-          let txt = `${e.name}\n`
-          for (const i of urls) {
-            const name = i.split('$')[0]
-            const url = encodeURI(i.split('$')[1])
-            txt += (name + ': ' + url + '\n')
-          }
-          clipboard.writeText(txt)
-          this.$m.success('〖M3U8〗: ' + this.$t('copy_success'))
-        }
+    getSiteName (key) {
+      var site = this.sites.find(e => e.key === key)
+      if (site) {
+        return site.name
+      }
+    },
+    getHistoryNote (index) {
+      if (index !== null && index !== undefined) {
+        return `第${index + 1}集`
+      } else {
+        return ''
+      }
+    },
+    getFavorites () {
+      star.all().then(res => {
+        this.list = res.reverse()
      })
    },
-    getAllStar () {
-      video.all().then(res => {
-        this.data = res.reverse()
-        this.loading = false
+    getAllsites () {
+      sites.all().then(res => {
+        this.sites = res
+      })
+    },
+    exportFavoritesEvent () {
+      const arr = [...this.list]
+      const str = JSON.stringify(arr, null, 4)
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ]
+      }
+      remote.dialog.showSaveDialog(options).then(result => {
+        if (!result.canceled) {
+          fs.writeFileSync(result.filePath, str)
+          this.$message.success('已保存成功')
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    importFavoritesEvent () {
+      const options = {
+        filters: [
+          { name: 'JSON file', extensions: ['json'] },
+          { name: 'Normal text file', extensions: ['txt'] },
+          { name: 'All types', extensions: ['*'] }
+        ],
+        properties: ['openFile', 'multiSelections']
+      }
+      remote.dialog.showOpenDialog(options).then(result => {
+        if (!result.canceled) {
+          result.filePaths.forEach(file => {
+            var str = fs.readFileSync(file)
+            const json = JSON.parse(str)
+            star.bulkAdd(json).then(e => {
+              this.getFavorites()
+            })
+            this.upgradeFavorites()
+          })
+          this.$message.success('导入收藏成功')
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    upgradeFavorites () {
+      star.all().then(res => {
+        res.forEach(element => {
+          const docs = {
+            key: element.key,
+            ids: element.ids,
+            name: element.name,
+            type: element.type,
+            year: element.year,
+            last: element.last,
+            note: element.note
+          }
+          star.find({ key: element.key, ids: element.ids }).then(res => {
+            if (!res) {
+              star.add(docs)
+            }
+          })
+        })
+        this.getFavorites()
+      })
+    },
+    clearFavoritesEvent () {
+      star.clear().then(e => {
+        this.getFavorites()
+        this.$message.success('清空所有收藏成功')
      })
    }
  },
  created () {
-    this.getAllStar()
+    this.getFavorites()
+    window.Sortable = require('sortablejs').Sortable
  }
 }
 </script>
 <style lang="scss" scoped>
 .star{
+  position: relative;
  height: calc(100% - 40px);
  width: 100%;
  display: flex;
-  flex-direction: column;
+  justify-content: center;
+  align-items: center;
  border-radius: 5px;
+  .body{
+    width: 100%;
+    height: 100%;
+  }
 }
 </style>
--- a/src/components/register.js
+++ b/src/components/register.js
@@ -1,22 +1,28 @@
 import Vue from 'vue'
 import Aside from './Aside'
-import Detail from './Detail'
-import Film from './Film'
 import Frame from './Frame'
+import Film from './Film'
 import Play from './Play'
-import Setting from './Setting'
-import Share from './Share'
 import Star from './Star'
+import Setting from './Setting'
+import Detail from './Detail'
+import Share from './Share'
+import History from './History'
+import EditSites from './EditSites'
+import IPTV from './IPTV'

 export default {
  registerComponents () {
    Vue.component('Aside', Aside)
-    Vue.component('Detail', Detail)
-    Vue.component('Film', Film)
    Vue.component('Frame', Frame)
+    Vue.component('Film', Film)
    Vue.component('Play', Play)
-    Vue.component('Setting', Setting)
-    Vue.component('Share', Share)
    Vue.component('Star', Star)
+    Vue.component('Setting', Setting)
+    Vue.component('Detail', Detail)
+    Vue.component('Share', Share)
+    Vue.component('History', History)
+    Vue.component('EditSites', EditSites)
+    Vue.component('IPTV', IPTV)
  }
 }
--- a/src/lib/cloud/index.js
+++ b/src/lib/cloud/index.js
@@ -1,44 +0,0 @@
-const os = require('os')
-const macaddress = require('macaddress')
-const AV = require('leancloud-storage')
-
-macaddress.one((err, mac) => {
-  if (err) {
-    return false
-  }
-  AV.init({
-    appId: 'X6TRIcMjgOG7EJ0t1l5r9In1-gzGzoHsz',
-    appKey: 'JmkGF9UqkWGQNYDcJ2g1QV1b',
-    serverURL: 'https://x6tricmj.lc-cn-n1-shared.com'
-  })
-  const system = os.hostname() + ' ' + os.type() + ' ' + os.arch()
-  const query = new AV.Query('ZYPlayer')
-  query.equalTo('os', system)
-  query.equalTo('mac', mac)
-  query.find().then(res => {
-    // 存储新用户数据
-    if (res.length === 0) {
-      const ZYPlayer = AV.Object.extend('ZYPlayer')
-      const zyPlayer = new ZYPlayer()
-      zyPlayer.set('os', system)
-      zyPlayer.set('mac', mac)
-      zyPlayer.set('times', 1)
-      zyPlayer.save()
-      return false
-    }
-    // 统计启动次数
-    if (res.length === 1) {
-      const id = res[0].id
-      const times = AV.Object.createWithoutData('ZYPlayer', id)
-      times.increment('times', 1)
-      times.save()
-      return false
-    }
-    // 清除冗余数据
-    if (res.length > 1) {
-      const arr = res
-      arr.shift()
-      AV.Object.destroyAll(arr)
-    }
-  })
-})
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -0,0 +1,26 @@
+import Dexie from 'dexie'
+import { setting, sites, localKey, iptv } from './initData'
+
+const db = new Dexie('zy')
+
+db.version(3).stores({
+  search: '++id, keywords',
+  setting: 'id, theme, site, shortcut, view',
+  shortcut: 'name, key, desc',
+  star: '++id, site, ids, name, type, year, index',
+  sites: '++id, key, name, json, xml, down, level',
+  history: '++id, site, ids, name, type, year, index, time',
+  mini: 'id, site, ids, name, index, time',
+  iptv: '++id, name, url'
+})
+
+db.on('populate', () => {
+  db.setting.bulkAdd(setting)
+  db.sites.bulkAdd(sites)
+  db.shortcut.bulkAdd(localKey)
+  db.iptv.bulkAdd(iptv)
+})
+
+db.open()
+
+export default db
--- a/src/lib/dexie/history.js
+++ b/src/lib/dexie/history.js
@@ -1,4 +1,4 @@
-import db from './index'
+import db from './dexie'
 const { history } = db
 export default {
  async add (doc) {
--- a/src/lib/dexie/index.js
+++ b/src/lib/dexie/index.js
@@ -1,33 +1,19 @@
-import Dexie from 'dexie'
+import history from './history'
+import mini from './mini'
+import setting from './setting'
+import shortcut from './shortcut'
+import star from './star'
+import sites from './sites'
+import search from './search'
+import iptv from './iptv'

-const db = new Dexie('zy')
-
-db.version(1).stores({
-  theme: '++id, theme',
-  site: '++id, site',
-  video: '++id, name, type, time, detail, urls, index'
-})
-
-db.version(2).stores({
-  setting: 'id, theme, site, language, cloud, cloudKey',
-  video: '++id, site, name, type, time, detail, index',
-  history: '++id, site, name, type, time, detail, index, currentTime',
-  mini: 'id, site, name, type, time, detail, index, currentTime'
-})
-
-const initData = [{
-  id: 0,
-  theme: 'light',
-  site: 'zuidazy',
-  language: 'zhCn',
-  cloud: false,
-  cloudKey: ''
-}]
-
-db.on('populate', () => {
-  db.setting.bulkAdd(initData)
-})
-
-db.open()
-
-export default db
+export {
+  history,
+  mini,
+  setting,
+  shortcut,
+  star,
+  sites,
+  iptv,
+  search
+}
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -0,0 +1,762 @@
+const setting = [
+  {
+    id: 0,
+    theme: 'light',
+    site: 'zuidazy',
+    shortcut: true,
+    view: 'picture'
+  }
+]
+
+const sites = [
+  {
+    id: 1,
+    key: 'okzy',
+    name: 'OK 资源网',
+    api: 'http://cj.okzy.tv/inc/api.php',
+    download: 'http://cj.okzy.tv/inc/apidown.php'
+  },
+  {
+    id: 2,
+    key: 'zuidazy',
+    name: '最大资源网',
+    api: 'http://www.zdziyuan.com/inc/api.php',
+    download: 'http://www.zdziyuan.com/inc/apidown.php'
+  },
+  {
+    id: 3,
+    key: 'doubanzy',
+    name: '豆瓣电影资源',
+    api: 'http://v.1988cj.com/inc/api.php',
+    download: 'http://v.1988cj.com/inc/apidown.php'
+  },
+  {
+    id: 4,
+    key: '135zy',
+    name: '135 资源网',
+    api: 'http://cj.zycjw1.com/inc/api.php',
+    download: 'http://cj.zycjw1.com/inc/apidown.php'
+  },
+  {
+    id: 5,
+    key: 'kuyunzy',
+    name: '酷云资源',
+    api: 'http://caiji.kuyun98.com/inc/ldg_api.php',
+    download: 'http://caiji.kuyun98.com/inc/apidown.php'
+  },
+  {
+    id: 6,
+    key: 'mgtvzy',
+    name: '芒果 TV 资源网',
+    api: 'https://api.shijiapi.com/api.php/provide/vod/at/xml/',
+    download: ''
+  },
+  {
+    id: 7,
+    key: 'subo988',
+    name: '速播资源站',
+    api: 'https://www.subo988.com/inc/api.php',
+    download: ''
+  },
+  {
+    id: 8,
+    key: '209zy',
+    name: '209 资源',
+    api: 'http://cj.1156zy.com/inc/api.php',
+    download: ''
+  },
+  {
+    id: 9,
+    key: 'zuixinzy',
+    name: '最新资源',
+    api: 'http://api.zuixinapi.com/inc/api.php',
+    download: ''
+  },
+  {
+    id: 10,
+    key: 'kubozy',
+    name: '酷播资源',
+    api: 'http://api.kbzyapi.com/inc/api.php',
+    download: ''
+  },
+  {
+    id: 11,
+    key: 'yongjiuzy',
+    name: '永久资源',
+    api: 'http://cj.yongjiuzyw.com/inc/api.php',
+    download: ''
+  },
+  {
+    id: 12,
+    key: '123ku',
+    name: '123 资源',
+    api: 'http://cj.123ku2.com:12315/inc/api.php',
+    download: ''
+  },
+  {
+    id: 13,
+    key: '88zyw',
+    name: '88 影视资源站',
+    api: 'http://www.88zyw.net/inc/api.php',
+    download: ''
+  },
+  {
+    id: 14,
+    key: 'wolongzy',
+    name: '卧龙资源',
+    api: 'http://cj.wlzy.tv/inc/api_mac.php',
+    download: ''
+  },
+  {
+    id: 15,
+    key: 'mahuazy',
+    name: '麻花资源',
+    api: 'https://www.mhapi123.com/inc/api.php',
+    download: ''
+  },
+  {
+    id: 16,
+    key: 'kkzy',
+    name: '快快资源',
+    api: 'https://api.kkzy.tv/inc/api.php',
+    download: ''
+  },
+  {
+    id: 17,
+    key: '158zy',
+    name: '壹伍捌资源网',
+    api: 'http://cj.158zyz.net:158/inc/api.php',
+    download: ''
+  },
+  {
+    id: 18,
+    key: 'rrzy',
+    name: '人人资源',
+    api: 'https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/',
+    download: ''
+  },
+  {
+    id: 19,
+    key: 'mokazy',
+    name: '魔卡资源网',
+    api: 'https://cj.heiyap.com/api.php/provide/vod/at/xml/',
+    download: ''
+  },
+  {
+    id: 20,
+    key: 'kyzy',
+    name: '快影资源站',
+    api: 'https://www.kyzy.tv/api.php/kyyun/vod/at/xml/',
+    download: ''
+  },
+  {
+    id: 21,
+    key: 'solezy',
+    name: '搜乐资源网',
+    api: 'https://www.caijizy.vip/api.php/provide/vod/at/xml/',
+    download: ''
+  },
+  {
+    id: 22,
+    key: 'bbkdj',
+    name: '步步高顶尖资源网',
+    api: 'http://api.bbkdj.com/api',
+    download: ''
+  },
+  {
+    id: 23,
+    key: '1886zy',
+    name: '1886 资源',
+    api: 'http://cj.1886zy.co/inc/api.php',
+    download: ''
+  },
+  {
+    id: 24,
+    key: 'mbo',
+    name: '秒播资源',
+    api: 'http://caiji.mb77.vip/inc/api.php',
+    download: ''
+  }
+]
+
+const localKey = [
+  {
+    name: 'playAndPause',
+    desc: '播放或暂停',
+    key: 'space'
+  },
+  {
+    name: 'forward',
+    desc: '快进',
+    key: 'right'
+  },
+  {
+    name: 'back',
+    desc: '快退',
+    key: 'left'
+  },
+  {
+    name: 'volumeUp',
+    desc: '音量调高',
+    key: 'up'
+  },
+  {
+    name: 'volumeDown',
+    desc: '音量调低',
+    key: 'down'
+  },
+  {
+    name: 'mute',
+    desc: '静音',
+    key: 'm'
+  },
+  {
+    name: 'top',
+    desc: '置顶或退出置顶',
+    key: 't'
+  },
+  {
+    name: 'fullscreen',
+    desc: '进入或退出全屏',
+    key: 'f'
+  },
+  {
+    name: 'escape',
+    desc: '退出全屏',
+    key: 'esc'
+  },
+  {
+    name: 'next',
+    desc: '下一集',
+    key: 'alt+right'
+  },
+  {
+    name: 'prev',
+    desc: '上一集',
+    key: 'alt+left'
+  },
+  {
+    name: 'home',
+    desc: '跳到视频开始位置',
+    key: 'home'
+  },
+  {
+    name: 'end',
+    desc: '跳到视频结束位置',
+    key: 'end'
+  },
+  {
+    name: 'opacityUp',
+    desc: '透明度调高',
+    key: 'alt+up'
+  },
+  {
+    name: 'opacityDown',
+    desc: '透明度调低',
+    key: 'alt+down'
+  },
+  {
+    name: 'playbackRateUp',
+    desc: '播放倍速加快',
+    key: 'pageup'
+  },
+  {
+    name: 'playbackRateDown',
+    desc: '播放倍速减慢',
+    key: 'pagedown'
+  },
+  {
+    name: 'mini',
+    desc: '进入或退出mini模式',
+    key: 'alt+m'
+  }
+]
+
+const getSite = (key) => {
+  for (const i of sites) {
+    if (key === i.key) {
+      return i
+    }
+  }
+}
+
+const iptv = [
+  {
+    name: 'CCTV1-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv1hd/4000000/mnf.m3u8',
+    id: 5910
+  },
+  {
+    name: '北京卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/bjwshd/4000000/mnf.m3u8',
+    id: 5911
+  },
+  {
+    name: '江苏卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jswshd/4000000/mnf.m3u8',
+    id: 5912
+  },
+  {
+    name: '浙江卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/zjwshd/4000000/mnf.m3u8',
+    id: 5913
+  },
+  {
+    name: '深圳卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/szwshd/4000000/mnf.m3u8',
+    id: 5914
+  },
+  {
+    name: '山东卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/sdwshd/4000000/mnf.m3u8',
+    id: 5915
+  },
+  {
+    name: '湖北卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hbwshd/4000000/mnf.m3u8',
+    id: 5916
+  },
+  {
+    name: '广东卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/gdwshd/4000000/mnf.m3u8',
+    id: 5917
+  },
+  {
+    name: '东方卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hddfws/4000000/mnf.m3u8',
+    id: 5918
+  },
+  {
+    name: '黑龙江卫视1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hljwshd/4000000/mnf.m3u8',
+    id: 5919
+  },
+  {
+    name: '五星体育1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ssty/4000000/mnf.m3u8',
+    id: 5920
+  },
+  {
+    name: '上海Knews24 1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba8/4000000/mnf.m3u8',
+    id: 5921
+  },
+  {
+    name: 'CCTV-1HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv1hd/2300000/mnf.m3u8',
+    id: 5922
+  },
+  {
+    name: 'CCTV-2',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv2/1300000/mnf.m3u8',
+    id: 5923
+  },
+  {
+    name: 'CCTV-3',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv3/1300000/mnf.m3u8',
+    id: 5924
+  },
+  {
+    name: 'CCTV-4',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv4/1300000/mnf.m3u8',
+    id: 5925
+  },
+  {
+    name: 'CCTV-5',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv5/1300000/mnf.m3u8',
+    id: 5926
+  },
+  {
+    name: 'CCTV-6',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv6/1300000/mnf.m3u8',
+    id: 5927
+  },
+  {
+    name: 'CCTV-7',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv7/1300000/mnf.m3u8',
+    id: 5928
+  },
+  {
+    name: 'CCTV-8',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv8/1300000/mnf.m3u8',
+    id: 5929
+  },
+  {
+    name: 'CCTV-10',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv10/1300000/mnf.m3u8',
+    id: 5930
+  },
+  {
+    name: 'CCTV-11',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv11/1300000/mnf.m3u8',
+    id: 5931
+  },
+  {
+    name: 'CCTV-12',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctv12/1300000/mnf.m3u8',
+    id: 5932
+  },
+  {
+    name: 'CCTV-13',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctvxw/1300000/mnf.m3u8',
+    id: 5933
+  },
+  {
+    name: 'CCTV-14',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctvse//1300000/mnf.m3u8',
+    id: 5934
+  },
+  {
+    name: 'CCTV-15',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cctvyy/1300000/mnf.m3u8',
+    id: 5935
+  },
+  {
+    name: '北京卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/bjwshd/1300000/mnf.m3u8',
+    id: 5936
+  },
+  {
+    name: '东方卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hddfws/1300000/mnf.m3u8',
+    id: 5937
+  },
+  {
+    name: '浙江卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/zjwshd/1300000/mnf.m3u8',
+    id: 5938
+  },
+  {
+    name: '湖北卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hbwshd/1300000/mnf.m3u8',
+    id: 5939
+  },
+  {
+    name: '湖南卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hnwshd/1300000/mnf.m3u8',
+    id: 5940
+  },
+  {
+    name: '山东卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/sdwshd/1300000/mnf.m3u8',
+    id: 5941
+  },
+  {
+    name: '江苏卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jswshd/1300000/mnf.m3u8',
+    id: 5942
+  },
+  {
+    name: '深圳卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/szwshd/1300000/mnf.m3u8',
+    id: 5943
+  },
+  {
+    name: '广东卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/gdwshd/1300000/mnf.m3u8',
+    id: 5944
+  },
+  {
+    name: '黑龙江卫视高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hljwshd/1300000/mnf.m3u8',
+    id: 5945
+  },
+  {
+    name: '五星体育高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ssty/1300000/mnf.m3u8',
+    id: 5946
+  },
+  {
+    name: '新闻24高清',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba8/1300000/mnf.m3u8',
+    id: 5947
+  },
+  {
+    name: '湖南卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hnwshd/2300000/mnf.m3u8',
+    id: 5948
+  },
+  {
+    name: '北京卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/bjwshd/2300000/mnf.m3u8',
+    id: 5949
+  },
+  {
+    name: '江苏卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jswshd/2300000/mnf.m3u8',
+    id: 5950
+  },
+  {
+    name: '浙江卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/zjwshd/2300000/mnf.m3u8',
+    id: 5951
+  },
+  {
+    name: '深圳卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/szwshd/2300000/mnf.m3u8',
+    id: 5952
+  },
+  {
+    name: '山东卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/sdwshd/2300000/mnf.m3u8',
+    id: 5953
+  },
+  {
+    name: '湖北卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hbwshd/2300000/mnf.m3u8',
+    id: 5954
+  },
+  {
+    name: '广东卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/gdwshd/2300000/mnf.m3u8',
+    id: 5955
+  },
+  {
+    name: '黑龙江卫视HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hljwshd/2300000/mnf.m3u8',
+    id: 5956
+  },
+  {
+    name: '五星体育HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ssty/2300000/mnf.m3u8',
+    id: 5957
+  },
+  {
+    name: '法治天地HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/fztd/1300000/mnf.m3u8',
+    id: 5958
+  },
+  {
+    name: '欢笑剧场HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hxjc/1300000/mnf.m3u8',
+    id: 5959
+  },
+  {
+    name: '都市剧场HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/dsjc/1300000/mnf.m3u8',
+    id: 5960
+  },
+  {
+    name: '七彩戏剧HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/qcxj/1300000/mnf.m3u8',
+    id: 5961
+  },
+  {
+    name: '动漫秀场HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/dmxc/1300000/mnf.m3u8',
+    id: 5962
+  },
+  {
+    name: '劲爆体育HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jbty/1300000/mnf.m3u8',
+    id: 5963
+  },
+  {
+    name: '极速汽车',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jsqc/1300000/mnf.m3u8',
+    id: 5964
+  },
+  {
+    name: '游戏风云',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/yxfy/1300000/mnf.m3u8',
+    id: 5965
+  },
+  {
+    name: '金鹰卡通',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jykt/1300000/mnf.m3u8',
+    id: 5966
+  },
+  {
+    name: '炫动卡通',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/xdkt/1300000/mnf.m3u8',
+    id: 5967
+  },
+  {
+    name: '嘉佳卡通',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jjkt/1300000/mnf.m3u8',
+    id: 5968
+  },
+  {
+    name: '星尚',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/shss/1300000/mnf.m3u8',
+    id: 5969
+  },
+  {
+    name: '上海纪实',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jspd/1300000/mnf.m3u8',
+    id: 5970
+  },
+  {
+    name: '上海新闻',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/xwzh/1300000/mnf.m3u8',
+    id: 5971
+  },
+  {
+    name: '上海娱乐',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ylpd/1300000/mnf.m3u8',
+    id: 5972
+  },
+  {
+    name: '上海电视剧',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/dsjpd/1300000/mnf.m3u8',
+    id: 5973
+  },
+  {
+    name: '上海ICS外语频道',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/wypd/1300000/mnf.m3u8',
+    id: 5974
+  },
+  {
+    name: '上海艺术人文',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ysrw/1300000/mnf.m3u8',
+    id: 5975
+  },
+  {
+    name: '东方财经浦东',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/dfcj/1300000/mnf.m3u8',
+    id: 5976
+  },
+  {
+    name: '第一财经',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/dycj/1300000/mnf.m3u8',
+    id: 5977
+  },
+  {
+    name: '安徽卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ahws/1300000/mnf.m3u8',
+    id: 5978
+  },
+  {
+    name: '兵团卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/btws/1300000/mnf.m3u8',
+    id: 5979
+  },
+  {
+    name: '甘肃卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/gsws/1300000/mnf.m3u8',
+    id: 5980
+  },
+  {
+    name: '陕西卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/sxws/1300000/mnf.m3u8',
+    id: 5981
+  },
+  {
+    name: '山西卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/shanxiws/1300000/mnf.m3u8',
+    id: 5982
+  },
+  {
+    name: '吉林卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jlws/1300000/mnf.m3u8',
+    id: 5983
+  },
+  {
+    name: '河北卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hbws/1300000/mnf.m3u8',
+    id: 5984
+  },
+  {
+    name: '四川卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/scws/1300000/mnf.m3u8',
+    id: 5985
+  },
+  {
+    name: '贵州卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/gzws/1300000/mnf.m3u8',
+    id: 5986
+  },
+  {
+    name: '云南卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ynws/1300000/mnf.m3u8',
+    id: 5987
+  },
+  {
+    name: '辽宁卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/lnws/1300000/mnf.m3u8',
+    id: 5988
+  },
+  {
+    name: '旅游卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/lyws/1300000/mnf.m3u8',
+    id: 5989
+  },
+  {
+    name: '东南卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/dnws/1300000/mnf.m3u8',
+    id: 5990
+  },
+  {
+    name: '重庆卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/cqws/1300000/mnf.m3u8',
+    id: 5991
+  },
+  {
+    name: '广西卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/gxws/1300000/mnf.m3u8',
+    id: 5992
+  },
+  {
+    name: '青海卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/qhws/1300000/mnf.m3u8',
+    id: 5993
+  },
+  {
+    name: '江西卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/jxws/1300000/mnf.m3u8',
+    id: 5994
+  },
+  {
+    name: '内蒙古卫视',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/nmgws/1300000/mnf.m3u8',
+    id: 5995
+  },
+  {
+    name: '五星体育HD',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/ssty/1300000/mnf.m3u8',
+    id: 5996
+  },
+  {
+    name: '直播1-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba1/4000000/mnf.m3u8',
+    id: 5997
+  },
+  {
+    name: '直播2-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba2/4000000/mnf.m3u8',
+    id: 5998
+  },
+  {
+    name: '直播3-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba3/4000000/mnf.m3u8',
+    id: 5999
+  },
+  {
+    name: '直播4-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba4/4000000/mnf.m3u8',
+    id: 6000
+  },
+  {
+    name: '直播5-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba5/4000000/mnf.m3u8',
+    id: 6001
+  },
+  {
+    name: '直播6-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba6/4000000/mnf.m3u8',
+    id: 6002
+  },
+  {
+    name: '直播7-1080P',
+    url: 'http://keonline.shanghai.liveplay.qq.com/live/program/live/hdnba7/4000000/mnf.m3u8',
+    id: 6003
+  }
+]
+
+export {
+  setting,
+  sites,
+  iptv,
+  localKey,
+  getSite
+}
--- a/src/lib/dexie/iptv.js
+++ b/src/lib/dexie/iptv.js
@@ -0,0 +1,25 @@
+import db from './dexie'
+const { iptv } = db
+export default {
+  async all () {
+    return await iptv.toArray()
+  },
+  async clear () {
+    return await iptv.clear()
+  },
+  async add (doc) {
+    return await iptv.add(doc)
+  },
+  async bulkAdd (doc) {
+    return await iptv.bulkAdd(doc)
+  },
+  async find (doc) {
+    return await iptv.get(doc)
+  },
+  async update (id, docs) {
+    return await iptv.update(id, docs)
+  },
+  async remove (id) {
+    return await iptv.delete(id)
+  }
+}
--- a/src/lib/dexie/mini.js
+++ b/src/lib/dexie/mini.js
@@ -1,4 +1,4 @@
-import db from './index'
+import db from './dexie'
 const { mini } = db
 export default {
  async add (doc) {
--- a/src/lib/dexie/search.js
+++ b/src/lib/dexie/search.js
@@ -0,0 +1,22 @@
+import db from './dexie'
+const { search } = db
+export default {
+  async add (doc) {
+    return await search.add(doc)
+  },
+  async find (doc) {
+    return await search.get(doc)
+  },
+  async update (id, docs) {
+    return await search.update(id, docs)
+  },
+  async all () {
+    return await search.toArray()
+  },
+  async remove (id) {
+    return await search.delete(id)
+  },
+  async clear () {
+    return await search.clear()
+  }
+}
--- a/src/lib/dexie/setting.js
+++ b/src/lib/dexie/setting.js
@@ -1,5 +1,6 @@
-import db from './index'
+import db from './dexie'
 const { setting } = db
+
 export default {
  async find () {
    return await setting.get({ id: 0 })
--- a/src/lib/dexie/shortcut.js
+++ b/src/lib/dexie/shortcut.js
@@ -0,0 +1,14 @@
+import db from './dexie'
+const { shortcut } = db
+
+export default {
+  async all () {
+    return await shortcut.toArray()
+  },
+  async clear () {
+    return await shortcut.clear()
+  },
+  async add (doc) {
+    return await shortcut.bulkAdd(doc)
+  }
+}
--- a/src/lib/dexie/sites.js
+++ b/src/lib/dexie/sites.js
@@ -0,0 +1,22 @@
+import db from './dexie'
+const { sites } = db
+export default {
+  async all () {
+    return await sites.toArray()
+  },
+  async clear () {
+    return await sites.clear()
+  },
+  async bulkAdd (doc) {
+    return await sites.bulkAdd(doc)
+  },
+  async find (doc) {
+    return await sites.get(doc)
+  },
+  async add (doc) {
+    return await sites.add(doc)
+  },
+  async remove (id) {
+    return await sites.delete(id)
+  }
+}
--- a/src/lib/dexie/star.js
+++ b/src/lib/dexie/star.js
@@ -0,0 +1,28 @@
+import db from './dexie'
+const { star } = db
+export default {
+  async add (doc) {
+    return await star.add(doc)
+  },
+  async bulkAdd (doc) {
+    return await star.bulkAdd(doc)
+  },
+  async find (doc) {
+    return await star.get(doc)
+  },
+  async update (id, docs) {
+    return await star.update(id, docs)
+  },
+  async all () {
+    return await star.toArray()
+  },
+  async remove (id) {
+    return await star.delete(id)
+  },
+  async get (id) {
+    return await star.get(id)
+  },
+  async clear () {
+    return await star.clear()
+  }
+}
--- a/src/lib/dexie/video.js
+++ b/src/lib/dexie/video.js
@@ -1,19 +0,0 @@
-import db from './index'
-const { video } = db
-export default {
-  async add (doc) {
-    return await video.add(doc)
-  },
-  async find (doc) {
-    return await video.get(doc)
-  },
-  async update (id, docs) {
-    return await video.update(id, docs)
-  },
-  async all () {
-    return await video.toArray()
-  },
-  async remove (id) {
-    return await video.delete(id)
-  }
-}
--- a/src/lib/element/index.js
+++ b/src/lib/element/index.js
@@ -1,6 +1,3 @@
 import Vue from 'vue'
-import { Message, Pagination } from 'element-ui'
-
-Vue.use(Pagination)
-
-Vue.prototype.$m = Message
+import { Message } from 'element-ui'
+Vue.prototype.$message = Message
--- a/src/lib/site/onlineVideo.js
+++ b/src/lib/site/onlineVideo.js
@@ -0,0 +1,219 @@
+import open from 'open'
+import axios from 'axios'
+import cheerio from 'cheerio'
+
+const onlineVideo = {
+  playVideoOnBde4 (videoName, videoIndex) {
+    videoName = videoName.replace(/\s/g, '')
+    var url = `https://bde4.com/search/${videoName}`
+    axios.get(url).then(res => {
+      const $ = cheerio.load(res.data)
+      var e = $('div.search-list')
+      var searchResult = $(e).find('div>div>div>div>a').toArray()
+      // 获取第一个搜索结果的视频链接
+      var detailPageLink = $(searchResult[0]).attr('href')
+      // 获取第一个搜索结果的title
+      var title = $(searchResult[0]).attr('title')
+      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
+        // 如果第一个搜索结果不符合，打开搜索页面
+        open(url)
+      } else {
+        var detailPageFullLink = 'https://bde4.com/' + detailPageLink
+        // 解析详情页面
+        axios.get(detailPageFullLink).then(res => {
+          const $ = cheerio.load(res.data)
+          var e = $('div.info1')
+          var videoList = $(e).find('a').toArray()
+          var videoFullLink = detailPageFullLink
+          // 获取index视频链接
+          if (videoIndex < videoList.length) {
+            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            if (indexVideoLink.includes('.htm')) {
+              videoFullLink = 'https://bde4.com' + indexVideoLink
+            }
+          }
+          open(videoFullLink)
+        })
+      }
+    })
+  },
+  playVideoOnK1080 (videoName, videoIndex) {
+    videoName = videoName.replace(/\s/g, '')
+    var url = `https://k1080.net/vodsearch123/-------------.html?wd=${videoName}&submit=`
+    axios.get(url).then(res => {
+      const $ = cheerio.load(res.data)
+      var e = $('#searchList')
+      var searchResult = $(e).find('li>div>a').toArray()
+      // 获取第一个搜索结果的视频链接
+      var detailPageLink = $(searchResult[0]).attr('href')
+      // 获取第一个搜索结果的title
+      var title = $(searchResult[0]).attr('title')
+      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
+        // 如果第一个搜索结果不符合，打开搜索页面
+        open(url)
+      } else {
+        // 解析详情页面
+        var detailPageFullLink = 'https://k1080.net' + detailPageLink
+        axios.get(detailPageFullLink).then(res2 => {
+          const $ = cheerio.load(res2.data)
+          // 获取playlist1
+          var e = $('#playlist1')
+          // 获取所有视频链接
+          var videoList = $(e).find('div>ul>li>a').toArray()
+          var videoFullLink = detailPageFullLink
+          // 获取index视频链接
+          if (videoIndex < videoList.length) {
+            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            if (indexVideoLink.includes('.htm')) {
+              videoFullLink = 'https://k1080.net' + indexVideoLink
+            }
+          }
+          open(videoFullLink)
+        })
+      }
+    })
+  },
+  playVideoOnSubaibai (videoName, videoIndex) {
+    videoName = videoName.replace(/\s/g, '')
+    var url = `https://www.subaibai.com/xssearch?q=${videoName}`
+    axios.get(url).then(res => {
+      const $ = cheerio.load(res.data)
+      var e = $('div.search_list')
+      var searchResult = $(e).find('div>ul>li>h3>a').toArray()
+      // 获取第一个搜索结果的视频链接
+      var detailPageLink = $(searchResult[0]).attr('href')
+      // 获取第一个搜索结果的title
+      var title = $(searchResult[0]).text()
+      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
+        // 如果第一个搜索结果不符合，打开搜索页面
+        open(url)
+      } else {
+        // 解析详情页面
+        var detailPageFullLink = detailPageLink
+        axios.get(detailPageFullLink).then(res2 => {
+          const $ = cheerio.load(res2.data)
+          // 获取playlist1
+          var e = $('div.paly_list_btn')
+          // 获取所有视频链接
+          var videoList = $(e).find('a').toArray()
+          // 获取index视频链接
+          var videoFullLink = detailPageFullLink
+          if (videoIndex < videoList.length) {
+            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            if (indexVideoLink.includes('.htm')) {
+              videoFullLink = indexVideoLink
+            }
+          }
+          open(videoFullLink)
+        })
+      }
+    })
+  },
+  playVideoOnYhdm (videoName, videoIndex) {
+    videoName = videoName.replace(/\s/g, '')
+    var url = `http://www.yhdm.tv/search/${videoName}`
+    axios.get(url).then(res => {
+      const $ = cheerio.load(res.data)
+      var e = $('div.lpic')
+      var searchResult = $(e).find('div>ul>li>h2>a').toArray()
+      // 获取第一个搜索结果的视频链接
+      var detailPageLink = $(searchResult[0]).attr('href')
+      // 获取第一个搜索结果的title
+      var title = $(searchResult[0]).attr('title')
+      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
+        // 如果第一个搜索结果不符合，打开搜索页面
+        open(url)
+      } else {
+        // 解析详情页面
+        var detailPageFullLink = 'http://www.yhdm.tv/' + detailPageLink
+        axios.get(detailPageFullLink).then(res2 => {
+          const $ = cheerio.load(res2.data)
+          // 获取playlist1
+          var e = $('div.movurl')
+          // 获取所有视频链接
+          var videoList = $(e).find('div>ul>li>a').toArray()
+          // 获取index视频链接
+          var videoFullLink = detailPageFullLink
+          if (videoIndex < videoList.length) {
+            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            if (indexVideoLink.includes('.htm')) {
+              videoFullLink = 'http://www.yhdm.tv/' + indexVideoLink
+            }
+          }
+          open(videoFullLink)
+        })
+      }
+    })
+  },
+  playVideoOndmdm2020 (videoName, videoIndex) {
+    videoName = videoName.replace(/\s/g, '')
+    var url = `http://www.dmdm2020.com/dongmansearch.html?wd=${videoName}&submit=`
+    axios.get(url).then(res => {
+      const $ = cheerio.load(res.data)
+      var e = $('#searchList')
+      var searchResult = $(e).find('ul>li>div>h4>a').toArray()
+      // 获取第一个搜索结果的视频链接
+      var detailPageLink = $(searchResult[0]).attr('href')
+      // 获取第一个搜索结果的title
+      var title = $(searchResult[0]).text()
+      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
+        // 如果第一个搜索结果不符合，打开搜索页面
+        open(url)
+      } else {
+        // 解析详情页面
+        var detailPageFullLink = 'http://www.dmdm2020.com' + detailPageLink
+        axios.get(detailPageFullLink).then(res2 => {
+          const $ = cheerio.load(res2.data)
+          // 获取playlist1
+          var e = $('#playlist1')
+          // 获取所有视频链接
+          var videoList = $(e).find('div>ul>li>a').toArray()
+          // 获取index视频链接
+          var videoFullLink = detailPageFullLink
+          if (videoIndex < videoList.length) {
+            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            if (indexVideoLink.includes('.htm')) {
+              videoFullLink = 'http://www.dmdm2020.com' + indexVideoLink
+            }
+          }
+          open(videoFullLink)
+        })
+      }
+    })
+  },
+  playVideoOnSyrme (videoName, videoIndex) {
+    videoName = videoName.replace(/\s/g, '')
+    var url = `https://syrme.top/searchs?q=${videoName}`
+    axios.get(url).then(res => {
+      const $ = cheerio.load(res.data)
+      var e = $('ul.MovieList')
+      var searchResult = $(e).find('ul>li>article>a').toArray()
+      // 获取第一个搜索结果的视频链接
+      var detailPageLink = $(searchResult[0]).attr('href')
+      // 获取第一个搜索结果的title
+      var title = $(searchResult[0]).find('a>h2').text()
+      if (title === null || title === undefined || !title.replace(/\s/g, '').includes(videoName)) {
+        // 如果第一个搜索结果不符合，打开搜索页面
+        open(url)
+      } else {
+        // 解析详情页面
+        var detailPageFullLink = 'https://syrme.top' + detailPageLink
+        axios.get(detailPageFullLink).then(res2 => {
+          const $ = cheerio.load(res2.data)
+          // 获取playlist1
+          var e = $('#categories-2')
+          // 获取所有视频链接
+          var videoList = $(e).find('div>ul>li>a').toArray()
+          // 获取index视频链接
+          var videoFullLink = detailPageFullLink
+          if (videoIndex < videoList.length) {
+            var indexVideoLink = $(videoList[videoIndex]).attr('href')
+            videoFullLink = 'https://syrme.top' + indexVideoLink
+          }
+          open(videoFullLink)
+        })
+      }
+    })
+  }
+}
+export default onlineVideo
--- a/src/lib/site/server.js
+++ b/src/lib/site/server.js
@@ -0,0 +1,18 @@
+import express from 'express'
+import cors from 'cors'
+const Axios = require('axios')
+
+const app = express()
+app.use(cors())
+app.use(express.json())
+app.use(express.urlencoded({ extended: true }))
+
+app.post('/api', async (req, res) => {
+  const result = await Axios.get(req.body.url)
+  res.json({
+    code: 1,
+    info: result.data
+  })
+})
+
+app.listen(44444)
--- a/src/lib/site/sites.js
+++ b/src/lib/site/sites.js
--- a/src/lib/site/tools.js
+++ b/src/lib/site/tools.js
@@ -1,476 +1,196 @@
+import { sites } from '../dexie'
 import axios from 'axios'
-import { getSite } from './sites'
+import parser from 'fast-xml-parser'
 const zy = {
-  key: 'zuidazy', // sites[n] 视频源
-  id: 0, // 视频类型
-  page: 1, // 第几页
-  keywords: '', // 搜索关键字
-  // 获取浏览列表
-  film_get (key, id = 0, page = 1) {
+  ports: 44444, // 端口号
+  xmlConfig: { // XML 转 JSON 配置
+    trimValues: true,
+    textNodeName: '_t',
+    ignoreAttributes: false,
+    attributeNamePrefix: '_',
+    parseAttributeValue: true
+  },
+  getSite (key) {
    return new Promise((resolve, reject) => {
-      const site = getSite(key)
-      let url = ''
-      if (id === 0) {
-        url = site.new.replace(/{page}/, page)
-      } else {
-        url = site.view.replace(/{id}/, id).replace(/{page}/, page)
-      }
-      const type = site.type
-      axios.get(url).then(async res => {
-        const data = res.data
-        if (type === 0) {
-          const zeroData = await this.film_get_type_zero(data, key)
-          resolve(zeroData)
-        }
-        if (type === 1) {
-          const oneData = await this.film_get_type_one(data, key)
-          resolve(oneData)
-        }
-        if (type === 2) {
-          const twoData = await this.film_get_type_two(data, key)
-          resolve(twoData)
-        }
-        if (type === 3) {
-          const threeData = await this.film_get_type_three(data, key)
-          resolve(threeData)
+      sites.all().then(res => {
+        for (const i of res) {
+          if (key === i.key) {
+            resolve(i)
+          }
        }
      }).catch(err => {
        reject(err)
      })
    })
  },
-  film_get_type_zero (txt, key) {
+  /**
+   * 获取资源分类 和 所有资源的总数, 分页等信息
+   * @param {*} key 资源网 key
+   * @returns
+   */
+  class (key) {
    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.xing_vb li')
-        const d = { list: [], total: 0, update: 0 }
-        const url = getSite(key).url
-        for (let i = 1; i < list.length - 1; i++) {
-          const info = {
-            site: key,
-            name: list[i].childNodes[1].innerText,
-            type: list[i].childNodes[3].innerText,
-            time: list[i].childNodes[5].innerText,
-            detail: url + list[i].childNodes[1].querySelector('a').getAttribute('href'),
-            index: 0
+      this.getSite(key).then(res => {
+        const site = res
+        axios.post(`http://localhost:${this.ports}/api`, { url: site.api }).then(res => {
+          const data = res.data.info
+          const json = parser.parse(data, this.xmlConfig)
+          const arr = []
+          if (json.rss.class) {
+            for (const i of json.rss.class.ty) {
+              const j = {
+                tid: i._id,
+                name: i._t
+              }
+              arr.push(j)
+            }
          }
-          d.list.push(info)
-        }
-        d.update = parseInt(html.querySelectorAll('.xing_top_right li strong')[0].innerText)
-        let t = html.querySelector('.pages').innerText
-        t = t.split('条')[0]
-        t = t.split('共')[1]
-        d.total = parseInt(t)
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
+          const doc = {
+            class: arr,
+            page: json.rss.list._page,
+            pagecount: json.rss.list._pagecount,
+            pagesize: json.rss.list._pagesize,
+            recordcount: json.rss.list._recordcount
+          }
+          resolve(doc)
+        }).catch(err => {
+          reject(err)
+        })
+      })
    })
  },
-  film_get_type_one (txt, key) {
+  /**
+   * 获取资源列表
+   * @param {*} key 资源网 key
+   * @param {number} [pg=1] 翻页 page
+   * @param {*} t 分类 type
+   * @returns
+   */
+  list (key, pg = 1, t) {
    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.videoContent li')
-        const d = { list: [], total: 0, update: 0 }
-        const url = getSite(key).url
-        for (let i = 0; i < list.length; i++) {
-          const info = {
-            site: key,
-            name: list[i].querySelector('.videoName').innerText,
-            type: list[i].querySelector('.category').innerText,
-            time: list[i].querySelector('.time').innerText,
-            detail: url + list[i].querySelector('.address').getAttribute('href'),
-            index: 0
-          }
-          d.list.push(info)
+      this.getSite(key).then(res => {
+        const site = res
+        let url = null
+        if (t) {
+          url = `${site.api}?ac=videolist&t=${t}&pg=${pg}`
+        } else {
+          url = `${site.api}?ac=videolist&pg=${pg}`
        }
-        d.update = parseInt(html.querySelectorAll('.header_list li span')[0].innerText)
-        let t = html.querySelectorAll('.pagination li')
-        t = t[t.length - 2].innerText
-        d.total = parseInt(t) * 50
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
+        axios.post(`http://localhost:${this.ports}/api`, { url: url }).then(async res => {
+          const data = res.data.info
+          const json = parser.parse(data, this.xmlConfig)
+          const videoList = json.rss.list.video
+          resolve(videoList)
+        }).catch(err => {
+          reject(err)
+        })
+      })
    })
  },
-  film_get_type_two (txt, key) {
+  /**
+   * 获取总资源数, 以及页数
+   * @param {*} key 资源网
+   * @param {*} t 分类 type
+   * @returns page object
+   */
+  page (key, t) {
    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.nr')
-        const d = { list: [], total: 0, update: 0 }
-        const url = getSite(key).url
-        for (let i = 0; i < list.length; i++) {
-          const info = {
-            site: key,
-            name: '',
-            type: list[i].querySelector('.btn_span').innerText,
-            time: list[i].querySelector('.hours').innerText,
-            detail: url + list[i].querySelector('.name').getAttribute('href'),
-            index: 0
-          }
-          let name = list[i].querySelector('.name').innerText
-          name = name.replace(/^\s*|\s*$/g, '')
-          info.name = name
-          d.list.push(info)
+      this.getSite(key).then(res => {
+        const site = res
+        let url = ''
+        if (t) {
+          url = `${site.api}?ac=videolist&t=${t}`
+        } else {
+          url = `${site.api}?ac=videolist`
        }
-        d.update = parseInt(html.querySelector('.kfs em').innerText)
-        d.total = parseInt(html.querySelector('.date span').innerText)
-        let t = html.querySelector('.pag2').innerText
-        t = t.split('条')[0]
-        t = t.split('共')[1]
-        d.total = parseInt(t)
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
+        axios.post(`http://localhost:${this.ports}/api`, { url: url }).then(async res => {
+          const data = res.data.info
+          const json = parser.parse(data, this.xmlConfig)
+          const pg = {
+            page: json.rss.list._page,
+            pagecount: json.rss.list._pagecount,
+            pagesize: json.rss.list._pagesize,
+            recordcount: json.rss.list._recordcount
+          }
+          resolve(pg)
+        }).catch(err => {
+          reject(err)
+        })
+      })
    })
  },
-  film_get_type_three (txt, key) {
+  /**
+   * 搜索资源
+   * @param {*} key 资源网 key
+   * @param {*} wd 搜索关键字
+   * @returns
+   */
+  search (key, wd) {
    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.xing_vb li')
-        const d = { list: [], total: 0, update: 0 }
-        const url = getSite(key).url
-        for (let i = 1; i < list.length - 1; i++) {
-          const info = {
-            site: key,
-            name: list[i].childNodes[1].innerText,
-            type: list[i].childNodes[2].innerText,
-            time: list[i].childNodes[3].innerText,
-            detail: url + list[i].childNodes[1].querySelector('a').getAttribute('href'),
-            index: 0
+      this.getSite(key).then(res => {
+        const site = res
+        wd = encodeURI(wd)
+        axios.post(`http://localhost:${this.ports}/api`, { url: site.api + '?wd=' + wd }, { timeout: 2000 }).then(res => {
+          const data = res.data.info
+          const json = parser.parse(data, this.xmlConfig)
+          if (json && json.rss && json.rss.list) {
+            const videoList = json.rss.list.video
+            resolve(videoList)
          }
-          d.list.push(info)
-        }
-        d.update = parseInt(html.querySelectorAll('.xing_top_right li strong')[0].innerText)
-        let t = html.querySelector('.pages').innerText
-        t = t.split('条')[0]
-        t = t.split('共')[1]
-        d.total = parseInt(t)
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  // 获取详情
-  detail_get (key, url) {
-    return new Promise((resolve, reject) => {
-      const type = getSite(key).type
-      axios.get(url).then(async res => {
-        if (type === 0) {
-          const zeroData = await this.detail_get_type_zero(res.data, key)
-          resolve(zeroData)
-        }
-        if (type === 1) {
-          const oneData = await this.detail_get_type_one(res.data, key)
-          resolve(oneData)
-        }
-        if (type === 2) {
-          const twoData = await this.detail_get_type_two(res.data, key)
-          resolve(twoData)
-        }
-        if (type === 3) {
-          const threeData = await this.detail_get_type_three(res.data, key)
-          resolve(threeData)
-        }
+        }).catch(err => {
+          reject(err)
+        })
      }).catch(err => {
        reject(err)
      })
    })
  },
-  detail_get_type_zero (txt, key) {
+  /**
+   * 获取资源详情
+   * @param {*} key 资源网 key
+   * @param {*} id 资源唯一标识符 id
+   * @returns
+   */
+  detail (key, id) {
    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const data = {
-          site: key,
-          name: '',
-          info: '',
-          desc: '',
-          m3u8_urls: [],
-          mp4_urls: []
-        }
-        const vodBox = html.querySelector('.vodBox')
-        data.info = vodBox.innerHTML
-        const title = html.querySelector('.vodh h2').innerText
-        const index = html.querySelector('.vodh span').innerText
-        data.name = title + index
-        const vodInfo = html.querySelectorAll('.playBox')
-        for (let i = 0; i < vodInfo.length; i++) {
-          const k = vodInfo[i].innerText
-          if (k.indexOf('剧情介绍') >= 0) {
-            data.desc = vodInfo[i].querySelector('.vodplayinfo').innerText
-          }
-        }
-        const vodLi = html.querySelectorAll('.ibox .vodplayinfo li')
-        const m3u8UrlArr = []
-        const mp4UrlArr = []
-        for (let i = 0; i < vodLi.length; i++) {
-          const j = vodLi[i].innerText
-          if (j.indexOf('.m3u8') >= 0) {
-            m3u8UrlArr.push(j)
-          }
-          if (j.indexOf('.mp4') >= 0) {
-            mp4UrlArr.push(j)
-          }
-        }
-        data.m3u8_urls = m3u8UrlArr
-        data.mp4_urls = mp4UrlArr
-        resolve(data)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  detail_get_type_one (txt, key) {
-    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const data = {
-          site: key,
-          name: '',
-          info: '',
-          desc: '',
-          m3u8_urls: [],
-          mp4_urls: []
-        }
-        let name = html.querySelector('.whitetitle').innerText
-        name = name.split('：')[1].replace(/^\s*|\s*$/g, '')
-        data.name = name
-        const vodBox = html.querySelector('.white').innerHTML
-        data.info = vodBox
-        const vodInfo = html.querySelectorAll('.white')
-        for (let i = 0; i < vodInfo.length; i++) {
-          const k = vodInfo[i].innerText
-          if (k.indexOf('剧情介绍') >= 0) {
-            data.desc = vodInfo[i].querySelector('div').innerText
-          }
-        }
-        const vodLi = html.querySelectorAll('.playlist li #m3u8')
-        const m3u8UrlArr = []
-        const mp4UrlArr = []
-        for (let i = 0; i < vodLi.length; i++) {
-          const j = vodLi[i].value
-          if (j.indexOf('.m3u8') >= 0) {
-            m3u8UrlArr.push(j)
-          }
-          if (j.indexOf('.mp4') >= 0) {
-            mp4UrlArr.push(j)
-          }
-        }
-        data.m3u8_urls = m3u8UrlArr
-        data.mp4_urls = mp4UrlArr
-        resolve(data)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  detail_get_type_two (txt, key) {
-    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const data = {
-          site: key,
-          name: '',
-          info: '',
-          desc: '',
-          m3u8_urls: [],
-          mp4_urls: []
-        }
-        const title = html.querySelector('.vodh h2').innerText
-        const index = html.querySelector('.vodh span').innerText
-        data.name = title + index
-        const vodBox = html.querySelector('.vodBox').innerHTML
-        data.info = vodBox
-        data.desc = html.querySelector('.vodplayinfo').innerText
-        const vodLi = html.querySelectorAll('.vodplayinfo li')
-        const m3u8UrlArr = []
-        const mp4UrlArr = []
-        for (let i = 0; i < vodLi.length; i++) {
-          const j = vodLi[i].innerText
-          if (j.indexOf('.m3u8') >= 0) {
-            m3u8UrlArr.push(j)
-          }
-          if (j.indexOf('.mp4') >= 0) {
-            mp4UrlArr.push(j)
-          }
-        }
-        data.m3u8_urls = m3u8UrlArr
-        data.mp4_urls = mp4UrlArr
-        resolve(data)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  detail_get_type_three (txt, key) {
-    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const data = {
-          site: key,
-          name: '',
-          info: '',
-          desc: '',
-          m3u8_urls: [],
-          mp4_urls: []
-        }
-        const vodBox = html.querySelector('.vodBox')
-        data.info = vodBox.innerHTML
-        const title = html.querySelector('.vodh h2').innerText
-        const index = html.querySelector('.vodh span').innerText
-        data.name = title + index
-        const vodInfo = html.querySelectorAll('.playBox')
-        for (let i = 0; i < vodInfo.length; i++) {
-          const k = vodInfo[i].innerText
-          if (k.indexOf('剧情介绍') >= 0) {
-            data.desc = vodInfo[i].querySelector('.vodplayinfo').innerHTML
-          }
-        }
-        const vodLi = html.querySelectorAll('.ibox .vodplayinfo li')
-        const m3u8UrlArr = []
-        const mp4UrlArr = []
-        for (let i = 0; i < vodLi.length; i++) {
-          const j = vodLi[i].innerText
-          if (j.indexOf('.m3u8') >= 0) {
-            m3u8UrlArr.unshift(j)
-          }
-          if (j.indexOf('.mp4') >= 0) {
-            mp4UrlArr.unshift(j)
-          }
-        }
-        data.m3u8_urls = m3u8UrlArr
-        data.mp4_urls = mp4UrlArr
-        resolve(data)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  // 搜索列表
-  search_get (key, keywords = '', page = 1) {
-    return new Promise((resolve, reject) => {
-      const site = getSite(key)
-      const type = site.type
-      let url = null
-      if (type === 0) {
-        url = site.search.replace(/{page}/, page).replace(/{keywords}/, keywords)
-      }
-      if (type === 1) {
-        url = site.search.replace(/{keywords}/, keywords)
-      }
-      axios.get(url).then(async res => {
-        const data = res.data
-        if (type === 0) {
-          const zeroData = await this.search_get_type_zero(data, key)
-          resolve(zeroData)
-        }
-        if (type === 1) {
-          const oneData = await this.search_get_type_one(data, key)
-          resolve(oneData)
-        }
-        if (type === 3) {
-          const threeData = await this.search_get_type_three(data, key)
-          resolve(threeData)
-        }
+      this.getSite(key).then(res => {
+        axios.post(`http://localhost:${this.ports}/api`, { url: res.api + '?ac=videolist&ids=' + id }).then(res => {
+          const data = res.data.info
+          const json = parser.parse(data, this.xmlConfig)
+          const videoList = json.rss.list.video
+          resolve(videoList)
+        }).catch(err => {
+          reject(err)
+        })
      }).catch(err => {
        reject(err)
      })
    })
  },
-  search_get_type_zero (txt, key) {
+  /**
+   * 下载资源
+   * @param {*} key 资源网 key
+   * @param {*} id 资源唯一标识符 id
+   * @returns
+   */
+  download (key, id) {
    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.xing_vb li')
-        const d = { list: [], total: 0 }
-        const url = getSite(key).url
-        for (let i = 1; i < list.length - 1; i++) {
-          const info = {
-            site: key,
-            name: list[i].childNodes[1].innerText,
-            type: list[i].childNodes[3].innerText,
-            time: list[i].childNodes[5].innerText,
-            detail: url + list[i].childNodes[1].querySelector('a').getAttribute('href'),
-            index: 0
-          }
-          d.list.push(info)
+      this.getSite(key).then(res => {
+        const site = res
+        const url = site.download
+        if (url) {
+          axios.post(`http://localhost:${this.ports}/api`, { url: url + '?ac=videolist&ids=' + id + '&ct=1' }).then(res => {
+            const data = res.data.info
+            const json = parser.parse(data, this.xmlConfig)
+            const videoList = json.rss.list.video
+            resolve(videoList)
+          }).catch(err => {
+            reject(err)
+          })
+        } else {
+          resolve([])
        }
-        const t = html.querySelector('.nvc dd').innerText.replace(/[^\d]/g, '')
-        d.total = parseInt(t)
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  search_get_type_one (txt, key) {
-    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.videoContent li')
-        const d = { list: [], total: 0 }
-        const url = getSite(key).url
-        for (let i = 0; i < list.length; i++) {
-          const info = {
-            site: key,
-            name: list[i].querySelector('.videoName').innerText,
-            type: list[i].querySelector('.category').innerText,
-            time: list[i].querySelector('.time').innerText,
-            detail: url + list[i].querySelector('.address').getAttribute('href'),
-            index: 0
-          }
-          d.list.push(info)
-        }
-        d.total = list.length
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
-    })
-  },
-  search_get_type_three (txt, key) {
-    return new Promise((resolve, reject) => {
-      try {
-        const parser = new DOMParser()
-        const html = parser.parseFromString(txt, 'text/html')
-        const list = html.querySelectorAll('.xing_vb li')
-        const d = { list: [], total: 0 }
-        const url = getSite(key).url
-        for (let i = 1; i < list.length - 1; i++) {
-          const info = {
-            site: key,
-            name: list[i].childNodes[1].innerText,
-            type: list[i].childNodes[2].innerText,
-            time: list[i].childNodes[3].innerText,
-            detail: url + list[i].childNodes[1].querySelector('a').getAttribute('href'),
-            index: 0
-          }
-          d.list.push(info)
-        }
-        const t = html.querySelector('.nvc dd').innerText.replace(/[^\d]/g, '')
-        d.total = parseInt(t)
-        resolve(d)
-      } catch (err) {
-        reject(err)
-      }
+      })
    })
  }
 }
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,52 +0,0 @@
-{
-    "zh": "Chinese",
-    "en": "English",
-    "language": "Language",
-    "default_site": "Default Site",
-    "view": "View",
-    "play": "Play",
-    "star": "Star",
-    "setting": "Setting",
-    "exists": "Already exists",
-    "videoName": "Video Name",
-    "type": "Type",
-    "time": "Time",
-    "operate": "Operate",
-    "share": "Share",
-    "detail": "Detail",
-    "close": "Close",
-    "download": "Download",
-    "all_download": "All Download",
-    "next": "Next",
-    "play_list": "Play List",
-    "history": "History",
-    "top": "Top",
-    "mini": "Mini",
-    "no_data": "No Data",
-    "clear_data": "Clear Data",
-    "delete": "Delete",
-    "from": "From",
-    "sync": "Sync",
-    "total": "Items",
-    "website": "Official Website",
-    "issues": "Issues",
-    "theme": "Theme",
-    "donate": "Donate",
-    "set_success": "Set up successfully.",
-    "delete_success": "Delete successful.",
-    "delete_failed": "Delete failed.",
-    "star_success": "Collection success.",
-    "first_video": "This is the first episode.",
-    "last_video": "This is the last episode.",
-    "qr_tips": "Long click recognition.",
-    "zy_tips": "Prohibit the dissemination of illegal resources.",
-    "share_tips": "It has been copied to the clipboard. Please share it~",
-    "not_support_search": "Search is not supported on this site.",
-    "copy_success": "has been copied, Download it now",
-    "async_failed": "Synchronization successful, no updates found.",
-    "async_success": "Synchronization succeeded, update found.",
-    "no_history": "No history data.",
-    "clearDB": "Reset software",
-    "clearTips": "Click to clear the database and close the software",
-    "rate": "The current video speed is: "
-}
--- a/src/locales/index.js
+++ b/src/locales/index.js
@@ -1,9 +0,0 @@
-import en from './en.json'
-import zhCn from './zh-cn'
-
-export const defaultLocal = 'zhCn'
-
-export const languages = {
-  en: en,
-  zhCn: zhCn
-}
--- a/src/locales/zh-cn.json
+++ b/src/locales/zh-cn.json
@@ -1,52 +0,0 @@
-{
-    "zh": "中文",
-    "en": "英文",
-    "language": "语言",
-    "default_site": "默认源",
-    "view": "浏览",
-    "play": "播放",
-    "star": "收藏",
-    "setting": "设置",
-    "exists": "已存在",
-    "videoName": "视频名称",
-    "type": "类型",
-    "time": "时间",
-    "operate": "操作",
-    "share": "分享",
-    "detail": "详情",
-    "close": "关闭",
-    "download": "下载",
-    "all_download": "全集下载",
-    "next": "下一集",
-    "play_list": "播放列表",
-    "history": "历史记录",
-    "top": "置顶",
-    "mini": "精简模式",
-    "no_data": "无数据",
-    "clear_data": "清空数据",
-    "delete": "删除",
-    "from": "来源",
-    "sync": "同步",
-    "total": "条数据",
-    "website": "官网",
-    "issues": "反馈",
-    "theme": "主题",
-    "donate": "捐赠",
-    "set_success": "设置成功。",
-    "delete_success": "删除成功。",
-    "delete_failed": "删除失败。",
-    "star_success": "收藏成功。",
-    "first_video": "这已经是第一集了。",
-    "last_video": "这已经是最后一集了。",
-    "qr_tips": "长按二维码，识别播放。",
-    "zy_tips": "『ZY Player』技术支持，严禁传播违法资源。",
-    "share_tips": "已复制到剪贴板，快去分享吧~ 严禁传播违法资源!!!",
-    "not_support_search": "这个网站不支持搜索。",
-    "copy_success": "已复制，快去下载吧。",
-    "async_failed": "同步成功, 未查询到更新。",
-    "async_success": "同步成功, 查询到更新。",
-    "no_history": "无历史记录",
-    "clearDB": "重置软件",
-    "clearTips": "软件没有问题,请勿重置软件,否则数据丢失概不负责.点击即清空数据库,并关闭软件.",
-    "rate": "当前视频播放倍速为："
-}
--- a/src/main.js
+++ b/src/main.js
@@ -3,24 +3,10 @@ import App from './App.vue'
 import store from './store'
 import 'modern-normalize'
 import Register from './components/register'
-import VueI18n from 'vue-i18n'
-import { languages, defaultLocal } from './locales/index'
 import './lib/element/index'
-
-Vue.config.productionTip = false
-
 Register.registerComponents()
-
-Vue.use(VueI18n)
-const messages = Object.assign(languages)
-const i18n = new VueI18n({
-  locale: defaultLocal,
-  fallbackLocale: 'zhCn',
-  messages
-})
-
+Vue.config.productionTip = false
 new Vue({
  store,
-  i18n,
  render: h => h(App)
 }).$mount('#app')
--- a/src/mini/Mini.vue
+++ b/src/mini/Mini.vue
@@ -2,26 +2,38 @@
  <div class="mini">
    <div class="top">
      <div class="left">
-        <span class="number" v-show="length > 0">{{index + 1}} / {{length}}</span>
-        <span class="zy-svg" @click="prevEvent" v-show="index > 0">
+        <span class="title">
+          <span v-if="m3u8Arr.length > 1">『第 {{(video.index + 1)}} 集』</span>{{name}}
+        </span>
+        <span class="zy-svg" @click="prevEvent" v-show="video.index > 0">
          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="backIconTitle">
            <title id="backIconTitle">上一集</title>
            <path d="M14 14.74L21 19V5l-7 4.26V5L2 12l12 7v-4.26z"></path>
          </svg>
        </span>
-        <span class="zy-svg" @click="nextEvent" v-show="index < (length - 1)">
+        <span class="zy-svg" @click="nextEvent" v-show="video.index < (m3u8Arr.length - 1)">
          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="forwardIconTitle">
            <title id="forwardIconTitle">下一集</title>
            <path d="M10 14.74L3 19V5l7 4.26V5l12 7-12 7v-4.26z"></path>
          </svg>
        </span>
-        <span class="opacity">
-          <input type="number" min="5" max="100" v-model="opacity" @change="opacityChange"/>
-        </span>
+        <span class="opacity" v-show="opacity !== 100">透明度: {{opacity}}</span>
+        <span class="rate" v-show="rate !== 1">播放速率: {{rate}}</span>
+        <span class="progress" v-show="progress > 0">播放进度: {{progress}}%</span>
      </div>
      <div class="right">
-        <span class="min" @click="frameClickEvent('miniMin')"></span>
-        <span class="close" @click="frameClickEvent('miniClose')"></span>
+        <span class="top" @click="frameClickEvent('top')" title="置顶">
+          <svg t="1595919317571" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1188" style="width:10px;height:14px"><path d="M43.072 974.72l380.864-301.952 151.936 161.6c0 0 63.424 17.28 67.328-30.72l-3.904-163.584 225.088-259.648 98.048-5.696c0 0 76.928-15.488 21.184-82.752l-275.072-276.928c0 0-74.944-9.6-69.248 59.584l0 75.008L383.552 367.104 225.856 376.64c0 0-57.728 19.2-36.608 69.248l148.16 146.176L43.072 974.72 43.072 974.72z" p-id="1189" :fill="isAlwaysOnTop ? '#555555' : '#ffffff'"></path></svg>
+        </span>
+        <span class="min" @click="frameClickEvent('min')" title="最小化">
+          <svg t="1595917239849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1155" style="width:8px;height:14px"><path d="M0 479.936C0 444.64 28.448 416 64.064 416L959.936 416C995.328 416 1024 444.736 1024 479.936L1024 544.064C1024 579.392 995.552 608 959.936 608L64.064 608C28.672 608 0 579.264 0 544.064L0 479.936Z" p-id="1156" fill="#ffffff"></path></svg>
+        </span>
+        <span class="max" @click="frameClickEvent('max')" title="最大化">
+          <svg t="1595917343956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1540" style="width:8px;height:14px"><path d="M416 416 64.064 416C28.448 416 0 444.64 0 479.936L0 544.064C0 579.264 28.672 608 64.064 608L416 608 416 959.936C416 995.552 444.64 1024 479.936 1024L544.064 1024C579.264 1024 608 995.328 608 959.936L608 608 959.936 608C995.552 608 1024 579.36 1024 544.064L1024 479.936C1024 444.736 995.328 416 959.936 416L608 416 608 64.064C608 28.448 579.36 0 544.064 0L479.936 0C444.736 0 416 28.672 416 64.064L416 416Z" p-id="1541" fill="#ffffff"></path></svg>
+        </span>
+        <span class="close" @click="frameClickEvent('close')" title="关闭">
+          <svg t="1595917372551" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1685" style="width:8px;height:14px"><path d="M511.968 376.224 796.096 92.096C833.536 54.624 894.4 54.624 931.84 92.096 969.312 129.568 969.312 190.4 931.84 227.872L647.744 512 931.84 796.096C969.312 833.568 969.312 894.4 931.84 931.872 894.4 969.344 833.536 969.344 796.096 931.872L511.968 647.744 227.84 931.872C190.4 969.344 129.536 969.344 92.096 931.872 54.624 894.4 54.624 833.568 92.096 796.096L376.224 512 92.096 227.872C54.624 190.4 54.624 129.568 92.096 92.096 129.536 54.624 190.4 54.624 227.84 92.096L511.968 376.224Z" p-id="1686" fill="#ffffff"></path></svg>
+        </span>
      </div>
    </div>
    <div class="bottom">
@@ -30,100 +42,168 @@
  </div>
 </template>
 <script>
-import tools from '../lib/site/tools'
-import mini from '../lib/dexie/mini'
-import history from '../lib/dexie/history'
+import zy from '../lib/site/tools'
+import { history, setting, shortcut, mini } from '../lib/dexie'
+import mt from 'mousetrap'
 import 'xgplayer'
 import Hls from 'xgplayer-hls.js'
-const ipc = require('electron').ipcRenderer
+const { remote, ipcRenderer } = require('electron')
+const VIDEO_DETAIL_CACHE = {}
 export default {
  name: 'mini',
  data () {
+    const win = remote.getCurrentWindow()
    return {
      xg: null,
      config: {
        id: 'xg',
-        lang: 'zh-cn',
        url: '',
-        fluid: true,
+        lang: 'zh-cn',
+        width: '100%',
+        height: '100%',
        autoplay: false,
        videoInit: true,
        screenShot: true,
-        keyShortcut: 'on',
+        keyShortcut: 'off',
        crossOrigin: true,
+        cssFullscreen: true,
        defaultPlaybackRate: 1,
-        playbackRate: [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 3, 4, 5]
+        playbackRate: [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 3, 4, 5],
+        controls: false
      },
      opacity: 100,
+      name: '',
      video: {},
-      d: {},
-      index: 0,
-      length: 0
+      detail: {},
+      m3u8Arr: [],
+      rate: 1,
+      progress: 0,
+      isAlwaysOnTop: win.isAlwaysOnTop()
    }
  },
  methods: {
    frameClickEvent (e) {
-      ipc.send(e)
+      const win = remote.getCurrentWindow()
+      if (e === 'min') {
+        win.minimize()
+      }
+      if (e === 'max') {
+        win.isMaximized() ? win.unmaximize() : win.maximize()
+      }
+      if (e === 'close') {
+        ipcRenderer.send('win')
+        return false
+      }
+      if (e === 'top') {
+        this.isAlwaysOnTop = !this.isAlwaysOnTop
+        win.setAlwaysOnTop(this.isAlwaysOnTop)
+      }
    },
-    opacityChange (e) {
-      ipc.send('miniOpacity', this.opacity / 100)
+    opacityChange (val) {
+      const win = remote.getCurrentWindow()
+      const num = val / 100
+      win.setOpacity(num)
+      return false
    },
    getUrls () {
      mini.find().then(res => {
-        const v = res
        this.video = res
-        tools.detail_get(v.site, v.detail).then(res => {
-          this.d = res
-          this.index = v.index
-          this.length = this.d.m3u8_urls.length
-          const link = res.m3u8_urls[v.index]
-          const src = link.split('$')[1]
-          this.xg.src = src
-          const currentTime = v.currentTime
-          if (currentTime !== '') {
+        this.fetchM3u8List(res).then(m3u8Arr => {
+          this.m3u8Arr = m3u8Arr
+          this.xg.src = m3u8Arr[res.index]
+          if (res.time !== 0 || res.time !== '') {
            this.xg.play()
            this.xg.once('playing', () => {
-              this.xg.currentTime = currentTime
+              this.xg.currentTime = res.time
            })
          } else {
            this.xg.play()
          }
-          this.onPlayVideo()
-          this.xg.on('ended', () => {
-            if (this.d.m3u8_urls.length > 1 && (this.d.m3u8_urls.length - 1 > this.index)) {
-              this.video.currentTime = 0
+          this.videoPlaying()
+          this.xg.once('ended', () => {
+            if (m3u8Arr.length > 1 && (m3u8Arr.length - 1 > res.index)) {
+              this.video.time = 0
              this.video.index++
-              this.index++
-              let src = this.d.m3u8_urls[this.index]
-              src = src.split('$')[1]
-              this.xg.src = src
+              this.xg.src = m3u8Arr[this.video.index]
              this.xg.play()
            }
          })
        })
      })
    },
-    onPlayVideo () {
-      const h = { ...this.video }
-      history.find({ detail: h.detail }).then(res => {
+    fetchM3u8List (info) {
+      return new Promise((resolve) => {
+        const cacheKey = info.site + '@' + info.ids
+        if (VIDEO_DETAIL_CACHE[cacheKey]) {
+          this.name = VIDEO_DETAIL_CACHE[cacheKey].name
+          resolve(VIDEO_DETAIL_CACHE[cacheKey].list)
+          return
+        }
+        zy.detail(info.site, info.ids).then(res => {
+          this.name = res.name
+          const dd = res.dl.dd
+          const type = Object.prototype.toString.call(dd)
+          let m3u8Txt = []
+          if (type === '[object Array]') {
+            for (const i of dd) {
+              if (i._t.indexOf('m3u8') >= 0) {
+                m3u8Txt = i._t.split('#')
+              }
+            }
+          } else {
+            m3u8Txt = dd._t.split('#')
+          }
+          const m3u8Arr = []
+          for (const i of m3u8Txt) {
+            const j = i.split('$')
+            if (j.length > 1) {
+              for (let m = 0; m < j.length; m++) {
+                if (j[m].indexOf('m3u8') >= 0) {
+                  m3u8Arr.push(j[m])
+                }
+              }
+            } else {
+              m3u8Arr.push(j[0])
+            }
+          }
+
+          VIDEO_DETAIL_CACHE[cacheKey] = {
+            list: m3u8Arr,
+            name: res.name
+          }
+          resolve(m3u8Arr)
+        })
+      })
+    },
+    videoPlaying () {
+      history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
        if (res) {
-          h.id = res.id
-          history.update(res.id, h)
+          res.index = this.video.index
+          history.update(res.id, res)
        } else {
-          h.currentTime = ''
-          delete h.id
-          history.add(h)
+          const doc = {
+            site: this.video.site,
+            ids: this.video.ids,
+            name: this.video.name,
+            index: this.video.index,
+            time: 0
+          }
+          history.add(doc)
        }
      })
-      this.timerEvent(h.detail)
+      this.timerEvent()
    },
-    timerEvent (d) {
+    timerEvent () {
      this.timer = setInterval(() => {
-        history.find({ detail: d }).then(res => {
+        const endTime = this.xg.duration
+        const currentTime = this.xg.currentTime
+        const progress = (currentTime / endTime) * 100
+        this.progress = progress.toFixed(2)
+        history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
          if (res) {
            const v = res
-            v.currentTime = this.xg.currentTime
-            v.index = this.index
+            v.time = this.xg.currentTime
+            v.index = this.video.index
            const id = v.id
            delete v.id
            history.update(id, v)
@@ -132,36 +212,34 @@ export default {
      }, 10000)
    },
    prevEvent () {
-      if (this.index === 0) {
+      if (this.video.index === 0) {
+        this.$message.info('已是第一集.')
        return false
      }
-      history.find({ detail: this.video.detail }).then(res => {
+      history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
        const v = res
-        v.index--
        const id = v.id
+        v.index--
        delete v.id
        history.update(id, v).then(e => {
-          let src = this.d.m3u8_urls[v.index]
-          src = src.split('$')[1]
-          this.xg.src = src
-          this.index--
+          this.xg.src = this.m3u8Arr[v.index]
+          this.video.index--
        })
      })
    },
    nextEvent () {
-      if (this.index >= this.d.m3u8_urls.length - 1) {
+      if (this.video.index >= this.m3u8Arr.length - 1) {
+        this.$message.info('已是最后一集.')
        return false
      }
-      history.find({ detail: this.video.detail }).then(res => {
+      history.find({ site: this.video.site, ids: this.video.ids }).then(res => {
        const v = res
        v.index++
        const id = v.id
        delete v.id
        history.update(id, v).then(e => {
-          let src = this.d.m3u8_urls[v.index]
-          src = src.split('$')[1]
-          this.xg.src = src
-          this.index++
+          this.xg.src = this.m3u8Arr[v.index]
+          this.video.index++
        })
      })
    },
@@ -171,59 +249,161 @@ export default {
        rate = rate + e
        this.xg.playbackRate = rate
      }
+    },
+    mtEvent () {
+      setting.find().then(res => {
+        if (res.shortcut) {
+          shortcut.all().then(res => {
+            for (const i of res) {
+              mt.bind(i.key, () => {
+                this.shortcutEvent(i.name)
+              })
+            }
+          })
+        }
+      })
+    },
+    shortcutEvent (e) {
+      if (e === 'playAndPause') {
+        if (this.xg) {
+          if (this.xg.paused) {
+            this.xg.play()
+          } else {
+            this.xg.pause()
+          }
+        }
+        return false
+      }
+      if (e === 'forward') {
+        if (this.xg && !this.xg.paused) {
+          this.xg.currentTime += 5
+        }
+        return false
+      }
+      if (e === 'back') {
+        if (this.xg && !this.xg.paused) {
+          this.xg.currentTime -= 5
+        }
+        return false
+      }
+      if (e === 'volumeUp') {
+        if (this.xg && this.xg.volume < 0.9) {
+          this.xg.volume += 0.1
+        }
+        return false
+      }
+      if (e === 'volumeDown') {
+        if (this.xg && this.xg.volume > 0.2) {
+          this.xg.volume -= 0.1
+        }
+        return false
+      }
+      if (e === 'mute') {
+        if (this.xg) {
+          this.xg.volume = 0
+        }
+        return false
+      }
+      if (e === 'top') {
+        const win = remote.getCurrentWindow()
+        if (win.isAlwaysOnTop()) {
+          win.setAlwaysOnTop(false)
+        } else {
+          win.setAlwaysOnTop(true)
+        }
+        return false
+      }
+      if (e === 'fullscreen') {
+        if (this.xg.fullscreen) {
+          this.xg.exitFullscreen()
+        } else {
+          this.xg.getFullscreen(this.xg.root)
+        }
+        return false
+      }
+      if (e === 'escape') {
+        if (this.xg.fullscreen) {
+          this.xg.exitFullscreen()
+          this.xg.exitCssFullscreen()
+        }
+        return false
+      }
+      if (e === 'next') {
+        this.nextEvent()
+        return false
+      }
+      if (e === 'prev') {
+        this.prevEvent()
+        return false
+      }
+      if (e === 'home') {
+        if (this.xg && !this.xg.paused) {
+          this.xg.currentTime = 0
+        }
+        return false
+      }
+      if (e === 'end') {
+        if (this.xg && !this.xg.paused) {
+          const endTime = this.xg.duration
+          this.xg.currentTime = endTime
+        }
+        return false
+      }
+      if (e === 'opacityUp') {
+        const win = remote.getCurrentWindow()
+        if (this.opacity >= 10) {
+          this.opacity -= 5
+          const num = this.opacity / 100
+          win.setOpacity(num)
+        }
+        return false
+      }
+      if (e === 'opacityDown') {
+        const win = remote.getCurrentWindow()
+        if (this.opacity <= 95) {
+          this.opacity += 5
+          const num = this.opacity / 100
+          win.setOpacity(num)
+        }
+        return false
+      }
+      if (e === 'playbackRateUp') {
+        if (this.xg && !this.xg.paused) {
+          const rate = this.xg.playbackRate
+          this.xg.playbackRate = rate + 0.25
+          this.rate = this.xg.playbackRate
+        }
+        return false
+      }
+      if (e === 'playbackRateDown') {
+        if (this.xg && !this.xg.paused) {
+          const rate = this.xg.playbackRate
+          if (rate > 0.25) {
+            this.xg.playbackRate = rate - 0.25
+            this.rate = this.xg.playbackRate
+          }
+        }
+        return false
+      }
+      if (e === 'mini') {
+        ipcRenderer.send('win')
+        return false
+      }
    }
  },
-  created () {
-    this.getUrls()
-  },
  mounted () {
    this.xg = new Hls(this.config)
-    ipc.on('next', () => {
-      if (this.xg) {
-        if (this.xg.hasStart) {
-          this.nextEvent()
-        }
-      }
-    })
-    ipc.on('prev', () => {
-      if (this.xg) {
-        if (this.xg.hasStart) {
-          this.prevEvent()
-        }
-      }
-    })
-    ipc.on('up', () => {
-      if (this.opacity <= 95) {
-        this.opacity = this.opacity + 5
-        this.opacityChange(this.opacity)
-      }
-    })
-    ipc.on('down', () => {
-      if (this.opacity >= 10) {
-        this.opacity = this.opacity - 5
-        this.opacityChange(this.opacity)
-      }
-    })
-    ipc.on('playbackRateUp', () => {
-      if (this.xg) {
-        if (this.xg.hasStart) {
-          this.playbackRateEvent(0.25)
-        }
-      }
-    })
-    ipc.on('playbackRateDown', () => {
-      if (this.xg) {
-        if (this.xg.hasStart) {
-          this.playbackRateEvent(-0.25)
-        }
-      }
-    })
+    this.mtEvent()
+    this.getUrls()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
  }
 }
 </script>
 <style lang="scss">
 html,body{
-  padding: 0;
+  padding: 1px;
  margin: 0;
  height: 100%;
  width: 100%;
@@ -231,9 +411,15 @@ html,body{
  background-color: #000;
 }
 .mini{
+  -webkit-app-region: drag;
  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  flex-direction: column;
  .top{
-    -webkit-app-region: drag;
    width: 100%;
    height: 30px;
    display: flex;
@@ -249,7 +435,7 @@ html,body{
      svg{
        width: 24px;
        height: 24px;
-        stroke: #fff;
+        stroke: #888;
        stroke-width: 1;
        stroke-linecap: round;
        stroke-linejoin: round;
@@ -262,20 +448,10 @@ html,body{
      align-items: center;
      height: 100%;
      flex: 1;
-      .number{
-        color: #fff;
-        margin: 0 10px;
+      .title, .opacity, .rate, .progress{
+        color: #888;
        font-size: 12px;
-      }
-      .opacity{
-        -webkit-app-region: no-drag;
-        margin-left: 10px;
-        input{
-          text-indent: 4px;
-          background-color: #000;
-          color: #fff;
-          border: 1px solid #aaa;
-        }
+        margin: 0 10px;
      }
    }
    .right{
@@ -287,18 +463,26 @@ html,body{
      span{
        -webkit-app-region: no-drag;
        display: inline-block;
-        width: 16px;
-        height: 16px;
+        width: 14px;
+        height: 14px;
+        text-align: center;
+        line-height: 14px;
        border-radius: 50%;
        margin-right: 10px;
        cursor: pointer;
-        opacity: 0.5;
+        opacity: 0.4;
        &.min{
+          background-color: #32dc36;
+        }
+        &.max{
          background-color: #ffbe2a;
        }
        &.close{
          background-color: #ff5f56;
        }
+        &.top{
+          background-color: #f3bab7;
+        }
        &:hover{
          animation: heartbeat 3s ease-in-out infinite both;
        }
@@ -331,7 +515,10 @@ html,body{
  }
  .bottom{
    width: 100%;
-    height: 305px;
+    flex: 1;
+    .xgplayer-start{
+      -webkit-app-region: no-drag;
+    }
  }
 }
 </style>
--- a/src/mini/main.js
+++ b/src/mini/main.js
@@ -1,5 +1,8 @@
 import Vue from 'vue'
 import Mini from './Mini'
+import 'modern-normalize'
+import '../lib/element/index'
+
 Vue.config.productionTip = false

 new Vue({
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,63 +6,69 @@ Vue.use(Vuex)
 export default new Vuex.Store({
  state: {
    view: 'Film',
-    theme: 'light',
-    site: 'zuidazy',
-    language: 'zhCn',
+    setting: {
+      theme: 'light',
+      site: 'zuidazy',
+      view: 'picture',
+      shortcut: true
+    },
    detail: {
      show: false,
-      v: {}
+      key: '',
+      info: {}
    },
    share: {
      show: false,
-      v: {}
+      key: '',
+      info: {}
    },
-    video: {}
+    video: {
+      key: '',
+      info: {}
+    },
+    editSites: {
+      show: false,
+      sites: []
+    }
  },
  getters: {
    getView: state => {
      return state.view
    },
-    getTheme: state => {
-      return state.theme
-    },
-    getSite: state => {
-      return state.site
-    },
-    getLanguage: state => {
-      return state.language
+    getSetting: state => {
+      return state.setting
    },
    getDetail: state => {
      return state.detail
    },
+    getShare: state => {
+      return state.share
+    },
    getVideo: state => {
      return state.video
    },
-    getShare: state => {
-      return state.share
+    getEditSites: state => {
+      return state.editSites
    }
  },
  mutations: {
    SET_VIEW: (state, payload) => {
      state.view = payload
    },
-    SET_THEME: (state, payload) => {
-      state.theme = payload
-    },
-    SET_SITE: (state, payload) => {
-      state.site = payload
-    },
-    SET_LANGUAGE: (state, payload) => {
-      state.language = payload
+    SET_SETTING: (state, payload) => {
+      state.setting = payload
    },
    SET_DETAIL: (state, payload) => {
      state.detail = payload
    },
+    SET_SHARE: (state, payload) => {
+      state.share = payload
+    },
    SET_VIDEO: (state, payload) => {
      state.video = payload
    },
-    SET_SHARE: (state, payload) => {
-      state.share = payload
+    SET_EDITSITES: (state, payload) => {
+      state.editSites = payload
    }
  }
 })
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
haiyangcui	2d406c0c24	v2.5.1	2020-10-04 16:59:17 +02:00
haiyangcui	7b39be271f	添加额外在线直播源文件	2020-10-04 16:55:50 +02:00
haiyangcui	d8367414a2	修复无法正确导入直播源的问题	2020-10-04 16:53:11 +02:00
haiyangcui	d647d2ecec	v2.5.0	2020-10-04 12:49:21 +02:00
haiyangcui	7f9f847d73	内置腾讯云直播源	2020-10-04 12:29:10 +02:00
haiyangcui	36e0b140cd	解决中文乱码问题	2020-10-04 12:20:24 +02:00
haiyangcui	99948770ff	读取m3u文件	2020-10-04 11:08:21 +02:00
haiyangcui	5300d777ce	移除无用链接	2020-10-04 10:30:49 +02:00
haiyangcui	64da42524d	添加赞赏码	2020-10-04 10:30:29 +02:00
haiyangcui	1ebdfee7bc	支持播放器内播放直播	2020-10-03 23:17:19 +02:00
haiyangcui	17ba319157	添加"导入" "导出" "重置"	2020-10-01 23:33:24 +02:00
haiyangcui	27bdc3559d	添加新频道页面	2020-10-01 23:33:21 +02:00
haiyangcui	ca53a22598	添加删除功能	2020-10-01 23:33:18 +02:00
haiyangcui	6632318cf6	添加简单的IPTV页面	2020-10-01 23:33:15 +02:00
haiyangcui	cb7a4af7ae	2.4.10.1 国庆版	2020-10-01 13:34:21 +02:00
haiyangcui	25340b79aa	v2.4.9	2020-09-30 21:33:08 +02:00
haiyangcui	381b0a8735	记录窗口大小及位置	2020-09-30 21:11:54 +02:00
haiyangcui	c7b99244bb	更新style	2020-09-29 23:08:23 +02:00
haiyangcui	5b5826e9a6	改进checkbox的点击效果	2020-09-29 17:43:14 +02:00
haiyangcui	03e2f2673b	更新style	2020-09-29 17:37:47 +02:00
haiyangcui	503a90d8da	转移收藏相关操作到收藏页面	2020-09-29 15:23:09 +02:00
haiyangcui	afb92d59ff	可设置快进快退的步长	2020-09-28 23:30:24 +02:00
haiyangcui	d26f1cbdf7	简影	2020-09-28 21:11:48 +02:00
haiyangcui	7f821b05ad	哆咪动漫	2020-09-28 20:53:48 +02:00
haiyangcui	746c93c9d2	樱花动漫	2020-09-28 20:53:15 +02:00
haiyangcui	9fb51ed8fc	点击'播放在线高清视频'也可以控制check box的开关	2020-09-28 17:51:56 +02:00
haiyangcui	6a1c045e0b	解析网站的代码放到onlineVideo里	2020-09-28 16:38:31 +02:00
haiyangcui	756b8ecc33	添加"素白白"的支持	2020-09-27 17:59:13 +02:00
haiyangcui	b4946a6c99	比较在线搜索结果时,忽略空格	2020-09-27 15:11:56 +02:00
haiyangcui	cbde4180ab	2.4.8	2020-09-27 15:02:24 +02:00
haiyangcui	00dab782e8	搜索的时候设置timeout,解决全局搜索结果无法打开的问题	2020-09-27 14:55:56 +02:00
haiyangcui	89d6183841	支持播放在线高清视频	2020-09-27 13:44:38 +02:00
haiyangcui	efd2095261	v2.4.7	2020-09-18 19:09:51 +02:00
haiyangcui	cbedb859c3	电影列表页面屏蔽福利片	2020-09-17 16:08:12 +02:00
haiyangcui	65aedc84cf	有最新版本时,在设置页面有提示	2020-09-16 22:17:04 +02:00
haiyangcui	95c58095ee	屏蔽福利片选项	2020-09-16 20:00:22 +02:00
haiyangcui	b5da3c7f81	屏蔽主分类	2020-09-13 15:05:54 +02:00
haiyangcui	5b0211b2ed	如果编辑源页面没有打开,无需更新	2020-09-13 14:51:22 +02:00
haiyangcui	0bb6409687	只有EditSites的资源列表变化时才更新Film页面	2020-09-13 08:19:57 +02:00
haiyangcui	7078e05668	修复编辑第三方播放器地址的bug	2020-09-12 22:35:54 +02:00
haiyangcui	0172a204b1	2.4.6	2020-09-12 08:28:30 +02:00
haiyangcui	c6b0781a02	添加源后清空输入框	2020-09-11 17:33:53 +02:00
haiyangcui	b3e67bcc7d	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player	2020-09-10 23:53:51 +02:00
haiyangcui	cbca6db97e	改进EditSites页面	2020-09-10 21:20:30 +02:00
haiyangcui	814ecaf25b	添加时检查name和api不能为空	2020-09-10 21:14:32 +02:00
haiyangcui	4a07520336	源更新时更新Film页面的源列表	2020-09-10 21:13:42 +02:00
haiyangcui	2e121a901c	ChangeView的时候关闭EditSites页面	2020-09-10 20:59:28 +02:00
haiyangcui	3a2a16a168	增加"添加新源"页面	2020-09-10 17:59:36 +02:00
Hunlongyu	881ab6cfa5	更换蓝奏云链接	2020-09-10 23:14:35 +08:00
haiyangcui	3151b33a23	支持源页面可拖曳	2020-09-09 17:34:23 +02:00
haiyangcui	f154f44772	添加编辑源页面	2020-09-09 17:12:18 +02:00
haiyangcui	a1458cf8bf	收藏页面添加观看至第几集的信息	2020-09-07 23:37:11 +02:00
haiyangcui	595136c799	支持收藏列表的拖曳排序	2020-09-07 20:48:33 +02:00
haiyangcui	b7e497e2d9	历史记录和收藏页面，添加表头	2020-09-07 13:35:04 +02:00
haiyangcui	dce8ad2ef2	支持直接编辑第三方播放器路径	2020-09-07 12:16:28 +02:00
haiyangcui	79ba45b63a	新播放的历史记录置顶	2020-09-05 23:39:16 +02:00
haiyangcui	b6fcbcb934	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player	2020-09-04 22:08:47 +02:00
haiyangcui	54c4409311	同步的时候不清除有更新标记	2020-09-02 23:05:40 +02:00
Hunlongyu	5e9c273048	更新详情截图	2020-09-02 19:57:49 +08:00
Hunlongyu	197df4e830	Update README.md	2020-09-02 19:44:39 +08:00
Hunlongyu	5271dfa490	Update README.md	2020-09-02 19:43:05 +08:00
Hunlongyu	7efde45aed	Update README.md	2020-09-02 19:42:39 +08:00
Hunlongyu	4c92918dc3	Update README.md	2020-09-02 19:28:34 +08:00
haiyangcui	6c0bd5125b	美化精简模式的按钮	2020-09-02 13:16:39 +02:00
haiyangcui	785f9b20e7	用m3u文件替代dpl文件	2020-09-01 23:03:24 +02:00
haiyangcui	8d052d2904	无搜索结果时,不需要提醒	2020-09-01 21:57:28 +02:00
haiyangcui	69a397e24e	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player	2020-08-30 13:48:01 +02:00
haiyangcui	c216352268	改进详情页面宽度	2020-08-30 13:47:39 +02:00
haiyangcui	89448d390f	Install cheerio	2020-08-30 13:32:07 +02:00
haiyangcui	a853b02aa0	v2.4.5	2020-08-30 13:23:00 +02:00
haiyangcui	0443ce248f	重置源放最后	2020-08-30 13:03:51 +02:00
haiyangcui	8009c3197e	比较头两个搜索结果	2020-08-30 12:09:23 +02:00
haiyangcui	978d4e7181	2.4.5	2020-08-30 11:35:20 +02:00
haiyangcui	138b70263a	添加豆瓣评分	2020-08-30 11:34:22 +02:00
haiyangcui	7f48c91f97	如果没有选择本地播放器,选择在线播放	2020-08-30 10:49:08 +02:00
haiyangcui	7a494a54c0	详情页添加"豆瓣"	2020-08-30 10:28:57 +02:00
haiyangcui	97812af0fd	v2.4.4	2020-08-28 15:00:56 +02:00
haiyangcui	490d7c963e	支持导入所有剧集到PotPlayer	2020-08-28 14:53:09 +02:00
haiyangcui	ed1afa2026	添加“重置源”功能	2020-08-28 12:58:16 +02:00
haiyangcui	7ef114d0e3	Change View的时候关闭Detail	2020-08-28 12:43:09 +02:00
haiyangcui	7f9b7fc2c8	Detail页面左边留出60px，侧边栏的宽度	2020-08-28 12:40:26 +02:00
haiyangcui	511820f873	修复历史记录里的下载功能	2020-08-27 17:01:22 +02:00
haiyangcui	af6dcb11bf	修复剧集的分享功能	2020-08-27 16:53:46 +02:00
haiyangcui	7ecad1ad8e	同步历史和收藏的operate buttons	2020-08-27 16:45:29 +02:00
haiyangcui	4d169f9d51	删除无用代码	2020-08-27 16:36:04 +02:00
haiyangcui	f3862e8385	格式化快捷键数据	2020-08-27 16:20:03 +02:00
haiyangcui	490d4839b7	没有更新的收藏跳过clearHasUpdateFlag	2020-08-27 16:06:46 +02:00
haiyangcui	033bcb3df7	修复下载功能	2020-08-27 15:52:56 +02:00
haiyangcui	df22efa980	导入收藏时不清空	2020-08-27 15:26:47 +02:00
haiyangcui	5428891297	删除多余信息	2020-08-27 15:14:03 +02:00
haiyangcui	bb3502774b	同步时更新收藏信息	2020-08-27 15:05:57 +02:00
haiyangcui	fa67ad03d2	恢复播放页面的收藏逻辑	2020-08-27 15:03:28 +02:00
haiyangcui	8a196ae52a	解决收藏项无法直接播放的bug	2020-08-27 14:48:11 +02:00
haiyangcui	ebfb681205	导出时先更新数据	2020-08-27 14:32:29 +02:00
haiyangcui	ba9f3246d2	Fix typo bug	2020-08-27 14:25:22 +02:00
haiyangcui	51cb181acd	改进播放页面的收藏功能	2020-08-27 13:58:05 +02:00
haiyangcui	33537638b0	更新version到2.4.3	2020-08-27 13:39:50 +02:00
haiyangcui	fa9f85a177	使用star.key	2020-08-27 13:33:21 +02:00
haiyangcui	3e1ecaac74	Fix bug in checkStar	2020-08-27 13:24:55 +02:00
haiyangcui	5cc9849e8a	导入收藏时升级数据格式	2020-08-27 13:13:45 +02:00
haiyangcui	e353b629c5	添加"更新收藏"	2020-08-27 13:08:41 +02:00
haiyangcui	4d20d5bc68	No need to record site info in star	2020-08-27 13:08:22 +02:00
haiyangcui	a921ce7adf	添加“清空所有收藏”	2020-08-27 12:39:54 +02:00
haiyangcui	1dd8d0dd24	在视图和列表里添加备注	2020-08-26 18:15:02 +02:00
haiyangcui	b90c359670	Reverse the list return by zy.list, to get video list from new to old	2020-08-26 16:24:57 +02:00
haiyangcui	27eb8c06ff	添加“最新”到class列表	2020-08-26 11:42:15 +02:00
haiyangcui	add2bedb61	v2.4.2	2020-08-25 16:59:59 +02:00
haiyangcui	3dc970e198	更新已存在的收藏	2020-08-25 15:54:07 +02:00
haiyangcui	3f2def4455	添加第三方播放器路径设置	2020-08-25 14:38:46 +02:00
haiyangcui	5b8d883af4	Format JSON string	2020-08-25 13:48:33 +02:00
haiyangcui	7113567475	可以使用PotPlayer打开视频	2020-08-25 00:31:34 +02:00
haiyangcui	e30da35e72	Import sites from file	2020-08-24 13:10:30 +02:00
haiyangcui	55b7396a2e	Export sites to file	2020-08-24 12:54:31 +02:00
haiyangcui	83568fa499	No need to copy to clipboard	2020-08-24 12:32:51 +02:00
haiyangcui	838d3a64cd	v2.4.1	2020-08-23 17:48:10 +02:00
haiyangcui	506be03e3e	从文件中导入收藏	2020-08-23 17:45:19 +02:00
haiyangcui	cfdb561473	加入取消操作识别	2020-08-23 15:03:47 +02:00
haiyangcui	ab2f45189f	导出收藏到文件	2020-08-23 14:33:59 +02:00
haiyangcui	f4b9a73b18	Simple favorites export import	2020-08-22 17:55:10 +02:00
haiyangcui	6f99d789f4	2.4.0	2020-08-22 16:08:38 +02:00
haiyangcui	e71090dad2	Wrap the items in Settings theme-box	2020-08-22 15:54:39 +02:00
haiyangcui	afe3351837	Add left margin to name	2020-08-22 15:35:28 +02:00
haiyangcui	5dc0613aeb	列表自适应	2020-08-22 15:06:10 +02:00
haiyangcui	1c6385ae6c	使用v-show显示隐藏class element,这样可以保持其占位	2020-08-22 10:58:47 +02:00
haiyangcui	88a95a8bfb	保存搜索选项设置	2020-08-22 00:20:18 +02:00
haiyangcui	951e6ffa37	更好的修复bug#183	2020-08-21 23:49:00 +02:00
haiyangcui	b83aed0a97	解决bug #183	2020-08-21 23:36:17 +02:00
haiyangcui	67ce537039	Add search style	2020-08-21 23:00:21 +02:00
haiyangcui	975562a66b	Fix a bug in Detail.vue	2020-08-19 23:31:20 +02:00
haiyangcui	8e7015c9d6	调整"搜索所有资源"位置	2020-08-19 23:09:42 +02:00
haiyangcui	b841552dc7	转移"搜索所有资源"到设置页面	2020-08-19 18:07:37 +02:00
haiyangcui	0a9b939dc3	v2.3.8	2020-08-19 11:36:08 +02:00
haiyangcui	14ff252cce	定义--highlight-color	2020-08-19 08:30:18 +02:00
haiyangcui	afd016be93	取消“搜索所有资源”的边框	2020-08-18 23:00:05 +02:00
haiyangcui	9cd7f7d267	高亮有更新的收藏项	2020-08-18 22:51:03 +02:00
haiyangcui	8a76ec4e87	Null check on site	2020-08-18 17:39:39 +02:00
haiyangcui	a00d965ce9	v2.3.7	2020-08-18 16:00:05 +02:00
Hunlongyu	c9eb0c3e22	Merge pull request #178 from cuiocean/master 添加搜索所有资源功能	2020-08-18 16:13:08 +08:00
haiyangcui	c80c0bd948	Video中添加site信息	2020-08-16 23:02:18 +02:00
haiyangcui	65dcfa04ae	在star中添加key信息	2020-08-16 22:58:12 +02:00
haiyangcui	4e4ab82ea2	添加site信息在Detail里	2020-08-16 22:30:54 +02:00
haiyangcui	dd2adf4f99	更新格式	2020-08-15 16:44:43 +02:00
haiyangcui	777fbde528	在历史界面显示资源网站名,而不是资源标识	2020-08-15 16:30:09 +02:00
haiyangcui	472898f978	Fix downloadEvent	2020-08-15 12:27:44 +02:00
haiyangcui	7f41d415f1	删除searchSingleSiteEvent	2020-08-15 12:18:40 +02:00
haiyangcui	5d37a36c21	添加简单的style	2020-08-15 11:23:19 +02:00
haiyangcui	3a499766af	playEvent starEvent shareEvent downloadEvent all take site as the input argument	2020-08-15 10:56:48 +02:00
haiyangcui	cea797b6d0	Save whole site data to res.site	2020-08-14 21:55:41 +02:00
haiyangcui	37b41b0e20	无搜索结果时，提示资源网站名字	2020-08-14 19:41:00 +02:00
haiyangcui	1105c46f08	添加“搜索所有资源”checkbox	2020-08-14 19:29:39 +02:00
haiyangcui	1df7b41edd	搜索结果显示资源网名字	2020-08-13 22:04:50 +02:00
haiyangcui	f76c71c950	Merge searchClickEvent and searchEvent	2020-08-13 21:46:23 +02:00
Hunlongyu	cd77384bd9	😄 v2.3.6 😆	2020-08-12 15:47:33 +08:00
Hunlongyu	64adc9d6c1	Merge pull request #170 from cuiocean/master 添加"备注"到搜索结果	2020-08-12 15:46:16 +08:00
haiyangcui	e9095e50a6	添加"备注"到搜索结果	2020-08-06 08:51:39 +02:00
Hunlongyu	acfa742b4f	👮‍♂️ v2.3.5 👨‍🚀	2020-08-06 10:15:34 +08:00
Hunlongyu	a79c48cba0	👨‍🚒👩‍🚒 v2.3.4 👨‍🚀👩‍🚀	2020-08-06 10:13:51 +08:00
Hunlongyu	904ef5ccea	modify css	2020-08-06 09:58:39 +08:00
Hunlongyu	3db281c87f	Merge pull request #168 from cuiocean/master 添加"备注"列到收藏试图	2020-08-06 09:57:29 +08:00
haiyangcui	076e6e99e4	当有更新时，刷新list列表	2020-08-05 17:06:17 +02:00
haiyangcui	32f6ac0310	添加"备注"列到收藏试图	2020-08-05 16:39:46 +02:00
haiyangcui	b8706ea432	添加播放视频点击事件到历史记录里的片名	2020-08-05 16:27:11 +02:00
haiyangcui	509d6c7900	添加"备注"列到收藏试图	2020-08-05 16:25:45 +02:00
Hunlongyu	51454d828c	🐱‍💻 v2.3.3 🐱‍🐉	2020-08-05 11:37:37 +08:00
Hunlongyu	59449886f5	🐱‍👤 新增一键同步所有收藏, 优化样式 🐱‍🏍	2020-08-05 11:35:39 +08:00
Hunlongyu	601e9895cc	Merge pull request #166 from cuiocean/master 添加"同步所有收藏"按钮	2020-08-05 11:03:21 +08:00
haiyangcui	1ba8b46990	Fix typo in the function name	2020-08-04 19:06:17 +02:00
haiyangcui	7ed34caa56	Add UpdateAll button	2020-08-04 17:53:07 +02:00
Hunlongyu	fc40521420	🐱‍💻🐱‍🐉 发版 2.2.0 🐱‍👓🐱‍🚀	2020-08-04 10:17:19 +08:00
Hunlongyu	cfdd836e01	showHistory change to history	2020-08-04 10:14:11 +08:00
Hunlongyu	083e00ddbf	Merge pull request #163 from cuiocean/master 添加“历史记录”到侧边栏	2020-08-04 10:10:07 +08:00
Hunlongyu	c41c7c4857	✌ 修改为字符串 👌	2020-08-04 10:09:22 +08:00
Hunlongyu	4bde51dc38	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player	2020-08-04 10:03:38 +08:00
Hunlongyu	38c7540145	删除 console	2020-08-04 10:03:33 +08:00
Hunlongyu	a44579d4a1	Merge pull request #160 from hectorqin/master 修复m3u8链接获取问题,修复跨域问题	2020-08-04 10:00:10 +08:00
Hunlongyu	7f2d6f12c0	删除备注, 以及console	2020-08-04 09:51:48 +08:00
haiyangcui	daf1c4ddb6	Add ShowHistory to Aside	2020-08-03 21:13:50 +02:00
hectorqin	c1372c5589	新增复制调试信息功能和上次播放提示	2020-08-02 11:57:36 +08:00
hectorqin	c623533271	修复m3u8链接获取问题,修复跨域问题	2020-08-01 22:04:14 +08:00
Hunlongyu	069e7e16d6	✌ 大佬优化了播放器 🤞	2020-07-29 10:31:55 +08:00
Hunlongyu	cabe4240f4	Merge pull request #150 from hectorqin/master 完善播放器功能，完善右上角窗口管理icon	2020-07-29 10:27:57 +08:00
hectorqin	5448e86109	更新播放库	2020-07-29 09:54:45 +08:00
hectorqin	536f6dad7d	新增导出播放列表功能,修复mini同步进度,优化mini视频加载	2020-07-28 22:53:54 +08:00
hectorqin	bf2796779f	优化播放器	2020-07-28 21:18:21 +08:00
hectorqin	3a29147fd6	完善右上角按钮,完善播放器标题	2020-07-28 17:33:45 +08:00
hectorqin	e987ecc446	完善播放器功能	2020-07-28 10:21:14 +08:00
Hunlongyu	9aee6d8527	Merge pull request #143 from godvmxi/master add yarn guide for dev and build	2020-07-24 20:39:35 +08:00
Bright Jiang	4d438fcdd3	add yarn usage guide for dev and build	2020-07-24 15:23:34 +08:00
hunlongyu	36e40f4778	🚀 x86 🚁	2020-07-22 10:51:38 +08:00
hunlongyu	422def0702	🎨🖼 x86 打包 🎭🎪	2020-07-22 09:44:25 +08:00
hunlongyu	fc52d79d88	✨🎉 V2.0.0 正式版发布 🎇🎊	2020-07-22 09:38:26 +08:00
dandan	cc09d0aca0	Merge pull request #1 from Hunlongyu/master merge to latest	2020-07-17 14:36:52 +08:00
hunlongyu	b514f1c04e	v1.2.6	2020-07-16 00:03:34 +08:00
hunlongyu	189e67eb22	🦺 1.2.5 🥼	2020-07-15 23:55:34 +08:00
hunlongyu	e5c3adf1c5	🎍 1.2.4 🎋	2020-07-15 23:53:53 +08:00
hunlongyu	299367f0b8	✨ 修复收藏夹播放多集视频的BUG 🎉	2020-07-15 23:51:27 +08:00
hunlongyu	0d67474459	🎟 版本号 🎫	2020-07-15 17:38:21 +08:00
hunlongyu	15a188aa85	🎍 优化 MINI 模式 🎋	2020-07-15 17:38:00 +08:00
hunlongyu	0555badcfa	🍚 修复列表模式下, 下载BUG 🍜	2020-07-14 16:35:51 +08:00
hunlongyu	6f8f700dfc	🍟 修复BUG 🌭	2020-07-14 15:26:01 +08:00
hunlongyu	001772d75c	🎉 优化搜索 🎊	2020-07-14 00:17:26 +08:00
hunlongyu	a2d2215646	🎆 修复详情页无法播放的BUG 🎇	2020-07-14 00:16:55 +08:00
hunlongyu	053853f036	🍖 首页新增文档入口 🍗	2020-07-13 17:58:39 +08:00
hunlongyu	d4ea77b961	modify base	2020-07-13 17:52:59 +08:00
hunlongyu	1cd91aada2	🌮 切换端口号, 添加文档 🥪	2020-07-13 17:49:45 +08:00
hunlongyu	f3aa8c1f51	🥗 新增多个下载入口 🥙	2020-07-13 15:25:47 +08:00
hunlongyu	ce73a9a095	🎋 优化搜索 🎄	2020-07-12 02:44:32 +08:00
hunlongyu	504fc7fc47	🧶 版本号升级	2020-07-11 00:34:37 +08:00
hunlongyu	ac56980317	🎗 修复无法软件重置 bug 🎨	2020-07-11 00:32:50 +08:00
hunlongyu	c1043d9197	🎭 修复窗口尺寸 🦺	2020-07-11 00:14:51 +08:00
hunlongyu	8902282fe2	🎉✨ 新版本内测 🎊🎏	2020-07-10 23:24:28 +08:00
Hunlongyu	e0ae32027a	Merge pull request #116 from jingsong-liu/patch-1 fix typo	2020-06-25 17:05:09 +08:00
Song	f5ffca0c52	fix typo	2020-06-24 20:11:30 +08:00
Hunlongyu	a95f915328	Merge pull request #114 from godvmxi/master Fix build command	2020-06-24 16:19:34 +08:00
Bright Jiang	1badcea9f3	Fix build command	2020-06-24 16:16:45 +08:00
Hunlongyu	a448825ed2	Merge pull request #113 from godvmxi/master add toc and develop guild	2020-06-24 16:01:52 +08:00
Bright Jiang	708b6bbd3a	add toc and develop guild	2020-06-24 15:56:22 +08:00
Hunlongyu	7ded9a8485	Update README.md	2020-06-24 14:16:52 +08:00
Hunlongyu	57d60e9400	感谢异次元软件世界的推广 🥰😘😍	2020-06-22 23:33:10 +08:00
Hunlongyu	e01254c1c4	Update README.md	2020-06-22 23:10:42 +08:00
Hunlongyu	a007e62e38	Create build.yml	2020-06-22 11:19:16 +08:00
hunlongyu	117c805e3c	🚑 打包	2020-06-22 11:13:32 +08:00
hunlongyu	529558b754	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player	2020-06-22 11:00:50 +08:00
hunlongyu	3b86ccd0d8	🚉 添加声明	2020-06-22 10:58:38 +08:00
hunlongyu	508a3af4b3	🚇 移除捐赠二维码	2020-06-22 10:44:43 +08:00
Hunlongyu	a010d8f11e	🦼 modify image	2020-06-18 14:34:37 +08:00
hunlongyu	d1a3c404fa	🚲 全新版本,从心出发	2020-06-17 16:33:31 +08:00
hunlongyu	1dbd07faae	🎈 优化视频自适应大小	2020-06-13 10:24:11 +08:00
Hunlongyu	4dec62aa9c	Merge pull request #101 from WinterSoHot/master fix(Play.vue):播放界面自适应窗口	2020-06-13 10:19:41 +08:00
Dongxian Gu	1f781ae92d	fix(Play.vue):播放界面自适应窗口	2020-06-12 23:17:56 +08:00
hunlongyu	4717299ae6	🤣 新增分享演示	2020-06-05 23:24:18 +08:00
hunlongyu	8d40cbd5fc	😶 移除测试代码	2020-06-05 11:14:49 +08:00
hunlongyu	4c8fa08166	🙄 解决 Mac 下 dock 栏不显示图标问题	2020-06-05 11:09:52 +08:00
hunlongyu	ac513fbce6	🙄 解决 Mac 下 dock 栏不显示图标问题	2020-06-05 11:09:19 +08:00
hunlongyu	9321d3a5d9	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player	2020-06-05 10:26:41 +08:00
hunlongyu	0f2776fb1c	😁 移除测试代码	2020-06-05 10:26:37 +08:00
Hunlongyu	b577ce12c1	Merge pull request #77 from zhangweiii/master 修复Mac下dock栏不显示图标	2020-06-05 10:25:16 +08:00
zhangweiii	fa4c4e22fd	修复Mac下dock栏不显示图标	2020-06-04 10:53:02 +08:00
hunlongyu	a93d4042ba	🎢 修复 Mac 电脑无法完全退出的BUG	2020-06-02 10:54:17 +08:00
hunlongyu	09bd9d8401	😊 成功测试打包32位安装包	2020-06-01 18:14:31 +08:00
hunlongyu	588e52c330	😌 尝试v1	2020-06-01 17:00:58 +08:00
hunlongyu	6c4e110bb8	😫 再次尝试x86	2020-06-01 16:59:38 +08:00
hunlongyu	54857b8501	🥱 尝试x86	2020-06-01 16:52:39 +08:00
				`@@ -0,0 +1 @@`
				`<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"><g stroke-width="2" stroke="#aaa" fill="none"><path d="M11.29 11.71l-4-4"/><circle cx="5" cy="5" r="4"/></g></svg>`
				`@@ -0,0 +1 @@`
				(window.webpackJsonp=window.webpackJsonp\|\|[]).push([[3],{317:function(t,e,n){},348:function(t,e,n){"use strict";var i=n(317);n.n(i).a},355:function(t,e,n){"use strict";n.r(e);var i={functional:!0,props:{type:{type:String,default:"tip"},text:String,vertical:{type:String,default:"top"}},render:function(t,e){var n=e.props,i=e.slots;return t("span",{class:["badge",n.type],style:{verticalAlign:n.vertical}},n.text\|\|i().default)}},r=(n(348),n(42)),a=Object(r.a)(i,void 0,void 0,!1,null,"50e657c5",null);e.default=a.exports}}]);
				`@@ -0,0 +1 @@`
				`(window.webpackJsonp=window.webpackJsonp\|\|[]).push([[5],{351:function(t,e,n){"use strict";n.r(e);var s=n(42),l=Object(s.a)({},(function(){var t=this.$createElement;return(this._self._c\|\|t)("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}})}),[],!1,null,null,null);e.default=l.exports}}]);`