revert: 还原合并冲突文件
This commit is contained in:
@@ -106,17 +106,17 @@
|
||||
</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>
|
||||
<view class="service-title">素质测评</view>
|
||||
</view>
|
||||
<view class="service-item press-button" @click="handleServiceClick('ai-interview')">
|
||||
<view class="service-item press-button" @click="goAiAu()">
|
||||
<view class="service-icon service-icon-9">
|
||||
<IconfontIcon name="ai" :size="68" color="#FFFFFF" />
|
||||
</view>
|
||||
<view class="service-title">AI智能面试</view>
|
||||
<view class="service-title">虚拟面试</view>
|
||||
</view>
|
||||
<view class="service-item press-button" style="justify-content:normal" @click="goRc()">
|
||||
<view class="service-icon service-icon-9">
|
||||
@@ -124,17 +124,11 @@
|
||||
</view>
|
||||
<view class="service-title" style="overflow:unset">高校毕业生<br/>智慧就业服务</view>
|
||||
</view>
|
||||
<view class="service-item press-button" @click="handleServiceClick('career-planning')">
|
||||
<view class="service-icon service-icon-11">
|
||||
<image class="service-icon-img" src="/static/icon/antOutline.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="service-title">职业规划推荐</view>
|
||||
</view>
|
||||
<view class="service-item press-button" @click="navToTestPage">
|
||||
<view class="service-item press-button" @click="navToPage">
|
||||
<view class="service-icon service-icon-10">
|
||||
<uni-icons type="gear-filled" size="32" color="#FFFFFF"></uni-icons>
|
||||
</view>
|
||||
<view class="service-title">测试页面</view>
|
||||
<view class="service-title">帮扶</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -599,8 +593,6 @@ const { columnCount, columnSpace } = useColumnCount(() => {
|
||||
const getCompanyInfo = () => {
|
||||
try {
|
||||
const cachedUserInfo = uni.getStorageSync('userInfo') || {};
|
||||
console.log('缓存中的userInfo:', cachedUserInfo);
|
||||
|
||||
// 重置企业信息
|
||||
companyInfo.name = '';
|
||||
companyInfo.avatar = '';
|
||||
@@ -707,15 +699,49 @@ 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
|
||||
};
|
||||
|
||||
// 跳转到测试页面
|
||||
const navToTestPage = () => {
|
||||
navTo('/pages/test/homepage-test');
|
||||
};
|
||||
const navToPage = () =>{
|
||||
// navTo('/packageB/login?flag=nw');
|
||||
navTo('/packageB/priority/helpFilter');
|
||||
}
|
||||
|
||||
async function loadData() {
|
||||
try {
|
||||
@@ -1008,17 +1034,49 @@ 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();
|
||||
console.log(token,'t123312')
|
||||
if(!token){
|
||||
console.log(111)
|
||||
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');
|
||||
}
|
||||
});
|
||||
});
|
||||
}else{
|
||||
if(storeRc.state.user.type == '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}`);
|
||||
}
|
||||
}
|
||||
// 跳转AI智能面试
|
||||
function goAiAu(){
|
||||
if (checkLogin()) {
|
||||
const userInfo = uni.getStorageSync('userInfo')
|
||||
navTo(`/packageCa/search/AIAudition?userId=${userInfo.userId}&name=${userInfo.name}`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
defineExpose({ loadData });
|
||||
@@ -1325,17 +1383,15 @@ defineExpose({ loadData });
|
||||
align-items: center
|
||||
justify-content: center
|
||||
.service-icon-11
|
||||
background-color: #72A4FC
|
||||
background: linear-gradient(135deg, #FF9800 0%, #FFB74D 100%)
|
||||
position: relative
|
||||
display: flex
|
||||
align-items: center
|
||||
justify-content: center
|
||||
.service-icon-img
|
||||
width: 42rpx
|
||||
height: 42rpx
|
||||
position: relative
|
||||
z-index: 1
|
||||
filter: brightness(1.8) contrast(1.4)
|
||||
&::before
|
||||
content: '📈'
|
||||
position: absolute
|
||||
top: 50%
|
||||
left: 50%
|
||||
transform: translate(-50%, -50%)
|
||||
font-size: 32rpx
|
||||
.service-icon-12
|
||||
background: linear-gradient(135deg, #4CAF50 0%, #81C784 100%)
|
||||
position: relative
|
||||
|
||||
Reference in New Issue
Block a user