Skip to content

broadcast_cloud / web-live

Go to a project
Commit 7e614605 by MichaelJier
Options

feature<traffic_driving> 

1. 引流模块支持 视频、互动区域复选功能
2. tab内容区滑动支持弹出提示
3. 右侧点赞和收缩菜单区域不提示引流
parent eaf7c35d
Showing with 71 additions and 44 deletions
components/modules/menuBox/list.vue
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { traffic } from '@/plugins/openTraffic';
const imageText = resolve => require(['./menuClass/imageText'], resolve); const imageText = resolve => require(['./menuClass/imageText'], resolve);
const playLists = resolve => require(['./menuClass/playLists/index'], resolve); const playLists = resolve => require(['./menuClass/playLists/index'], resolve);
const inviteBox = resolve => require(['./menuClass/invite'], resolve); const inviteBox = resolve => require(['./menuClass/invite'], resolve);
...@@ -71,7 +72,8 @@ export default { ...@@ -71,7 +72,8 @@ export default {
}, },
computed: { computed: {
...mapGetters({ ...mapGetters({
menuList: 'menuList' menuList: 'menuList',
drainage: 'drainage',
}), }),
isShowChat() { isShowChat() {
let index = -1; let index = -1;
...@@ -104,11 +106,34 @@ export default { ...@@ -104,11 +106,34 @@ export default {
}, },
_tabSwitch() { _tabSwitch() {
this.swiper && this.swiper.slideTo(this.active); this.swiper && this.swiper.slideTo(this.active);
} },
showD() {
const drainage = this.drainage
if (drainage.drainage_status === 1){
if (!(drainage.drainage_model || []).includes('1')) {
return
}
// eslint-disable-next-line no-undef
!this.count && traffic(drainage)
}
},
}, },
watch: { watch: {
value(nVal) { value(newVal, oldVal) {
this.active = nVal; const menuType = this.menuList[newVal] ? this.menuList[newVal].menuType : ''
if ((menuType === 'playlists' || menuType === 'coupon') && (this.drainage.drainage_model || []).includes('1') && this.drainage.drainage_status === 1){
this.showD()
// 强制引流 不切换
if (this.drainage.drainage_type === 0) {
if (newVal > oldVal){
this.swiper.slidePrev()
} else {
this.swiper.slideNext()
}
return
}
}
this.active = newVal;
this._tabSwitch(); this._tabSwitch();
}, },
active(nVal) { active(nVal) {
......
components/modules/menuBox/tab.vue
...@@ -65,13 +65,12 @@ export default { ...@@ -65,13 +65,12 @@ export default {
showD() { showD() {
const drainage = this.drainage const drainage = this.drainage
if (drainage.drainage_status === 1){ if (drainage.drainage_status === 1){
if (drainage.drainage_model !== 1) { if (!(drainage.drainage_model || []).includes('1')) {
return return
} }
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
!this.count && traffic(drainage) !this.count && traffic(drainage)
} }
}, },
async _getWechatInfo() { async _getWechatInfo() {
const res = await getWechatInfo({ const res = await getWechatInfo({
...@@ -83,11 +82,12 @@ export default { ...@@ -83,11 +82,12 @@ export default {
this.isScroll() this.isScroll()
this.listScroll() this.listScroll()
this.boxScrollListener() this.boxScrollListener()
if (this.drainage.drainage_status === 0 || this.drainage.drainage_model !== 1 || this.drainage.drainage_type !== 0) { if (this.drainage.drainage_status === 0 || !(this.drainage.drainage_model || []).includes('1') || this.drainage.drainage_type !== 0) {
return return
} }
for (let i = 0; i < this.menuList.length; i++){ for (let i = 0; i < this.menuList.length; i++){
if (this.menuList[i].menuType !== 'playlists' && this.menuList[i].menuType !== 'coupon'){ if (this.menuList[i].menuType !== 'playlists' && this.menuList[i].menuType !== 'coupon'){
console.log(i, this.menuList[i].menuType)
this.active = i; this.active = i;
return return
} }
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
} }
}, },
_tabSwitch(num, menuType) { _tabSwitch(num, menuType) {
if ((menuType === 'playlists' || menuType === 'coupon') && this.drainage.drainage_model === 1 && this.drainage.drainage_status === 1){ if ((menuType === 'playlists' || menuType === 'coupon') && (this.drainage.drainage_model || []).includes('1') && this.drainage.drainage_status === 1){
this.showD() this.showD()
// 强制引流 不切换 // 强制引流 不切换
if (this.drainage.drainage_type === 0) { if (this.drainage.drainage_type === 0) {
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
} }
}, },
watch: { watch: {
active(){ active(newVal, oldVal){
this.switchMid() this.switchMid()
}, },
} }
......
components/modules/playerBox/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="status" v-if="liveNowStatus" v-html="liveNowStatus"></div> <div class="status" v-if="liveNowStatus" v-html="liveNowStatus"></div>
<div id="mps" @click.stop="showD"> <div id="mps" @click.stop="showD">
<div class="mpstitle-name">{{ channelInfo.channelName }}?true</div> <div class="mpstitle-name">{{ channelInfo.channelName }}?true</div>
<div class="videoPlayer" id="videoPlayer" :style="{pointerEvents: (count || drainage.drainage_model !== 0) ? 'all' : 'none'}"> <div class="videoPlayer" id="videoPlayer" :style="{pointerEvents: (count || !(drainage.drainage_model || []).includes('0')) ? 'all' : 'none'}">
<div style="display:none;"> <div style="display:none;">
<video></video> <video></video>
</div> </div>
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
showD() { showD() {
const drainage = this.drainage const drainage = this.drainage
if (drainage.drainage_status === 1){ if (drainage.drainage_status === 1){
if (drainage.drainage_model !== 0) { if (!(drainage.drainage_model || []).includes('0')) {
return return
} }
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
......
components/modules/sendBox/index.vue
<template> <template>
<div class="send-box" @click.stop="showD"> <div class="send-box" @click.stop="showD">
<div class="reply-mask" @click="_remReplay" v-if="chatReplyObj.id"></div> <div class="reply-mask" @click="_remReplay" v-if="chatReplyObj.id"></div>
<div class="send-wrapper" :style="{pointerEvents: (count || drainage.drainage_model !== 1) ? 'all' : 'none'}"> <div class="send-wrapper" :style="{pointerEvents: (count || !(drainage.drainage_model || []).includes('1')) ? 'all' : 'none'}">
<div class="send-chat" @click.stop="_remEnclosure"> <div class="send-chat" @click.stop="_remEnclosure">
<div class="user-head" @click.stop="_goMyCenter"> <div class="user-head" @click.stop="_goMyCenter">
<i class="icon"></i> <i class="icon"></i>
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
showD() { showD() {
const drainage = this.drainage const drainage = this.drainage
if (drainage.drainage_status === 1){ if (drainage.drainage_status === 1){
if (drainage.drainage_model !== 1) { if (!(drainage.drainage_model || []).includes('1')) {
return return
} }
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
......
components/modules/suspensionBox/index.vue
<template> <template>
<div class="suspension-menu" @click.stop="showD"> <div class="suspension-menu" @click.stop>
<div class="menu-list" <div @click.stop="showD">
v-if="isToggle" <div class="menu-list"
v-show="toggle" v-if="isToggle"
ref="list" v-show="toggle"
:style="{pointerEvents: (count || drainage.drainage_model !== 1) ? 'all' : 'none'}" ref="list"
> :style="{pointerEvents: (count || !(drainage.drainage_model || []).includes('1')) ? 'all' : 'none'}"
<div class="menu-item" v-if="isOffice"> >
<!-- 文档 --> <div class="menu-item" v-if="isOffice">
<office-box></office-box> <!-- 文档 -->
</div> <office-box></office-box>
<div class="menu-item" v-if="drawInfo.id"> </div>
<!-- 抽奖 --> <div class="menu-item" v-if="drawInfo.id">
<draw-box :info="drawInfo"></draw-box> <!-- 抽奖 -->
</div> <draw-box :info="drawInfo"></draw-box>
<div class="menu-item" v-if="voteInfo.id"> </div>
<!-- 投票 --> <div class="menu-item" v-if="voteInfo.id">
<vote-box :info="voteInfo"></vote-box> <!-- 投票 -->
</div> <vote-box :info="voteInfo"></vote-box>
<div class="menu-item" v-if="isInvitation"> </div>
<!-- 邀请卡 --> <div class="menu-item" v-if="isInvitation">
<invite-box></invite-box> <!-- 邀请卡 -->
</div> <invite-box></invite-box>
<div class="menu-item" v-if="isDraw"> </div>
<!--提现--> <div class="menu-item" v-if="isDraw">
<wallet-box></wallet-box> <!--提现-->
</div> <wallet-box></wallet-box>
<div class="menu-item" v-if="isReward"> </div>
<!-- 打赏 --> <div class="menu-item" v-if="isReward">
<reward-box></reward-box> <!-- 打赏 -->
<reward-box></reward-box>
</div>
</div> </div>
</div> </div>
<!-- 切换 --> <!-- 切换 -->
...@@ -167,7 +169,7 @@ export default { ...@@ -167,7 +169,7 @@ export default {
showD() { showD() {
const drainage = this.drainage const drainage = this.drainage
if (drainage.drainage_status === 1){ if (drainage.drainage_status === 1){
if (drainage.drainage_model !== 1) { if (!(drainage.drainage_model || []).includes('1')) {
return return
} }
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
......
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 sign in to comment