From f6bef563d241c75b73402118b8fdc6adec2b17de Mon Sep 17 00:00:00 2001 From: hunlongyu Date: Mon, 23 Dec 2019 15:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +- src/App.vue | 12 ++- src/components/zy_content.vue | 2 +- src/components/zy_header.vue | 6 +- src/components/zy_sider.vue | 10 +- src/store.js | 15 ++- src/util/util.666zy.js | 94 +++++++++++++++++++ src/util/util.detail.js | 41 --------- src/util/util.video.js | 53 ----------- src/views/Collection.vue | 4 +- src/views/Detail.vue | 17 ++-- src/views/Player.vue | 88 ++++++++++++++++-- src/views/Search.vue | 35 ++++--- src/views/Settings.vue | 1 - yarn.lock | 167 ++++++++++++++++++++++++++++++++-- 15 files changed, 400 insertions(+), 151 deletions(-) create mode 100644 src/util/util.666zy.js delete mode 100644 src/util/util.detail.js delete mode 100644 src/util/util.video.js diff --git a/package.json b/package.json index 6cc9716..b159d13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy-player", - "version": "0.4.1", + "version": "0.5.0", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -19,7 +19,9 @@ "view-design": "^4.0.2", "vue": "^2.6.10", "vue-router": "^3.0.3", - "vuex": "^3.0.1" + "vuex": "^3.0.1", + "xgplayer": "^2.4.1", + "xgplayer-hls.js": "^2.1.6" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.12.0", diff --git a/src/App.vue b/src/App.vue index 75abda9..7bf7e0f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,9 +4,9 @@
- + - +
@@ -15,6 +15,7 @@ import { mapGetters, mapActions } from 'vuex' import ZYSider from '@/components/zy_sider.vue' import ZYHeader from '@/components/zy_header.vue' +import ZYContent from '@/components/zy_content.vue' import setting from './plugin/nedb/setting' export default { name: 'app', @@ -28,7 +29,8 @@ export default { }, components: { ZYSider, - ZYHeader + ZYHeader, + ZYContent }, methods: { ...mapActions([ @@ -63,5 +65,9 @@ html, body, #app, .box{ height: 50px; padding: 0; } + .content{ + width: 100%; + height: 100%; + } } diff --git a/src/components/zy_content.vue b/src/components/zy_content.vue index 723f8fe..dfce303 100644 --- a/src/components/zy_content.vue +++ b/src/components/zy_content.vue @@ -1,5 +1,5 @@ diff --git a/src/views/Search.vue b/src/views/Search.vue index 5d68961..6c1f682 100644 --- a/src/views/Search.vue +++ b/src/views/Search.vue @@ -21,13 +21,14 @@ diff --git a/src/views/Settings.vue b/src/views/Settings.vue index c89c1a7..cf0c121 100644 --- a/src/views/Settings.vue +++ b/src/views/Settings.vue @@ -2,7 +2,6 @@ -