fix

1. 对于接口出现不确定情况加入JSON防错处理 2. 区分私有环境图片不加oss样式后缀 3. huaguangyun加入用户ws统计

fix
1. 对于接口出现不确定情况加入JSON防错处理 2. 区分私有环境图片不加oss样式后缀 3. huaguangyun加入用户ws统计
c4e10e2b · MichaelJier · aedad4fa · c4e10e2b · c4e10e2b · c4e10e2b
Commit c4e10e2b authored Jun 08, 2021 by MichaelJier
11 changed files
--- a/components/modules-vertical/shopBox/shopHot/index.vue
+++ b/components/modules-vertical/shopBox/shopHot/index.vue
@@ -7,7 +7,7 @@
      </div>
      <div class="body">
        <div class="img-box">
-          <img :src="`${info.real_img}?x-oss-process=style/commodity_cover`" alt="" />
+          <img :src="info.real_img + (isPrivate ? `` : `x-oss-process=style/commodity_cover`)" alt="" />
        </div>
        <div class="content">
          <div class="name">{{ info.name }}</div>
@@ -33,7 +33,8 @@ export default {
  name: 'vertical-shop-hot',
  data() {
    return {
-      info: {}
+      info: {},
+      isPrivate: process.env.private
    };
  },
  computed: {

--- a/components/modules-vertical/shopBox/shopList/index.vue
+++ b/components/modules-vertical/shopBox/shopList/index.vue
@@ -6,7 +6,7 @@
        <div class="list-item" v-for="(item, index) in sortList" :key="item.id">
          <div class="img-box" v-show="value">
            <div class="no">{{ sortList.length - index }}</div>
-            <img v-lazy="`${item.real_img}?x-oss-process=style/commodity_cover`" alt="" />
+            <img v-lazy="item.real_img + isPrivate ? `` : `x-oss-process=style/commodity_cover`" alt="" />
          </div>
          <div class="content">
            <div class="name">{{ item.name }}</div>
@@ -75,7 +75,8 @@ export default {
      isAjax: true,
      count: 0,
      num: 10,
-      list: []
+      list: [],
+      isPrivate: process.env.private
    };
  },
  computed: {

--- a/components/modules/menuBox/menuClass/shop/hot.vue
+++ b/components/modules/menuBox/menuClass/shop/hot.vue
@@ -2,7 +2,9 @@
  <transition name="move-right-left" mode="out-in">
    <div class="shop-hot" v-if="info.id" :key="info.id">
      <div class="img-box">
-        <img :src="`${Array.isArray(info.real_img) ? info.real_img[0] : info.real_img}?x-oss-process=style/commodity_cover`" alt="" />
+        <img
+        :src="real_img"
+        alt="" />
      </div>
      <div class="content">
        <div class="name">{{ info.name }}</div>
@@ -41,13 +43,18 @@ export default {
  },
  data() {
    return {
-      info: {}
+      info: {},
    };
  },
  computed: {
    ...mapGetters({
      channelInfo: 'channelInfo'
-    })
+    }),
+    real_img() {
+      const {info} = this
+      const url = Array.isArray(info.real_img) ? info.real_img[0] : info.real_img
+      return process.env.private ? url : url + `?x-oss-process=style/commodity_cover`
+    }
  },
  mounted() {
    this.getRecommendGoods();

--- a/components/modules/menuBox/menuClass/shop/index.vue
+++ b/components/modules/menuBox/menuClass/shop/index.vue
@@ -6,7 +6,7 @@
        <div class="list-item" v-for="(item, index) in sortList" :key="item.id">
          <div class="img-box">
            <div class="no">{{ sortList.length - index }}</div>
-            <img v-lazy="`${item.real_img}?x-oss-process=style/commodity_cover`" alt="" />
+            <img v-lazy="item.real_img + (isPrivate ? `` : `?x-oss-process=style/commodity_cover`)" alt="" />
          </div>
          <div class="content">
            <div class="name">{{ item.name }}</div>
@@ -88,7 +88,8 @@ export default {
      isAjax: true,
      count: 0,
      num: 10,
-      list: []
+      list: [],
+      isPrivate: process.env.private
    };
  },
  computed: {

--- a/components/showcase/index.vue
+++ b/components/showcase/index.vue
@@ -67,7 +67,7 @@ export default {
    }
  },
  mounted() {
-    this.real_img = JSON.parse(JSON.stringify(this.caseInfo.goodsInfo.real_img))
+    this.real_img = this.caseInfo.goodsInfo.real_img ? JSON.parse(JSON.stringify(this.caseInfo.goodsInfo.real_img)) : ''
    this.$nextTick(() => {
      this._initSwiper();
    });
@@ -115,7 +115,7 @@ export default {
 				deep:true,
 				handler(newVal){
          if (newVal.goodsInfo.id){
-            this.real_img = JSON.parse(JSON.stringify(newVal.goodsInfo.real_img))
+            this.real_img = newVal.goodsInfo.real_img ? JSON.parse(JSON.stringify(newVal.goodsInfo.real_img)) : ''
            this.$nextTick(() => {
              this._initSwiper();
            });

--- a/components/view/index.vue
+++ b/components/view/index.vue
@@ -75,7 +75,7 @@ export default {
    await this.get_userInfo({ refererId: this.$route.query.refererId });
    this.$Bus.$emit('bus-initWX');
    this.set_nowDate();
-    if (!process.env.private) {
+    if (!process.env.private || process.env.privateName === 'huawei') {
      this.timer = websocketHeartbeat.call(this)
      this.set_uuid(this.timer.uuid)
      // bus注册ws暂停和开始事件 

--- a/config/cbn.private.js
+++ b/config/cbn.private.js
@@ -7,6 +7,7 @@ module.exports = {
  HTTP_PORT: '',
  X_CA_STAGE: '',
  private: true,
+  privateName: 'cbn',
  sentryOptions: {},
  uploaderName: 'tencent',
  uploaderOptions: {

--- a/config/cm.private.js
+++ b/config/cm.private.js
@@ -7,6 +7,7 @@ module.exports = {
  HTTP_PORT: ':8680',
  X_CA_STAGE: '',
  private: true,
+  privateName: 'cm',
  sentryOptions: {},
  uploaderName: 'cmecloud',
  uploaderOptions: {

--- a/config/huawei.private.js
+++ b/config/huawei.private.js
@@ -9,6 +9,7 @@ module.exports = {
  private: true,
  sentryOptions: {},
  SERVE_PORT: 33000,
+  privateName: 'huawei',
  uploaderName: 'huaweicloud',
  uploaderOptions: {
    accessKeyId: 'GOQ82NEHQYDQCHMW5GZT',

--- a/config/vvku.private.js
+++ b/config/vvku.private.js
@@ -7,6 +7,7 @@ module.exports = {
  private: true,
  sentryOptions: {},
  uploaderName: 'aws',
+  privateName: 'vvku',
  uploaderOptions: {
    accessKeyId: 'AKIA27QSGT2TTSQLUVUN',
    accessKeySecret: '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',

--- a/plugins/API/apiWS.js
+++ b/plugins/API/apiWS.js
@@ -10,6 +10,9 @@ if (!process.env.X_CA_STAGE) {
 } else if (process.env.X_CA_STAGE === 'TEST') {
  watchTime = `wss://bapidev.guangdianyun.tv/v1/stats/channel/watchTime`
 }
+if (process.env.privateName === 'huawei') {
+  watchTime = `wss://bapi.guangdianyun.tv/v1/stats/channel/watchTime`
+}
 export {watchTime}
\ No newline at end of file