合并分支 'dev' 到 'master'

Publisher 自动合并请求 [bvq6EHA30VcMEEC3VNBUO]

## feature
1. 接入中传大数据分析


------



查看合并请求 !50

plugins/main.js

@@ -43,10 +43,8 @@ Vue.use(Bus);
 if (process.client) {
 if (process.client) {
   if (!process.env.private) {
   if (!process.env.private) {
     require('@/plugins/arms');
     require('@/plugins/arms');
-    if (process.env.X_CA_STAGE) {
-      // const Inkmarks = require('@gdyfe/ink-marks');
-      // Vue.prototype.$inkmarks = Inkmarks;
-    }
+    const Inkmarks = require('@gdyfe/ink-marks');
+    Vue.prototype.$inkmarks = Inkmarks;
   }
   }
   const Cookie = require('js-cookie');
   const Cookie = require('js-cookie');
   Vue.prototype.$cookie = Cookie;
   Vue.prototype.$cookie = Cookie;