Merge branch 'feature/add_vconsole' into 'master'

Feature/add vconsole

See merge request !2

app/web/component/layout/activity/index.ts

@@ -3,7 +3,6 @@ import { Getter } from 'vuex-class';
 import Raven from 'raven-js';
 import RavenVue from 'raven-js/plugins/vue';
 import 'intersection-observer';
-import vConsole from 'vconsole';
 import { release } from '@/.sentryclirc';
 import '@/service/qg.service';
 import SaDirective from '@qg/citrus-ui/src/helper/directives/saTrack.directive.js';
@@ -21,7 +20,8 @@ if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production')
 
 if (EASY_ENV_IS_BROWSER && process.env.SENTRY_ENV === 'test' || process.env.NODE_ENV !== 'production') {
   // ! 上线后务必取掉
-  // new vConsole();
+  const vConsole = require('vconsole');
+  new vConsole();
 }
 
 if (EASY_ENV_IS_BROWSER) {
@@ -43,7 +43,7 @@ export default class Layout extends Vue {
     // `<script src="https://activitystatic.lkbang.net/vuex/3.4.0/vuex.min.js"></script>`,
     `<script src="https://activitystatic.lkbang.net/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script>`,
     `<script src="https://activitystatic.lkbang.net/swiper/4.5.1/swiper.min.js"></script>`,
-    `<script src="https://cdn.bootcss.com/axios/0.19.2/axios.min.js"></script>`
+    `<script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script>`
   ];
   talosHost: string = config.kdspHost;
 

app/web/view/layout.html

@@ -312,6 +312,6 @@
     <!-- <script src="https://activitystatic.lkbang.net/vuex/3.4.0/vuex.min.js"></script> -->
     <script src="https://activitystatic.lkbang.net/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script>
     <script src="https://activitystatic.lkbang.net/swiper/4.5.1/swiper.min.js"></script>
-    <script src="https://cdn.bootcss.com/axios/0.19.2/axios.min.js"></script>
+    <script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script>
   </body>
 </html>
\ No newline at end of file

package-lock.json

@@ -1609,9 +1609,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.0.57",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.57.tgz",
-      "integrity": "sha512-h0scJ0MElCj/Lr3BeY/uLHLO9a4B+8NBO2Rc6dWs1QhF7JpsF5sQot644dWZRHQiLL/OUZmhsngB8MGBqn307w==",
+      "version": "0.0.63",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.63.tgz",
+      "integrity": "sha512-sIaKT3ICdHRw1liKiPmA6EqB2ZWDWyM8UisKLR6L/FOVDXbe2Y4zKkfMDDpRM2S4xc7ovk7vuQw533hLc+M2FA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.5",

package.json

@@ -21,7 +21,7 @@
   "dependencies": {
     "@better-scroll/core": "^2.0.5",
     "@qg/cherry-ui": "^2.20.6",
-    "@qg/citrus-ui": "0.0.57",
+    "@qg/citrus-ui": "0.0.63",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",

upload-cos.js

@@ -5,6 +5,8 @@ const fs = require('fs');
 const prefix = process.env.NODE_ENV === 'production' ? 'qb' : 'qb-test';
 const cdnPrefix = `https://misc.lkbang.net/${prefix}/`;
 
+console.log('prefix', process.env);
+
 class upload2Cos {
   constructor() {
     this.filesPath = [];