diff --git a/public/favicon.ico b/public/favicon.ico index bc7f765..578ece5 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index b5e24e9..5ee9ab0 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -344,11 +344,31 @@ {{ jobDetail.salaryDetail || "-" }} - 发薪说明 + 薪资发放 {{ jobDetail.payDay || "-" }} - 补充说明 + 银行卡 + {{ jobDetail.bankInfo || "-" }} + + + 工期 + {{ jobDetail.workCycle || "-" }} + + + 培训 + {{ jobDetail.training || "-" }} + + + 试用期 + {{ jobDetail.probation || "-" }} + + + 福利待遇 + {{ jobDetail.boon || "-" }} + + + 薪资说明 {{ jobDetail.salaryDesp || "-" }} @@ -415,10 +435,26 @@ 文化学历 {{ jobDetail.education || "-" }} + - 面试资料 + 证件 {{ jobDetail.idCard || "-" }} + + + 疑难杂症 + {{ jobDetail.otherRequire || "-" }} + + + + 体检 + {{ jobDetail.healthRequire || "-" }} + + + - + @@ -452,8 +488,14 @@ 工作内容 {{ jobDetail.workContent || "-" }} + + + 工作方式 + {{ jobDetail.workMode || "-" }} + + - 班次时间 + 班次工时 {{ jobDetail.workClasses || "-" }} @@ -461,11 +503,11 @@ {{ jobDetail.workClothes || "-" }} - 过安检 + 车间 {{ jobDetail.securityCheck || "-" }} - 员工保险 + 保险 {{ jobDetail.employeeInsurance || "-" }} - 补充说明 + 换岗调班 {{ jobDetail.otherDesp || "-" }} @@ -510,25 +552,38 @@
  • 民族窗口{{ jobDetail.muslim }}
    • --> -
  • +
  • 住宿
    • @@ -831,8 +886,12 @@ export default { jobName: data.data.storeJob.jobName, }; this.storeInfo = newdata; + + let regs = /\.(jpg|jpeg|png)(\?.*)?$/; data.data.storeImage.forEach((item) => { - this.storeImage.push(item.url); + if (regs.test(item.url.toLowerCase())) { + this.storeImage.push(item.url); + } }); // console.log(this.storeImage); } else { diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index b707e90..05a3f81 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -73,7 +73,7 @@ --> @@ -1829,8 +1829,9 @@ export default { justify-content: start; // flex-direction: column; .icon { - width: 158px; - height: 43px; + width: 90px; + height: auto; + margin-top: 6px; } .searchBox { position: relative; diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index b9689b3..5fe329a 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -186,6 +186,7 @@ :datetime.sync="form.interviewTime" > - + + + + + @@ -499,6 +509,7 @@ export default { previewImage: "", isMaster: true, isShow: false, + isShow1: false, nationlist, moment, loading: false, @@ -601,6 +612,7 @@ export default { address: "", // 家庭住址 policy: "", // 代理政策 interviewTime: "", // 面试时间 + receptionTime: "", //接待时间 idCardImageUrl: "", }, proxyinfo: {}, @@ -784,11 +796,20 @@ export default { this.isShow = true; console.log(this.form.interviewTime); }, + getDateinfo1() { + this.isShow1 = true; + console.log(this.form.receptionTime); + }, verify() { if (this.form.interviewTime !== "") { this.form.interviewTime = ""; } }, + verify1() { + if (this.form.receptionTime !== "") { + this.form.receptionTime = ""; + } + }, handleChange({ fileList }) { console.log(fileList); console.log(fileList[0]); @@ -1658,6 +1679,10 @@ export default { .ant-input { border-radius: 0px; } +/deep/ .pt1 .ant-input { + padding-top: 1px; +} + /deep/ .ant-select-selection { border-radius: 0px !important; } diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue index aabeb77..c01e265 100644 --- a/src/components/Login/login.vue +++ b/src/components/Login/login.vue @@ -6,8 +6,8 @@ --> diff --git a/src/components/main/index.vue b/src/components/main/index.vue index 3bc9e71..cb8c22d 100644 --- a/src/components/main/index.vue +++ b/src/components/main/index.vue @@ -9,8 +9,8 @@ @@ -116,11 +116,19 @@
    + >

    伯才稻田公众号

     + >

    伯才稻田小程序
    diff --git a/src/utils/request.js b/src/utils/request.js index d15b44f..8025514 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,7 +2,8 @@ import axios from "axios"; import router from "@/router"; import Cookies from "js-cookie"; // import Vue from "vue"; -const baseURL = "http://1shoudan.com"; // 正式环境线上 +// const baseURL = "http://1shoudan.com"; // 正式环境线上 +const baseURL = "http://idaotian.com"; // 正式环境线上 console.log(baseURL); // const baseURL = "https://d.matripe.com.cn"; // 正式环境本地 // const baseURL = "http://bl7.matripe.com.cn:8001"; // 测试环境本地 @@ -22,7 +23,7 @@ const service = axios.create({ service.interceptors.response.use( (response) => { const { msg, status } = response.data; - // console.log(status); + // console.log(status) ; if (status == 9999) { sessionStorage.removeItem("LOGIN_DATA"); Cookies.remove("LOGIN_DATA");