Merge branch 'main' into feature/v1.0.73

apps/bigmember_pc/.env.production

@@ -1,6 +1,6 @@
 NODE_ENV=production
 VITE_APP_BASE_API=''
 VITE_APP_BASE_URL='/page_big_pc'
-VITE_APP_BASE_PUBLIC='/page_big_pc/'
+VITE_APP_BASE_PUBLIC='https://cdn-common.jianyu360.cn/page_big_pc/'
 VITE_APP_WORK_DESKTOP_URL='/page_workDesktop/work-bench/app/big'
-VITE_APP_GIT_BRANCH='v1.0.54.1'
+VITE_APP_GIT_BRANCH='v1.0.74'

apps/mobile/.env.development

@@ -1,5 +1,6 @@
 VITE_APP_BASE_API='/api'
 VITE_APP_BASE_URL='/jy_mobile'
+VITE_APP_BASE_PUBLIC='/jy_mobile/'
 VITE_APP_IMAGE_BASE='https://web2-qmxtest.jydev.jianyu360.com'
 VITE_APP_APP_PROJECT_BASE='https://app2-jytest.jydev.jianyu360.com'
 VITE_APP_WX_PROJECT_BASE='https://jybx2-webtest.jydev.jianyu360.com'

apps/mobile/.env.production

@@ -1,6 +1,7 @@
 VITE_APP_BASE_API=''
 VITE_APP_BASE_URL='/jy_mobile'
+VITE_APP_BASE_PUBLIC='https://cdn-common.jianyu360.cn/jy_mobile/'
 VITE_APP_IMAGE_BASE=''
 VITE_APP_APP_PROJECT_BASE=''
 VITE_APP_WX_PROJECT_BASE=''
-VITE_APP_GIT_BRANCH='v1.0.62'
+VITE_APP_GIT_BRANCH='v1.0.74'

apps/mobile/vite.config.js

@@ -36,7 +36,7 @@ function getExternals(isDev) {
 export default defineConfig(({ mode,command }) => {
   const env = loadEnv(mode, process.cwd())
   return {
-    base: '/jy_mobile/',
+    base: env.VITE_APP_BASE_PUBLIC,
     build: {
       sourcemap: true,
       outDir: '../../dist/jy_mobile',