Merge branch 'feature-20260316wyz-修改流程' into 'test'

Feature 20260316wyz 修改流程

See merge request !92

Dockerfile

@@ -45,7 +45,7 @@ RUN ls -la node_modules/esbuild/bin && \
 
 
 # 复制源码并构建
 # 复制源码并构建
 COPY . .
 COPY . .
-RUN npm run build:dev
+RUN npm run build:prod
 
 
 # 生产阶段
 # 生产阶段
 FROM docker.m.daocloud.io/library/nginx:alpine
 FROM docker.m.daocloud.io/library/nginx:alpine
@@ -60,5 +60,5 @@ RUN echo "https://mirrors.aliyun.com/alpine/v3.22/main/" > /etc/apk/repositories
     cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo "Asia/Shanghai" > /etc/timezone
     echo "Asia/Shanghai" > /etc/timezone
 
 
-EXPOSE 6688
+EXPOSE 2669
 CMD ["nginx", "-g", "daemon off;"]
 CMD ["nginx", "-g", "daemon off;"]

nginx.conf

+# 定义网关服务的负载均衡组
+upstream gateway_load_balance {
+    server 139.224.150.79:9010;  # 管理节点服务器上的网关实例
+    server 139.224.149.150:9011;  # 工作节点服务器上的网关实例
+}
+
 server {
 server {
-    listen 6688;
-    server_name 139.224.145.34;
+    listen 2669;
+    server_name _;
 
 
-    # 处理前端静态资源（Vue应用）
-    location / {
     root /usr/share/nginx/html;
     root /usr/share/nginx/html;
     index index.html;
     index index.html;
-        try_files $uri $uri/ /index.html; # 处理Vue路由history模式
-        if ($request_method = OPTIONS) {
+
+    # 静态资源处理 - 必须放在最前面
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|map)$ {
+        # ✅ 关键：添加 try_files 指令
+        try_files $uri =404;
+
+        # 确保静态资源有正确的过期时间和缓存头
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+
+        # 为静态资源添加CORS头
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization' always;
+
+        # 处理OPTIONS请求（CORS预检）
+        if ($request_method = 'OPTIONS') {
             add_header 'Access-Control-Allow-Origin' '*';
             add_header 'Access-Control-Allow-Origin' '*';
             add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
             add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
-            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization';
             add_header 'Access-Control-Max-Age' 1728000;
             add_header 'Access-Control-Max-Age' 1728000;
-            add_header 'Content-Type' 'text/plain charset=UTF-8';
             add_header 'Content-Length' 0;
             add_header 'Content-Length' 0;
+            add_header 'Content-Type' 'text/plain; charset=UTF-8';
             return 204;
             return 204;
         }
         }
-
-        limit_except GET POST PUT DELETE OPTIONS {
-            deny all;
-        }
     }
     }
 
 
-    # 代理后端API请求 - 使用更具体的路径
-    location /api/ {
-        proxy_buffer_size 1024k; #设置代理服务器（nginx）保存用户头信息的缓冲区大小
-        proxy_buffers 16 1024k; #proxy_buffers缓冲区，网页平均在32k以下的设置
-        proxy_busy_buffers_size 2048k; #高负荷下缓冲大小（proxy_buffers*2）
-        proxy_temp_file_write_size 2048k; #设定缓存文件夹大小，大于这个值，将从upstream服务器传
-        proxy_pass http://139.224.145.34:9002/;
+    # 健康检查接口
+    location /health {
+        access_log off;
+        return 200 "healthy\n";
+        add_header Content-Type text/plain;
     }
     }
 
 
-    # 可能需要代理其他后端服务
-    # location /other-service/ {
-    #     proxy_pass http://other-service:port/;
-    # }
+    # 前端路由处理 - 放在最后，作为兜底规则
+    location / {
+        try_files $uri $uri/ /index.html; # 处理Vue路由history模式
+
+        # 为页面添加CORS头
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization' always;
+    }
 }
 }
\ No newline at end of file

src/views/sign/FnaList/components/customer.vue

@@ -755,7 +755,10 @@ const handleDateChange = child => {
   let age = null
   let age = null
   if (child.key == 'birthday') {
   if (child.key == 'birthday') {
     age = calculateExactAge(proxy.formatToDate(form.value.birthday))
     age = calculateExactAge(proxy.formatToDate(form.value.birthday))
-    if (age >= 18) {
+
+    if (age >= 18 && props.activeName !== 'insurantInfo') {
+      form.value.age = age
+    } else if (props.activeName == 'insurantInfo') {
       form.value.age = age
       form.value.age = age
     }
     }
   }
   }