diff --git a/compontent/public/downmenu.vue b/compontent/public/downmenu.vue index a07f9e8..9a697ad 100644 --- a/compontent/public/downmenu.vue +++ b/compontent/public/downmenu.vue @@ -61,7 +61,7 @@ display: flex; justify-content: space-between; font-weight: 500; - z-index: 998; + z-index: 9999; .bottom-button { width: 100%; diff --git a/compontent/public/yuangongdownmenu.vue b/compontent/public/yuangongdownmenu.vue index 0714171..920ff7f 100644 --- a/compontent/public/yuangongdownmenu.vue +++ b/compontent/public/yuangongdownmenu.vue @@ -61,7 +61,7 @@ display: flex; justify-content: space-between; font-weight: 500; - z-index: 998; + z-index: 9999; .bottom-button { width: 100%; diff --git a/pages.json b/pages.json index 28bc87d..d35ee10 100644 --- a/pages.json +++ b/pages.json @@ -92,6 +92,18 @@ "navigationBarTitleText": "我的" } }, + { + "path": "pages/yuangongindex/searchjigou", + "style": { + "navigationBarTitleText": "查找" + } + }, + { + "path": "pages/yuangongindex/workjoin", + "style": { + "navigationBarTitleText": "入驻审核" + } + }, { "path": "pages/yuangongindex/index", "style": { @@ -129,9 +141,6 @@ } }, - - - { "path": "pages/addstaff/all", "style": { diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index 6e99493..cda06b2 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -19,7 +19,9 @@ + :src="headImge ? headImge : `https://www.focusnu.com/media/directive/index/yingye.png`" /> + @@ -237,7 +239,7 @@ if (!uping.value) { return } - const allNonEmpty = textArray[0] && textArray[1]&& textArray[2]&&textArray[3]&&fontphoto.value; + const allNonEmpty = textArray[0] && textArray[1] && textArray[2] && textArray[3] && fontphoto.value; if (allNonEmpty) { let data = uni.getStorageSync('backhuancun') data.comName = textArray[0] diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index d198484..fadbcc7 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -19,7 +19,9 @@ + :src="fontphoto ? `${base_url}/sys/common/static/${fontphoto}` : `https://www.focusnu.com/media/directive/index/IDfront.png`" /> + @@ -32,8 +34,15 @@ 请上传身份证国徽面 - + --> + + @@ -266,7 +275,7 @@ endphoto.value = JSON.parse(uploadRes.data).message } uni.hideLoading() - if(JSON.parse(uploadRes.data).code==401){ + if (JSON.parse(uploadRes.data).code == 401) { uni.uploadFile({ url: `${base_url}/sys/common/upload`, // 替换为您的POST接口地址 filePath, @@ -457,11 +466,13 @@ justify-content: space-around; display: flex; flex-direction: column; + .message-title { width: 100%; height: 100rpx; align-items: center; display: flex; + .message-weight { font-size: 30rpx; } diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index 0a20c08..a9a50ff 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -564,7 +564,7 @@ /* 隐藏超出内容 */ white-space: nowrap; /* 不换行 */ - font-size: 25rpx; + // font-size: 25rpx; text-overflow: ellipsis; width: 350rpx; display: flex; diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue index 3ee5800..c7b22c4 100644 --- a/pages/addstaff/IDcard.vue +++ b/pages/addstaff/IDcard.vue @@ -357,7 +357,7 @@ let data = uni.getStorageSync('backhuancun') data.startTime = start data.endTime = end - // data.tel = uni.getStorageSync('tel') + data.id = uni.getStorageSync('specicalid') || "" data.name = textArray[0] data.sex = textArray[1] data.idCard = textArray[2] diff --git a/pages/addstaff/all.vue b/pages/addstaff/all.vue index 5951581..7feea1b 100644 --- a/pages/addstaff/all.vue +++ b/pages/addstaff/all.vue @@ -6,19 +6,39 @@ - 机构加盟 + 入职登记表 + - - - 驳回原因：{{contentred}} + + + + + + 个人信息 + + + + + 修改个人信息 + + + + + + {{item}} + {{textArray1[index] ? textArray1[index] : "自动获取" }} + + - + 身份证 - + @@ -32,7 +52,7 @@ style="position: absolute;top: 50%;left: 50%;width: 70rpx;height: 60rpx;transform: translate(-50%,-50%);" src="https://www.focusnu.com/media/directive/index/takephoto.png" /> - + @@ -46,7 +66,7 @@ style="position: absolute;top: 50%;left: 50%;width: 70rpx;height: 60rpx;transform: translate(-50%,-50%);" src="https://www.focusnu.com/media/directive/index/takephoto.png" /> - + @@ -62,29 +82,47 @@ - - + - 营业执照 + 银行卡 + (选填) - + - 营业执照 - 请上传营业执照 + 银行卡正面 + 请上传银行卡正面 - + + - + - + + + 银行卡反面 + 请上传银行卡反面 + + + + + + + + + - 企业信息 + 确认银行卡信息 @@ -95,21 +133,94 @@ + + - 机构信息 + 健康证 + (选填) + + + + 健康证正面 + 请上传健康证正面 + + + + + + + + + + + 健康证反面 + 请上传健康证反面 + + + + + + + - - - - - - {{item}} - {{textArray1[index] ? textArray1[index] : "自动获取" }} - + + + + 资质证 + (选填) + + + + 资质证 + 请上传资质证 + + + + + + + + + + + + 无犯罪证明 + (选填) + + + + 无犯罪证明 + 请上传无犯罪证明 + + + + + + + @@ -128,30 +239,36 @@ import { base_url } from '@/request/index.js'; - import { getrel } from '@/pages/addjigou/api/addjigou.js'; + import { + getrel + } from '@/pages/addjigou/api/addjigou.js'; import model from "@/compontent/public/model.vue" const show = ref(false); const content = ref(""); - const statusarray = ["loading","success","fail"] + const statusarray = ["loading", "success", "fail"] const nameArray = ["姓名", "性别", "身份证号码", "民族", "出生日期", "住址", "签发机关", "有效期限"]; const textArray = reactive(["", "", "", "", "", "", "", ""]); - + const headImge = ref(""); - + const headImge0 = ref(""); - - const nameArray0 = ["企业名称", "注册地址", "信用代码", "法人"]; - const textArray0 = reactive(["", "", "", "", "", "", ""]); - - const nameArray1 = ["机构位置","详细地址","机构负责人", "机构负责人电话", "房屋性质","建筑面积"]; - const textArray1 = reactive([ "","", "", "", "", ""]); - + + const fontphoto0 = ref("") + const endphoto0 = ref("") + const imgArray = ref(["", "", "", ""]) + + const nameArray0 = ["开户行", "开户行卡号"]; + const textArray0 = reactive(["", "", ]); + + const nameArray1 = ["婚否", "联系电话", "身高", "体重", "健康状态", "政治面貌", "紧急联系人", "紧急联系人电话", "联系人与本人关系", "户口性质", ]; + const textArray1 = reactive(["", "", "", "", "", "", "", "", "", ""]); + const backImge = ref(""); - - const states = ["待提交","审核中", "审核通过", "审核未通过"]; + + const states = ["待提交", "审核中", "审核通过", "审核未通过"]; const fontphoto = ref(""); const endphoto = ref(""); @@ -162,25 +279,28 @@ // 拍照并上传 function getMessage(url) { - uni.previewImage({ - current: url, // 当前显示图片的链接 - urls: [url], // 可以预览的图片列表 - indicator: 'default', // 显示面板指示点，'default'|'number'|'none' - loop: true, // 是否可循环预览 - longPressActions: { - itemList: ['保存图片'], - success: (data) => { - console.log('长按操作成功', data) - }, - fail: (err) => { - console.error('长按操作失败', err) - } - } - }) + if (!url) { + return + } + uni.previewImage({ + current: url, // 当前显示图片的链接 + urls: [url], // 可以预览的图片列表 + indicator: 'default', // 显示面板指示点，'default'|'number'|'none' + loop: true, // 是否可循环预览 + longPressActions: { + itemList: ['保存图片'], + success: (data) => { + console.log('长按操作成功', data) + }, + fail: (err) => { + console.error('长按操作失败', err) + } + } + }) } function isAtLeastEightChars(str) { - return typeof str === 'string' && str.length >= 12; + return typeof str === 'string' && str.length >= 12; } const openLook = (res) => { if (isAtLeastEightChars(res)) { @@ -193,15 +313,15 @@ } const alldata = ref(""); const contentred = ref("") - const special = ref(false); + const applyStatus = ref(false); onLoad((options) => { - if(options.special){ - special.value = true + if (options.applyStatus) { + applyStatus.value = options.applyStatus } alldata.value = JSON.parse(options.element); - + let data = alldata.value - if(data.content){ + if (data.content) { contentred.value = data.content } textArray[0] = data.name; @@ -214,20 +334,43 @@ textArray[7] = `${data.startTime}-${data.endTime}`; headImge.value = `${base_url}/sys/common/static/${data.cardZmPath}`; backImge.value = `${base_url}/sys/common/static/${data.cardFmPath}`; - textArray0[0] = data.comName; - textArray0[1] = data.comRegisterAddress; - textArray0[2] = data.comCreditCode; - textArray0[3] = data.comLegalPerson; - headImge0.value = `${base_url}/sys/common/static/${data.comBusinessLicense}`; - textArray1[0] = (data.orgProvince_dictText || "") + (data.orgCity_dictText!=null?data.orgCity_dictText:``) + (data.orgDistrict_dictText!=null?data.orgDistrict_dictText:``); - textArray1[1] = data.orgAddress; - textArray1[2] = data.orgLeader; - textArray1[3] = data.orgLeaderPhone; - textArray1[4] = data.orgPropertyType; - if(data.orgBuildingArea){ - textArray1[5] = data.orgBuildingArea + 'm²'; - } + textArray0[0] = data.openingBank; + textArray0[1] = data.bankCard; + fontphoto0.value = `${base_url}/sys/common/static/${data.bankZmPath}`; + endphoto0.value = `${base_url}/sys/common/static/${data.bankFmPath}`; + imgArray.value[0] = data.healthZmPath + imgArray.value[1] = data.healthFmPath + imgArray.value[2] = data.qualificationPath + imgArray.value[3] = data.noCrimeCertificate + + + const keys = [ + "maritalStatus", + "tel", + "height", + "weight", + "healthStatus", + "politicalAppearance", + "contactName", + "contactTel", + "contactRelationship", + "hukouType" + ] + + keys.forEach((key, index) => { + textArray1[index] = data[key] || "" + }) + textArray1[2] += "cm" + textArray1[3] += 'kg' }) + const changeMessage = () => { + uni.setStorageSync("baddata", alldata.value) + uni.setStorageSync('specicalid', alldata.value.id); + uni.setStorageSync("backhuancun", {}) + uni.navigateTo({ + url: `/pages/addstaff/information` + }); + } \ No newline at end of file diff --git a/pages/addstaff/bankcard.vue b/pages/addstaff/bankcard.vue index e4d8d55..ee61a11 100644 --- a/pages/addstaff/bankcard.vue +++ b/pages/addstaff/bankcard.vue @@ -22,7 +22,7 @@ + :src="fontphoto ? `` : `https://www.focusnu.com/media/directive/index/bian.png`" /> @@ -47,7 +47,7 @@ - 确认身份证信息 + 确认银行卡信息 diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue index 36c0792..660b409 100644 --- a/pages/addstaff/healthcertificate.vue +++ b/pages/addstaff/healthcertificate.vue @@ -21,8 +21,8 @@ - + @@ -169,7 +169,7 @@ const photoclick = (element) => { if (element) { uni.previewImage({ - urls: [ `${base_url}/sys/common/static/${imgArray[imgetarget.value]}`], // 必填，所有要预览的图片地址数组 + urls: [`${base_url}/sys/common/static/${imgArray[imgetarget.value]}`], // 必填，所有要预览的图片地址数组 // current: headImge.value, // 可选，当前显示图片的地址，默认是 urls[0] indicator: 'default', // 可选，指示器样式，H5/App 有效，值为 'default'（圆点）或 'number'（数字） longPressActions: { // 可选，仅 App 支持，长按图片时弹出的操作项 @@ -244,26 +244,34 @@ if (!uping.value) { return } - changemessage(uni.getStorageSync('backhuancun')).then(res => { + let data = uni.getStorageSync('backhuancun'); + data.healthZmPath = imgArray[0] + data.healthFmPath = imgArray[1] + data.qualificationPath = imgArray[2] + data.noCrimeCertificate = imgArray[3] + changemessage(data).then(res => { if (res.success) { - uni.requestSubscribeMessage({ - // 这里填后台申请好的 templateId 数组 - tmplIds: ['CJ6NDNV4mTTyOdYhbksyA_YjDORVemJRmzEVAUZMBis'], - success: (res) => { - // console.log("????", res) - uni.setStorageSync('specicalid', ""); - uni.reLaunch({ - url: `/pages/addstaff/successpush` - }); - }, - fail: (err) => { - // console.error('订阅接口调用失败：', err); - uni.showToast({ - title: '订阅失败', - icon: 'none' - }); - } + uni.reLaunch({ + url: `/pages/addstaff/successpush` }); + // uni.requestSubscribeMessage({ + // // 这里填后台申请好的 templateId 数组 + // tmplIds: ['CJ6NDNV4mTTyOdYhbksyA_YjDORVemJRmzEVAUZMBis'], + // success: (res) => { + // // console.log("????", res) + // // uni.setStorageSync('specicalid', ""); + // uni.reLaunch({ + // url: `/pages/addstaff/successpush` + // }); + // }, + // fail: (err) => { + // // console.error('订阅接口调用失败：', err); + // uni.showToast({ + // title: '订阅失败', + // icon: 'none' + // }); + // } + // }); } else { uni.showToast({ title: res.message, diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue index f502199..b55c481 100644 --- a/pages/addstaff/information.vue +++ b/pages/addstaff/information.vue @@ -15,7 +15,7 @@ 婚否 + placeholder="请选择婚否" v-model="form.maritalStatus" /> @@ -26,15 +26,21 @@ 联系电话 - + 身高 - + + cm + - + 体重 - + + kg + 健康状况 @@ -58,22 +64,21 @@ 紧急联系人 - + 紧急联系人电话 + v-model="form.contactTel" /> 联系人与本人关系 - + 户口性质 + placeholder="请选择户口性质" v-model="form.hukouType" /> @@ -174,7 +179,7 @@ ) const confirmmarry = (item) => { - form.marriedOrNot = item[0].value + form.maritalStatus = item[0].value } const confirmshowhealth = (item) => { form.healthStatus = item[0].value @@ -183,28 +188,28 @@ form.politicalAppearance = item[0].value } const confirmshowform = (item) => { - form.hukouNature = item[0].value + form.hukouType = item[0].value } const form = reactive({ - marriedOrNot: "", + maritalStatus: "", tel: "", height: "", weight: "", healthStatus: "", politicalAppearance: "", - emergencyContact: "", - emergencyTel: "", - emergencyRelationship: "", - hukouNature: "", - openId : uni.getStorageSync('openid'), + contactName: "", + contactTel: "", + contactRelationship: "", + hukouType: "", + openId: uni.getStorageSync('openid'), }) function isValid11DigitNumber(val) { return /^(\d{11})$/.test(val); } const next = () => { - if (!form.marriedOrNot) { + if (!form.maritalStatus) { uni.showToast({ title: '请填写婚否', icon: 'error' @@ -240,28 +245,28 @@ title: '请填写政治面貌', icon: 'error' }) - } else if (!form.emergencyContact) { + } else if (!form.contactName) { uni.showToast({ title: '请填写紧急联系人', icon: 'none' }) - } else if (!form.emergencyTel) { + } else if (!form.contactTel) { uni.showToast({ title: '请填写紧急联系人电话', icon: 'none' }) - } else if (!isValid11DigitNumber(form.emergencyTel)) { + } else if (!isValid11DigitNumber(form.contactTel)) { uni.showToast({ title: '紧急联系人手机号格式错误', icon: 'none' }) return - } else if (!form.emergencyRelationship) { + } else if (!form.contactRelationship) { uni.showToast({ title: '请填写联系人和本人的关系', icon: 'none' }) - } else if (!form.hukouNature) { + } else if (!form.hukouType) { uni.showToast({ title: '请填写户口性质', icon: 'error' @@ -289,7 +294,22 @@ onLoad(() => { if (uni.getStorageSync('baddata')) { let data = uni.getStorageSync('baddata'); - form = data + const keys = [ + "maritalStatus", + "tel", + "height", + "weight", + "healthStatus", + "politicalAppearance", + "contactName", + "contactTel", + "contactRelationship", + "hukouType" + ] + + keys.forEach(key => { + form[key] = data[key] || "" + }) } }) @@ -404,7 +424,7 @@ /* 隐藏超出内容 */ white-space: nowrap; /* 不换行 */ - font-size: 25rpx; + // font-size: 25rpx; text-overflow: ellipsis; width: 350rpx; display: flex; @@ -419,4 +439,12 @@ height: 20rpx; } } + .triangle-down-mi { + position: absolute; + top: 50%; + transform: translateY(-50%); + right: 26rpx; + font-size: 30rpx; + color: #999999; + } \ No newline at end of file diff --git a/pages/addstaff/successpush.vue b/pages/addstaff/successpush.vue index 3f0dfce..890be50 100644 --- a/pages/addstaff/successpush.vue +++ b/pages/addstaff/successpush.vue @@ -5,21 +5,21 @@ - + 提交成功 - 尊敬的用户，您的员工入住申请已成功提交 + 尊敬的用户，您的员工入驻{{ uni.getStorageSync('specicalid') ? '变更' : '申请' }}已提交成功 - {{ special?`我们将尽快处理并反馈审核结果`:`请耐心等待审核结果` }}，{{ special?`期待与您继续携手同行`:`期待您早日加入护理单元大家庭` }} + {{ special?`我们将尽快处理并反馈审核结果`:`` }}{{ special?`期待与您继续携手同行`:`欢迎加入护理单元大家庭` }} ！ - - - - - - 长者入住 @@ -61,15 +13,13 @@ 申请入住 - - - + 员工入驻 @@ -78,13 +28,10 @@ 护理员严格按标准流程，定时为失能长者开展床旁照护，用专业与温情守护长者生活与健康。 - - - + + 员工进入 + + 申请入驻 @@ -93,7 +40,7 @@ - + 机构加盟 @@ -102,10 +49,10 @@ 加盟我们，共享银发经济红利！依托成熟运营体系，标准化服务流程降低人力成本及管理开支，背靠品牌资源，助力企业快速实现营收增长。 - + 进入机构 - + 申请加盟 @@ -130,7 +77,6 @@ import { onLoad } from '@dcloudio/uni-app'; - // import three from "@/compontent/public/photohuadong.vue"; const itemTarget = ref(0); const fontArray = ["护理院日常护理涵盖生活照料、健康监测、康复护理及心理关怀，为长者提供贴心照护。", "护理员日常为长者提供饮食起居照料、协助康复训练监测健康状况，陪伴交流并做好环境清洁。", @@ -144,15 +90,9 @@ uni.navigateBack() } const ceshi = () => { - // uni.navigateTo({ - // url: `/pages/login/phonebumber` - // }); uni.navigateTo({ url: `/pages/login/xuanchuan` }); - // uni.navigateTo({ - // url: `/pages/addjigou/all` - // }); } const tobestaff = () =>{ //表单ID @@ -165,6 +105,25 @@ url: `/pages/addstaff/information` }); } + const yuangonghowtojump = () => { + if(op1.value==`1`){ + jumpToYuangongindex() + }else{ + tobestaff() + } + } + const jumpToYuangongindex = () => { + uni.reLaunch({ + url: `/pages/yuangongindex/index` + }); + } + const jigouhowtojump = () => { + if(op2.value==`1`){ + jumpToindex() + }else{ + gotoadd() + } + } const jumpToindex = () => { uni.navigateTo({ url: `/pages/index/index` @@ -182,9 +141,6 @@ uni.navigateTo({ url: `/pages/addjigou/name` }); - // uni.navigateTo({ - // url: `/pages/addjigou/where` - // }); } const close = () => { uni.exitMiniProgram({}); @@ -198,7 +154,6 @@ op0.value = uni.getStorageSync('izJs'); op1.value = uni.getStorageSync('izYg'); op2.value = uni.getStorageSync('izJg'); - }) @@ -253,9 +208,6 @@ width: 100%; height: 63vh; background-color: #fff; - // border-top-left-radius: 50rpx; - // border-top-right-radius: 50rpx; - // box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1); display: flex; flex-direction: column; align-items: center; @@ -336,10 +288,7 @@ .card-text { color: #999999; font-size: 25rpx; - } - - } .card-right { @@ -353,8 +302,6 @@ margin-left: 5rpx; } } - - // .right-imge } .blue-button { @@ -374,7 +321,6 @@ .title-back { position: absolute; - // margin-top: 100rpx; top: 100rpx; width: 100%; height: 100rpx; @@ -396,13 +342,6 @@ margin-right: 15rpx; } } - - // .button-right{ - // width: 100%; - // display: flex; - // justify-content: flex-end; - // padding-right: 0rpx; - // } .white-button { position: absolute; bottom: 35rpx; diff --git a/pages/login/threeselectonespec.vue b/pages/login/threeselectonespec.vue index 19d5aff..5f9d61f 100644 --- a/pages/login/threeselectonespec.vue +++ b/pages/login/threeselectonespec.vue @@ -24,7 +24,7 @@ - + 员工入驻 @@ -33,13 +33,10 @@ 护理员严格按标准流程，定时为失能长者开展床旁照护，用专业与温情守护长者生活与健康。 - - - 进入员工入驻 + + 员工进入 - + 申请入驻 @@ -48,7 +45,7 @@ - + 机构加盟 @@ -57,10 +54,10 @@ 加盟我们，共享银发经济红利！依托成熟运营体系，标准化服务流程降低人力成本及管理开支，背靠品牌资源，助力企业快速实现营收增长。 - + 进入机构 - + 申请加盟 @@ -71,9 +68,7 @@ @click="ceshi" /> - + @@ -85,13 +80,27 @@ import { onLoad } from '@dcloudio/uni-app'; - // import three from "@/compontent/public/photohuadong.vue"; const itemTarget = ref(0); const fontArray = ["护理院日常护理涵盖生活照料、健康监测、康复护理及心理关怀，为长者提供贴心照护。", "护理员日常为长者提供饮食起居照料、协助康复训练监测健康状况，陪伴交流并做好环境清洁。", "护理员日常为长者提供饮食起居照料、协助康复训练监测健康状况，陪伴交流并做好环境清洁。" ] - + const jigouhowtojump = () => { + if(op2.value==`1`){ + jumpToindex() + }else{ + gotoadd() + } + } + + const yuangonghowtojump = () => { + if(op1.value==`1`){ + jumpToYuangongindex() + }else{ + tobestaff() + } + } + const changePhoto = (index) => { itemTarget.value = index; } @@ -99,24 +108,18 @@ uni.navigateBack() } const ceshi = () => { - // uni.navigateTo({ - // url: `/pages/login/phonebumber` - // }); uni.navigateTo({ url: `/pages/login/index` }); - // uni.navigateTo({ - // url: `/pages/addjigou/all` - // }); } const jumpToindex = () => { - uni.navigateTo({ + uni.reLaunch({ url: `/pages/index/index` }); } const jumpToYuangongindex = () => { - uni.navigateTo({ + uni.reLaunch({ url: `/pages/yuangongindex/index` }); } @@ -136,7 +139,7 @@ url: `/pages/addjigou/name` }); } - const tobestaff = () =>{ + const tobestaff = () => { //表单ID uni.setStorageSync('specicalid', ""); //表单详情 @@ -147,9 +150,6 @@ url: `/pages/addstaff/information` }); } - const close = () => { - uni.exitMiniProgram({}); - } const phone = ref("") const op0 = ref(false); const op1 = ref(false); @@ -171,24 +171,6 @@ background-color: rgb(239, 241, 252); position: relative; - // .title { - // margin-top: 180rpx; - // align-items: center; - - // .title-imge { - // width: 100rpx; - // height: 105rpx; - // margin-left: 100rpx; - // } - - // .title-font { - // font-size: 35rpx; - // font-weight: 600; - // margin-left: 105rpx; - // margin-top: 10rpx; - // } - // } - .photo-imge { position: absolute; top: 0rpx; @@ -205,69 +187,8 @@ width: 400rpx; height: 400rpx; } - - // .under-container { - // position: fixed; - // left: 0; - // bottom: 0; - // width: 100%; - // height: 63vh; - // background-color: #fff; - // // border-top-left-radius: 50rpx; - // // border-top-right-radius: 50rpx; - // // box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1); - // display: flex; - // flex-direction: column; - // align-items: center; - // justify-content: center; - // } } - .font-father { - width: 100%; - color: #666666; - justify-content: center; - display: flex; - - .font { - width: 60%; - } - } - - .button-father { - width: 100%; - margin-top: 80rpx; - display: flex; - justify-content: center; - - .button-blue { - width: 40%; - display: flex; - justify-content: center; - align-items: center; - height: 100rpx; - border-radius: 43rpx; - background: linear-gradient(to right, #00C9FF, #0076FF); - color: #fff; - font-size: 33rpx; - margin-bottom: 30rpx; - } - } - - // .card-title { - // z-index: 1; - // margin-top: 600rpx; - // width: 92%; - // margin-left: 4%; - // height: 100rpx; - // border-radius: 35rpx; - // background-color: #fff; - // display: flex; - // justify-content: center; - // align-items: center; - // font-size: 26rpx; - // } - .card { z-index: 1; margin-top: 30rpx; @@ -299,7 +220,7 @@ } - + } .card-right { @@ -313,27 +234,10 @@ margin-left: 5rpx; } } - - // .right-imge } - // .blue-button { - // width: 92%; - // margin-left: 4%; - // display: flex; - // justify-content: center; - // align-items: center; - // height: 90rpx; - // border-radius: 50rpx; - // background: linear-gradient(to left, #00C9FF, #0076FF); - // color: #fff; - // font-size: 35rpx; - // margin-bottom: 60rpx; - // margin-top: 40rpx; - // } .title-back { position: absolute; - // margin-top: 100rpx; top: 100rpx; width: 100%; height: 100rpx; @@ -342,11 +246,12 @@ align-items: center; z-index: 1; } - + .left-father { display: flex; align-items: center; z-index: 1; + .back-img { width: 45rpx; height: 40rpx; @@ -354,6 +259,7 @@ margin-right: 15rpx; } } + .white-button { position: absolute; bottom: 35rpx; diff --git a/pages/login/workjoin.vue b/pages/login/workjoin.vue index ea58b91..9875a42 100644 --- a/pages/login/workjoin.vue +++ b/pages/login/workjoin.vue @@ -97,7 +97,6 @@ } const again = (item) => { - console.log("????", item) uni.setStorageSync("baddata", item) uni.setStorageSync('specicalid', item.id); uni.setStorageSync("backhuancun", {}) @@ -135,17 +134,14 @@ margin-left: 3%; background-color: #fff; border-radius: 30rpx; - // padding: 40rpx; padding: 30rpx 40rpx; margin-bottom: 30rpx; font-size: 25rpx; - // color: #999999; position: relative; } } .button-heng { - // width: 100%; display: flex; justify-content: flex-end; position: absolute; @@ -163,8 +159,6 @@ color: black; margin-right: 20rpx; } - - } .bgc-card{ margin-top: 450rpx; @@ -251,7 +245,6 @@ justify-content: center; align-items: center; background: linear-gradient(to right, #00C9FF, #0076FF); - // margin-right: 20rpx; margin-left: -10rpx; border-radius: 25rpx; color: #fff; diff --git a/pages/login/workjoinsuccess.vue b/pages/login/workjoinsuccess.vue index c7c94d7..37bb851 100644 --- a/pages/login/workjoinsuccess.vue +++ b/pages/login/workjoinsuccess.vue @@ -12,17 +12,10 @@ - 暂无机构信息 - @@ -41,21 +34,9 @@ - - - 变更 - @@ -161,7 +142,6 @@ } const jumpToAll = (element) => { - // console.log("?????",element) uni.navigateTo({ url: `/pages/addjigou/all?element=${JSON.stringify(element)}&special=1` }); @@ -177,7 +157,6 @@ width: 100%; background-color: rgb(239, 241, 252); position: relative; - } .under-scroll { @@ -189,17 +168,14 @@ margin-left: 3%; background-color: #fff; border-radius: 30rpx; - // padding: 40rpx; padding: 30rpx 40rpx; margin-bottom: 30rpx; font-size: 25rpx; - // color: #999999; position: relative; } } .button-heng { - // width: 100%; display: flex; justify-content: flex-end; position: absolute; @@ -310,26 +286,6 @@ color: #fff; font-size: 33rpx; margin-top: 40rpx; - // margin-bottom: 90rpx; - // margin-top: 40rpx; - // margin-top: 40rpx; - // position: absolute; - // top: 30rpx; - // right: 25rpx; - // width: 50rpx; - // height: 50rpx; - // border-radius: 50%; - // display: flex; - // justify-content: center; - // align-items: center; - // background-color: rgb(240,240,240); - // color: #fff; - // font-size: 30rpx; - // .blue-button-img{ - // width: 25rpx; - // height: 25rpx; - // // margin-left: 5rpx; - // } } .none{ position: absolute; @@ -337,7 +293,6 @@ left: 50%; transform: translate(-50%,-50%); display: flex; - // justify-content: center; align-items: center; flex-direction: column; color: #999; diff --git a/pages/login/xuanchuan.vue b/pages/login/xuanchuan.vue index 8ef86a8..9e0a666 100644 --- a/pages/login/xuanchuan.vue +++ b/pages/login/xuanchuan.vue @@ -1,18 +1,15 @@