diff --git a/Dockerfile b/Dockerfile index 98a0e61..f5d4468 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN rm -rf /etc/nginx/conf.d/default.conf COPY docker/nginx.conf /etc/nginx/conf.d/default.conf # 从构建阶段复制构建产物(UniApp H5 输出目录) -COPY --from=builder /build/dist/build/h5 /usr/share/nginx/html/h5 +COPY --from=builder /build/dist/build/h5/ /usr/share/nginx/html/ # 暴露端口 EXPOSE 80 diff --git a/docker/nginx.conf b/docker/nginx.conf index 8a75535..7d22fc7 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -27,16 +27,8 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } - location /h5/ { - try_files $uri $uri/ /h5/index.html; - } - - location = /h5 { - return 301 /h5/; - } - - location = / { - return 301 /h5/; + location / { + try_files $uri $uri/ /index.html; } location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ { diff --git a/vite.config.ts b/vite.config.ts index 2c5bb2f..8c57ebe 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -17,9 +17,8 @@ export default defineConfig(({ command, mode }): UserConfig => { console.log('环境变量 env -> ', env); const isBuild = process.env.NODE_ENV === 'production'; - // const base = ['development', 'test'].includes(mode) ? '/h5/' : '/'; return { - base: '/h5/', + base: '/', // 自定义env目录 envDir: './env', resolve: {