Merge branch 'master' of 81.70.119.104:guangyin/hbt-training-ui

.env.prod

@@ -16,6 +16,6 @@ VUE_APP_ALL_MENU = false
 # 微前端地址
 VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
 # 当前应用部署地址
-VUE_APP_EXPOSES_URL=""
+VUE_APP_EXPOSES_URL="http://172.16.0.77/trainingbase/"
 # nginx路径
 PUB_PATH:'/trainingbase/'

.env.prodLocal

@@ -16,6 +16,6 @@ VUE_APP_ALL_MENU = false
 # 微前端地址
 VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
 # 当前应用部署地址
-VUE_APP_EXPOSES_URL="http://192.168.1.66:8084/"
+VUE_APP_EXPOSES_URL="http://192.168.1.66/dev/trainingbase/"
 # nginx路径
 PUB_PATH:'/dev/trainingbase/'

src/views/base.component.ts

@@ -152,8 +152,8 @@ export default class BaseComponent extends Vue {
             const options = layer.data.map((item,index)=>{
                 const option = {} as any
                 if(item.hasPop && !item.model){
-                    const path = process.env.NODE_ENV === 'production'? process.env.PUB_PATH : '/'
+                    const path = process.env.NODE_ENV === 'production'? process.env.VUE_APP_EXPOSES_URL : 'http://192.168.1.66/'
-                    option.popupURL = "http://192.168.1.66"+path+"#/popup?"+new URLSearchParams(layer.popData)
+                    option.popupURL = path+"#/popup?"+new URLSearchParams(layer.popData)
                 }
                 return Object.assign(option,{
                     id:item.id,

vue.config.js

@@ -7,7 +7,7 @@ const resolve = (dir)=>{
 }
 module.exports = defineConfig({
   publicPath: process.env.NODE_ENV === 'production'
-  ? process.env.PUB_PATH
+  ? process.env.VUE_APP_EXPOSES_URL
   : './',
   productionSourceMap:process.env.NODE_ENV!=="production",
   transpileDependencies: true,