diff --git a/.env.production b/.env.production index fe553e6..2b0efa1 100644 --- a/.env.production +++ b/.env.production @@ -6,3 +6,6 @@ ENV = 'production' # 若依管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' + +VUE_APP_HOUTAI = /ggfw-jcphx + diff --git a/src/App.vue b/src/App.vue index 0291a6a..2727084 100644 --- a/src/App.vue +++ b/src/App.vue @@ -22,13 +22,13 @@ export default { }; /* npm run build:prod - /usr/share/nginx/html/ggfw-cphx + /usr/share/nginx/html/ggfw-jcphx - sudo mv ggfw-jcphx.zip /usr/share/nginx/html/ggfw-cphx 在 MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下 + sudo mv ggfw-jcphx.zip /usr/share/nginx/html/ggfw-jcphx 在 MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下 - cd /usr/share/nginx/html/ggfw-jg 移动到文件夹下 + cd /usr/share/nginx/html/ggfw-jcphx 移动到文件夹下 - unzip ggfw-cphx.zip -d . 解压 + unzip ggfw-jcphx.zip -d . 解压 */ diff --git a/src/api/myAPI/login.js b/src/api/myAPI/login.js index 7f5179b..438ebc8 100644 --- a/src/api/myAPI/login.js +++ b/src/api/myAPI/login.js @@ -1,9 +1,9 @@ import request from "@/utils/request"; // 本地 -let api = "API" +// let api = "API" // 线上 -// let api = location.origin +let api = location.origin export default { diff --git a/src/assets/font/font.css b/src/assets/font/font.css index 8e75b43..646a5cd 100644 --- a/src/assets/font/font.css +++ b/src/assets/font/font.css @@ -1,16 +1,20 @@ @font-face { font-family: 'YouSheBiaoTiHei'; - src: url('http://www.jichuanglanhai.com/demo/font-file/YouSheBiaoTiHei-2.ttf'); + src: url("./tell/YouSheBiaoTiHei-2.ttf"); + } + @font-face { font-family: 'Medium'; - src: url('http://www.jichuanglanhai.com/demo/font-file/Alibaba-PuHuiTi-Medium.otf'); + src: url("./tell/Alibaba-PuHuiTi-Medium.otf"); } + @font-face { font-family: 'DIN'; - src: url('http://www.jichuanglanhai.com/demo/font-file/din-bold-2.ttf'); + src: url("./tell/din-bold-2.ttf"); } + @font-face { font-family: 'Regular'; - src: url('http://www.jichuanglanhai.com/demo/font-file/Alibaba-PuHuiTi-Regular.otf'); -} + src: url("./tell/Alibaba-PuHuiTi-Regular.otf"); +} \ No newline at end of file diff --git a/src/assets/font/tell/Alibaba-PuHuiTi-Medium.otf b/src/assets/font/tell/Alibaba-PuHuiTi-Medium.otf new file mode 100644 index 0000000..a308250 Binary files /dev/null and b/src/assets/font/tell/Alibaba-PuHuiTi-Medium.otf differ diff --git a/src/assets/font/tell/Alibaba-PuHuiTi-Regular.otf b/src/assets/font/tell/Alibaba-PuHuiTi-Regular.otf new file mode 100644 index 0000000..5960ba1 Binary files /dev/null and b/src/assets/font/tell/Alibaba-PuHuiTi-Regular.otf differ diff --git a/src/assets/font/tell/YouSheBiaoTiHei-2.ttf b/src/assets/font/tell/YouSheBiaoTiHei-2.ttf new file mode 100644 index 0000000..3729151 Binary files /dev/null and b/src/assets/font/tell/YouSheBiaoTiHei-2.ttf differ diff --git a/src/assets/font/tell/din-bold-2.ttf b/src/assets/font/tell/din-bold-2.ttf new file mode 100644 index 0000000..1220089 Binary files /dev/null and b/src/assets/font/tell/din-bold-2.ttf differ diff --git a/src/main.js b/src/main.js index 565e3d1..da41388 100644 --- a/src/main.js +++ b/src/main.js @@ -71,15 +71,15 @@ DictData.install() import { setToken } from '@/utils/auth' // 临时获取token - let token = async()=>{ - let Authentication = await API.login.frimLogin(); - localStorage.setItem( - "MSSM-LIAONING__TOKEN", - Authentication.data.result.userToken - ); - - } - token() +// let token = async()=>{ +// let Authentication = await API.login.frimLogin(); +// localStorage.setItem( +// "MSSM-LIAONING__TOKEN", +// Authentication.data.result.userToken +// ); + +// } +// token() let infor = async()=>{ let response = await API.login.getuserinfo(); localStorage.setItem("userDto", JSON.stringify(response?.result.userDto)); diff --git a/src/utils/request.js b/src/utils/request.js index 9e5eadb..175a806 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,9 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 - baseURL: process.env.VUE_APP_BASE_API, + // baseURL: process.env.VUE_APP_BASE_API, + //!线上 + baseURL:location.origin, // 超时 timeout: 10000 }) diff --git a/vue.config.js b/vue.config.js index de93782..114c63e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + publicPath: process.env.NODE_ENV === "production" ? process.env.VUE_APP_HOUTAI : "/", // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)