diff --git a/.env.development b/.env.development index 6012f8d..1075b7d 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://121.36.65.171:9527' +VUE_APP_BASE_API = 'http://124.70.15.185:9527' VUE_APP_H5_QR = 'http://172.119.51.219/h5/invitation.html' VUE_APP_H5_INFO = 'http://172.119.51.219/h5/info.html' #VUE_APP_BASE_API = 'http://172.119.50.181:9527' diff --git a/.env.production b/.env.production index ad49f2c..83fde77 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = 'http://121.36.65.171:9527' -VUE_APP_H5_QR = 'http://121.36.65.171:8778/h5/invitation.html' -VUE_APP_H5_INFO = 'http://121.36.65.171:8778/h5/info.html' +VUE_APP_BASE_API = 'http://124.70.15.185:9527' +VUE_APP_H5_QR = 'http://124.70.15.185:8778/h5/invitation.html' +VUE_APP_H5_INFO = 'http://124.70.15.185:8778/h5/info.html' diff --git a/public/h5/info.html b/public/h5/info.html index 62513d7..1f90a80 100644 --- a/public/h5/info.html +++ b/public/h5/info.html @@ -270,7 +270,7 @@ var uuid = ""; var enterpriseid= ""; var infoOpen = ''; - var baseUrlIp = "http://121.36.65.171:9527"; + var baseUrlIp = "http://124.70.15.185:9527"; var enterpriseTpyeOption = ['政府机关','研究机构','社会团体','企业事业单位'] function getEnterpriseOptions () { $.ajax({ diff --git a/public/index.html b/public/index.html index 925455c..593b76e 100644 --- a/public/index.html +++ b/public/index.html @@ -8,7 +8,8 @@ <%= webpackConfig.name %> - -
-
+
正在加载系统资源，请耐心等待
-
-
+
+ diff --git a/src/permission.js b/src/permission.js index a989483..3bd0ca0 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,6 @@ import { getToken } from '@/utils/auth' NProgress.configure({ showSpinner: false }) const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/retrievePassword'] - router.beforeEach((to, from, next) => { NProgress.start() // next() diff --git a/src/router/index.js b/src/router/index.js index ef77277..1ad858c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -232,6 +232,7 @@ export const constantRoutes = [ export default new Router({ mode: 'history', // 去掉url中的# + base: '/', scrollBehavior: () => ({ y: 0 }), routes: constantRoutes }) diff --git a/src/views/company/manager.vue b/src/views/company/manager.vue index f64a41b..afd0352 100644 --- a/src/views/company/manager.vue +++ b/src/views/company/manager.vue @@ -53,6 +53,7 @@ + diff --git a/src/views/company/search.vue b/src/views/company/search.vue index 6d2bcf1..4b26f8c 100644 --- a/src/views/company/search.vue +++ b/src/views/company/search.vue @@ -2,7 +2,7 @@
- +
diff --git a/src/views/home/index2.vue b/src/views/home/index2.vue index ce83367..907e543 100644 --- a/src/views/home/index2.vue +++ b/src/views/home/index2.vue @@ -24,6 +24,7 @@

{{companyInfo.userName}}

{{companyInfo.loginDate}}

+

{{companyInfo.entPrefix}}

diff --git a/src/views/system/qualification/index.vue b/src/views/system/qualification/index.vue index ad21f9d..40c2fd1 100644 --- a/src/views/system/qualification/index.vue +++ b/src/views/system/qualification/index.vue @@ -76,14 +76,15 @@ + - + - - + + - + diff --git a/vue.config.js b/vue.config.js index 37b1b38..d2a564e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -17,7 +17,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" ? "/" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）