Merge remote-tracking branch 'origin/main' into CareerMap

This commit is contained in:
2025-12-08 20:24:39 +08:00
2 changed files with 6 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
<!-- <!--
* @Date: 2025-10-16 15:15:47 * @Date: 2025-10-16 15:15:47
* @LastEditors: lip * @LastEditors: shirlwang
* @LastEditTime: 2025-11-19 18:22:34 * @LastEditTime: 2025-12-08 16:10:47
--> -->
<template> <template>
<!-- @scroll="handleScroll" @scrolltolower="scrollBottom" --> <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -66,7 +66,7 @@
<view class="title-item active"><view>政策专区</view></view> <view class="title-item active"><view>政策专区</view></view>
<view @click="toPolicyList">{{'查看更多 >'}}</view> <view @click="toPolicyList">{{'查看更多 >'}}</view>
</view> </view>
<view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail"> <view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail(item)">
<view class="sign">推荐</view> <view class="sign">推荐</view>
<view class="title"> <view class="title">
<image src="../../../packageRc/static/zcLeft.png"/> <image src="../../../packageRc/static/zcLeft.png"/>
@@ -100,7 +100,7 @@ function getPolicy() {
function toPolicyList() { function toPolicyList() {
navTo(`/packageRc/pages/policy/policyList`) navTo(`/packageRc/pages/policy/policyList`)
} }
function toPolicyDetail() { function toPolicyDetail(item) {
navTo(`/packageRc/pages/policy/policyDetail?id=${item.id}`) navTo(`/packageRc/pages/policy/policyDetail?id=${item.id}`)
} }
let activeTab = ref(1) let activeTab = ref(1)

View File

@@ -106,7 +106,7 @@
<view class="service-icon service-icon-4"> <view class="service-icon service-icon-4">
<IconfontIcon name="zhengce" :size="48" color="#FFFFFF" /> <IconfontIcon name="zhengce" :size="48" color="#FFFFFF" />
</view> </view>
<view class="service-title">劳动政策指引</view> <view class="service-title">政策指引</view>
</view> </view>
<view class="service-item press-button" @click="handleServiceClick('skill-training')"> <view class="service-item press-button" @click="handleServiceClick('skill-training')">
<view class="service-icon service-icon-5"> <view class="service-icon service-icon-5">
@@ -856,7 +856,7 @@ function navToService(serviceType) {
'service-guidance': '/pages/service/guidance', 'service-guidance': '/pages/service/guidance',
'public-recruitment': '/pages/service/public-recruitment', 'public-recruitment': '/pages/service/public-recruitment',
'resume-creation': '/pages/resume-guide/resume-guide', 'resume-creation': '/pages/resume-guide/resume-guide',
'labor-policy': '/pages/service/labor-policy', 'labor-policy': '/packageRc/pages/policy/policyList',
'skill-training': '/packageB/train/video/videoList', 'skill-training': '/packageB/train/video/videoList',
'skill-evaluation': '/packageB/train/index', 'skill-evaluation': '/packageB/train/index',
// 'skill-evaluation': '/pages/service/skill-evaluation', // 'skill-evaluation': '/pages/service/skill-evaluation',
@@ -1065,7 +1065,6 @@ import storeRc from '@/utilsRc/store/index.js';
function goRc(){ function goRc(){
if (checkLogin()) { if (checkLogin()) {
let userInfo = uni.getStorageSync('userInfo') let userInfo = uni.getStorageSync('userInfo')
console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
storeRc.dispatch('LoginByUserInfo', userInfo).then(res => { storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
// console.log(res, "'res"); // console.log(res, "'res");
navTo('/packageRc/pages/index/index'); navTo('/packageRc/pages/index/index');