Merge branch 'test' into dev

components/modules-pc/headerBox/index.vue

@@ -22,7 +22,6 @@ export default {
   name: 'pc-header-box',
   computed: {
     ...mapGetters({
-      corpId: 'corpId',
       channelInfo: 'channelInfo',
       userInfo: 'userInfo',
       jumpUrls: 'jumpUrls'
@@ -32,7 +31,7 @@ export default {
     _goMyCenter() {
       if (!this.userInfo.id) {
         this.$Bus.$emit('bus-showLogin', true);
-      } else if (this.corpId === 1421) {
+      } else if (Number(this.$route.query.corpId) === 1421) {
         return false;
       } else {
         window.location.href = this.jumpUrls.center;

components/modules/sendBox/index.vue

@@ -65,7 +65,6 @@ export default {
   computed: {
     ...mapGetters({
       type: 'type',
-      corpId: 'corpId',
       channelInfo: 'channelInfo',
       userInfo: 'userInfo',
       jumpUrls: 'jumpUrls'
@@ -86,7 +85,7 @@ export default {
     _goMyCenter() {
       if (!this.userInfo.id) {
         this.$Bus.$emit('bus-showLogin', true);
-      } else if (this.corpId === 1421) {
+      } else if (Number(this.$route.query.corpId) === 1421) {
         return false;
       } else {
         window.location.href = this.jumpUrls.center;

components/modules/sendBox/more.vue

@@ -43,13 +43,13 @@ export default {
   name: 'send-more',
   data() {
     return {
-      swiper: null
+      swiper: null,
+      corpId: this.$route.query.corpId
     };
   },
   computed: {
     ...mapGetters({
       type: 'type',
-      corpId: 'corpId',
       channelInfo: 'channelInfo',
       channelConfig: 'channelConfig',
       userInfo: 'userInfo',

components/state/index.vue

@@ -13,10 +13,10 @@
 
 <script>
 import { mapGetters } from 'vuex';
-const status401 = resolve => require(['./401'], resolve);
-const status404 = resolve => require(['./404'], resolve);
-const status408 = resolve => require(['./408'], resolve);
-const statusLoading = resolve => require(['./loading'], resolve);
+import status401 from './401';
+import status404 from './404';
+import status408 from './408';
+import statusLoading from './loading';
 export default {
   name: 'state-box',
   components: {

components/view/index.vue

 <template>
-  <!--加密直播-->
-  <transition name="fade" v-if="encrypt">
-    <encrypt />
-  </transition>
-  <!-- 白名单观看 -->
-  <transition name="fade" v-else-if="white">
-    <white />
-  </transition>
-  <transition v-else>
-    <view-pc v-if="!isMobile" />
-    <view-vertical v-else-if="channelInfo.screenDirection === 'vertical'" />
-    <view-mobile v-else />
-  </transition>
+  <div style="height: 100%">
+    <!--加密直播-->
+    <transition name="fade" v-if="encrypt">
+      <encrypt />
+    </transition>
+    <!-- 白名单观看 -->
+    <transition name="fade" v-else-if="white">
+      <white />
+    </transition>
+    <template v-else>
+      <view-pc v-if="!isMobile" />
+      <view-vertical v-else-if="channelInfo.screenDirection === 'vertical'" />
+      <view-mobile v-else />
+      <!--欢迎页-->
+      <welcome v-if="isMobile && welcomeInfo.imgState == 1" />
+    </template>
+  </div>
 </template>
 <script>
 import { getWatchLoginInfo } from '@/plugins/API/apiAll';
 import { mapGetters, mapMutations, mapActions } from 'vuex';
-const encrypt = resolve => require(['@/components/encrypt/index'], resolve);
-const white = resolve => require(['@/components/white/index'], resolve);
-const viewPc = resolve => require(['./pc'], resolve);
-const viewMobile = resolve => require(['./mobile'], resolve);
-const viewVertical = resolve => require(['./vertical'], resolve);
+import encrypt from '@/components/encrypt/index';
+import white from '@/components/white/index';
+import welcome from '@/components/welcome/index';
+import viewPc from './pc';
+import viewMobile from './mobile';
+import viewVertical from './vertical';
 
 export default {
   name: 'view-box',
   components: {
     encrypt,
     white,
+    welcome,
     viewPc,
     viewMobile,
     viewVertical
@@ -43,6 +49,7 @@ export default {
     ...mapGetters({
       encrypt: 'encrypt',
       white: 'white',
+      welcomeInfo: 'welcomeInfo',
       channelInfo: 'channelInfo',
       channelConfig: 'channelConfig',
       jumpUrls: 'jumpUrls'
@@ -95,5 +102,3 @@ export default {
   }
 };
 </script>
-
-<style lang="less" scoped></style>

components/view/mobile.vue

@@ -32,8 +32,6 @@
       </transition>
       <extend-ad></extend-ad>
     </div>
-    <!--欢迎页-->
-    <welcome-box v-if="welcomeInfo.imgState == 1"></welcome-box>
   </div>
 </template>
 <script>
@@ -42,7 +40,6 @@ import SKIN from '@/components/modules/skin';
 const advertTop = resolve => require(['@/components/modules/advertBox/top'], resolve);
 const advertMiddle = resolve => require(['@/components/modules/advertBox/middle'], resolve);
 const advertText = resolve => require(['@/components/modules/advertBox/text'], resolve);
-const welcomeBox = resolve => require(['@/components/modules/welcomeBox'], resolve);
 const shareBox = resolve => require(['@/components/modules/shareBox'], resolve);
 const authBox = resolve => require(['@/components/auth'], resolve);
 const cameraBox = resolve => require(['@/components/modules/cameraBox'], resolve);
@@ -69,7 +66,6 @@ export default {
     menuTab,
     menuList,
     cameraBox,
-    welcomeBox,
     shareBox,
     redBox,
     authBox,
@@ -84,7 +80,6 @@ export default {
   },
   computed: {
     ...mapGetters({
-      welcomeInfo: 'welcomeInfo',
       channelInfo: 'channelInfo',
       advertTop: 'advertTop',
       advertMiddle: 'advertMiddle',

store/actions.js

@@ -22,21 +22,17 @@ const actions = {
         return false;
       }
       commit('set_channelInfo', res.data);
-      if (res.data.screenDirection === 'vertical') {
-        await Promise.all([dispatch('get_menuList'), dispatch('get_channelConfig')]);
-      } else {
-        const advertText = {
-          status: 1,
-          words: res.data.advertWords,
-          link: res.data.advertWordsLink
-        };
-        commit('set_advertText', advertText);
-        await Promise.all([
-          dispatch('get_welcomeInfo'),
-          dispatch('get_menuList'),
-          dispatch('get_channelConfig')
-        ]);
-      }
+      const advertText = {
+        status: 1,
+        words: res.data.advertWords,
+        link: res.data.advertWordsLink
+      };
+      commit('set_advertText', advertText);
+      await Promise.all([
+        dispatch('get_welcomeInfo'),
+        dispatch('get_menuList'),
+        dispatch('get_channelConfig')
+      ]);
     } else if (res.code === 200 && res.errorCode === 3) {
       commit('set_status', 408);
     } else {

store/getters.js

@@ -11,9 +11,6 @@ const getters = {
   type(state) {
     return state.type;
   },
-  corpId(state) {
-    return state.corpId;
-  },
   welcomeInfo(state) {
     return state.welcomeInfo;
   },

store/mutations.js

@@ -5,9 +5,6 @@ const mutations = {
   set_status(state, status) {
     state.status = status;
   },
-  set_corpId(state, id) {
-    state.corpId = id;
-  },
   set_welcomeInfo(state, info) {
     state.welcomeInfo = info;
   },

store/state.js

@@ -2,7 +2,6 @@ const state = () => ({
   nowDate: Date.now(),
   status: 200, // 200 404 408
   type: 'live',
-  corpId: 0,
   welcomeInfo: {},
   channelInfo: {},
   channelConfig: {},

views/_id.vue

@@ -3,7 +3,7 @@
   <state v-else />
 </template>
 <script>
-import { mapGetters, mapMutations } from 'vuex';
+import { mapGetters } from 'vuex';
 import REPORT from '@/plugins/report';
 import DMS from '@/plugins/Mixin/dms';
 import questionnaire from '@/components/questionnaire/index.js';
@@ -63,12 +63,6 @@ export default {
   async mounted() {
     const mobile = Number(this.$route.query.mobile);
     this.isMobile = mobile || UserAgent.isMobile();
-    this.set_corpId(Number(this.$route.query.corpId));
-  },
-  methods: {
-    ...mapMutations({
-      set_corpId: 'set_corpId'
-    })
   }
 };
 </script>