xbx #284

Merged
theluyuan merged 6 commits from xbx into master 2021-01-28 09:24:48 +00:00
6 changed files with 111 additions and 6 deletions
Showing only changes of commit d5d8509530 - Show all commits

View File

@ -508,8 +508,8 @@
Are you sure you want to turn off live streaming Are you sure you want to turn off live streaming
</div> </div>
<div class="buttons"> <div class="buttons">
<div data-dismiss="modal">countermand</div> <div data-dismiss="modal">No</div>
<div data-dismiss="modal" class="back" id="logout-btn">uncertain</div> <div data-dismiss="modal" class="back" id="logout-btn">Yes</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -356,6 +356,7 @@ export default {
shipinshangchuanchenggong:"Save correctlywaiting for review", shipinshangchuanchenggong:"Save correctlywaiting for review",
jiazaizhong:"Loding.", jiazaizhong:"Loding.",
yulan:"preview", yulan:"preview",
dianjigenghuan: "Click on the video to change",
shichangtishi:"", shichangtishi:"",
renshutishi: '', renshutishi: '',
tixianzhu: "", tixianzhu: "",

View File

@ -356,6 +356,7 @@ export default {
shipinshangchuanchenggong:"上传成功,等待审核", shipinshangchuanchenggong:"上传成功,等待审核",
jiazaizhong:"加载中", jiazaizhong:"加载中",
yulan:"预览", yulan:"预览",
dianjigenghuan: "点击视频区域更换",
shichangtishi:"", shichangtishi:"",
renshutishi: '', renshutishi: '',
tixianzhu:"", tixianzhu:"",

View File

@ -215,6 +215,9 @@
<p class="one-line-hide"> <p class="one-line-hide">
3.{{ lan.$t("shipinyaoqiu3") }} 3.{{ lan.$t("shipinyaoqiu3") }}
</p> </p>
<p class="one-line-hide">
4.{{ lan.$t("dianjigenghuan") }}
</p>
</div> </div>
</div> </div>
<div class="submit-btn" style="position:unset;margin-left:1.2rem;margin-bottom:0.3rem" @click="showspjj"> <div class="submit-btn" style="position:unset;margin-left:1.2rem;margin-bottom:0.3rem" @click="showspjj">

View File

@ -98,6 +98,7 @@
<p>1.{{ lan.$t("cshipinyaoqiu1") }}</p> <p>1.{{ lan.$t("cshipinyaoqiu1") }}</p>
<p>2.{{ lan.$t("cshipinyaoqiu2") }}</p> <p>2.{{ lan.$t("cshipinyaoqiu2") }}</p>
<p>3.{{ lan.$t("shipinyaoqiu3") }}</p> <p>3.{{ lan.$t("shipinyaoqiu3") }}</p>
<p>4.{{ lan.$t("dianjigenghuan") }}</p>
</div> </div>
<!-- <div class="demand"> <!-- <div class="demand">
<p class="one-line-hide">视频要求</p> <p class="one-line-hide">视频要求</p>
@ -108,6 +109,9 @@
</p> </p>
</div> --> </div> -->
</a-form-item> </a-form-item>
<div class="submit-btn" style="position:unset;margin-left:1.8rem;margin-bottom:0.3rem" @click="showspjj">
{{ lan.$t("yulan") }}
</div>
<a-form-item :label="lan.$t('shipinjianjie')" class="brief"> <a-form-item :label="lan.$t('shipinjianjie')" class="brief">
<a-textarea <a-textarea
v-model:value="form.desc" v-model:value="form.desc"
@ -125,10 +129,13 @@
</a-form-item> </a-form-item>
</a-form> </a-form>
<nav-bottom></nav-bottom> <nav-bottom></nav-bottom>
<a-modal v-model:visible="shipinjianjie" :footer="null" @cancel="spjjclone" style="htight: 2rem" :closable="false" >
<div v-html="videohtml"></div>
</a-modal>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, onMounted, reactive, Ref, ref, toRaw } from "vue"; import { defineComponent, nextTick, onMounted, reactive, Ref, ref, toRaw } from "vue";
import { PlaySquareOutlined, PlusOutlined } from "@ant-design/icons-vue"; import { PlaySquareOutlined, PlusOutlined } from "@ant-design/icons-vue";
import NavBottom from "@/components/NavBottom.vue"; import NavBottom from "@/components/NavBottom.vue";
import { previewCover, provenimg, provenvideo } from "@/utils/common"; import { previewCover, provenimg, provenvideo } from "@/utils/common";
@ -339,7 +346,28 @@ export default defineComponent({
function imgs(file: any){ function imgs(file: any){
return provenimg(file) return provenimg(file)
} }
const shipinjianjie = ref(false);
let play: any;
const videohtml = ref(`<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`)
function spjjclone(){
console.log(1067)
if(play){
play.dispose()
}
videohtml.value = ""
}
async function showspjj(){
if(!form.value.fileid){
return ;
}
shipinjianjie.value = true;
videohtml.value = `<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`
await nextTick()
play = window.TCPlayer('a' + form.value.fileid, {
fileID: form.value.fileid,
appID: '1303872925'
});
}
return { return {
labelCol: { span: 4 }, labelCol: { span: 4 },
@ -365,7 +393,11 @@ export default defineComponent({
lan, lan,
beforeUploadpic, beforeUploadpic,
video, video,
imgs imgs,
spjjclone,
showspjj,
videohtml,
shipinjianjie
}; };
}, },
}); });
@ -531,5 +563,22 @@ export default defineComponent({
} }
} }
} }
.submit-btn {
width: 70px;
height: 28px;
background: #08ae98;
border-radius: 3px;
font-size: 10px;
font-weight: 500;
color: #ffffff;
text-align: center;
line-height: 28px;
cursor: pointer;
user-select: none;
position: fixed;
top: 1.3rem;
right: 1rem;
}
} }
</style> </style>

View File

@ -100,6 +100,7 @@
<p>1.{{ lan.$t("shipinyaoqiu1") }}</p> <p>1.{{ lan.$t("shipinyaoqiu1") }}</p>
<p>2.{{ lan.$t("shipinyaoqiu2") }}</p> <p>2.{{ lan.$t("shipinyaoqiu2") }}</p>
<p>3.{{ lan.$t("shipinyaoqiu3") }}</p> <p>3.{{ lan.$t("shipinyaoqiu3") }}</p>
<p>4.{{ lan.$t("dianjigenghuan") }}</p>
</div> </div>
<!-- <div class="demand"> <!-- <div class="demand">
<p class="one-line-hide">视频要求</p> <p class="one-line-hide">视频要求</p>
@ -110,6 +111,9 @@
</p> </p>
</div> --> </div> -->
</a-form-item> </a-form-item>
<div class="submit-btn" style="position:unset;margin-left:1.7rem;margin-bottom:0.3rem" @click="showspjj">
{{ lan.$t("yulan") }}
</div>
<a-form-item :label="lan.$t('kaishishijian')" @click="isEntitled = jinzhi" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}"> <a-form-item :label="lan.$t('kaishishijian')" @click="isEntitled = jinzhi" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
<!-- <a-input <!-- <a-input
@ -229,12 +233,16 @@
</div> </div>
<a-modal v-model:visible="shipinjianjie" :footer="null" @cancel="spjjclone" style="htight: 2rem" :closable="false" >
<div v-html="videohtml"></div>
</a-modal>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { import {
computed, computed,
defineComponent, defineComponent,
nextTick,
onBeforeUpdate, onBeforeUpdate,
onMounted, onMounted,
reactive, reactive,
@ -592,6 +600,28 @@ export default defineComponent({
return provenimg(file) return provenimg(file)
} }
const view = computed(()=>store.state.seting.views) const view = computed(()=>store.state.seting.views)
const shipinjianjie = ref(false);
let play: any;
const videohtml = ref(`<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`)
function spjjclone(){
console.log(1067)
if(play){
play.dispose()
}
videohtml.value = ""
}
async function showspjj(){
if(!form.value.fileid){
return ;
}
shipinjianjie.value = true;
videohtml.value = `<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`
await nextTick()
play = window.TCPlayer('a' + form.value.fileid, {
fileID: form.value.fileid,
appID: '1303872925'
});
}
return { return {
labelCol: { span: 4 }, labelCol: { span: 4 },
wrapperCol: { span: 14 }, wrapperCol: { span: 14 },
@ -629,7 +659,11 @@ export default defineComponent({
video, video,
imgs, imgs,
jinzhi, jinzhi,
view view,
spjjclone,
showspjj,
videohtml,
shipinjianjie
}; };
}, },
}); });
@ -844,5 +878,22 @@ export default defineComponent({
} }
} }
} }
.submit-btn {
width: 70px;
height: 28px;
background: #08ae98;
border-radius: 3px;
font-size: 10px;
font-weight: 500;
color: #ffffff;
text-align: center;
line-height: 28px;
cursor: pointer;
user-select: none;
position: fixed;
top: 1.3rem;
right: 1rem;
}
} }
</style> </style>