提交 0a193d4f 编写于 作者: bo.dang's avatar bo.dang

Merge branch 'dev-circle-live-20200805' into 'release'

小生态互动直播四期,Code Review: bo.dang



See merge request !205
此差异已折叠。
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<input type="text" id="copyInput" class="hidden-input" /> <input type="text" id="copyInput" class="hidden-input" />
<div class="live_url_style" v-if="streamType == 1 && (this.liveStatus==1 || this.liveStatus==2)"> <div class="live_url_style" v-if="streamType == 1 && (this.liveStatus==1 || this.liveStatus==2)">
<div class="href_style">讲师链接 {{lecturerUrl}}</div> <div class="href_style">主播链接 {{lecturerUrl}}</div>
<el-col class="href_outer_border"> <el-col class="href_outer_border">
<el-link type="primary" @click="copyTxt(1)" size="small" class="href_button_style">复制</el-link> <el-link type="primary" @click="copyTxt(1)" size="small" class="href_button_style">复制</el-link>
<el-link type="primary">|</el-link> <el-link type="primary">|</el-link>
...@@ -1040,8 +1040,31 @@ export default { ...@@ -1040,8 +1040,31 @@ export default {
} else { } else {
txt.value = this.audienceUrl; txt.value = this.audienceUrl;
} }
txt.select(); //选择对象 // if (navigator.userAgent.match(/(iPhone|iPod|iPad|Mac);?/i)) {
document.execCommand("copy"); if (navigator.userAgent.indexOf("Safari") > -1 && navigator.userAgent.indexOf("Chrome") < 1) {
var el = document.createElement('input');
el.value = txt.value;//要复制的内容
el.style.opacity = '0';
document.body.appendChild(el);
var editable = el.contentEditable;
var readOnly = el.readOnly;
el.contentEditable = true;
el.readOnly = false;
const range = document.createRange();
range.selectNodeContents(el);
var sel = window.getSelection();
sel.removeAllRanges();
sel.addRange(range);
el.setSelectionRange(0, 999999);
el.contentEditable = editable;
el.readOnly = readOnly;
var ret = document.execCommand('copy');
el.blur();
}
else {
txt.select(); //选择对象
document.execCommand("copy");
}
vm.$message({ vm.$message({
type: "success", type: "success",
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
size="small" size="small"
>降为普通成员</el-button> >降为普通成员</el-button>
<el-button <el-button
v-if="scope.row.level != 2 && v-if="scope.row.level != 2 && scope.row.level != 4 &&
(idType == 1 || selfRoleId > scope.row.level) && (idType == 1 || selfRoleId > scope.row.level) &&
scope.row.status == 1" scope.row.status == 1"
@click="addBlackList(scope.row)" @click="addBlackList(scope.row)"
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
size="small" size="small"
>加入黑名单</el-button> >加入黑名单</el-button>
<el-button <el-button
v-if="scope.row.level != 2 && v-if="scope.row.level != 2 && scope.row.level != 4 &&
(idType == 1 || selfRoleId > scope.row.level) && (idType == 1 || selfRoleId > scope.row.level) &&
scope.row.status == 2" scope.row.status == 2"
@click="addBlackList(scope.row)" @click="addBlackList(scope.row)"
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册