diff --git a/App.vue b/App.vue index cae140c..4628c8c 100644 --- a/App.vue +++ b/App.vue @@ -1,13 +1,13 @@ diff --git a/compontent/public/huakuai.vue b/compontent/public/huakuai.vue index 43aab6b..e2a4392 100644 --- a/compontent/public/huakuai.vue +++ b/compontent/public/huakuai.vue @@ -1,12 +1,10 @@ \ No newline at end of file diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index cd288e7..876cdf2 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -89,9 +89,9 @@ onShow } from '@dcloudio/uni-app'; import { - media_base_url, - base_url - } from '@/request/index.js'; + media_base_url, + base_url + } from '@/request/index.js'; import { swapLongTerm } from '@/compontent/public/long.js' @@ -128,7 +128,7 @@ } } const photoclick = (element) => { - if (element==2) { + if (element == 2) { uni.previewImage({ urls: [headImge.value, backImge.value], // 必填,所有要预览的图片地址数组 current: targetphoto.value ? backImge.value : headImge.value, // 可选,当前显示图片的地址,默认是 urls[0] @@ -234,7 +234,7 @@ }, formData: {}, success: uploadRes => { - console.log("token", uni.getStorageSync('token')) + // console.log("token", uni.getStorageSync('token')) if (!JSON.parse(uploadRes.data).success) { uni.hideLoading() uni.showToast({ @@ -259,7 +259,7 @@ } else if (JSON.parse(JSON.parse(uploadRes.data).result.data).data.back) { - + let father = JSON.parse(JSON.parse(uploadRes.data).result.data).data.back.data; // console.log(father) // textArray[6] = father.issueAuthority; @@ -267,19 +267,19 @@ // backImge.value = filePath; // savephoto(filePath, 1); let regex = /[\u4E00-\u9FA5\uF900-\uFA2D]{1,}/; - console.log(regex.test(father.validPeriod)) - if(!regex.test(father.validPeriod)){ + console.log(regex.test(father.validPeriod)) + if (!regex.test(father.validPeriod)) { textArray[6] = father.issueAuthority; textArray[7] = father.validPeriod; backImge.value = filePath; savephoto(filePath, 1); - }else{ - if(father.validPeriod.indexOf('长期')>-1){ + } else { + if (father.validPeriod.indexOf('长期') > -1) { textArray[6] = father.issueAuthority; textArray[7] = father.validPeriod; backImge.value = filePath; savephoto(filePath, 1); - }else{ + } else { textArray[7] = ""; uni.showToast({ title: '识别失败', @@ -317,7 +317,7 @@ const yyyy = now.getFullYear(); const mm = String(now.getMonth() + 1).padStart(2, '0'); // 补0 let path = ''; - + switch ('jg') { case 'jg': // 机构 path = `${yyyy}/${mm}/jgxx/jg`; @@ -400,6 +400,7 @@ show.value = true } } + function isValid18DigitNumber(val) { return /^(\d{18})$/.test(val); } @@ -417,12 +418,12 @@ }) return } - if(!isValid18DigitNumber(textArray[2])) { - uni.showToast({ - title: '身份证号格式错误', - icon: 'none' - }) - } + if (!isValid18DigitNumber(textArray[2])) { + uni.showToast({ + title: '身份证号格式错误', + icon: 'none' + }) + } const allNonEmpty = textArray.every(item => { // 如果想忽略前后空格,可用 item.trim() !== '' return item !== ''; @@ -463,16 +464,18 @@ } const alldata = ref({}) onLoad((e) => { + + if(e.element){ let data = JSON.parse(e.element); - if(e.element){ + if (e.element) { alldata.value = JSON.parse(e.element); - uni.setStorageSync('baddata',alldata.value) - uni.setStorageSync('backhuancun',alldata.value) - uni.setStorageSync('tel',alldata.value.tel) - }else{ - data = uni.getStorageSync('baddata') + uni.setStorageSync('baddata', alldata.value) + uni.setStorageSync('backhuancun', alldata.value) + uni.setStorageSync('tel', alldata.value.tel) + } else { + data = uni.getStorageSync('baddata') } - if(!data){ + if (!data) { return } textArray[0] = data.name; @@ -487,7 +490,8 @@ backImge.value = `${media_base_url}${data.cardFmPath}`; fontphoto.value = data.cardZmPath endphoto.value = data.cardFmPath - + } + }) onShow(() => { const img = uni.getStorageSync('imgkey0') @@ -609,7 +613,7 @@ .photo-font { font-size: 28rpx; - margin-top: 10rpx; + margin-top: 10rpx; color: #999999; } @@ -675,18 +679,20 @@ .line { margin: 10rpx 0; } - .contentred{ + + .contentred { width: 90%; border-radius: 15rpx; margin: 15rpx 0; margin-left: 5%; padding: 5rpx; - .contentred-bgc{ + + .contentred-bgc { border-radius: 15rpx; color: red; padding: 20rpx; padding-bottom: 30rpx; - + } } \ No newline at end of file diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index 4ea3d86..8b5659a 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -363,7 +363,7 @@ data.orgBuildingArea = form.orgBuildingArea data.izSkipRepetVali = izSkipRepetVali.value data.headPath = form.headPath; - + // console.log("看看",data.headPath) // if (data.id === null) { // data.status = `4` // } else { @@ -614,7 +614,7 @@ success: uploadRes => { let data = JSON.parse(uploadRes.data) form.headPath = data.message; - console.log(form.headPath,1111111111111111111) + // console.log(form.headPath,1111111111111111111) uping.value = true; uni.hideLoading() }, @@ -659,7 +659,7 @@ form.orgLeaderPhone = data.orgLeaderPhone; form.orgPropertyType = data.orgPropertyType; form.orgBuildingArea = data.orgBuildingArea; - // form.headPath = data.headPath; + form.headPath = data.headPath; form.sex = data.sex; if(data.headPath&&data.headPath.indexOf('https')>-1){ form.value = data.headPath ; @@ -682,7 +682,7 @@ form.orgLeaderPhone = data.orgLeaderPhone; form.orgPropertyType = data.orgPropertyType; form.orgBuildingArea = data.orgBuildingArea; - // form.headPath = data.headPath; + form.headPath = data.headPath; form.sex = data.sex; if(data.headPath&&data.headPath.indexOf('https')>-1){ form.value = data.headPath ; diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue index e2430fa..5e3c75b 100644 --- a/pages/addstaff/healthcertificate.vue +++ b/pages/addstaff/healthcertificate.vue @@ -453,6 +453,7 @@ orgCode: uni.getStorageSync('nostaffmessage') } Apply(data).then((data) => { + console.log("不好使?",data) if (data.success) { uni.requestSubscribeMessage({ // 这里填后台申请好的 templateId 数组 diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue index bc9291c..e080e24 100644 --- a/pages/addstaff/information.vue +++ b/pages/addstaff/information.vue @@ -31,13 +31,14 @@ - + - + 头像(选填) - @@ -47,7 +48,8 @@ 婚否 - + @@ -84,7 +86,8 @@ 健康状况 - + @@ -95,7 +98,8 @@ 政治面貌 - + @@ -104,7 +108,8 @@ 紧急联系人 - + @@ -123,7 +128,8 @@ 户口性质 - + @@ -144,7 +150,7 @@ 下一步 - + @@ -223,7 +229,7 @@ ) onShow(() => { const img = uni.getStorageSync('imgkey0') - console.log(img,1111111111111) + console.log(img, 1111111111111) if (img) { // uploadImage(img) savephoto(img) @@ -243,6 +249,7 @@ } } const tempImagePath = ref('') + function getMessage() { uni.chooseImage({ count: 1, @@ -252,7 +259,7 @@ uni.navigateTo({ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1&height=1500&width=1500` }); - + }, fail: err => { console.error('拍照失败:', err) @@ -260,7 +267,7 @@ }) } const photoclick = (element) => { - if (element==2) { + if (element == 2) { uni.previewImage({ urls: [`${media_base_url}${headPath.value}`], // 必填,所有要预览的图片地址数组 // current: headImge.value, // 可选,当前显示图片的地址,默认是 urls[0] @@ -288,51 +295,88 @@ const uping = ref(true); const savephoto = (filePath) => { uping.value = false; - // category: 'jg' | 'yg' | 'zz' | 'jhr' + const now = new Date(); const yyyy = now.getFullYear(); - const mm = String(now.getMonth() + 1).padStart(2, '0'); // 补0 + const mm = String(now.getMonth() + 1).padStart(2, '0'); + let path = ''; - - switch ('yg') { - case 'jg': // 机构 + const type = 'yg'; // 这里别写死,后面换成你的真实类型 + + switch (type) { + case 'jg': path = `${yyyy}/${mm}/jgxx/jg`; break; - case 'yg': // 员工 + case 'yg': path = `${yyyy}/${mm}/ygxx/yg`; break; - case 'zz': // 长者 + case 'zz': path = `${yyyy}/${mm}/zzxx/zz`; break; - case 'jhr': // 监护人 + case 'jhr': path = `${yyyy}/${mm}/zzxx/jhr`; break; default: path = `${yyyy}/${mm}/temp`; } - console.log(filePath) - uni.uploadFile({ - url: `${base_url}/sys/common/upload`, // 替换为您的POST接口地址 - filePath, - name: 'file', // 后端接收时的字段名 - header: { - 'X-Access-Token': uni.getStorageSync('token') || '', + + uni.compressImage({ + src: filePath, + quality: 70, // 大致相当于压缩 30%,不是严格百分比 + success: (compressRes) => { + uni.uploadFile({ + url: `${base_url}/sys/common/upload`, + filePath: compressRes.tempFilePath, + name: 'file', + header: { + 'X-Access-Token': uni.getStorageSync('token') || '', + }, + formData: { + biz: path + }, + success: uploadRes => { + headPath.value = JSON.parse(uploadRes.data).message + uping.value = true + uni.hideLoading() + }, + fail: () => { + uni.showToast({ + title: '上传出错', + icon: 'none' + }) + uni.hideLoading() + } + }) }, - formData: { - biz: path - }, - success: uploadRes => { - headPath.value = JSON.parse(uploadRes.data).message - console.log(headPath.value,JSON.parse(uploadRes.data)) - uping.value = true; - uni.hideLoading() - }, - fail: err => { + fail: () => { uni.showToast({ - title: '上传出错', + title: '压缩失败,直接上传原图', icon: 'none' }) - uni.hideLoading() + + uni.uploadFile({ + url: `${base_url}/sys/common/upload`, + filePath, + name: 'file', + header: { + 'X-Access-Token': uni.getStorageSync('token') || '', + }, + formData: { + biz: path + }, + success: uploadRes => { + headPath.value = JSON.parse(uploadRes.data).message + uping.value = true + uni.hideLoading() + }, + fail: () => { + uni.showToast({ + title: '上传出错', + icon: 'none' + }) + uni.hideLoading() + } + }) } }) } @@ -609,6 +653,7 @@ border-radius: 35rpx; font-size: 33rpx; } + .back-button { display: flex; justify-content: center; @@ -621,6 +666,7 @@ border-radius: 37rpx; font-size: 33rpx; } + .title-back { background-color: #F7F7F7; width: 100%; diff --git a/pages/index/mine.vue b/pages/index/mine.vue index 8339de5..8ec1576 100644 --- a/pages/index/mine.vue +++ b/pages/index/mine.vue @@ -2,7 +2,7 @@ - + - + +86 + placeholder="请输入手机号" @input="isRight" @keyboardheightchange="keyboardheightchange" /> @@ -82,12 +82,37 @@ } } - const keyboardheightchange = (e)=>{ + const keyboardheightchange = (e) => { console.log(e.detail.height) } const goback = () => { uni.navigateBack() } + // 滑块图片预加载 + const images = [ + 'https://www.focusnu.com/media/directive/login/0.png', + 'https://www.focusnu.com/media/directive/login/1.png', + 'https://www.focusnu.com/media/directive/login/2.png' + ] + + function preloadImages(list = []) { + return Promise.all( + list.map(src => { + return new Promise((resolve) => { + uni.getImageInfo({ + src, + success: () => resolve(true), + fail: () => resolve(false) + }) + }) + }) + ) + } + + onMounted(async () => { + await preloadImages(images) + // console.log('预加载完成') + }) - \ No newline at end of file + } + + \ No newline at end of file diff --git a/pages/yuangongindex/purchaseorderdetail.vue b/pages/yuangongindex/purchaseorderdetail.vue index d6860e7..96e92ac 100644 --- a/pages/yuangongindex/purchaseorderdetail.vue +++ b/pages/yuangongindex/purchaseorderdetail.vue @@ -377,7 +377,7 @@ 单价 - + @@ -553,7 +553,7 @@ stringShow.value = stringShow.value.slice(0, -1) return } - if (stringShow.value.length > 10) { return } + if (stringShow.value.length > 6) { return } let a = stringShow.value.indexOf('.') if (item == "." && stringShow.value.length == 0) { return diff --git a/static/donghua/home/home1.png b/static/donghua/home/home1.png deleted file mode 100644 index 2f83126..0000000 Binary files a/static/donghua/home/home1.png and /dev/null differ diff --git a/static/donghua/home/home10.png b/static/donghua/home/home10.png deleted file mode 100644 index 8e0e722..0000000 Binary files a/static/donghua/home/home10.png and /dev/null differ diff --git a/static/donghua/home/home11.png b/static/donghua/home/home11.png deleted file mode 100644 index c53ab17..0000000 Binary files a/static/donghua/home/home11.png and /dev/null differ diff --git a/static/donghua/home/home12.png b/static/donghua/home/home12.png deleted file mode 100644 index 911f12b..0000000 Binary files a/static/donghua/home/home12.png and /dev/null differ diff --git a/static/donghua/home/home13.png b/static/donghua/home/home13.png deleted file mode 100644 index cfad568..0000000 Binary files a/static/donghua/home/home13.png and /dev/null differ diff --git a/static/donghua/home/home14.png b/static/donghua/home/home14.png deleted file mode 100644 index 99481db..0000000 Binary files a/static/donghua/home/home14.png and /dev/null differ diff --git a/static/donghua/home/home15.png b/static/donghua/home/home15.png deleted file mode 100644 index dd1a4c1..0000000 Binary files a/static/donghua/home/home15.png and /dev/null differ diff --git a/static/donghua/home/home16.png b/static/donghua/home/home16.png deleted file mode 100644 index 34e5a62..0000000 Binary files a/static/donghua/home/home16.png and /dev/null differ diff --git a/static/donghua/home/home17.png b/static/donghua/home/home17.png deleted file mode 100644 index dd1a4c1..0000000 Binary files a/static/donghua/home/home17.png and /dev/null differ diff --git a/static/donghua/home/home18.png b/static/donghua/home/home18.png deleted file mode 100644 index cfad568..0000000 Binary files a/static/donghua/home/home18.png and /dev/null differ diff --git a/static/donghua/home/home2.png b/static/donghua/home/home2.png deleted file mode 100644 index 0c59ea8..0000000 Binary files a/static/donghua/home/home2.png and /dev/null differ diff --git a/static/donghua/home/home3.png b/static/donghua/home/home3.png deleted file mode 100644 index 720abd1..0000000 Binary files a/static/donghua/home/home3.png and /dev/null differ diff --git a/static/donghua/home/home4.png b/static/donghua/home/home4.png deleted file mode 100644 index bacad5c..0000000 Binary files a/static/donghua/home/home4.png and /dev/null differ diff --git a/static/donghua/home/home5.png b/static/donghua/home/home5.png deleted file mode 100644 index dca109b..0000000 Binary files a/static/donghua/home/home5.png and /dev/null differ diff --git a/static/donghua/home/home6.png b/static/donghua/home/home6.png deleted file mode 100644 index 3f8f0e2..0000000 Binary files a/static/donghua/home/home6.png and /dev/null differ diff --git a/static/donghua/home/home7.png b/static/donghua/home/home7.png deleted file mode 100644 index 2864078..0000000 Binary files a/static/donghua/home/home7.png and /dev/null differ diff --git a/static/donghua/home/home8.png b/static/donghua/home/home8.png deleted file mode 100644 index 7af4544..0000000 Binary files a/static/donghua/home/home8.png and /dev/null differ diff --git a/static/donghua/home/home9.png b/static/donghua/home/home9.png deleted file mode 100644 index 25389ae..0000000 Binary files a/static/donghua/home/home9.png and /dev/null differ diff --git a/static/donghua/my/my1.png b/static/donghua/my/my1.png deleted file mode 100644 index 4df3477..0000000 Binary files a/static/donghua/my/my1.png and /dev/null differ diff --git a/static/donghua/my/my10.png b/static/donghua/my/my10.png deleted file mode 100644 index 00e7ea4..0000000 Binary files a/static/donghua/my/my10.png and /dev/null differ diff --git a/static/donghua/my/my11.png b/static/donghua/my/my11.png deleted file mode 100644 index 22527b6..0000000 Binary files a/static/donghua/my/my11.png and /dev/null differ diff --git a/static/donghua/my/my12.png b/static/donghua/my/my12.png deleted file mode 100644 index b1a483c..0000000 Binary files a/static/donghua/my/my12.png and /dev/null differ diff --git a/static/donghua/my/my13.png b/static/donghua/my/my13.png deleted file mode 100644 index 4070536..0000000 Binary files a/static/donghua/my/my13.png and /dev/null differ diff --git a/static/donghua/my/my2.png b/static/donghua/my/my2.png deleted file mode 100644 index 2b45c58..0000000 Binary files a/static/donghua/my/my2.png and /dev/null differ diff --git a/static/donghua/my/my3.png b/static/donghua/my/my3.png deleted file mode 100644 index 67c4586..0000000 Binary files a/static/donghua/my/my3.png and /dev/null differ diff --git a/static/donghua/my/my4.png b/static/donghua/my/my4.png deleted file mode 100644 index 6e86bb9..0000000 Binary files a/static/donghua/my/my4.png and /dev/null differ diff --git a/static/donghua/my/my5.png b/static/donghua/my/my5.png deleted file mode 100644 index ec254e9..0000000 Binary files a/static/donghua/my/my5.png and /dev/null differ diff --git a/static/donghua/my/my6.png b/static/donghua/my/my6.png deleted file mode 100644 index 4690cb9..0000000 Binary files a/static/donghua/my/my6.png and /dev/null differ diff --git a/static/donghua/my/my7.png b/static/donghua/my/my7.png deleted file mode 100644 index de4d2c0..0000000 Binary files a/static/donghua/my/my7.png and /dev/null differ diff --git a/static/donghua/my/my8.png b/static/donghua/my/my8.png deleted file mode 100644 index 2da1e82..0000000 Binary files a/static/donghua/my/my8.png and /dev/null differ diff --git a/static/donghua/my/my9.png b/static/donghua/my/my9.png deleted file mode 100644 index 1c1cb61..0000000 Binary files a/static/donghua/my/my9.png and /dev/null differ diff --git a/static/donghua/new/new1.png b/static/donghua/new/new1.png deleted file mode 100644 index f0499f3..0000000 Binary files a/static/donghua/new/new1.png and /dev/null differ diff --git a/static/donghua/new/new10.png b/static/donghua/new/new10.png deleted file mode 100644 index 165bfd5..0000000 Binary files a/static/donghua/new/new10.png and /dev/null differ diff --git a/static/donghua/new/new11.png b/static/donghua/new/new11.png deleted file mode 100644 index 65dbba6..0000000 Binary files a/static/donghua/new/new11.png and /dev/null differ diff --git a/static/donghua/new/new12.png b/static/donghua/new/new12.png deleted file mode 100644 index 874e69f..0000000 Binary files a/static/donghua/new/new12.png and /dev/null differ diff --git a/static/donghua/new/new13.png b/static/donghua/new/new13.png deleted file mode 100644 index a6f7a9a..0000000 Binary files a/static/donghua/new/new13.png and /dev/null differ diff --git a/static/donghua/new/new14.png b/static/donghua/new/new14.png deleted file mode 100644 index 9439e80..0000000 Binary files a/static/donghua/new/new14.png and /dev/null differ diff --git a/static/donghua/new/new15.png b/static/donghua/new/new15.png deleted file mode 100644 index 1d4ab14..0000000 Binary files a/static/donghua/new/new15.png and /dev/null differ diff --git a/static/donghua/new/new16.png b/static/donghua/new/new16.png deleted file mode 100644 index 03cfa50..0000000 Binary files a/static/donghua/new/new16.png and /dev/null differ diff --git a/static/donghua/new/new17.png b/static/donghua/new/new17.png deleted file mode 100644 index fa77053..0000000 Binary files a/static/donghua/new/new17.png and /dev/null differ diff --git a/static/donghua/new/new2.png b/static/donghua/new/new2.png deleted file mode 100644 index 71ba3a0..0000000 Binary files a/static/donghua/new/new2.png and /dev/null differ diff --git a/static/donghua/new/new3.png b/static/donghua/new/new3.png deleted file mode 100644 index e9bc7cc..0000000 Binary files a/static/donghua/new/new3.png and /dev/null differ diff --git a/static/donghua/new/new4.png b/static/donghua/new/new4.png deleted file mode 100644 index 4c26802..0000000 Binary files a/static/donghua/new/new4.png and /dev/null differ diff --git a/static/donghua/new/new5.png b/static/donghua/new/new5.png deleted file mode 100644 index 45b2bef..0000000 Binary files a/static/donghua/new/new5.png and /dev/null differ diff --git a/static/donghua/new/new6.png b/static/donghua/new/new6.png deleted file mode 100644 index 78259e1..0000000 Binary files a/static/donghua/new/new6.png and /dev/null differ diff --git a/static/donghua/new/new7.png b/static/donghua/new/new7.png deleted file mode 100644 index 213a531..0000000 Binary files a/static/donghua/new/new7.png and /dev/null differ diff --git a/static/donghua/new/new8.png b/static/donghua/new/new8.png deleted file mode 100644 index e2dd096..0000000 Binary files a/static/donghua/new/new8.png and /dev/null differ diff --git a/static/donghua/new/new9.png b/static/donghua/new/new9.png deleted file mode 100644 index 840a667..0000000 Binary files a/static/donghua/new/new9.png and /dev/null differ