feature<traffic_driving>

1. 引流模块支持 视频、互动区域复选功能
2. tab内容区滑动支持弹出提示
3. 右侧点赞和收缩菜单区域不提示引流

components/modules/menuBox/list.vue

@@ -37,6 +37,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import { traffic } from '@/plugins/openTraffic';
 const imageText = resolve => require(['./menuClass/imageText'], resolve);
 const playLists = resolve => require(['./menuClass/playLists/index'], resolve);
 const inviteBox = resolve => require(['./menuClass/invite'], resolve);
@@ -71,7 +72,8 @@ export default {
   },
   computed: {
     ...mapGetters({
-      menuList: 'menuList'
+      menuList: 'menuList',
+      drainage: 'drainage',
     }),
     isShowChat() {
       let index = -1;
@@ -104,11 +106,34 @@ export default {
     },
     _tabSwitch() {
       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: {
-    value(nVal) {
-      this.active = nVal;
+    value(newVal, oldVal) {
+      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();
     },
     active(nVal) {

components/modules/menuBox/tab.vue

@@ -65,13 +65,12 @@ export default {
     showD() {
       const drainage = this.drainage
       if (drainage.drainage_status === 1){
-        if (drainage.drainage_model !== 1) {
+        if (!(drainage.drainage_model || []).includes('1')) {
           return
         }
         // eslint-disable-next-line no-undef 
         !this.count && traffic(drainage)
       }
-      
     },
     async _getWechatInfo() {
       const res = await getWechatInfo({
@@ -83,11 +82,12 @@ export default {
           this.isScroll()
           this.listScroll()
           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
           }
           for (let i = 0; i < this.menuList.length; i++){
             if (this.menuList[i].menuType !== 'playlists' && this.menuList[i].menuType !== 'coupon'){
+              console.log(i, this.menuList[i].menuType)
               this.active = i;
               return
             }
@@ -96,7 +96,7 @@ export default {
       }
     },
     _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()
          // 强制引流 不切换 
         if (this.drainage.drainage_type === 0) {
@@ -164,7 +164,7 @@ export default {
     }
   },
   watch: {
-    active(){
+    active(newVal, oldVal){
       this.switchMid()
     },
   }

components/modules/playerBox/index.vue

@@ -3,7 +3,7 @@
      <div class="status" v-if="liveNowStatus" v-html="liveNowStatus"></div>
     <div id="mps" @click.stop="showD">
       <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;">
           <video></video>
         </div>
@@ -135,7 +135,7 @@ export default {
     showD() {
       const drainage = this.drainage
       if (drainage.drainage_status === 1){
-        if (drainage.drainage_model !== 0) {
+        if (!(drainage.drainage_model || []).includes('0')) {
          return
         }
         // eslint-disable-next-line no-undef 

components/modules/sendBox/index.vue

 <template>
   <div class="send-box" @click.stop="showD">
     <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="user-head" @click.stop="_goMyCenter">
           <i class="icon"></i>
@@ -136,7 +136,7 @@ export default {
     showD() {
       const drainage = this.drainage
       if (drainage.drainage_status === 1){
-        if (drainage.drainage_model !== 1) {
+        if (!(drainage.drainage_model || []).includes('1')) {
           return
         }
         // eslint-disable-next-line no-undef 

components/modules/suspensionBox/index.vue

 <template>
-  <div class="suspension-menu" @click.stop="showD">
+  <div class="suspension-menu" @click.stop>
+    <div @click.stop="showD">
       <div class="menu-list"
           v-if="isToggle"
           v-show="toggle"
           ref="list"
-        :style="{pointerEvents: (count || drainage.drainage_model !== 1) ? 'all' : 'none'}"
+          :style="{pointerEvents: (count || !(drainage.drainage_model || []).includes('1')) ? 'all' : 'none'}"
       >
         <div class="menu-item" v-if="isOffice">
           <!-- 文档 -->
@@ -31,6 +32,7 @@
           <reward-box></reward-box>
         </div>
       </div>
+    </div>
     <!-- 切换 -->
     <div class="toggle-box" v-if="isToggle">
       <toggle-btn v-model="toggle"></toggle-btn>
@@ -167,7 +169,7 @@ export default {
     showD() {
       const drainage = this.drainage
       if (drainage.drainage_status === 1){
-        if (drainage.drainage_model !== 1) {
+        if (!(drainage.drainage_model || []).includes('1')) {
           return
         }
         // eslint-disable-next-line no-undef