v2.6.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/components/Play.vue

@@ -202,7 +202,8 @@ export default {
         list: [],
         history: [],
         shortcut: [],
-        other: []
+        other: [],
+        currentTime: 0
       },
       config: {
         id: 'xgplayer',
@@ -340,11 +341,14 @@ export default {
         this.getIptvList()
       } else {
         const index = this.video.info.index | 0
-        let time = 0
-        const db = await history.find({ site: this.video.key, ids: this.video.info.id })
-        if (db) {
-          if (db.index === index) {
-            time = db.time
+        var time = this.video.info.time
+        if (!time) {
+          // 如果video.info.time没有设定的话，从历史中读取时间进度
+          const db = await history.find({ site: this.video.key, ids: this.video.info.id })
+          if (db) {
+            if (db.index === index) {
+              time = db.time
+            }
           }
         }
         this.playVideo(index, time)
@@ -778,10 +782,11 @@ export default {
       this.right.type = 'other'
       this.getOtherSites()
       this.right.show = true
+      this.right.currentTime = this.xg.currentTime
     },
     async otherItemEvent (e) {
       // 打开当前播放的剧集index, 定位到当前的时间
-      this.video = { key: e.key, info: { id: e.id, name: e.name, site: e.site, index: this.video.info.index, time: this.xg.currentTime } }
+      this.video = { key: e.key, info: { id: e.id, name: e.name, site: e.site, index: this.video.info.index, time: this.right.currentTime } }
     },
     mtEvent () {
       setting.find().then(res => {

src/lib/dexie/iniData/Recommandations.json

@@ -285,7 +285,7 @@
       "status": "可用"
     },
     "name": "女王的棋局",
-    "rate": "暂无评分",
+    "rate": "9.2",
     "detail": {
       "last": "2020-10-23 21:36:23",
       "id": 50756,
@@ -632,7 +632,7 @@
       "group": "默认"
     },
     "name": "野兽巨星/[BEASTARS",
-    "rate": "暂无评分",
+    "rate": "9.1",
     "detail": {
       "last": "2019-12-26 12:42:36",
       "id": 14406,
@@ -1060,7 +1060,7 @@
       "group": "默认"
     },
     "name": "去他妈的世界第二季",
-    "rate": "暂无评分",
+    "rate": "9.2",
     "detail": {
       "last": "2019-11-15 21:22:21",
       "id": 17906,
@@ -1137,7 +1137,7 @@
       "group": "默认"
     },
     "name": "切尔诺贝利",
-    "rate": "",
+    "rate": "9.6",
     "detail": {
       "last": "2019-07-08 10:18:38",
       "id": 20488,
@@ -2066,7 +2066,7 @@
       "group": "默认"
     },
     "name": "爆裂无声",
-    "rate": "暂无评分",
+    "rate": "8.3",
     "detail": {
       "last": "2018-05-19 02:39:50",
       "id": 12855,
@@ -2390,7 +2390,7 @@
       "group": "默认"
     },
     "name": "去他妈的世界第一季",
-    "rate": "暂无评分",
+    "rate": "9.1",
     "detail": {
       "last": "2020-10-16 09:09:43",
       "id": 50181,
@@ -3748,7 +3748,7 @@
       "status": "可用"
     },
     "name": "进击的巨人第一季",
-    "rate": "暂无评分",
+    "rate": "9.2",
     "detail": {
       "last": "2019-11-15 21:18:41",
       "id": 9923,
@@ -3770,7 +3770,7 @@
         }
       },
       "des": "<div>&nbsp;艾伦·耶格尔&nbsp;阿诺德&nbsp;阿克曼<br />悠长的历史之中,人类曾一度因被巨人捕食而崩溃。幸存下来的人们建造了一面巨大的墙壁,防止了巨人的入侵。不过,作为「和平」的代价,人类失去了到墙壁的外面去这一「自由」……主人公艾伦·耶格尔对还没见过的外面的世界抱有兴趣。在他正做着到墙壁的外面去这个梦的时候,毁坏墙壁的大巨人出现了！<br /></div>",
-      "rate": "暂无评分"
+      "rate": "9.2"
     },
     "id": 154
   },
@@ -4314,7 +4314,7 @@
       "group": "默认"
     },
     "name": "艾特熊和赛娜鼠",
-    "rate": "",
+    "rate": "8.9",
     "detail": {
       "last": "2020-09-23 21:31:04",
       "id": 35646,
@@ -4342,7 +4342,7 @@
         ]
       },
       "des": "一份跨越种族的深厚感情，一次直触心底的神奇旅程。 　　从小生活在孤儿院的小老鼠赛娜几经波折，终于从地下鼠国逃出。可是当她跌跌撞撞地来到熊的王国时，却一路受尽鄙夷和白眼。疲惫的小赛娜沉沉地睡在垃圾桶里，一觉惊醒后发现一只体型硕大的大熊正要把她当作晚餐。然而经过此次的风波后，两人很快成为了朋友。原来这只名叫艾特的熊先生是名街头音乐家兼马戏团演员，多才多艺的艾特还从事过很多职业。热情的艾特带着赛娜到家里住，他们彼此扶持理解，相互鼓励帮助。一份看似不可能发生的友谊，正在挑战着现有的秩序和规则，也正慢慢变得越来越深厚坚实。",
-      "rate": ""
+      "rate": "8.9"
     },
     "id": 139
   },
@@ -4718,7 +4718,7 @@
       "group": "默认"
     },
     "name": "触不可及 法版",
-    "rate": "暂无评分",
+    "rate": "9.2",
     "detail": {
       "last": "2019-11-13 21:04:36",
       "id": 18647,
@@ -6025,6 +6025,7 @@
       "group": "默认"
     },
     "name": "怪化猫",
+    "rate": "9.4",
     "detail": {
       "last": "2019-11-04 20:32:52",
       "id": 30961,
@@ -6531,7 +6532,7 @@
       "group": "默认"
     },
     "name": "V字仇杀队",
-    "rate": "暂无评分",
+    "rate": "9.2",
     "detail": {
       "last": "2019-11-26 21:42:56",
       "id": 21145,
@@ -7151,7 +7152,7 @@
         ]
       },
       "des": "六年级的小学生进藤光（川上友子 配音）无意中翻出了爷爷家的旧棋盘。触碰棋盘的一瞬间也释放出了寄居在其上的平安时代棋士藤原佐为（千叶进步 配音）的灵魂。附身于小光体内的佐为视棋如命，小光在其软磨硬泡下开始下围棋，接触了一批厉害的棋士，其中不乏他的同龄人。小光开始对围棋产生兴趣并展现了他的天分，而佐为则成为了小光的秘密老师…… 《棋魂》改变自堀田由美的同名作品，漫画由小畑健执笔，并由日本棋院的女棋士梅泽由香里担当监修。当年上映引起轰动后，引发了一股学习围棋的热潮，借由佐为的附身改变了主人公进藤光，讲述了其棋艺和心灵的成长，也在其中普及了围棋知识，意义深远。",
-      "rate": "7.2"
+      "rate": "9.2"
     },
     "id": 70
   },
@@ -7324,7 +7325,7 @@
       "group": "默认"
     },
     "name": "死神来了1",
-    "rate": "暂无评分",
+    "rate": "7.8",
     "detail": {
       "last": "2020-02-11 11:14:26",
       "id": 25793,
@@ -9351,7 +9352,7 @@
       "group": "默认"
     },
     "name": "是，大臣第二季",
-    "rate": "暂无评分",
+    "rate": "9.8",
     "detail": {
       "last": "2020-04-15 00:56:02",
       "id": 30031,
@@ -9429,7 +9430,7 @@
       "group": "默认"
     },
     "name": "是，大臣第一季",
-    "rate": "暂无评分",
+    "rate": "9.7",
     "detail": {
       "last": "2020-04-15 00:54:22",
       "id": 30030,
@@ -9916,7 +9917,7 @@
       "group": "默认"
     },
     "name": "盲井",
-    "rate": "",
+    "rate": "8.8",
     "detail": {
       "last": "2020-05-18 14:36:58",
       "id": 33970,
@@ -9926,7 +9927,7 @@
       "pic": "https://mahuapic.com/upload/vod/2020-05-18/202005181589783803.png",
       "lang": "国语",
       "area": "大陆",
-      "year": 0,
+      "year": 2003,
       "state": 0,
       "note": "DVD",
       "actor": "王双宝 / 王宝强 / 李易祥 / 安静 / 赵君 / 鲍振江 / 孙伟 / 赵俊芝 / 王艺凝 / 刘振起 / 张露露 / 李艳 / 赵红 / 聂伟华 / 董治美",
@@ -9938,7 +9939,7 @@
         }
       },
       "des": "<span style=\"color: rgb(17, 17, 17); font-family: Helvetica, Arial, sans-serif; font-size: 13px;\">　　在私人小煤矿做工的农民唐朝阳（王双宝）和宋金明（李易祥）发家致富的招数是，先套近乎将打工无门的外地农民认作亲人带到煤矿做工，在井下工作时制造“安全事故”将“亲人”杀死，再找矿主私了。两人在火车站盯上16岁的懵懂农村少年元凤鸣（王宝强）后，故伎重操帮其办了假身份证，更名后元凤鸣“成为”宋金明的侄子。</span><br style=\"color: rgb(17, 17, 17); font-family: Helvetica, Arial, sans-serif; font-size: 13px;\" /><span style=\"color: rgb(17, 17, 17); font-family: Helvetica, Arial, sans-serif; font-size: 13px;\">　　三人来到新一家小煤矿成为挖煤工人，元凤鸣的好学、纯朴、天真与体贴常令宋金明想起自己正在念书的娃子，生出恻隐之心迟迟不肯下手，与唐朝阳的矛盾日益激化，不久，唐朝阳给他定下最后期限。</span><br />",
-      "rate": ""
+      "rate": "8.8"
     },
     "id": 1
   }

src/lib/dexie/iniData/Sites.json

@@ -0,0 +1,245 @@
+[
+  {
+    "id": 1,
+    "key": "mahuazy",
+    "name": "麻花资源",
+    "api": "https://www.mhapi123.com/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 2,
+    "key": "subo988",
+    "name": "速播资源站",
+    "api": "https://www.subo988.com/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "key": "niuniucj",
+    "id": 3,
+    "name": "牛牛资源",
+    "api": "http://v.niuniucj.com/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": 1
+  },
+  {
+    "id": 4,
+    "key": "1886zy",
+    "name": "1886 资源",
+    "api": "http://cj.1886zy.co/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 5,
+    "key": "88zyw",
+    "name": "88 影视资源站",
+    "api": "http://www.88zyw.net/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "key": "apibdzy",
+    "id": 6,
+    "name": "百度云资源",
+    "api": "https://api.apibdzy.com/api.php/provide/vod/at/xml",
+    "download": "",
+    "group": "默认",
+    "isActive": 1
+  },
+  {
+    "id": 7,
+    "key": "mbo",
+    "name": "秒播资源",
+    "api": "http://caiji.mb77.vip/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 8,
+    "key": "zuidazy",
+    "name": "最大资源网",
+    "api": "http://www.zdziyuan.com/inc/api.php",
+    "download": "http://www.zdziyuan.com/inc/apidown.php",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 9,
+    "key": "123ku",
+    "name": "123 资源",
+    "api": "http://cj.123ku2.com:12315/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 10,
+    "key": "okzy",
+    "name": "OK 资源网",
+    "api": "http://cj.okzy.tv/inc/api.php",
+    "download": "http://cj.okzy.tv/inc/apidown.php",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 11,
+    "key": "kuyunzy",
+    "name": "酷云资源",
+    "api": "http://caiji.kuyun98.com/inc/ldg_api.php",
+    "download": "http://caiji.kuyun98.com/inc/apidown.php",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 12,
+    "key": "zuixinzy",
+    "name": "最新资源",
+    "api": "http://api.zuixinapi.com/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 13,
+    "key": "kubozy",
+    "name": "酷播资源",
+    "api": "http://api.kbzyapi.com/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 14,
+    "key": "yongjiuzy",
+    "name": "永久资源",
+    "api": "http://cj.yongjiuzyw.com/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 15,
+    "key": "rrzy",
+    "name": "人人资源",
+    "api": "https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 16,
+    "key": "bbkdj",
+    "name": "步步高顶尖资源网",
+    "api": "http://api.bbkdj.com/api",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 17,
+    "key": "solezy",
+    "name": "搜乐资源网",
+    "api": "https://www.caijizy.vip/api.php/provide/vod/at/xml/",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 18,
+    "key": "605zy",
+    "name": "605资源",
+    "api": "http://www.605zy.net/inc/seacmsapi.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 19,
+    "key": "doubanzy",
+    "name": "豆瓣电影资源",
+    "api": "http://v.1988cj.com/inc/api.php",
+    "download": "http://v.1988cj.com/inc/apidown.php",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 20,
+    "key": "135zy",
+    "name": "135 资源网",
+    "api": "http://cj.zycjw1.com/inc/api.php",
+    "download": "http://cj.zycjw1.com/inc/apidown.php",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 21,
+    "key": "mgtvzy",
+    "name": "芒果 TV 资源网",
+    "api": "https://api.shijiapi.com/api.php/provide/vod/at/xml/",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 22,
+    "key": "209zy",
+    "name": "209 资源",
+    "api": "http://cj.1156zy.com/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 23,
+    "key": "kkzy",
+    "name": "快快资源",
+    "api": "https://api.kkzy.tv/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 24,
+    "key": "wolongzy",
+    "name": "卧龙资源",
+    "api": "http://cj.wlzy.tv/inc/api_mac.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 25,
+    "key": "mokazy",
+    "name": "魔卡资源网",
+    "api": "https://cj.heiyap.com/api.php/provide/vod/at/xml/",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 26,
+    "key": "158zy",
+    "name": "壹伍捌资源网",
+    "api": "http://cj.158zyz.net:158/inc/api.php",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  },
+  {
+    "id": 27,
+    "key": "kyzy",
+    "name": "快影资源站",
+    "api": "https://www.kyzy.tv/api.php/kyyun/vod/at/xml/",
+    "download": "",
+    "isActive": 1,
+    "group": "默认"
+  }
+]

src/lib/dexie/initData.js

@@ -15,234 +15,6 @@ const setting = [
   }
 ]
 
-const sites = [
-  {
-    id: 1,
-    key: 'okzy',
-    name: 'OK 资源网',
-    api: 'http://cj.okzy.tv/inc/api.php',
-    download: 'http://cj.okzy.tv/inc/apidown.php',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 2,
-    key: 'zuidazy',
-    name: '最大资源网',
-    api: 'http://www.zdziyuan.com/inc/api.php',
-    download: 'http://www.zdziyuan.com/inc/apidown.php',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 3,
-    key: 'doubanzy',
-    name: '豆瓣电影资源',
-    api: 'http://v.1988cj.com/inc/api.php',
-    download: 'http://v.1988cj.com/inc/apidown.php',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 4,
-    key: '135zy',
-    name: '135 资源网',
-    api: 'http://cj.zycjw1.com/inc/api.php',
-    download: 'http://cj.zycjw1.com/inc/apidown.php',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 5,
-    key: 'kuyunzy',
-    name: '酷云资源',
-    api: 'http://caiji.kuyun98.com/inc/ldg_api.php',
-    download: 'http://caiji.kuyun98.com/inc/apidown.php',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 6,
-    key: 'mgtvzy',
-    name: '芒果 TV 资源网',
-    api: 'https://api.shijiapi.com/api.php/provide/vod/at/xml/',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 7,
-    key: 'subo988',
-    name: '速播资源站',
-    api: 'https://www.subo988.com/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 8,
-    key: '209zy',
-    name: '209 资源',
-    api: 'http://cj.1156zy.com/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 9,
-    key: 'zuixinzy',
-    name: '最新资源',
-    api: 'http://api.zuixinapi.com/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 10,
-    key: 'kubozy',
-    name: '酷播资源',
-    api: 'http://api.kbzyapi.com/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 11,
-    key: 'yongjiuzy',
-    name: '永久资源',
-    api: 'http://cj.yongjiuzyw.com/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 12,
-    key: '123ku',
-    name: '123 资源',
-    api: 'http://cj.123ku2.com:12315/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 13,
-    key: '88zyw',
-    name: '88 影视资源站',
-    api: 'http://www.88zyw.net/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 14,
-    key: 'wolongzy',
-    name: '卧龙资源',
-    api: 'http://cj.wlzy.tv/inc/api_mac.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 15,
-    key: 'mahuazy',
-    name: '麻花资源',
-    api: 'https://www.mhapi123.com/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 16,
-    key: 'kkzy',
-    name: '快快资源',
-    api: 'https://api.kkzy.tv/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 17,
-    key: '158zy',
-    name: '壹伍捌资源网',
-    api: 'http://cj.158zyz.net:158/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 18,
-    key: 'rrzy',
-    name: '人人资源',
-    api: 'https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 19,
-    key: 'mokazy',
-    name: '魔卡资源网',
-    api: 'https://cj.heiyap.com/api.php/provide/vod/at/xml/',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 20,
-    key: 'kyzy',
-    name: '快影资源站',
-    api: 'https://www.kyzy.tv/api.php/kyyun/vod/at/xml/',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 21,
-    key: 'solezy',
-    name: '搜乐资源网',
-    api: 'https://www.caijizy.vip/api.php/provide/vod/at/xml/',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 22,
-    key: 'bbkdj',
-    name: '步步高顶尖资源网',
-    api: 'http://api.bbkdj.com/api',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 23,
-    key: '1886zy',
-    name: '1886 资源',
-    api: 'http://cj.1886zy.co/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 24,
-    key: 'mbo',
-    name: '秒播资源',
-    api: 'http://caiji.mb77.vip/inc/api.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  },
-  {
-    id: 25,
-    key: '605zy',
-    name: '605资源',
-    api: 'http://www.605zy.net/inc/seacmsapi.php',
-    download: '',
-    isActive: 1,
-    group: '默认'
-  }
-]
-
 const localKey = [
   {
     name: 'playAndPause',
@@ -344,6 +116,7 @@ const getSite = (key) => {
   }
 }
 
+const sites = require('./iniData/Sites.json')
 const iptv = require('./iniData/Iptv.json')
 const recommandations = require('./iniData/Recommandations.json')
 export {