diff --git a/compontent/public/downmenu.vue b/compontent/public/downmenu.vue index fb9f55d..af6e7fc 100644 --- a/compontent/public/downmenu.vue +++ b/compontent/public/downmenu.vue @@ -37,9 +37,7 @@ }); break; case 1: - uni.navigateTo({ - url: `/pages/login/special?no=true` - }); + break; case 2: @@ -80,7 +78,7 @@ display: flex; justify-content: center; align-items: center; - color: rgb(42, 133, 235); + color: #01a8ff; flex-direction: column; } diff --git a/compontent/public/exit.vue b/compontent/public/exit.vue new file mode 100644 index 0000000..1555d00 --- /dev/null +++ b/compontent/public/exit.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/compontent/public/huakuai.vue b/compontent/public/huakuai.vue index 18ecc80..d46943f 100644 --- a/compontent/public/huakuai.vue +++ b/compontent/public/huakuai.vue @@ -3,14 +3,14 @@ 请通过滑块验证 - + 400) originX.value = 400 + originX.value = Math.random() * (containerWidth.value - pieceSize) + pieceSize / 2 + originX.value = Math.max(pieceSize / 2, Math.min(originX.value, containerWidth.value - pieceSize / 2)) originY.value = containerHeight.value / 2 offsetX.value = 0 }) @@ -130,12 +128,12 @@ function init() { function onStart(e) { dragging.value = true - startX.value = e.touches[0].clientX * 2 + startX.value = e.touches[0].clientX } function onMove(e) { if (!dragging.value) return - const clientX = e.touches[0].clientX * 2 + const clientX = e.touches[0].clientX let dx = clientX - startX.value dx = Math.max(0, Math.min(dx, containerWidth.value - pieceSize)) offsetX.value = dx @@ -149,10 +147,9 @@ function onEnd() { icon: 'none', duration: 2000 }) - // console.log("????", originX.value) emit('success') } else { - offsetX.value = 0 + offsetX.value全員= 0 uni.showToast({ title: '验证失败', icon: 'none', @@ -169,7 +166,7 @@ onMounted(() => { // 'https://www.focusnu.com/media/directive/login/3.png' ] bgImage.value = images[Math.floor(Math.random() * images.length)] - console.log('加载图片:', bgImage.value) + // console.log('加载图片:', bgImage.value) }) @@ -258,12 +255,12 @@ onMounted(() => { } .font-title { - width: 100%; - display: flex; - justify-content: center; - align-items: center; - height: 100rpx; - font-size: 35rpx; - font-weight: 700; + width: 100%; + display: flex; + justify-content: center; + align-items: center; + height: 100rpx; + font-size: 35rpx; + font-weight: 700; } - + \ No newline at end of file diff --git a/compontent/public/model.vue b/compontent/public/model.vue index 3bedc43..6be3660 100644 --- a/compontent/public/model.vue +++ b/compontent/public/model.vue @@ -5,11 +5,12 @@ - - 提示 - - 确定 - {{ content }} + + + + {{ content }} @@ -65,13 +66,17 @@ function handleClose() { /* 拟态框 固定尺寸 + 阴影样式 + 相对定位于 wrapper */ .neuro-box { position: relative; - width: 550rpx; - height: 600rpx; + width: 480rpx; + height: 300rpx; border-radius: 20rpx; background-color: #fff; display: flex; justify-content: center; align-items: center; + background-image: url('https://www.focusnu.com/media/directive/index/newpink.png'); + // background-size: 100% auto; + background-position: top center; + background-repeat: no-repeat; z-index: 1; padding: 0 10%; } diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue index 85fd891..250f52f 100644 --- a/pages/addjigou/all.vue +++ b/pages/addjigou/all.vue @@ -15,11 +15,11 @@ - + - + 身份证 @@ -211,7 +211,7 @@ // }); } function isAtLeastEightChars(str) { - return typeof str === 'string' && str.length >= 8; + return typeof str === 'string' && str.length >= 12; } const openLook = (res) => { if (isAtLeastEightChars(res)) { @@ -410,21 +410,21 @@ color: #999999; } - .finish-button { - display: flex; - justify-content: center; - align-items: center; - width: 92%; - height: 90rpx; - margin: 0rpx auto; - margin-bottom: 10rpx; - margin-top: 20rpx; - color: #fff; - background: linear-gradient(to right, #00C9FF, #0076FF); - border-radius: 37rpx; - font-size: 35rpx; - z-index: 1; - } + // .finish-button { + // display: flex; + // justify-content: center; + // align-items: center; + // width: 92%; + // height: 90rpx; + // margin: 0rpx auto; + // margin-bottom: 10rpx; + // margin-top: 20rpx; + // color: #fff; + // background: linear-gradient(to right, #00C9FF, #0076FF); + // border-radius: 37rpx; + // font-size: 35rpx; + // z-index: 1; + // } .title-back { margin-top: 100rpx; diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index 63509a2..21a18bc 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -54,7 +54,7 @@ 3.所有上传信息均会被妥善保管，不会用于其他商业用途或传输给其他第三方。 - + 返回上一步 @@ -195,7 +195,7 @@ } // if (JSON.parse(JSON.parse(uploadRes.data).result.data).data.face) { - uni.hideLoading() + // textArray[4] = father.birthDate; // textArray[5] = father.address; // uni.showToast({ @@ -219,6 +219,7 @@ title: '上传出错', icon: 'error' }) + uping.value = true; uni.hideLoading() } }) @@ -238,6 +239,7 @@ success: uploadRes => { fontphoto.value = JSON.parse(uploadRes.data).message; uping.value = true; + uni.hideLoading() }, fail: err => { uni.showToast({ @@ -250,7 +252,7 @@ } function isAtLeastEightChars(str) { - return typeof str === 'string' && str.length >= 8; + return typeof str === 'string' && str.length >= 12; } const openLook = (res) => { if (isAtLeastEightChars(res)) { @@ -516,12 +518,12 @@ align-items: center; width: 44%; height: 90rpx; - margin: 0rpx auto; + // margin: 0rpx auto; margin-bottom: 80rpx; color: #fff; background: linear-gradient(to right, #00C9FF, #0076FF); border-radius: 37rpx; - font-size: 35rpx; + font-size: 33rpx; } .back-button { @@ -530,12 +532,13 @@ align-items: center; width: 44%; height: 90rpx; - margin: 0rpx auto; + // margin: 0rpx auto; + margin-bottom: 80rpx; border: 2rpx solid #c3cacd; background: linear-gradient(to bottom, #f3f3f5, #dee4e9); border-radius: 37rpx; - font-size: 35rpx; + font-size: 33rpx; } .gray-text { diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index f715be4..21eca21 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -224,25 +224,25 @@ textArray[3] = father.ethnicity; textArray[4] = father.birthDate; textArray[5] = father.address; - uni.showToast({ - title: '识别成功', - }) + // uni.showToast({ + // title: '识别成功', + // }) headImge.value = filePath; savephoto(filePath, 0); - uni.hideLoading() + } 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; textArray[6] = father.issueAuthority; textArray[7] = father.validPeriod; - uni.showToast({ - title: '识别成功', - }) + // uni.showToast({ + // title: '识别成功', + // }) backImge.value = filePath; savephoto(filePath, 1); - uni.hideLoading() + } else { uni.hideLoading() uni.showToast({ @@ -281,6 +281,7 @@ } else { endphoto.value = JSON.parse(uploadRes.data).message } + uni.hideLoading() if(JSON.parse(uploadRes.data).code==401){ uni.uploadFile({ url: `${base_url}/sys/common/upload`, // 替换为您的POST接口地址 @@ -322,7 +323,7 @@ } function isAtLeastEightChars(str) { - return typeof str === 'string' && str.length >= 8; + return typeof str === 'string' && str.length >= 12; } const openLook = (res) => { if (isAtLeastEightChars(res)) { @@ -603,15 +604,15 @@ display: flex; justify-content: center; align-items: center; - width: 92%; + width: 80%; height: 90rpx; margin: 0rpx auto; margin-bottom: 80rpx; margin-top: 20rpx; color: #fff; - background: linear-gradient(to right, #00C9FF, #0076FF); - border-radius: 37rpx; - font-size: 35rpx; + background: linear-gradient(to left, #00C9FF, #0076FF); + border-radius: 35rpx; + font-size: 33rpx; } .title-back { diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index b3eb068..ab1f2c6 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -15,13 +15,13 @@ + :style="index==address.length-1?{backgroundColor:`rgb(222, 233, 251)`,color:`rgb(6, 122, 233)`}:{}" + @click="deleteUP(index)"> {{item.name}} + :src="`https://www.focusnu.com/media/directive/index/workjoin/${index==address.length-1?`x`:`redcha`}.png`" /> @@ -115,7 +115,7 @@ - + 返回上一步 @@ -211,7 +211,7 @@ const backImge = ref(""); function isAtLeastEightChars(str) { - return typeof str === 'string' && str.length >= 8; + return typeof str === 'string' && str.length >= 12; } const openLook = (res) => { if (isAtLeastEightChars(res)) { @@ -331,19 +331,32 @@ changemessage(uni.getStorageSync('backhuancun')).then(res => { if (res.success) { - console.log("????", uni.getStorageSync('backhuancun').id) - if (res.message == `保存成功！`) { - uni.setStorageSync('specicalid', ""); - if (uni.getStorageSync('backhuancun').id === null) {} - uni.reLaunch({ - url: `/pages/login/specialsmall?type=1&special=${uni.getStorageSync('backhuancun').id===null}` - }); - } else { - uni.setStorageSync('specicalid', res.result.id); - uni.reLaunch({ - url: `/pages/login/specialsmall?type=1&special=${uni.getStorageSync('backhuancun').id===null}` - }); - } + // console.log("????", uni.getStorageSync('backhuancun').id) + uni.requestSubscribeMessage({ + // 这里填后台申请好的 templateId 数组 + tmplIds: ['CJ6NDNV4mTTyOdYhbksyA_YjDORVemJRmzEVAUZMBis'], + success: (res) => { + console.log("????",res) + uni.setStorageSync('specicalid', ""); + uni.reLaunch({ + url: `/pages/login/specialsmall?type=1&special=${uni.getStorageSync('backhuancun').id===null}` + }); + }, + fail: (err) => { + console.error('订阅接口调用失败：', err); + uni.showToast({ + title: '订阅失败', + icon: 'none' + }); + } + }); + + // } else { + // uni.setStorageSync('specicalid', res.result.id); + // uni.reLaunch({ + // url: `/pages/login/specialsmall?type=1&special=${uni.getStorageSync('backhuancun').id===null}` + // }); + // } } else { uni.showToast({ @@ -654,12 +667,12 @@ align-items: center; width: 44%; height: 90rpx; - margin: 0rpx auto; + // margin: 0rpx auto; margin-bottom: 80rpx; color: #fff; background: linear-gradient(to right, #00C9FF, #0076FF); border-radius: 37rpx; - font-size: 35rpx; + font-size: 33rpx; } .one-img { @@ -707,8 +720,8 @@ } .title-imge { - width: 20rpx; - height: 20rpx; + width: 30rpx; + height: 30rpx; margin-left: 10rpx; margin-top: 5rpx; } @@ -755,7 +768,7 @@ display: flex; align-items: center; - .back-img { + .back-img { width: 45rpx; height: 40rpx; margin-left: 40rpx; @@ -770,12 +783,12 @@ align-items: center; width: 44%; height: 90rpx; - margin: 0rpx auto; + // margin: 0rpx auto; margin-bottom: 80rpx; border: 2rpx solid #c3cacd; background: linear-gradient(to bottom, #f3f3f5, #dee4e9); border-radius: 37rpx; - font-size: 35rpx; + font-size: 33rpx; } .shu { @@ -824,7 +837,8 @@ .button-father { height: 60rpx; - width: 23%; + // width: 23%; + padding: 0 20rpx; display: flex; align-items: center; justify-content: center; diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue index 6f7124d..d0247aa 100644 --- a/pages/addoldman/IDcard.vue +++ b/pages/addoldman/IDcard.vue @@ -158,7 +158,7 @@ } function isAtLeastEightChars(str) { - return typeof str === 'string' && str.length >= 8; + return typeof str === 'string' && str.length >= 12; } const openLook = (res) => { if (isAtLeastEightChars(res)) { @@ -316,13 +316,13 @@ display: flex; justify-content: center; align-items: center; - width: 70%; + width: 80%; height: 100rpx; margin: 0rpx auto; margin-bottom: 80rpx; color: #fff; background: linear-gradient(to right, #00C9FF, #0076FF); - border-radius: 50rpx; - font-size: 35rpx; + border-radius: 35rpx; + font-size: 33rpx; } \ No newline at end of file diff --git a/pages/addoldman/hukou.vue b/pages/addoldman/hukou.vue index 5f36ae6..18a6928 100644 --- a/pages/addoldman/hukou.vue +++ b/pages/addoldman/hukou.vue @@ -227,13 +227,13 @@ display: flex; justify-content: center; align-items: center; - width: 70%; + width: 80%; height: 100rpx; margin: 0rpx auto; margin-bottom: 80rpx; color: #fff; background: linear-gradient(to right,#00C9FF,#0076FF ); - border-radius: 50rpx; - font-size: 35rpx; + border-radius: 35rpx; + font-size: 33rpx; } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 40c7291..4db5946 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,15 +1,16 @@