diff --git a/common/globalFunction.js b/common/globalFunction.js index 874e94d..8402cc1 100644 --- a/common/globalFunction.js +++ b/common/globalFunction.js @@ -50,7 +50,8 @@ const prePage = () => { return prePage.$vm; } -export const urls ='http://10.110.145.145/images/train/' +// export const urls ='http://10.110.145.145/images/train/' +export const urls ='http://222.80.110.161:11111/images/train/' /** * 页面跳转封装，支持 query 参数传递和返回回调 diff --git a/components/jobfair/signDialog.vue b/components/jobfair/signDialog.vue index 1b12efb..70a1704 100644 --- a/components/jobfair/signDialog.vue +++ b/components/jobfair/signDialog.vue @@ -54,7 +54,7 @@ {{ item.jobTitle }} - {{ item.salaryRange }}元/月 + {{ item.minSalary }} - {{ item.maxSalary }}元/月 diff --git a/config.js b/config.js index 2fcc09b..ec5cdb0 100644 --- a/config.js +++ b/config.js @@ -3,10 +3,14 @@ export default { // baseUrl: 'http://222.80.110.161:11111/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://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:11111/prod-api',//内网端口 + LCBaseUrlInner:'http://222.80.110.161:11111/prod-psout-api',//招聘、培训、帮扶 + imgBaseUrl:'http://222.80.110.161:11111/images', //图片基础url + trainVideoImgUrl:'http://222.80.110.161:11111/prod-api/file/file/minio', // sseAI+ // StreamBaseURl: 'http://39.98.44.136:8000', StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai', diff --git a/packageB/login.vue b/packageB/login.vue index 18e59df..47e7b19 100644 --- a/packageB/login.vue +++ b/packageB/login.vue @@ -1,7 +1,7 @@ @@ -43,8 +43,8 @@ const flag=ref('hlw') const form = reactive({ - username: 'langchaojituan', - password: 'Aa123456?', + username: '913700004941904564', + password: '913700004941904564', rememberMe: false, code: '', uuid: '' @@ -57,7 +57,43 @@ }) onMounted(() => { - getCodeImg() + // getCodeImg() + let form={} + if (uni.getStorageSync('userInfo').isCompanyUser=='1') { + form={ + usertype: '1', + idno: uni.getStorageSync('userInfo').idCard, + name: uni.getStorageSync('userInfo').name, + enterprisecode:"", + enterprisename: "", + contactperson: "", + contactphone: "", + } + }else if (uni.getStorageSync('userInfo').isCompanyUser=='0') { + form={ + usertype: "2", + enterprisecode: uni.getStorageSync('userInfo').idCard, + enterprisename: uni.getStorageSync('userInfo').name, + contactperson: "", + contactphone: "", + idno: "", + name: "" + } + } + $api.myRequest('/auth/login2/ks',form,'post',10100).then((res) => { + if (res.code=='200') { + uni.setStorageSync('Padmin-Token', res.data.access_token) + uni.navigateBack({ + delta:2 + }) + } + }).catch(() => { + uni.hideLoading() + uni.showToast({ + icon: 'none', + title: '登录失败，请重试' + }) + }) }) function register() { diff --git a/packageB/train/index.vue b/packageB/train/index.vue index 8e39257..4703b17 100644 --- a/packageB/train/index.vue +++ b/packageB/train/index.vue @@ -3,7 +3,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue index e699f76..a816058 100644 --- a/pages/careerfair/careerfair.vue +++ b/pages/careerfair/careerfair.vue @@ -13,9 +13,9 @@ 我参与的 - + - 技能培训信息 + 技能培训 - 技能评价指引 + 技能评价 - + @@ -862,7 +862,8 @@ function navToService(serviceType) { 'public-recruitment': '/pages/service/public-recruitment', 'resume-creation': '/pages/resume-guide/resume-guide', 'labor-policy': '/pages/service/labor-policy', - 'skill-training': '/pages/service/skill-training', + 'skill-training': '/packageB/train/video/videoList', + 'skill-evaluation': '/packageB/train/index', // 'skill-evaluation': '/pages/service/skill-evaluation', 'question-bank': '/pages/service/question-bank', // 'quality-assessment': '/packageCa/search/search', @@ -874,9 +875,11 @@ function navToService(serviceType) { 'interview-tips': '/pages/service/interview-tips', 'employment-news': '/pages/service/employment-news', 'more-services': '/pages/service/more-services', - 'skill-evaluation': '/packageB/train/index' }; - + if((serviceType=='skill-training'||serviceType=='skill-evaluation')&&!uni.getStorageSync('userInfo').idCard){ + $api.msg('请先完善信息'); + return + } const route = serviceRoutes[serviceType]; if (route) { navTo(route); diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json index 013e402..78517a9 100644 --- a/unpackage/dist/dev/mp-weixin/project.config.json +++ b/unpackage/dist/dev/mp-weixin/project.config.json @@ -1,35 +1,40 @@ { - "setting": { - "es6": true, - "postcss": true, - "minified": true, - "uglifyFileName": false, - "enhance": true, - "packNpmRelationList": [], - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" + "setting": { + "es6": true, + "postcss": true, + "minified": true, + "uglifyFileName": false, + "enhance": true, + "packNpmRelationList": [], + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useCompilerPlugins": false, + "minifyWXML": true, + "compileWorklet": false, + "uploadWithSourceMap": true, + "packNpmManually": false, + "minifyWXSS": true, + "localPlugins": false, + "disableUseStrict": false, + "condition": false, + "swc": false, + "disableSWC": true, + "ignoreUploadUnusedFiles": false }, - "useCompilerPlugins": false, - "minifyWXML": true, - "compileWorklet": false, - "uploadWithSourceMap": true, - "packNpmManually": false, - "minifyWXSS": true, - "localPlugins": false, - "disableUseStrict": false, - "condition": false, - "swc": false, - "disableSWC": true - }, - "compileType": "miniprogram", - "simulatorPluginLibVersion": {}, - "packOptions": { - "ignore": [], - "include": [] - }, - "appid": "wx4aa34488b965a331", - "editorSetting": {}, - "libVersion": "3.11.1" + "compileType": "miniprogram", + "simulatorPluginLibVersion": {}, + "packOptions": { + "ignore": [], + "include": [] + }, + "appid": "wx4aa34488b965a331", + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 4 + }, + "libVersion": "3.11.1", + "condition": {} } \ No newline at end of file