bug修复
This commit is contained in:
@@ -6,8 +6,8 @@
|
|||||||
*/
|
*/
|
||||||
export default {
|
export default {
|
||||||
// baseUrl: 'http://39.98.44.136:8080', // 测试
|
// baseUrl: 'http://39.98.44.136:8080', // 测试
|
||||||
// baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
|
baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
|
||||||
baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
|
// baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
|
||||||
|
|
||||||
// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
|
// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
|
||||||
// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
|
// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
|
||||||
|
|||||||
@@ -47,7 +47,8 @@
|
|||||||
/>
|
/>
|
||||||
<view v-if="nameError" class="error-message">{{ nameError }}</view>
|
<view v-if="nameError" class="error-message">{{ nameError }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-input" :class="{ 'input-error': passwordError }">
|
<!-- 密码模块已注释,密码改为非必填 -->
|
||||||
|
<!-- <view class="content-input" :class="{ 'input-error': passwordError }">
|
||||||
<view class="input-titile">密码</view>
|
<view class="input-titile">密码</view>
|
||||||
<input
|
<input
|
||||||
class="input-con2"
|
class="input-con2"
|
||||||
@@ -59,7 +60,7 @@
|
|||||||
/>
|
/>
|
||||||
<view v-if="passwordError" class="error-message">{{ passwordError }}</view>
|
<view v-if="passwordError" class="error-message">{{ passwordError }}</view>
|
||||||
<view v-if="fromValue.ytjPassword && !passwordError" class="success-message">✓ 密码格式正确</view>
|
<view v-if="fromValue.ytjPassword && !passwordError" class="success-message">✓ 密码格式正确</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="content-sex" :class="{ 'input-error': sexError }">
|
<view class="content-sex" :class="{ 'input-error': sexError }">
|
||||||
<view class="sex-titile">性别</view>
|
<view class="sex-titile">性别</view>
|
||||||
<view class="sext-ri">
|
<view class="sext-ri">
|
||||||
@@ -649,7 +650,6 @@ function nextStep() {
|
|||||||
validateName();
|
validateName();
|
||||||
validateAge();
|
validateAge();
|
||||||
validateIdCard();
|
validateIdCard();
|
||||||
validatePassword();
|
|
||||||
|
|
||||||
if (fromValue.sex !== 0 && fromValue.sex !== 1) {
|
if (fromValue.sex !== 0 && fromValue.sex !== 1) {
|
||||||
sexError.value = '请选择性别';
|
sexError.value = '请选择性别';
|
||||||
@@ -668,16 +668,6 @@ function nextStep() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 密码校验
|
|
||||||
if (!fromValue.ytjPassword) {
|
|
||||||
$api.msg('请输入密码');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (passwordError.value) {
|
|
||||||
$api.msg(passwordError.value);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查所有错误状态
|
// 检查所有错误状态
|
||||||
if (nameError.value) return;
|
if (nameError.value) return;
|
||||||
if (sexError.value) return;
|
if (sexError.value) return;
|
||||||
|
|||||||
@@ -373,8 +373,8 @@ console.log('完整userInfo对象:---223--', userType.value);
|
|||||||
// 页面加载时计算高度和初始化数据
|
// 页面加载时计算高度和初始化数据
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|
||||||
console.log('完整userInfo对象:-----', );
|
// console.log('完整userInfo对象:-----', );
|
||||||
console.log('缓存中的userInfo:----', cachedUserInfo);
|
// console.log('缓存中的userInfo:----', cachedUserInfo);
|
||||||
calculateScrollViewHeight();
|
calculateScrollViewHeight();
|
||||||
await initFormData();
|
await initFormData();
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,8 @@
|
|||||||
<view class="input-titile">姓名</view>
|
<view class="input-titile">姓名</view>
|
||||||
<input class="input-con" v-model="fromValue.name" placeholder="请输入您的姓名" />
|
<input class="input-con" v-model="fromValue.name" placeholder="请输入您的姓名" />
|
||||||
</view>
|
</view>
|
||||||
<view class="content-input" :class="{ 'input-error': passwordError }">
|
<!-- 设置密码模块已注释,密码改为非必填 -->
|
||||||
|
<!-- <view class="content-input" :class="{ 'input-error': passwordError }">
|
||||||
<view class="input-titile">设置密码</view>
|
<view class="input-titile">设置密码</view>
|
||||||
<input
|
<input
|
||||||
class="input-con"
|
class="input-con"
|
||||||
@@ -29,7 +30,7 @@
|
|||||||
/>
|
/>
|
||||||
<view v-if="passwordError" class="error-message">{{ passwordError }}</view>
|
<view v-if="passwordError" class="error-message">{{ passwordError }}</view>
|
||||||
<view v-if="fromValue.ytjPassword && !passwordError" class="success-message">✓ 密码格式正确</view>
|
<view v-if="fromValue.ytjPassword && !passwordError" class="success-message">✓ 密码格式正确</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="content-sex">
|
<view class="content-sex">
|
||||||
<view class="sex-titile">性别</view>
|
<view class="sex-titile">性别</view>
|
||||||
<view class="sext-ri">
|
<view class="sext-ri">
|
||||||
@@ -213,43 +214,21 @@ watch(() => userInfo.value, (newVal) => {
|
|||||||
}
|
}
|
||||||
}, { deep: true, immediate: false });
|
}, { deep: true, immediate: false });
|
||||||
|
|
||||||
// 监听字典数据加载完成,自动更新学历显示
|
watch([() => dictComplete.value, () => dictStore.state.education], ([completeVal, eduData]) => {
|
||||||
watch(() => dictComplete.value, (newVal) => {
|
if (eduData && eduData.length > 0) {
|
||||||
if (newVal) {
|
console.log('学历字典数据已就绪,更新学历显示');
|
||||||
console.log('字典数据加载完成,更新学历显示');
|
|
||||||
// 确保有学历值(如果没有则使用默认值"4"本科)
|
|
||||||
if (!fromValue.education) {
|
if (!fromValue.education) {
|
||||||
fromValue.education = '4';
|
fromValue.education = '4';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 直接遍历字典数据查找对应标签
|
|
||||||
const eduValue = String(fromValue.education);
|
const eduValue = String(fromValue.education);
|
||||||
const eduItem = dictStore.state.education.find(item => String(item.value) === eduValue);
|
const eduItem = eduData.find(item => String(item.value) === eduValue);
|
||||||
if (eduItem && eduItem.label) {
|
if (eduItem && eduItem.label) {
|
||||||
console.log('从字典数据中找到学历标签:', eduItem.label);
|
console.log('从字典数据中找到学历标签:', eduItem.label);
|
||||||
state.educationText = eduItem.label;
|
state.educationText = eduItem.label;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}, { immediate: true, deep: true });
|
||||||
|
|
||||||
// 监听学历字典数据变化
|
|
||||||
watch(() => dictStore.state.education, (newVal) => {
|
|
||||||
if (newVal && newVal.length > 0) {
|
|
||||||
console.log('学历字典数据变化,更新显示');
|
|
||||||
// 确保有学历值(如果没有则使用默认值"4"本科)
|
|
||||||
if (!fromValue.education) {
|
|
||||||
fromValue.education = '4';
|
|
||||||
}
|
|
||||||
|
|
||||||
// 直接遍历字典数据查找对应标签
|
|
||||||
const eduValue = String(fromValue.education);
|
|
||||||
const eduItem = newVal.find(item => String(item.value) === eduValue);
|
|
||||||
if (eduItem && eduItem.label) {
|
|
||||||
console.log('从字典数据中找到学历标签:', eduItem.label);
|
|
||||||
state.educationText = eduItem.label;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, { deep: true });
|
|
||||||
|
|
||||||
function initLoad() {
|
function initLoad() {
|
||||||
// 优先从 store 获取,如果没有则从本地缓存获取
|
// 优先从 store 获取,如果没有则从本地缓存获取
|
||||||
@@ -296,17 +275,14 @@ function initLoad() {
|
|||||||
percent.value = result;
|
percent.value = result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 初始化学历显示文本
|
|
||||||
function initEducationText() {
|
function initEducationText() {
|
||||||
// 确保有学历值(如果没有则使用默认值"4"本科)
|
|
||||||
if (!fromValue.education) {
|
if (!fromValue.education) {
|
||||||
fromValue.education = '4';
|
fromValue.education = '4';
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('初始化学历显示,当前学历值:', fromValue.education);
|
console.log('初始化学历显示,当前学历值:', fromValue.education);
|
||||||
|
|
||||||
// 直接遍历字典数据查找对应标签(不依赖dictLabel函数,确保准确性)
|
const findLabel = () => {
|
||||||
const findLabelFromDict = () => {
|
|
||||||
if (dictStore.state.education && dictStore.state.education.length > 0) {
|
if (dictStore.state.education && dictStore.state.education.length > 0) {
|
||||||
const eduValue = String(fromValue.education);
|
const eduValue = String(fromValue.education);
|
||||||
const eduItem = dictStore.state.education.find(item => String(item.value) === eduValue);
|
const eduItem = dictStore.state.education.find(item => String(item.value) === eduValue);
|
||||||
@@ -314,48 +290,34 @@ function initEducationText() {
|
|||||||
console.log('从字典数据中找到学历标签:', eduItem.label);
|
console.log('从字典数据中找到学历标签:', eduItem.label);
|
||||||
state.educationText = eduItem.label;
|
state.educationText = eduItem.label;
|
||||||
return true;
|
return true;
|
||||||
} else {
|
|
||||||
console.log('字典数据中未找到匹配的学历标签');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
// 立即尝试查找
|
if (findLabel()) {
|
||||||
if (!findLabelFromDict() && dictComplete.value) {
|
return;
|
||||||
// 如果字典数据已加载完成但未找到标签,尝试重新获取字典数据
|
|
||||||
loadEducationDictAndUpdate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 等待字典数据加载完成
|
let retryCount = 0;
|
||||||
const checkDictData = () => {
|
const maxRetries = 10;
|
||||||
if (dictComplete.value && dictStore.state.education && dictStore.state.education.length > 0) {
|
const retryInterval = 200;
|
||||||
findLabelFromDict();
|
|
||||||
} else {
|
const checkDict = () => {
|
||||||
// 如果字典数据未加载,等待一段时间后重试
|
retryCount++;
|
||||||
setTimeout(() => {
|
if (retryCount >= maxRetries) {
|
||||||
if (dictComplete.value && dictStore.state.education && dictStore.state.education.length > 0) {
|
console.log('学历字典数据加载超时');
|
||||||
findLabelFromDict();
|
return;
|
||||||
} else {
|
|
||||||
// 尝试主动加载字典数据
|
|
||||||
loadEducationDictAndUpdate();
|
|
||||||
}
|
}
|
||||||
}, 500);
|
|
||||||
|
if (findLabel()) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setTimeout(checkDict, retryInterval);
|
||||||
};
|
};
|
||||||
|
|
||||||
// 主动加载学历字典数据并更新显示
|
checkDict();
|
||||||
function loadEducationDictAndUpdate() {
|
|
||||||
getDictSelectOption('education').then((data) => {
|
|
||||||
console.log('主动加载学历字典数据:', data);
|
|
||||||
dictStore.state.education = data;
|
|
||||||
findLabelFromDict();
|
|
||||||
}).catch((error) => {
|
|
||||||
console.error('加载学历字典数据失败:', error);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
checkDictData();
|
|
||||||
}
|
}
|
||||||
const confirm = () => {
|
const confirm = () => {
|
||||||
if (!fromValue.name) {
|
if (!fromValue.name) {
|
||||||
@@ -374,12 +336,6 @@ const confirm = () => {
|
|||||||
return $api.msg('请输入正确手机号');
|
return $api.msg('请输入正确手机号');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 密码校验
|
|
||||||
validatePassword();
|
|
||||||
if (fromValue.ytjPassword && passwordError.value) {
|
|
||||||
return $api.msg(passwordError.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 构建appSkillsList数据结构 - 使用新的技能数据结构,包含id字段
|
// 构建appSkillsList数据结构 - 使用新的技能数据结构,包含id字段
|
||||||
const appSkillsList = state.skills
|
const appSkillsList = state.skills
|
||||||
.filter(skill => skill.name && skill.name.trim() !== '')
|
.filter(skill => skill.name && skill.name.trim() !== '')
|
||||||
|
|||||||
@@ -807,7 +807,7 @@ const { columnCount, columnSpace } = useColumnCount(() => {
|
|||||||
const getCompanyInfo = () => {
|
const getCompanyInfo = () => {
|
||||||
try {
|
try {
|
||||||
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
||||||
console.log('缓存中的userInfo:', cachedUserInfo);
|
// console.log('缓存中的userInfo:', cachedUserInfo);
|
||||||
|
|
||||||
// 重置企业信息
|
// 重置企业信息
|
||||||
companyInfo.name = '';
|
companyInfo.name = '';
|
||||||
@@ -902,7 +902,7 @@ onShow(() => {
|
|||||||
// 页面显示时获取最新的企业信息
|
// 页面显示时获取最新的企业信息
|
||||||
getCompanyInfo();
|
getCompanyInfo();
|
||||||
// 四级联动单点及权限
|
// 四级联动单点及权限
|
||||||
getIsFourLevelLinkagePurview();
|
// getIsFourLevelLinkagePurview();
|
||||||
});
|
});
|
||||||
|
|
||||||
// 监听用户信息变化,当登录状态改变时重新获取企业信息
|
// 监听用户信息变化,当登录状态改变时重新获取企业信息
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ onShow(() => {
|
|||||||
function getCompanyInfo() {
|
function getCompanyInfo() {
|
||||||
try {
|
try {
|
||||||
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
||||||
console.log('缓存中的userInfo:', cachedUserInfo);
|
// console.log('缓存中的userInfo:', cachedUserInfo);
|
||||||
|
|
||||||
// 检查是否有company字段
|
// 检查是否有company字段
|
||||||
if (cachedUserInfo.company) {
|
if (cachedUserInfo.company) {
|
||||||
|
|||||||
@@ -234,7 +234,7 @@ onUnmounted(() => {
|
|||||||
function getCompanyInfo() {
|
function getCompanyInfo() {
|
||||||
try {
|
try {
|
||||||
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
||||||
console.log('缓存中的userInfo:', cachedUserInfo);
|
// console.log('缓存中的userInfo:', cachedUserInfo);
|
||||||
|
|
||||||
// 检查是否有company字段
|
// 检查是否有company字段
|
||||||
if (cachedUserInfo.company) {
|
if (cachedUserInfo.company) {
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ const useDictStore = defineStore("dict", () => {
|
|||||||
if (state[dictType] && Array.isArray(state[dictType])) {
|
if (state[dictType] && Array.isArray(state[dictType])) {
|
||||||
for (let i = 0; i < state[dictType].length; i++) {
|
for (let i = 0; i < state[dictType].length; i++) {
|
||||||
let element = state[dictType][i];
|
let element = state[dictType][i];
|
||||||
if (element.value === value) {
|
if (String(element.value) === String(value)) {
|
||||||
return element.label
|
return element.label
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user