From aae6ac39373871cf6fa98a252ab51b6cfe5deb02 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 13 Nov 2020 10:22:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/zhibo.html | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/public/zhibo.html b/public/zhibo.html
index d72203b..0aeeefd 100644
--- a/public/zhibo.html
+++ b/public/zhibo.html
@@ -12,28 +12,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
视频通话
-
-
-
-
-
+
+
--
2.47.2
From 0359178f17d1147fbd1a1faed0cef5b608f6553b Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 13 Nov 2020 14:45:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E7=9B=B4=E6=92=AD=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/zhibo.html | 33 +++++++++------------------------
1 file changed, 9 insertions(+), 24 deletions(-)
diff --git a/public/zhibo.html b/public/zhibo.html
index 0aeeefd..208de06 100644
--- a/public/zhibo.html
+++ b/public/zhibo.html
@@ -249,25 +249,20 @@
-
+
-
-
-
-
-
视频通话
+
+
直播页面
-
-
+
-
-
+
+
@@ -290,17 +285,7 @@
-
-
-
-
-
-
-
-
-
微信扫一扫打开小程序,点击“视频通话”即可加入通话
-
-
+
--
2.47.2
From a104d4bcd7d8d6d212c7e799130b7185c3b1f1bc Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 13 Nov 2020 17:07:11 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=BA=86=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/index.html | 9 +++++++++
src/components/LivePlay.vue | 30 ++++++++++++++++++++++++++----
src/components/VideoPlay.vue | 22 +++++++++++++++++++---
src/import-png.d.ts | 4 +++-
src/views/regime/VideoInfo.vue | 2 +-
5 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/public/index.html b/public/index.html
index d0854bb..0ee7c33 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,6 +7,15 @@
<%= htmlWebpackPlugin.options.title %>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/VideoPlay.vue b/src/components/VideoPlay.vue
index 13e12cf..9bc4a99 100644
--- a/src/components/VideoPlay.vue
+++ b/src/components/VideoPlay.vue
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/src/import-png.d.ts b/src/import-png.d.ts
index 9feb1f7..607160a 100644
--- a/src/import-png.d.ts
+++ b/src/import-png.d.ts
@@ -18,4 +18,6 @@ declare module 'tim-js-sdk'{
export default value;
}
-declare var FB: any;
\ No newline at end of file
+declare var FB: any;
+
+declare var TCPlayer: any;
\ No newline at end of file
diff --git a/src/views/regime/VideoInfo.vue b/src/views/regime/VideoInfo.vue
index 1057ed7..080218a 100644
--- a/src/views/regime/VideoInfo.vue
+++ b/src/views/regime/VideoInfo.vue
@@ -1,7 +1,7 @@
-
+
--
2.47.2
From 25c2f495768c0345a65026c96cff341a4121d64a Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 13 Nov 2020 17:09:04 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=BA=86=E8=89=B0?=
=?UTF-8?q?=E5=B7=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/LiveItem.vue | 3 ++-
src/components/VideoItem.vue | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/LiveItem.vue b/src/components/LiveItem.vue
index d945c2b..ebe09ef 100644
--- a/src/components/LiveItem.vue
+++ b/src/components/LiveItem.vue
@@ -76,7 +76,8 @@
.info{
display: flex;
align-items: center;
- margin-top: 18px;
+ margin-top: 9px;
+ margin-bottom: 9px;
margin-left: 18px;
.datetime{
diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue
index 3e9a8d1..e01640e 100644
--- a/src/components/VideoItem.vue
+++ b/src/components/VideoItem.vue
@@ -76,7 +76,8 @@
.info{
display: flex;
align-items: center;
- margin-top: 18px;
+ margin-top: 9px;
+ margin-bottom: 9px;
margin-left: 18px;
.datetime{
--
2.47.2
From d1a3115ed4f7d279e1501074fb99bb8bc26d7918 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 13 Nov 2020 17:21:16 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0videoid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/index.ts | 3 ++-
src/store/index.ts | 1 +
src/utils/vod.ts | 2 +-
src/views/mine/Archives.vue | 1 +
src/views/mine/ReleaseWebcast.vue | 2 +-
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index b596808..3e83d88 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -769,7 +769,8 @@ export async function putmember(data: any): Promise
{
language: data.languageValue,
tlanguage: data.tlanguageValue,
video: data.video,
- desc: data.desc
+ desc: data.desc,
+ videoid: data.videoid
}
console.log(newdata)
const res = await put(`member/${store.state.userinfo.memberid}`, newdata)
diff --git a/src/store/index.ts b/src/store/index.ts
index 3f300b6..12494fa 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -45,6 +45,7 @@ export default createStore({
uid: "",
updatedAt: "",
video: "",
+ videoid: 0,
willsay: [{name: "请选择", level: 0}],
willsayValue: [{name: "0", level: 0}],
zoneStr: "中途岛GMT-11:00",
diff --git a/src/utils/vod.ts b/src/utils/vod.ts
index f716ff8..79acfd9 100644
--- a/src/utils/vod.ts
+++ b/src/utils/vod.ts
@@ -6,7 +6,7 @@ interface OnFunctio {
}
interface UploaderDone {
- fileId: string;
+ fileId: number;
video: {
url: string;
verify_content: string;
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index d523b78..030067f 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -932,6 +932,7 @@ export default defineComponent({
uploadprogress.value = info.percent.toFixed(2) * 100;
});
userinfo.value.video = res.video.url;
+ userinfo.value.videoid = res.fileId;
}
if (formData.value.video != "") {
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index d59d7a7..2d85636 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -257,7 +257,7 @@ export default defineComponent({
const form = ref({
title: "",
img: "",
- fileid: "",
+ fileid: 0,
fileurl: "",
fileduration: 0,
dateline: "",
--
2.47.2