diff --git a/.env.production b/.env.production index 3d18e2a..d1ef207 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ NODE_ENV = "production" # 线上环境接口地址(easymock) -VITE_API_URL = "https://mock.mengxuegu.com/mock/629d727e6163854a32e8307e" +VITE_API_URL = "http://139.9.66.234:6688" diff --git a/index.html b/index.html index 81ee23d..908092e 100644 --- a/index.html +++ b/index.html @@ -99,6 +99,7 @@ dot.forEach(item => (item.style.background = color)); if (isDark) html.style.background = "#141414"; } + window.http = "http://139.9.66.234:6688"; diff --git a/package.json b/package.json index 36ba07d..7616ecd 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "serve": "vite", "build:dev": "vue-tsc --noEmit && vite build --mode development", "build:test": "vue-tsc --noEmit && vite build --mode test", - "build:pro": "vue-tsc --noEmit && vite build --mode production", + "build:pro": "vite build --mode production", "preview": "vite preview", "lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src", "lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"", diff --git a/src/api/config/servicePort.ts b/src/api/config/servicePort.ts index 2532e86..2541f5b 100644 --- a/src/api/config/servicePort.ts +++ b/src/api/config/servicePort.ts @@ -1,3 +1,3 @@ // * 后端微服务端口名 export const PORT1 = "http://192.168.34.122:6688"; -export const PORT2 = "http://192.168.34.122:6688"; +export const PORT2 = "http://139.9.66.234:6688"; diff --git a/src/api/index.ts b/src/api/index.ts index 0dd5840..cb3cf6f 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -11,6 +11,7 @@ import router from "@/routers"; const config = { // 默认地址请求地址,可在 .env.*** 文件中修改 baseURL: import.meta.env.VITE_API_URL as string, + // baseURL: import.meta.env.NODE_ENV=='development' ?'/api' : window.http, // 设置超时时间(10s) timeout: ResultEnum.TIMEOUT as number, // 跨域时候允许携带凭证 diff --git a/src/assets/images/login/loginImg.jpg b/src/assets/images/login/loginImg.jpg new file mode 100644 index 0000000..4f72107 Binary files /dev/null and b/src/assets/images/login/loginImg.jpg differ diff --git a/src/config/config.ts b/src/config/config.ts index e1f6596..eefc987 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -6,11 +6,13 @@ export const HOME_URL: string = "/government"; // * 登录页地址(默认) export const LOGIN_URL: string = "/login"; +// export const PROJECT_URL: string = "/projectlogon"; + // * 默认主题颜色 export const DEFAULT_PRIMARY: string = "#008BFF"; // * 路由白名单地址(必须是本地存在的路由 staticRouter.ts) -export const ROUTER_WHITE_LIST: string[] = ["/500"]; +export const ROUTER_WHITE_LIST: string[] = ["/500", "/projectlogon"]; // * 高德地图 key export const AMAP_MAP_KEY: string = ""; diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index c741809..d2c1f59 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -17,6 +17,14 @@ export const staticRouter: RouteRecordRaw[] = [ title: "登录" } }, + { + path: "/projectlogon", + name: "projectLogon", + component: () => import("@/views/login/ProJectForm/index.vue") + // meta: { + // title: "登录" + // } + }, { path: "/layout", name: "layout", diff --git a/src/views/login/ProJectForm/index.vue b/src/views/login/ProJectForm/index.vue new file mode 100644 index 0000000..02af043 --- /dev/null +++ b/src/views/login/ProJectForm/index.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 978e4d5..021cf32 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -8,7 +8,13 @@ - + @@ -21,10 +27,15 @@ 登录 +
+ 企业注册 + 项目注册 + +