diff --git a/config.js b/config.js index 9a33dee..3e1848e 100644 --- a/config.js +++ b/config.js @@ -1,25 +1,28 @@ -// 应用全局配置 -// module.exports = { -// // baseUrl:'/prod-api', -// loginBaseUrl:'http://112.29.103.165:1616', -// // baseUrl:'http://192.168.0.14:2900', -// baseUrl:'http://192.168.0.137:2900', -// // loginUrl: 'http://112.29.103.165:1616', -// login: 'http://192.168.0.137:19200', -// // 图片展示基础地址 -// fileUrl:'http://192.168.0.137:2909/exam-file/', -// // 上传文件地址 -// uploadUrl: 'http://192.168.0.137:2909/exam-file/file/uploadBase64', -// bmwUrl: 'http://192.168.0.137:2911/exam-bmw', -// // 应用信息 -// appInfo: { -// // 应用名称 -// name: "作业管控智慧平台", -// // 应用版本 -// version: "1.1.0", -// } -// } +// 产线 +module.exports = { + // http://192.168.0.14:19999 + loginBaseUrl:'http://112.29.103.165:1616', + baseUrl:'http://112.29.103.165:1616/exam', + // login: 'http://112.29.103.165:1616', + login: 'http://112.29.103.165:1616/exam/exam-auth/', + // 图片展示基础地址 + fileUrl:'http://112.29.103.165:1616/exam-file/', + // 上传文件地址 + uploadUrl: 'http://112.29.103.165:1616/exam-file/file/uploadBase64', + bmwUrl: 'http://112.29.103.165:1616/exam-bmw', + // 体检-基础路径 + tjBaseUrl: 'http://112.29.103.165:1616/AppPeaManager', + tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/', + // 应用信息 + appInfo: { + // 应用名称 + name: "作业管控智慧平台", + // 应用版本 + version: "1.1.0", + } +} +// 测试环境 module.exports = { // baseUrl:'/prod-api', // http://192.168.0.14:19999 @@ -37,7 +40,7 @@ module.exports = { bmwUrl: 'http://192.168.0.14:19999/exam-bmw', // 体检-基础路径 // tjBaseUrl: 'http://192.168.0.14:20000/AppPeaManager', - tjBaseUrl: 'http://192.168.2.147:20000/AppPeaManager', + tjBaseUrl: 'http://192.168.2.147:18089/AppPeaManager', tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/', //实名制移动端-登录接口 diff --git a/main.js b/main.js index f5ef3a8..8e78ed1 100644 --- a/main.js +++ b/main.js @@ -4,6 +4,7 @@ import store from './store' // #ifndef VUE3 import Vue from 'vue' +import config from './config.js' Vue.config.productionTip = false // Vue.prototype.$api = $api Vue.prototype.$store = store @@ -27,7 +28,7 @@ Vue.use(uView) Vue.prototype.$verificationToken = function () { console.log('验证Token-->') uni.request({ - url: 'http://192.168.0.14:19999/exam-bmw/users/current', + url: config.bmwUrl + '/users/current', method: 'get', header: { Authorization: uni.getStorageSync('access_token') diff --git a/pages.json b/pages.json index 85d0763..3f649ea 100644 --- a/pages.json +++ b/pages.json @@ -198,42 +198,6 @@ "navigationBarTitleText": "消息详情" } }, - { - "path": "pages/HealthExaminationApp/index/index", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/HealthExaminationApp/appointment/appointment", - "style": { - "navigationBarTitleText": "体检预约" - } - }, - { - "path": "pages/HealthExaminationApp/report/report", - "style": { - "navigationBarTitleText": "体检报告" - } - }, - { - "path": "pages/HealthExaminationApp/report/pdfView", - "style": { - "navigationBarTitleText": "体检报告" - } - }, - { - "path": "pages/HealthExaminationApp/myAppointment/myAppointment", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/HealthExaminationApp/jobAppointment/jobAppointment", - "style": { - "navigationBarTitleText": "职业预约" - } - }, { "path" : "pages/YNEduApp/index/notices", "style" : @@ -241,6 +205,14 @@ "navigationStyle": "custom" } }, + { + "path" : "pages/YNEduApp/learnProj/imageStudy", + "style" : + { + "navigationBarTitleText" : "图片学习" + } + }, + ////实名制二期-移动端 {//首页 "path": "pages/realName/index/index", @@ -328,16 +300,42 @@ "navigationStyle": "custom" } }, - - - { - "path" : "pages/YNEduApp/learnProj/imageStudy", - "style" : - { - "navigationBarTitleText" : "图片学习" - } + "path": "pages/HealthExaminationApp/index/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/HealthExaminationApp/appointment/appointment", + "style": { + "navigationBarTitleText": "体检预约" + } + }, + { + "path": "pages/HealthExaminationApp/report/report", + "style": { + "navigationBarTitleText": "体检报告" + } + }, + { + "path": "pages/HealthExaminationApp/report/pdfView", + "style": { + "navigationBarTitleText": "体检报告" + } + }, + { + "path": "pages/HealthExaminationApp/myAppointment/myAppointment", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/HealthExaminationApp/jobAppointment/jobAppointment", + "style": { + "navigationBarTitleText": "职业预约" + } }, { "path" : "pages/HealthExaminationApp/myAppointment/bookSuccessfully", diff --git a/pages/YNEduApp/user/user.vue b/pages/YNEduApp/user/user.vue index 193b9d9..cf5f729 100644 --- a/pages/YNEduApp/user/user.vue +++ b/pages/YNEduApp/user/user.vue @@ -84,7 +84,6 @@ export default { this.$verificationToken() uni.request({ url: config.baseUrl + '/exam-student/personalCenter/getStudyAndCer', - // url: 'http://192.168.0.137:2900' + '/exam-student/personalCenter/getStudyAndCer', method: 'post', header: { Authorization: uni.getStorageSync('access_token') diff --git a/pages/login.vue b/pages/login.vue index 4ba60ed..ddf1c58 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -165,8 +165,8 @@ // globalConfig: getApp().globalData.config, selectTab: 1, loginForm: { - phone: '18700000002', // 18955734761 18700000001 - pd: 'YNsbd@123456',//YNsbd@123456 + phone: '', // 18955734761 18700000001 17681010134 15955147005 + pd: '',//YNsbd@123456 Lv@200018 }, loginForm0: { phone: this.$store.state.user.phone,