From 3b04d82393de8cada93467caee661f9df2458818 Mon Sep 17 00:00:00 2001 From: lintiantian <156569930@qq.com> Date: Tue, 4 Nov 2025 13:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=99=BA=E6=85=A7=E5=B0=B1?= =?UTF-8?q?=E4=B8=9A=E5=86=85=E5=AE=B9=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=82=E5=89=A9=E7=99=BB=E5=BD=95=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apiB/studentProfile.js | 7 + apiB/tenpayOrder.js | 10 - apiB/user.js | 11 + apiB/weChartUser.js | 26 - packageB/pages/job/index.vue | 9 +- packageB/pages/search/search.vue | 32 +- .../testReport/components/contrastBox.vue | 25 +- .../testReport/generalCareerTestReport.vue | 9 +- .../pages/testReport/interestTestReport.vue | 11 +- .../testReport/multipleAbilityTestReport.vue | 25 +- .../pages/testReport/personalTestReport.vue | 19 +- .../pages/testReport/workValuesTestReport.vue | 23 +- packageB/pages/userCenter/careerCompass.vue | 6 +- .../pages/userCenter/fillInInformation.vue | 8 +- packageB/pages/userCenter/professionPath.vue | 759 ++++++++++++++++++ pages.json | 7 + utilB/config.js | 12 - utilB/request.js | 2 +- 18 files changed, 853 insertions(+), 148 deletions(-) delete mode 100644 apiB/tenpayOrder.js delete mode 100644 apiB/weChartUser.js create mode 100644 packageB/pages/userCenter/professionPath.vue diff --git a/apiB/studentProfile.js b/apiB/studentProfile.js index a4effa9..96b8d2f 100644 --- a/apiB/studentProfile.js +++ b/apiB/studentProfile.js @@ -22,4 +22,11 @@ api.queryPlanList = (encodeId) => request.globalRequest(`/StudentProfile/QueryPl api.savePlanList = (data) => request.globalRequest(`/StudentProfile/SavePlanList`,'POST', data, 1) // 获取生涯档案（高校 api.getGXWechatStudentProfile = () => request.globalRequest(`/StudentProfile/GetGXWechatStudentProfile`,'GET', {}, 1) + +//获取职业路径职业列表 +api.queryCareerPath = () => request.globalRequest(`/StudentManage/QueryCareerPath`,'POST', {}, 1) +// 获取职业详情，参数encodeId 加密id +api.queryPathInfo = (encodeId) => request.globalRequest(`/StudentManage/QueryPathInfo?encodeId=${encodeId}`,'POST', {}, 1) + + export default api diff --git a/apiB/tenpayOrder.js b/apiB/tenpayOrder.js deleted file mode 100644 index 33c543a..0000000 --- a/apiB/tenpayOrder.js +++ /dev/null @@ -1,10 +0,0 @@ -import request from '@/utilB/request.js' - -const api = {} -// 获取openid -api.getOpenId = (params) => request.globalRequest(`/WishOrder/GetOpenId?code=${params}`,'GET', {}, "") - -// 微信支付 -api.createWeiXinOrder = (data) => request.globalRequest(`/TenpayOrder/CreateWeiXinOrder`, 'POST', data) - -export default api diff --git a/apiB/user.js b/apiB/user.js index 1b9efb0..d5b56f0 100644 --- a/apiB/user.js +++ b/apiB/user.js @@ -1,6 +1,17 @@ import request from '@/utilB/request.js' const api = {} +//根据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上） diff --git a/apiB/weChartUser.js b/apiB/weChartUser.js deleted file mode 100644 index f52d33a..0000000 --- a/apiB/weChartUser.js +++ /dev/null @@ -1,26 +0,0 @@ -import request from '@/utilB/request.js' - -const api = {} - -// 获取个人信息 -api.getMyWeChartUser = (params) => request.globalRequest(`/WeChartUser/GetMyWeChartUser?openId=${params}`,'GET', {}) -// 保存个人信息 -api.saveChartUser = (data) => request.globalRequest(`/WeChartUser/SaveChartUser`, 'POST', data) -// 保存反馈信息 -api.saveWeChartUserFeedback = (data) => request.globalRequest(`/WeChartUser/SaveWeChartUserFeedback`, 'POST', data) -// 获取出行人列表 -api.getResearchUserList = (params) => request.globalRequest(`/WeChartUser/GetResearchUserList?openId=${params}`,'GET', {}) -// 删除出行人 -api.deleteResearchUser = (params) => request.globalRequest(`/WeChartUser/DeleteResearchUser?id=${params}`,'GET', {}) -// 保存出行人 -api.saveResearchUser = (data) => request.globalRequest(`/WeChartUser/SaveResearchUser`, 'POST', data) - -//根据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) - -api.sLLogin = (accessToken,openId,studentId) => request.globalRequest(`/WeChartUser/SLLogin?accessToken=${accessToken}&openId=${openId}&studentId=${studentId}`, 'POST', {}) - -export default api \ No newline at end of file diff --git a/packageB/pages/job/index.vue b/packageB/pages/job/index.vue index 339b341..127f0ca 100644 --- a/packageB/pages/job/index.vue +++ b/packageB/pages/job/index.vue @@ -14,7 +14,8 @@ - + + @@ -275,9 +276,10 @@ .jobIndex { position: relative; padding-top: 0; + height: 100vh; .u-menu-wrap { display: flex; - // height: calc(100vh - 100rpx); + height: calc(100vh - 100rpx); overflow: auto; padding-top: 100rpx; .u-tab-view { @@ -301,7 +303,7 @@ .u-tab-item-active { position: relative; color: #fff; - font-size: 28rpx; + font-size: 26rpx; font-weight: 500; background: #1677ff; border-radius:5px; @@ -442,6 +444,7 @@ overflow: auto; box-shadow: 0 0 4rpx 2rpx #f2f2f2; border-radius: 8rpx; + z-index: 90; .link { display: flex; align-items: center; diff --git a/packageB/pages/search/search.vue b/packageB/pages/search/search.vue index 35692ce..dd5f380 100644 --- a/packageB/pages/search/search.vue +++ b/packageB/pages/search/search.vue @@ -28,41 +28,32 @@ 个人档案 --> - 规划中心 + 职业生涯规划 生涯罗盘 - + 职业生涯路径 学业规划 - - - 档案中心 - + 生涯档案 - - + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 762f8f0..bfb6b99 100644 --- a/pages.json +++ b/pages.json @@ -288,6 +288,13 @@ "navigationBarTitleText": "职业详情" } }, + { + "path": "pages/userCenter/professionPath", + "style": { + "navigationBarTitleText": "职业路径", + "navigationStyle": "custom" + } + }, { "path": "pages/userCenter/personDocument", "style": { diff --git a/utilB/config.js b/utilB/config.js index 56c6b2e..b02c0ce 100644 --- a/utilB/config.js +++ b/utilB/config.js @@ -11,27 +11,15 @@ let filestore_site = ""; // #ifdef MP-WEIXIN if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') { baseUrl = 'http://dev.51xuanxiao.com:8005/api' // 开发环境 - baseUrl1 = 'http://dev.51xuanxiao.com:8008/api' // 专业环境 - baseUrl2 = 'http://192.168.1.168:9002/api' // 院校环境 baseUrl3 = 'http://dev.51xuanxiao.com:8007/api' // 职业环境 baseUrl4 = 'http://dev.51xuanxiao.com:8009/api' // 用户环境 baseUrl5 = 'http://dev.51xuanxiao.com:8006/api' // 测评环境 - - baseUrl6 = 'http://dev.51xuanxiao.com:8005' // 开发环境 - baseUrl7 = 'https://bapi.cnjzy.net/api' // 精志愿 - baseUrl8 = 'http://dev.51xuanxiao.com:8005/api' // 精志愿(新版本接口) 现在已迁移到 Career.YanXueApi filestore_site = 'http://192.168.1.168:31128' //文件地址 } else { baseUrl = 'https://yanxueapi.51xuanxiao.com/api' // 生产环境 - baseUrl1 = "https://specialtyapi.51xuanxiao.com/api"// 专业环境 - baseUrl2 = "https://universityapi.51xuanxiao.com/api"// 院校环境 baseUrl3 = "https://jobapi.51xuanxiao.com/api"// 职业环境 baseUrl4 = "https://authapi.51xuanxiao.com/api"// 用户环境 baseUrl5 = "https://testapi.51xuanxiao.com/api"// 测评环境 - - baseUrl6 = 'https://yanxueapi.51xuanxiao.com/' // 生产环境 - baseUrl7 = 'https://bapi.cnjzy.net/api' // 精志愿 - baseUrl8 = 'https://yanxueapi.51xuanxiao.com/api'// 精志愿(新版本接口)现在已迁移到 Career.YanXueApi filestore_site = 'https://filestore.plan.51xuanxiao.com' //文件地址 } // #endif diff --git a/utilB/request.js b/utilB/request.js index 17442fc..78cd634 100644 --- a/utilB/request.js +++ b/utilB/request.js @@ -69,7 +69,7 @@ request.globalRequest = (url, method, data, power, type) => { header: headers }).then(res => { //console.log("ressss===="+JSON.stringify(res.data)); - console.log("type===="+type); + // console.log("type===="+type); if (type == 7) { if (res[1].data.code == 0) { return res[1].data