diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index 5975d3a..45401d1 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -58,6 +58,15 @@
手机号码
+
+ 技能等级
+
+
技能名称
{
+ // 初始化页面数据
initLoad();
+
+ // initLoad执行完毕后，尝试从appSkillsList获取和设置技能信息
+ // 使用setTimeout确保initLoad完全执行
+ setTimeout(() => {
+ try {
+ // 方式1：直接从缓存获取appSkillsList
+ let appSkillsList = uni.getStorageSync('appSkillsList');
+
+ // 方式2：如果缓存中没有，尝试从用户信息中获取
+ if (!appSkillsList || !Array.isArray(appSkillsList) || appSkillsList.length === 0) {
+ const userInfo = uni.getStorageSync('userInfo');
+ if (userInfo && userInfo.appSkillsList) {
+ appSkillsList = userInfo.appSkillsList;
+ }
+ }
+
+ // 打印调试信息
+ console.log('获取到的appSkillsList:', appSkillsList);
+
+ // 处理技能信息回显
+ if (appSkillsList && Array.isArray(appSkillsList) && appSkillsList.length > 0) {
+ // 过滤掉name为空的技能项
+ const validSkills = appSkillsList.filter(item => item.name && item.name.trim() !== '');
+ console.log('过滤后的有效技能:', validSkills);
+
+ if (validSkills.length > 0) {
+ // 提取有效的技能名称数组
+ const skillNames = validSkills.map(item => item.name);
+ console.log('提取的技能名称数组:', skillNames);
+
+ // 确保fromValue.skills和state.skillsText的格式正确
+ fromValue.skills = skillNames.join(','); // 转换为逗号分隔的字符串
+ state.skillsText = skillNames; // 转换为数组格式
+ console.log('设置的fromValue.skills:', fromValue.skills);
+ console.log('设置的state.skillsText:', state.skillsText);
+
+ // 提取最后一个技能的等级
+ const lastSkill = validSkills[validSkills.length - 1];
+ const lastSkillLevel = lastSkill.levels;
+ console.log('最后一个技能等级:', lastSkillLevel);
+
+ if (lastSkillLevel) {
+ // 定义等级映射，用于兼容不同格式的等级值
+ const levelMap = {
+ '1': { value: '1', label: '初级' },
+ '2': { value: '2', label: '中级' },
+ '3': { value: '3', label: '高级' },
+ '初级': { value: '1', label: '初级' },
+ '中级': { value: '2', label: '中级' },
+ '高级': { value: '3', label: '高级' }
+ };
+
+ // 获取对应的等级信息
+ const levelInfo = levelMap[lastSkillLevel] || { value: '1', label: '初级' };
+ fromValue.skillLevel = levelInfo.value;
+ state.skillLevelText = levelInfo.label;
+ console.log('设置的技能等级:', levelInfo);
+ }
+ }
+
+ // 更新完成度百分比
+ const result = getFormCompletionPercent(fromValue);
+ percent.value = result;
+ console.log('更新完成度:', percent.value);
+ }
+ } catch (error) {
+ console.error('获取技能信息失败:', error);
+ }
+ }, 100); // 短暂延迟确保初始化完成
});
// 监听页面显示，接收从技能查询页面返回的数据
onShow(() => {
// 通过事件总线接收技能选择结果
uni.$on('skillSelected', handleSkillSelected);
+
+ // 在页面显示时也再次尝试获取技能信息，确保数据最新
+ try {
+ // 优先尝试从用户信息中获取
+ const userInfo = uni.getStorageSync('userInfo');
+ let appSkillsList = userInfo && userInfo.appSkillsList ? userInfo.appSkillsList : uni.getStorageSync('appSkillsList');
+
+ // 只有在之前未设置或数据有更新时才重新设置
+ if (appSkillsList && Array.isArray(appSkillsList) && appSkillsList.length > 0) {
+ const validSkills = appSkillsList.filter(item => item.name && item.name.trim() !== '');
+ if (validSkills.length > 0) {
+ // 检查是否需要更新
+ const currentSkillsText = state.skillsText || '';
+ const newSkillNames = validSkills.map(item => item.name);
+ const newSkillsText = newSkillNames.join(', ');
+
+ // 如果技能名称或等级有变化，才更新
+ if (currentSkillsText !== newSkillsText || !fromValue.skillLevel) {
+ fromValue.skills = newSkillNames;
+ state.skillsText = newSkillsText;
+
+ const lastSkill = validSkills[validSkills.length - 1];
+ if (lastSkill.levels) {
+ const levelMap = {
+ '1': { value: '1', label: '初级' },
+ '2': { value: '2', label: '中级' },
+ '3': { value: '3', label: '高级' },
+ '初级': { value: '1', label: '初级' },
+ '中级': { value: '2', label: '中级' },
+ '高级': { value: '3', label: '高级' }
+ };
+
+ const levelInfo = levelMap[lastSkill.levels] || { value: '1', label: '初级' };
+ fromValue.skillLevel = levelInfo.value;
+ state.skillLevelText = levelInfo.label;
+ }
+
+ // 更新完成度
+ const result = getFormCompletionPercent(fromValue);
+ percent.value = result;
+ }
+ }
+ }
+ } catch (error) {
+ console.error('页面显示时获取技能信息失败:', error);
+ }
});
// 页面卸载时移除事件监听
@@ -212,6 +342,28 @@ function initLoad() {
state.skillsText = [];
}
+ // 初始化技能等级数据
+ if (currentUserInfo.skillLevel) {
+ fromValue.skillLevel = currentUserInfo.skillLevel;
+ // 根据skillLevel值设置对应的文本
+ switch(currentUserInfo.skillLevel) {
+ case '1':
+ state.skillLevelText = '初级';
+ break;
+ case '2':
+ state.skillLevelText = '中级';
+ break;
+ case '3':
+ state.skillLevelText = '高级';
+ break;
+ default:
+ state.skillLevelText = '';
+ }
+ } else {
+ fromValue.skillLevel = '';
+ state.skillLevelText = '';
+ }
+
// 初始化学历显示文本（需要等待字典数据加载完成）
initEducationText();
@@ -300,10 +452,24 @@ const confirm = () => {
if (!checkingPhoneRegExp(fromValue.phone)) {
return $api.msg('请输入正确手机号');
}
+ // 构建appSkillsList数据结构
+ let appSkillsList = [];
+ if (state.skillsText && state.skillsText.length > 0) {
+ // 获取当前技能等级文本
+ const currentLevelText = state.skillLevelText || '';
+ // 为每个技能名称创建一个包含等级信息的对象
+ appSkillsList = state.skillsText.map(skillName => ({
+ name: skillName,
+ levels: currentLevelText
+ }));
+ }
+
const params = {
...fromValue,
age: calculateAge(fromValue.birthDate),
+ appSkillsList: appSkillsList
};
+
$api.createRequest('/app/user/resume', params, 'post').then((resData) => {
$api.msg('完成');
getUserResume().then(() => {
@@ -463,6 +629,37 @@ const changePoliticalAffiliation = () => {
});
};
+// 技能等级选择
+function changeSkillLevel() {
+ const skillLevels = [
+ { label: '初级', value: '1' },
+ { label: '中级', value: '2' },
+ { label: '高级', value: '3' }
+ ];
+
+ // 查找当前技能等级在数据中的索引
+ let defaultIndex = [0];
+ if (fromValue.skillLevel) {
+ const index = skillLevels.findIndex(item => item.value === fromValue.skillLevel);
+ if (index >= 0) {
+ defaultIndex = [index];
+ }
+ }
+
+ openSelectPopup({
+ title: '技能等级',
+ maskClick: true,
+ data: [skillLevels],
+ defaultIndex: defaultIndex,
+ success: (_, [value]) => {
+ fromValue.skillLevel = value.value;
+ state.skillLevelText = value.label;
+ const result = getFormCompletionPercent(fromValue);
+ percent.value = result;
+ },
+ });
+}
+
function generateDatePickerArrays(startYear = 1975, endYear = new Date().getFullYear()) {
const years = [];
const months = [];