diff --git a/.env b/.env index ef80d4f..011a99d 100644 --- a/.env +++ b/.env @@ -19,4 +19,7 @@ VITE_GLOB_APP_OPEN_QIANKUN=true # 文件预览地址 VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview +# 运维服务器接口地址 +VITE_GLOB_INSTITUTIONS_URL=http://192.168.2.19:8080/nursing-unit/ + diff --git a/src/assets/images/advisory.jpg b/src/assets/images/advisory.jpg new file mode 100644 index 0000000..4399fc7 Binary files /dev/null and b/src/assets/images/advisory.jpg differ diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index 975850e..bbfd9c6 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -15,4 +15,6 @@ export enum PageEnum { TOKEN_LOGIN = '/tokenLogin', // h5白名单 H5_ADVISORYINFO = '/h5/advisoryInfo', + // h5白名单 + H5_REGISTER_ADVISORY = '/h5/registerAdvisory', } diff --git a/src/hooks/setting/index.ts b/src/hooks/setting/index.ts index 044539d..57e7947 100644 --- a/src/hooks/setting/index.ts +++ b/src/hooks/setting/index.ts @@ -13,6 +13,7 @@ export const useGlobSetting = (): Readonly => { VITE_GLOB_APP_OPEN_QIANKUN, VITE_GLOB_DOMAIN_URL, VITE_GLOB_ONLINE_VIEW_URL, + VITE_GLOB_INSTITUTIONS_URL, // 【JEECG作为乾坤子应用】 VITE_GLOB_QIANKUN_MICRO_APP_NAME, @@ -40,6 +41,7 @@ export const useGlobSetting = (): Readonly => { urlPrefix: VITE_GLOB_API_URL_PREFIX, uploadUrl: VITE_GLOB_DOMAIN_URL, viewUrl: VITE_GLOB_ONLINE_VIEW_URL, + institutionsUrl:VITE_GLOB_INSTITUTIONS_URL, // 【JEECG作为乾坤子应用】是否以乾坤子应用模式启动 isQiankunMicro: VITE_GLOB_QIANKUN_MICRO_APP_NAME != null && VITE_GLOB_QIANKUN_MICRO_APP_NAME !== '', diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index c030eb1..61576b5 100644 --- a/src/router/guard/permissionGuard.ts +++ b/src/router/guard/permissionGuard.ts @@ -24,12 +24,13 @@ const SYS_FILES_PATH = PageEnum.SYS_FILES_PATH; // 邮件中的跳转地址,对应此路由,携带token免登录直接去办理页面 const TOKEN_LOGIN = PageEnum.TOKEN_LOGIN; const H5_ADVISORYINFO = PageEnum.H5_ADVISORYINFO; +const H5_REGISTER_ADVISORY = PageEnum.H5_REGISTER_ADVISORY; const ROOT_PATH = RootRoute.path; //update-begin---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------ //update-begin---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------ -const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN, H5_ADVISORYINFO ]; +const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN, H5_ADVISORYINFO,H5_REGISTER_ADVISORY ]; //update-end---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------ //update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------ diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index 9747fb1..ae8ac94 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -65,14 +65,24 @@ export const TokenLoginRoute: AppRouteRecordRaw = { }, }; +//h5页面首页 +export const H5_REGISTER_ADVISORY: AppRouteRecordRaw = { + path: '/h5/registerAdvisory', + name: 'registerAdvisory', + component: () => import('../../views/biz/NuBizAdvisoryInfo/h5/RegisterAdvisoryInfo.vue'), + meta: { + title: "选择入住", + }, +}; + //h5页面首页 export const H5_ADVISORYINFO: AppRouteRecordRaw = { path: '/h5/advisoryInfo', name: 'advisoryInfo', - component: () => import('/@/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue'), + component: () => import('../../views/biz/NuBizAdvisoryInfo/h5/AdvisoryInfo.vue'), meta: { title: "选择入住", }, }; // Basic routing without permission -export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,H5_ADVISORYINFO]; +export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,H5_REGISTER_ADVISORY,H5_ADVISORYINFO]; diff --git a/src/utils/env.ts b/src/utils/env.ts index 8f4b1ac..fe23aed 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -36,6 +36,7 @@ export function getAppEnvConfig() { VITE_GLOB_APP_CAS_BASE_URL, VITE_GLOB_DOMAIN_URL, VITE_GLOB_ONLINE_VIEW_URL, + VITE_GLOB_INSTITUTIONS_URL, // 【JEECG作为乾坤子应用】 VITE_GLOB_QIANKUN_MICRO_APP_NAME, @@ -59,6 +60,7 @@ export function getAppEnvConfig() { VITE_GLOB_APP_CAS_BASE_URL, VITE_GLOB_DOMAIN_URL, VITE_GLOB_ONLINE_VIEW_URL, + VITE_GLOB_INSTITUTIONS_URL, // 【JEECG作为乾坤子应用】 VITE_GLOB_QIANKUN_MICRO_APP_NAME, diff --git a/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue b/src/views/biz/NuBizAdvisoryInfo/h5/AdvisoryInfo.vue similarity index 56% rename from src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue rename to src/views/biz/NuBizAdvisoryInfo/h5/AdvisoryInfo.vue index 8811f4b..27b38a6 100644 --- a/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue +++ b/src/views/biz/NuBizAdvisoryInfo/h5/AdvisoryInfo.vue @@ -1,12 +1,18 @@