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 @@
-