From 96b8cd5e086a75a9cf11d77113d88eb8eca913fc Mon Sep 17 00:00:00 2001 From: lip <1040791966@qq.com> Date: Fri, 19 Dec 2025 18:41:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8C=E6=84=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apiRc/user/user.js | 2 +- common/globalFunction.js | 138 ++++++++++++++++++------------------- config.js | 16 +++-- packageCa/utilCa/config.js | 4 +- pages/login/h5-login.vue | 2 +- utilsRc/config.js | 6 +- 6 files changed, 87 insertions(+), 81 deletions(-) diff --git a/apiRc/user/user.js b/apiRc/user/user.js index 7e9279b..8721ef1 100644 --- a/apiRc/user/user.js +++ b/apiRc/user/user.js @@ -8,7 +8,7 @@ import request from '@/utilsRc/request' // 获取用户信息（职业规划推荐用） export function appUserInfo() { return request({ - fullUrl: 'http://222.80.110.161:80/api/ks/app/user/appUserInfo', + fullUrl: 'https://www.xjksly.cn/api/ks/app/user/appUserInfo', method: 'get' }) } diff --git a/common/globalFunction.js b/common/globalFunction.js index dab1430..8a183eb 100644 --- a/common/globalFunction.js +++ b/common/globalFunction.js @@ -51,7 +51,7 @@ const prePage = () => { } // export const urls ='http://10.110.145.145/images/train/' -export const urls ='http://222.80.110.161:80/images/train/' +export const urls ='https://www.xjksly.cn/images/train/' /** * 页面跳转封装，支持 query 参数传递和返回回调 @@ -61,74 +61,74 @@ export const urls ='http://222.80.110.161:80/images/train/' * @param {object} options.query - 携带参数 * @param {function} options.onBack - 页面返回时的回调（目标页调用 uni.navigateBack 时传递数据） */ -export const navTo = function(url, { - needLogin = false, - query = {}, - onBack = null -} = {}) { - const userStore = useUserStore(); - - if (needLogin && !userStore.hasLogin) { - const pages = getCurrentPages(); - if (pages.length >= 10) { - uni.redirectTo({ - url: '/pages/complete-info/complete-info', - fail: (err) => { - console.error('页面跳转失败:', err); - } - }); - } else { - uni.navigateTo({ - url: '/pages/complete-info/complete-info', - fail: (err) => { - console.error('页面跳转失败:', err); - uni.redirectTo({ - url: '/pages/complete-info/complete-info', - fail: (err2) => { - console.error('redirectTo也失败:', err2); - } - }); - } - }); - } - return; - } - - const queryStr = Object.entries(query) - .map(([key, val]) => `${key}=${encodeURIComponent(val)}`) - .join('&'); - const finalUrl = queryStr ? `${url}?${queryStr}` : url; - - if (onBack) { - const pages = getCurrentPages(); - const currentPage = pages[pages.length - 1]; - currentPage.__onBackCallback__ = onBack; - } - - const pages = getCurrentPages(); - if (pages.length >= 10) { - // 页面栈已满，使用redirectTo替代 - uni.redirectTo({ - url: finalUrl, - fail: (err) => { - console.error('页面跳转失败:', err); - } - }); - } else { - uni.navigateTo({ - url: finalUrl, - fail: (err) => { - console.error('页面跳转失败:', err); - // 失败后尝试redirectTo - uni.redirectTo({ - url: finalUrl, - fail: (err2) => { - console.error('redirectTo也失败:', err2); - } - }); - } - }); - } +export const navTo = function(url, { + needLogin = false, + query = {}, + onBack = null +} = {}) { + const userStore = useUserStore(); + + if (needLogin && !userStore.hasLogin) { + const pages = getCurrentPages(); + if (pages.length >= 10) { + uni.redirectTo({ + url: '/pages/complete-info/complete-info', + fail: (err) => { + console.error('页面跳转失败:', err); + } + }); + } else { + uni.navigateTo({ + url: '/pages/complete-info/complete-info', + fail: (err) => { + console.error('页面跳转失败:', err); + uni.redirectTo({ + url: '/pages/complete-info/complete-info', + fail: (err2) => { + console.error('redirectTo也失败:', err2); + } + }); + } + }); + } + return; + } + + const queryStr = Object.entries(query) + .map(([key, val]) => `${key}=${encodeURIComponent(val)}`) + .join('&'); + const finalUrl = queryStr ? `${url}?${queryStr}` : url; + + if (onBack) { + const pages = getCurrentPages(); + const currentPage = pages[pages.length - 1]; + currentPage.__onBackCallback__ = onBack; + } + + const pages = getCurrentPages(); + if (pages.length >= 10) { + // 页面栈已满，使用redirectTo替代 + uni.redirectTo({ + url: finalUrl, + fail: (err) => { + console.error('页面跳转失败:', err); + } + }); + } else { + uni.navigateTo({ + url: finalUrl, + fail: (err) => { + console.error('页面跳转失败:', err); + // 失败后尝试redirectTo + uni.redirectTo({ + url: finalUrl, + fail: (err2) => { + console.error('redirectTo也失败:', err2); + } + }); + } + }); + } }; export const navBack = function({ diff --git a/config.js b/config.js index aa1dcbc..972541c 100644 --- a/config.js +++ b/config.js @@ -1,17 +1,23 @@ +/* + * @Descripttion: + * @Author: lip + * @Date: 2025-12-04 13:40:08 + * @LastEditors: lip + */ export default { // baseUrl: 'http://39.98.44.136:8080', // 测试 baseUrl: 'https://www.xjksly.cn/api/ks', // 测试 - // baseUrl: 'http://222.80.110.161:80/api/ks', // 测试 + // baseUrl: 'https://www.xjksly.cn/api/ks', // 测试 // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试 // LCBaseUrl:'http://10.110.145.145:9100',//内网端口 // LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶 // imgBaseUrl:'http://10.110.145.145/images', //图片基础url // trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio', - LCBaseUrl:'http://222.80.110.161:80/prod-api',//内网端口 - LCBaseUrlInner:'http://222.80.110.161:80/prod-psout-api',//招聘、培训、帮扶 - imgBaseUrl:'http://222.80.110.161:80/images', //图片基础url - trainVideoImgUrl:'http://222.80.110.161:80/prod-api/file/file/minio', + LCBaseUrl:'https://www.xjksly.cn/prod-api',//内网端口 + LCBaseUrlInner:'https://www.xjksly.cn/prod-psout-api',//招聘、培训、帮扶 + imgBaseUrl:'https://www.xjksly.cn/images', //图片基础url + trainVideoImgUrl:'https://www.xjksly.cn/prod-api/file/file/minio', // sseAI+ // StreamBaseURl: 'http://39.98.44.136:8000', StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai', diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js index 54dc437..1f6a165 100644 --- a/packageCa/utilCa/config.js +++ b/packageCa/utilCa/config.js @@ -2,9 +2,9 @@ let baseUrl = "" // #ifdef MP-WEIXIN // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译 if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') { - baseUrl = 'http://222.80.110.161:80/career' // 开发环境 + baseUrl = 'https://www.xjksly.cn/career' // 开发环境 } else { - baseUrl = 'http://222.80.110.161:80/career' // 生产环境 + baseUrl = 'https://www.xjksly.cn/career' // 生产环境 } // #endif diff --git a/pages/login/h5-login.vue b/pages/login/h5-login.vue index 12b5e85..cd58ace 100644 --- a/pages/login/h5-login.vue +++ b/pages/login/h5-login.vue @@ -194,7 +194,7 @@ const handleLogin = async () => { icon: 'success' }) // window.location.assign('http://222.80.110.161:11111/mechine-dual-vue/login') - window.location.assign('http://222.80.110.161:80/mechine-single-vue/login') + window.location.assign('https://www.xjksly.cn/mechine-single-vue/login') // // 跳转到首页 // uni.reLaunch({ // url: '/pages/index/index' diff --git a/utilsRc/config.js b/utilsRc/config.js index c500ebb..6862c2b 100644 --- a/utilsRc/config.js +++ b/utilsRc/config.js @@ -10,7 +10,7 @@ import config from '@/config.js' let exports = { // ========== baseUrl 配置方式选择 ========== // 方式1：硬编码baseUrl（main分支使用，合并到main时不会影响现有功能） - baseUrl: 'http://222.80.110.161:80/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接） + baseUrl: 'https://www.xjksly.cn/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接） // 方式2：引用根目录config.js的baseUrl（CareerMap分支可选方式，如需使用请注释掉方式1，取消注释此方式） // baseUrl: config.baseUrl, // 引用根目录config.js的baseUrl，避免重复配置 @@ -26,13 +26,13 @@ let exports = { // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 已从根目录config.js引用，不再重复配置 // ========== 职业图谱专用baseUrl ========== - zytpBaseUrl: 'http://222.80.110.161:80/career-map/api/ks_zytp/admin-api/zytp', + zytpBaseUrl: 'https://www.xjksly.cn/career-map/api/ks_zytp/admin-api/zytp', // ========== 用户接口专用baseUrl（其他用户接口使用） ========== userBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 用户相关接口使用根目录config.js的baseUrl // ========== appUserInfo接口专用baseUrl ========== - appUserInfoBaseUrl: 'http://222.80.110.161:80/api/ks', // appUserInfo接口专用，与其他接口路径不一致 + appUserInfoBaseUrl: 'https://www.xjksly.cn/api/ks', // appUserInfo接口专用，与其他接口路径不一致 From 8f119607f20a6c37dc1e3aedd4016b222cf6811d Mon Sep 17 00:00:00 2001 From: xuchao <1151716571@qq.com> Date: Fri, 19 Dec 2025 19:26:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=8B=9B=E8=81=98?= =?UTF-8?q?=E4=BC=9A=E5=B2=97=E4=BD=8D=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/pages/UnitDetails/UnitDetails.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue index e7d4088..2cf6817 100644 --- a/packageA/pages/UnitDetails/UnitDetails.vue +++ b/packageA/pages/UnitDetails/UnitDetails.vue @@ -39,8 +39,8 @@ 在招职位 -