Browse Source

Merge branch 'feature/docker-env-url' of duanxiaoduan/tmr-group-admin into develop

xuyiping 1 year ago
parent
commit
3f293437c1
2 changed files with 14 additions and 5 deletions
  1. 2 0
      Dockerfile
  2. 12 5
      src/main.js

+ 2 - 0
Dockerfile

@@ -17,3 +17,5 @@ FROM nginx:alpine
 COPY --from=builder /app/tmr-group-admin/dist/ /usr/share/nginx/html/
 COPY --from=builder /app/tmr-group-admin/default.conf.template /etc/nginx/templates/default.conf.template
 EXPOSE 80
+
+CMD ["/bin/bash", "-c", "sed -i "s@<html@<html domain="$DOMAIN"@" /usr/share/nginx/html/index.html; nginx -g "daemon off;""]

+ 12 - 5
src/main.js

@@ -3,8 +3,8 @@ import VueRouter from 'vue-router'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import UmyUi from 'umy-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+import UmyUi from 'umy-ui'
 import 'umy-ui/lib/theme-chalk/index.css';// 引入样式
 // const ElementUI = require('element-ui')
 // require('element-ui/lib/theme-chalk/index.css')
@@ -59,14 +59,14 @@ Vue.use(VueRouter)
 Vue.use(pageCount)
 Vue.use(ElementUI, {
   i18n: (key, value) => i18n.t(key, value)
-})
+})
 Vue.use(UmyUi);
 // register global utility filters
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
 })
 
-// import echarts from 'echarts'
+// import echarts from 'echarts'
  import * as echarts from 'echarts'
 Vue.use(echarts)
 // Vue.prototype.$echarts = echarts
@@ -90,4 +90,11 @@ Vue.directive('loadmore', {
       }
     })
   }
-})
+})
+
+const DOMAIN = document.querySelector("html").getAttribute("domain");
+// 获取html标签的domain属性值
+if (DOMAIN) {
+  Vue.prototype.$DOMAIN = `${DOMAIN}`;
+  // 将$domain设置为vue全局变量
+}