Merge remote-tracking branch 'origin/main'

# Conflicts:
#	packageA/pages/UnitDetails/UnitDetails.vue
#	pages.json
#	pages/careerfair/careerfair.vue
This commit is contained in:
2025-11-05 17:29:17 +08:00
142 changed files with 33297 additions and 2033 deletions

View File

@@ -167,7 +167,7 @@
console.log("登录成功");
// 可以在这里添加登录成功后的处理逻辑
};
function goDetail(jobFairId){
if(state.current != 3){
navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
@@ -793,4 +793,4 @@
.cards .card:first-child {
margin-top: 0;
}
</style>
</style>

View File

@@ -106,7 +106,7 @@
</view>
<view class="service-title">题库和考试</view>
</view>
<view class="service-item press-button" @click="handleServiceClick('quality-assessment')">
<view class="service-item press-button" @click="goCa()">
<view class="service-icon service-icon-8">
<IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
</view>
@@ -699,9 +699,43 @@ const handleServiceClick = (serviceType) => {
}
};
// 处理直播按钮点击
// 处理直播按钮点击 - 跳转微信视频号
const handleLiveClick = () => {
$api.msg('该功能正在开发中');
// #ifdef MP-WEIXIN
const feedId = 'sphKH1AEeLfTJJE';
// 使用微信原生 API 打开视频号直播
if (typeof wx !== 'undefined' && wx.openChannelsUserProfile) {
wx.openChannelsUserProfile({
// feedId: feedId,
finderUserName: feedId, // 视频号 finderUserName如果feedId足够可以留空
success: (res) => {
console.log('打开视频号成功', res);
},
fail: (err) => {
console.error('打开视频号失败', err);
$api.msg(err.errMsg || '无法打开直播,请稍后重试');
}
});
} else {
// 如果 API 不存在,尝试使用 uni API
uni.openChannelsLive({
feedId: feedId,
success: (res) => {
console.log('打开视频号成功', res);
},
fail: (err) => {
console.error('打开视频号失败', err);
$api.msg('无法打开直播,请检查微信版本或稍后重试');
}
});
}
// #endif
// #ifndef MP-WEIXIN
// 非微信小程序环境提示
$api.msg('该功能仅在微信小程序中可用');
// #endif
};
// 跳转到测试页面
@@ -1000,15 +1034,38 @@ function dataToImg(data) {
// import { loginRc } from '@/apiRc/login/login.js';
import storeRc from '@/utilsRc/store/index.js';
import { getToken } from '@/utilsRc/auth.js';
// 跳转到高校毕业页面
function goRc(){
if (checkLogin()) {
let userInfo = uni.getStorageSync('userInfo')
console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
// console.log(res, "'res");
navTo('/packageRc/pages/index/index');
});
let token = getToken();
if( token != null ){
if(storeRc.state.user.type == 'person'){
navTo('/packageRc/pages/index/index');
}else{
navTo('/packageRc/pages/daiban/daiban');
}
console.log(storeRc.state.user.roles, storeRc.state.user.type, 'state')
}else{
let userInfo = uni.getStorageSync('userInfo')
storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
// console.log(res, "'res");
storeRc.dispatch('GetInfo').then(res => {
if(res.data.user.userType == 'person'){
navTo('/packageRc/pages/index/index');
}else{
navTo('/packageRc/pages/daiban/daiban');
}
});
});
}
}
}
// 跳转素质测评页面(在线测评,职业库,职业生涯规划)
function goCa(){
if (checkLogin()) {
const userInfo = uni.getStorageSync('userInfo')
navTo(`/packageCa/search/search?userId=${userInfo.userId}&name=${userInfo.name}`);
}
}

View File

@@ -1,5 +1,5 @@
<template>
<AppLayout title="我的" back-gorund-color="#F4F4F4">
<AppLayout back-gorund-color="#F4F4F4">
<!-- 自定义tabbar -->
<CustomTabBar :currentPage="4" />
<!-- 企业用户信息卡片 -->

View File

@@ -1,5 +1,5 @@
<template>
<AppLayout title="附近" :use-scroll-view="false">
<AppLayout :use-scroll-view="false">
<template #headerleft>
<view class="btnback">
<image src="@/static/icon/back.png" @click="navBack"></image>
@@ -19,10 +19,10 @@
<component :is="components[index]" :ref="(el) => handelComponentsRef(el, index)" />
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<oneComponent v-show="currentIndex === 0" :ref="(el) => handelComponentsRef(el, index)" />
<twoComponent v-show="currentIndex === 1" :ref="(el) => handelComponentsRef(el, index)" />
<threeComponent v-show="currentIndex === 2" :ref="(el) => handelComponentsRef(el, index)" />
<fourComponent v-show="currentIndex === 3" :ref="(el) => handelComponentsRef(el, index)" />
<oneComponent v-if="index === 0" :ref="(el) => handelComponentsRef(el, index)" />
<twoComponent v-if="index === 1" :ref="(el) => handelComponentsRef(el, index)" />
<threeComponent v-if="index === 2" :ref="(el) => handelComponentsRef(el, index)" />
<fourComponent v-if="index === 3" :ref="(el) => handelComponentsRef(el, index)" />
<!-- #endif -->
</swiper-item>
</swiper>