Merge branch 'test' into dev

4a4a776a · xiawei · 3eb70299 · 8a040180 · 4a4a776a · 4a4a776a
Commit 4a4a776a authored Sep 04, 2020 by xiawei
13 changed files
--- a/components/modules-pc/headerBox/index.vue
+++ b/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;

--- a/components/modules/sendBox/index.vue
+++ b/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;

--- a/components/modules/sendBox/more.vue
+++ b/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',

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

--- a/components/view/index.vue
+++ b/components/view/index.vue
 <template>
-  <!--加密直播-->
+  <div style="height: 100%">
-  <transition name="fade" v-if="encrypt">
+    <!--加密直播-->
-    <encrypt />
+    <transition name="fade" v-if="encrypt">
-  </transition>
+      <encrypt />
-  <!-- 白名单观看 -->
+    </transition>
-  <transition name="fade" v-else-if="white">
+    <!-- 白名单观看 -->
-    <white />
+    <transition name="fade" v-else-if="white">
-  </transition>
+      <white />
-  <transition v-else>
+    </transition>
-    <view-pc v-if="!isMobile" />
+    <template v-else>
-    <view-vertical v-else-if="channelInfo.screenDirection === 'vertical'" />
+      <view-pc v-if="!isMobile" />
-    <view-mobile v-else />
+      <view-vertical v-else-if="channelInfo.screenDirection === 'vertical'" />
-  </transition>
+      <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);
+import encrypt from '@/components/encrypt/index';
-const white = resolve => require(['@/components/white/index'], resolve);
+import white from '@/components/white/index';
-const viewPc = resolve => require(['./pc'], resolve);
+import welcome from '@/components/welcome/index';
-const viewMobile = resolve => require(['./mobile'], resolve);
+import viewPc from './pc';
-const viewVertical = resolve => require(['./vertical'], resolve);
+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>
--- a/components/view/mobile.vue
+++ b/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',

--- a/components/modules/welcomeBox/img/welcome-default.png
+++ b/components/modules/welcomeBox/img/welcome-default.png
--- a/components/modules/welcomeBox/index.vue
+++ b/components/modules/welcomeBox/index.vue
--- a/store/actions.js
+++ b/store/actions.js
@@ -22,21 +22,17 @@ const actions = {
        return false;
      }
      commit('set_channelInfo', res.data);
-      if (res.data.screenDirection === 'vertical') {
+      const advertText = {
-        await Promise.all([dispatch('get_menuList'), dispatch('get_channelConfig')]);
+        status: 1,
-      } else {
+        words: res.data.advertWords,
-        const advertText = {
+        link: res.data.advertWordsLink
-          status: 1,
+      };
-          words: res.data.advertWords,
+      commit('set_advertText', advertText);
-          link: res.data.advertWordsLink
+      await Promise.all([
-        };
+        dispatch('get_welcomeInfo'),
-        commit('set_advertText', advertText);
+        dispatch('get_menuList'),
-        await Promise.all([
+        dispatch('get_channelConfig')
-          dispatch('get_welcomeInfo'),
+      ]);
-          dispatch('get_menuList'),
-          dispatch('get_channelConfig')
-        ]);
-      }
    } else if (res.code === 200 && res.errorCode === 3) {
      commit('set_status', 408);
    } else {

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

--- a/store/mutations.js
+++ b/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;
  },

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

--- a/views/_id.vue
+++ b/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>