Merge branch 'master' into v_BI

config/dev.env.js

@@ -4,6 +4,7 @@ var prodEnv = require('./prod.env');
 module.exports = merge(prodEnv, {
   NODE_ENV:'"development"',
   VUE_APP_API_ROOT:'"/adminapi"',  //
+  VUE_APP_BASE_URL:'"/"',
   Domain:'"brilliantstart.cn"',
   // Login:'"http://localhost:3030/login"',
   // CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',

config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     assetsRoot: path.resolve(__dirname, '../eta_front'),
     assetsSubDirectory: 'static',
 //  assetsPublicPath: '/vue-admin/',
-		assetsPublicPath: './',
+		assetsPublicPath: process.env.VUE_APP_BASE_URL,
     productionSourceMap: false,
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.

config/prod.env.js

@@ -1,6 +1,7 @@
 module.exports = {
 	NODE_ENV:'"production"',
-	VUE_APP_API_ROOT:'"/adminapi"',  //生产环境
+	VUE_APP_API_ROOT:'"/ybeta/adminapi"',  //生产环境
+	VUE_APP_BASE_URL:'"/ybeta/"',
 	Domain:'"hzinsights.com"',
 	// Login:'"https://eta.hzinsights.com/login"',
 	// CHART_LINK:'"https://chartlib.hzinsights.com/chartshow"',

config/prod.test.env.js

@@ -1,6 +1,7 @@
 module.exports = {
 	NODE_ENV:'"test"',
 	VUE_APP_API_ROOT:'"/adminapi"',  //测试环境
+	VUE_APP_BASE_URL:'"/"',
 	Domain:'"brilliantstart.cn"',
 	// Login:'"http://8.136.199.33:7778/login"',
 	// CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',

src/main.js

@@ -180,6 +180,7 @@ Array.prototype.flat = function (count) {
 };
 export const router = new VueRouter({
   mode: "history",
+  base:process.env.VUE_APP_BASE_URL,
   routes,
 });