diff --git a/package-lock.json b/package-lock.json index ced35b6..d04dbac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "ant-design-vue": "^1.7.8", "axios": "^0.25.0", + "clipboard": "^2.0.10", "core-js": "^3.6.5", "jquery": "^3.6.0", "js-cookie": "^3.0.1", @@ -4408,6 +4409,16 @@ "node": ">= 10" } }, + "node_modules/clipboard": { + "version": "2.0.10", + "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.10.tgz", + "integrity": "sha512-cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g==", + "dependencies": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "node_modules/clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -5781,6 +5792,11 @@ "node": ">=0.4.0" } }, + "node_modules/delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -7498,6 +7514,14 @@ "node": ">=6" } }, + "node_modules/good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", + "dependencies": { + "delegate": "^3.1.2" + } + }, "node_modules/graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", @@ -13010,6 +13034,11 @@ "node": ">= 8.9.0" } }, + "node_modules/select": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", + "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -14385,6 +14414,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "node_modules/tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" + }, "node_modules/tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -19792,6 +19826,16 @@ "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true }, + "clipboard": { + "version": "2.0.10", + "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.10.tgz", + "integrity": "sha512-cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g==", + "requires": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -20931,6 +20975,11 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -22359,6 +22408,14 @@ "slash": "^2.0.0" } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", + "requires": { + "delegate": "^3.1.2" + } + }, "graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", @@ -26914,6 +26971,11 @@ "ajv-keywords": "^3.5.2" } }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", + "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -28088,6 +28150,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" + }, "tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", diff --git a/package.json b/package.json index 79aec92..81c16ca 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dependencies": { "ant-design-vue": "^1.7.8", "axios": "^0.25.0", + "clipboard": "^2.0.10", "core-js": "^3.6.5", "jquery": "^3.6.0", "js-cookie": "^3.0.1", diff --git a/src/App.vue b/src/App.vue index 5382922..ff89d0b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -22,7 +22,6 @@ export default { methods: { loader() { this.isRouterViewshow = false; - console.log(123); this.$nextTick(() => { this.isRouterViewshow = true; }); diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index 1f245db..1af0e95 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -622,9 +622,15 @@
-
-

服务热线

-

135 2307 4549

+ +
+

+ 职位详版 复制 +

+

{{ jobDetail.jobDesp || "-" }}

@@ -650,9 +656,16 @@
+
+ +

服务热线

+
+

服务热线

+

135 2307 4549

+
+
- @@ -1356,6 +1384,32 @@ export default { > div { margin-bottom: 16px; } + .jobDetailInfo { + width: 240px; + overflow: hidden; + // height: 114px; + // padding: 0 20px 0px 20px; + border-radius: 4px; + background-color: #fff; + text-align: left; + h1 { + position: relative; + text-align: center; + margin-bottom: 0; + + span { + position: absolute; + right: 10px; + color: #ff6a00; + } + } + p { + font-size: 16px; + word-break: break-all; + white-space: break-spaces; + padding: 16px 20px; + } + } .hotphone { width: 240px; overflow: hidden; @@ -1474,4 +1528,45 @@ export default { color: #ff6a00; } } +.hotTel { + position: fixed; + top: 50%; + left: calc(50vw + 600px); + width: 104px; + height: 110px; + background-color: #fff; + box-shadow: 5px 0px 10px 3px #eee; + text-align: center; + padding-top: 10px; + > i { + font-size: 40px; + } + > p { + font-size: 16px; + text-align: center; + color: #ff6a00; + } + &:hover > div { + display: block; + } + div { + position: absolute; + display: none; + width: 200px; + left: 0; + bottom: -122px; + text-align: center; + box-shadow: 5px 0px 10px 3px #eee; + background-color: #fff; + > p:first-child { + padding: 14px 0; + border-bottom: 1px solid #eee; + } + > p:last-child { + padding: 16px 0; + font-size: 24px; + color: #ff6a00; + } + } +} diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index f48cf98..e477f52 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -304,6 +304,7 @@ > @@ -446,7 +447,7 @@ import { nationlist } from "../../utils/datalist"; // import recordbill from "@/components/FirstJob/components/recordbill.vue"; import moment from "moment"; -import { isEmptyCheck } from "../../utils/commonUtil"; +import { isEmptyCheck, getAgeFromBirthday } from "../../utils/commonUtil"; import timepicker from "./components/timepicker.vue"; import { recordBillApi, @@ -669,6 +670,7 @@ export default { this.$refs.ruleForm.validate(async (ispass, no) => { console.log(this.form); console.log(ispass); + console.log(no); this.confirmLoading = true; if (ispass) { @@ -702,6 +704,7 @@ export default { // }, 2000); } else { this.confirmLoading = false; + this.$message.error(no); console.log(123); } @@ -999,6 +1002,17 @@ export default { // window.location.reload(); this.reload(); }, + getIdInfo(e) { + if (e.target.value.length == 18) { + let bir = getAgeFromBirthday(e.target.value); + if (!isEmptyCheck(bir.gender)) { + this.form.sex = bir.gender; + } + if (!isEmptyCheck(bir.age)) { + this.form.age = bir.age; + } + } + }, }, }; diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue index 6094d82..cea28fd 100644 --- a/src/components/Login/login.vue +++ b/src/components/Login/login.vue @@ -422,6 +422,16 @@ export default { font-size: 16px; border: none; color: white; + box-shadow: none; + &::after { + display: none; + } + &:hover { + background-color: rgba(255, 106, 0, 0.8); + } + &:active { + background-color: rgba(234, 99, 2, 0.9); + } } .register { display: flex; diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue index b0f6bcc..d072dad 100644 --- a/src/components/userinfo/usercenter/components/mybill.vue +++ b/src/components/userinfo/usercenter/components/mybill.vue @@ -56,7 +56,7 @@
parent.offsetHeight) { // sibling.style.height = "100%"; sibling.style.overflow = "hidden"; @@ -379,7 +381,7 @@ export default { // console.log("isunfold", item.isunfold); // console.log(item); }); - }, 100); + }, 0); this.pagination.total = data.data.recordCount; this.$forceUpdate(); @@ -743,7 +745,7 @@ export default { display: flex; justify-content: space-between; .searchinput { - width: 350px; + width: 400px; position: relative; .ant-input { // width: 300px; diff --git a/src/style/index.less b/src/style/index.less index 15139e8..20c4dc3 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -133,7 +133,7 @@ i { fill: currentColor; overflow: hidden; } -@import "http://at.alicdn.com/t/font_3135652_9tpi9n6784g.css"; +@import "http://at.alicdn.com/t/font_3135652_onj5dmqt30d.css"; // 字体图标 // @font-face { // font-family: "iconfont"; /* Project id 3135652 */ diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js index 6a17fc1..350dc57 100644 --- a/src/utils/commonUtil.js +++ b/src/utils/commonUtil.js @@ -1569,3 +1569,63 @@ export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) { return "-"; } } +// 通过身份证获取信息 + +export function getAgeFromBirthday(bir) { + if (isEmptyCheck(bir)) { + return ""; + } + var infoObj = { age: "", gender: "" }; + var birth = bir.substr(6, 8); + var age = bir.substr(16, 1); + console.log(age); + console.log(birth); + if (age % 2 == 0) { + infoObj.gender = "2"; + } else { + infoObj.gender = "1"; + } + // console.log(bir); + var returnAge; + // var strBirthdayArr = bir.split("-"); + // if (strBirthdayArr.length == 1) { + // var d = new Date(); + // var nowYear = d.getFullYear(); + // return nowYear - strBirthdayArr[0] + 1; + // } + var birthYear = birth.substr(0, 4); + var birthMonth = birth.substr(4, 2); + var birthDay = birth.substr(6, 2); + + var d = new Date(); + var nowYear = d.getFullYear(); + var nowMonth = d.getMonth() + 1; + var nowDay = d.getDate(); + + if (nowYear == birthYear) { + returnAge = 0; //同年 则为0岁 + } else { + var ageDiff = nowYear - birthYear; //年之差 + if (ageDiff > 0) { + if (nowMonth == birthMonth) { + var dayDiff = nowDay - birthDay; //日之差 + if (dayDiff < 0) { + returnAge = ageDiff - 1; + } else { + returnAge = ageDiff; + } + } else { + var monthDiff = nowMonth - birthMonth; //月之差 + if (monthDiff < 0) { + returnAge = ageDiff - 1; + } else { + returnAge = ageDiff; + } + } + } else { + returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天 + } + } + infoObj.age = returnAge; + return infoObj; //返回周岁年龄 +} diff --git a/src/utils/request.js b/src/utils/request.js index 0aadba0..f663313 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,8 +13,8 @@ console.log(baseURL); axios.defaults.withCredentials = true; //添加这行代码 // console.log(axios); const service = axios.create({ - // baseURL: "/api_prod", // url = base url + request url - baseURL: baseURL, // baseURL: "/api", // url = base url + request url + baseURL: "/api_prod", // url = base url + request url + // baseURL: baseURL, // baseURL: "/api", // url = base url + request url withCredentials: true, // send cookies when cross-domain requests timeout: 10000, // request timeout crossDomain: true, diff --git a/yarn.lock b/yarn.lock index d1c1669..bfc95de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2692,6 +2692,15 @@ "resolved" "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz" "version" "3.0.0" +"clipboard@^2.0.10": + "integrity" "sha512-cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g==" + "resolved" "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.10.tgz" + "version" "2.0.10" + dependencies: + "good-listener" "^1.2.2" + "select" "^1.1.2" + "tiny-emitter" "^2.0.0" + "clipboardy@^2.3.0": "integrity" "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==" "resolved" "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz" @@ -3430,6 +3439,11 @@ "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" "version" "1.0.0" +"delegate@^3.1.2": + "integrity" "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + "resolved" "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz" + "version" "3.2.0" + "depd@~1.1.2": "integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" @@ -4606,6 +4620,13 @@ "pify" "^4.0.1" "slash" "^2.0.0" +"good-listener@^1.2.2": + "integrity" "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==" + "resolved" "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz" + "version" "1.2.2" + dependencies: + "delegate" "^3.1.2" + "graceful-fs@^4.1.11", "graceful-fs@^4.1.15", "graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.2": "integrity" "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz" @@ -7939,6 +7960,11 @@ "resolved" "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz" "version" "2.0.0" +"select@^1.1.2": + "integrity" "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" + "resolved" "https://registry.npmmirror.com/select/-/select-1.1.2.tgz" + "version" "1.1.2" + "selfsigned@^1.10.8": "integrity" "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==" "resolved" "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz" @@ -8739,6 +8765,11 @@ "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" "version" "0.3.0" +"tiny-emitter@^2.0.0": + "integrity" "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" + "resolved" "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz" + "version" "2.1.0" + "tinycolor2@^1.4.1": "integrity" "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==" "resolved" "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"