Skip to content

N
newLive
Commit deacb36e authored by mengqr's avatar mengqr
Browse files
Options

修改逻辑问题

parent 95346999
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 18 deletions
src/axios/request.js
View file @ deacb36e
...@@ -9,9 +9,9 @@ const appName = "test5" ...@@ -9,9 +9,9 @@ const appName = "test5"
const IS_PROD = ["production", "prod"].includes(process.env.NODE_ENV); const IS_PROD = ["production", "prod"].includes(process.env.NODE_ENV);
// 接口路径 // 接口路径
const BASEURL_TEST = 'https://test6.douniu8.com' const BASEURL_TEST = 'https://api.douniu8.com'
// const BASEURL_TEST = 'http://39.105.193.58:8081' // const BASEURL_TEST = 'http://39.105.193.58:8081'
const BASEURL_PROD = 'https://test6.douniu8.com' const BASEURL_PROD = 'https://api.douniu8.com'
const CONTRACT_TEST = 'http://47.95.140.89:9090' const CONTRACT_TEST = 'http://47.95.140.89:9090'
const CONTRACT_PROD = 'http://ht.douniu8.com:9090' const CONTRACT_PROD = 'http://ht.douniu8.com:9090'
const baseURL = IS_PROD ? BASEURL_PROD : BASEURL_TEST; const baseURL = IS_PROD ? BASEURL_PROD : BASEURL_TEST;
......
src/views/fullScreen.vue
View file @ deacb36e
...@@ -225,8 +225,8 @@ ...@@ -225,8 +225,8 @@
</div> </div>
<div v-if="imgShow==false"> <div v-if="imgShow==false">
<img src="../common/img/vertical-screen.webp" style="height:100vh;width:100%" alt=""> <img src="../common/img/vertical-screen.webp" style="height:100vh;width:100%" alt="">
<!-- <img src="../common/img/video_play.png" style="height:14vw;width:14vw;position: fixed;top:74vw;left:42vw;" @click="goLive()" alt=""> <!-- <img src="../common/img/video_play.png" style="height:14vw;width:14vw;position: fixed;top:74vw;left:42vw;" @click="goLive()" alt=""> -->
<span style="font-size:4vw;color:white;position: fixed;top:100vw;left:20vw;">直播暂未开始，先看看其它视频吧</span> --> <span v-if="buttonType==4" style="font-size:4vw;color:white;position: fixed;top:100vw;left:20vw;">直播暂未开始，先看看其它视频吧</span>
</div> </div>
<!-- 登录后观看按钮 --> <!-- 登录后观看按钮 -->
<div v-if="buttonType==0"> <div v-if="buttonType==0">
...@@ -859,15 +859,22 @@ this.pten = false ...@@ -859,15 +859,22 @@ this.pten = false
console.log("头像",img) console.log("头像",img)
if(token&&img){ if(token&&img){
// alert("sadfa第三个") // alert("sadfa第三个")
if(res.data.data.lvrStatus==1){ if(res.data.data.lvrIsFree==0){
//是否购买 if(res.data.data.lvrStatus==1){
if(res.data.data.isBuy==1){ this.url=res.data.data.lvpPullUrl
this.url=res.data.data.lvpPullUrl
this.urlStor=res.data.data.lvpPullUrl this.urlStor=res.data.data.lvpPullUrl
this.imgShow=true//显示直播页面 }else{
this.buttonType=3 alert("当前直播间未开播")
}else{ this.buttonType=4
if(res.data.data.seeDuration==0){ this.imgShow=false//显示暂无主播
}
}else{
if(res.data.data.isBuy==0){
if(res.data.data.lvrStatus==1){
// this.url=res.data.data.lvpPullUrl
// this.urlStor=res.data.data.lvpPullUrl
if(res.data.data.seeDuration==0){
this.buttonType=1 this.buttonType=1
this.imgShow=false//显示暂无主播 this.imgShow=false//显示暂无主播
this.url="" this.url=""
...@@ -905,12 +912,74 @@ this.pten = false ...@@ -905,12 +912,74 @@ this.pten = false
} }
} }
}
}else{ }else{
this.imgShow=false // alert("当前直播间未开播")
this.buttonType=2 this.buttonType=2
this.imgShow=false
}
}else{
if(res.data.data.lvrStatus==1){
this.url=res.data.data.lvpPullUrl
this.urlStor=res.data.data.lvpPullUrl
}else{
alert("当前直播间未开播")
} }
}
}
// if(res.data.data.lvrStatus==1){
// //是否购买
// if(res.data.data.isBuy==1){
// this.url=res.data.data.lvpPullUrl
// this.urlStor=res.data.data.lvpPullUrl
// this.imgShow=true//显示直播页面
// this.buttonType=3
// }else{
// if(res.data.data.seeDuration==0){
// this.buttonType=1
// this.imgShow=false//显示暂无主播
// this.url=""
// this.urlStor=""
// }else{
// this.url=res.data.data.lvpPullUrl
// this.urlStor=res.data.data.lvpPullUrl
// this.imgShow=true//显示暂无主播
// this.buttonType=3
// //试看倒计时
// if(timer==0){
// this.countTimes=0
// this.imgShow=false
// this.buttonType=2
// this.url=""
// this.urlStor=""
// }else{
// if (!this.timers) {
// this.countTimes=timer
// this.timers = setInterval(() => {
// if (this.countTimes > 0 && this.countTimes <= timer) {
// this.countTimes--;
// } else {
// this.countTimes=0
// this.updataTime()
// this.$router.go(0)
// this.buttonType=1
// this.imgShow=false//显示暂无主播
// this.url=""
// this.urlStor=""
// }
// }, 1000)
// }
// }
// }
// }
// }else{
// this.imgShow=false
// alert("当前直播未开播")
// this.buttonType=4
// }
}else{ }else{
this.buttonType=0 this.buttonType=0
this.imgShow=false this.imgShow=false
......
src/views/live.vue
View file @ deacb36e
...@@ -628,8 +628,8 @@ export default { ...@@ -628,8 +628,8 @@ export default {
}else{ }else{
// this.videoList(1) // this.videoList(1)
// aleart("直播暂未开始") // aleart("直播暂未开始")
this.buttonType=1 this.buttonType=4
// alert("直播暂未开始") alert("直播暂未开始")
} }
}else{ }else{
// 付费 // 付费
......
src/views/liveList.vue
View file @ deacb36e
...@@ -88,6 +88,7 @@ export default { ...@@ -88,6 +88,7 @@ export default {
list.forEach(i => { list.forEach(i => {
i.ifrecom=true i.ifrecom=true
i.imgLargeUrl=i.lvrRecommendImg
if(i.lvrIsFree==0){ if(i.lvrIsFree==0){
this.freeList.push(i) this.freeList.push(i)
}else{ }else{
...@@ -213,7 +214,7 @@ export default { ...@@ -213,7 +214,7 @@ export default {
}else{ }else{
ifrecom=false ifrecom=false
} }
if(i.lvrLiveType==0){ if(i.lvrLiveType==1){
this.$router.push( this.$router.push(
{ {
path:'/fullScreen', path:'/fullScreen',
......
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