diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue index a15aa2d..cedbc34 100644 --- a/packageA/pages/exhibitors/exhibitors.vue +++ b/packageA/pages/exhibitors/exhibitors.vue @@ -287,7 +287,8 @@ title: '报名成功', icon: 'success' }); - getCompanyInfo(userInfo.value.info.userId, jobFairId.value) + fairInfo.value.isSignUp = 1; + getCompanyInfo(userInfo.value.info.userId, jobFairId.value); } else { uni.showToast({ title: res.msg || '报名失败', diff --git a/packageB/jobFair/detailPerson.vue b/packageB/jobFair/detailPerson.vue index 77acadf..f9e8557 100644 --- a/packageB/jobFair/detailPerson.vue +++ b/packageB/jobFair/detailPerson.vue @@ -43,7 +43,7 @@ - {{ +{{ parseDateTime(fair.jobFairStartTime).time }} {{ @@ -345,6 +345,10 @@ }).then((data) => { if (data && data.code === 200) { $api.msg("简历投递成功"); + if (!job.jobFairPersonJob) { + job.jobFairPersonJob = {}; + } + job.jobFairPersonJob.status = "1"; getList(false); } else { $api.msg((data && data.msg) || "简历投递失败"); diff --git a/packageB/login.vue b/packageB/login.vue index 47e7b19..45f048e 100644 --- a/packageB/login.vue +++ b/packageB/login.vue @@ -59,7 +59,7 @@ onMounted(() => { // getCodeImg() let form={} - if (uni.getStorageSync('userInfo').isCompanyUser=='1') { + if (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2') { form={ usertype: '1', idno: uni.getStorageSync('userInfo').idCard, diff --git a/packageB/train/index.vue b/packageB/train/index.vue index 578970f..bcef18e 100644 --- a/packageB/train/index.vue +++ b/packageB/train/index.vue @@ -71,7 +71,7 @@ async function jumps(url){ async function thirdLogin(){ let form={} - if (uni.getStorageSync('userInfo').isCompanyUser=='1') { + if (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2') { form={ usertype: '1', idno: uni.getStorageSync('userInfo').idCard, diff --git a/packageB/train/video/videoList.vue b/packageB/train/video/videoList.vue index 5efd2d0..ca754ba 100644 --- a/packageB/train/video/videoList.vue +++ b/packageB/train/video/videoList.vue @@ -145,7 +145,7 @@ async function playVideo(video) { async function thirdLogin(){ let form={} - if (uni.getStorageSync('userInfo').isCompanyUser=='1') { + if (uni.getStorageSync('userInfo').isCompanyUser=='1'|| uni.getStorageSync('userInfo').isCompanyUser=='2') { form={ usertype: '1', idno: uni.getStorageSync('userInfo').idCard, diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue index 5aa3a0a..db9a562 100644 --- a/pages/careerfair/careerfair.vue +++ b/pages/careerfair/careerfair.vue @@ -157,7 +157,7 @@ async function thirdLogin(needToast){ let form={} - if (uni.getStorageSync('userInfo') && uni.getStorageSync('userInfo').isCompanyUser=='1') { + if (uni.getStorageSync('userInfo') && (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2')) { form={ usertype: '1', idno: uni.getStorageSync('userInfo').idCard, diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index 5b7ff76..0f6e00b 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -262,6 +262,7 @@ @scrolltolower="scrollBottom" :enable-back-to-top="false" :scroll-with-animation="false" + @touchmove.stop.prevent > @@ -1686,12 +1687,24 @@ defineExpose({ loadData }); background: #F4F4F4 flex: 1 overflow: hidden - height: 0; // 确保flex容器正确计算高度 + // 确保flex容器正确计算高度 + position: relative; .falls-scroll width: 100% height: 100% // 确保滚动容器可以正常滚动 -webkit-overflow-scrolling: touch; + // 解决H5端嵌套环境滑动问题 + touch-action: pan-y; + /* #ifdef H5 */ + // 修复H5端在一体机嵌套环境中的滚动问题 + overflow-y: auto; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + /* #endif */ .falls padding: 28rpx 28rpx; .item