Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

packageA/pages/post/post.vue

@@ -1,5 +1,5 @@
 <template>
-    <AppLayout title="" backGorundColor="#F4F4F4">
+    <AppLayout backGorundColor="#F4F4F4">
         <template #headerleft>
             <view class="btnback">
                 <image src="@/static/icon/back.png" @click="navBack"></image>
@@ -10,11 +10,12 @@
                 <image src="@/static/icon/share.png" @click="shareJob"></image>
             </view> -->
             <view class="btn mar_ri10">
-                <image src="@/static/icon/collect3.png" v-if="!jobInfo.isCollection" @click="jobCollection"></image>
+                <image src="@/static/icon/collect3.png" v-if="jobInfo.isCollection!==0" @click="jobCollection"></image>
                 <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
             </view>
         </template>
         <view class="content" v-show="!isEmptyObject(jobInfo)">
+            
             <view class="content-top btn-feel">
                 <view  style="background: #ffffff;padding: 24rpx;box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);border-radius: 20rpx 20rpx 20rpx 20rpx;position: relative;overflow: hidden;">
                     <view class="top-salary">
@@ -35,9 +36,15 @@
                             <dict-Label dictType="education" :value="jobInfo.education"></dict-Label>
                         </view>
                     </view>
-                        <view class="position-source">
+                        <!-- <view class="position-source">
                             <text>来源&nbsp;</text>
                             {{ jobInfo.dataSource }}
+                        </view> -->
+                        <view class="position-source">
+                            <view class="btn">
+                                <image src="@/static/icon/collect3.png" v-if="jobInfo.isCollection!==0" @click="jobCollection"></image>
+                                <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
+                            </view>
                         </view>
                         <view class="publish-time" v-if="jobInfo.postingDate">
                             {{ formatPublishTime(jobInfo.postingDate) }}
@@ -179,7 +186,7 @@
         <view style="height: 34px"></view>
         <template #footer>
             <view class="footer">
-                <view class="btn-wq button-click" @click="jobApply">立即前往</view>
+                <view class="btn-wq button-click" @click="jobApply">投递简历</view>
             </view>
         </template>
         <VideoPlayer ref="videoPalyerRef" />
@@ -400,17 +407,23 @@ function getCompetivetuveness(jobId) {
 // 申请岗位
 function jobApply() {
     const jobId = jobInfo.value.jobId;
-    if (jobInfo.value.isApply) {
-        const jobUrl = jobInfo.value.jobUrl;
-        return window.open(jobUrl);
-    } else {
-        $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+    $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
             getDetail(jobId);
             $api.msg('申请成功');
             const jobUrl = jobInfo.value.jobUrl;
-            return window.open(jobUrl);
+            // return window.open(jobUrl);
         });
-    }
+    // if (jobInfo.value.isApply) {
+    //     const jobUrl = jobInfo.value.jobUrl;
+    //     return window.open(jobUrl);
+    // } else {
+    //     $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+    //         getDetail(jobId);
+    //         $api.msg('申请成功');
+    //         const jobUrl = jobInfo.value.jobUrl;
+    //         return window.open(jobUrl);
+    //     });
+    // }
 }
 
 // 取消/收藏岗位
@@ -650,7 +663,7 @@ for i in 0..100
             top: 0
             right: 0
             width: fit-content;
-            height: 76rpx;
+            height: 65rpx;
             padding: 0 24rpx
             background: rgba(37,107,250,0.1);
             box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
@@ -742,6 +755,7 @@ for i in 0..100
     bottom: 0;
     width: 100%;
     padding: 20rpx 0!important
+    z-index: 1000;
     .btn-wq{
         display: block;
         width: 94%;

packageCa/apiCa/job.js

@@ -2,11 +2,11 @@ import request from '@/packageCa/utilCa/request.js'
 
 const api = {}
 // 获取职业大类 中类 
-api.queryJobDictionaryListByParentCode = (code) => request.globalRequest(`/Job/QueryJobDictionaryListByParentCode?code=${code}`,'GET', {}, 1,3)
+api.queryJobDictionaryListByParentCode = (code) => request.globalRequest(`/Job/QueryJobDictionaryListByParentCode?code=${code}`,'GET', {}, 1)
 // 搜索
-api.queryJobListByParentCode = (name,code) => request.globalRequest(`/Job/QueryJobListByParentCode?name=${name}&code=${code}`,'GET', {}, 1,3)
+api.queryJobListByParentCode = (name,code) => request.globalRequest(`/Job/QueryJobListByParentCode?name=${name}&code=${code}`,'GET', {}, 1)
 // 职业详情
-api.queryJobDetailById = (id) => request.globalRequest(`/Job/QueryJobDetailById?id=${id}`,'GET', {}, 2,3)
+api.queryJobDetailById = (id) => request.globalRequest(`/Job/QueryCeremonyDetail?id=${id}`,'GET', {}, 2)
 
 export default api
 

packageCa/apiCa/studentProfile.js

@@ -2,31 +2,32 @@ import request from '@/packageCa/utilCa/request.js'
 
 const api = {}
 // 获取生涯罗盘
-api.getCareerCompassList = (name) => request.globalRequest(`/StudentProfile/GetCareerCompassList`,'GET', {}, 1)
+api.getCareerCompassList = (name) => request.globalRequest(`/GXCareerPlan/GetGXWechatCoursePlanList`,'GET', {})
 // 保存生涯罗盘--职业方向
-api.saveGXCareerPlan = (jobId) => request.globalRequest(`/StudentProfile/SaveGXCareerPlan?jobId=${jobId}`,'POST', {}, 1)
+api.saveGXCareerPlan = (jobId) => request.globalRequest(`/GXCareerPlan/SaveGXCareerPlan?jobId=${jobId}`,'POST', {})
 // 生涯罗盘--获取职业规划
-api.getGXCareerPlanList = (keyword,page,ps) => request.globalRequest(`/StudentProfile/GetGXCareerPlanList?keyword=${keyword}&page=${page}&ps=${ps}`,'GET', {}, 1)
+api.getGXCareerPlanList = (keyword,page,ps) => request.globalRequest(`/GXCareerPlan/GetGXCareerPlanList?keyword=${keyword}&page=${page}&ps=${ps}`,'GET', {})
 
 // smart目标制定：获取学习目标
-api.querySmartTargets = () => request.globalRequest(`/StudentProfile/QuerySmartTargets`,'GET', {}, 1)
+api.querySmartTargets = () => request.globalRequest(`/GXStudent/QuerySmartTargets`,'GET', {})
 // smart目标制定：获取单个目标
-api.querySmartInfo = (encodeId) => request.globalRequest(`/StudentProfile/QuerySmartInfo?encodeId=${encodeId}`,'GET', {}, 1)
+api.querySmartInfo = (encodeId) => request.globalRequest(`/GXStudent/QuerySmartInfo?encodeId=${encodeId}`,'GET', {})
 // smart目标制定：保存smart目标
-api.saveSmartTarget = (data) => request.globalRequest(`/StudentProfile/SaveSmartTarget`,'POST', data, 1)
+api.saveSmartTarget = (data) => request.globalRequest(`/GXStudent/SaveSmartTargetNew`,'POST', data)
 // smart目标制定：删除Smart目标
-api.deleteSmartTarg = (encodeId) => request.globalRequest(`/StudentProfile/DeleteSmartTarg?encodeId=${encodeId}`,'POST', {}, 1)
+api.deleteSmartTarg = (encodeId) => request.globalRequest(`/GXStudent/DeleteSmartTarg?encodeId=${encodeId}`,'POST', {})
 // smart目标制定：获取年度计划
-api.queryPlanList = (encodeId) => request.globalRequest(`/StudentProfile/QueryPlanList?encodeId=${encodeId}`,'GET', {}, 1)
+api.queryPlanList = (encodeId) => request.globalRequest(`/GXStudent/QueryPlanList?encodeId=${encodeId}`,'GET', {})
 // smart目标制定：保存年度计划
-api.savePlanList = (data) => request.globalRequest(`/StudentProfile/SavePlanList`,'POST', data, 1)
+api.savePlanList = (data) => request.globalRequest(`/GXStudent/SavePlanListNew`,'POST', data)
+
 // 获取生涯档案（高校
-api.getGXWechatStudentProfile = () => request.globalRequest(`/StudentProfile/GetGXWechatStudentProfile`,'GET', {}, 1)
+api.getGXWechatStudentProfile = () => request.globalRequest(`/GXStudentProfile/GetGXStudentProfile`,'GET', {})
 
 //获取职业路径职业列表 
-api.queryCareerPath = () => request.globalRequest(`/StudentManage/QueryCareerPath`,'POST', {}, 1)
+api.queryCareerPath = () => request.globalRequest(`/GXStudent/QueryCareerPath`,'POST', {})
 // 获取职业详情，参数encodeId 加密id
-api.queryPathInfo = (encodeId) => request.globalRequest(`/StudentManage/QueryPathInfo?encodeId=${encodeId}`,'POST', {}, 1)
+api.queryPathInfo = (encodeId) => request.globalRequest(`/GXStudent/QueryPathInfo?encodeId=${encodeId}`,'POST', {})
 
 
 export default api

packageCa/apiCa/testManage.js

@@ -2,124 +2,52 @@ import request from '@/packageCa/utilCa/request.js'
 
 const api = {}
 
-// 检查综合解释是否完成
-api.checkUnionTest = () => request.globalRequest(`/TaskManage/CheckUnionTest`,'GET', {}, 2,5)
-api.queryUnionTestResult = () => request.globalRequest(`/Test/QueryUnionTestResult`,'GET', {}, 2,5)
-
 // 测评列表
-api.queryTaskListForWeChart = (eduLevel) => request.globalRequest(`/TaskManage/QueryTaskListForWeChart?eduLevel=${eduLevel}`,'GET', {}, 2,5)
+api.queryTaskListForWeChart = () => request.globalRequest(`/TestRecordProcess/GetTestTypeList`,'GET', {})
 // 获取测评题目
-api.queryTestContent = (type) => request.globalRequest(`/TaskManage/QueryTestContent?type=${type}`,'GET', {}, 2,5)
+api.queryTestContent = (type) => request.globalRequest(`/TestManage/QueryTestContent?type=${type}`,'GET', {})
 
-// 保存学科信心测评结果
-api.saveSubjectTest = (testStr) => request.globalRequest(`/TaskManage/SaveSubjectTest?testStr=${testStr}`,'POST', "", 2,5)
-// 保存自我评估
-api.saveStudentSscoreResult = (data) => request.globalRequest(`/Test/SaveStudentSscoreResult`,'POST', data, 2,5)
-// 保存MBTI
-api.saveMBTITest = (data) => request.globalRequest(`/TaskManage/SaveMBTITest`,'POST', data, 2,5)
 // 保存工作价值
-api.saveWorkValuesResult = (data) => request.globalRequest(`/TaskManage/SaveWorkValuesResult`,'POST', data, 2,5)
-// 保存多元智能
-api.saveMultipleIntelligenceResult = (data) => request.globalRequest(`/TaskManage/SaveMultipleIntelligenceResult`,'POST', data, 2,5)
+api.saveWorkValuesResult = (data) => request.globalRequest(`/TestManagenew/SaveWorkValuesResultNew`,'POST', data)
 // 保存人格测评
-api.saveCharacterTestResult = (data) => request.globalRequest(`/TaskManage/SaveCharacterTestResult`,'POST', data, 2,5)
+api.saveCharacterTestResult = (data) => request.globalRequest(`/TestManagenew/SavePersonTestNew`,'POST', data)
 // 保存兴趣测评
-api.saveInterestTestResult = (data) => request.globalRequest(`/TaskManage/SaveInterestTestResult`,'POST', data, 2,5)
-// 保存初中测评结果
-api.querySaveTestRecord = (data) => request.globalRequest(`/ResearchStudy/QuerySaveTestRecord`,'POST', data, 1)
-// 保存简易测评
-api.saveCustomerTestResult = (data) => request.globalRequest(`/TaskManage/SaveCustomerTestResult`,'POST', data, 2,5)
+api.saveInterestTestResult = (data) => request.globalRequest(`/TestManagenew/SaveInterestTestNew`,'POST', data)
 //保存测评结果(通用能力，多元能力，领导力) 
-api.saveCustomTestResult = (data) => request.globalRequest(`/TaskManage/SaveCustomTestResult`,'POST', data, 2,5)
-//保存结果(学习力相关测评(文本类)，图形类(-45：推理能力测评，),(生涯构建)(生涯适应力)) 
-api.saveStudyCustomTestResult = (data) => request.globalRequest(`/TestManage/SaveStudyCustomTestResult`,'POST', data, 1,0)
-//保存结果(学习力:图形类：22：注意力测评，23：记忆力测评，25：场独立-场依存认知风格测评)
-api.saveStudyGraphic_TestResult = (data) => request.globalRequest(`/TestManage/SaveStudyGraphic_TestResult`,'POST', data, 1,0)
-//保存结果(学习力:图形类：沉思型-冲动型认知风格测评，
-api.saveStudyGraphic_DependencyResult = (data) => request.globalRequest(`/TestManage/SaveStudyGraphic_DependencyResult`,'POST', data, 1,0)
+api.saveCustomTestResult = (data) => request.globalRequest(`/TestManagenew/SaveCustomTestResultNew`,'POST', data)
 
-
-// 获取自我评估结果
-api.querySubjectScoreResult = () => request.globalRequest(`/TaskManage/QuerySubjectScoreResult`,'GET', {}, 2,5)
 // 获取兴趣测评结果
-api.queryInterestTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryInterestTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-// 获取学科信心结果
-api.querySubjectResult = (year,term,recordId) => request.globalRequest(`/TestManage/QuerySubjectResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {},1)
-// 获取MBTI结果
-api.queryMBTIResult = (year,term,recordId)=> request.globalRequest(`/TestManage/QueryMBTIResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-// 获取多元智能结果
-api.multipleIntelligenceResult = (year,term,recordId) => request.globalRequest(`/TestManage/MultipleIntelligenceResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
+api.queryInterestTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryInterestTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 // 获取工作价值结果
-api.workValuesResult = (year,term,recordId) => request.globalRequest(`/TestManage/WorkValuesResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
+api.workValuesResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryWorkValuesResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 // 获取人格测评结果
-api.personalityTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/PersonalityTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {},1)
-// 获取初中兴趣题目
-api.getTestTitle = (testtype) => request.globalRequest(`/ResearchStudy/GetTestTitle?testtype=${testtype}`,'GET', {}, 1)
-// 获取初中测评结果
-api.queryJuniorTestRecord = (year,term,recordId) => request.globalRequest(`/ResearchStudy/QueryJuniorTestRecord?year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-// 获取简易测评
-api.queryCustomerTestTite = (testtype) => request.globalRequest(`/TaskManage/QueryTestContent?type=${testtype}`,'GET', {}, 2,5)
-// 获取简易测评报告
-api.queryPrimaryInterestResult = () => request.globalRequest(`/TaskManage/QueryPrimaryInterestResult`,'GET', {}, 2,5)
-// 获取多元智能结果（简版）
-api.multipleIntelligenceSimpleResult = () => request.globalRequest(`/Test/MultipleIntelligenceSimpleResult`,'GET', {}, 2,5)
+api.personalityTestResult = (year,term,recordId) => request.globalRequest(`/TestManage/QueryPersonalityTestResult?year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 // 获取测评结果(通用能力，多元能力，领导力) 
-api.queryCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/QueryCustomTestResult?type=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1)
-//获取测评结果(生涯构建和学习力相关测评)
-api.getStudyCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/GetStudyCustomTestResult?testType=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1,0)
-//获取结果时间维度对比(生涯构建和学习力相关测评)
-api.getStudyTimeGroupTestResult = (testType,userId,year,term,recordId) => request.globalRequest(`/TestManage/GetStudyTimeGroupTestResult?testType=${testType}&userId=${userId}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {}, 1,0)
-//小程序获取时间维度接口(所有生涯测评)
-api.getCareerYearAndTermList = (testType) => request.globalRequest(`/TestManage/GetCareerYearAndTermList?testType=${testType}`,'GET', {}, 1,0)
+api.queryCustomTestResult = (testType,year,term,recordId) => request.globalRequest(`/TestManage/QueryCustomTestResult?type=${testType}&year=${year}&term=${term}&recordId=${recordId}`,'GET', {})
 
+//小程序获取时间维度接口(所有生涯测评)
+api.getCareerYearAndTermList = (testType) => request.globalRequest(`/TestManage/GetCareerYearAndTermList?testType=${testType}`,'GET', {})
 
 //兴趣测评对比数据
-api.getInterestTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetInterestTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getInterestTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetInterestTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 //人格测评对比数据
-api.getPersonTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetPersonTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//多元智能测评对比数据
-api.getMultipleTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getPersonTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetPersonTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 //工作价值观测评对比数据
-api.getWorkValuesTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetWorkValuesTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//MBTI测评对比数据
-api.getMBTITestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMBTITestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-
-//学科信心测评对比数据
-api.getSubjectTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetSubjectTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-
-//SCL-90对比/领导力数据
-api.getCustomTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,typeId,userId,recordId) => request.globalRequest(`/TestManage/GetCustomTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&typeId=${typeId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getWorkValuesTestGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetWorkValuesTestGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 
 //多元能力测评对比数据
-api.getMultipleAbilityGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleAbilityGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getMultipleAbilityGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetMultipleAbilityGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 
 //通用职业能力测评对比数据
-api.getBeCurrentJobGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetBeCurrentJobGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-
-//获取学习力测评(文本类)群体维度对比数据,(生涯构建)
-api.getStudyTestGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetStudyTestGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//记忆力测评群体维度对比数据
-api.getLearningMemoryGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningMemoryGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//场独立-场依存认知风格测评群体维度对比数据
-api.getLearningUniqueGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningUniqueGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//沉思型-冲动型认知风格测评群体维度对比数据
-api.getLearningDependencyGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetLearningDependencyGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
-//学习力（图形类）测评群体维度对比数据(22：注意力测评，-45：推理能力测评)
-api.getGraphic_TestGroupResult = (typeId,year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetGraphic_TestGroupResult?typeId=${typeId}&year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {}, 1,0)
+api.getBeCurrentJobGroupResult = (year,term,schoolId,gradeId,classId,sex,departId,userId,recordId) => request.globalRequest(`/TestManage/GetBeCurrentJobGroupResult?year=${year}&term=${term}&schoolId=${schoolId}&gradeid=${gradeId}&classid=${classId}&sex=${sex}&departId=${departId}&userId=${userId}&recordId=${recordId}`,'GET', {})
 //获取测评分类标签
-api.getTestTypeTagLIst = () => request.globalRequest(`/TestManage/GetTestTypeTagLIst`,'GET', {}, 1)
+api.getTestTypeTagLIst = () => request.globalRequest(`/TestRecordProcess/GetTestTypeList`,'GET', {})
 
 //获取测评报告日期列表
-api.getCareerYearAndTermListNew = (testType,userId) => request.globalRequest(`/TestManage/GetCareerYearAndTermListNew?testType=${testType}&userId=${userId}`,'GET', {}, 1)
+api.getCareerYearAndTermListNew = (testType,userId) => request.globalRequest(`/TestManage/GetCareerYearAndTermListNew?testType=${testType}&userId=${userId}`,'GET', {})
 
 // 保存测评答题过程记录
-api.saveTestRecordProcess = (data) => request.globalRequest(`/TestRecordProcess/SaveTestRecordProcess`,'POST', data, 1)
-//获取测评答题记录
-api.getTestRecordProcessList = (testType) => request.globalRequest(`/TestRecordProcess/GetTestRecordProcessList?testType=${testType}`,'GET', {}, 1)
-// 删除测评数据
-api.removeTestRecordProcess = (testType) => request.globalRequest(`/TestRecordProcess/RemoveTestRecordProcess?testType=${testType}`,'POST', {}, 1)
-// 获取测评列表答题记录状态
-api.getUserTestTypeProcessList = (testTypes) => request.globalRequest(`/TestRecordProcess/GetUserTestTypeProcessList?testTypes=${testTypes}`,'GET', {}, 1)
+api.saveTestRecordProcess = (data) => request.globalRequest(`/TestRecordProcess/SaveTestRecordProcess`,'POST', data)
 
 
 export default api

packageCa/apiCa/user.js

@@ -3,79 +3,14 @@ import request from '@/packageCa/utilCa/request.js'
 const api = {}
 
 //根据openId,获取token,并判断用户是否已绑定账号
-api.queryKaShiToken = (userId,name) => request.globalRequest(`/KaShi/QueryKaShiToken?userId=${userId}&name=${name}&schoolId=2268`,'GET', {})
+api.queryKaShiToken = (idCard,name) => request.globalRequest(`/Home/QueryKaShiToken?userIdNO=${idCard}&name=${name}&schoolId=2371`,'GET', {})
 // 获取ai面试路径
-api.queryAIUrl = (userId,name) => request.globalRequest(`/KaShi/QueryAIUrl?userId=${userId}&name=${name}&schoolId=2268`,'GET', {})
-
-//根据openId,获取token,并判断用户是否已绑定账号
-api.getAccessTokenAndUser = (params) => request.globalRequest(`/WeChartToken/GetAccessTokenAndUser?openId=${params}`,'GET', {})
-
-//获取用户token 生涯平台token
-api.queryWechartToken = (userId,schoolId,userType) => request.globalRequest(`/Auth/QueryWechartToken?userId=${userId}&schoolId=${schoolId}&userType=${userType}`,'GET', {},1,4)
-// 获取openid
-api.getOpenId = (params) => request.globalRequest(`/WishOrder/GetOpenId?code=${params}`,'GET', {}, "")
-
-// 微信支付
-api.createWeiXinOrder = (data) => request.globalRequest(`/TenpayOrder/CreateWeiXinOrder`, 'POST', data)
-
-// 用户绑定登录
-api.userBindLogin = (data) => request.globalRequest(`/user/UserBindLogin`, 'POST', data)
-//用户解绑账号或切换账号（有返回User, Token话,前端重新绑定到header上）
-api.userUnBindOrChangeCodeNumber = (userId,type) => request.globalRequest(`/user/UserUnBindOrChangeCodeNumber?userId=${userId}&type=${type}`,'GET', {}, 1)
-//获取当前微信用户已绑定的账号列表
-api.getUserCodeNumber = () => request.globalRequest(`/user/GetUserCodeNumber`,'GET', {}, 1)
-//根据学号获取学校列表
-api.getSchoolByCodeNumber = (params) => request.globalRequest(`/user/GetSchoolByCodeNumber?codeNumber=${params}`,'GET', {}, 1)
-
-// 判断学生是否完成生涯成熟度问卷, taskId大于0，需要进行问卷，taskId 等于0，不需要问卷
-// api.getQuestionnaireTitlePower = () => request.globalRequest(`/CareerMaturityTask/GetQuestionnaireTitlePower`,'GET', {}, 1)
-// 获取生涯成熟度题目
-// api.getTestTitleListList = () => request.globalRequest(`/CareerMaturityTask/GetTestTitleListList`,'GET', {}, 1)
-// 保存生涯成熟度测评结果
-// api.saveCareerMaturityTestResult = (data) => request.globalRequest(`/CareerMaturityTask/SaveCareerMaturityTestResult`, 'POST', data, 1)
-
-// 获取手机验证码
-api.getMobileCode = (mobile) => request.globalRequest(`/WeChartUser/GetMobileCode?mobile=${mobile}&token=SQEIfNmlFufmOMNVPZCvNVWpDeldYjH`,'GET', {}, 1)
-// 提交手机注册
-api.checkSmsCode = (data) => request.globalRequest(`/user/CheckSmsCode`, 'POST', data, 1)
+api.queryAIUrl = (idCard,name) => request.globalRequest(`/Home/QueryAIUrl?userIdNO=${idCard}&name=${name}&schoolId=2371`,'GET', {})
 
 // 获取个人档案
-api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {}, 2,4)
-// 添加，取消个人意向
-api.doIntention = (type,id,actionType) => request.globalRequest(`/StudentResource/DoIntention?type=${type}&actionType=${actionType}&id=${id}`,'GET', {}, 2,4)
-//绑vip卡
-api.bindCard = (data) => request.globalRequest(`/user/BindCard`,'POST', data, 1)
+api.queryStudentProfile = () => request.globalRequest(`/StudentResource/QueryStudentProfile`,'GET', {})
 
-// 一体机激活 绑定 获取列表
-api.queryMachineOrderCountList = (machineNumber) => request.globalRequest(`/Onemachine/QueryMachineOrderCountList?machineNumber=${machineNumber}`,'GET', {}, 1)
-// 绑定设备
-api.activityMachine = (data) => request.globalRequest(`/Onemachine/ActivityMachine`,'POST', data, 1)
-// 解绑
-api.removeMachine = (orderId,machineModelId,machineNumber) => request.globalRequest(`/Onemachine/RemoveMachine?orderId=${orderId}&machineModelId=${machineModelId}&machineNumber=${machineNumber}`,'POST', {}, 1)
 
-// ai咨询问题
-api.aISearch = (keyword,sessionId) => request.globalRequest(`/AIAgents/search?keyword=${keyword}&sessionId=${sessionId}`,'GET', {}, 1)
-// ai获取历史咨询
-api.aIGetHistoryRecord = (page) => request.globalRequest(`/AIAgents/GetHistoryRecord?page=${page}&pageSize=20`,'GET', {}, 1)
-
-// 保存人脸图片
-api.queryUploadPhoto = (address) => request.globalRequest(`/user/QueryUploadPhoto?address=${address}`,'GET', {}, 1)
-
-// 保存操作日志
-api.saveUserOperationLog = (data) => request.globalRequest(`/UserOperationLog/SaveUserOperationLog`,'POST', data, 3)
-	
-// 获取操作日志
-api.getUserOperationLogList = (pageIndex,pageSize,keyword,operationType) => request.globalRequest(`/UserOperationLog/GetUserOperationLogList?pageIndex=${pageIndex}&pageSize=${pageSize}&keyword=${keyword}&operationType=${operationType}`,'GET', {}, 1)	
-// 设备登录
-api.loginOneMachine = (machineNo) => request.globalRequest(`/user/LoginOneMachine?machineNo=${machineNo}`,'POST', {}, 1)
-// 获取系统菜单权限
-api.querySchoolMenu = () => request.globalRequest(`/user/QuerySchoolMenu`,'GET', {}, 1)
-
-// 保存高校个人信息
-api.saveUserBasisInfo = (mobileCode,data) => request.globalRequest(`/user/SaveUserBasisInfo?mobileCode=${mobileCode}`,'POST', data, 1)
-
-// 获取高校个人信息
-api.getUserBasisInfo = () => request.globalRequest(`/user/GetUserBasisInfo`,'GET', {}, 1)
 export default api
 
 

packageCa/job/details.vue

@@ -3,125 +3,80 @@
 		<view class="content">
 			<view class="head">
 				<view class="h3">
-					{{jobDetailData.Name}}
+					{{jonInfo.Name}}
 				</view>
-				<view class="h2">所属大类：<text>{{jobDetailData.BigCategoryName}}</text></view>
-				<view class="h2">所属中类：<text>{{jobDetailData.MidCategoryName}}</text></view>
-				<view class="h2">所属小类：<text>{{jobDetailData.SmallCategoryName}}</text></view>
-				<view class="intention-btn" v-if="jobDetailData.ShowIntention" v-text="jobDetailData.IsIntention?'取消意向':'加入意向'" @click="changeIntention"></view>
+				<view class="h2">所属大类：<text>{{bigType}}</text></view>
+				<view class="h2">所属中类：<text>{{midType}}</text></view>
+				<view class="h2">所属小类：<text>{{smallType}}</text></view>
 			</view>
 			<view class="txt-content">
-				<view class="article-item" v-if="jobDetailData.VideoUrl">
+				<view class="article-item" v-if="jonInfo.VideoUrl">
 					<text class="h4">职业新说：</text>
-					<video :src="jobDetailData.VideoUrl"></video>
+					<video :src="jonInfo.VideoUrl"></video>
 				</view>
-				<view class="article-item" v-if="jobDetailData.TopIntroduction">
+				<view class="article-item" v-if="jonInfo.TopIntroduction">
 					<text class="h4">职业说明：</text>
-					<view class="article-content" v-html="jobDetailData.TopIntroduction"></view>
+					<view class="article-content" v-html="jonInfo.TopIntroduction"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.TopWorkContent">
+				<view class="article-item" v-if="jonInfo.TopWorkContent">
 					<text class="h4">工作内容：</text>
-					<view class="article-content" v-html="jobDetailData.TopWorkContent"></view>
+					<view class="article-content" v-html="jonInfo.TopWorkContent"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.QualityRequirements">
+				<view class="article-item" v-if="jonInfo.QualityRequirements">
 					<text class="h4">从业要求：</text>
-					<view class="article-content" v-html="jobDetailData.QualityRequirements"></view>
+					<view class="article-content" v-html="jonInfo.QualityRequirements"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.AbilityRequirements">
+				<view class="article-item" v-if="jonInfo.AbilityRequirements">
 					<text class="h4">能力要求：</text>
-					<view class="article-content" v-html="jobDetailData.AbilityRequirements"></view>
+					<view class="article-content" v-html="jonInfo.AbilityRequirements"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.SalaryStr">
+				<view class="article-item" v-if="jonInfo.SalaryStr">
 					<text class="h4">薪资范围：</text>
-					<view class="article-content" v-html="jobDetailData.SalaryStr"></view>
+					<view class="article-content" v-html="jonInfo.SalaryStr"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.CareerProspects">
+				<view class="article-item" v-if="jonInfo.CareerProspects">
 					<text class="h4">就业前景：</text>
-					<view class="article-content" v-html="jobDetailData.CareerProspects"></view>
+					<view class="article-content" v-html="jonInfo.CareerProspects"></view>
 				</view>
-				<view class="article-item" v-if="listOne.length > 0">
+				<view class="article-item" v-if="jonInfo.JobSkill">
 					<text class="h4">职业技能：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listOne" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobSkill"></view>
 				</view>
-				<view class="article-item" v-if="listTwo.length > 0">
+				<view class="article-item" v-if="jonInfo.JobAbility">
 					<text class="h4">职业能力：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listTwo" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobAbility"></view>
 				</view>
-				<view class="article-item" v-if="listThree.length > 0">
+				<view class="article-item" v-if="jonInfo.JobKnowledge">
 					<text class="h4">具备知识：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listThree" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobKnowledge"></view>
 				</view>
-				<view class="article-item" v-if="listFour.length > 0">
+				<view class="article-item" v-if="jonInfo.JobRequire">
 					<text class="h4">职业素养：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listFour" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobRequire"></view>
 				</view>
-				<view class="article-item" v-if="listFive.length > 0">
+				
+				<view class="article-item" v-if="jonInfo.JobActivity">
 					<text class="h4">职业活动：</text>
-					<view class="attr-wrap">
-						<view class="row" v-for="(item,index) in listFive" :key="index">
-							<view class="name">
-								<text class="label">{{index + 1}}</text>{{item.Name}}
-							</view>
-							<view class="desc">
-								{{item.Explain}}
-							</view>
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.JobActivity"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.DevelopmentPath">
+				<view class="article-item" v-if="jonInfo.JobPath">
 					<text class="h4">发展路径：</text>
-					<view class="article-content" v-html="jobDetailData.DevelopmentPath"></view>
+					<view class="article-content" v-html="jonInfo.JobPath"></view>
 				</view>
-				<view class="article-item" v-if="jobDetailData.SpecialtyList != null && jobDetailData.SpecialtyList.length > 0">
+				<view class="article-item" v-if="jonInfo.TopWorkContent">
 					<text class="h4">推荐专业：</text>
-					<view class="sp-wrap">
-						<view  class="item" v-for="(item,index) in jobDetailData.SpecialtyList":key="index">
-							{{item.Name}}
-						</view>
-					</view>
+					<view class="article-content" v-html="jonInfo.TopWorkContent"></view>
+				</view>
+				<view class="article-item" v-if="jonInfo.SalaryStr">
+					<text class="h4">薪资范围：</text>
+					<view class="article-content" v-html="jonInfo.SalaryStr"></view>
+				</view>
+				<view class="article-item" v-if="jonInfo.CareerProspects">
+					<text class="h4">就业前景：</text>
+					<view class="article-content" v-html="jonInfo.CareerProspects"></view>
 				</view>
 			</view>
 		</view>
-		<view class="fiexd-visitor" v-if="isVisitor">
-			<navigator class="btn" url="/pagesUserInfo/binding/binding?routeType=6">请先登录</navigator>
-		</view>
-		<!-- <u-modal :show="showLogin" content='观看完整内容,请先登录' width='500rpx' @confirm="showLogin=false"></u-modal> -->
 	</view>
 </template>
 
@@ -135,21 +90,27 @@ import api1 from "@/packageCa/apiCa/user.js"
 				isVisitor: false, //游客
 				user: uni.getStorageSync("CAuserInfo").user,
 				id: 0,
-				jobDetailData: {
-					Name: "",
-					BigCategoryName: "",
-					MidCategoryName: "",
-					SmallCategoryName: "",
-					VideoUrl: "",
-					TopIntroduction: "",
-					TopWorkContent: "",
-					QualityRequirements: "",
-				},
-				listOne: [],//职业技能
-				listTwo: [],//职业能力
-				listThree: [],//具备知识
-				listFour: [],//职业素养
-				listFive: [],//职业活动
+				// jonInfo: {
+				// 	Name: "",
+				// 	BigCategoryName: "",
+				// 	MidCategoryName: "",
+				// 	SmallCategoryName: "",
+				// 	VideoUrl: "",
+				// 	TopIntroduction: "",
+				// 	TopWorkContent: "",
+				// 	QualityRequirements: "",
+				// },
+				// listOne: [],//职业技能
+				// listTwo: [],//职业能力
+				// listThree: [],//具备知识
+				// listFour: [],//职业素养
+				// listFive: [],//职业活动
+				
+				jonInfo: {},
+				isIntention: "",
+				bigType: "",
+				midType: "",
+				smallType: "",
 			}
 		},
 		onLoad(e) {
@@ -162,23 +123,15 @@ import api1 from "@/packageCa/apiCa/user.js"
 			this.queryJobDetailById();
 		},
 		methods: {
-			showConfirmInfor(){
-				uni.showModal({
-					content:"观看完整内容,请先登录",
-					confirmText:"确认",
-					confirmColor:"#1677ff",
-					showCancel:false
-				})		
-			},			
 			changeIntention(){
 				uni.showLoading({
 					title: "加载中"
 				})
-				let isIntention = this.jobDetailData.IsIntention;
+				let isIntention = this.jonInfo.IsIntention;
 				api1.doIntention(2,this.id,isIntention?1:0).then((res)=>{
 					uni.hideLoading();
 					if(res.Result == 1){
-						this.jobDetailData.IsIntention = !this.jobDetailData.IsIntention;
+						this.jonInfo.IsIntention = !this.jonInfo.IsIntention;
 					}
 				})
 			},
@@ -190,44 +143,11 @@ import api1 from "@/packageCa/apiCa/user.js"
 				api.queryJobDetailById(this.id).then((res) => {
 					uni.hideLoading();
 					if(res.Result == 1){
-						this.jobDetailData = res.Data;
-						let attList  = res.Data.AttList;
-						if(attList != null){
-							let  listOne = [],//职业技能
-								listTwo = [],//职业能力
-								listThree = [],//具备知识
-								listFour = [],//职业素养
-								listFive = [];//职业活动
-							attList.forEach(item => {
-								switch(item.Identify){
-									case 1 :{
-										listOne.push(item);
-										break;
-									}
-									case 2 :{
-										listTwo.push(item);
-										break;
-									}
-									case 3 :{
-										listThree.push(item);
-										break;
-									}
-									case 5 :{
-										listFour.push(item);
-										break;
-									}
-									case 6 :{
-										listFive.push(item);
-										break;
-									}
-								}
-							});
-							this.listOne = listOne;
-							this.listTwo = listTwo;
-							this.listThree = listThree;
-							this.listFour = listFour;
-							this.listFive = listFive;
-						}
+						  this.jonInfo = res.Data.info;
+						  this.isIntention = res.Data.exit;
+						  this.bigType = res.Data.parent3
+						  this.midType = res.Data.parent2
+						  this.smallType = res.Data.parent1
 					}
 				})
 			},

packageCa/job/index.vue

@@ -37,17 +37,6 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="fiexd-visitor" v-if="isVisitor">
-			<navigator class="btn" url="/packageB/pagesUserInfo/binding/binding?routeType=6">请先登录</navigator>
-		</view>
-<!-- 		<u-modal :show="showTip" @confirm="showTip=false" @cancel="showTip=false" confirmText="我明白了">
-			<view class="slot-content">
-				<view class="tip-layer">
-					<view class="title">{{layerTitile}}</view>
-					<view class="desc" v-html="layerDesc"></view>
-			  </view>
-			</view>
-		</u-modal> -->
 	</view>
 </template>
 
@@ -59,7 +48,6 @@
 			return {
 				kw: "", //搜索关键
 				user: uni.getStorageSync("CAuserInfo").user,
-				isVisitor: false, //游客
 				barHeight: wx.getWindowInfo().statusBarHeight,
 				winHeight: wx.getWindowInfo().windowHeight,
 				jobDataList: [],
@@ -81,10 +69,8 @@
 		},
 		onLoad(e) {
 			if(this.user == undefined || this.user == null){
-				this.isVisitor = true;
 				this.loginHeight=99;
 			}else {
-				this.isVisitor = false;
 				this.loginHeight=0;
 			}
 			this.scrollRightTop = 1;

packageCa/job/smallList.vue

@@ -75,7 +75,7 @@
 					//this.showLogin = true;
 				}else {
 					uni.navigateTo({
-						url: `/packageCa/job/details?id=${item.Id}&name=${item.Name}`
+						url: `/packageCa/job/details?id=${item.EnCodeId}&name=${item.Name}`
 					})
 				}
 			},

packageCa/pagesTest/customTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-    <view class="title-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" v-if="taskId ==0" @click="goback"></view>
-            <text v-if="testTitle != ''">{{testTitle}}</text>
-        </view>
+    <view class="title-wrap" style="padding-top: 40rpx;">
         <view class="progress-block">
             <view class="row">
                 <view class="title-index">
@@ -104,7 +100,7 @@
                 this.taskId = e.taskId 
             }
              this.computeTitle(this.testType);
-            this.getHistoryTitle();
+			 this.getTitle();
         },
         methods: {
             // 返回
@@ -141,16 +137,6 @@
                     }
                 }
             },
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(this.testType).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
             // 获取题目
             getTitle() {
                 uni.showLoading({
@@ -162,45 +148,7 @@
                         let list = res.Data.List.Item1;
                         list.forEach(item => {
                             item.Value = "";
-							this.historyTitle.forEach(ritem=>{
-								if(item.Id == ritem.TestTitleId){
-									switch (ritem.TestResult) {
-									    case "A": {
-											item.Value = 1;
-									        break;
-									    }
-									    case "B": {
-									        item.Value = 2;
-									        break;
-									    }
-									    case "C": {
-									       item.Value = 3;
-									        break;
-									    }
-									    case "D": {
-									        item.Value = 4;
-									        break;
-									    }
-									    case "E": {
-									        item.Value = 5;
-									        break;
-									    }
-									    case "F": {
-									        item.Value = 6;
-									        break;
-									    }
-									}
-								}
-							})
                         })
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
-						
                         this.allNum = list.length;
                         this.list = list;
 						this.testTitle = res.Data.List.Item2;
@@ -225,54 +173,14 @@
                     console.log('单击事件被触发');
                     this.lastTapTime = now;
                     this.list[INDEX].Value = NUM;
-					this.saveTestRecordProcess(this.list[INDEX].Id,NUM);
                     setTimeout(() => {
-                        if (this.pageIndex != this.list.length - 1) {
-                            this.pageIndex = INDEX + 1;
-                        }
+                       if(this.pageIndex != this.list.length - 1){
+						   this.pageIndex = INDEX + 1;
+                       }
                     }, 300)
                 }
             },
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let val = ""
-				switch (VALUE) {
-				    case 1: {
-						val = "A";
-				        break;
-				    }
-				    case 2: {
-				        val = "B";
-				        break;
-				    }
-				    case 3: {
-				       val = "C";
-				        break;
-				    }
-				    case 4: {
-				        val = "D";
-				        break;
-				    }
-				    case 5: {
-				        val = "E";
-				        break;
-				    }
-				    case 6: {
-				        val = "F";
-				        break;
-				    }
-				}
-				let data = {
-					testType: this.testType,
-					testTitleId: ID,
-					testResult: val
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
-            // 提交题目
+			 // 提交题目
             submitTitle() {
                 let testStr = "";
                 this.list.forEach(item => {
@@ -308,42 +216,41 @@
                     title: "提交中"
                 })
                 let data = {
-                    testType: this.testType,
+                    testType:  Number(this.testType),
                     taskId: this.taskId,
                     testStr
                 }
-				api.removeTestRecordProcess(this.testType).then((res) => {
-					 return api.saveCustomTestResult(data);
-				}).then((res) => {
-                        uni.hideLoading();
-                        if (res.Result === 1) {
-                            uni.showToast({
-                                title: "提交成功",
-                                icon: "success"
-                            })
-                            let pages = getCurrentPages(); // 当前页面
-                            let beforePage = pages[pages.length - 2]; // 上一页
-                            if (beforePage != undefined) {
-                                beforePage.data.refreshIfNeeded = true;
-                            }
-                            setTimeout(() => {
-                                if (this.testType == -27) {
-                                    uni.redirectTo({
-                                        url: `/packageCa/testReport/multipleAbilityTestReport?id=${res.Data.TestId}`
-                                    })
-                                } else if (this.testType == -28) {
-                                    uni.redirectTo({
-                                        url: `/packageCa/testReport/generalCareerTestReport?id=${res.Data.TestId}`
-                                    })
-                                } 
-                            }, 1000)
-                        } else {
-                            uni.showToast({
-                                title: res.Message,
-                                icon: "none"
-                            })
-                        }
-                    })
+				api.saveCustomTestResult(data).then((res) => {
+					uni.hideLoading();
+					if (res.Result === 1) {
+						uni.showToast({
+							title: "提交成功",
+							icon: "success"
+						})
+						let pages = getCurrentPages(); // 当前页面
+						let beforePage = pages[pages.length - 2]; // 上一页
+						if (beforePage != undefined) {
+							beforePage.data.refreshIfNeeded = true;
+						}
+						setTimeout(() => {
+							if (this.testType == -27) {
+								uni.redirectTo({
+									url: `/packageCa/testReport/multipleAbilityTestReport`
+								})
+							} else if (this.testType == -28) {
+								uni.redirectTo({
+									url: `/packageCa/testReport/generalCareerTestReport`
+								})
+							} 
+						}, 1000)
+					} else {
+						uni.hideLoading();
+						uni.showToast({
+							title: res.Message,
+							icon: "none"
+						})
+					}
+				})
             }
         }
     }

packageCa/pagesTest/interestTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>职业兴趣测评</text>
-		</view>
+	<view class="title-wrap" style="padding-top: 40rpx;">
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">
@@ -158,7 +154,7 @@
 			}
 		},
 		onLoad(e) {
-			this.getHistoryTitle();
+			this.getTitle();
 		},
 		methods: {
 			// 返回
@@ -179,16 +175,6 @@
 				});
 				//uni.navigateBack(-1);
 			},
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(11).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
 			// 获取题目
 			getTitle() {
 				uni.showLoading({
@@ -200,26 +186,7 @@
 						let list = res.Data;
 						list.forEach(item => {
 							item.Value = 0
-							this.historyTitle.forEach(ritem=>{
-								if(item.Id == ritem.TestTitleId){
-									item.Value = Number(ritem.TestResult);
-								}
-							})
 						})
-						if(this.historyTitle.length > 180){
-							let len = this.historyTitle.length - 180;
-							for(let i = 0; i < len; i++){
-								this.checkTitleList[i].Value = this.historyTitle[i + 180];
-								this.checkTitleList[i].Checked = true;
-							}
-						}
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
 						this.allNum = list.length + 3;
 						this.list = list;
 					}
@@ -241,11 +208,8 @@
 					 // 处理单击事件
 					this.lastTapTime = now; 
 					this.list[INDEX].Value = NUM;
-					this.saveTestRecordProcess(this.list[INDEX].Id,NUM);
 					setTimeout(()=>{
-						if(this.pageIndex != this.allNum - 1){
 							this.pageIndex = INDEX + 1;
-						}
 					},400)
 				}
 			},
@@ -260,7 +224,6 @@
 						this.firstDescVal = ITEM.Value;
 						this.secondDescVal = "";
 						this.thirdDescVal = "";
-						this.saveTestRecordProcess(181,ITEM.Value);
 						break;
 					}
 					case 2: {
@@ -272,13 +235,11 @@
 						this.checkTitleList[INDEX].Checked = true;
 						this.secondDescVal = ITEM.Value;
 						this.thirdDescVal = "";
-						this.saveTestRecordProcess(182,ITEM.Value);
 						break;
 					}
 					case 3: {
 						this.checkTitleList[INDEX].Checked = true;
 						this.thirdDescVal = ITEM.Value;
-						this.saveTestRecordProcess(183,ITEM.Value);
 						break;
 					}
 				}
@@ -289,27 +250,8 @@
 				},400)
 
 			},
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let data = {
-					testType: 11,
-					testTitleId: ID,
-					testResult: VALUE
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
 			// 提交题目
 			submitTitle() {
-				
-				// uni.showToast({
-				// 	title: "请选择三个特质描述",
-				// 	icon: "none"
-				// })
-				// return;
-
 				let testStr = "";
 				this.list.forEach(item => {
 					testStr += `${item.Id}|${item.Value - 1},`
@@ -319,9 +261,7 @@
 					title: "提交中"
 				})
 				let data = {testStr}
-				api.removeTestRecordProcess(11).then((res) => {
-					 return api.saveInterestTestResult(data);
-				}).then((res) => {
+				api.saveInterestTestResult(data).then((res) => {
 					uni.hideLoading();
 					if (res.Result === 1) {
 						uni.showToast({

packageCa/pagesTest/personalTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback()"></view>
-			<text>人格测评</text>
-		</view>
+	<view class="title-wrap" style="padding-top: 40rpx;">
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">
@@ -86,7 +82,7 @@
 			}
 		},
 		created() {
-			this.getHistoryTitle();
+			this.getTitle();
 		},
 		methods: {
 			// 返回
@@ -107,16 +103,6 @@
 				});
 				//uni.navigateBack(-1);
 			},
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(15).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
 			// 获取题目
 			getTitle() {
 				uni.showLoading({
@@ -128,37 +114,7 @@
 						let list = res.Data.List;
 						list.forEach(item => {
 							item.Value = 0
-							this.historyTitle.forEach(ritem=>{
-								if(item.TitleId == ritem.TestTitleId){
-									switch (ritem.TestResult) {
-									    case "A": {
-											item.Value = 4;
-									        break;
-									    }
-									    case "B": {
-									        item.Value = 3;
-									        break;
-									    }
-									    case "C": {
-									        item.Value = 2;
-									        break;
-									    }
-									    case "D": {
-									        item.Value = 1;
-									        break;
-									    }
-									}
-								}
-							})
 						})
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
-						
 						this.allNum = list.length;
 						this.list = list;
 					}
@@ -180,7 +136,6 @@
 					 // 处理单击事件
 					this.lastTapTime = now; 
 					this.list[INDEX].Value = NUM;
-					this.saveTestRecordProcess(this.list[INDEX].TitleId,NUM);
 					setTimeout(()=>{
 						if(this.pageIndex != this.list.length - 1){
 							this.pageIndex = INDEX + 1;
@@ -188,37 +143,6 @@
 					},400)
 				}
 			},
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let val = ""
-				switch (VALUE) {
-				    case 4: {
-						val = "A";
-				        break;
-				    }
-				    case 3: {
-				        val = "B";
-				        break;
-				    }
-				    case 2: {
-				       val = "C";
-				        break;
-				    }
-				    case 1: {
-				        val = "D";
-				        break;
-				    }
-				}
-				let data = {
-					testType: 15,
-					testTitleId: ID,
-					testResult: val
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
 			// 提交题目
 			submitTitle() {
 				let testStr = "";
@@ -249,9 +173,7 @@
 					testStr,
 					testType: 15
 				}
-				api.removeTestRecordProcess(15).then((res) => {
-					 return api.saveCharacterTestResult(data);
-				}).then((res) => {
+				api.saveCharacterTestResult(data).then((res) => {
 					uni.hideLoading();
 					if (res.Result === 1) {
 						uni.showToast({
@@ -263,7 +185,7 @@
 						beforePage.data.refreshIfNeeded = true;
 						setTimeout(()=>{
 							uni.redirectTo({
-								url: `/packageCa/testReport/personalTestReport?year=${res.Data.Year}`
+								url: `/packageCa/testReport/personalTestReport`
 							})
 						},1000)
 						

packageCa/pagesTest/testList.vue

@@ -1,25 +1,9 @@
 <template>
 	<view class="test-list-wrap" style="display:block;">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>生涯测评</text>
-		</view>
-		<view class="contrast-box" >
-		    <view class="desc">
-		        <text class="icon"></text>
-		        <view class="txt-item">
-					<text v-for="(item,index) in selectTypeStr" :key="index">{{item}}</text>
-		        </view>
-		    </view>
-		    <view class="btn" @click="showContrastLayer">
-		        筛选
-		    </view>
-		</view>
-		<view class="content" style="overflow:hidden;">
-			<view class="p-item" v-for="(pitem,pindex) in filteredData" :key="pindex">
-				<view class="h1">{{pitem.title}}</view>
-				<view class="item" v-for="(item,index) in pitem.list" :key="index">
-				    <view class="h2">{{item.TestName}}</view>
+		<view class="content" style="overflow:hidden; padding-top: 40rpx;" >
+			<view class="p-item" >
+				<view class="item" v-for="(item,index) in dataList" :key="index">
+				    <view class="h2">{{item.Name}}</view>
 				    <view class="do-time">
 				        约{{item.AvgTime == 0 ? '1' : item.AvgTime}}分钟
 				    </view>
@@ -27,51 +11,16 @@
 				        {{item.Brief}}
 				    </view>
 				    <view class="btn-wrap">
-				    	<view class="btn" v-if="item.HasTest" @click="navTest(item,1)">
-				    	    重新测评
+				    	<view class="btn"  @click="navTest(item,1)" v-text="item.RecordId>0?'重新测评':'开始测评'">
+				    	    
 				    	</view>
-				    	<view class="btn" v-else @click="navTest(item,1)">
-				    	    开始测评
-				    	</view>
-				    	<view class="btn" v-if="item.HasTestRecordProcess && item.Type != 25" @click="navTest(item,2)">
-				    	    继续测评
-				    	</view>
-				        <view class="report-btn" v-if="item.HasTest" @click="navReport(item)">
+				        <view class="report-btn" v-if="item.RecordId>0" @click="navReport(item)">
 				            查看报告
 				        </view>
 				    </view>
 				</view>
 			</view>
 		</view>
-		
-		<!-- 筛选 -->
-		<uni-popup ref="pop_card" type="bottom">
-		    <view class="search-content">
-		        <view class="head-title">
-					<text>筛选</text>
-					<view @click="closeDialog()" class="s_close"></view>
-				</view>
-		        <view class="item-content">
-		            <view class="title">测评等级</view>
-		            <view class="options">
-						<view class="item"  v-for="(item,index) in levelOption" :class="checkedTestLevel==item.value?'on':''"  @click="checkedTestLevel = item.value" :key="index">{{item.name}}</view>
-		            </view>
-		            <view class="title">测评类型</view>
-		            <view class="options">
-						<view class="item"  v-for="(item,index) in typeOption" :class="checkedTestType==item.value?'on':''"  @click="checkedTestType = item.value" :key="index">{{item.name}}</view>
-		            </view>
-		            <view class="title">测评功能</view>
-		            <view class="options">
-						<view class="item"  v-for="(item,index) in fnOption" :class="checkedTestFun==item.value?'on':''"  @click="checkedTestFun = item.value" :key="index">{{item.name}}</view>
-		            </view>
-		        </view>
-		        <view class="btn-wrap">
-		            <view class="btn" v-on:click="confirmCompute">
-		                确认筛选
-		            </view>
-		        </view>
-		    </view>
-		</uni-popup>	
 	</view>
 </template>
 
@@ -83,145 +32,12 @@
 				barHeight: wx.getWindowInfo().statusBarHeight,
 				refreshIfNeeded: false, //是否返回刷新
 				dataList: [],
-				selectTypeStr: ["全部"],
-				showContrast: false,//显示筛选
-				levelOption: [
-					{
-						name: "全部",
-						value: 0
-					},
-					{
-						name: "基础型",
-						value: 1
-					},
-					{
-						name: "进阶型",
-						value: 2
-					},
-					{
-						name: "专项型",
-						value: 3
-					},
-				],
-				typeOption: [
-					{
-						name: "全部",
-						value: 0
-					},
-					{
-						name: "生涯类",
-						value: 1
-					},
-					{
-						name: "学习力类",
-						value: 2
-					},
-					{
-						name: "心理健康类",
-						value: 3
-					},
-					{
-						name: "其他",
-						value: 4
-					},
-				],
-				fnOption: [
-					{
-						name: "全部",
-						value: 0
-					},
-					{
-						name: "情感态度",
-						value: 1
-					},
-					{
-						name: "智力能力",
-						value: 2
-					},
-					{
-						name: "认知学习",
-						value: 3
-					},
-					{
-						name: "人格特质",
-						value: 4
-					},
-					{
-						name: "心理健康",
-						value: 5
-					}
-				],
-				testLevel:0 ,// 测评等级
-				testType: 0,// 测评类型
-				testFun: 0,// 测评功能
-				checkedTestLevel: 0,// 测评等级
-				checkedTestType: 0,// 测评类型
-				checkedTestFun: 0,// 测评功能
-				testList1: [], //情感
-				testList2: [], //智力
-				testList3: [], //认知学习
-				testList4: [], //人格特质
-				testList5: [], //心理健康
-				testList6: [], //其他测评
-				filteredData: [],//筛选后数据
 			}
 		},
 		onShow() {
 			this.queryTaskListForWeChart();
 		},
 		methods: {
-			closeDialog(){
-				this.$refs.pop_card.close();
-			},
-			//确认筛选
-			confirmCompute(){
-				this.testLevel = this.checkedTestLevel;
-				this.testType = this.checkedTestType;
-				this.testFun = this.checkedTestFun;
-				if(this.checkedTestLevel == 0 && this.checkedTestType == 0 && this.checkedTestFun == 0){
-					this.selectTypeStr = ["全部"];
-				}else {
-					let arr = [];
-					if(this.checkedTestLevel != 0){
-						arr.push(this.levelOption[this.checkedTestLevel].name);
-					}
-					if(this.checkedTestType != 0){
-						arr.push(this.typeOption[this.checkedTestType].name);
-					}
-					if(this.checkedTestFun != 0){
-						arr.push(this.fnOption[this.checkedTestFun].name);
-					}
-					this.selectTypeStr = arr;
-				}
-				
-				this.filteredData = this.dataList.map(category => {
-					const filteredList = category.list.filter(item => {
-						// 处理TestLevel筛选
-						const levelMatch = this.testLevel === 0 || item.TestLevel === this.testLevel;
-						
-						// 处理TestType特殊映射（其他类对应TestType=0）
-						const typeMatch = this.testType === 0 ? true : 
-						this.testType === 4 ? item.TestType === 0 : 
-						item.TestType === this.testType;
-						
-						// 处理TestFun筛选
-						const funMatch = this.testFun === 0 || item.TestFun === this.testFun;
-						
-						return levelMatch && typeMatch && funMatch;
-					});
-					return { ...category, list: filteredList };
-				}).filter(category => category.list.length > 0); // 过滤空分组
-				//this.showContrast = false;
-				this.$refs.pop_card.close();
-			},
-			// 显示筛选列表
-			showContrastLayer(){
-				 //this.showContrast = true;
-				 this.$refs.pop_card.open('bottom') //底部弹出
-				 this.checkedTestLevel = this.testLevel;
-				 this.checkedTestType = this.testType;
-				 this.checkedTestFun = this.testFun;
-			},
 			// 返回
 			goback(){
 				uni.navigateBack(-1);
@@ -231,195 +47,16 @@
 				uni.showLoading({
 					title: "加载中"
 				})
-				let eduLevel = uni.getStorageSync("CAuserInfo").user.GradeLevel;
-				new Promise((resolve,reject)=>{
-					return api.getTestTypeTagLIst().then((res)=>{
-						resolve(res)
-					})
-				}).then((res)=>{
-					let arr = [];
-					res.Data.forEach(item=>{
-						return arr.push(item.Type);
-					})
-					return api.getUserTestTypeProcessList(JSON.stringify(arr)).then((res1)=>{
-						 return [res, res1];
-					})	
-				}).then(([res1, res2]) => {
-				    if (res1.Result === 1 && res2.Result === 1) {
-						return api.queryTaskListForWeChart(eduLevel).then((res) => {
-							return [res, res1, res2];
-						});
-				    }
-				}).then(([res, res1, res2]) => {
-					 uni.hideLoading();
-				    if (res && res.Result === 1) {
-				        this.testList1 = [];
-				        this.testList2 = [];
-				        this.testList3 = [];
-				        this.testList4 = [];
-				        this.testList5 = [];
-				        this.testList6 = [];
-				        let list = res.Data.TestList;
-						list.forEach(item=>{
-							// 处理答题记录匹配
-							 item.HasTestRecordProcess = false;
-							 res2.Data.forEach(ritem=>{
-								 if(item.TestType == ritem.TestType){
-									 item.HasTestRecordProcess = ritem.HasTestRecordProcess;
-								 }
-							 })
-						})
-				        let num = 0;
-				        let arr = []; 
-				        let arr1 = []; 
-				        list.forEach(item=>{
-				        	if(item.HasTest){
-				        		num++
-				        	}
-				        	let isMatch = false;
-							// 处理测评分类匹配
-				        	res1.Data.forEach((yitem, yindex) => {
-				        		if (item.TestType == yitem.Type) {
-				        			item.Type = item.TestType;
-				        			item.TestType = yitem.TestType;
-				        			item.TestLevel = yitem.TestLevel;
-				        			item.TestFun = yitem.TestFun;
-				        			arr.push(item); 
-				        			isMatch = true;
-				        		}
-				        	})
-				        	if (!isMatch) {
-				        		item.Type = item.TestType;
-				        		item.TestType = 0;
-				        		item.TestLevel = 0;
-				        		item.TestFun = 0;
-				        		arr1.push(item);
-				        	}
-				        })
-				        this.testList6 = arr1;
-				        this.testList = list;
-				        arr.forEach((item, index) => {
-				        	switch (item.Type) {
-				        			// 1 情感态度
-				        			// 高中，大学职业兴趣11
-				        			// 工作价值观17
-				        			// 学习动机测评-33
-				        			// 自我效能感测评-34
-				        			// 小学兴趣测评-31
-				        			//初中兴趣测评18
-				        		case 11: 
-				        		case 17:
-				        		// case 18:
-				        		// case -31:
-				        		// case -33:
-				        		// case -34: 
-								{
-				        			this.testList1.push(item);
-				        			// this.interestList.push(item);
-				        			break;
-				        		}
-				        			// 2 智力能力
-				        			// 注意力22
-				        			// 记忆力23
-				        			// 多元智能16
-				        			// 小学多元智能 -32
-				        			// 多元性向潜能发展6
-				        			// 推理能力测评-45
-				        			// 批判性思维倾向测评-38
-				        			// 创造力倾向测评-37
-				        			// 多元(职业)能力测评-27
-				        			// 通用(职业)能力测评-28
-				        		// case 22:
-				        		// case 23:
-				        		// case 16:
-				        		// case 6:
-				        		// case -32:
-				        		// case -45:
-				        		// case -38:
-				        		// case -37:
-				        		case -27:
-				        		case -28: {
-				        			this.testList2.push(item);
-				        			break;
-				        		}
-				        		// 3认知学习
-				        		// 学科信心-2
-				        		// 学科能力测评20
-				        		// 学科自评-9999
-				        		// 学习习惯-36
-				        		// 领导力测评-29
-				        		// 生涯建构测评-42
-				        		// 生涯适应力测评-43
-				        		// 意志力测评 -35
-				        		// 场独立-场依存认知风格测评 25
-				        		// 沉思型-冲动型认知风格测评 26
-				        		// 儿童元认知测评 -39
-				        		// 元认知测评 -40
-				        		// 学习资源管理能力测评 -41
-				        		// 问题解决能力测评-44
-				        		// case -2:
-				        		// case 20:
-				        		// case -9999:
-				        		// case -36:
-				        		// case -29:
-				        		// case -42:
-				        		// case -43:
-				        		// case -35:
-				        		// case 25:
-				        		// case 26: 
-				        		// case -39:
-				        		// case -40:
-				        		// case -41:
-				        		// case -44:
-				        		// {
-				        		// 	this.testList3.push(item);
-				        		// 	// this.workValueList.push(item);
-				        		// 	break;
-				        		// }
-				        		// 4.人格特质
-				        		// MBTI 4
-				        		// 人格测评15
-				        		// case 4:
-				        		case 15: {
-				        			this.testList4.push(item);
-				        			break;
-				        		}
-				        		// 5.心理健康
-				        		// SCL-90
-				        		// case -10: {
-				        		// 	this.testList5.push(item);
-				        		// 	break;
-				        		// }
-				        	}
-				        })
-				        let allList = [];
-				        if(this.testList1.length>0){
-				        	allList.push({title: '情感态度', list: this.testList1});
-				        }
-				        if(this.testList2.length>0){
-				        	allList.push({title: '智力能力', list: this.testList2}); 
-				        }
-				        if(this.testList3.length>0){
-				        	allList.push({title: '认知学习', list: this.testList3}); 
-				        }
-				        if(this.testList4.length>0){
-				        	allList.push({title: '人格特质', list: this.testList4}); 
-				        }
-				        // if(this.testList5.length>0){
-				        // 	allList.push({title: '心理健康', list: this.testList5}); 
-				        // }
-				        // if(this.testList6.length>0){
-				        // 	allList.push({title: '其他测评', list: this.testList6}); 
-				        // }
-				        this.dataList = allList;
-				        this.confirmCompute();
-				    }
-				}).catch((error) => {
-				    console.error('请求出错:', error);
-				});
+				api.queryTaskListForWeChart().then((res)=>{
+						uni.hideLoading();
+					if (res && res.Result === 1) {
+						this.dataList = res.Data.DataList.filter(item=>(item.Type !== 4 && item.Type != -29));
+					}
+				})
+				
 			},
-			routerUrl(TYPE){
-				switch (TYPE) {
+			navTest(item,index) {
+				switch (item.Type) {
 					case 11: {
 						// 高中兴趣测评
 						uni.navigateTo({
@@ -458,21 +95,6 @@
 					}
 				}
 			},
-			navTest(item,index) {
-				if(index == 1){
-					uni.showLoading({
-					    title: "加载中..."
-					})
-					api.removeTestRecordProcess(item.Type).then((res) => {
-						if (res.Result == 1) {
-							uni.hideLoading();
-							this.routerUrl(item.Type)
-						}
-					})
-				}else {
-					this.routerUrl(item.Type)
-				}
-			},
 			navReport(item) {
 			    switch (item.Type) {
 			        case 11: {
@@ -543,50 +165,7 @@
             background-size: 38rpx 38rpx;
         }
     }
-	.progress-box {
-		display: flex;
-		align-items: center;
-		margin-bottom: 36rpx;
-		.progress-txt {
-			display: flex;
-			align-items: center;
-			font-size: 24rpx;
-			width: 175rpx;
-			color: #333333;
-			margin-right: 20rpx;
-			.strong {
-				font-size: 32rpx;
-				color: #20B664;
-				font-weight: 600;
-				margin-left: 6rpx;
-			}
-		}
-		.progress-bar {
-			width: 500rpx;
-			height: 24rpx;
-			background: #F8F8F8;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			.progress {
-				position: relative;
-				background-image: repeating-linear-gradient(-45deg, #20B664, #20B664 20rpx, #47C580  20rpx, #47C580 30rpx);
-				height: 24rpx;
-				border-radius: 20rpx;
-				transition: width 1s ease-in-out;
-				&::after {
-					display: block;
-					content: "";
-					  position: absolute;
-					  right: -20rpx;
-					  top: -8rpx;
-					  width: 40rpx;
-					  height: 40rpx;
-					  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA2FBMVEUAAAA60X84z4A60YE50X850n860H860IA6z4A4z4A60X850IA50X84z4Awz4D///860X8iv2khu2ciwmskyW8guWUlzHEky3Ajx20hvWglznEl0HMm0nQjxWwm1HUgt2Q3z3zk+O112KK67dGR47Yu03kyznktzXYuyHQz0nsvxXIqwm/I8NoqyHInv2ys6Mc9yHwr0Xbx+/Wt7Mpa15NZ0ZBO1os/0IEyynfI8tyD3Ktn1Jjx/PbW8+Of5b6E4q9LzYZA1oVLyYTW9eSf6cGf5r+C2qpp35/QM//cAAAAD3RSTlMA70B/37+vn2Agz7+PYBCLRPBlAAACh0lEQVQ4y6XV2XqqMBAAYKKI1i2DgNZWK6AHEHetS7X72d7/jc4kGBJFvTlzARf833yTySRo55HLV8oEgOhGNVdXP2RlEZ0MUsxdpSUdgRuEi8fHx05nMRwCQOEyvzNQhs1m8wGD887TD8bvLqQlSFutVhNDasZJ7dzmAYKmbaPmWOonLCafseG9jZHJjcmFlnZyf6/oh+u6hraL+EbuUtoHAlG3i/pGbiJ6UoDAsjIa+dfz36/hcZVGYnMAlpXVmxVl8ZLkFoUUILIyetunSXii37pMfKY3HhVxrBsgh7gIkWmmejsbD2zbp2l46c4XNa1OwDRTPeDf+XP18cJe/WNPFkBYFYEp9HwsMw5areAV379EB4dYRxWi9lH7HpXxjKv8ie+N6PcQt9GAUTvRPlVjZdtb1rl0LxdQ0XQw24nu05MYsz6/btK9XEBZI9BuNLieUbr0lvQkPuScdHCFAA3ETMf+Ghd5kn+gzgkAw1yLVc5Uq84gwwSxqt8VvLW5FphoZZg6nDM9f5vPFdxXZhCxrlUQOyL3mI7NwUmzZe4QDDxRsSP0H/zum/ulLFqZ7wCquN07R+j4e0aXezNeH2bHzMp8u7jdbIVcc+6h8D4ta83tb/U0AKmzER31hPZpf8wqsT6Z9aKu1CEU+fC7PaG//fbBm2MH9wyv1bPDhh9Dx9RpbmVO3tWzE0IhueXAbUiNPMFvJyeNJeZhQNQ7yx0ffKRSB1CQl8zoXGMoOpSXDBYC01t6AlBTL0ZXaoxTPclco9criaSVeudc0t2dsErUCLgjJ6MnLpDShR9QAcCNHbVuCykYd5f/gshhF0/bjE5HUQAAeun/fpoy6rmqoRN05Uo+I/8B7R+IPTrIPJ8AAAAASUVORK5CYII=');
-					  background-size: 100%;
-				}
-			}
-		}
-	}
-    .test-list-wrap {
+	.test-list-wrap {
         padding: 0 20rpx 130rpx;
 
         .content {
@@ -747,196 +326,4 @@
             }
         }
     }
-	.contrast-box {
-	    display: flex;
-	    align-items: center;
-	    justify-content: space-between;
-	    width: 666rpx;
-	    height: 76rpx;
-	    margin-bottom: 20rpx;
-	    padding: 0 20rpx;
-	    background: #E7F1FF;
-	    border-radius: 12rpx 12rpx 12rpx 12rpx;
-	    border: 2rpx solid #FFFFFF;
-		
-	    .desc {
-	        display: flex;
-	        align-items: center;
-	
-	        .icon {
-	            width: 28rpx;
-	            height: 28rpx;
-	            background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAHfSURBVEiJ1Va9btswEP5OlBNr01JAMgpUeYNm7FDAeoP2Ddq1UzK5Roc6Q6AoS7auzps4QDt0i4fu1lYVWThFP7Z4HSIpspC4cCMmyLeQR+nu4/GOvAOeAwYn+dQ9zWf/o0vtBSdIvE0KBpkvmfg7AKyY3i5T85eckLzRZS/NICvZnrBdze8kdMN8AWAj4V1gVfgkxFcwhqX8EcAFGeISYPl7tLtXb7jl2dZkJTww7FoyzFelLRsgzwm4tmu0NbcBMz6tVtiPx9Z5kvR8VoXPqvDjUe+oUKI+yjRDPa+P1AkSjwyx2IZQAW/+jHZ+3vd9EGbvlFIyHlsX1dqDPPznhpSSTU+1EjpBMiRDzEwTM3vCdXy1eljC7u/eJpSpiyXN+nPLyiMAiMcUaSeUE5IS2Guvaz1SN1yeuWF+9iiETpAMAT4AcNDZxd+E+y6+NsKrLztzYpwD6rD5gGtLGgC4TnuH7WqhM4aeZS0XbpitPZc6s9RD19ViE54macDvWRV+M47Pq1oQY7/qgZwg8ZwgGb44zl+XcvfVggjfSIgpAJAQ05Lg0gmSD43f1qpFTRiPrQhAtDWputGpxgpp1p8DHAEcNavFg9vEq8+9H7e6621iZ3BP89ngJJ92alQX/gLMKt2XTOFMygAAAABJRU5ErkJggg==") no-repeat;
-	            background-size: 100%;
-	        }
-	
-	        .txt-item {
-	            width: 400rpx;
-	            line-height: 21px;
-	            overflow: hidden;
-	            text-overflow: ellipsis;
-	            white-space: nowrap;
-				margin-left: 20rpx;
-	            text {
-	
-	                display: inline-block;
-	                line-height: 50rpx;
-	                font-size: 24rpx;
-	                color: #1677ff;
-	                margin-left: 16rpx;
-	
-	                &::after {
-	                    content: "";
-	                    display: inline-block;
-	                    width: 2rpx;
-	                    height: 12rpx;
-	                    margin-left: 16rpx;
-	                    background: #1677ff;
-	                }
-	            }
-	        }
-	    }
-	
-	    .btn {
-	        display: flex;
-	        align-items: center;
-	        justify-content: center;
-	        width: 120rpx;
-	        height: 48rpx;
-	        background: #FFFFFF;
-	        border-radius: 8rpx 8rpx 8rpx 8rpx;
-	        font-size: 24rpx;
-	        color: #333333;
-	
-	        &::after {
-	            content: "";
-	            display: block;
-	            width: 0;
-	            height: 0;
-	            margin-left: 6rpx;
-	            border-top: 12rpx solid #333;
-	            border-left: 12rpx solid #fff;
-	            border-right: 12rpx solid #fff;
-	        }
-	    }
-	}
-	.search-content {
-	    width: 100%;
-	    background: #fff;
-	    border-top-left-radius: 28rpx;
-	    border-top-right-radius: 28rpx;
-	    overflow: hidden;
-	
-	    .head-title {
-	        width: 100%;
-	        height: 96rpx;
-	        line-height: 96rpx;
-	        text-align: center;
-	        font-size: 36rpx;
-	        color: #333;
-			font-weight:550;
-			margin-top:10rpx;
-			position:relative;
-	    }
-	
-	    .item-content {
-	        padding: 0 0 0 30rpx;
-	
-	        .s-line {
-	            position: relative;
-	            width: 630rpx;
-	            margin: 15rpx auto 45rpx;
-	            height: 2rpx;
-	            background: #FAFAFA;
-	
-	            &:before {
-	                content: "";
-	                display: block;
-	                position: absolute;
-	                left: -85rpx;
-	                top: -16rpx;
-	                width: 32rpx;
-	                height: 32rpx;
-	                border-radius: 50%;
-	                background: #EEF1F8;
-	            }
-	
-	            &::after {
-	                content: "";
-	                display: block;
-	                position: absolute;
-	                right: -58rpx;
-	                top: -16rpx;
-	                width: 32rpx;
-	                height: 32rpx;
-	                border-radius: 50%;
-	                background: #EEF1F8;
-	            }
-	        }
-	
-	        .title {
-	            font-size: 28rpx;
-	            color: #333333;
-	            padding: 30rpx 0 20rpx;
-	        }
-	
-	        .options {
-	            display: flex;
-	            flex-wrap: wrap;
-	
-	            .v-line {
-	                border-bottom: 1px dotted #f1ececb8;
-	                margin: 26rpx 0;
-	            }
-	
-	            .item {
-	                position: relative;
-	                min-width: 170rpx;
-	                margin-right: 30rpx;
-	                height: 76rpx;
-	                text-align: center;
-	                line-height: 76rpx;
-	                background: #F5F5F5;
-	                margin-bottom: 30rpx;
-	                padding: 0 20rpx;
-	                border-radius: 12rpx;
-	                font-size: 28rpx;
-	                color: #333333;
-	
-	                &.disable {
-	                    color: #C6C6C6;
-	                    background: #F8F8F8;
-	                }
-	
-	                &.on {
-	                    background: #E7F1FF;
-	                    color: #1677ff;
-	
-	                }
-	            }
-	        }
-	    }
-	
-	    .btn-wrap {
-	        display: flex;
-	        justify-content: center;
-	        padding-top: 10rpx;
-	        padding-bottom: 40rpx;
-	
-	        .btn {
-	            width: 688rpx;
-	            height: 88rpx;
-	            line-height: 88rpx;
-	            text-align: center;
-	            background: #1677ff;
-	            font-size: 32rpx;
-	            color: #fff;
-	            border-radius: 60rpx;
-	        }
-	    }
-	}
-.s_close{position:absolute;top:30rpx;right:6%;width:30rpx;height:30rpx;
-background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAgCAYAAAAFQMh/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjkzQkY4QkFCMjY0MTFGMDlGOThGMzcyM0VCRTJGMkYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjkzQkY4QkJCMjY0MTFGMDlGOThGMzcyM0VCRTJGMkYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTNCRjhCOEIyNjQxMUYwOUY5OEYzNzIzRUJFMkYyRiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTNCRjhCOUIyNjQxMUYwOUY5OEYzNzIzRUJFMkYyRiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvssjGYAAAO/SURBVHjatJf7a5V1HMef5bN2tduObjp1hMlOTbCpaKTifpI0b1EKXgo0U4Lw/0j8ZSoohkpFKjLvUYrWREX8Qa0oQaw5O7Yzt45jbW7u4nZ8f+R14MvDOdtz9PSB13jOs+37/n6u3+/Ji0aj2zzPaxenxF9i2Mu9lYo66BG/+foxT3SLAXFUtORY9AUxWywTM0WvKDHhWlEkqsSgaBD/5kj0Rdb/VKzms0U34bMjs6jYIvLFd+JBDoTfYc1FiJr9IS6PiUQiteTgZVEhyghHC/l41vDOFRvEKtbuE1fEAXHehBOEOErIJxL2TnFH9GcpmifeFl8gWsJ7E90lfhRtJhzXQ5xqnuR4Pk4kRbN4lIXwfLFZvC9e5d1ZPD2DQ0kTHtLDfUJbgrcW+smiXHSJfwj/SJZPIW0U68QrTni/EqdZ66mZcOrZiumuvRNviUIxXkwl17dpuUw2S2wVK4ia2UWxQ5yjZb10whbWBK2U74S9nJANsrG+NKJzaJkPxGuO6H7xfVA0KJyyNhEjVNWiQEwRlfRgM5tIVe+btMzH4iVhqftV7BQnMnVGOmEPgTjP1YS9HPFOejH1O6velY6nl8Qe8YOb06D5I+TsBq1hLbaENnuXdHSQ7/lMpAieXhffiOPpwhtW2CNk9fSyDYNixMsI9wREk4jWZ8pp2FC7BdcO3bRZFUyh1xOIfU2f/hem2f2QQ+EavV5BXoucGR/nYGnIdqaGtQHyGLRhp8pD22ihTtkMsUYsZKLlBTafz6ZaRxkyoUNti74h1lNcZeSwiYKz0L/O7ycz9c6FOdVG83i6+Fx8SAWn+nQ7g7+HaBTSbjbtHoo/M6QllMc1TKPVDA+zX8QhcZLPCTa0lApfyEk2gOdd2Xo8jTG4gQXNbjLwjzvz2oTvkYIaUlOF5/c5z4fCCtsCm8RH5NBjOOxDNBHo81YmWQH1UIhwhN5Pe3MNCk+lUDaSsyS7tlPmIIMknf2NeITQF7NWKf/TFqx2PxDez2ib8by7JXaHvHleZaN2YVhLy9WhUciVZ8D1eAzh/YRCqnIK6VtxmHCOZkN43uWEeyztVsKGYqlh43MbXMpBnvK0idl7aITwZrKfKT5bezHjdTmbsd6/YJVvHn/JH1Q69969hLfVy96SVHQ7ua4h7BVgvd/lc0cqdnJ6BJ7nq4zlspFRauFewDXqPSo84n6TiHEFfV5R9/BoJPePcTCPm2ivz2Fv0+YncYwLXa6snxFbRE9Pp8jiPvfeDg7x2P/wFbWPVitAx3L8+xMBBgBa0QNtbOSplwAAAABJRU5ErkJggg==") center no-repeat;
-background-size:30rpx;
-}
 </style>

packageCa/pagesTest/workValuesTestTitle.vue

@@ -1,9 +1,5 @@
 <template>
-	<view class="title-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>工作价值观测评</text>
-		</view>
+	<view class="title-wrap" style="padding-top: 40rpx;">
 		<view class="progress-block">
 			<view class="row">
 				<view class="title-index">
@@ -86,7 +82,7 @@
 			}
 		},
 		created() {
-			this.getHistoryTitle();
+			this.getTitle();
 		},
 		methods: {
 			// 返回
@@ -114,16 +110,6 @@
 				}
 				this.pageIndex--
 			},
-			//获取答题记录
-			getHistoryTitle(){
-				api.getTestRecordProcessList(17).then(res => {
-					if (res.Result === 1) {
-						let data = res.Data;
-						this.historyTitle = data;
-						this.getTitle();
-					}
-				})
-			},
 			// 获取题目
 			getTitle() {
 				uni.showLoading({
@@ -135,20 +121,7 @@
 						let list = res.Data.List;
 						list.forEach(item => {
 							item.Value = 0;
-							this.historyTitle.forEach(ritem=>{
-								if(item.TitleId == ritem.TestTitleId){
-									item.Value = Number(ritem.TestResult) + 1;
-								}
-							})
 						})
-						if(this.historyTitle.length == 0){
-							this.pageIndex = 0;
-						}else if(this.historyTitle.length == list.length){
-							this.pageIndex = list.length - 1;
-						}else {
-							this.pageIndex = this.historyTitle.length;
-						}
-						
 						this.allNum = list.length;
 						this.list = list;
 					}
@@ -165,28 +138,14 @@
 					 console.log('单击事件被触发');
 					this.lastTapTime = now; 
 					this.list[INDEX].Value = NUM;
-					//
-					this.saveTestRecordProcess(this.list[INDEX].TitleId,NUM-1);
+				
 					setTimeout(()=>{
 						if(this.pageIndex != this.list.length - 1){
 							this.pageIndex = INDEX + 1;
-							
 						}
 					},300)
 				}
 			},
-			//存储答题记录
-			saveTestRecordProcess(ID,VALUE){
-				let data = {
-					testType: 17,
-					testTitleId: ID,
-					testResult: VALUE
-				}
-				api.saveTestRecordProcess(data).then(res => {
-					if (res.Result === 1) {
-					}
-				})
-			},
 			// 提交题目
 			submitTitle() {
 				let testStr = "";
@@ -217,9 +176,7 @@
 				let data = {
 					testStr
 				}
-				api.removeTestRecordProcess(17).then((res) => {
-					 return api.saveWorkValuesResult(data);
-				}).then((res) => {
+				api.saveWorkValuesResult(data).then((res) => {
 					uni.hideLoading();
 					if (res.Result === 1) {
 						uni.showToast({
@@ -231,7 +188,7 @@
 						beforePage.data.refreshIfNeeded = true;
 						setTimeout(()=>{
 							uni.redirectTo({
-								url: `/packageCa/testReport/workValuesTestReport?year=${res.Data.Year}`
+								url: `/packageCa/testReport/workValuesTestReport`
 							})
 						},1000)
 					} else {

packageCa/search/search.vue

@@ -1,10 +1,6 @@
 <template>
 	<view class="index-wrap">
 		<view class="yanshi-wrap">
-			<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-				<view class="go-back"  @click="goback"></view>
-				<text>素质测评</text>
-			</view>
 			<view class="section">
 				<view class="head-title">测评中心</view>
 				<view class="nav-block">
@@ -55,43 +51,16 @@
 			return {
 				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: null,//用户信息
-				userId: 0,
-				name: ""
+				name: "",
+				idCard: ""
 			}
 		},
 		onLoad(e) {
-			this.userId = e.userId;
+			this.idCard = e.idCard;
 			this.name = e.name;
-			this.queryWechartToken();
+			this.queryKaShiToken();
 		},
 		methods: {
-			// 返回
-			goback() {
-				uni.navigateBack(-1);
-			},
-			async getUserInfor(){
-				const res = await api.getUserBasisInfo();
-				if (res.Result == 1) {
-					const data = res.Data.data;
-					if(data === null){
-						uni.showToast({
-							title: "请先完善个人信息",
-							duration:2000,
-							icon: "none"
-						})
-						setTimeout(() => {
-							uni.navigateTo({
-								url: "/packageCa/userCenter/fillInInformation"
-							})
-						}, 2000);
-					}
-				} else {
-					uni.showToast({
-						title: res.Message,
-						icon: "none"
-					})
-				}
-			},	
 			// 演示入
 			navDetail(index){
 				switch (index){
@@ -137,44 +106,17 @@
 			
 			// 登录获取用户信息
 			async queryKaShiToken() {
-				const res = await api.queryKaShiToken(this.userId,this.name)
+				const res = await api.queryKaShiToken(this.idCard,this.name)
 				if(res.Result == 1){
-					return res.Data;
+					let params = {
+						token:res.Data.token, 
+						user: res.Data.userInfo
+					};
+					uni.setStorageSync('CAuserInfo',params);
 				}else {
 					return null
 				}
 			},
-			// 获取token
-			async queryWechartToken() {
-				uni.showLoading({
-					title: "加载中"
-				})
-				const data = await this.queryKaShiToken();
-				if(data.userInfo != null){
-					const res = await api.queryWechartToken(data.userInfo.Id,2268,1)
-					uni.hideLoading();
-					if(res.Result == 1){
-						let params = {
-							token:data.token,
-							user:data.userInfo,
-							userToken: res.Data.token
-						};
-						uni.setStorageSync('CAuserInfo',params);
-						this.getUserInfor();
-					}
-				}else {
-					uni.showToast({
-						title: "获取用户信息失败",
-						icon: "none"
-					})
-					setTimeout(()=>{
-						uni.reLaunch({
-							url: "/pages/index/index"
-						})
-					},1500)
-					
-				}
-			}
 		}
 	}
 </script>

packageCa/testReport/components/contrastBox.vue

@@ -30,9 +30,9 @@
 						{{optionStr2}}
 						<view class="iocn"></view>
 					</view>
-		        <!--    <view class="title">群体维度</view>
+		           <view class="title">群体维度</view>
 		            <view class="options">
-		                <view class="item" :class="[schoolLevel == 1?'on':'', gradeShow?'':'disable']" v-on:click="selectSchoolLevel(1)"  >班级</view>
+		               <view class="item" :class="[schoolLevel == 1?'on':'', gradeShow?'':'disable']" v-on:click="selectSchoolLevel(1)"  >班级</view>
 		                <view class="item" :class="[schoolLevel == 2?'on':'', gradeShow?'':'disable']" v-on:click="selectSchoolLevel(2)">年级</view>
 		                <view class="item" v-on:click="selectSchoolLevel(3)" :class="schoolLevel == 3?'on':''">学校</view>
 		            </view>
@@ -40,7 +40,7 @@
 		            <view class="options">
 		                <view class="item" v-on:click="selectSex(1)" :class="sexType == 1?'on':''">男</view>
 		                <view class="item" v-on:click="selectSex(2)" :class="sexType == 2?'on':''">女</view>
-		            </view> -->
+		            </view>
 		        </view>
 		        <view class="content" v-else>
 		            <view class="title">我的报告</view>
@@ -54,19 +54,21 @@
 		            	{{optionStr2}}
 		            	<view class="iocn"></view>
 		            </view>
-		        <!--    <view class="title">群体维度</view>
+		           <view class="title">群体维度</view>
 		            <view class="options">
-		                <view v-for="(item, index) in departList" :key="index">
-		                    <view class="item" v-on:click="selectSchoolLevel(item)" :class="schoolLevel == item.DepartId?'on':''">
+		                <view >
+							<!-- v-for="(item, index) in departList" :key="index" -->
+		                    <!-- <view class="item" v-on:click="selectSchoolLevel(item)" :class="schoolLevel == item.DepartId?'on':''">
 		                        {{item.Name}}
-		                    </view>
+		                    </view> -->
+							 <view class="item" v-on:click="selectSchoolLevel(3)" :class="schoolLevel == 3?'on':''">全体人员</view>
 		                </view>
 		            </view>
 		            <view class="title">受测对象</view>
 		            <view class="options">
 		                <view class="item" v-on:click="selectSex(1)" :class="sexType == 1?'on':''">男</view>
 		                <view class="item" v-on:click="selectSex(2)" :class="sexType == 2?'on':''">女</view>
-		            </view> -->
+		            </view>
 		        </view>
 		        <view class="btn-wrap">
 		            <view class="btn" v-on:click="confirmCompute">
@@ -340,22 +342,25 @@
 			//选中群体维度
 			selectSchoolLevel(info) {
 				console.log(info);
-			    if (this.platformType == 1) {
-			        this.departName = info.Name;
-			        //高校
-					this.schoolLevel = info.DepartId;
-					this.sexType = 0;
-			    } else {
-					if(!this.gradeShow && info < 3){
-						return uni.showToast({
-						    title: "当前学期未进行分班,无法进行对比",
-						    icon: "none"
-						})
-					}
-					//普教
-					this.schoolLevel = info;
-					this.sexType = 0;
-			    }
+			  //   if (this.platformType == 1) {
+			  //       this.departName = info.Name;
+			  //       //高校
+					// this.schoolLevel = info.DepartId;
+					// this.sexType = 0;
+			  //   } else {
+					// if(!this.gradeShow && info < 3){
+					// 	return uni.showToast({
+					// 	    title: "当前学期未进行分班,无法进行对比",
+					// 	    icon: "none"
+					// 	})
+					// }
+					// //普教
+					// this.schoolLevel = info;
+					// this.sexType = 0;
+			  //   }
+				this.departName = "全体人员"
+			    this.sexType = 0;
+			    this.schoolLevel = info;
 				this.optionStr2 = "";
 				this.selYTItem2 = null;
 				this.selRepItem2 = null;

packageCa/testReport/generalCareerTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			 <contrastBox  @updateValue="handleChildValueChange" :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -75,8 +71,8 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
-    // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
+	const echarts = require('../utilCa/echarts.min.js');
+    import * as echarts1 from '../utilCa/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);
     export default {

packageCa/testReport/interestTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			<contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -245,7 +241,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/multipleAbilityTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
             <contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -115,7 +111,7 @@
     import api from "@/packageCa/apiCa/testManage.js"
     import wayData from "./multipleAbilityData.json";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/personalTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
             <contrastBox   :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
             <view class="section-block">
@@ -402,7 +398,7 @@
     import opts from "./chartOpts.js"
     import api from "@/packageCa/apiCa/testManage.js";
 	import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
+	const echarts = require('../utilCa/echarts.min.js');
     // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
     // // 注册主题
     // echarts.registerTheme('theme', theme);

packageCa/testReport/workValuesTestReport.vue

@@ -1,9 +1,5 @@
 <template>
     <view class="interest-report-wrap">
-        <view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-            <view class="go-back" @click="goback"></view>
-            <text>我的报告</text>
-        </view>
         <view class="content">
 			<contrastBox  :testType="testType" :userId="userId"  :recordId="recordId" @compareParameters="opCompareParameters"></contrastBox>
 			<view class="section-block">
@@ -43,8 +39,7 @@
 	import contrastBox from "@/packageCa/testReport/components/contrastBox.vue"
     import api from "@/packageCa/apiCa/testManage.js";
     import theme from '@/uni_modules/lime-echart/static/walden.json';
-	const echarts = require('../../utilCa/echarts.min.js');
-    // import * as echarts from '@/uni_modules/lime-echart/static/echarts.min';
+	const echarts = require('../utilCa/echarts.min.js');
     // // 注册主题
     // echarts.registerTheme('theme', theme);
     export default {

packageCa/userCenter/careerCompass.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>生涯罗盘</text>
-		</view>
 		<view class="content">
 			<view class="title">
 				生涯罗盘
@@ -119,13 +115,14 @@
 			this.getGXCareerPlanList();
 		},
 		methods: {
-			goBack() {
-				uni.navigateBack(-1);
-			},			
 			//选中职业添加
 			async checkedJob(ITEM){
+				uni.showLoading({
+					title: "添加中..."
+				}) 
 				this.checkedIndex = ITEM.JobId;
 				const res = await api.saveGXCareerPlan(ITEM.JobId);
+				uni.hideLoading();
 				if (res.Result == 1) {
 					uni.showToast({
 						title: "添加成功",
@@ -162,9 +159,9 @@
 				const res = await api.getGXCareerPlanList("",this.page,10);
 				if (res.Result == 1) {
 					this.jobList = res.Data.list;
-					// if(res.Data.list.length < 10){
-					// 	this.noMore = true;
-					// }
+					if(res.Data.list.length == 0){
+						this.noMore = true;
+					}
 				} else {
 					uni.showToast({
 						title: res.Message,

packageCa/userCenter/fillInInformation.vue

@@ -1,563 +0,0 @@
-<template>
-	<view class="index-wrap">
-		<view class="title-h1">
-			请先完善个人信息
-		</view>
-		<view class="item-list">
-			<view class="item">
-				<view class="title"><text>*</text>学历(必选)</view>
-				<view class="option">
-					<view class="subject-item" :class="eduLevel===3?'on':''" @click="changeEduLevel(3)">研究生</view>
-					<view class="subject-item" :class="eduLevel===2?'on':''" @click="changeEduLevel(2)">本科</view>
-					<view class="subject-item" :class="eduLevel===1?'on':''" @click="changeEduLevel(1)">专科</view>
-				</view>
-			</view>
-			<view class="item">
-				<view class="title"><text>*</text>专业类(必选)</view>
-				<view class="input-wrap">
-					<view class="input-value" :class="specialtyName!== ''?'':'placeholder'"
-						@click="showZhuanYeDialog(true)">
-						{{specialtyName !== ''? specialtyName: "请选择专业类"}}
-					</view>
-					<view class="icon-select">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="btn-wrap">
-			<view class="btn"  @click="commitForm">
-				确认提交
-			</view>
-		</view>
-		<uni-popup ref="pop_zhuanye" type="bottom"  style="background: #fff !important;">
-			<view class="layer-inner">
-				<view class="head">
-					<text>选择专业类</text>
-					<view class="close-btn" @click="showZhuanYeDialog(false)"></view>
-				</view>
-				<view class="content">
-					<view class="li" :class="item.value == specialtyName?'on':''" v-for="(item,index) in showSpecialtyList"
-						:key="index" @click="checkSpecialty(item)">
-						<text>{{item.label}}</text>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import api from "@/packageCa/apiCa/user.js"
-	export default {
-		data() {
-			return {
-				schoolName: "", // 
-				eduLevel: 2, //3研究生，2本科，1专科
-				specialtyName: "", // 
-				showSpecialtyList: [{
-						label: '哲学',
-						value: '哲学'
-					},
-					{
-						label: '经济学',
-						value: '经济学'
-					},
-					{
-						label: '法学',
-						value: '法学'
-					},
-					{
-						label: '教育学',
-						value: '教育学'
-					},
-					{
-						label: '文学',
-						value: '文学'
-					},
-					{
-						label: '历史学',
-						value: '历史学'
-					},
-					{
-						label: '理学',
-						value: '理学'
-					},
-					{
-						label: '工学',
-						value: '工学'
-					},
-					{
-						label: '农学',
-						value: '农学'
-					},
-					{
-						label: '医学',
-						value: '医学'
-					},
-					{
-						label: '管理学',
-						value: '管理学'
-					},
-					{
-						label: '艺术学',
-						value: '艺术学'
-					},
-					{
-						label: '军事学',
-						value: '军事学'
-					},
-					{
-						label: '交叉学科',
-						value: '交叉学科'
-					},],
-				specialtyOption1: [{
-						label: '农林牧渔大类',
-						value: '农林牧渔大类'
-					},
-					{
-						label: '资源环境与安全大类',
-						value: '资源环境与安全大类'
-					},
-					{
-						label: '能源动力与材料大类',
-						value: '能源动力与材料大类'
-					},
-					{
-						label: '土木建筑大类',
-						value: '土木建筑大类'
-					},
-					{
-						label: '水利大类',
-						value: '水利大类'
-					},
-					{
-						label: '装备制造大类',
-						value: '装备制造大类'
-					},
-					{
-						label: '生物与化工大类',
-						value: '生物与化工大类'
-					},
-					{
-						label: '轻工纺织大类',
-						value: '轻工纺织大类'
-					},
-					{
-						label: '食品药品与粮食',
-						value: '食品药品与粮食'
-					},
-					{
-						label: '交通运输大类',
-						value: '交通运输大类'
-					},
-					{
-						label: '电子信息大类',
-						value: '电子信息大类'
-					},
-					{
-						label: '医药卫生大类',
-						value: '医药卫生大类'
-					},
-					{
-						label: '财经商贸大类',
-						value: '财经商贸大类'
-					},
-					{
-						label: '旅游大类',
-						value: '旅游大类'
-					},
-					{
-						label: '文化艺术大类',
-						value: '文化艺术大类'
-					},
-					{
-						label: '新闻传播大类',
-						value: '新闻传播大类'
-					},
-					{
-						label: '教育与体育大类',
-						value: '教育与体育大类'
-					},
-					{
-						label: '公安与司法大类',
-						value: '公安与司法大类'
-					},
-					{
-						label: '公共管理与服务大类',
-						value: '公共管理与服务大类'
-					},
-				],
-				specialtyOption2: [{
-						label: '哲学',
-						value: '哲学'
-					},
-					{
-						label: '经济学',
-						value: '经济学'
-					},
-					{
-						label: '法学',
-						value: '法学'
-					},
-					{
-						label: '教育学',
-						value: '教育学'
-					},
-					{
-						label: '文学',
-						value: '文学'
-					},
-					{
-						label: '历史学',
-						value: '历史学'
-					},
-					{
-						label: '理学',
-						value: '理学'
-					},
-					{
-						label: '工学',
-						value: '工学'
-					},
-					{
-						label: '农学',
-						value: '农学'
-					},
-					{
-						label: '医学',
-						value: '医学'
-					},
-					{
-						label: '管理学',
-						value: '管理学'
-					},
-					{
-						label: '艺术学',
-						value: '艺术学'
-					},
-					{
-						label: '军事学',
-						value: '军事学'
-					},
-					{
-						label: '交叉学科',
-						value: '交叉学科'
-					},
-				],
-			
-			}
-		},
-		computed: {
-		},
-		created() {
-			// this.getUserInfor();
-		},
-		methods: {
-			async getUserInfor(){
-				const res = await api.getUserBasisInfo();
-				if (res.Result == 1) {
-					const data = res.Data.data;
-					this.specialtyName=data.SpecialtyName;
-					this.eduLevel=data.EduLevel;
-				} else {
-					uni.showToast({
-						title: res.Message,
-						icon: "none"
-					})
-				}
-			},			
-			//显示专业弹窗
-			showZhuanYeDialog(type){
-				if(type==false){
-					this.$refs.pop_zhuanye.close();
-				}else{
-					this.$refs.pop_zhuanye.open('bottom');
-				}
-			},
-			// 改变学历
-			changeEduLevel(INDEX){
-				if(INDEX == 1){
-					this.showSpecialtyList = this.specialtyOption1;
-				}else {
-					this.showSpecialtyList = this.specialtyOption2;
-				}
-				this.specialtyName = "";
-				this.eduLevel = INDEX;
-			},
-			//选中专业类
-			checkSpecialty(ITEM) {
-				this.specialtyName = ITEM.value;
-				this.showZhuanYeDialog(false)
-			},
-			//确认表单
-			async commitForm() {
-				if (this.specialtyName == "") {
-					uni.showToast({
-						title: "请先选择专业类",
-						icon: "none"
-					})
-					return;
-				}
-				uni.showLoading({
-					title: "保存中..."
-				}) 
-				let mobileCode =  this.code;
-				const data = {
-					//SchoolName: this.schoolName,
-					EduLevel: this.eduLevel,
-					SpecialtyName: this.specialtyName,
-					//Phone: this.mobile,
-					//StartYear: this.startYear
-				}
-				const res = await api.saveUserBasisInfo(mobileCode,data);
-				uni.hideLoading();
-				if (res.Result == 1) {
-					uni.navigateBack()
-				} else {
-					uni.showToast({
-						title: res.Message,
-						icon: "none"
-					})
-				}
-			},
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.index-wrap {
-		padding: 40rpx 20rpx 60rpx;
-
-		.title-h1 {
-			font-size: 36rpx;
-			color: #000000;
-			font-weight: 600;
-			margin-bottom: 40rpx;
-		}
-
-		.item-list {
-			.item {
-				padding-bottom: 20px;
-
-				.title {
-					font-size: 28rpx;
-					color: #333;
-					margin-bottom: 20rpx;
-					text{
-						color:red;
-					}
-				}
-
-				.input-wrap {
-					width: 670rpx;
-					height: 84rpx;
-					border-radius: 12rpx;
-					border: 2rpx solid #EEEEEE;
-					padding: 0 20rpx;
-					display: flex;
-					align-items: center;
-
-					.icon-input {
-						width: 32rpx;
-						height: 32rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAMAAABF0y+mAAAAM1BMVEUAAAAwMDAyMjIzMzMyMjIwMDAzMzMyMjIzMzMyMjIzMzMzMzM0NDQwMDAzMzMzMzMzMzNtKHn7AAAAEHRSTlMAIN+/fzDvYM9wn49AEK9QVfMC+gAAAGNJREFUKM/VzTsSgDAIRVEiIf8o+1+tGcOkIjQ2etvDPOAbdV/bztzBzH6DFHjULD21zURTUf0XHg1OM55KqolqNkuGHe63BtEwSIY5wyAuI7+KgmUQ5i5nEgrmkmXxwlWFV91t2QjwOGHVAgAAAABJRU5ErkJggg==") no-repeat;
-						background-size: 100%;
-					}
-					.icon-select {
-						width: 16rpx;
-						height: 16rpx;
-						margin-left: 24rpx;
-						background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAS5JREFUWEftltsRgjAQRXehEeyACQ1IJUolYiXSiRRAMnQgjTDRZdCJCOQhhB/yH+7JZnMWhI0XbpwPO8Bega4CjLELIuYeG7IBgJJznmGSJDcAOHsMV6MKAngAQLQRQEMA91c5jhsBFBjHcRSGIUH4rkLTtm3aNWEPQVfhbSFiWlVV+fGAT4h3OJ32S0SMsTMi0qtYbanhPwBrO0FKmQkhCvV0oypeQ0xSylwIcR2WdnIWLAxRkPXG7nUSgJoyCILTAoom5aZTTTU7DfuXQU3pKqrZ8NEmHJL+AaENNwJQRGVjy4ZzfjB5y8Y/JBbK7hRb1zWNXO0yBjBV9lA0OgIrAB2EbbhxDwxPMaZsl3BnAKUS9EQjRMxosunKbSUil4+57LHuAZeQuT07wF6BJ0iYZ7lPYQRvAAAAAElFTkSuQmCC") no-repeat;
-						background-size: 100%;
-					}
-
-					.input-value {
-						width: 580rpx;
-						height: 84rpx;
-						font-size: 28rpx;
-						color: #333;
-						line-height: 84rpx;
-						padding-left: 20rpx;
-
-						&.placeholder {
-							font-size: 28rpx;
-							color: #999;
-						}
-
-						&::-webkit-input-placeholder {
-							font-size: 28rpx;
-							color: #999;
-						}
-					}
-					.mb-input-value {
-						width: 440rpx;
-						height: 84rpx;
-						font-size: 28rpx;
-						color: #333;
-						border-radius: 12rpx;
-						border: 2rpx solid #EEEEEE;
-						line-height: 84rpx;
-						padding-left: 40rpx;
-						&::-webkit-input-placeholder {
-							font-size: 28rpx;
-							color: #999;
-						}
-					}
-					.get-code-btn {
-						width: 240rpx;
-						height: 80rpx;
-						margin-left: 30rpx;
-						line-height: 80rpx;
-						background-color: #1b88ff;
-						border-radius: 12rpx;
-						font-size: 32rpx;
-						text-align: center;
-						color: #ffffff;
-						z-index: 9;
-						&.disable {
-							background: #9f9f9f;
-						}
-					}
-				}
-
-				.option {
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: space-around;
-					.subject-item {
-						width: 210rpx;
-						height: 76rpx;
-						background: #F3F4F6;
-						border-radius: 12rpx;
-						font-size: 28rpx;
-						color: #333;
-						margin-bottom: 20rpx;
-						margin-right: 30rpx;
-						text-align: center;
-						line-height: 76rpx;
-
-						&:nth-child(3n) {
-							margin-right: 0;
-						}
-
-						&.on {
-							background: #F3F4F6;
-							color: #1677ff;
-						}
-
-						&.disadble {
-							color: #bbb;
-						}
-					}
-				}
-			}
-		}
-
-		.btn-wrap {
-			position: fixed;
-			bottom: 100rpx;
-			left: 50%;
-			transform: translateX(-50%);
-			display: flex;
-			justify-content: center;
-			z-index: 9;
-
-			.btn {
-				width: 688rpx;
-				height: 88rpx;
-				line-height: 88rpx;
-				text-align: center;
-				background: #1677ff;
-				font-size: 32rpx;
-				color: #fff;
-				border-radius: 60rpx;
-
-				&.disable {
-					background: #F3F4F6;
-					color: #bbb;
-				}
-			}
-		}
-		.layer-inner {
-			background:#fff;
-			border-radius:10px 10px 0 0;
-			.head {
-				position: relative;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				height: 120rpx;
-				width: 100%;
-				font-size: 34rpx;
-				color: #000000;
-
-				.close-btn {
-					position: absolute;
-					top: 39rpx;
-					right: 27rpx;
-					width: 52rpx;
-					height: 52rpx;
-					background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAQAAAADQ4RFAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAHdElNRQfmChMLCDGRh9c8AAAAmklEQVQ4y7WUMQ7DMAhFnzpmRO3979ABqVN8m/YWdLGcqEkM+lI92Qb+R3wAPgRPjMoxnOANQRCsLGnIwtq98X5pCZvRuucLHuMxY9tYGvffD0tYdsA2ZbsEvWabAp4b09SPDlYp0t4JSAt0YPOhYEH4ja0m+jg+QvzMfKuh/CE9oRBCyQVxhTYSGlYYDWEIpXGXFou0woRl+QUj09L9Yg66GgAAAABJRU5ErkJggg==") center no-repeat;
-					background-size: 50%;
-				}
-			}
-
-			.content {
-				max-height: 640rpx;
-				overflow: auto;
-				padding: 0 40rpx;
-
-				.li {
-					position: relative;
-					height: 114rpx;
-					line-height: 114rpx;
-					border-bottom: 2rpx solid #f5f5f5;
-
-					text {
-						font-size: 30rpx;
-						color: #000000;
-						margin-right: 20rpx;
-					}
-
-					&.on {
-						text {
-							color: #1b88ff;
-						}
-
-						&::after {
-							position: absolute;
-							right: 10rpx;
-							top: 50%;
-							transform: translateY(-50%);
-							content: "";
-							background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAZCAMAAACM5megAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAATlBMVEUbiP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8biP8AAAAx8hE2AAAAGHRSTlMAH0f2c0SVAfc7bv6JI/hS+UhR+1D0jxRK42VSAAAAAWJLR0QZ7G61iAAAAAd0SU1FB+YKFBEcF+FCm4sAAABsSURBVCjPzdHHDoAwDANQs1cLlJn//1KGEIKqrY+QY/QOiQ2QiRgA4iTlRCTjJC9+QsqPSMVJ3ShGdCuiwgToegu5zrWQ+6MX8j39QMaby41MILoLmWC6JzKkgGFHI+voQKxGTLMshACrdu83CdwKBKKZxqUAAAAASUVORK5CYII=") no-repeat;
-							background-size: 100%;
-							display: block;
-							width: 35rpx;
-							height: 25rpx;
-						}
-					}
-				}
-			}
-
-			.op-block {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				padding: 30rpx 40rpx 0;
-				width: 670rpx;
-				height: 115rpx;
-
-				.commit-btn {
-					width: 361rpx;
-					height: 77rpx;
-					line-height: 77rpx;
-					text-align: center;
-					background-color: #1b88ff;
-					border-radius: 38rpx;
-					font-size: 30rpx;
-					color: #ffffff;
-				}
-			}
-		}
-	}
-</style>

packageCa/userCenter/learningPlan.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>学习计划制定</text>
-		</view>
 		<view class="content">
 			<view class="title-h1">PDCA 循环法</view>
 			<view class="banner"></view>
@@ -150,9 +146,6 @@
 			this.queryPlanList();
 		},
 		methods: {
-			goBack(){
-				uni.navigateBack(-1);
-			},
 			// 切换目标标签
 			changeTarget(ITEM){
 				if(ITEM.EncodeId == this.checkedTargetCode){

packageCa/userCenter/personDocument.vue

@@ -1,23 +1,6 @@
 <template>
 	<view class="document">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goback"></view>
-			<text>生涯档案</text>
-		</view>
-		<view class="person-info" style="display:none;">
-			<view class="img-wrap">
-				<image v-if="customInfo.AllHeadimgUrl" :src="customInfo.AllHeadimgUrl"></image>
-				<image v-else src="https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/avatar.png"  mode=""></image>
-			</view>
-			<view class="txt-wrap">
-				<view class="top">
-					<view class="name">{{user.RealName}}</view>
-					<!-- <view class="grades">{{user.GradeName}}{{user.ClassName}}</view> -->
-				</view>
-				<view class="bottom">{{user.SchoolName}}</view>
-			</view>
-		</view>
-		<view class="section" style="margin-top:60rpx;">
+	<!-- 	<view class="section" style="margin-top:60rpx;">
 			<view class="head">
 				<view class="left-txt">
 					<view class="icon icon-1"></view>
@@ -44,8 +27,8 @@
 			<view class="footer">
 				<navigator url="/packageCa/job/index" class="btn">添加意向职业</navigator>
 			</view>
-		</view>
-		<view class="section">
+		</view> -->
+		<view class="section" >
 			<view class="head">
 				<view class="left-txt">
 					<view class="icon icon-4"></view>
@@ -223,7 +206,7 @@
 			<view class="content" v-if="universalResult != null&&universalResult !=''">
 				<view class="text-wrap">
 					<view class="row">
-						<text class="label">优势的能力： </text>
+						<text class="label">优秀的能力： </text>
 						<view class="long-value" v-if="universalResult != null && universalResult.length > 0 && universalGroupList1.length > 0">
 							<text  v-for="(item, index) in universalGroupList1" :key="index">
 									{{item}} <text v-if="index < universalGroupList1.length -1">、</text>
@@ -233,6 +216,17 @@
 							<text>无</text>
 						</view>
 					</view>
+					<view class="row">
+						<text class="label">优势的能力： </text>
+						<view class="long-value" v-if="universalResult != null && universalResult.length > 0 && universalGroupList2.length > 0">
+							<text  v-for="(item, index) in universalGroupList2" :key="index">
+									{{item}} <text v-if="index < universalGroupList2.length -1">、</text>
+							</text>
+						</view>
+						<view class="long-value"  v-else>
+							<text>无</text>
+						</view>
+					</view>
 				</view>
 			</view>
 			<view class="content" v-else>
@@ -298,6 +292,7 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 				multGroupList1: [],//多元能力能力强
 				universalResult: "",//通用能力
 				universalGroupList1: [],//通用能力 优势
+				universalGroupList2: [],//通用能力 优势
 			}
 		},
 		onShow() {
@@ -308,19 +303,16 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 		created() {
 		},
 		methods: {
-			goback(){
-				uni.navigateBack(-1);
-			},
 			// 获取个人档案
 			async queryStudentProfile() {
 				uni.showLoading({
 					title: "加载中"
 				})
 				const gradeLevel = this.user.GradeLevel;
-				const res = gradeLevel == 3? await api1.getGXWechatStudentProfile() : await api.queryStudentProfile();
+				const res = await api1.getGXWechatStudentProfile();
 				uni.hideLoading();
 				if(res.Result == 1){
-					let data = gradeLevel == 3? res.Data.list : res.Data;
+					let data =  res.Data;
 					// 意向职业
 					this.intentionJobList = data.IntentionJobList;
 					// 意向专业
@@ -373,6 +365,7 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 						this.multResult = data.MultResult;
 						// 通用能力
 						this.universalGroupList1 = data.UniversalGroupList1;
+						this.universalGroupList2 = data.UniversalGroupList2;
 						this.universalResult = data.UniversalResult;
 					}
 				}

packageCa/userCenter/professionPath.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-		    <text>职业路径</text>
-		</view>
 		<view class="content">
 			<view class="section">
 				<view class="title-h1">
@@ -22,9 +18,6 @@
 						<view class="th">
 							我的意向
 						</view>
-						<view class="th">
-							专业匹配
-						</view>
 					</view>
 					<view class="tr" v-for="(item,index) in jobList" @click="checkedJob(item)" :key="index">
 						<view class="td">
@@ -39,9 +32,9 @@
 						<view class="td">
 							<view class="is-has" v-if="item.IsIntention"></view>
 						</view>
-						<view class="td">
+					<!-- 	<view class="td">
 							<view class="is-has" v-if="item.IsSpecialtyMatch"></view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="empty" v-else>
@@ -51,7 +44,7 @@
 						去测评
 					</view>
 				</view>
-				<view class="title-h1">
+				<view class="title-h1" v-if="jobList.length > 0">
 					职业介绍
 				</view>
 				<view class="desc">
@@ -60,7 +53,7 @@
 					</view>
 					{{jobIntroduce}}
 				</view>
-				<view class="title-h1">
+				<view class="title-h1" v-if="jobList.length > 0">
 					发展路径
 				</view>
 				<view class="desc">
@@ -68,9 +61,9 @@
 						{{jobPath}}
 					</view>
 				</view>
-				<view class="path-map">
+				<view class="path-map" v-if="jobList.length > 0">
 					<view class="origin-item">
-						大学生
+						我
 					</view>
 					<view class="path-list" :class="isLoadingEnd?'show':'ing'">
 						<view class="line-1">
@@ -183,6 +176,9 @@
 			// 获取职业
 			async queryPathInfo(){
 				this.isLoadingEnd = false;
+				if(this.jobList.length == 0){
+					return;
+				}
 				const res = await api.queryPathInfo(this.checkedCode);
 				if (res.Result == 1) {
 					let data = res.Data;
@@ -221,9 +217,6 @@
 					icon:"none"
 				});
 			},
-			goBack(){
-				uni.navigateBack(-1);
-			},
 		}
 	}
 </script>
@@ -312,7 +305,7 @@
 					.tr {
 						display: -webkit-box;
 						.th {
-							width: 145rpx;
+							width: 170rpx;
 							height: 72rpx;
 							line-height: 72rpx;
 							text-align: center;
@@ -331,7 +324,7 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							width: 145rpx;
+							width: 170rpx;
 							min-height: 72rpx;
 							font-size: 24rpx;
 							color: #333333;

packageCa/userCenter/smartTarget.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="index-wrap">
-		<view class="head-bar" :style="{'margin-top': barHeight + 5 + 'px'}">
-			<view class="go-back" @click="goBack"></view>
-			<text>smart目标制定</text>
-		</view>
 		<view class="content">
 			<view class="banner-wrap"></view>
 			<view class="desc">
@@ -186,6 +182,7 @@
 				tabs:['目标一 ', '目标二 ', '目标三 ', '目标四 ', '目标五 '],
 				targetList: [],////目标列表
 				checkedTargetCode: "",//// 目标码
+				videoUrlVisitor: "",
 				newTargetParams: {
 					Id: 0,
 					TargetDesc: "",
@@ -215,9 +212,6 @@
 					url:"/packageCa/userCenter/learningPlan"
 				})	
 			},
-			goBack(){
-				uni.navigateBack(-1);
-			},
 			// 添加目标
 			addTarget(){
 				this.targetForm = {
@@ -383,10 +377,18 @@
 			background-size: 38rpx 38rpx;
 		}
 	}
+	.video-content {
+		padding: 0;
+		width: 710rpx;
+		background: #000;
+		.video {
+			width: 100%;
+			// height: 400rpx;
+		}
+	}
 
 	.index-wrap {
 		.content {
-			padding-top: 60rpx;
 			padding-bottom: 60rpx;
 
 			.banner-wrap {

packageCa/utilCa/config.js

@@ -1,40 +1,13 @@
 let baseUrl = ""
-let baseUrl1 = ""
-let baseUrl2 = ""
-let baseUrl3 = ""
-let baseUrl4 = ""
-let baseUrl5 = ""
-let baseUrl6 = ""
-let baseUrl7 = ""
-let baseUrl8 = ""
-let filestore_site = "";
 // #ifdef MP-WEIXIN
 // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
 if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') {
-    baseUrl = 'http://dev.51xuanxiao.com:8005/api' // 开发环境
-	baseUrl3 = 'http://dev.51xuanxiao.com:8007/api' // 职业环境
-	baseUrl4 = 'http://dev.51xuanxiao.com:8009/api' // 用户环境
-	baseUrl5 = 'http://dev.51xuanxiao.com:8006/api' // 测评环境
-	filestore_site = 'http://192.168.1.168:31128' //文件地址
+    baseUrl = 'https://localhost:7026/career' // 开发环境
 } else {
-    baseUrl = 'https://yanxueapi.51xuanxiao.com/api' // 生产环境
-    baseUrl3 = "https://jobapi.51xuanxiao.com/api"// 职业环境
-    baseUrl4 = "https://authapi.51xuanxiao.com/api"// 用户环境
-    baseUrl5 = "https://testapi.51xuanxiao.com/api"// 测评环境
-	filestore_site = 'https://filestore.plan.51xuanxiao.com' //文件地址
+    baseUrl = 'https://ksrs.51xuanxiao.com' // 生产环境
 }
 // #endif
 
 export {
-    baseUrl,
-    baseUrl1,
-    baseUrl2,
-    baseUrl3,
-    baseUrl4,
-    baseUrl5,
-    baseUrl6,
-    baseUrl7,
-    baseUrl8,
-	filestore_site
+    baseUrl
 }
-

packageCa/utilCa/imageUrl.js

@@ -1,20 +0,0 @@
-// 公共图片基地址
-const BASE_IMAGE_URL = 'https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh';
-
-/**
- * 图片地址拼接方法
- * @param {string} path - 图片路径（相对于基地址的路径）
- * @param {string} [process] - OSS图片处理参数，例如：'image/resize,m_fixed,w_348/quality,q_80'
- * @returns {string} 完整的图片URL
- */
-export function ossImageUrl(path, process) {
-  
-  // 如果有处理参数，拼接处理参数
-  if (process) {
-    return `${BASE_IMAGE_URL}/${path}?x-oss-process=${process}`;
-  }
-  
-  // 没有处理参数时，直接返回原始路径
-  return `${BASE_IMAGE_URL}/${path}`;
-}
-

packageCa/utilCa/request.js

@@ -1,14 +1,4 @@
-import {
-    baseUrl,
-    baseUrl1,
-    baseUrl2,
-    baseUrl3,
-    baseUrl4,
-    baseUrl5,
-    baseUrl6,
-    baseUrl7,
-    baseUrl8
-} from './config.js'
+import { baseUrl} from './config.js'
 
 const request = {}
 const headers = {}
@@ -18,77 +8,23 @@ request.globalRequest = (url, method, data, power, type) => {
     // 1 == 不通过access_token校验的接口
     // 2 == 文件下载接口列表
     const userInfo = uni.getStorageSync('CAuserInfo')
-    // console.log('缓存userinfo:',userInfo);
-    switch (power) {
-        case 1:
-        case 3:
-            headers['Token'] = userInfo.token
-			// if(power == 3){
-			// 	const deviceInfo = wx.getDeviceInfo()
-			// 	let data = {
-			// 		model: deviceInfo.model,
-			// 		system: deviceInfo.system,
-			// 		platform: deviceInfo.platform
-			// 	}
-			// 	headers['DeviceInfo'] = JSON.stringify(data)
-			// }
-            break;
-        case 2:
-            headers['Authorization'] = userInfo.userToken
-            break;
-        default:
-            break;
-    }
-    let host = "";
-    let key = "";
-    if (type == 1) {
-        host = baseUrl1;
-    } else if (type == 2) {
-        host = baseUrl2;
-    } else if (type == 3) {
-        host = baseUrl3;
-    } else if (type == 4) {
-        host = baseUrl4;
-    } else if (type == 5) {
-        host = baseUrl5;
-    } else if (type == 7) {
-        host = baseUrl7;
-        key = `?PartnerKey=51xuanxiao&PartnerSecret=mC6XRjDWUzGAdxcCqRBWGb88uR`;
-    } else if (type == 8) {
-        host = baseUrl8;
-        //key = `?AppKey=51xuanxiao&AppSecret=mC6XRjDWUzGAdxcCqRBWGb88uR`;
-    } else {
-        host = baseUrl;
-    }
+	console.log("ca用户",userInfo);
+	if(userInfo != ""){
+		headers['Token'] = userInfo.token
+	}
     return uni.request({
         timeout: 60000,
-        url: host + url + key,
+        url: baseUrl + url,
         method,
         data: data,
         dataType: 'json',
         header: headers
     }).then(res => {
-		//console.log("ressss===="+JSON.stringify(res.data));	
-		// console.log("type===="+type);	
-        if (type == 7) {
-            if (res[1].data.code == 0) {
-                return res[1].data
-            } else {
-                throw res[1].data
-            }
-        } else if (type == 8) {
-            if (res[1].data.Code == 0) {
-                return res[1].data
-            } else {
-                throw res[1].data
-            }
-        } else {
-            if (res.data.Result) {
-                return res.data
-            } else {
-                throw res.data
-            }
-        }
+		if (res.data.Result) {
+			return res.data
+		} else {
+			throw res.data
+		}
     }).catch(parmas => {
         switch (parmas.status) {
             case 401:

packageRc/pages/index/index.vue

@@ -1,12 +1,13 @@
 <!--
  * @Date: 2025-10-16 15:15:47
  * @LastEditors: lip
- * @LastEditTime: 2025-11-07 12:08:01
+ * @LastEditTime: 2025-11-19 18:22:34
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
   <scroll-view :scroll-y="true" class="container" style="background-image: url('../../../packageRc/static/pageBg.png');">
     <view style="padding: 40rpx 28rpx;">
+         <!-- #ifdef MP-WEIXIN -->
       <view class="kinggang">
         <view @click="navTo('/packageA/pages/myResume/myResume')">
           <image src="../../../packageRc/static/kinggang1.png"/>
@@ -29,6 +30,7 @@
           <view>素质测评</view>
         </view>
       </view>
+      <!-- #endif -->
       <view class="tabs">
         <view class="tab" :class="{active: pageState.type == ''}" @click="changeJobType('')">岗位列表</view>
         <view class="tab" :class="{active: pageState.type == 2}" @click="changeJobType(2)">实习实训</view>

pages.json

@@ -125,6 +125,24 @@
           "navigationBarTitleText": "社保登录",
           "navigationStyle": "custom"
         }
+      },
+      {
+        "path": "pages/resume-guide/resume-guide",
+        "style": {
+          "navigationBarTitleText": "简历制作指导"
+        }
+      },
+      {
+        "path": "pages/resume-guide/resume-example",
+        "style": {
+          "navigationBarTitleText": "简历示例"
+        }
+      },
+      {
+        "path": "pages/service/salary-info",
+        "style": {
+          "navigationBarTitleText": "薪酬信息"
+        }
       }
     ],
     "subpackages": [
@@ -479,7 +497,7 @@
           {
             "path": "search/search",
             "style": {
-              "navigationBarTitleText": "生涯规划"
+              "navigationBarTitleText": "素质测评"
             }
           },
           {
@@ -542,22 +560,16 @@
               "navigationBarTitleText": "学业规划"
             }
           },
-          {
-            "path": "userCenter/fillInInformation",
-            "style": {
-              "navigationBarTitleText": "完善个人信息"
-            }
-          },
           {
             "path": "pagesTest/testList",
             "style": {
-              "navigationBarTitleText": "生涯测评"
+              "navigationBarTitleText": "职业测评"
             }
           },
           {
             "path": "pagesTest/customTestTitle",
             "style": {
-              "navigationBarTitleText": "自定义测评"
+              "navigationBarTitleText": "能力测评"
             }
           },
           {

pages/index/components/index-one.vue

@@ -74,6 +74,18 @@
                 </view> -->
             </view>
             
+            <!-- H5端专用按钮 -->
+            <!-- #ifdef H5 -->
+            <view class="h5-action-buttons" v-if="shouldShowJobSeekerContent">
+                <view class="h5-action-btn press-button" @click="handleH5SalaryClick">
+                    <view class="btn-text">薪酬信息</view>
+                </view>
+                <view class="h5-action-btn press-button" @click="handleServiceClick('resume-creation')">
+                    <view class="btn-text">简历指导</view>
+                </view>
+            </view>
+            <!-- #endif -->
+            
             <!-- 服务功能网格 -->
             <!-- #ifndef H5 -->
             <view class="service-grid" v-if="shouldShowJobSeekerContent">
@@ -93,7 +105,7 @@
                     <view class="service-icon service-icon-3">
                         <IconfontIcon name="jianli" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">简历制作</view>
+                    <view class="service-title">简历指导</view>
                 </view>
                 <view class="service-item press-button" @click="handleServiceClick('labor-policy')">
                     <view class="service-icon service-icon-4">
@@ -119,13 +131,13 @@
                     </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="goCaAI()">
                     <view class="service-icon service-icon-9">
                         <IconfontIcon name="ai" :size="68" color="#FFFFFF" />
                     </view>
@@ -143,11 +155,11 @@
                     </view>
                     <view class="service-title">职业规划推荐</view>
                 </view>
-                <view class="service-item press-button" @click="navToTestPage">
-                    <view class="service-icon service-icon-10">
-                        <uni-icons type="gear-filled" size="32" color="#FFFFFF"></uni-icons>
+                <view class="service-item press-button" @click="handleSalaryInfoClick">
+                    <view class="service-icon service-icon-12">
+                        <span style="display:block;width:40rpx;height:40rpx;border-radius:100%;border:4rpx #ffffff solid;line-height:40rpx;text-align:center;">￥</span>
                     </view>
-                    <view class="service-title">测试页面</view>
+                    <view class="service-title">薪酬信息</view>
                 </view>
             </view>
             <!-- #endif -->
@@ -751,9 +763,13 @@ const handleLiveClick = () => {
     // #endif
 };
 
-// 跳转到测试页面
-const navToTestPage = () => {
-    navTo('/pages/test/homepage-test');
+// 处理薪酬信息点击
+const handleSalaryInfoClick = () => {
+    navTo('/pages/service/salary-info');
+};
+const handleH5SalaryClick = () => {
+    const salaryUrl = "https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html";
+    window.location.assign(salaryUrl);
 };
 
 async function loadData() {
@@ -844,13 +860,13 @@ function navToService(serviceType) {
     const serviceRoutes = {
         'service-guidance': '/pages/service/guidance',
         'public-recruitment': '/pages/service/public-recruitment', 
-        'resume-creation': '/packageA/pages/myResume/myResume',
+        'resume-creation': '/pages/resume-guide/resume-guide',
         'labor-policy': '/pages/service/labor-policy',
         'skill-training': '/pages/service/skill-training',
         // 'skill-evaluation': '/pages/service/skill-evaluation',
         'question-bank': '/pages/service/question-bank',
-        'quality-assessment': '/pages/service/quality-assessment',
-        'ai-interview': '/pages/chat/chat',
+        // 'quality-assessment': '/packageCa/search/search',
+        // 'ai-interview': '/pages/chat/chat',
         'job-search': '/pages/search/search',
         'career-planning': '/pages/service/career-planning',
         'salary-query': '/pages/service/salary-query',
@@ -1058,6 +1074,24 @@ function goRc(){
         });
     }
 }
+// 跳转到素质测评
+function goCa(){
+    if (checkLogin()) {
+        let userInfo = uni.getStorageSync('userInfo')
+        storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+            navTo(`/packageCa/search/search?name=${userInfo.name}&idCard=${userInfo.idCard}`);
+        });
+    }
+}
+// 跳转到AI面试
+function goCaAI(){
+    if (checkLogin()) {
+        let userInfo = uni.getStorageSync('userInfo')
+        storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+            navTo(`/packageCa/search/AIAudition?name=${userInfo.name}&idCard=${userInfo.idCard}`);
+        });
+    }
+}
 
 
 defineExpose({ loadData });
@@ -1283,6 +1317,29 @@ defineExpose({ loadData });
         background-size: cover;
         background-position: center;
 
+// H5端专用按钮样式
+.h5-action-buttons
+    padding: 16rpx 28rpx
+    display: flex
+    gap: 16rpx
+    .h5-action-btn
+        flex: 1
+        height: 60rpx
+        background:#FFFFFF
+        border-radius: 8rpx
+        display: flex
+        align-items: center
+        justify-content: center
+        transition: opacity 0.2s ease
+        box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(37, 107, 250, 0.3)
+        &:active
+            opacity: 0.8
+        
+        .btn-text
+            font-family: 'PingFangSC-Regular', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif
+            font-weight: 400
+            font-size: 26rpx
+            color: #256BFA
 // 服务功能网格样式
 .service-grid
     padding: 20rpx 28rpx
@@ -1378,13 +1435,9 @@ defineExpose({ loadData });
         .service-icon-12
             background: linear-gradient(135deg, #4CAF50 0%, #81C784 100%)
             position: relative
-            &::before
-                content: '💰'
-                position: absolute
-                top: 50%
-                left: 50%
-                transform: translate(-50%, -50%)
-                font-size: 32rpx
+            display: flex
+            align-items: center
+            justify-content: center
         .service-icon-13
             background: linear-gradient(135deg, #607D8B 0%, #90A4AE 100%)
             position: relative

pages/job/publishJob.vue

@@ -111,15 +111,13 @@
                 </view>
                 <view class="form-group">
                     <view class="label">工作地点</view>
-                    <view class="location-input-container">
-                        <input 
-                            class="input location-input" 
-                            placeholder="请输入具体工作地址" 
-                            v-model="formData.jobLocation"
-                        />
-                        <view class="location-icon-btn" @click="chooseLocation">
-                            <uni-icons type="location" size="20" color="#333"></uni-icons>
-                        </view>
+                    <input 
+                        class="input" 
+                        placeholder="请输入具体工作地址" 
+                        v-model="formData.jobLocation"
+                    />
+                    <view class="location-text-btn" @click="chooseLocation">
+                        <text class="location-btn-text">获取定位</text>
                     </view>
                 </view>
                 <view class="form-group">
@@ -594,6 +592,15 @@ const validateForm = () => {
         }
     }
 
+    // 验证定位信息
+    if (!formData.latitude || !formData.longitude) {
+        uni.showToast({
+            title: '请点击"获取定位"按钮获取工作地点位置',
+            icon: 'none'
+        });
+        return false;
+    }
+
     // 薪资验证
     const minSalary = parseFloat(formData.minSalary);
     const maxSalary = parseFloat(formData.maxSalary);
@@ -792,36 +799,28 @@ const validateForm = () => {
         }
     }
     
-    // 工作地点输入容器样式
-    .location-input-container {
+    // 工作地点文字按钮样式
+    .location-text-btn {
+        width: 100%;
+        height: 80rpx;
+        background: #256BFA;
+        border: none;
+        border-radius: 12rpx;
         display: flex;
         align-items: center;
-        position: relative;
+        justify-content: center;
+        margin-top: 20rpx;
+        transition: all 0.3s ease;
         
-        .location-input {
-            flex: 1;
-            padding-right: 100rpx;
+        .location-btn-text {
+            font-size: 28rpx;
+            color: #fff;
+            font-weight: 500;
         }
         
-        .location-icon-btn {
-            position: absolute;
-            right: 0;
-            top: 44%;
-            transform: translateY(-50%);
-            width: 80rpx;
-            height: 60rpx;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            background: #f0f0f0;
-            border: none;
-            border-radius: 12rpx;
-            transition: all 0.3s ease;
-            z-index: 99;
-            
-            &:active {
-                transform: translateY(-50%) scale(0.95);
-            }
+        &:active {
+            background: #1a5cd9;
+            transform: scale(0.98);
         }
     }
 }

pages/login/h5-login.vue

@@ -75,29 +75,11 @@
 					<view class="loading-spinner" v-else></view>
 				</view>
 			</button>
-
-			<!-- 其他登录方式 -->
-			<view class="other-login">
-				<view class="divider">
-					<view class="divider-line"></view>
-					<view class="divider-text">其他登录方式</view>
-					<view class="divider-line"></view>
-				</view>
-				
-				<view class="login-options">
-					<view class="login-option" @click="goToIdCardLogin">
-						<view class="option-icon">
-							<uni-icons type="idcard" size="36" color="#4778EC"></uni-icons>
-						</view>
-						<view class="option-text">社保卡登录</view>
-					</view>
-				</view>
-			</view>
 		</view>
 
 		<!-- 底部信息 -->
 		<view class="footer">
-			<view class="footer-text">© 2024 社保就业服务平台</view>
+			<view class="footer-text">新疆喀什智慧就业平台</view>
 		</view>
 	</view>
 </template>
@@ -211,11 +193,11 @@ const handleLogin = async () => {
 				title: '登录成功',
 				icon: 'success'
 			})
-			
-			// 跳转到首页
-			uni.reLaunch({
-				url: '/pages/index/index'
-			})
+			window.location.assign('http://222.80.110.161:11111/mechine-dual-vue/login')
+			// // 跳转到首页
+			// uni.reLaunch({
+			// 	url: '/pages/index/index'
+			// })
 		} else {
 			uni.showToast({
 				title: '登录失败',

pages/resume-guide/resume-example.vue

@@ -0,0 +1,513 @@
+<template>
+  <AppLayout backGorundColor="#FFFFFF">
+    <view class="resume-example-container">
+      <!-- 职业选择 -->
+      <view class="job-selector">
+        <view 
+          class="job-option" 
+          :class="{ active: selectedJob === job.value }"
+          v-for="job in jobTypes" 
+          :key="job.value"
+          @click="selectJob(job.value)"
+        >
+          {{ job.label }}
+        </view>
+      </view>
+
+      <!-- 简历示例内容 -->
+      <view class="resume-content">
+        <view class="resume-header">
+          <view class="name">{{ resumeData.name }}</view>
+          <view class="contact-info">
+            <text v-if="resumeData.phone">{{ resumeData.phone }} | </text>
+            <text v-if="resumeData.email">{{ resumeData.email }} | </text>
+            <text v-if="resumeData.location">{{ resumeData.location }}</text>
+          </view>
+        </view>
+
+        <view class="resume-section" v-if="resumeData.education && resumeData.education.length > 0">
+          <view class="section-title">教育背景</view>
+          <view class="section-content">
+            <view class="education-item" v-for="(edu, index) in resumeData.education" :key="index">
+              <view class="edu-header">
+                <text class="school">{{ edu.school }}</text>
+                <text class="date">{{ edu.date }}</text>
+              </view>
+              <view class="degree">{{ edu.degree }} - {{ edu.major }}</view>
+              <view class="desc" v-if="edu.desc">{{ edu.desc }}</view>
+            </view>
+          </view>
+        </view>
+
+        <view class="resume-section" v-if="resumeData.skills && resumeData.skills.length > 0">
+          <view class="section-title">技能专长</view>
+          <view class="section-content">
+            <view class="skills-grid">
+              <view class="skill-tag" v-for="(skill, index) in resumeData.skills" :key="index">
+                {{ skill }}
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="resume-section" v-if="resumeData.experience && resumeData.experience.length > 0">
+          <view class="section-title">工作经历</view>
+          <view class="section-content">
+            <view class="experience-item" v-for="(exp, index) in resumeData.experience" :key="index">
+              <view class="exp-header">
+                <text class="company">{{ exp.company }}</text>
+                <text class="date">{{ exp.date }}</text>
+              </view>
+              <view class="position">{{ exp.position }}</view>
+              <view class="responsibilities">
+                <view class="resp-item" v-for="(resp, idx) in exp.responsibilities" :key="idx">
+                  {{ resp }}
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="resume-section" v-if="resumeData.projects && resumeData.projects.length > 0">
+          <view class="section-title">项目经验</view>
+          <view class="section-content">
+            <view class="project-item" v-for="(project, index) in resumeData.projects" :key="index">
+              <view class="project-header">
+                <text class="project-name">{{ project.name }}</text>
+                <text class="date">{{ project.date }}</text>
+              </view>
+              <view class="project-role">{{ project.role }}</view>
+              <view class="project-desc">{{ project.desc }}</view>
+              <view class="achievements">
+                <view class="achievement-item" v-for="(ach, idx) in project.achievements" :key="idx">
+                  ● {{ ach }}
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </AppLayout>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+
+// 职业类型选项
+const jobTypes = [
+  { label: '软件工程师', value: 'software-engineer' },
+  { label: '产品经理', value: 'product-manager' },
+  { label: '市场营销', value: 'marketing' },
+  { label: '财务会计', value: 'accountant' },
+  { label: '人力资源', value: 'hr' }
+];
+
+// 当前选中的职业
+const selectedJob = ref('software-engineer');
+
+// 选择职业
+const selectJob = (jobValue) => {
+  selectedJob.value = jobValue;
+};
+
+// 不同职业的简历数据
+const resumeSamples = {
+  'software-engineer': {
+    name: '张伟',
+    phone: '138-0000-0000',
+    email: 'zhangwei@example.com',
+    location: '北京市',
+    education: [
+      {
+        school: '清华大学',
+        date: '2016.09 - 2020.06',
+        degree: '本科',
+        major: '计算机科学与技术',
+        desc: '主修课程：数据结构、算法设计、数据库原理、操作系统'
+      }
+    ],
+    experience: [
+      {
+        company: '腾讯科技有限公司',
+        date: '2022.07 - 至今',
+        position: '高级前端工程师',
+        responsibilities: [
+          '负责公司核心产品的前端架构设计和开发',
+          '主导团队技术选型，推动Vue3 + TypeScript技术栈落地',
+          '优化前端性能，页面加载速度提升40%',
+          '指导初级工程师，提升团队整体技术水平'
+        ]
+      },
+      {
+        company: '阿里巴巴集团',
+        date: '2020.07 - 2022.06',
+        position: '前端工程师',
+        responsibilities: [
+          '参与电商平台前端开发，使用Vue.js框架',
+          '负责商品详情页和购物车模块开发',
+          '优化页面响应速度，用户体验评分提升25%',
+          '编写技术文档，协助测试团队完成测试用例'
+        ]
+      }
+    ],
+    skills: [
+      'Vue.js', 'React', 'JavaScript', 'TypeScript', 'HTML5', 'CSS3',
+      'Node.js', 'Webpack', 'Git', '小程序开发', '响应式设计'
+    ],
+    projects: [
+      {
+        name: '电商平台前端重构项目',
+        date: '2023.03 - 2023.09',
+        role: '前端技术负责人',
+        desc: '主导公司核心电商平台的前端重构工作，提升用户体验和系统性能',
+        achievements: [
+          '采用微前端架构，实现多团队协同开发',
+          '页面加载速度提升40%，用户停留时长增加25%',
+          '代码可维护性大幅提升，bug率降低30%'
+        ]
+      }
+    ]
+  },
+  'product-manager': {
+    name: '李娜',
+    phone: '139-0000-0000',
+    email: 'lina@example.com',
+    location: '上海市',
+    education: [
+      {
+        school: '复旦大学',
+        date: '2015.09 - 2019.06',
+        degree: '本科',
+        major: '工商管理',
+        desc: '主修课程：市场营销、消费者行为学、战略管理'
+      }
+    ],
+    experience: [
+      {
+        company: '字节跳动',
+        date: '2021.05 - 至今',
+        position: '高级产品经理',
+        responsibilities: [
+          '负责短视频产品功能规划和迭代优化',
+          '分析用户行为数据，制定产品策略',
+          '协调设计、开发、运营团队推进项目落地',
+          '跟踪竞品动态，持续优化产品体验'
+        ]
+      },
+      {
+        company: '美团',
+        date: '2019.07 - 2021.04',
+        position: '产品经理',
+        responsibilities: [
+          '负责外卖商家端产品功能设计',
+          '通过数据分析发现业务增长点',
+          '推动商户入驻流程优化，提升转化率15%',
+          '组织跨部门会议，推进项目进度'
+        ]
+      }
+    ],
+    skills: [
+      '产品设计', '数据分析', '用户研究', 'Axure', 'SQL',
+      '项目管理', '沟通协调', '市场调研', '竞品分析'
+    ],
+    projects: [
+      {
+        name: '智能推荐系统优化',
+        date: '2023.01 - 2023.06',
+        role: '项目经理',
+        desc: '优化平台内容推荐算法，提升用户粘性和内容消费时长',
+        achievements: [
+          '推荐准确率提升20%，用户满意度显著提高',
+          '日活跃用户增长12%，内容消费时长增加18%',
+          '项目获公司年度创新奖'
+        ]
+      }
+    ]
+  },
+  'marketing': {
+    name: '王强',
+    phone: '136-0000-0000',
+    email: 'wangqiang@example.com',
+    location: '广州市',
+    education: [
+      {
+        school: '中山大学',
+        date: '2017.09 - 2021.06',
+        degree: '本科',
+        major: '市场营销',
+        desc: '主修课程：市场营销学、消费者心理学、品牌管理'
+      }
+    ],
+    experience: [
+      {
+        company: '宝洁公司',
+        date: '2021.08 - 至今',
+        position: '品牌推广专员',
+        responsibilities: [
+          '负责洗护用品品牌线上线下推广活动策划',
+          '分析市场数据，制定营销策略',
+          '协调广告公司和媒体资源',
+          '跟踪活动效果，撰写分析报告'
+        ]
+      }
+    ],
+    skills: [
+      '品牌推广', '社交媒体营销', '数据分析', '活动策划',
+      '广告投放', 'SEO/SEM', '内容营销', '客户关系管理'
+    ],
+    projects: [
+      {
+        name: '新品上市推广 campaign',
+        date: '2023.03 - 2023.05',
+        role: '推广负责人',
+        desc: '负责公司新款洗发水产品上市的全渠道推广活动',
+        achievements: [
+          '首月销售额突破500万元，超出预期目标20%',
+          '社交媒体话题阅读量超1000万次',
+          '成功签约10位知名KOL进行产品推广'
+        ]
+      }
+    ]
+  },
+  'accountant': {
+    name: '陈丽',
+    phone: '137-0000-0000',
+    email: 'chenli@example.com',
+    location: '深圳市',
+    education: [
+      {
+        school: '厦门大学',
+        date: '2018.09 - 2022.06',
+        degree: '本科',
+        major: '会计学',
+        desc: '主修课程：财务会计、成本会计、税法、审计'
+      }
+    ],
+    experience: [
+      {
+        company: '德勤会计师事务所',
+        date: '2022.07 - 至今',
+        position: '审计员',
+        responsibilities: [
+          '参与多家上市公司年度财务报表审计',
+          '编制审计工作底稿，整理审计证据',
+          '协助项目经理完成审计报告',
+          '与客户沟通解决审计过程中发现的问题'
+        ]
+      }
+    ],
+    skills: [
+      '财务报表分析', '税务筹划', '审计', 'Excel', 'SAP',
+      '财务软件', '成本核算', '风险控制', '财务制度设计'
+    ],
+    projects: [
+      {
+        name: '制造业企业年度审计',
+        date: '2023.09 - 2024.01',
+        role: '审计小组成员',
+        desc: '参与大型制造企业的年度财务报表审计工作',
+        achievements: [
+          '发现并纠正财务处理错误3处，涉及金额约200万元',
+          '优化审计流程，提高工作效率15%',
+          '协助企业完善内控制度，获得客户高度评价'
+        ]
+      }
+    ]
+  },
+  'hr': {
+    name: '赵敏',
+    phone: '135-0000-0000',
+    email: 'zhaomin@example.com',
+    location: '杭州市',
+    education: [
+      {
+        school: '浙江大学',
+        date: '2019.09 - 2023.06',
+        degree: '本科',
+        major: '人力资源管理',
+        desc: '主修课程：人力资源管理、组织行为学、薪酬管理'
+      }
+    ],
+    experience: [
+      {
+        company: '华为技术有限公司',
+        date: '2023.07 - 至今',
+        position: '人力资源专员',
+        responsibilities: [
+          '负责员工招聘、面试安排和入职培训',
+          '协助制定员工绩效考核方案',
+          '处理员工关系问题，维护良好工作氛围',
+          '管理员工档案和薪酬福利'
+        ]
+      }
+    ],
+    skills: [
+      '招聘面试', '员工培训', '绩效管理', '劳动关系',
+      '薪酬福利', 'HR系统', '沟通协调', '团队建设'
+    ],
+    projects: [
+      {
+        name: '新员工培训体系优化',
+        date: '2024.01 - 2024.03',
+        role: '项目负责人',
+        desc: '优化公司新员工培训体系，提升培训效果',
+        achievements: [
+          '建立标准化培训流程，培训满意度提升25%',
+          '开发在线学习平台，节省培训成本30%',
+          '新员工试用期通过率提高至95%'
+        ]
+      }
+    ]
+  }
+};
+
+// 当前显示的简历数据
+const resumeData = computed(() => {
+  return resumeSamples[selectedJob.value] || resumeSamples['software-engineer'];
+});
+</script>
+
+<style lang="scss" scoped>
+.resume-example-container {
+  padding: 32rpx;
+  background: #FFFFFF;
+  min-height: 100vh;
+}
+
+.job-selector {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-bottom: 32rpx;
+  
+  .job-option {
+    padding: 16rpx 24rpx;
+    background: #F5F5F5;
+    border-radius: 6rpx;
+    font-size: 26rpx;
+    color: #666666;
+    cursor: pointer;
+    
+    &.active {
+      background: #1A1A1A;
+      color: #FFFFFF;
+    }
+  }
+}
+
+.resume-content {
+  background: #FFFFFF;
+  border-radius: 8rpx;
+  padding: 32rpx;
+  border: 1rpx solid #F0F0F0;
+}
+
+.resume-header {
+  text-align: center;
+  margin-bottom: 32rpx;
+  padding-bottom: 24rpx;
+  border-bottom: 1rpx solid #F0F0F0;
+  
+  .name {
+    font-size: 40rpx;
+    font-weight: 600;
+    color: #1A1A1A;
+    margin-bottom: 16rpx;
+  }
+  
+  .contact-info {
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 1.6;
+  }
+}
+
+.resume-section {
+  margin-bottom: 32rpx;
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
+  
+  .section-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #1A1A1A;
+    margin-bottom: 20rpx;
+    padding-bottom: 12rpx;
+    border-bottom: 1rpx solid #F0F0F0;
+  }
+  
+  .section-content {
+    padding-left: 0;
+  }
+}
+
+.education-item, .experience-item, .project-item {
+  margin-bottom: 24rpx;
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.edu-header, .exp-header, .project-header {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 8rpx;
+  
+  .school, .company, .project-name {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #1A1A1A;
+  }
+  
+  .date {
+    font-size: 24rpx;
+    color: #666666;
+  }
+}
+
+.degree, .position, .project-role {
+  font-size: 26rpx;
+  color: #1A1A1A;
+  margin-bottom: 8rpx;
+  font-weight: 500;
+}
+
+.desc, .project-desc {
+  font-size: 24rpx;
+  color: #666666;
+  line-height: 1.5;
+}
+
+.responsibilities, .achievements {
+  margin-top: 8rpx;
+  
+  .resp-item, .achievement-item {
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.6;
+    margin-bottom: 6rpx;
+    
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
+
+.skills-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  
+  .skill-tag {
+    padding: 12rpx 20rpx;
+    background: #F5F5F5;
+    border-radius: 4rpx;
+    font-size: 22rpx;
+    color: #1A1A1A;
+  }
+}
+</style>

pages/resume-guide/resume-guide.vue

@@ -0,0 +1,246 @@
+<template>
+  <AppLayout back-gorund-color="#FFFFFF">
+    <view class="resume-guide-container">
+      <!-- 页面标题 -->
+      <view class="page-header">
+        <view class="page-title">简历制作指导</view>
+        <view class="page-subtitle">打造专业简历，提升求职成功率</view>
+      </view>
+
+      <!-- 简历制作步骤 -->
+      <view class="guide-section">
+        <view class="section-title">制作步骤</view>
+        <view class="steps-list">
+          <view class="step-card" v-for="(step, index) in steps" :key="index">
+            <view class="step-header">
+              <view class="step-number">步骤{{ index + 1 }}</view>
+              <view class="step-title">{{ step.title }}</view>
+            </view>
+            <view class="step-desc">{{ step.desc }}</view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 简历写作技巧 -->
+      <view class="guide-section">
+        <view class="section-title">写作技巧</view>
+        <view class="tips-list">
+          <view class="tip-item" v-for="(tip, index) in tips" :key="index">
+            <view class="tip-content">
+              <view class="tip-title">{{ tip.title }}</view>
+              <view class="tip-desc">{{ tip.desc }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 常见错误提醒 -->
+      <view class="guide-section">
+        <view class="section-title">避坑指南</view>
+        <view class="warnings-list">
+          <view class="warning-item" v-for="(warning, index) in warnings" :key="index">
+            <view class="warning-content">
+              <view class="warning-title">{{ warning.title }}</view>
+              <view class="warning-desc">{{ warning.desc }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 行动按钮 -->
+      <view class="action-buttons">
+        <view class="primary-button button-click" @click="startCreateResume">
+          开始制作简历
+        </view>
+        <view class="secondary-button button-click" @click="viewExampleResume">
+          查看简历示例
+        </view>
+      </view>
+    </view>
+  </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref } from 'vue';
+const { navTo } = inject('globalFunction');
+
+// 制作步骤数据
+const steps = ref([
+  { title: '基本信息', desc: '填写真实姓名、联系方式、邮箱等基本信息' },
+  { title: '教育背景', desc: '按时间倒序填写学历信息，突出最高学历' },
+  { title: '技能特长', desc: '列出与目标岗位相关的专业技能' },
+  { title: '工作经历', desc: '详细描述工作职责和成就，使用量化数据' },
+  { title: '项目经验', desc: '展示参与的重要项目，突出个人贡献' }
+]);
+
+// 写作技巧数据
+const tips = ref([
+  { title: '简洁明了', desc: '简历内容控制在1-2页，重点突出，避免冗长' },
+  { title: '目标导向', desc: '根据应聘岗位调整简历内容，突出相关经验' },
+  { title: '量化成果', desc: '使用具体数字展示工作成果，如"提升效率30%"' },
+  { title: '关键词优化', desc: '包含行业关键词，提高简历被搜索到的概率' },
+  { title: '格式规范', desc: '使用标准字体，保持排版整洁，避免错别字' }
+]);
+
+// 常见错误数据
+const warnings = ref([
+  { title: '信息不完整', desc: '确保联系方式、教育经历等重要信息完整' },
+  { title: '夸大事实', desc: '如实描述个人能力，避免过度包装' },
+  { title: '格式混乱', desc: '保持统一的字体、字号和排版风格' },
+  { title: '缺乏针对性', desc: '针对不同岗位调整简历内容' }
+]);
+
+// 开始制作简历
+const startCreateResume = () => {
+  navTo('/packageA/pages/myResume/myResume');
+};
+
+// 查看简历示例
+const viewExampleResume = () => {
+  navTo('/pages/resume-guide/resume-example');
+};
+</script>
+
+<style lang="scss" scoped>
+.resume-guide-container {
+  padding: 32rpx;
+  background: #FFFFFF;
+  min-height: 100vh;
+}
+
+.page-header {
+  text-align: center;
+  margin-bottom: 28rpx;
+  padding: 12rpx 0;
+  
+  .page-title {
+    font-size: 40rpx;
+    font-weight: 600;
+    color: #1A1A1A;
+    margin-bottom: 16rpx;
+  }
+  
+  .page-subtitle {
+    font-size: 28rpx;
+    color: #666666;
+  }
+}
+
+.guide-section {
+  background: #FFFFFF;
+  border-radius: 12rpx;
+  padding: 32rpx 0;
+  margin-bottom: 24rpx;
+  border: 1rpx solid #F0F0F0;
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #1A1A1A;
+  margin-bottom: 24rpx;
+  padding-bottom: 16rpx;
+  border-bottom: 1rpx solid #F0F0F0;
+  padding-left: 20rpx;
+}
+
+.steps-list {
+  .step-card {
+    background: #FFFFFF;
+    // border-radius: 8rpx;
+    padding: 24rpx;
+    border-bottom: 1rpx solid #F0F0F0;
+    margin-bottom: 20rpx;
+    
+    &:last-child {
+      margin-bottom: 0;
+    }
+    
+    .step-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: 12rpx;
+      
+      .step-number {
+        font-size: 24rpx;
+        font-weight: 600;
+        color: #1A1A1A;
+        margin-right: 16rpx;
+        background: #F5F5F5;
+        padding: 4rpx 12rpx;
+        border-radius: 4rpx;
+      }
+      
+      .step-title {
+        font-size: 28rpx;
+        font-weight: 600;
+        color: #1A1A1A;
+      }
+    }
+    
+    .step-desc {
+      font-size: 24rpx;
+      color: #666666;
+      line-height: 1.4;
+    }
+  }
+}
+
+.tips-list, .warnings-list {
+  .tip-item, .warning-item {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 24rpx;
+    padding:0 20rpx;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
+
+.tip-item, .warning-item {
+  .tip-content, .warning-content {
+    flex: 1;
+    
+    .tip-title, .warning-title {
+      font-size: 28rpx;
+      font-weight: 600;
+      color: #1A1A1A;
+      margin-bottom: 8rpx;
+    }
+    
+    .tip-desc, .warning-desc {
+      font-size: 24rpx;
+      color: #666666;
+      line-height: 1.5;
+    }
+  }
+}
+
+.action-buttons {
+  margin-top: 40rpx;
+  padding: 0 20rpx;
+  
+  .primary-button, .secondary-button {
+    height: 88rpx;
+    border-radius: 8rpx;
+    text-align: center;
+    line-height: 88rpx;
+    font-size: 30rpx;
+    font-weight: 500;
+    margin-bottom: 20rpx;
+  }
+  
+  .primary-button {
+    background: #1A1A1A;
+    color: #FFFFFF;
+  }
+  
+  .secondary-button {
+    background: #FFFFFF;
+    color: #1A1A1A;
+    border: 1rpx solid #D9D9D9;
+  }
+}
+
+</style>

pages/service/salary-info.vue

@@ -0,0 +1,12 @@
+<template>
+  <web-view class="salary-info-container" src="https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html"></web-view>
+</template>
+
+
+<style lang="scss" scoped>
+.salary-info-container {
+  padding: 30rpx;
+  background: #F5F5F5;
+  min-height: 100vh;
+}
+</style>

utilsRc/config.js

@@ -2,7 +2,7 @@
  * @Descripttion:
  * @Author: lip
  * @Date: 2022-12-28 13:59:09
- * @LastEditors: shirlwang
+ * @LastEditors: lip
  */
 // 应用全局配置
 import config from '@/config.js'
@@ -36,7 +36,7 @@ let exports = {
 	// 应用信息
 	appInfo: {
 	  // 应用名称
-	  name: "泉就业H5",
+	  name: "",
 	  // 应用版本
 	  version: "1.1.0",
 	  // 应用logo