diff --git a/jiuyi2/api/video.js b/jiuyi2/api/video.js index 46cca5e8..5559fddd 100644 --- a/jiuyi2/api/video.js +++ b/jiuyi2/api/video.js @@ -628,6 +628,20 @@ const video = { method: 'GET', }) }, + + /** + * 获取推流的用户 + * @param {Object} param + */ + getVideoPushUsers(param) { + return util.request({ + url: `/video/getWatchStream`, + query: param.query, + data: param.data, + method: 'GET', + load: true, + }) + }, } export default video \ No newline at end of file diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index 095539ba..933d799a 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -8,7 +8,7 @@ const config = { // #ifndef H5 // host: 'http://91f.xyz:8080', // host: 'http://liuyd.cpolar.top', - host: 'http://pwpbxz.natappfree.cc', + host: 'http://7pj622.natappfree.cc', // #endif // 是否vivo显示 showVivo: true, diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json index cfa9e251..b0563858 100644 --- a/jiuyi2/pages.json +++ b/jiuyi2/pages.json @@ -480,7 +480,8 @@ "path": "pages/index/dataCenter/pushDetailUser", "style": { "navigationBarTitleText": "推流的用户", - "navigationBarBackgroundColor": "#fff" + "navigationBarBackgroundColor": "#fff", + "enablePullDownRefresh": true } }, { diff --git a/jiuyi2/pages/index/dataCenter/push.vue b/jiuyi2/pages/index/dataCenter/push.vue index c0cf26d0..750f829a 100644 --- a/jiuyi2/pages/index/dataCenter/push.vue +++ b/jiuyi2/pages/index/dataCenter/push.vue @@ -309,7 +309,7 @@ - + @@ -339,24 +339,7 @@ - - - 我想要 - - - - 展示播放量 - - - - 完播播放量 - 需申请平台审核 - 申请 - - - - - + 我想投流Ta的视频 @@ -387,6 +370,25 @@ + + + 我想要 + + + + 展示播放量 + 无需平台审核 + 投流 + + + + 完播播放量 + 需申请平台审核 + 申请 + + + + diff --git a/jiuyi2/pages/index/dataCenter/pushDetail.vue b/jiuyi2/pages/index/dataCenter/pushDetail.vue index fc1b3453..5f710dfa 100644 --- a/jiuyi2/pages/index/dataCenter/pushDetail.vue +++ b/jiuyi2/pages/index/dataCenter/pushDetail.vue @@ -153,7 +153,9 @@ - + 推流的用户 diff --git a/jiuyi2/pages/index/dataCenter/pushDetailUser.vue b/jiuyi2/pages/index/dataCenter/pushDetailUser.vue index 17cb6a97..b70ba993 100644 --- a/jiuyi2/pages/index/dataCenter/pushDetailUser.vue +++ b/jiuyi2/pages/index/dataCenter/pushDetailUser.vue @@ -1,17 +1,112 @@