Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-02-25 03:41:04 +08:00

View File

@@ -50,12 +50,15 @@
</div> -->
</div>
<div v-if="projectStatus && projectEndTime">
<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" class="threeBtn">
<div v-if="projectStatus !=='-1' && new Date(projectEndTime).getTime() > new Date().getTime()" class="threeBtn">
<botton class="btn" :style="{
background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
}" @click="showClick">
{{ new Date(data.liveEndTime).getTime() }}
{{ new Date().getTime() }}
{{ data.liveLink }}
{{
new Date(data.liveEndTime).getTime() < new Date().getTime() && data.livePlayback == '1' ? '回放' : '观看'
new Date(data.liveEndTime).getTime() < new Date().getTime() && data.livePlayback == 'true' ? '回放' : '观看'
}}
</botton>
@@ -91,7 +94,7 @@
:style="{background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
}" @click="showClick">
{{
new Date(data.liveEndTime).getTime() < new Date().getTime() && data.livePlayback == '1' ? '回放' : '观看'
new Date(data.liveEndTime).getTime() < new Date().getTime() && data.livePlayback == 'true' ? '回放' : '观看'
}}
</botton>
@@ -188,7 +191,7 @@
</template>
<script setup>
import {computed, reactive, toRefs, onUnmounted} from "vue";
import {computed, reactive, toRefs, onUnmounted, watch} from "vue";
import img from "@/assets/image/uploadimg.png";
import {request, useRequest} from "@/api/request";
import {TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
@@ -250,9 +253,11 @@ const signClick = () => {
};
let timer = null;
//判断能否签到
function isSignClick() {
timer = setInterval(() => {
// timer = setInterval(() => {
let beginTime = new Date(data.value?.liveStartTime).getTime();
let endTime = !data.value.afterSignIn || data.value?.afterSignIn == '0'
? new Date(data.value.liveEndTime).getTime()
@@ -294,10 +299,13 @@ function isSignClick() {
// nowTime < endTime,
// nowTime > beginTime
// );
}, 1000);
// }, 1000);
}
isSignClick();
watch(data, () => {
isSignClick();
})
const commitClick = () => {
if (data.value.liveStartTime) {
let date1 = new Date(data.value.liveStartTime).getTime()
@@ -346,7 +354,7 @@ function showClick() {
return;
}
}
if (new Date(data.value.liveEndTime).getTime() < new Date().getTime() && data.value.livePlayback == '1') {
if (new Date(data.value.liveEndTime).getTime() < new Date().getTime() && data.value.livePlayback == 'true') {
window.open(data.value.livePlaybackLink, '_top');
} else {
window.open(data.value.liveLink, '_top');