合并分支 'dev' 到 'master'

Dev



查看合并请求 !180

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: {

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: {

components/modules/menuBox/menuClass/invite/index.vue

@@ -87,7 +87,8 @@ export default {
       this.tabIndex = key;
     },
     async _getInvitationList() {
-      if (this.nowDate - this.prevTime < 5000) {
+
+      if (this.nowDate - this.prevTime < 1500) {
         this.$layer.msg('操作太频繁了，先休息下');
         return false;
       }
@@ -120,6 +121,7 @@ export default {
   height: 0.3rem;
   border-radius: 50%;
   background: rgba(0, 0, 0, 0.2);
+  z-index: 1;
   &-main {
     width: 100%;
     height: 100%;
@@ -128,6 +130,9 @@ export default {
     filter: brightness(2.3);
     cursor: pointer;
   }
+  &:active {
+    opacity: 0.5;
+  }
 }
 .invite__tab-box {
   padding: 0.15rem 0;

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();

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: {

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();
             });

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暂停和开始事件 

config/cbn.private.js

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

config/cm.private.js

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

config/huawei.private.js

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

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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',

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://bgateway.huaguangyun.cn/v1/stats/channel/watchTime`
+}
 
 export {watchTime}
  
\ No newline at end of file