Skip to content

T
techbook
Commit 1fcccb34 authored by zhangyanni's avatar zhangyanni
Browse files
Options

提交

parent 19865d3c
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 17 deletions
public/live.html
View file @ 1fcccb34
<head>
<title>`DEMO`</title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta name="viewport"
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
<script src='https://cnstatic01.e.vhall.com/static/js/iframeSolu.js'></script>
</head>
<style>
.iframeBody ::-webkit-scrollbar {
display: none !important;
background-color: transparent !important;
}
::-webkit-scrollbar {
display: none !important;
background-color: transparent !important;
}
iframe /deep/ ::-webkit-scrollbar {
display: none !important;
background-color: transparent !important;
}
</style>
<body style="height:100%;margin: 0;" class="iframeBody" onload="loadFunc()">
<!--<iframe border="0" src="https://live.vhall.com/528253505" style="width: 100%;height: calc(100vh - 3rem);"></iframe>-->
<!--<iframe allow="camera *;microphone *;" name="vcallIframe" id="vcallIframe" src="https://live4.vhall.com/webinar/inituser/528253505" allowfullscreen="true" style="width: 100%;height: calc(100vh - 3rem);border: medium none;"></iframe>-->
......@@ -24,22 +41,15 @@
return ""
};
function loadFunc(){
setTimeout(function(){
function loadFunc() {
setTimeout(function () {
var body = document.getElementsByTagName("body");
var div = document.createElement("div");
div.innerHTML = '<iframe allow="camera *;microphone *;" name="vcallIframe" id="vcallIframe" allowfullscreen="true" style="width: 100%;height: calc(100vh - 3rem);border: medium none;z-index: 1;"></iframe>';
document.body.appendChild(div);
document.getElementById("vcallIframe").src =getCookie("liveUrl").replace("https://live.vhall.com","https://live4.vhall.com")+"?email="+window.sessionStorage.getItem("liveEmail")+"&name="+window.sessionStorage.getItem("liveName");
},100);
document.getElementById("vcallIframe").src = getCookie("liveUrl").replace("https://live.vhall.com", "https://live4.vhall.com") + "?email=" + window.sessionStorage.getItem("liveEmail") + "&name=" + window.sessionStorage.getItem("liveName");
}, 100);
}
</script>
<style>
::-webkit-scrollbar {
display: none;
background-color: transparent !important;
}
</style>
\ No newline at end of file
src/views/dashboard/pages/statistics.vue
View file @ 1fcccb34
......@@ -28,7 +28,7 @@
<el-date-picker style="width: 200px;" v-model="endTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('operationjson.authEnd')"></el-date-picker>
<el-input :placeholder="$t('commonTitle.searchKeyword')" v-model="keyWord" maxlength="36"
<el-input :placeholder="$t('commonTitle.searchKeyword')" @keyup.enter.native="searchCik" v-model="keyWord" maxlength="36"
class="input-with-select" style="width: 180px;margin-left: 20px;">
<!--<el-button slot="append" icon="el-icon-search" @click="searchCik"></el-button>-->
</el-input>
......
src/views/mobile/api.js
View file @ 1fcccb34
......@@ -100,7 +100,7 @@ export default {
//获取直播推荐用户
getLiveFriendAxios(params){
return api.fetchLoadingPost("/base/emp/selectActivityCardList",params);
return api.fetchPost("/base/emp/selectActivityCardList",params);
},
//获取评论数据
......
src/views/mobile/live.vue
View file @ 1fcccb34
......@@ -438,6 +438,13 @@
}
iframe{
::-webkit-scrollbar {
display: none !important;
background-color: transparent !important;
}
}
.wrapper {
height: calc(100vh - 1rem);
::-webkit-scrollbar {
......
src/views/mobile/mine/api.js
View file @ 1fcccb34
......@@ -3,11 +3,11 @@ import Qs from 'qs';
export default {
//获取消息列表
getMessageAxios(params){
return api.fetchLoadingPost("/business/my/selectMyMessageList",params);
return api.fetchPost("/business/my/selectMyMessageList",params);
},
//同意/拒绝
postMessageAxios(params){
return api.fetchLoadingPost("/business/my/executeMessage",params);
return api.fetchPost("/business/my/executeMessage",params);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment