feat:优化初版

.idea/.name

@@ -0,0 +1 @@
+南邮工会羽毛球报名

backend/src/main/java/com/budwk/app/client/auth/service/ClientAuthServiceImpl.java

@@ -52,14 +52,16 @@ public class ClientAuthServiceImpl implements ClientAuthService {
         }
 
         if (loginBody.getLoginMethod().equals("sms")) {
-            // 测试阶段允许已注册手机号直接登录；恢复正式登录时必须重新启用短信验证码校验。
+            validateService.checkSMSCode(loginBody.getPhone(), loginBody.getSmsCode());
-//            validateService.checkSMSCode(loginBody.getPhone(), loginBody.getSmsCode());
         }
 
         if (loginBody.getLoginMethod().equals("password")) {
+            if (Strings.isBlank(loginBody.getPassword())) {
+                throw new BaseException("请输入密码");
+            }
             String hashedPassword = PwdUtil.getPassword(loginBody.getPassword(), user.getSalt());
             if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-//                throw new BaseException("密码不正确");
+                throw new BaseException("密码不正确");
             }
         }
 

backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientActivityController.java

@@ -59,6 +59,7 @@ public class ClientActivityController {
                   t1.signStartTime,
                   t1.signEndTime,
                   t1.coHostUnit,
+                  t1.hostUnit,
                   t1.cover
                 FROM
                   activity t1

backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientGroupController.java

@@ -66,7 +66,6 @@ public class ClientGroupController {
                   LEFT JOIN act_user t2 ON t1.id = t2.activityId
                 WHERE
                   t2.userId = @userId
-                  AND t2.isSignIn =1
                 """).setParam("userId", StpClientUtil.STP.getLoginIdAsLong());
         List<NutMap> list = clientActivityService.listMap(sql);
         return Result.success(list);

backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientActivityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.budwk.app.client.module.activity.service.impl;
 
+import cn.hutool.core.util.IdcardUtil;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.client.auth.models.Client_user;
@@ -144,6 +145,11 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
                 oldUser = oldUserByPhone.get(user.getPhone());
             }
             mergeHiddenFields(user, oldUser, requiredMap);
+            // 无手机号人员再次提交时沿用本人旧记录关联的账号，不信任客户端传入的账号ID。
+            user.setUserId(oldUser == null ? null : oldUser.getUserId());
+            if (!conditionMatches(user, RegistrationFieldDefinition.PHONE)) {
+                user.setPhone(null);
+            }
         }
 
         if (requiredMap.containsKey("personType") || requiredMap.containsKey("projectType")) {
@@ -175,6 +181,7 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
 
         // 检查是否有重复的手机号
         boolean hasDuplicatePhone = userList.stream()
+                .filter(item -> Strings.isNotBlank(item.getPhone()))
                 .collect(Collectors.groupingBy(ActUser::getPhone, Collectors.counting()))
                 .values().stream()
                 .anyMatch(count -> count > 1);
@@ -191,7 +198,10 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
 
         // 首先检查报名人员是否已经在用户表中
         for (ActUser user : userList) {
-            Client_user clientUser = dao().fetch(Client_user.class, Cnd.where(Client_user::getPhone, "=", user.getPhone()));
+            // 未兼任教练或领队的运动员允许不填手机号，不能用空手机号查找并错误关联其他人的账号。
+            Client_user clientUser = Strings.isNotBlank(user.getPhone())
+                    ? dao().fetch(Client_user.class, Cnd.where(Client_user::getPhone, "=", user.getPhone()))
+                    : (user.getUserId() == null ? null : dao().fetch(Client_user.class, user.getUserId()));
             if (clientUser == null) {
                 // 创建用户
                 clientUser = new Client_user();
@@ -259,6 +269,11 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
             if (Boolean.TRUE.equals(entry.getValue()) && isEmptyValue(value)) {
                 throw new BaseException("请填写" + definition.getFieldLabel());
             }
+            // 服务端复核身份证，防止绕过页面校验提交无效号码。
+            if ("idCard".equals(entry.getKey()) && !isEmptyValue(value)
+                    && (String.valueOf(value).length() != 18 || !IdcardUtil.isValidCard18(String.valueOf(value)))) {
+                throw new BaseException("请输入正确的18位身份证号码");
+            }
             if (!isEmptyValue(value)
                     && !activityRegistrationFieldService.isValidDictValue(activityId, entry.getKey(), String.valueOf(value))) {
                 throw new BaseException(definition.getFieldLabel() + "不属于当前可用的数据字典选项");
@@ -274,6 +289,10 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
         if (Strings.isBlank(definition.getParentField())) {
             return true;
         }
+        // 人员类型为字典多选，按名称解析编码后匹配任意目标类型。
+        if ("personType".equals(definition.getParentField())) {
+            return activityRegistrationFieldService.matchesPersonTypes(user.getPersonType(), definition.getShowWhenValue());
+        }
         Object parentValue = getFieldValue(user, definition.getParentField());
         return parentValue != null && definition.getShowWhenValue().equals(String.valueOf(parentValue));
     }
@@ -292,6 +311,7 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
             case "unitName" -> user.getUnitName();
             case "position" -> user.getPosition();
             case "phone" -> user.getPhone();
+            case "idCard" -> user.getIdCard();
             case "birthday" -> user.getBirthday();
             case "isStay" -> user.getIsStay();
             case "isContacts" -> user.getIsContacts();
@@ -321,6 +341,7 @@ public class ClientActivityServiceImpl extends BaseServiceImpl<Activity> impleme
                 case "projectType" -> target.setProjectType(source == null ? null : source.getProjectType());
                 case "weight" -> target.setWeight(source == null ? null : source.getWeight());
                 case "position" -> target.setPosition(source == null ? null : source.getPosition());
+                case "idCard" -> target.setIdCard(source == null ? null : source.getIdCard());
                 case "birthday" -> target.setBirthday(source == null ? null : source.getBirthday());
                 case "isStay" -> target.setIsStay(source == null ? null : source.getIsStay());
                 case "isContacts" -> target.setIsContacts(source == null ? false : source.getIsContacts());

backend/src/main/java/com/budwk/app/module/activity/controller/ActGroupController.java

@@ -187,6 +187,20 @@ public class ActGroupController {
     }
 
 
+    /**
+     * 按单位对活动全部有效报名人员进行分组。
+     *
+     * @param activityId 活动ID
+     * @return 分组成功结果；数据不完整时由业务异常返回错误提示
+     */
+    @At
+    @SaCheckPermission("activity.group")
+    @SLog(tag = "活动分组", msg = "按单位分组")
+    public Result groupByUnit(Long activityId) {
+        actGroupService.groupByUnit(activityId);
+        return Result.success();
+    }
+
     @At
     @SaCheckPermission("activity.group")
     public Result queryUnGroupUser(String activityId) {

backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java

@@ -40,6 +40,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -255,10 +258,53 @@ public class ActUserController {
 
             Sql sql = actUserService.getSignUpSql(pageForm);
             List<NutMap> nutMaps = actUserService.listMap(sql);
+            // 历史表列名为ProjectType，统一导出键名供项目排序及名称转换使用。
+            for (NutMap row : nutMaps) {
+                if (row.getString("projectType", "").isEmpty()) {
+                    row.put("projectType", row.getString("ProjectType", ""));
+                }
+            }
+            // 导出按单位、领队、教练、项目、男女分组；人员类型按字典名称解析，兼任类型也参与排序。
+            Map<String, Integer> personTypeOrder = nutMaps.stream()
+                    .map(row -> row.getString("personType", "")).distinct()
+                    .collect(Collectors.toMap(type -> type, type ->
+                            activityRegistrationFieldService.matchesPersonTypes(type, "领队") ? 0
+                                    : activityRegistrationFieldService.matchesPersonTypes(type, "教练") ? 1 : 2));
+            nutMaps.sort(Comparator.comparing((NutMap row) -> row.getString("unitName", ""))
+                    .thenComparing(row -> row.getString("unitId", ""))
+                    .thenComparingInt(row -> personTypeOrder.get(row.getString("personType", "")))
+                    .thenComparing(row -> Arrays.stream(row.getString("projectType", "").split(","))
+                            .map(String::trim).filter(value -> !value.isEmpty()).distinct().sorted()
+                            .collect(Collectors.joining(",")))
+                    .thenComparingInt(row -> "男".equals(row.getString("sex")) ? 0
+                            : "女".equals(row.getString("sex")) ? 1 : 2));
+            // 多选字典编码转换为名称；保留无法匹配的旧编码，避免历史报名信息在导出时丢失。
+            for (NutMap field : activityRegistrationFieldService.getFieldConfig(pageForm.getActivityId(), false, true)) {
+                String fieldKey = field.getString("fieldKey");
+                if (!"personType".equals(fieldKey) && !"projectType".equals(fieldKey)) {
+                    continue;
+                }
+                Map<String, String> optionNames = new HashMap<>();
+                if (field.get("options") instanceof List<?> options) {
+                    for (Object option : options) {
+                        if (option instanceof Map<?, ?> optionMap) {
+                            optionNames.put(String.valueOf(optionMap.get("value")), String.valueOf(optionMap.get("label")));
+                        }
+                    }
+                }
+                for (NutMap row : nutMaps) {
+                    row.put(fieldKey + "Desc", Arrays.stream(row.getString(fieldKey, "").split(","))
+                            .map(String::trim).filter(value -> !value.isEmpty())
+                            .map(value -> optionNames.getOrDefault(value, value))
+                            .collect(Collectors.joining("、")));
+                }
+            }
             List<ExcelExportEntity> entityList = new ArrayList<>() {{
 //                add(new ExcelExportEntity("报名号", "actUserNo", 20));
                 add(new ExcelExportEntity("姓名", "userName", 20));
                 add(new ExcelExportEntity("性别", "sex", 20));
+                add(new ExcelExportEntity("人员类型", "personTypeDesc", 20));
+                add(new ExcelExportEntity("项目类型", "projectTypeDesc", 30));
                 add(new ExcelExportEntity("身份证号码", "idCard", 20));
                 add(new ExcelExportEntity("联系方式", "phone", 20));
                 add(new ExcelExportEntity("职务", "position", 20));

backend/src/main/java/com/budwk/app/module/activity/enums/RegistrationFieldDefinition.java

@@ -14,11 +14,11 @@ public enum RegistrationFieldDefinition {
     USER_NAME("userName", "姓名", "input", true, true, true, null, null, null),
     SEX("sex", "性别", "radio", true, true, false, null, null, null),
     PERSON_TYPE("personType", "人员类型", "dict-checkbox", false, false, false, null, null, "person_type"),
-    PROJECT_TYPE("projectType", "项目类型", "dict-checkbox", false, false, false, null, null, "project_type"),
+    PROJECT_TYPE("projectType", "项目类型", "dict-checkbox", false, true, false, "personType", "运动员", "project_type"),
     WEIGHT("weight", "体重（KG）", "number", true, true, false, null, null, null),
     UNIT_NAME("unitName", "单位名称", "readonly", true, true, true, null, null, null),
     POSITION("position", "职务", "input", true, true, false, null, null, null),
-    PHONE("phone", "联系电话", "tel", true, true, true, null, null, null),
+    PHONE("phone", "联系电话", "tel", true, true, true, "personType", "教练,领队", null),
     BIRTHDAY("birthday", "出生日期", "date", false, false, false, null, null, null),
     IS_STAY("isStay", "是否住宿", "boolean-radio", true, true, false, null, null, null),
     IS_CONTACTS("isContacts", "是否联络员", "boolean-radio", true, true, false, null, null, null),
@@ -29,7 +29,8 @@ public enum RegistrationFieldDefinition {
     IS_SHOW_SKILL("isShowSkill", "是否展示才艺", "boolean-radio", false, false, false, null, null, null),
     SKILL_NAME("skillName", "才艺名称", "input", false, false, false, "isShowSkill", "true", null),
     EQUIP("equip", "所需器材", "input", false, false, false, "isShowSkill", "true", null),
-    IS_PARTY("isParty", "参加茶叙会", "boolean-radio", true, true, false, null, null, null);
+    IS_PARTY("isParty", "参加茶叙会", "boolean-radio", true, true, false, null, null, null),
+    ID_CARD("idCard", "身份证", "input", true, true, true, "personType", "运动员", null);
 
     private final String fieldKey;
     private final String fieldLabel;

backend/src/main/java/com/budwk/app/module/activity/models/ActUser.java

@@ -71,10 +71,10 @@ public class ActUser extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, width = 100)
     private String position;
 
-//    @Column
+    @Column
-//    @Comment("身份证号码")
+    @Comment("身份证号码")
-//    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 20)
-//    private String idCard;
+    private String idCard;
 
     @Column
     @Comment("出生日期")

backend/src/main/java/com/budwk/app/module/activity/service/ActGroupService.java

@@ -24,6 +24,14 @@ public interface ActGroupService extends BaseService<ActGroup> {
      */
     void groupSetting(ActGroupVo groupVo);
 
+    /**
+     * 按单位重建活动全部有效报名人员的分组，同一单位只生成一个组。
+     *
+     * @param activityId 活动ID；不限制人员签到状态
+     * @throws com.budwk.app.base.exception.BaseException 活动或报名数据不满足分组条件时抛出
+     */
+    void groupByUnit(Long activityId);
+
     /**
      * 设置未分组人员
      * @param unGroupUserVo

backend/src/main/java/com/budwk/app/module/activity/service/ActivityRegistrationFieldService.java

@@ -54,6 +54,15 @@ public interface ActivityRegistrationFieldService extends BaseService<ActRegistr
      */
     boolean isValidPersonTypeCombination(String value);
 
+    /**
+     * 根据字典名称判断多选人员类型是否满足字段联动条件。
+     *
+     * @param personType 逗号分隔的人员类型字典编码
+     * @param labels 逗号分隔的人员类型名称，匹配任意一项即满足条件
+     * @return 已选人员类型中包含目标类型时返回true
+     */
+    boolean matchesPersonTypes(String personType, String labels);
+
     /**
      * 获取同一活动、同一单位的人员类型人数限制状态。
      *

backend/src/main/java/com/budwk/app/module/activity/service/impl/ActGroupServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdcardUtil;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.module.activity.models.*;
 import com.budwk.app.module.activity.service.ActGroupService;
 import com.budwk.app.module.activity.vo.ActGroupVo;
@@ -16,6 +17,7 @@ import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
+import org.nutz.lang.Strings;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -133,6 +135,62 @@ public class ActGroupServiceImpl extends BaseServiceImpl<ActGroup> implements Ac
     }
 
 
+    /**
+     * 将活动全部有效报名人员按单位ID重建为一单位一组，并初始化各项目得分记录。
+     *
+     * @param activityId 活动ID
+     * @throws BaseException 活动不存在、无有效报名人员或人员缺少单位、关联账号时抛出
+     */
+    @Override
+    @Aop(TransAop.READ_COMMITTED)
+    public void groupByUnit(Long activityId) {
+        if (activityId == null || dao().fetch(Activity.class,
+                Cnd.where(Activity::getId, "=", activityId).and(Activity::getDelFlag, "=", false)) == null) {
+            throw new BaseException("请选择有效活动");
+        }
+        List<ActUser> users = dao().query(ActUser.class,
+                Cnd.where(ActUser::getActivityId, "=", activityId).and(ActUser::getDelFlag, "=", false)
+                        .asc(ActUser::getUnitName).asc(ActUser::getId));
+        if (users.isEmpty()) {
+            throw new BaseException("当前活动暂无有效报名人员");
+        }
+        Map<String, List<ActUser>> unitUsers = new LinkedHashMap<>();
+        for (ActUser user : users) {
+            if (Strings.isBlank(user.getUnitId()) || user.getUserId() == null) {
+                throw new BaseException("报名人员【" + user.getUserName() + "】缺少所属单位或关联账号，请补齐后再分组");
+            }
+            unitUsers.computeIfAbsent(user.getUnitId(), key -> new ArrayList<>()).add(user);
+        }
+        List<ActivityItem> items = dao().query(ActivityItem.class, Cnd.where(ActivityItem::getActivityId, "=", activityId));
+        // 完成数据检查后再覆盖旧分组，整个重建过程在同一事务内完成。
+        dao().clear(ActItemGroupScore.class, Cnd.where(ActItemGroupScore::getActivityId, "=", activityId));
+        dao().clear(ActGroupUser.class, Cnd.where(ActGroupUser::getActivityId, "=", activityId));
+        dao().clear(ActUnGroupUser.class, Cnd.where(ActUnGroupUser::getActivityId, "=", activityId));
+        dao().clear(ActGroup.class, Cnd.where(ActGroup::getActivityId, "=", activityId));
+        int sort = 1;
+        for (List<ActUser> members : unitUsers.values()) {
+            ActGroup group = new ActGroup();
+            group.setActivityId(activityId);
+            group.setGroupName(Strings.sBlank(members.get(0).getUnitName(), members.get(0).getUnitId()));
+            group.setSort(sort++);
+            group.setIsOpen(false);
+            group.setGroupUsers(members.stream().map(ActUser::getUserId).distinct().map(userId -> {
+                ActGroupUser member = new ActGroupUser();
+                member.setActivityId(activityId);
+                member.setUserId(userId);
+                return member;
+            }).collect(Collectors.toList()));
+            dao().insertWith(group, "groupUsers");
+            for (ActivityItem item : items) {
+                ActItemGroupScore score = new ActItemGroupScore();
+                score.setActivityId(activityId);
+                score.setItemId(item.getId());
+                score.setGroupId(group.getId());
+                dao().insert(score);
+            }
+        }
+    }
+
     @Override
     @Aop(TransAop.READ_COMMITTED)
     public void unGroupUserSetting(ActUnGroupUserVo unGroupUserVo) {

backend/src/main/java/com/budwk/app/module/activity/service/impl/ActivityRegistrationFieldServiceImpl.java

@@ -51,12 +51,41 @@ public class ActivityRegistrationFieldServiceImpl extends BaseServiceImpl<ActReg
                 .collect(Collectors.toMap(ActRegistrationField::getFieldKey, item -> item, (left, right) -> left,
                         LinkedHashMap::new));
         boolean useDefault = storedFields.isEmpty();
+        ActRegistrationField identityField = storedMap.get("idCard");
+        boolean legacyIdentitySort = identityField == null || identityField.getSort() == null
+                || identityField.getSort() == 0;
+        // 兼容身份证原来排在0的活动配置，仅在旧顺序下为第6位腾出位置，避免重复顺延。
+        if (legacyIdentitySort) {
+            for (ActRegistrationField field : storedMap.values()) {
+                if (field.getSort() != null && field.getSort() >= 6) {
+                    field.setSort(field.getSort() + 1);
+                }
+            }
+            if (identityField != null) {
+                identityField.setSort(6);
+            }
+            if (storedMap.containsKey("phone")) {
+                storedMap.get("phone").setSort(7);
+            }
+            if (storedMap.containsKey("position")) {
+                storedMap.get("position").setSort(8);
+            }
+        }
+        // 旧活动也补齐新增固定字段及其父字段，使人员类型联动无需重新保存即可生效。
+        for (RegistrationFieldDefinition definition : RegistrationFieldDefinition.values()) {
+            if (definition.isLocked() || useDefault && definition.isDefaultSelected()) {
+                storedMap.putIfAbsent(definition.getFieldKey(), buildDefaultField(definition));
+            }
+        }
+        for (String fieldKey : new LinkedHashSet<>(storedMap.keySet())) {
+            addParentField(storedMap, RegistrationFieldDefinition.fromKey(fieldKey));
+        }
         List<NutMap> result = new ArrayList<>();
         int defaultSort = 1;
         for (RegistrationFieldDefinition definition : RegistrationFieldDefinition.values()) {
             boolean projectTypeField = RegistrationFieldDefinition.PROJECT_TYPE == definition;
             ActRegistrationField stored = storedMap.get(definition.getFieldKey());
-            boolean selected = useDefault ? definition.isDefaultSelected() : stored != null;
+            boolean selected = stored != null;
             // 多项目、无项目或唯一项目未配置有效类型时，历史配置也不再向客户端开放。
             if (projectTypeField && !projectTypeContext.configurable) {
                 selected = false;
@@ -66,13 +95,14 @@ public class ActivityRegistrationFieldServiceImpl extends BaseServiceImpl<ActReg
                 continue;
             }
             boolean required = stored == null ? definition.isDefaultRequired() : Boolean.TRUE.equals(stored.getRequired());
-            int sort = stored == null || stored.getSort() == null ? defaultSort : stored.getSort();
+            int sort = stored == null || stored.getSort() == null
+                    ? buildDefaultField(definition).getSort() : stored.getSort();
             NutMap item = NutMap.NEW()
                     .addv("fieldKey", definition.getFieldKey())
                     .addv("fieldLabel", definition.getFieldLabel())
                     .addv("componentType", definition.getComponentType())
                     .addv("selected", selected)
-                    .addv("required", definition.isLocked() || required)
+                    .addv("required", definition.isLocked() || projectTypeField || required)
                     .addv("locked", definition.isLocked())
                     .addv("sort", sort)
                     .addv("parentField", definition.getParentField())
@@ -130,16 +160,13 @@ public class ActivityRegistrationFieldServiceImpl extends BaseServiceImpl<ActReg
             RegistrationFieldDefinition definition = RegistrationFieldDefinition.fromKey(field.getFieldKey());
             field.setId(null);
             field.setActivityId(activityId);
-            field.setRequired(definition.isLocked() || Boolean.TRUE.equals(field.getRequired()));
+            field.setRequired(definition.isLocked() || definition == RegistrationFieldDefinition.PROJECT_TYPE || Boolean.TRUE.equals(field.getRequired()));
-            field.setSort(field.getSort() == null ? defaultSort : field.getSort());
+            field.setSort(field.getSort() == null ? buildDefaultField(definition).getSort() : field.getSort());
             saveList.add(field);
             defaultSort++;
         }
         saveList.sort(Comparator.comparing(ActRegistrationField::getSort));
-        // 允许管理端用数字快速调整顺序；保存时归一化为连续序号，避免重复排序值导致展示不稳定。
+        // 保留配置序号，避免未启用字段被跳过后将身份证的第6位重新编号。
-        for (int index = 0; index < saveList.size(); index++) {
-            saveList.get(index).setSort(index + 1);
-        }
         dao().insert(saveList);
     }
 
@@ -167,6 +194,22 @@ public class ActivityRegistrationFieldServiceImpl extends BaseServiceImpl<ActReg
         return splitMultiValue(value).stream().allMatch(enabledValues::contains);
     }
 
+    /**
+     * 根据字典名称判断多选人员类型是否满足字段联动条件。
+     *
+     * @param personType 逗号分隔的人员类型字典编码
+     * @param labels 逗号分隔的人员类型名称，匹配任意一项即满足条件
+     * @return 已选人员类型中包含目标类型时返回true
+     */
+    @Override
+    public boolean matchesPersonTypes(String personType, String labels) {
+        List<String> selected = splitMultiValue(personType);
+        List<String> expectedLabels = splitMultiValue(labels);
+        return getEnabledDictOptions(RegistrationFieldDefinition.PERSON_TYPE.getDictCode()).stream()
+                .anyMatch(option -> expectedLabels.contains(option.getString("label"))
+                        && selected.contains(option.getString("value")));
+    }
+
     @Override
     public boolean isValidPersonTypeCombination(String value) {
         if (Strings.isBlank(value)) {
@@ -366,7 +409,17 @@ public class ActivityRegistrationFieldServiceImpl extends BaseServiceImpl<ActReg
             }
         }
         if (mixedMaleCount != mixedFemaleCount) {
-            throw new BaseException("混合双打须按一男一女配对，请按规则重新选择");
+            String currentSelection = "当前已选择" + mixedMaleCount + "名男选手、" + mixedFemaleCount + "名女选手";
+            if (mixedMaleCount == 2 && mixedFemaleCount == 0) {
+                currentSelection = "当前两名选手均为男选手，未选择女选手";
+            } else if (mixedMaleCount == 0 && mixedFemaleCount == 2) {
+                currentSelection = "当前两名选手均为女选手，未选择男选手";
+            }
+            // 差额按当前全部混双报名人数计算，明确未能配对的性别和人数。
+            String missingSex = mixedMaleCount > mixedFemaleCount ? "女" : "男";
+            int missingCount = Math.abs(mixedMaleCount - mixedFemaleCount);
+            throw new BaseException("混合双打：" + currentSelection + "，按现有人数配对还缺少"
+                    + missingCount + "名" + missingSex + "选手。请调整报名选择，确保每对为一男一女");
         }
         validateProjectTypeRegistrationLimits(activityId, users, options);
     }
@@ -541,7 +594,14 @@ public class ActivityRegistrationFieldServiceImpl extends BaseServiceImpl<ActReg
         ActRegistrationField field = new ActRegistrationField();
         field.setFieldKey(definition.getFieldKey());
         field.setRequired(definition.isDefaultRequired());
-        field.setSort(definition.ordinal() + 1);
+        field.setSort(switch (definition) {
+            case UNIT_NAME -> 5;
+            case ID_CARD -> 6;
+            case PHONE -> 7;
+            case POSITION -> 8;
+            default -> definition.ordinal() >= RegistrationFieldDefinition.BIRTHDAY.ordinal()
+                    ? definition.ordinal() + 2 : definition.ordinal() + 1;
+        });
         return field;
     }
 

backend/src/main/java/com/budwk/app/sys/controller/SysUserController.java

@@ -129,7 +129,7 @@ public class SysUserController {
         try {
             Sys_user user = sysUserService.fetch(id);
             String salt = R.UU32();
-            String pwd = R.captchaNumber(6);
+            String pwd = "wdxxmm@123";
             String hashedPasswordBase64 = PwdUtil.getPassword(pwd, salt);
             sysUserService.update(Chain.make("salt", salt).add("password", hashedPasswordBase64), Cnd.where("id", "=", id));
             sysUserService.deleteCache(user.getId());

backend/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -261,9 +261,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         if (user.isDisabled()) {
             throw new BaseException("用户被禁用");
         }
+        if (Strings.isBlank(passowrd)) {
+            throw new BaseException("请输入密码");
+        }
         String hashedPassword = PwdUtil.getPassword(passowrd, user.getSalt());
         if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-//            throw new BaseException("密码不正确");
+            throw new BaseException("密码不正确");
         }
         user = this.fetchLinks(user, "unit");
         return user;

backend/src/main/resources/views/platform/activity/group/index.html

@@ -62,6 +62,7 @@ layout("/layouts/platform_1.html"){
 	<el-card shadow="never" class="mt-3">
 		<el-row type="flex" style="justify-content: flex-start" class="mb-3">
 			<el-button type="primary" size="small" @click="openGrouping">开始分组</el-button>
+			<el-button type="primary" size="small" :loading="unitGrouping" @click="groupByUnit">按单位分组</el-button>
 <!--			<div v-if="unGroupUser && unGroupUser.length > 0" style="margin-left: 10px; display: inline-block;">-->
 <!--				<el-button type="warning" size="small" style="position: relative;" @click="doUnGroupUserSetting">-->
 <!--					未分组人员-->
@@ -139,7 +140,8 @@ layout("/layouts/platform_1.html"){
 					year: new Date().getFullYear() + ""
 				},
 				activityList: [],
-				unGroupUser: []
+				unGroupUser: [],
+				unitGrouping: false
 			}
 		},
 		methods: {
@@ -223,6 +225,36 @@ layout("/layouts/platform_1.html"){
 					})
 				})
 			},
+			// 按单位重建会清空旧分组及得分，操作前明确提示并防止重复提交。
+			async groupByUnit() {
+				if (this.unitGrouping) return
+				if (!this.pageForm.activityId) {
+					this.$message.error("请选择活动")
+					return
+				}
+				const activityId = this.pageForm.activityId
+				try {
+					await this.$confirm('将全部有效报名人员按单位分组，同一单位生成一个组。此操作会清空该活动现有分组及项目得分，是否继续？', '按单位分组', {
+						type: 'warning', confirmButtonText: '确定分组', cancelButtonText: '取消'
+					})
+				} catch (error) {
+					return
+				}
+				this.unitGrouping = true
+				try {
+					const resp = await $.post('/platform/activity/group/groupByUnit', {activityId})
+					if (resp.code === 0) {
+						this.$message.success('按单位分组成功')
+						await this.successGroup()
+					} else {
+						this.$message.error(resp.msg || '按单位分组失败')
+					}
+				} catch (error) {
+					this.$message.error('按单位分组失败')
+				} finally {
+					this.unitGrouping = false
+				}
+			},
 			// 开始分组
 			openGrouping(){
 				if (!this.pageForm.activityId) {

backend/src/main/resources/views/platform/activity/manage/registrationFieldSetting.js

@@ -8,7 +8,7 @@ const registrationFieldSetting = {
                 :before-close="handleClose">
             <div class="registration-field-setting" v-loading="loading">
                 <el-alert
-                    title="姓名、联系电话和单位名称为系统固定字段；关联字段会自动保持完整的父子关系。"
+                        title="身份证、姓名、联系电话和单位名称为系统固定字段；关联字段会自动保持完整的父子关系。"
                         type="info"
                         :closable="false"
                         show-icon>
@@ -46,7 +46,7 @@ const registrationFieldSetting = {
                         <template #default="scope">
                             <el-switch
                                     v-model="scope.row.required"
-                                :disabled="!scope.row.selected || scope.row.locked || scope.row.configurable === false">
+                                    :disabled="!scope.row.selected || scope.row.locked || scope.row.fieldKey === 'projectType' || scope.row.configurable === false">
                             </el-switch>
                         </template>
                     </el-table-column>
@@ -55,7 +55,7 @@ const registrationFieldSetting = {
                             <el-input-number
                                     v-model="scope.row.sort"
                                     :disabled="!scope.row.selected || scope.row.configurable === false"
-                                :min="1"
+                                    :min="0"
                                     :max="99"
                                     controls-position="right"
                                     size="small">
@@ -121,6 +121,11 @@ const registrationFieldSetting = {
                 this.selectParent(row)
                 return
             }
+            if (this.fieldList.some((item) => item.parentField === row.fieldKey && item.locked)) {
+                this.$set(row, "selected", true)
+                this.$message.warning("系统固定字段依赖此字段，不能取消显示")
+                return
+            }
             this.unselectChildren(row.fieldKey)
         },
         selectParent(row) {
@@ -223,6 +228,9 @@ const registrationFieldSetting = {
             return row.dictCode ? "数据字典：" + row.dictCode : "固定表单字段"
         },
         dependencyLabel(row) {
+            if (row.parentField === "personType") {
+                return "当人员类型为" + row.showWhenValue.split(",").join("或者") + "时才需要填写"
+            }
             if (!row.parentField) {
                 return "-"
             }

backend/src/main/resources/views/platform/activity/user/index.html

@@ -683,13 +683,13 @@ layout("/layouts/platform_1.html"){
 					})
 				})
 			},
-			// 查询面板和代报名弹窗共用启用单位列表，并按单位名称排序，便于快速检索。
+			// 查询面板和代报名弹窗共用启用单位列表，按数据库序号location升序排列。
 			getUnits(){
 				this.unitLoading = true
 				$.post('/open/common/units').then((resp) => {
 					if (resp.code === 0) {
 						const units = (resp.data || []).slice().sort((left, right) => {
-							return String(left.name || '').localeCompare(String(right.name || ''), 'zh-CN')
+							return Number(left.location ?? 0) - Number(right.location ?? 0)
 						})
 						this.$set(this, 'units', units)
 					} else {

frontend/src/App.vue

@@ -27,6 +27,10 @@ export default {
   margin: 0;
   padding: 0;
   box-sizing: border-box;
+}
+
+/* 活动详情富文本保留自身字体及继承关系，其他区域沿用原有默认字体。 */
+:where(*:not(.activity-rich-content *)) {
   font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;
 }
 

frontend/src/manifest.json

@@ -69,7 +69,7 @@
         "enable": false
     },
     "h5": {
-        "title": "趣味运动会",
+        "title": "赛事管理",
         "router": {
             "mode": "history"
         }

frontend/src/pages.json

@@ -107,7 +107,7 @@
   },
   "tabBar": {
     "color": "#000",
-    "selectedColor": "#f45a5a",
+    "selectedColor": "#1989fa",
     "borderStyle": "white",
     "backgroundColor": "#ffffff",
     "height": "60px",
@@ -124,7 +124,7 @@
           "selectedText": "\ue64d",
           "fontSize": "17px",
           "color": "#333",
-          "selectedColor": "#f45a5a"
+          "selectedColor": "#1989fa"
         }
       },
       {
@@ -135,7 +135,7 @@
           "selectedText": "\ue8b3",
           "fontSize": "17px",
           "color": "#333",
-          "selectedColor": "#f45a5a"
+          "selectedColor": "#1989fa"
         }
       },
       {
@@ -146,7 +146,7 @@
           "selectedText": "\ue600",
           "fontSize": "17px",
           "color": "#333",
-          "selectedColor": "#f45a5a"
+          "selectedColor": "#1989fa"
         }
       }
     ]

frontend/src/pages/activity/detail/index.vue

@@ -18,7 +18,7 @@
         <view class="event-info-section">
           <!-- 报名时间 -->
           <view class="info-item">
-            <t-icon name="calendar" size="20px"/>
+            <CalendarIcon  size="20px"/>
             <view class="info-text-container">
               <text class="info-text-title">报名时间</text>
               <text class="info-text">{{ formatDate(detailData.signStartTime) }} 至
@@ -29,7 +29,7 @@
 
           <!-- 活动时间 -->
           <view class="info-item">
-            <t-icon name="alarm" size="20px"/>
+            <AlarmIcon  size="20px"/>
             <view class="info-text-container">
               <text class="info-text-title">活动时间</text>
               <text class="info-text">{{ formatDate(detailData.startTime) }} 至 {{
@@ -41,7 +41,7 @@
 
           <!-- 活动地点 -->
           <view class="info-item">
-            <t-icon name="location" size="20px"/>
+            <LocationIcon  size="20px"/>
             <view class="info-text-container">
               <text class="info-text-title">活动地点</text>
               <text class="info-text">{{ detailData.address }}</text>
@@ -52,7 +52,7 @@
         <!-- 活动详情区域 -->
         <view class="activity-detail-section">
           <view class="section-title">活动详情</view>
-          <rich-text class="rich-content" :nodes="detailData.content"></rich-text>
+          <rich-text class="rich-content activity-rich-content" :nodes="detailData.content"></rich-text>
         </view>
 
         <!-- 比赛项目 -->
@@ -76,7 +76,7 @@
                   <view class="event-item-info">
                     <view class="event-item-section">
                       <view class="event-item-section-title">
-                        <t-icon name="flag" size="16px" color="var(--td-brand-color-5)"/>
+                        <FlagIcon  size="16px" color="var(--td-brand-color-5)"/>
                         <text>比赛方法</text>
                       </view>
                       <view class="event-item-section-content">{{ item.form }}</view>
@@ -84,7 +84,7 @@
 
                     <view class="event-item-section">
                       <view class="event-item-section-title">
-                        <t-icon name="chart-bar" size="16px" color="var(--td-brand-color-5)"/>
+                        <ChartBarIcon  size="16px" color="var(--td-brand-color-5)"/>
                         <text>评分标准</text>
                       </view>
                       <view class="event-item-section-content">{{ item.rule }}</view>
@@ -92,7 +92,7 @@
 
                     <view class="event-item-section">
                       <view class="event-item-section-title">
-                        <t-icon name="help-circle" size="16px" color="var(--td-brand-color-5)"/>
+                        <HelpCircleIcon  size="16px" color="var(--td-brand-color-5)"/>
                         <text>比赛规则</text>
                       </view>
                       <view class="event-item-section-content">{{ item.ruleForm }}</view>
@@ -125,9 +125,16 @@
 </template>
 
 <script setup>
+// 固定图标按文件引入，避免通用 Icon 加载整套图标。
+import AlarmIcon from 'tdesign-icons-vue-next/esm/components/alarm.js';
+import CalendarIcon from 'tdesign-icons-vue-next/esm/components/calendar.js';
+import ChartBarIcon from 'tdesign-icons-vue-next/esm/components/chart-bar.js';
+import FlagIcon from 'tdesign-icons-vue-next/esm/components/flag.js';
+import HelpCircleIcon from 'tdesign-icons-vue-next/esm/components/help-circle.js';
+import LocationIcon from 'tdesign-icons-vue-next/esm/components/location.js';
 import {ref, onMounted, computed} from 'vue';
 import {onLoad} from '@dcloudio/uni-app';
-import {Toast} from 'tdesign-mobile-vue';
+import {ToastPlugin as Toast} from 'tdesign-mobile-vue/esm/toast/index.js';
 import {useRequest} from "@/utils/request";
 import {config} from "@/utils/config";
 import moment from "moment";
@@ -281,7 +288,7 @@ onLoad((option) => {
 .event-tag {
   display: inline-flex;
   align-items: center;
-  background-color: rgba(var(--td-brand-color-5), 0.1);
+  background-color: var(--td-brand-color-light);
   color: var(--td-brand-color-5);
   font-size: 24rpx;
   padding: 6rpx 12rpx;
@@ -364,6 +371,20 @@ onLoad((option) => {
   color: #333333;
 }
 
+/* 移动端覆盖富文本内联大字号，仅调整字号和行高，不改写字体、字重或颜色。 */
+@media screen and (max-width: 767px) {
+  .rich-content {
+    font-size: 15px;
+    line-height: 1.75;
+    overflow-wrap: anywhere;
+
+    :deep(*) {
+      font-size: 15px !important;
+      line-height: 1.75 !important;
+    }
+  }
+}
+
 /* 比赛项目 */
 .event-items-scroll {
   width: 100%;

frontend/src/pages/activity/dynamic/PublishMoment.vue

@@ -369,7 +369,7 @@ async function publishMoment() {
 
           .location-icon {
             font-size: 36rpx;
-            color: #ff5777;
+            color: var(--td-brand-color);
             margin-right: 10rpx;
           }
 
@@ -395,7 +395,7 @@ async function publishMoment() {
 
             .location-icon {
               font-size: 32rpx;
-              color: #ff5777;
+              color: var(--td-brand-color);
               margin-right: 10rpx;
             }
           }

frontend/src/pages/activity/dynamic/index.vue

@@ -41,7 +41,7 @@
             <view class="time">{{ moment(item.publish).format('MM-DD HH:mm') }}</view>
             <view @click="onPraise(item)">
               <t-badge :count="item.praiseCount" :offset="[-2, -2]" class="badge-item" :showZero="true">
-                <t-icon :style="item.praiseCount > 0 ? 'color: red' : ''" name="thumb-up-2-filled"/>
+                <t-icon :style="item.praiseCount > 0 ? 'color: var(--td-brand-color)' : ''" name="thumb-up-2-filled"/>
               </t-badge>
             </view>
           </view>

frontend/src/pages/activity/list/index.vue

@@ -59,7 +59,7 @@
                 </view>
                 <view style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
                   <t-icon name="castle-7"></t-icon>
-                  {{ item.coHostUnit }}
+                  {{ item.hostUnit }}
                 </view>
               </view>
             </view>
@@ -67,7 +67,12 @@
               <view>
 <!--                100人已报名-->
               </view>
-              <t-button theme="primary" shape="round" size="small">立即报名</t-button>
+              <view style="display: flex;gap: 10px" @click.stop>
+                <t-button theme="default" variant="outline" shape="round" size="small"
+                          @click="navigateToDetail(item.id)"><t-icon name="browse" size="16px" style="margin-right: 4px"/>查看详情</t-button>
+                <t-button theme="primary" shape="round" size="small"
+                          @click="navigateToSignUp(item.id)"><t-icon name="edit" size="16px" style="margin-right: 4px"/>立即报名</t-button>
+              </view>
             </view>
           </view>
         </view>
@@ -204,6 +209,13 @@ const navigateToDetail = (id) => {
   });
 };
 
+// 报名按钮直达表单，活动ID沿用详情页的报名入口参数。
+const navigateToSignUp = (id) => {
+  uni.navigateTo({
+    url: `/pages/activity/registration-form/index?id=${id}`
+  });
+};
+
 // 初始化
 onMounted(() => {
   getListData();
@@ -263,8 +275,8 @@ onMounted(() => {
   padding: 4px 8px;
   border-radius: 12px;
   box-sizing: border-box;
-  color: #f45a5a;
+  color: var(--td-brand-color);
-  background-color: rgba(244, 90, 90, 0.12);
+  background-color: rgba(25, 137, 250, 0.12);
   font-size: 12px;
   line-height: 1.2;
   white-space: nowrap;

frontend/src/pages/activity/rank/index.vue

@@ -181,7 +181,7 @@ onMounted(async () => {
 .bg-circle {
   position: absolute;
   border-radius: 50%;
-  background: linear-gradient(135deg, #f45a5a, #f78484);
+  background: linear-gradient(135deg, var(--td-brand-color), var(--td-brand-color-4));
   opacity: 0.06;
 }
 
@@ -227,7 +227,7 @@ onMounted(async () => {
 
 .rank-header {
   flex-shrink: 0;
-  background: linear-gradient(135deg, #f45a5a, #f78484);
+  background: linear-gradient(135deg, var(--td-brand-color), var(--td-brand-color-4));
   height: 200rpx;
   padding: 20rpx 32rpx;
   color: #fff;
@@ -235,7 +235,7 @@ onMounted(async () => {
   align-items: center;
   justify-content: space-between;
   position: relative;
-  box-shadow: 0 4rpx 20rpx rgba(244, 90, 90, 0.3);
+  box-shadow: 0 4rpx 20rpx rgba(25, 137, 250, 0.3);
   border-bottom-left-radius: 30rpx;
   border-bottom-right-radius: 30rpx;
   z-index: 1;
@@ -292,7 +292,7 @@ onMounted(async () => {
   padding: 24rpx 16rpx;
   font-weight: bold;
   color: #666;
-  border-bottom: 1px solid rgba(244, 90, 90, 0.1);
+  border-bottom: 1px solid rgba(25, 137, 250, 0.1);
   background-color: rgba(255, 255, 255, 0.8);
   margin: 16rpx;
   border-radius: 16rpx;
@@ -353,8 +353,8 @@ onMounted(async () => {
 }
 
 .my-team {
-  background-color: rgba(244, 90, 90, 0.05);
+  background-color: rgba(25, 137, 250, 0.05);
-  border-left: 8rpx solid #f45a5a;
+  border-left: 8rpx solid var(--td-brand-color);
   position: relative;
   overflow: hidden;
 }
@@ -367,7 +367,7 @@ onMounted(async () => {
   width: 60rpx;
   height: 60rpx;
   border-radius: 50%;
-  background-color: rgba(244, 90, 90, 0.1);
+  background-color: rgba(25, 137, 250, 0.1);
   z-index: 0;
 }
 
@@ -389,8 +389,8 @@ onMounted(async () => {
 }
 
 .my-rank-number {
-  background-color: rgba(244, 90, 90, 0.1);
+  background-color: rgba(25, 137, 250, 0.1);
-  color: #f45a5a;
+  color: var(--td-brand-color);
 }
 
 .team-info {
@@ -432,9 +432,9 @@ onMounted(async () => {
 
 .my-team-tag {
   margin-left: 10rpx;
-  background-color: rgba(244, 90, 90, 0.1);
+  background-color: rgba(25, 137, 250, 0.1);
-  color: #f45a5a;
+  color: var(--td-brand-color);
-  border: 1px solid rgba(244, 90, 90, 0.2);
+  border: 1px solid rgba(25, 137, 250, 0.2);
 }
 
 .progress-bar {
@@ -454,14 +454,14 @@ onMounted(async () => {
 .progress-bar-fill {
   position: absolute;
   height: 100%;
-  background: linear-gradient(to right, #f45a5a, #f78484);
+  background: linear-gradient(to right, var(--td-brand-color), var(--td-brand-color-4));
   border-radius: 3rpx;
   transition: width 0.8s cubic-bezier(0.16, 1, 0.3, 1);
 }
 
 .score-value {
   font-weight: bold;
-  color: #f45a5a;
+  color: var(--td-brand-color);
   font-size: 32rpx;
 }
 
@@ -477,8 +477,8 @@ onMounted(async () => {
   width: 90rpx;
   height: 90rpx;
   border-radius: 50%;
-  background: linear-gradient(135deg, #f45a5a, #f78484);
+  background: linear-gradient(135deg, var(--td-brand-color), var(--td-brand-color-4));
-  box-shadow: 0 4rpx 20rpx rgba(244, 90, 90, 0.4);
+  box-shadow: 0 4rpx 20rpx rgba(25, 137, 250, 0.4);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -489,15 +489,15 @@ onMounted(async () => {
 @keyframes pulse {
   0% {
     transform: scale(1);
-    box-shadow: 0 4rpx 20rpx rgba(244, 90, 90, 0.4);
+    box-shadow: 0 4rpx 20rpx rgba(25, 137, 250, 0.4);
   }
   50% {
     transform: scale(1.05);
-    box-shadow: 0 4rpx 25rpx rgba(244, 90, 90, 0.6);
+    box-shadow: 0 4rpx 25rpx rgba(25, 137, 250, 0.6);
   }
   100% {
     transform: scale(1);
-    box-shadow: 0 4rpx 20rpx rgba(244, 90, 90, 0.4);
+    box-shadow: 0 4rpx 20rpx rgba(25, 137, 250, 0.4);
   }
 }
 
@@ -516,7 +516,7 @@ onMounted(async () => {
 }
 
 .empty-icon {
-  color: rgba(244, 90, 90, 0.5);
+  color: rgba(25, 137, 250, 0.5);
 }
 
 .empty-text {

frontend/src/pages/activity/registration-form/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="page-container">
+  <view class="page-container" :class="{ 'input-editing': inputEditing }" :style="inputViewportStyle">
     <!-- 人员选项卡区域 -->
     <view class="tabs-container">
       <view class="tabs-header">
@@ -22,7 +22,7 @@
           </view>
         </view>
       </view>
-      <scroll-view scroll-x="true" class="tabs-scroll-view" show-scrollbar="false">
+      <scroll-view scroll-x="true" class="tabs-scroll-view" show-scrollbar="false" :scroll-left="tabsScrollLeft" scroll-with-animation>
         <view class="tabs">
           <view
               v-for="(user, index) in formData.userList"
@@ -69,7 +69,7 @@
 
         <view class="form-block">
           <view class="form-block-title">
-            <t-icon name="usergroup"></t-icon>
+            <UsergroupIcon ></UsergroupIcon>
             <text>报名人员信息</text>
             <text class="form-subtitle">
               {{ formData.userList.length > 0 ? activeTabIndex + 1 : 0 }}/{{ formData.userList.length }}
@@ -85,7 +85,7 @@
                 v-show="activeTabIndex === index">
             <t-form-item v-if="isFieldVisible('userName')" label="姓名" :name="`userList[${index}].userName`"
                          :rules="fieldRules('userName', '请输入姓名')">
-              <t-input v-model="user.userName" borderless placeholder="请输入内容"></t-input>
+              <t-input v-model="user.userName" borderless placeholder="请输入内容" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
             <t-form-item v-if="isFieldVisible('sex')" label="性别" :name="`userList[${index}].sex`"
                          :rules="fieldRules('sex', '请选择性别')">
@@ -105,7 +105,7 @@
                             :disabled="isPersonTypeOptionDisabled(user, option)"/>
               </t-checkbox-group>
             </t-form-item>
-            <t-form-item v-if="isFieldVisible('projectType')" label="项目类型"
+            <t-form-item v-if="isFieldVisible('projectType', user)" label="项目类型"
                          :name="'userList[' + index + '].projectType'"
                          :rules="fieldRules('projectType', '请选择项目类型')">
               <t-checkbox-group v-model="user.projectType" class="radio-box dict-radio-box"
@@ -117,7 +117,7 @@
             </t-form-item>
             <t-form-item v-if="isFieldVisible('weight')" label="体重（KG）" :name="`userList[${index}].weight`"
                          :rules="fieldRules('weight', '请输入体重拔河比赛分组需要')">
-              <t-input placeholder="拔河比赛分组需要" type="number" borderless v-model="user.weight"></t-input>
+              <t-input placeholder="拔河比赛分组需要" type="number" borderless v-model="user.weight" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
             <t-form-item v-if="isFieldVisible('unitName')" label="单位名称"
                          :name="`userList[${index}].unitName`"
@@ -127,22 +127,24 @@
             <t-form-item v-if="isFieldVisible('unitName')" label="单位简称">
               <t-input :model-value="unitAliasName" borderless readonly></t-input>
             </t-form-item>
+            <t-form-item v-if="isFieldVisible('idCard', user)" label="身份证" :name="`userList[${index}].idCard`"
+                         :rules="fieldRules('idCard', '请输入身份证号码', [{validator: validateIdCard, message: '请输入正确的18位身份证号码'}])">
+              <t-input v-model="user.idCard" borderless placeholder="请输入身份证号码" :maxlength="18"
+                       @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
+            </t-form-item>
+            <t-form-item v-if="isFieldVisible('phone', user)" label="联系电话" :name="`userList[${index}].phone`"
+                         :rules="fieldRules('phone', '请输入联系电话', [{telnumber:true, message: '请输入正确的联系电话'}])">
+              <t-input v-model="user.phone" type="tel" inputmode="numeric" :maxlength="11" borderless placeholder="请输入联系电话"
+                       @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
+            </t-form-item>
             <t-form-item v-if="isFieldVisible('position')" label="职务" :name="`userList[${index}].position`"
                          :rules="fieldRules('position', '请输入职务')">
-              <t-input v-model="user.position" borderless placeholder="请输入职务"></t-input>
+              <t-input v-model="user.position" borderless placeholder="请输入职务" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
-            </t-form-item>
-<!--            <t-form-item label="身份证号" :name="`userList[${index}].idCard`"-->
-<!--                         :rules="[{required:true,message: '请输入身份证号码'},{idcard:true, message: '请输入正确的身份证号码'}]">-->
-<!--              <t-input v-model="user.idCard" borderless placeholder="请输入身份证号码"></t-input>-->
-<!--            </t-form-item>-->
-            <t-form-item v-if="isFieldVisible('phone')" label="联系电话" :name="`userList[${index}].phone`"
-                         :rules="fieldRules('phone', '请输入联系电话', [{telnumber:true, message: '请输入正确的联系电话'}])">
-              <t-input v-model="user.phone" borderless placeholder="请输入联系电话"></t-input>
             </t-form-item>
             <t-form-item v-if="isFieldVisible('birthday')" label="出生日期"
                          :name="'userList[' + index + '].birthday'"
                          :rules="fieldRules('birthday', '请选择出生日期')">
-              <t-input v-model="user.birthday" type="date" borderless placeholder="请选择出生日期"></t-input>
+              <t-input v-model="user.birthday" type="date" borderless placeholder="请选择出生日期" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
             <t-form-item v-if="isFieldVisible('isStay')" label="是否住宿" :name="`userList[${index}].isStay`"
                          :rules="fieldRules('isStay', '请选择是否住宿')">
@@ -168,7 +170,7 @@
 
             <t-form-item v-if="isFieldVisible('carNo') && user.traffic === '自驾'" label="车牌号"
                          :name="`userList[${index}].carNo`" :rules="fieldRules('carNo', '请输入车牌号')">
-              <t-input v-model="user.carNo" borderless placeholder="请输入车牌号"></t-input>
+              <t-input v-model="user.carNo" borderless placeholder="请输入车牌号" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
 
             <t-form-item v-if="isFieldVisible('isStation') && user.traffic === '公共交通'" label="是否接站"
@@ -182,7 +184,7 @@
             <t-form-item v-if="isFieldVisible('stationAddress') && user.traffic === '公共交通' && user.isStation"
                          label="接站地址" :name="`userList[${index}].stationAddress`"
                          :rules="fieldRules('stationAddress', '请输入接站地址')">
-              <t-input v-model="user.stationAddress" borderless placeholder="请输入接站地址" maxlength="50"></t-input>
+              <t-input v-model="user.stationAddress" borderless placeholder="请输入接站地址" maxlength="50" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
 
 
@@ -196,11 +198,11 @@
             </t-form-item>
             <t-form-item v-if="isFieldVisible('skillName') && user.isShowSkill" label="才艺名称"
                          :name="`userList[${index}].skillName`" :rules="fieldRules('skillName', '请填写才艺名称')">
-              <t-input v-model="user.skillName" borderless placeholder="请输入才艺名称"></t-input>
+              <t-input v-model="user.skillName" borderless placeholder="请输入才艺名称" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
             <t-form-item v-if="isFieldVisible('equip') && user.isShowSkill" label="所需器材"
                          :name="`userList[${index}].equip`" :rules="fieldRules('equip', '请填写才艺所需器材')">
-              <t-input v-model="user.equip" borderless placeholder="请填写才艺所需器材"></t-input>
+              <t-input v-model="user.equip" borderless placeholder="请填写才艺所需器材" @focus="handleIdentityInputFocus" @blur="handleIdentityInputBlur"></t-input>
             </t-form-item>
             <t-form-item v-if="isFieldVisible('isParty')" label="参加茶叙会" :name="`userList[${index}].isParty`"
                          :rules="fieldRules('isParty', '请选择是否参加茶叙会')">
@@ -268,7 +270,7 @@
     <view class="notice-popup">
       <view class="notice-popup-header">
         <view class="notice-popup-icon">
-          <t-icon name="info-circle" size="24px" color="#ff6b35"></t-icon>
+          <InfoCircleIcon  size="24px" color="#ff6b35"></InfoCircleIcon>
         </view>
         <text class="notice-popup-title">重要提醒</text>
       </view>
@@ -287,9 +289,13 @@
 </template>
 
 <script setup>
-import {ref, computed} from 'vue'
+// 固定图标按文件引入，避免通用 Icon 加载整套图标。
+import InfoCircleIcon from 'tdesign-icons-vue-next/esm/components/info-circle.js';
+import UsergroupIcon from 'tdesign-icons-vue-next/esm/components/usergroup.js';
+import {ref, computed, nextTick, onMounted, onBeforeUnmount, watch} from 'vue'
 import {useRequest} from '@/utils/request';
-import {Dialog, Toast} from "tdesign-mobile-vue";
+import {DialogPlugin as Dialog} from 'tdesign-mobile-vue/esm/dialog/index.js';
+import {ToastPlugin as Toast} from 'tdesign-mobile-vue/esm/toast/index.js';
 import {onLoad} from "@dcloudio/uni-app";
 import {useUserStore} from "@/store";
 import {showConfirmWithHistory} from "@/utils/popupHistory";
@@ -302,6 +308,43 @@ const userStore = useUserStore()
 const unitAliasName = computed(() => userStore?.userInfo?.unit?.aliasName || '未设置')
 
 // 后端不可用时仍按历史字段展示，保证已有活动的报名页面不会变成空表单。
+// H5键盘弹出时为当前输入项让出空间，并跟随实际可视窗口高度变化。
+const inputEditing = ref(false)
+const inputViewportHeight = ref(0)
+const inputViewportStyle = computed(() => inputEditing.value && inputViewportHeight.value
+    ? {'--input-viewport-height': inputViewportHeight.value + 'px'} : {})
+let focusedIdentityInput = null
+let inputScrollTimer = null
+const updateInputViewport = () => {
+  if (typeof window === 'undefined' || !inputEditing.value) return
+  inputViewportHeight.value = window.visualViewport?.height || window.innerHeight
+  clearTimeout(inputScrollTimer)
+  inputScrollTimer = setTimeout(() => {
+    focusedIdentityInput?.scrollIntoView({block: 'center', inline: 'nearest', behavior: 'auto'})
+  }, 200)
+}
+const handleIdentityInputFocus = (_value, context) => {
+  if (typeof window === 'undefined') return
+  focusedIdentityInput = context?.e?.target
+  inputEditing.value = true
+  nextTick(updateInputViewport)
+}
+const handleIdentityInputBlur = () => {
+  clearTimeout(inputScrollTimer)
+  focusedIdentityInput = null
+  inputEditing.value = false
+}
+onMounted(() => {
+  if (typeof window === 'undefined') return
+  window.visualViewport?.addEventListener('resize', updateInputViewport)
+  window.addEventListener('resize', updateInputViewport)
+})
+onBeforeUnmount(() => {
+  clearTimeout(inputScrollTimer)
+  if (typeof window === 'undefined') return
+  window.visualViewport?.removeEventListener('resize', updateInputViewport)
+  window.removeEventListener('resize', updateInputViewport)
+})
 const registrationFields = ref([
   {fieldKey: 'userName', required: true, options: []},
   {fieldKey: 'sex', required: true, options: []},
@@ -338,10 +381,33 @@ const projectTypeRuleStatus = ref({
   enabled: false,
   rules: []
 })
-const isFieldVisible = (fieldKey) => Boolean(registrationFieldMap.value[fieldKey])
+// 人员类型按字典编码多选匹配，兼任运动员时同时显示身份证和联系电话。
+const isFieldVisible = (fieldKey, user) => {
+  const field = registrationFieldMap.value[fieldKey]
+  if (!field) return false
+  if (!user || field.parentField !== 'personType') return true
+  const labels = field.showWhenValue.split(',')
+  const selected = parseMultiValue(user.personType)
+  return fieldOptions('personType').some((option) => labels.includes(option.label) && selected.includes(option.value))
+}
 const fieldOptions = (fieldKey) => registrationFieldMap.value[fieldKey]?.options || []
 // 红色必填标识与前端必填校验统一读取当前活动的报名字段配置，避免显示字段被全局标记为必填。
 const isFieldRequired = (fieldKey) => Boolean(registrationFieldMap.value[fieldKey]?.required)
+// 校验出生日期及末位校验码，避免仅检查位数而接受无效身份证号码。
+const validateIdCard = (value) => {
+  if (value == null || value === '') return true
+  const idCard = String(value).toUpperCase()
+  if (!/^[1-9]\d{16}[\dX]$/.test(idCard)) return false
+  const year = Number(idCard.slice(6, 10))
+  const month = Number(idCard.slice(10, 12))
+  const day = Number(idCard.slice(12, 14))
+  const birthday = new Date(year, month - 1, day)
+  if (year < 1800 || birthday.getFullYear() !== year || birthday.getMonth() !== month - 1
+      || birthday.getDate() !== day || birthday.getTime() > Date.now()) return false
+  const weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+  const sum = weights.reduce((total, weight, index) => total + Number(idCard[index]) * weight, 0)
+  return '10X98765432'[sum % 11] === idCard[17]
+}
 const fieldRules = (fieldKey, message, extraRules = []) => {
   return [{required: isFieldRequired(fieldKey), message}, ...extraRules]
 }
@@ -525,10 +591,12 @@ const handleSexChange = (user) => {
 
 // 当前选中的选项卡索引
 const activeTabIndex = ref(0)
+const tabsScrollLeft = ref(0)
 
 // 切换选项卡
 function switchTab(index) {
   activeTabIndex.value = index
+  nextTick(() => scrollToTab(index))
   // 添加滚动表单区域到顶部
   scrollFormToTop()
 }
@@ -543,7 +611,7 @@ function addNewUser() {
     unitName: userStore?.userInfo?.unit?.name,
     position: null,
     birthday: null,
-    // idCard: null,
+    idCard: null,
     phone: null,
     isStay: null,
     isContacts: false,
@@ -566,42 +634,33 @@ function addNewUser() {
   }, 10)
 }
 
-// 滚动到指定选项卡
+// 控制标签栏自身的滚动位置：中间人员居中，最后一人靠右，边界不足时自动限位。
-function scrollToTab(index) {
+async function scrollToTab(index) {
+  await nextTick()
+  if (inputEditing.value || !formData.value.userList.length) return
   const query = uni.createSelectorQuery()
   query.selectAll('.tab').boundingClientRect()
   query.select('.tabs-scroll-view').boundingClientRect()
-  query.exec((res) => {
+  query.select('.tabs').boundingClientRect()
-    if (res && res[0] && res[0][index] && res[1]) {
+  query.select('.tabs-scroll-view').scrollOffset()
-      const tabElement = res[0][index]
+  query.exec(async (res) => {
-      const scrollView = res[1]
+    if (inputEditing.value || index !== activeTabIndex.value || !res?.[0]?.[index] || !res[1]?.width || !res[2] || !res[3]) return
-      const scrollLeft = tabElement.left - scrollView.left - (scrollView.width / 2) + (tabElement.width / 2)
+    const tab = res[0][index]
-      uni.pageScrollTo({
+    const viewport = res[1]
-        scrollLeft: scrollLeft > 0 ? scrollLeft : 0,
+    const currentLeft = res[3].scrollLeft || 0
-        duration: 300
+    const maxLeft = Math.max(0, res[2].width - viewport.width)
-      })
+    const target = index === formData.value.userList.length - 1 ? maxLeft
-    }
+        : Math.min(maxLeft, Math.max(0, currentLeft + tab.left - viewport.left - (viewport.width - tab.width) / 2))
+    // 用户手动滑动后先同步真实位置，保证相同目标值仍能触发重新定位。
+    tabsScrollLeft.value = currentLeft
+    await nextTick()
+    if (!inputEditing.value && index === activeTabIndex.value) tabsScrollLeft.value = target
   })
 }
 
-// 滚动到最右边
+// 新增人员后沿用选中标签定位逻辑。
 function scrollToRight() {
-  const query = uni.createSelectorQuery()
+  scrollToTab(activeTabIndex.value)
-  query.select('.tabs-scroll-view').boundingClientRect()
-  query.exec((res) => {
-    if (res && res[0]) {
-      const scrollView = res[0]
-      const scrollWidth = scrollView.scrollWidth
-      const clientWidth = scrollView.width
-      const scrollLeft = scrollWidth - clientWidth
-      if (scrollLeft > 0) {
-        uni.pageScrollTo({
-          scrollLeft: scrollLeft,
-          duration: 300
-        })
-      }
-    }
-  })
 }
 
 // 滚动表单区域到顶部
@@ -644,6 +703,10 @@ const formRef = ref(null)
 const formData = ref({
   userList: []
 })
+// 增删人员、姓名改变或键盘收起都会改变标签布局，渲染后重新定位当前人员。
+watch([activeTabIndex, inputEditing, () => formData.value.userList.map(user => user.userName)], () => {
+  if (!inputEditing.value) scrollToTab(activeTabIndex.value)
+}, {flush: 'post'})
 // 后端返回当前单位已保存总数；编辑原报名时先扣除旧名单，再合并当前页面草稿人数，避免重复累计。
 const savedUnitRegistrationCount = ref(0)
 const originalSignupUserCount = ref(0)
@@ -681,7 +744,7 @@ onLoad(async (option) => {
         unitName: userStore?.userInfo?.unit?.name,
         position: null,
         birthday: userStore.userInfo.birthday,
-        // idCard: userStore.userInfo.idCard,
+        idCard: null,
         phone: userStore.userInfo.phone,
         isStay: null,
         isContacts: false,
@@ -1088,7 +1151,7 @@ function closeNoticePopup() {
 .person-counter {
   width: 64px;
   height: 30px;
-  background-color: #f45a5a;
+  background-color: var(--td-brand-color);
   border-radius: 15px;
   display: flex;
   align-items: center;
@@ -1130,15 +1193,15 @@ function closeNoticePopup() {
 }
 
 .header-add-btn {
-  background: linear-gradient(135deg, #f45a5a, #ff7676);
+  background: linear-gradient(135deg, var(--td-brand-color), var(--td-brand-color-4));
   color: #fff;
-  box-shadow: 0 2px 6px rgba(244, 90, 90, 0.25);
+  box-shadow: 0 2px 6px rgba(25, 137, 250, 0.25);
 }
 
 .header-remove-btn {
-  color: #f45a5a;
+  color: var(--td-brand-color);
-  background-color: #fff1f0;
+  background-color: var(--td-brand-color-light);
-  border: 1px solid rgba(244, 90, 90, 0.35);
+  border: 1px solid rgba(25, 137, 250, 0.35);
 }
 
 .header-action-btn:active {
@@ -1159,12 +1222,15 @@ function closeNoticePopup() {
 
 .tabs {
   display: flex;
+  width: max-content;
+  min-width: 100%;
   padding: 10px 12px;
   align-items: center;
 }
 
 .tab {
   display: inline-flex;
+  flex-shrink: 0;
   align-items: center;
   justify-content: center;
   min-width: 90px;
@@ -1202,8 +1268,8 @@ function closeNoticePopup() {
 
 .tab.active {
   color: #fff;
-  background-color: #f45a5a;
+  background-color: var(--td-brand-color);
-  box-shadow: 0 3px 8px rgba(244, 90, 90, 0.25);
+  box-shadow: 0 3px 8px rgba(25, 137, 250, 0.25);
   font-weight: 500;
 }
 
@@ -1213,7 +1279,7 @@ function closeNoticePopup() {
   left: 0;
   width: 100%;
   height: 2px;
-  background: linear-gradient(90deg, transparent, rgba(244, 90, 90, 0.3), transparent);
+  background: linear-gradient(90deg, transparent, rgba(25, 137, 250, 0.3), transparent);
 }
 
 .act-info {
@@ -1259,8 +1325,27 @@ function closeNoticePopup() {
   }
 }
 
+/* 输入期间收起非输入区域，避免与键盘共同占据屏幕；16px防止iOS聚焦自动放大。 */
+.page-container.input-editing {
+  height: calc(var(--input-viewport-height, 100vh) - var(--window-top, 44px));
+}
+.input-editing .tabs-container,
+.input-editing .footer,
+.input-editing .quick-nav {
+  display: none;
+}
+.input-editing .form-area {
+  margin-bottom: 0;
+  padding-bottom: 24px;
+}
+.form-area :deep(input) {
+  font-size: 16px;
+  scroll-margin-block: 24px;
+}
+
 .form-area {
   flex: 1;
+  min-height: 0;
   overflow-y: auto;
   margin-bottom: 130px;
   padding-top: 10px;
@@ -1418,7 +1503,7 @@ function closeNoticePopup() {
   width: 40px;
   height: 40px;
   border-radius: 50%;
-  background-color: rgba(244, 90, 90, 0.9);
+  background-color: rgba(25, 137, 250, 0.9);
   color: white;
   display: flex;
   align-items: center;
@@ -1429,7 +1514,7 @@ function closeNoticePopup() {
 
 .quick-nav-btn:active {
   transform: scale(0.95);
-  background-color: rgba(244, 90, 90, 1);
+  background-color: rgba(25, 137, 250, 1);
 }
 
 /* 协议弹窗样式 */

frontend/src/pages/activity/registration-form/success.vue

@@ -141,14 +141,14 @@ const navigateToEdit = () => {
   display: flex;
   align-items: center;
   justify-content: center;
-  background-color: rgba(255, 95, 92, 0.1);
+  background-color: rgba(25, 137, 250, 0.1);
   border-radius: 100px;
   padding: 10px 20px;
   margin-top: 20px;
   margin-bottom: 40px;
 
   .t-icon {
-    color: #ff5f5c;
+    color: var(--td-brand-color);
     margin-right: 6px;
   }
 
@@ -171,13 +171,13 @@ const navigateToEdit = () => {
   }
 
   :deep(.t-button--primary) {
-    background-color: #ff5f5c !important;
+    background-color: var(--td-brand-color) !important;
-    border-color: #ff5f5c !important;
+    border-color: var(--td-brand-color) !important;
   }
 
   :deep(.t-button--default) {
-    border-color: #ff5f5c !important;
+    border-color: var(--td-brand-color) !important;
-    color: #ff5f5c !important;
+    color: var(--td-brand-color) !important;
   }
 }
 </style>

frontend/src/pages/activity/team-form/index.vue

@@ -550,7 +550,7 @@ const submitRegistration = async () => {
 
   .picker-subtitle {
     font-size: 14px;
-    color: #ff5f5c;
+    color: var(--td-brand-color);
     margin-bottom: 20px;
     padding-bottom: 12px;
     border-bottom: 1px solid #f0f0f0;

frontend/src/pages/activity/team/index.vue

@@ -355,7 +355,7 @@ onLoad(() => {
 
   .picker-subtitle {
     font-size: 14px;
-    color: #ff5f5c;
+    color: var(--td-brand-color);
     margin-bottom: 20px;
     padding-bottom: 12px;
     border-bottom: 1px solid #f0f0f0;
@@ -403,7 +403,7 @@ onLoad(() => {
   background-color: #fff;
   border-radius: 16px;
   overflow: hidden;
-  box-shadow: 0 4px 16px rgba(255, 95, 92, 0.08);
+  box-shadow: 0 4px 16px rgba(25, 137, 250, 0.08);
   margin: 12px 0 20px;
 }
 
@@ -411,8 +411,8 @@ onLoad(() => {
   display: flex;
   align-items: center;
   padding: 16px;
-  background: linear-gradient(to right, rgba(255, 95, 92, 0.05), rgba(255, 95, 92, 0.02));
+  background: linear-gradient(to right, rgba(25, 137, 250, 0.05), rgba(25, 137, 250, 0.02));
-  border-bottom: 1px solid rgba(255, 95, 92, 0.1);
+  border-bottom: 1px solid rgba(25, 137, 250, 0.1);
 }
 
 .team-logo {
@@ -424,14 +424,14 @@ onLoad(() => {
   justify-content: center;
   align-items: center;
   border: 2px solid #fff;
-  box-shadow: 0 2px 8px rgba(255, 95, 92, 0.15);
+  box-shadow: 0 2px 8px rgba(25, 137, 250, 0.15);
   overflow: hidden;
   flex-shrink: 0;
 }
 
 .team-logo i {
   font-size: 24px;
-  color: #ff5f5c;
+  color: var(--td-brand-color);
 }
 
 .team-logo img {
@@ -472,12 +472,12 @@ onLoad(() => {
   width: 36px;
   height: 36px;
   border-radius: 18px;
-  background-color: rgba(255, 95, 92, 0.1);
+  background-color: rgba(25, 137, 250, 0.1);
   display: flex;
   align-items: center;
   justify-content: center;
   margin-right: 10px;
-  color: #ff5f5c;
+  color: var(--td-brand-color);
   font-size: 18px;
 }
 
@@ -528,12 +528,12 @@ onLoad(() => {
   color: #666;
   line-height: 1.5;
   position: relative;
-  background-color: #fff8f8;
+  background-color: #f5faff;
   border-top: 1px solid #f0f0f0;
 }
 
 .team-desc i {
-  color: #ffdddd;
+  color: var(--td-brand-color-2);
   font-size: 18px;
   position: absolute;
   top: 8px;
@@ -548,9 +548,9 @@ onLoad(() => {
 .register-btn {
   height: 48px;
   font-size: 16px;
-  background-color: #ff5f5c;
+  background-color: var(--td-brand-color);
-  border-color: #ff5f5c;
+  border-color: var(--td-brand-color);
-  box-shadow: 0 6px 16px rgba(255, 95, 92, 0.2);
+  box-shadow: 0 6px 16px rgba(25, 137, 250, 0.2);
 }
 
 /* 成员列表 */
@@ -579,7 +579,7 @@ onLoad(() => {
 
 .section-title i {
   margin-right: 8px;
-  color: #ff5f5c;
+  color: var(--td-brand-color);
   font-size: 18px;
 }
 
@@ -589,8 +589,8 @@ onLoad(() => {
   justify-content: center;
   min-width: 24px;
   height: 24px;
-  background-color: #fff0f0;
+  background-color: var(--td-brand-color-light);
-  color: #ff5f5c;
+  color: var(--td-brand-color);
   border-radius: 12px;
   font-size: 13px;
   font-weight: 500;
@@ -647,11 +647,11 @@ onLoad(() => {
 .role-card {
   display: flex;
   align-items: center;
-  background-color: #fff8f8;
+  background-color: #f5faff;
   border-radius: 12px;
   padding: 16px;
   margin-bottom: 16px;
-  box-shadow: 0 4px 12px rgba(255, 95, 92, 0.05);
+  box-shadow: 0 4px 12px rgba(25, 137, 250, 0.05);
 }
 
 .role-icon {
@@ -664,7 +664,7 @@ onLoad(() => {
   justify-content: center;
   margin-right: 12px;
   //box-shadow: 0 4px 12px rgba(255, 95, 92, 0.2);
-  color: #ff5f5c;
+  color: var(--td-brand-color);
   font-size: 22px;
 }
 
@@ -689,8 +689,8 @@ onLoad(() => {
   margin-top: 8px;
   border-radius: 12px;
   height: 48px;
-  border-color: #ff5f5c;
+  border-color: var(--td-brand-color);
-  color: #ff5f5c;
+  color: var(--td-brand-color);
 }
 
 /* 弹窗内容样式 */

frontend/src/pages/index/index.vue

@@ -1,12 +1,16 @@
 <template>
   <view class="page-container">
     <view class="header">
-      <image class="header-bg"
+      <image
-             src="/static/img/index4.png"
+        class="header-bg"
-             mode="aspectFill"></image>
+        src="/static/img/index4.jpg"
+        mode="aspectFill"
+      ></image>
+      <!-- html文字临时屏蔽
       <view v-if="currentActivityTitle" class="header-activity-title">
         {{ displayActivityTitle }}
       </view>
+       -->
     </view>
 
     <view class="menu-container">
@@ -16,12 +20,6 @@
         </view>
         <view class="menu-text">赛事报名</view>
       </view>
-      <view class="menu-item" @click="navigateTo('/pages/activity/scan-sign/index')">
-        <view class="menu-icon-wrapper orange-bg">
-          <view class="menu-icon qrcode-icon"></view>
-        </view>
-        <view class="menu-text">扫码签到</view>
-      </view>
       <view class="menu-item" @click="navigateTo('/pages/activity/team/index')">
         <view class="menu-icon-wrapper yellow-bg">
           <view class="menu-icon team-icon"></view>
@@ -29,12 +27,19 @@
         </view>
         <view class="menu-text">我的团队</view>
       </view>
-      <view class="menu-item" @click="navigateTo('/pages/activity/team-form/index')">
+      <!-- 暂未开放的快捷入口保留展示，不绑定跳转事件。 -->
+      <view class="menu-item menu-item-disabled" aria-disabled="true">
         <view class="menu-icon-wrapper blue-bg">
           <view class="menu-icon star-icon"></view>
         </view>
         <view class="menu-text">项目报名</view>
       </view>
+      <view class="menu-item menu-item-disabled" aria-disabled="true">
+        <view class="menu-icon-wrapper orange-bg">
+          <view class="menu-icon qrcode-icon"></view>
+        </view>
+        <view class="menu-text">扫码签到</view>
+      </view>
       <!--      <view class="menu-item" @click="navigateTo('/pages/activity/dynamic/index')">-->
       <!--        <view class="menu-icon-wrapper blue-bg">-->
       <!--          <view class="menu-icon star-icon"></view>-->
@@ -47,23 +52,47 @@
     <view class="content-section">
       <view class="section-header">
         <view class="section-title">活动详情</view>
-        <view class="section-more" @click="navigateTo('/pages/activity/list/index')">更多</view>
+        <view
+          class="section-more"
+          @click="navigateTo('/pages/activity/list/index')"
+          >更多</view
+        >
       </view>
 
       <t-swiper
         v-if="actList.length > 0"
         :autoplay="actList.length > 1"
-        :navigation="{ type: 'fraction', paginationPosition: 'bottom-right', showControls: true }"
+        :navigation="{
+          type: 'fraction',
+          paginationPosition: 'bottom-right',
+          showControls: true,
+        }"
+      >
+        <t-swiper-item
+          v-for="(item, index) in actList"
+          :key="index"
+          style="height: 192px"
+        >
+          <view
+            class="activity-list"
+            @click="navigateTo('/pages/activity/detail/index?id=' + item.id)"
           >
-        <t-swiper-item v-for="(item, index) in actList" :key="index" style="height: 192px">
-          <view class="activity-list" @click="navigateTo('/pages/activity/detail/index?id=' + item.id)">
             <view class="activity-item">
-              <t-image :src="getActivityCoverUrl(item.cover)" shape="round"
+              <t-image
-                       class="activity-image" fit="fill"/>
+                :src="getActivityCoverUrl(item.cover)"
+                :lazy="index > 0"
+                shape="round"
+                class="activity-image"
+                fit="fill"
+              />
               <view class="activity-info">
                 <view class="activity-title">{{ item.title }}</view>
                 <view class="activity-meta">
-                  <text class="activity-time">{{ moment(item.startTime).format('M月DD日') + '-' + moment(item.endTime).format('DD日') }}</text>
+                  <text class="activity-time">{{
+                    moment(item.startTime).format('M月DD日') +
+                    '-' +
+                    moment(item.endTime).format('DD日')
+                  }}</text>
                   <text class="activity-location">{{ item.address }}</text>
                 </view>
               </view>
@@ -71,11 +100,7 @@
           </view>
         </t-swiper-item>
       </t-swiper>
-      <t-empty
+      <t-empty v-if="actList.length === 0" description="暂无近期活动" />
-        v-if="actList.length === 0"
-        description="暂无近期活动"
-      />
-
     </view>
 
     <view class="content-section">
@@ -84,14 +109,23 @@
       </view>
 
       <view class="activity-list" v-if="wonderfulMomentList.length > 0">
-        <view class="moment-item" v-for="item in wonderfulMomentList" :key="item.id"
+        <view
-              @click="handleWonderfulMoment(item)">
+          class="moment-item"
-          <t-image :src=config.fileDomain+item.cover shape="round"
+          v-for="item in wonderfulMomentList"
-                   class="moment-image" fit="fill"/>
+          :key="item.id"
+          @click="handleWonderfulMoment(item)"
+        >
+          <t-image
+            :src="config.fileDomain + item.cover"
+            lazy
+            shape="round"
+            class="moment-image"
+            fit="fill"
+          />
           <view class="moment-content">
             <view class="moment-title">{{ item.title }}</view>
             <view class="moment-sub-content">
-              <view style="float: right;">{{ item.time }}</view>
+              <view style="float: right">{{ item.time }}</view>
               <view>阅读 {{ item.readCount }}</view>
             </view>
           </view>
@@ -101,19 +135,17 @@
         v-if="wonderfulMomentList.length === 0"
         description="暂无精彩瞬间"
       />
-
     </view>
-
   </view>
 </template>
 
 <script setup>
-import {computed, onMounted, ref} from "vue";
+  import { computed, onMounted, ref } from 'vue'
-import {onLoad, onShow} from "@dcloudio/uni-app";
+  import { onLoad, onShow } from '@dcloudio/uni-app'
-import {Toast} from "tdesign-mobile-vue";
+  import { Toast } from 'tdesign-mobile-vue'
-import {useRequest} from "@/utils/request";
+  import { useRequest } from '@/utils/request'
-import moment from "moment";
+  import moment from 'moment'
-import {config} from "@/utils/config";
+  import { config } from '@/utils/config'
 
   const request = useRequest()
 
@@ -131,52 +163,64 @@ const getActivityCoverUrl = (cover) => {
     if (!cover) {
       return ''
     }
-  return '/api/open/file/upload/download?inline=true&filepath=' + encodeURIComponent(cover)
+    return (
+      '/api/open/file/upload/download?inline=true&filepath=' +
+      encodeURIComponent(cover)
+    )
   }
 
   function navigateTo(url) {
     uni.navigateTo({
-    url
+      url,
     })
   }
 
   function getActivity() {
-  request.post('/platform/activity/manage/getActivity').then(res=>{
+    request.post('/platform/activity/manage/getActivity').then((res) => {
       if (res.code === 0) {
         actList.value = res.data
       } else {
-      Toast({message: res.msg, theme: 'error'});
+        Toast({ message: res.msg, theme: 'error' })
       }
     })
   }
 
   // 公开接口返回当前最新开启活动信息；请求失败时不显示标题，也不阻断首页其他内容。
   function getLatestActivityTitle() {
-  request.get('/open/common/latestActivityOrganizer').then(({code, data}) => {
+    request
+      .get('/open/common/latestActivityOrganizer')
+      .then(({ code, data }) => {
         if (code === 0 && data) {
           currentActivityTitle.value = data.title || ''
         }
-  }).catch((error) => {
+      })
+      .catch((error) => {
         console.error('获取当前活动标题失败', error)
       })
   }
 
   function getWonderfulMoment() {
-  request.post('/platform/activity/wonderfulMoment/getWonderfulMoment').then(res=>{
+    request
+      .post('/platform/activity/wonderfulMoment/getWonderfulMoment')
+      .then((res) => {
         if (res.code === 0) {
           wonderfulMomentList.value = res.data
         } else {
-      Toast({message: res.msg, theme: 'error'});
+          Toast({ message: res.msg, theme: 'error' })
         }
       })
   }
   function handleWonderfulMoment(row) {
-  request.post('/platform/activity/wonderfulMoment/handleWonderfulMoment/' + row.id).then(res=>{
+    request
+      .post(
+        '/platform/activity/wonderfulMoment/handleWonderfulMoment/' + row.id,
+      )
+      .then((res) => {
         if (res.code === 0) {
           getWonderfulMoment()
           navigateTo('/pages/activity/wonderfulMoment/index?id=' + row.id)
         } else {
-      Toast({message: res.msg, theme: 'error'});
+          Toast({ message: res.msg, theme: 'error' })
         }
       })
   }
@@ -186,8 +230,6 @@ onShow(() => {
     getActivity()
     getWonderfulMoment()
   })
-
-
 </script>
 
 <style lang="less" scoped>
@@ -254,7 +296,7 @@ uni-page-body {
   }
 
   .red-bg {
-  background: linear-gradient(135deg, #ff7676, #f45a5a);
+    background: linear-gradient(135deg, var(--td-brand-color-4), var(--td-brand-color));
   }
 
   .orange-bg {
@@ -317,6 +359,22 @@ uni-page-body {
     font-weight: 500;
   }
 
+  .menu-item-disabled {
+    cursor: not-allowed;
+  }
+
+  .menu-item-disabled .menu-icon-wrapper::after {
+    content: '';
+    position: absolute;
+    inset: 0;
+    border-radius: inherit;
+    background: rgba(255, 255, 255, 0.55);
+  }
+
+  .menu-item-disabled .menu-text {
+    opacity: 0.45;
+  }
+
   // 内容区域样式
   .content-section {
     margin: 0 0 15px;
@@ -348,7 +406,7 @@ uni-page-body {
     transform: translateY(-50%);
     width: 3px;
     height: 16px;
-  background: linear-gradient(to bottom, #ff6b6b, #e83a3a);
+    background: linear-gradient(to bottom, var(--td-brand-color-4), var(--td-brand-color-active));
     border-radius: 3px;
   }
 

frontend/src/pages/login/index.vue

@@ -6,15 +6,15 @@
           <pattern id="pattern-hex" x="0" y="0" width="10" height="10" patternUnits="userSpaceOnUse"
                    patternTransform="scale(0.8)">
             <rect x="0" y="0" width="10" height="10" fill="none"/>
-            <path d="M0,5 L2.5,0 L7.5,0 L10,5 L7.5,10 L2.5,10 Z" stroke-width="0.5" stroke="rgba(244, 90, 90, 0.2)"
+            <path d="M0,5 L2.5,0 L7.5,0 L10,5 L7.5,10 L2.5,10 Z" stroke-width="0.5" stroke="rgba(25, 137, 250, 0.2)"
-                  fill="rgba(244, 90, 90, 0.1)">
+                  fill="rgba(25, 137, 250, 0.1)">
               <animate attributeName="stroke-opacity" values="0.1;0.3;0.1" dur="3s" repeatCount="indefinite"/>
             </path>
           </pattern>
           <rect x="0" y="0" width="100%" height="100%" fill="url(#pattern-hex)"/>
 
           <g fill="none" stroke-width="0.5">
-            <path d="M20,50 Q60,20 100,50 T180,50 T260,50" stroke="rgba(244, 90, 90, 0.6)">
+            <path d="M20,50 Q60,20 100,50 T180,50 T260,50" stroke="rgba(25, 137, 250, 0.6)">
               <animate attributeName="d"
                        values="M20,50 Q60,20 100,50 T180,50 T260,50;
                       M20,50 Q60,80 100,50 T180,50 T260,50;
@@ -22,7 +22,7 @@
                        dur="10s" repeatCount="indefinite"/>
             </path>
 
-            <path d="M20,70 Q60,40 100,70 T180,70 T260,70" stroke="rgba(244, 90, 90, 0.4)">
+            <path d="M20,70 Q60,40 100,70 T180,70 T260,70" stroke="rgba(25, 137, 250, 0.4)">
               <animate attributeName="d"
                        values="M20,70 Q60,40 100,70 T180,70 T260,70;
                       M20,70 Q60,100 100,70 T180,70 T260,70;
@@ -31,19 +31,19 @@
             </path>
           </g>
 
-          <circle cx="50" cy="50" r="1" fill="rgba(244, 90, 90, 0.8)">
+          <circle cx="50" cy="50" r="1" fill="rgba(25, 137, 250, 0.8)">
             <animate attributeName="cx" values="50;250;50" dur="20s" repeatCount="indefinite"/>
             <animate attributeName="cy" values="50;30;80;50" dur="16s" repeatCount="indefinite"/>
             <animate attributeName="r" values="1;1.5;1" dur="5s" repeatCount="indefinite"/>
           </circle>
 
-          <circle cx="150" cy="30" r="1" fill="rgba(244, 90, 90, 0.8)">
+          <circle cx="150" cy="30" r="1" fill="rgba(25, 137, 250, 0.8)">
             <animate attributeName="cx" values="150;100;200;150" dur="25s" repeatCount="indefinite"/>
             <animate attributeName="cy" values="30;60;20;30" dur="18s" repeatCount="indefinite"/>
             <animate attributeName="r" values="1;1.8;1" dur="6s" repeatCount="indefinite"/>
           </circle>
 
-          <circle cx="250" cy="70" r="1" fill="rgba(244, 90, 90, 0.8)">
+          <circle cx="250" cy="70" r="1" fill="rgba(25, 137, 250, 0.8)">
             <animate attributeName="cx" values="250;150;250" dur="22s" repeatCount="indefinite"/>
             <animate attributeName="cy" values="70;40;70" dur="15s" repeatCount="indefinite"/>
             <animate attributeName="r" values="1;1.2;1" dur="4s" repeatCount="indefinite"/>
@@ -89,8 +89,7 @@
           />
         </view>
 
-        <!-- 测试阶段临时关闭登录验证码输入和发送入口；恢复正式登录时需取消本段注释。 -->
+        <!-- 登录验证码输入和发送入口 -->
-        <!--
         <view class="input-box" v-if="loginForm.loginMethod==='sms'">
           <t-icon name="shield-error" size="20px" class="input-icon"/>
           <input
@@ -104,7 +103,6 @@
             {{ countDownText }}
           </view>
         </view>
-        -->
 
         <!-- 密码输入框 -->
         <view class="input-box" v-if="loginForm.loginMethod==='password'">
@@ -260,8 +258,7 @@ const startCountDown = () => {
 
 // 在页面挂载时恢复倒计时状态
 onMounted(() => {
-  // 测试阶段不启用登录验证码，因此不再恢复验证码倒计时状态。
+  restoreCountdownState()
-  // restoreCountdownState()
   getLatestActivityOrganizer()
 })
 
@@ -274,7 +271,6 @@ onBeforeUnmount(() => {
 })
 
 // 获取登录短信验证码：手机号通过路径参数传递，接口返回 code 和 msg 表示发送结果。
-/* 测试阶段临时关闭登录验证码发送；恢复正式登录时需同时恢复验证码输入和后端校验。
 const getSmsCode = () => {
   if (!loginForm.phone) {
     Toast('请输入手机号码');
@@ -295,21 +291,19 @@ const getSmsCode = () => {
       Toast({message: msg, theme: 'error'})
     }
   }).catch((error) => {
-    Toast({message: error.message, theme: 'error'})
+    Toast({message: error?.message || error?.msg || error?.errMsg || '验证码发送失败，请稍后重试', theme: 'error'})
   })
 }
-*/
 
 const handleLogin = () => {
   if (!loginForm.phone) {
     Toast('请输入手机号码');
     return
   }
-  // 测试阶段允许已注册手机号直接登录，暂不校验验证码是否填写。
+  if (!loginForm.smsCode.trim() && loginForm.loginMethod === 'sms') {
-  // if (!loginForm.smsCode && loginForm.loginMethod === 'sms') {
+    Toast('请输入验证码');
-  //   Toast('请输入验证码');
+    return
-  //   return
+  }
-  // }
   if (!loginForm.password && loginForm.loginMethod === 'password') {
     Toast('请输入密码');
     return
@@ -354,32 +348,25 @@ function navigateToRegister() {
 </script>
 
 <style lang="less" scoped>
-body {
-  height: 100%;
-  overflow: hidden;
-  position: fixed;
-  width: 100%;
-  top: 0;
-  left: 0;
-}
 
 .login-container {
-  height: 100vh;
+  min-height: 100vh;
   background: #f4f2f2;
   position: relative;
-  overflow: hidden;
   display: flex;
   flex-direction: column;
 }
 
 .title-area {
   padding: 0;
-  height: 30vh;
+  // 固定顶部高度，长表单通过整页滚动展示，避免挤压标题区域。
+  height: 260px;
+  flex-shrink: 0;
   position: relative;
   overflow: hidden;
   display: flex;
   align-items: center;
-  background: linear-gradient(135deg, #7a1818 0%, #d03e3e 50%, #f45a5a 100%);
+  background: linear-gradient(135deg, #00468c 0%, #0873d9 50%, var(--td-brand-color) 100%);
 }
 
 .tech-animation {
@@ -403,7 +390,7 @@ body {
 }
 
 .main-title {
-  font-size: 34px;
+  font-size: 28px;
   font-weight: bold;
   margin-bottom: 8px;
   display: block;
@@ -429,7 +416,7 @@ body {
 }
 
 .login-card {
-  flex: 1;
+  flex: 1 0 auto;
   background-color: #ffffff;
   border-radius: 30px 30px 0 0;
   margin-top: -30px;
@@ -455,9 +442,9 @@ body {
   justify-content: center;
   align-items: center;
   font-size: 15px;
-  color: #f45a5a;
+  color: var(--td-brand-color);
   font-weight: 500;
-  background-color: #fff0f0;
+  background-color: var(--td-brand-color-light);
   transition: all 0.3s ease;
   position: relative;
   overflow: hidden;
@@ -475,7 +462,7 @@ body {
 
 .tab.active {
   color: #fff;
-  background-color: #f45a5a;
+  background-color: var(--td-brand-color);
 }
 
 .form-container {
@@ -510,7 +497,7 @@ body {
 }
 
 .verify-code-btn {
-  color: #f45a5a;
+  color: var(--td-brand-color);
   font-size: 14px;
   white-space: nowrap;
 
@@ -522,7 +509,7 @@ body {
 .submit-btn {
   margin-top: 32px;
   height: 50px;
-  background-color: #f45a5a;
+  background-color: var(--td-brand-color);
   border-radius: 25px;
   color: white;
   font-size: 16px;
@@ -538,13 +525,14 @@ body {
   color: #666;
 
   .link {
-    color: #f45a5a;
+    color: var(--td-brand-color);
     margin-left: 4px;
   }
 }
 
 /* 底部信息样式 */
 .footer-info {
+  flex-shrink: 0;
   padding: 20px 30px;
   text-align: center;
   background-color: #ffffff;

frontend/src/pages/login/register.vue

@@ -4,50 +4,129 @@
     <view class="image-area">
       <div class="tech-animation">
         <svg preserveAspectRatio="xMidYMid slice" viewBox="0 0 300 100">
-          <pattern id="pattern-hex" x="0" y="0" width="10" height="10" patternUnits="userSpaceOnUse"
+          <pattern
-                   patternTransform="scale(0.8)">
+            id="pattern-hex"
+            x="0"
+            y="0"
+            width="10"
+            height="10"
+            patternUnits="userSpaceOnUse"
+            patternTransform="scale(0.8)"
+          >
             <rect x="0" y="0" width="10" height="10" fill="none" />
-            <path d="M0,5 L2.5,0 L7.5,0 L10,5 L7.5,10 L2.5,10 Z" stroke-width="0.5" stroke="rgba(244, 90, 90, 0.2)"
+            <path
-                  fill="rgba(244, 90, 90, 0.1)">
+              d="M0,5 L2.5,0 L7.5,0 L10,5 L7.5,10 L2.5,10 Z"
-              <animate attributeName="stroke-opacity" values="0.1;0.3;0.1" dur="3s" repeatCount="indefinite"/>
+              stroke-width="0.5"
+              stroke="rgba(25, 137, 250, 0.2)"
+              fill="rgba(25, 137, 250, 0.1)"
+            >
+              <animate
+                attributeName="stroke-opacity"
+                values="0.1;0.3;0.1"
+                dur="3s"
+                repeatCount="indefinite"
+              />
             </path>
           </pattern>
-          <rect x="0" y="0" width="100%" height="100%" fill="url(#pattern-hex)"/>
+          <rect
+            x="0"
+            y="0"
+            width="100%"
+            height="100%"
+            fill="url(#pattern-hex)"
+          />
 
           <g fill="none" stroke-width="0.5">
-            <path d="M20,50 Q60,20 100,50 T180,50 T260,50" stroke="rgba(244, 90, 90, 0.6)">
+            <path
-              <animate attributeName="d"
+              d="M20,50 Q60,20 100,50 T180,50 T260,50"
+              stroke="rgba(25, 137, 250, 0.6)"
+            >
+              <animate
+                attributeName="d"
                 values="M20,50 Q60,20 100,50 T180,50 T260,50;
                       M20,50 Q60,80 100,50 T180,50 T260,50;
                       M20,50 Q60,20 100,50 T180,50 T260,50"
-                       dur="10s" repeatCount="indefinite"/>
+                dur="10s"
+                repeatCount="indefinite"
+              />
             </path>
 
-            <path d="M20,70 Q60,40 100,70 T180,70 T260,70" stroke="rgba(244, 90, 90, 0.4)">
+            <path
-              <animate attributeName="d"
+              d="M20,70 Q60,40 100,70 T180,70 T260,70"
+              stroke="rgba(25, 137, 250, 0.4)"
+            >
+              <animate
+                attributeName="d"
                 values="M20,70 Q60,40 100,70 T180,70 T260,70;
                       M20,70 Q60,100 100,70 T180,70 T260,70;
                       M20,70 Q60,40 100,70 T180,70 T260,70"
-                       dur="12s" repeatCount="indefinite"/>
+                dur="12s"
+                repeatCount="indefinite"
+              />
             </path>
           </g>
 
-          <circle cx="50" cy="50" r="1" fill="rgba(244, 90, 90, 0.8)">
+          <circle cx="50" cy="50" r="1" fill="rgba(25, 137, 250, 0.8)">
-            <animate attributeName="cx" values="50;250;50" dur="20s" repeatCount="indefinite"/>
+            <animate
-            <animate attributeName="cy" values="50;30;80;50" dur="16s" repeatCount="indefinite"/>
+              attributeName="cx"
-            <animate attributeName="r" values="1;1.5;1" dur="5s" repeatCount="indefinite"/>
+              values="50;250;50"
+              dur="20s"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="cy"
+              values="50;30;80;50"
+              dur="16s"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="r"
+              values="1;1.5;1"
+              dur="5s"
+              repeatCount="indefinite"
+            />
           </circle>
 
-          <circle cx="150" cy="30" r="1" fill="rgba(244, 90, 90, 0.8)">
+          <circle cx="150" cy="30" r="1" fill="rgba(25, 137, 250, 0.8)">
-            <animate attributeName="cx" values="150;100;200;150" dur="25s" repeatCount="indefinite"/>
+            <animate
-            <animate attributeName="cy" values="30;60;20;30" dur="18s" repeatCount="indefinite"/>
+              attributeName="cx"
-            <animate attributeName="r" values="1;1.8;1" dur="6s" repeatCount="indefinite"/>
+              values="150;100;200;150"
+              dur="25s"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="cy"
+              values="30;60;20;30"
+              dur="18s"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="r"
+              values="1;1.8;1"
+              dur="6s"
+              repeatCount="indefinite"
+            />
           </circle>
 
-          <circle cx="250" cy="70" r="1" fill="rgba(244, 90, 90, 0.8)">
+          <circle cx="250" cy="70" r="1" fill="rgba(25, 137, 250, 0.8)">
-            <animate attributeName="cx" values="250;150;250" dur="22s" repeatCount="indefinite"/>
+            <animate
-            <animate attributeName="cy" values="70;40;70" dur="15s" repeatCount="indefinite"/>
+              attributeName="cx"
-            <animate attributeName="r" values="1;1.2;1" dur="4s" repeatCount="indefinite"/>
+              values="250;150;250"
+              dur="22s"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="cy"
+              values="70;40;70"
+              dur="15s"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="r"
+              values="1;1.2;1"
+              dur="4s"
+              repeatCount="indefinite"
+            />
           </circle>
         </svg>
       </div>
@@ -137,7 +216,7 @@
           v-model="formData.birthday"
           placeholder="选择出生日期"
           @click="showBirthdayPicker = true"
-        >
+        />
         <t-popup v-model="showBirthdayPicker" placement="bottom">
           <t-date-time-picker
             :value="formData.birthday"
@@ -152,7 +231,6 @@
         </t-popup>
       </view>
 
-
       <!-- 验证码输入框 -->
       <view class="input-box">
         <t-icon name="shield-error" size="20px" class="input-icon" />
@@ -163,7 +241,11 @@
           placeholder="请输入验证码"
           maxlength="6"
         />
-        <view class="verify-code-btn" @click="sendVerificationCode" :class="{ disabled: countdown > 0 }">
+        <view
+          class="verify-code-btn"
+          @click="sendVerificationCode"
+          :class="{ disabled: countdown > 0 }"
+        >
           {{ countdown > 0 ? `${countdown}秒` : '获取验证码' }}
         </view>
       </view>
@@ -171,7 +253,9 @@
       <!-- 短信可能被系统拦截或受双卡设置影响，提前提示用户检查手机接收状态。 -->
       <view class="sms-reminder">
         <text class="sms-reminder-title">温馨提醒：</text>
-        <text>如果您长时间没有收到短信，请检查手机是否当做骚扰短信被拦截，或您是否有两个手机卡号，可能需要切换主副卡</text>
+        <text
+          >如果您长时间没有收到短信，请检查手机是否当做骚扰短信被拦截，或您是否有两个手机卡号，可能需要切换主副卡</text
+        >
       </view>
 
       <!-- 注册按钮 -->
@@ -187,11 +271,13 @@
     </view>
 
     <!-- 底部信息 -->
+    <!--
     <view class="footer-info">
       <view class="footer-item">主办单位：浙江省教育工会</view>
       <view class="footer-item">承办单位：杭州医学院</view>
       <view class="footer-item">技术支持：武汉地大三思科技有限公司（智慧工会提供商）</view>
     </view>
+     -->
 
     <!-- 自定义单位选择弹窗 -->
     <t-popup v-model="showUnitPicker" placement="bottom">
@@ -241,7 +327,12 @@
             @click="selectUnit(unit)"
           >
             <text class="unit-name">{{ unit.name }}</text>
-            <t-icon v-if="selectedUnitId === unit.id" name="check" size="22px" class="check-icon"/>
+            <t-icon
+              v-if="selectedUnitId === unit.id"
+              name="check"
+              size="22px"
+              class="check-icon"
+            />
           </view>
           <view v-if="filteredUnits.length === 0" class="empty-result">
             <t-icon name="info-circle" size="40rpx" class="empty-icon" />
@@ -254,26 +345,37 @@
 </template>
 
 <script setup>
-import {ref, reactive, computed, onMounted, watch, nextTick, getCurrentInstance} from 'vue';
+  import {
-import {Dialog, Toast} from 'tdesign-mobile-vue';
+    ref,
-import {useRequest} from "@/utils/request";
+    reactive,
-import {useUserStore} from "@/store";
+    computed,
+    onMounted,
+    watch,
+    nextTick,
+    getCurrentInstance,
+  } from 'vue'
+  import { Dialog, Toast } from 'tdesign-mobile-vue'
+  import { useRequest } from '@/utils/request'
+  import { useUserStore } from '@/store'
 
-const userStore = useUserStore();
+  const userStore = useUserStore()
 
   // 注册页与登录页使用同一口径展示当前最新开启活动的标题。
-const currentActivityTitle = ref('');
+  const currentActivityTitle = ref('')
 
   const getLatestActivityTitle = () => {
-  useRequest().get('/open/common/latestActivityOrganizer').then(({code, data}) => {
+    useRequest()
+      .get('/open/common/latestActivityOrganizer')
+      .then(({ code, data }) => {
         if (code === 0 && data) {
-      currentActivityTitle.value = data.title || '';
+          currentActivityTitle.value = data.title || ''
         }
-  }).catch((error) => {
+      })
+      .catch((error) => {
         // 标题属于辅助展示，请求失败时使用“赛事管理”占位，不阻断注册流程。
-    console.error('获取当前活动标题失败', error);
+        console.error('获取当前活动标题失败', error)
-  });
+      })
-};
+  }
 
   // 表单数据
   const formData = reactive({
@@ -284,169 +386,172 @@ const formData = reactive({
     unitAliasName: '',
     // idCard: '',
     birthday: null,
-  smsCode: ''
+    smsCode: '',
-});
+  })
 
   // 验证码倒计时
-const countdown = ref(0);
+  const countdown = ref(0)
-const sendingCode = ref(false);
+  const sendingCode = ref(false)
-const registering = ref(false);
+  const registering = ref(false)
 
   // 单位选择相关
-const showUnitPicker = ref(false);
+  const showUnitPicker = ref(false)
-const unitList = ref([]);
+  const unitList = ref([])
-const searchKeyword = ref('');
+  const searchKeyword = ref('')
-const selectedUnitId = ref('');
+  const selectedUnitId = ref('')
-const scrollViewId = ref('');
+  const scrollViewId = ref('')
-const unitAliasLocked = ref(false);
+  const unitAliasLocked = ref(false)
 
   // 筛选单位列表
   const filteredUnits = computed(() => {
     if (!searchKeyword.value) {
-    return unitList.value;
+      return unitList.value
     }
-  return unitList.value.filter(unit =>
+    return unitList.value.filter((unit) =>
-      unit.name.toLowerCase().includes(searchKeyword.value.toLowerCase())
+      unit.name.toLowerCase().includes(searchKeyword.value.toLowerCase()),
-  );
+    )
-});
+  })
 
   // 当选择器打开时，预设选中当前已选单位
   watch(showUnitPicker, (newVal) => {
     if (newVal && formData.unitId) {
-    selectedUnitId.value = formData.unitId;
+      selectedUnitId.value = formData.unitId
       // 设置scrollViewId以触发滚动
-    scrollViewId.value = `unit-${formData.unitId}`;
+      scrollViewId.value = `unit-${formData.unitId}`
       // 确保Android上滚动正常工作
       nextTick(() => {
         setTimeout(() => {
-        scrollViewId.value = '';
+          scrollViewId.value = ''
           nextTick(() => {
-          scrollViewId.value = `unit-${formData.unitId}`;
+            scrollViewId.value = `unit-${formData.unitId}`
-        });
+          })
-      }, 100);
+        }, 100)
-    });
+      })
     } else {
-    selectedUnitId.value = '';
+      selectedUnitId.value = ''
     }
     // 清空搜索关键词
-  searchKeyword.value = '';
+    searchKeyword.value = ''
-});
+  })
 
   // 搜索处理
   const handleSearch = () => {
     // 实时搜索，不需要额外处理，由计算属性完成
-};
+  }
 
   // 清除搜索
   const clearSearch = () => {
-  searchKeyword.value = '';
+    searchKeyword.value = ''
-};
+  }
-
 
   // 生日选择器
-const showBirthdayPicker = ref(false);
+  const showBirthdayPicker = ref(false)
 
   const onBirthdayConfirm = (date) => {
-  formData.birthday = date;
+    formData.birthday = date
-  showBirthdayPicker.value = false;
+    showBirthdayPicker.value = false
-};
+  }
 
   const onBirthdayCancel = () => {
-  showBirthdayPicker.value = false;
+    showBirthdayPicker.value = false
-};
+  }
 
   // 选择单位
   const selectUnit = (unit) => {
-  selectedUnitId.value = unit.id;
+    selectedUnitId.value = unit.id
     // 更新scrollViewId并确保滚动生效
-  scrollViewId.value = '';
+    scrollViewId.value = ''
     nextTick(() => {
-    scrollViewId.value = `unit-${unit.id}`;
+      scrollViewId.value = `unit-${unit.id}`
-  });
+    })
-};
+  }
 
   // 确认选择
   const confirmUnitSelection = () => {
     if (!selectedUnitId.value) {
-    Toast({message: '请选择单位', theme: 'warning'});
+      Toast({ message: '请选择单位', theme: 'warning' })
-    return;
+      return
     }
 
-  const selectedUnit = unitList.value.find(unit => unit.id === selectedUnitId.value);
+    const selectedUnit = unitList.value.find(
+      (unit) => unit.id === selectedUnitId.value,
+    )
     if (selectedUnit) {
-    formData.unitId = selectedUnit.id;
+      formData.unitId = selectedUnit.id
-    formData.unitName = selectedUnit.name;
+      formData.unitName = selectedUnit.name
-    formData.unitAliasName = selectedUnit.aliasName || '';
+      formData.unitAliasName = selectedUnit.aliasName || ''
-    unitAliasLocked.value = Boolean(selectedUnit.aliasName);
+      unitAliasLocked.value = Boolean(selectedUnit.aliasName)
+    }
+    showUnitPicker.value = false
   }
-  showUnitPicker.value = false;
-};
 
   // 获取单位列表
   const getUnitList = async () => {
     try {
-    const {code, data, msg} = await useRequest().get('/open/common/units');
+      const { code, data, msg } = await useRequest().get('/open/common/units')
       if (code === 0) {
-      unitList.value = data || [];
+        unitList.value = data || []
       } else {
-      Toast({message: msg || '获取单位列表失败', theme: 'error'});
+        Toast({ message: msg || '获取单位列表失败', theme: 'error' })
       }
     } catch (error) {
-    console.error('获取单位列表失败', error);
+      console.error('获取单位列表失败', error)
-    Toast({message: '获取单位列表失败', theme: 'error'});
+      Toast({ message: '获取单位列表失败', theme: 'error' })
+    }
   }
-};
 
   // 发送验证码
   const sendVerificationCode = async () => {
     if (!formData.phone || formData.phone.length !== 11) {
-    Toast({message: '请输入正确的手机号', theme: 'error'});
+      Toast({ message: '请输入正确的手机号', theme: 'error' })
-    return;
+      return
     }
 
-  if (countdown.value > 0) return;
+    if (countdown.value > 0) return
 
-  sendingCode.value = true;
+    sendingCode.value = true
     try {
-    const {code, msg} = await useRequest().post('/client/auth/send-reg-code/' + formData.phone);
+      const { code, msg } = await useRequest().post(
+        '/client/auth/send-reg-code/' + formData.phone,
+      )
 
       if (code === 0) {
-      Toast({message: '验证码已发送'});
+        Toast({ message: '验证码已发送' })
-      startCountdown();
+        startCountdown()
       } else {
-      Toast({message: msg || '发送验证码失败', theme: 'error'});
+        Toast({ message: msg || '发送验证码失败', theme: 'error' })
       }
     } catch (error) {
-    console.error('发送验证码失败', error);
+      console.error('发送验证码失败', error)
-    Toast({message: '发送验证码失败', theme: 'error'});
+      Toast({ message: '发送验证码失败', theme: 'error' })
     } finally {
-    sendingCode.value = false;
+      sendingCode.value = false
+    }
   }
-};
 
   // 倒计时
   const startCountdown = () => {
-  countdown.value = 60;
+    countdown.value = 60
     const timer = setInterval(() => {
-    countdown.value--;
+      countdown.value--
       if (countdown.value <= 0) {
-      clearInterval(timer);
+        clearInterval(timer)
+      }
+    }, 1000)
   }
-  }, 1000);
-};
 
   // 注册
   const handleRegister = async () => {
     if (!formData.userName) {
-    Toast('请输入姓名');
+      Toast('请输入姓名')
       return
     }
     if (!formData.phone) {
-    Toast('请输入手机号码');
+      Toast('请输入手机号码')
       return
     }
     if (!formData.phone.match(/^1[3456789]\d{9}$/)) {
-    Toast('请输入正确的手机号码');
+      Toast('请输入正确的手机号码')
       return
     }
     // if (!formData.idCard) {
@@ -455,27 +560,30 @@ const handleRegister = async () => {
     // }
     // 当前注册流程暂不要求出生日期，恢复字段显示时再同步启用必填校验。
     if (!formData.unitId) {
-    Toast('请选择单位');
+      Toast('请选择单位')
       return
     }
-  const unitAliasName = formData.unitAliasName.trim();
+    const unitAliasName = formData.unitAliasName.trim()
     if (!unitAliasName) {
-    Toast('请输入单位简称');
+      Toast('请输入单位简称')
       return
     }
-  formData.unitAliasName = unitAliasName;
+    formData.unitAliasName = unitAliasName
     // if (!formData.idCard.match(/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/)) {
     //   Toast('请输入正确的身份证号');
     //   return
     // }
     if (!formData.smsCode) {
-    Toast('请输入验证码');
+      Toast('请输入验证码')
       return
     }
 
-  registering.value = true;
+    registering.value = true
     try {
-    const {code, msg, data} = await useRequest().post('/client/auth/register', formData);
+      const { code, msg, data } = await useRequest().post(
+        '/client/auth/register',
+        formData,
+      )
 
       if (code === 0) {
         Dialog.confirm({
@@ -485,58 +593,62 @@ const handleRegister = async () => {
           cancelBtn: '取消',
           onConfirm: () => {
             userStore.setToken(data)
-          userStore.getUserInfo().then(() => {
+            userStore
+              .getUserInfo()
+              .then(() => {
                 uni.switchTab({
-              url: '/pages/index/index'
+                  url: '/pages/index/index',
                 })
-          }).catch(e => {
+              })
+              .catch((e) => {
                 Toast({ message: e.message, theme: 'error' })
               })
-        }
+          },
         })
       } else {
-      Toast({message: msg || '注册失败', theme: 'error'});
+        Toast({ message: msg || '注册失败', theme: 'error' })
       }
     } catch (error) {
-    console.error('注册失败', error);
+      console.error('注册失败', error)
-    Toast({message: '注册失败', theme: 'error'});
+      Toast({ message: '注册失败', theme: 'error' })
     } finally {
-    registering.value = false;
+      registering.value = false
+    }
   }
-};
 
   // 跳转登录页面
   const goToLogin = () => {
     uni.navigateTo({
-    url: '/pages/login/index'
+      url: '/pages/login/index',
-  });
+    })
-};
+  }
 
   // 页面加载时获取单位列表
   onMounted(() => {
-  getLatestActivityTitle();
+    getLatestActivityTitle()
-  getUnitList();
+    getUnitList()
-});
+  })
 </script>
 
 <style scoped lang="less">
   .register-container {
-  height: 100vh;
+    min-height: 100vh;
     background: #f4f2f2;
     position: relative;
-  overflow: hidden;
     display: flex;
     flex-direction: column;
   }
 
   .image-area {
     padding: 0;
-  height: 30vh;
+    // 固定顶部高度，长表单通过整页滚动展示，避免挤压标题区域。
+    height: 260px;
+    flex-shrink: 0;
     position: relative;
     overflow: hidden;
     display: flex;
     align-items: center;
-  background: linear-gradient(135deg, #7a1818 0%, #d03e3e 50%, #f45a5a 100%);
+    background: linear-gradient(135deg, #00468c 0%, #0873d9 50%, var(--td-brand-color) 100%);
   }
 
   .tech-animation {
@@ -568,7 +680,7 @@ onMounted(() => {
   }
 
   .main-title {
-  font-size: 34px;
+    font-size: 28px;
     font-weight: bold;
     margin-bottom: 8px;
     display: block;
@@ -594,11 +706,11 @@ onMounted(() => {
   }
 
   .form-area {
-  flex: 1;
+    flex: 1 0 auto;
     background-color: #ffffff;
     border-radius: 30px 30px 0 0;
     margin-top: -30px;
-  padding: 30px 30px 0;
+    padding: 30px 30px;
     position: relative;
     z-index: 2;
     box-shadow: 0 -5px 20px rgba(0, 0, 0, 0.05);
@@ -624,7 +736,8 @@ onMounted(() => {
     display: none; /* 不使用图标容器 */
   }
 
-.input, .unit-selector {
+  .input,
+  .unit-selector {
     flex: 1;
     height: 100%;
     border: none;
@@ -647,7 +760,7 @@ onMounted(() => {
   }
 
   .verify-code-btn {
-  color: #f45a5a;
+    color: var(--td-brand-color);
     font-size: 14px;
     white-space: nowrap;
     background: none;
@@ -670,14 +783,14 @@ onMounted(() => {
   }
 
   .sms-reminder-title {
-  color: #f45a5a;
+    color: var(--td-warning-color);
     font-weight: 500;
   }
 
   .submit-btn {
     margin-top: 32px;
     height: 50px;
-  background-color: #f45a5a;
+    background-color: var(--td-brand-color);
     border-radius: 25px;
     color: white;
     font-size: 16px;
@@ -687,7 +800,7 @@ onMounted(() => {
 
     &.disabled {
       opacity: 0.6;
-    background-color: #f45a5a;
+      background-color: var(--td-brand-color);
     }
   }
 
@@ -703,7 +816,7 @@ onMounted(() => {
   }
 
   .link-text {
-  color: #f45a5a;
+    color: var(--td-brand-color);
     margin-left: 4px;
   }
 
@@ -724,10 +837,11 @@ onMounted(() => {
     border-bottom: 1px solid #f5f5f5;
   }
 
-.cancel-btn, .confirm-btn {
+  .cancel-btn,
+  .confirm-btn {
     padding: 10rpx 20rpx;
     border-radius: 8rpx;
-  color: #f45a5a;
+    color: var(--td-brand-color);
     font-size: 28rpx;
   }
 
@@ -789,7 +903,7 @@ onMounted(() => {
   }
 
   .unit-selected {
-  background-color: rgba(244, 90, 90, 0.1);
+    background-color: rgba(25, 137, 250, 0.1);
   }
 
   .unit-name {
@@ -802,7 +916,7 @@ onMounted(() => {
   .check-icon {
     position: absolute;
     right: 30rpx;
-  color: #f45a5a;
+    color: var(--td-brand-color);
   }
 
   .t-radio-group {
@@ -818,8 +932,6 @@ onMounted(() => {
     /*border-color: #ffffff;*/
   }
 
-
-
   .empty-result {
     display: flex;
     flex-direction: column;
@@ -839,6 +951,7 @@ onMounted(() => {
 
   /* 底部信息样式 */
   .footer-info {
+    flex-shrink: 0;
     padding: 20px 30px;
     text-align: center;
     background-color: #ffffff;

frontend/src/pages/profile/act.vue

@@ -56,7 +56,7 @@
                 </view>
                 <view style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
                   <t-icon name="castle-7"></t-icon>
-                  {{ item.coHostUnit }}
+                  {{ item.hostUnit }}
                 </view>
               </view>
             </view>

frontend/src/pages/profile/index.vue

@@ -123,7 +123,7 @@ async function updateAvatar(avatar) {
     </view>
 
     <view class="logout-btn">
-      <t-button theme="danger" size="large" block @click="handleLogout">退出登录</t-button>
+      <t-button theme="primary" size="large" block @click="handleLogout">退出登录</t-button>
     </view>
 
     <view class="footer">

frontend/src/theme.css

@@ -1,14 +1,14 @@
 :root, :root[theme-mode="light"] {
-    --td-brand-color-1: #fff0ed;
+    --td-brand-color-1: #e8f3ff;
-    --td-brand-color-2: #ffd8d3;
+    --td-brand-color-2: #cfe7ff;
-    --td-brand-color-3: #ffb8b1;
+    --td-brand-color-3: #a4d2ff;
-    --td-brand-color-4: #ff928c;
+    --td-brand-color-4: #70b7ff;
-    --td-brand-color-5: #ff5f5c;
+    --td-brand-color-5: #1989fa;
-    --td-brand-color-6: #df3d3f;
+    --td-brand-color-6: #0873d9;
-    --td-brand-color-7: #b6292d;
+    --td-brand-color-7: #005bb5;
-    --td-brand-color-8: #8f121b;
+    --td-brand-color-8: #00468c;
-    --td-brand-color-9: #6b000a;
+    --td-brand-color-9: #003568;
-    --td-brand-color-10: #490005;
+    --td-brand-color-10: #002447;
     --td-brand-color-light: var(--td-brand-color-1);
     --td-brand-color-focus: var(--td-brand-color-2);
     --td-brand-color-disabled: var(--td-brand-color-3);
@@ -119,16 +119,16 @@
 }
 
 :root[theme-mode="dark"] {
-    --td-brand-color-1: #ff505020;
+    --td-brand-color-1: #1989fa20;
-    --td-brand-color-2: #6b000a;
+    --td-brand-color-2: #003568;
-    --td-brand-color-3: #8f121b;
+    --td-brand-color-3: #00468c;
-    --td-brand-color-4: #b6292d;
+    --td-brand-color-4: #005bb5;
-    --td-brand-color-5: #df3d3f;
+    --td-brand-color-5: #0873d9;
-    --td-brand-color-6: #ff5050;
+    --td-brand-color-6: #1989fa;
-    --td-brand-color-7: #ff928c;
+    --td-brand-color-7: #70b7ff;
-    --td-brand-color-8: #ffb8b1;
+    --td-brand-color-8: #a4d2ff;
-    --td-brand-color-9: #ffd8d3;
+    --td-brand-color-9: #cfe7ff;
-    --td-brand-color-10: #fff0ed;
+    --td-brand-color-10: #e8f3ff;
     --td-brand-color-light: var(--td-brand-color-1);
     --td-brand-color-focus: var(--td-brand-color-2);
     --td-brand-color-disabled: var(--td-brand-color-3);