From 44d498c2dc3a0311f682445ce0490b57278a9981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 11 Feb 2025 15:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diamagnetic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/public/favicon.ico | Bin 5018 -> 894 bytes .../miniprogram/pages/project_qr/index.js | 223 +++++++++--------- .../miniprogram/pages/project_qr/index.wxml | 2 +- yanzhu-ui-vue3/public/favicon.ico | Bin 5561 -> 894 bytes 4 files changed, 118 insertions(+), 107 deletions(-) diff --git a/yanzhu-bigscreen/public/favicon.ico b/yanzhu-bigscreen/public/favicon.ico index 0908b50141564e06bcfa31436240b8cf32776c5c..d92e0b8c4963f1ae81021bbed63e94c2699dea66 100644 GIT binary patch literal 894 zcmZQzU<5(|0R|u`!H~hsz#zuJz@P!dKp_SNAO?x!2k(<*|Mp73(S^ghaCG}W3micV zd6}gJRR66~2Cn|nK^;8mfr=prt{%vMt3Q887jFKoe=I;N;Of6uAgs8$R~xS7)?Ze* z7G(86jaaP!YD8B5HAMw(#m^dPxRwit(0u_9G`M>FR>0MN^(+15GZl&w=KiVL1wn6T z6kkZ}DT8x=g_XnA|4v>HSO33$3S12u1Fjy#fSC_upeciM zfBAL8wfs)p0oU^X|9`j|GzMHfvK44*kh#ACs}Nd}*5GjrTo*z;*cWhd@)!pg85kNs n7^oeNfqano0bpKwAP>a+3=AJYn4N*)2ax^&6#E0jpkM$1?7KMX literal 5018 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 { if (res.code == 200) { let phoneNumber = res.data; - //使用手机号码查询详情 - if (this.data.userPost == "1") { - findProSubDeptsInfo(this.data.proId, phoneNumber).then(deptRes => { - if (deptRes.code == 200 && deptRes.data) { - deptRes.data.subDeptLeaderPhone = phoneNumber; - if(deptRes.data.proProjectInfoSubdeptsUsers){ - deptRes.data.leaderDegreeGrade = deptRes.data.proProjectInfoSubdeptsUsers.degreeGrade; - deptRes.data.eduFilePath = deptRes.data.proProjectInfoSubdeptsUsers.eduFilePath; - deptRes.data.subStep = deptRes.data.proProjectInfoSubdeptsUsers.subStep; - } - if (deptRes.data.businessLicensePath) { - deptRes.data.businessLicensePath = (this.data.imgBase + deptRes.data.businessLicensePath).split(','); - } - if (deptRes.data.subDeptInfos) { - let subDeptInfosJSON = JSON.parse(deptRes.data.subDeptInfos); - deptRes.data.subDeptInfos = subDeptInfosJSON; - if (deptRes.data.subDeptInfos.legalPersonCardImgPos) { - deptRes.data.subDeptInfos.legalPersonCardImgPos = (this.data.imgBase + deptRes.data.subDeptInfos.legalPersonCardImgPos).split(','); - } - if (deptRes.data.subDeptInfos.legalPersonCardImgInv) { - deptRes.data.subDeptInfos.legalPersonCardImgInv = (this.data.imgBase + deptRes.data.subDeptInfos.legalPersonCardImgInv).split(','); - } - } - if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos){ - let userInfosJSON = JSON.parse(deptRes.data.proProjectInfoSubdeptsUsers.userInfos); - deptRes.data.proProjectInfoSubdeptsUsers.userInfos = userInfosJSON; - if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgPos){ - deptRes.data.leaderCardImgPos = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgPos).split(','); - } - if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgInv){ - deptRes.data.leaderCardImgInv = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgInv).split(','); - } - } - if(deptRes.data.proProjectInfoSubdeptsUsers.userPicture){ - deptRes.data.leaderUserPicture = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userPicture).split(','); - } - if (deptRes.data.proProjectInfoSubdeptsUsers.subDeptPowerPath) { - deptRes.data.subDeptLeaderPowerPath = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.subDeptPowerPath).split(','); - } - this.setData({ - form: deptRes.data, - userPhoneNumber: phoneNumber, - active: deptRes.data.subStep - }); - if (deptRes.data.proProjectInfoSubdeptsUsers.subStep == 1) { - this.initBusEduVideos(false); - } else if (deptRes.data.proProjectInfoSubdeptsUsers.subStep == 2) { - this.initBusEduQuestion(false); - } else if (deptRes.data.proProjectInfoSubdeptsUsers.subStep == 3) { - this.startSignFile(false); - } - } else { - this.setData({ - userPhoneNumber: phoneNumber, - "form.subDeptLeaderPhone": phoneNumber, - }); - } - }); - } else { - findProSubDeptsUser(this.data.proId, phoneNumber).then(userRes => { - if (userRes.code == 200 && userRes.data) { - if (userRes.data.userInfos) { - let userInfosJSON = JSON.parse(userRes.data.userInfos); - userRes.data.nativePlace = userInfosJSON.nativePlace; - userRes.data.address = userInfosJSON.address; - userRes.data.emergencyContact = userInfosJSON.emergencyContact; - userRes.data.contactPhone = userInfosJSON.contactPhone; - userRes.data.bankName = userInfosJSON.bankName; - userRes.data.bankOffice = userInfosJSON.bankOffice; - userRes.data.bankCardNo = userInfosJSON.bankCardNo; - } - if (userRes.data.cardImgPos) { - userRes.data.cardImgPos = (this.data.imgBase + userRes.data.cardImgPos).split(','); - } - if (userRes.data.cardImgInv) { - userRes.data.cardImgInv = (this.data.imgBase + userRes.data.cardImgInv).split(','); - } - if (userRes.data.userPicture) { - userRes.data.userPicture = (this.data.imgBase + userRes.data.userPicture).split(','); - } - if (userRes.data.subDeptPowerPath) { - userRes.data.subDeptPowerPath = (this.data.imgBase + userRes.data.subDeptPowerPath).split(','); - } - this.setData({ - form: userRes.data, - userPhoneNumber: phoneNumber, - "form.userPhone": phoneNumber, - active: userRes.data.subStep - }); - if (userRes.data.subStep == 1) { - this.initBusEduVideos(false); - } else if (userRes.data.subStep == 2) { - this.initBusEduQuestion(false); - } else if (userRes.data.subStep == 3) { - this.startSignFile(false); - } - } else { - this.setData({ - userPhoneNumber: phoneNumber, - "form.userPhone": phoneNumber, - }); - } - }); - } + this.initData(phoneNumber); } }) } else { @@ -416,6 +313,113 @@ Page({ } }, + initData(phoneNumber){ +//使用手机号码查询详情 +if (this.data.userPost == "1") { + findProSubDeptsInfo(this.data.proId, phoneNumber).then(deptRes => { + if (deptRes.code == 200 && deptRes.data) { + deptRes.data.subDeptLeaderPhone = phoneNumber; + if(deptRes.data.proProjectInfoSubdeptsUsers){ + deptRes.data.leaderDegreeGrade = deptRes.data.proProjectInfoSubdeptsUsers.degreeGrade; + deptRes.data.eduFilePath = deptRes.data.proProjectInfoSubdeptsUsers.eduFilePath; + deptRes.data.subStep = deptRes.data.proProjectInfoSubdeptsUsers.subStep; + } + if (deptRes.data.businessLicensePath) { + deptRes.data.businessLicensePath = (this.data.imgBase + deptRes.data.businessLicensePath).split(','); + } + if (deptRes.data.subDeptInfos) { + let subDeptInfosJSON = JSON.parse(deptRes.data.subDeptInfos); + deptRes.data.subDeptInfos = subDeptInfosJSON; + if (deptRes.data.subDeptInfos.legalPersonCardImgPos) { + deptRes.data.subDeptInfos.legalPersonCardImgPos = (this.data.imgBase + deptRes.data.subDeptInfos.legalPersonCardImgPos).split(','); + } + if (deptRes.data.subDeptInfos.legalPersonCardImgInv) { + deptRes.data.subDeptInfos.legalPersonCardImgInv = (this.data.imgBase + deptRes.data.subDeptInfos.legalPersonCardImgInv).split(','); + } + } + if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos){ + let userInfosJSON = JSON.parse(deptRes.data.proProjectInfoSubdeptsUsers.userInfos); + deptRes.data.proProjectInfoSubdeptsUsers.userInfos = userInfosJSON; + if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgPos){ + deptRes.data.leaderCardImgPos = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgPos).split(','); + } + if(deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgInv){ + deptRes.data.leaderCardImgInv = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userInfos.cardImgInv).split(','); + } + } + if(deptRes.data.proProjectInfoSubdeptsUsers.userPicture){ + deptRes.data.leaderUserPicture = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.userPicture).split(','); + } + if (deptRes.data.proProjectInfoSubdeptsUsers.subDeptPowerPath) { + deptRes.data.subDeptLeaderPowerPath = (this.data.imgBase + deptRes.data.proProjectInfoSubdeptsUsers.subDeptPowerPath).split(','); + } + this.setData({ + form: deptRes.data, + userPhoneNumber: phoneNumber, + active: deptRes.data.subStep + }); + if (deptRes.data.proProjectInfoSubdeptsUsers.subStep == 1) { + this.initBusEduVideos(false); + } else if (deptRes.data.proProjectInfoSubdeptsUsers.subStep == 2) { + this.initBusEduQuestion(false); + } else if (deptRes.data.proProjectInfoSubdeptsUsers.subStep == 3) { + this.startSignFile(false); + } + } else { + this.setData({ + userPhoneNumber: phoneNumber, + "form.subDeptLeaderPhone": phoneNumber, + }); + } + }); +} else { + findProSubDeptsUser(this.data.proId, phoneNumber).then(userRes => { + if (userRes.code == 200 && userRes.data) { + if (userRes.data.userInfos) { + let userInfosJSON = JSON.parse(userRes.data.userInfos); + userRes.data.nativePlace = userInfosJSON.nativePlace; + userRes.data.address = userInfosJSON.address; + userRes.data.emergencyContact = userInfosJSON.emergencyContact; + userRes.data.contactPhone = userInfosJSON.contactPhone; + userRes.data.bankName = userInfosJSON.bankName; + userRes.data.bankOffice = userInfosJSON.bankOffice; + userRes.data.bankCardNo = userInfosJSON.bankCardNo; + } + if (userRes.data.cardImgPos) { + userRes.data.cardImgPos = (this.data.imgBase + userRes.data.cardImgPos).split(','); + } + if (userRes.data.cardImgInv) { + userRes.data.cardImgInv = (this.data.imgBase + userRes.data.cardImgInv).split(','); + } + if (userRes.data.userPicture) { + userRes.data.userPicture = (this.data.imgBase + userRes.data.userPicture).split(','); + } + if (userRes.data.subDeptPowerPath) { + userRes.data.subDeptPowerPath = (this.data.imgBase + userRes.data.subDeptPowerPath).split(','); + } + this.setData({ + form: userRes.data, + userPhoneNumber: phoneNumber, + "form.userPhone": phoneNumber, + active: userRes.data.subStep + }); + if (userRes.data.subStep == 1) { + this.initBusEduVideos(false); + } else if (userRes.data.subStep == 2) { + this.initBusEduQuestion(false); + } else if (userRes.data.subStep == 3) { + this.startSignFile(false); + } + } else { + this.setData({ + userPhoneNumber: phoneNumber, + "form.userPhone": phoneNumber, + }); + } + }); +} + }, + /** * 初始化学习视频 */ @@ -670,6 +674,13 @@ Page({ }); }, + /** + * 签名.. + */ + startSignFile_0(){ + this.initData(this.data.userPhoneNumber); + }, + /** * 开始签署文件 * @param {*} skip @@ -677,8 +688,8 @@ Page({ startSignFile(skip) { let _fileForm = {}; let currDate = new Date().toLocaleString().substring(0, 10).split("/"); - currDate[2] = currDate[2].replace("上午","").replace("下午",""); - if (this.data.userPost == 1) { + currDate[2] = currDate[2].replace("上","").replace("下","").replace("午",""); + if (this.data.form.userPost == 1) { _fileForm.fName = this.data.form.subDeptLeaderName; _fileForm.fCardId = this.data.form.subDeptLeaderCode; _fileForm.fSex = this.getGenderFromIdCard(this.data.form.subDeptLeaderCode); diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml index bdffb60b..f76e5991 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml @@ -688,7 +688,7 @@ - +