diff --git a/pages/plugins/live/pull/components/video/video.vue b/pages/plugins/live/pull/components/video/video.vue
index 263b1ca1..9dc946de 100644
--- a/pages/plugins/live/pull/components/video/video.vue
+++ b/pages/plugins/live/pull/components/video/video.vue
@@ -6,7 +6,7 @@
-
+
@@ -48,11 +48,15 @@
this.$emit('ended');
}
// #endif
+ // #ifdef APP-NVUE
+ if (!isEmpty(e.type) && e.type == 'error') {
+ this.$emit('ended');
+ }
+ // #endif
console.log(e, 'error');
},
// video app使用这种方式,判断直播是否结束
ended() {
- console.log('ended');
this.$emit('ended');
}
},
@@ -64,4 +68,7 @@
width: 100vw;
height: 100vh;
}
+ .video-bg {
+ background-image: linear-gradient(to bottom,#ba623c,#14766a);
+ }
\ No newline at end of file
diff --git a/pages/plugins/live/pull/mixins/mixins.js b/pages/plugins/live/pull/mixins/mixins.js
index b788cb69..b68025a5 100644
--- a/pages/plugins/live/pull/mixins/mixins.js
+++ b/pages/plugins/live/pull/mixins/mixins.js
@@ -30,6 +30,9 @@ export default {
methods: {
ended() {
this.is_live_ended = true;
+ },
+ live_back() {
+ app.globalData.page_back_prev_event();
}
}
}
\ No newline at end of file
diff --git a/pages/plugins/live/pull/pull.nvue b/pages/plugins/live/pull/pull.nvue
index ff192bb7..aca09b92 100644
--- a/pages/plugins/live/pull/pull.nvue
+++ b/pages/plugins/live/pull/pull.nvue
@@ -1,12 +1,21 @@
-
-
+
+
+
-
- 直播已结束
-
+
+
+
+
+
+
+ 直播已结束
+
+
+
+
@@ -30,6 +39,14 @@
}
\ No newline at end of file
diff --git a/pages/plugins/live/pull/pull.vue b/pages/plugins/live/pull/pull.vue
index 129d2e3c..a173402b 100644
--- a/pages/plugins/live/pull/pull.vue
+++ b/pages/plugins/live/pull/pull.vue
@@ -1,15 +1,18 @@
-
+
-
+
-
- 直播已结束
+
+
+ 直播已结束
+
+
@@ -35,6 +38,9 @@
}