Merge remote-tracking branch 'origin/master'

build.sh

-#!/bin/sh -l
-#cd phone
-#npm i
-#npm run build
-#\cp -rfp dist/* ../dist_phone
-
-cd server
-bee pack -a "qsh-wc-test" -exp=".git:.idea:phone:pc" exs="Dockerfile:build.sh"
\ No newline at end of file

build_prod.sh

-#!/bin/sh -l
-cd phone
-npm i
-npm run build
-mv dist/env/prod.js dist/env.js
-\cp -rfp dist/* ../dist_phone
-
-cd ../
-bee pack -a "cf_data_monitor_prod" -exp=".git:.idea:phone:pc" exs="Dockerfile:build.sh"
\ No newline at end of file

server/dist_pc/.gitignore

-.gitignore
+*
 !.gitignore

server/dist_phone/.gitignore

-.gitignore
+*
 !.gitignore

server/dist_web/.gitignore

+*
+!.gitignore

web/vite.config.js

@@ -44,7 +44,7 @@ export default ({
   const esbuild = {}
 
   return {
-    base: './', // index.html文件所在位置
+    base: '/admin', // index.html文件所在位置
     root: './', // js导入的资源路径，src
     resolve: {
       alias,