From 8cf298ddadc647bdad70134168096f1c18f40fe8 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 30 Dec 2024 16:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E5=88=B6ios=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 110 +- manifest.json | 4 +- pages/realName/components/PdfView.vue | 4 +- pages/realName/index/pages/personDetail.vue | 1063 +++++++---------- .../electronicContract/contractVideo.vue | 4 +- pages/realName/workbench/workPlan/index.vue | 13 +- 6 files changed, 498 insertions(+), 700 deletions(-) diff --git a/config.js b/config.js index a1de685..211e21e 100644 --- a/config.js +++ b/config.js @@ -1,61 +1,18 @@ // 产线 -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/', - - //实名制移动端-登录接口 - realLoginUrl: 'http://192.168.0.14:9200/', - //实名制移动端-移动 - realAppUrl: 'http://192.168.0.14:1913/app', - //实名制移动端-安培 - realExamUrl: 'http://192.168.0.14:1910', - //实名制移动端-文件 - realFileUrl: 'http://192.168.0.14:1909/file/', - //实名制移动端 - realBmwUrl: 'http://192.168.0.14:1911/bmw', - //实名制移动端 -- 新 - realNewBmwUrl: 'http://192.168.0.14:1911', - //实名制移动端 -- 新 - realNewYnUrl: 'http://192.168.0.14:1918', - - // 应用信息 - appInfo: { - // 应用名称 - name: '作业管控智慧平台', - // 应用版本 - version: '1.1.0' - } -} -// 测试环境 // module.exports = { -// // baseUrl:'/prod-api', // // http://192.168.0.14:19999 -// loginBaseUrl: 'http://192.168.0.14:27018', -// // loginBaseUrl:'http://192.168.0.14:19999', -// // baseUrl:'http://192.168.0.14:2900', -// baseUrl: 'http://192.168.0.14:19999', -// // loginUrl: 'http://112.29.103.165:1616', -// login: 'http://192.168.0.14:19200', +// 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://192.168.0.14:19999/exam-file/', +// fileUrl: 'http://112.29.103.165:1616/exam-file/', // // 上传文件地址 -// uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64', -// bmwUrl: 'http://192.168.0.14:19999/exam-bmw', +// uploadUrl: 'http://112.29.103.165:1616/exam-file/file/uploadBase64', +// bmwUrl: 'http://112.29.103.165:1616/exam-bmw', // // 体检-基础路径 -// tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager', -// // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager', -// tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/', +// tjBaseUrl: 'http://112.29.103.165:1616/AppPeaManager', +// tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/', // //实名制移动端-登录接口 // realLoginUrl: 'http://192.168.0.14:1616/auth/', @@ -86,3 +43,52 @@ module.exports = { // version: '1.1.0' // } // } +// 测试环境 +module.exports = { + // baseUrl:'/prod-api', + // http://192.168.0.14:19999 + loginBaseUrl: 'http://192.168.0.14:27018', + // loginBaseUrl:'http://192.168.0.14:19999', + // baseUrl:'http://192.168.0.14:2900', + baseUrl: 'http://192.168.0.14:19999', + // loginUrl: 'http://112.29.103.165:1616', + login: 'http://192.168.0.14:19200', + // 图片展示基础地址 + fileUrl: 'http://192.168.0.14:19999/exam-file/', + // 上传文件地址 + uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64', + bmwUrl: 'http://192.168.0.14:19999/exam-bmw', + // 体检-基础路径 + tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager', + // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager', + tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/', + + //实名制移动端-登录接口 + realLoginUrl: 'http://192.168.0.14:1616/auth/', + realBaseUrl: 'http://192.168.0.14:1910/', + //实名制移动端-移动 + realAppUrl: 'http://192.168.0.14:1913/app', + //实名制移动端-安培 + realExamUrl: 'http://192.168.0.14:1616/system', + //实名制移动端-文件 + realFileUrl: 'http://192.168.0.14:1909/file/', + //实名制移动端 + realBmwUrl: 'http://192.168.0.14:1616/bmw', + //实名制移动端 -- 新 + realNewBmwUrl: 'http://192.168.0.14:1616', + loginUrl: 'http://192.168.0.14:27018', + //实名制移动端 -- 新 + realNewYnUrl: 'http://192.168.0.14:1918', + realIdCardUrl: 'http://192.168.0.14:26699', + + //作业计划 -- 新 + workPlanNewYnUrl: 'http://192.168.0.14:19191', + + // 应用信息 + appInfo: { + // 应用名称 + name: '作业管控智慧平台', + // 应用版本 + version: '1.1.0' + } +} diff --git a/manifest.json b/manifest.json index b8a75e1..cc5bbe1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,6 +6,8 @@ "versionCode" : 111, "transformPx" : false, "app-plus" : { + "screenOrientation" : [ "portrait-primary", "landscape-primary" ], + "flexible" : true, "runmode" : "liberate", "compatible" : { "ignoreVersion" : true @@ -98,7 +100,7 @@ } } }, - "orientation" : [ "portrait-primary" ], + "screenOrientation" : [ "portrait-primary", "landscape-primary" ], "icons" : { "ios" : { "iphone" : { diff --git a/pages/realName/components/PdfView.vue b/pages/realName/components/PdfView.vue index 22ee299..f88cc2e 100644 --- a/pages/realName/components/PdfView.vue +++ b/pages/realName/components/PdfView.vue @@ -23,7 +23,7 @@ export default { return { viewerUrl: '/hybrid/html/web/viewer.html', // 注意：静态的html文件需要放在根路径下的 hybrid/html 文件夹中 fileUrl: '', // 要访问的本地pdf的路径 - url: '', // 最终显示在web-view中的路径 + // url: '', // 最终显示在web-view中的路径 currentPage: 1, //初始页 totalPage: 0, //总页码 currentReadPage: 0, //当前页码 @@ -80,7 +80,7 @@ export default { pageInt() { console.log(this.viewerUrlWithParams) // #ifdef H5 - this.url = `${this.viewerUrl}?file=${encodeURIComponent(this.fileUrl)}&page=`+this.currentPage + this.viewerUrlWithParams = `${this.viewerUrl}?file=${encodeURIComponent(this.fileUrl)}&page=`+this.currentPage console.log(this.viewerUrlWithParams) // #endif // #ifdef APP-PLUS diff --git a/pages/realName/index/pages/personDetail.vue b/pages/realName/index/pages/personDetail.vue index 4540232..3e3ac7f 100644 --- a/pages/realName/index/pages/personDetail.vue +++ b/pages/realName/index/pages/personDetail.vue @@ -1,394 +1,256 @@ @@ -397,266 +259,195 @@ import config from '@/config' export default { data() { return { - idNumber: '', - detailData: {}, - faceImgUrl: '', - showPopup1: false, //信息 - showPopup2: false, //培训考试 - contractData: {}, //合同 - contractImgUrl: '', - contractWitnessType: '', - showPopup3: false, //合同 - listCertificate: {}, //持证 - showPopup4: false //持证 + idNumber:'', + detailData:{}, + faceImgUrl:'', + showPopup1:false,//信息 + showPopup2:false,//培训考试 + contractData:{},//合同 + contractImgUrl:"", + contractWitnessType:"", + showPopup3:false,//合同 + listCertificate:{},//持证 + showPopup4:false,//持证 } }, onLoad(option) { - console.log(option) - this.idNumber = option.idNumber || '' - if (this.idNumber != '') { - this.selectPersonQualificationsContent() - } + console.log(option) + this.idNumber=option.idNumber||""; + if(this.idNumber!=""){ + this.selectPersonQualificationsContent() + } + }, + onShow() { }, - onShow() {}, methods: { - // 获取详情 - selectPersonQualificationsContent() { - let param = { - idNumber: this.idNumber - } - uni.request({ - url: config.realAppUrl + '/BasePerson/selectPersonQualificationsContent', - method: 'post', - data: param, - header: { - 'Content-Type': 'application/json;charset=UTF-8;', - Authorization: uni.getStorageSync('realNameToken') - }, - success: res => { - console.log(res) - res = res.data - if (res.code == 200) { - this.detailData = res.data - this.faceImgUrl = config.realBaseUrl + res.data.facePhoto - } else { - uni.showToast({ - title: res.msg, - icon: 'none' - }) - } - }, - fail: err => { - console.log(err) - } - }) - }, - openInfo() { - this.showPopup1 = true - }, - closePopup1() { - this.showPopup1 = false - }, - openTrain() { - this.showPopup2 = true - }, - closePopup2() { - this.showPopup2 = false - }, - openContract() { - this.contractData = this.detailData.listContract[0] - if (this.contractData.witnessPath && this.contractData.witnessPath.split('.')[1] == 'pdf') { - this.contractWitnessType = 'file' - } else { - this.contractWitnessType = 'img' - } - this.contractImgUrl = config.realFileUrl + this.contractData.witnessPath - this.showPopup3 = true - }, - closePopup3() { - this.showPopup3 = false - }, - openListCertificate() { - this.listCertificate = this.detailData.listCertificate[0] - this.showPopup4 = true - }, - closePopup4() { - this.showPopup4 = false - }, - openPdf() { - console.log('附件打开', this.listCertificate.certificateTypeFile) - uni.navigateTo({ - url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.listCertificate.certificateTypeFile}` - }) - }, - openPdf2() { - console.log('附件打开', this.contractImgUrl) - // let url = config.realFileUrl+this.contractData.witnessPath - uni.navigateTo({ - url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.contractImgUrl}` - }) - }, - leftClick() { + // 获取详情 + selectPersonQualificationsContent(){ + let param={ + idNumber:this.idNumber, + } + uni.request({ + url: config.realAppUrl+'/BasePerson/selectPersonQualificationsContent', + method: 'post', + data: param, + header: { + 'Content-Type': 'application/json;charset=UTF-8;', + Authorization: uni.getStorageSync('realNameToken') + }, + success: res => { + console.log(res) + res = res.data; + if(res.code==200){ + this.detailData=res.data; + this.faceImgUrl=config.realBaseUrl+res.data.facePhoto; + }else{ + uni.showToast({ + title: res.msg, + icon: 'none' + }) + } + }, + fail: err => { + console.log(err) + } + }) + }, + openInfo(){ + this.showPopup1=true; + }, + closePopup1(){ + this.showPopup1=false; + }, + openTrain(){ + this.showPopup2=true; + }, + closePopup2(){ + this.showPopup2=false; + }, + openContract(){ + this.contractData = this.detailData.listContract[0] + if(this.contractData.witnessPath&&this.contractData.witnessPath.split(".")[1]=="pdf"){ + this.contractWitnessType="file" + }else{ + this.contractWitnessType="img" + } + this.contractImgUrl=config.realFileUrl+this.contractData.witnessPath; + this.showPopup3=true; + }, + closePopup3(){ + this.showPopup3=false; + }, + openListCertificate(){ + this.listCertificate = this.detailData.listCertificate[0] + this.showPopup4=true; + }, + closePopup4(){ + this.showPopup4=false; + }, + openPdf(){ + console.log("附件打开",this.listCertificate.certificateTypeFile) + uni.navigateTo({ + url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.listCertificate.certificateTypeFile}` + }) + }, + openPdf2(){ + console.log("附件打开",this.contractImgUrl) + // let url = config.realFileUrl+this.contractData.witnessPath + uni.navigateTo({ + url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.contractImgUrl}` + }) + }, + leftClick() { console.log('返回') uni.navigateBack({ - delta: 1 // 返回 - }) + delta: 1 // 返回 + }); } }, - onShow() {}, - methods: { - // 获取详情 - selectPersonQualificationsContent() { - let param = { - idNumber: this.idNumber - } - uni.request({ - url: config.realAppUrl + '/BasePerson/selectPersonQualificationsContent', - method: 'post', - data: param, - header: { - 'Content-Type': 'application/json;charset=UTF-8;', - Authorization: uni.getStorageSync('realNameToken') - }, - success: res => { - console.log(res) - res = res.data - if (res.code == 200) { - this.detailData = res.data - this.faceImgUrl = config.realBaseUrl + res.data.facePhoto - } else { - uni.showToast({ - title: res.msg, - icon: 'none' - }) - } - }, - fail: err => { - console.log(err) - } - }) - }, - openInfo() { - this.showPopup1 = true - }, - closePopup1() { - this.showPopup1 = false - }, - openTrain() { - this.showPopup2 = true - }, - closePopup2() { - this.showPopup2 = false - }, - openContract() { - this.contractData = this.detailData.listContract[0] - this.contractImgUrl = config.realBaseUrl + this.contractData.witnessPath - this.showPopup3 = true - }, - closePopup3() { - this.showPopup3 = false - }, - openListCertificate() { - this.listCertificate = this.detailData.listCertificate[0] - this.showPopup4 = true - }, - closePopup4() { - this.showPopup4 = false - }, - openPdf() { - console.log('附件打开') - uni.navigateTo({ - url: `/pages/realName/workbench/qualifications/listCertificatePdf?pdfUrl=${this.listCertificate.certificateTypeFile}` - }) - }, - leftClick() { - console.log('返回') - uni.navigateBack({ - delta: 1 // 返回 - }) - } - } + } diff --git a/pages/realName/workbench/electronicContract/contractVideo.vue b/pages/realName/workbench/electronicContract/contractVideo.vue index 935c3d3..7aad93a 100644 --- a/pages/realName/workbench/electronicContract/contractVideo.vue +++ b/pages/realName/workbench/electronicContract/contractVideo.vue @@ -5,7 +5,7 @@ 合同视频 - + 确认视频无误，进行下一步签订 @@ -88,7 +88,7 @@ export default { compressed: false, success: res => { console.log('chooseVideo',res) - this.videoSrc = res.tempFilePath+'?_t=' + Date.now(); + this.videoSrc = res.tempFilePath; this.videoUrl = res.tempFilePath; }, diff --git a/pages/realName/workbench/workPlan/index.vue b/pages/realName/workbench/workPlan/index.vue index 5403fb0..a189058 100644 --- a/pages/realName/workbench/workPlan/index.vue +++ b/pages/realName/workbench/workPlan/index.vue @@ -26,8 +26,8 @@ - 横屏 - 竖屏 + 横屏 + 竖屏 @@ -105,15 +105,14 @@ // 竖屏 //this.lockOrientation('portrait') lockOrientation(orientation) { - if(orientation=='landscape'){ + if(orientation=='landscape-primary'){ this.screenType=1 - }else if(orientation=='portrait'){ + }else if(orientation=='portrait-primary'){ this.screenType=2 - } - if (typeof plus !== 'undefined' && typeof plus.screen !== 'undefined') { + // if (typeof plus !== 'undefined' && typeof plus.screen !== 'undefined') { plus.screen.lockOrientation(orientation) - } + // } this.webviewStyles = { progress: false, width:'90%',