{
+ let day1 = new Date(item).getMonth() + "" + new Date(item).getDate();
+ return day1 === day;
+ });
+ return value;
},
},
mounted() {
@@ -370,6 +385,7 @@ export default {
.date-picker {
background-color: white;
position: absolute;
+ width: 430px;
top: 28px;
left: 0;
display: block;
@@ -511,15 +527,14 @@ export default {
width: calc(100% - 40px);
border-right: 1px solid #eee;
}
- .hour-list,
- .minutes-list {
+ .hour-list {
display: inline-block;
list-style: none;
padding: 0 2px 0 5px;
margin: 0;
height: 100%;
overflow-x: hidden;
- width: 80px;
+ width: 300px;
font-size: 12px;
overflow-y: auto;
&::-webkit-scrollbar {
@@ -542,13 +557,12 @@ export default {
li {
padding: 0;
margin: 0;
- // color: #4d575e;
- color: rgba(77, 87, 94, 0.8);
-
- font-weight: 600;
+ color: #4d575ecc;
+ /* font-weight: 600; */
display: flex;
- line-height: 13px;
- font-size: 13px;
+ height: 35px !important;
+ line-height: 25px;
+ font-size: 18px;
justify-content: center;
align-items: center;
padding: 0 4px;
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index e3961d1..2e05f21 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -91,18 +91,18 @@
-->
-
-
-
+
@@ -121,7 +121,14 @@
-
+
+
+
-
- {{ jobDetail.minMonthlyPay }}- {{ jobDetail.maxMonthlyPay }}元/月
+
-
- {{ jobDetail.hourlyPay }}元/小时
- {{ jobDetail.dayPay }}元/日
+
+ {{ item }}
+
+
+ {{ jobDetail.hourlyPay }}元/小时
+ {{ jobDetail.dayPay }}元/日
+
+
+
+ |
+ {{ jobDetail.minMonthlyPay }}-{{ jobDetail.maxMonthlyPay }}元/月
+
+
+
@@ -268,7 +613,7 @@ import { getJobDetailApi } from "../../api/job";
import { disposeJobListData } from "../../utils/commonUtil";
import recommend from "../../components/FirstJob/components/recommend.vue";
import { nationlist } from "../../utils/datalist";
-import recordbill from "@/components/FirstJob/components/recordbill.vue";
+// import recordbill from "@/components/FirstJob/components/recordbill.vue";
export default {
// 组件名称
@@ -276,7 +621,7 @@ export default {
// 局部注册的组件
components: {
recommend,
- recordbill,
+ // recordbill,
},
// 组件参数 接收来自父组件的数据
props: {},
@@ -286,10 +631,23 @@ export default {
relationList: [],
jobDetail: {},
storeImage: [],
+ storeInfo: {},
id: this.$route.params.id,
visible: false, // 录单模态框的展示
confirmLoading: false, // 录单提交的loading效果
+ skeletonshow: true,
+ tabchange: 1,
nationlist,
+ labelColor: [
+ "pink",
+ "blue",
+ "purple",
+ "orange",
+ "green",
+ "cyan",
+ "red",
+ "purple",
+ ],
form: {
// 录单数据
name: "",
@@ -348,6 +706,16 @@ export default {
console.log(data);
if (data.status === 200) {
this.jobDetail = disposeJobListData(data.data.storeJob);
+ this.skeletonshow = false;
+ this.jobDetail.district = disposeJobListData(
+ data.data.store
+ ).district;
+ let newdata = {
+ id: data.data.storeJob.id,
+ aliasName: data.data.store.aliasName,
+ jobName: data.data.storeJob.jobName,
+ };
+ this.storeInfo = newdata;
data.data.storeImage.forEach((item) => {
this.storeImage.push(item.url);
});
@@ -423,8 +791,10 @@ export default {
// 跳转到路由新页面的方法
console.log(item);
// let userinfo = JSON.stringify(item);
-
- this.$router.push({ name: "recordbill", params: this.jobDetail });
+ console.log(this.jobDetail);
+ console.log(this.storeInfo);
+ this.$router.push({ name: "recordbill", params: this.storeInfo });
+ sessionStorage.setItem("CURRENT_FIRM", JSON.stringify(this.storeInfo));
},
},
};
@@ -622,28 +992,37 @@ export default {
color: #4d575e;
line-height: 20px;
}
- .jobtag {
- margin-top: 14px;
+ .jobtag,
+ .jobtag1 {
+ margin-top: 12px;
text-align: left;
- span:first-child {
- color: #ff6a00;
- background: rgba(254, 97, 0, 0.1);
- }
+ // span:first-child {
+ // color: #ff6a00;
+ // background: rgba(254, 97, 0, 0.1);
+ // }
span {
margin-right: 8px;
font-size: 16px;
- padding: 2px 10px;
- background: rgba(51, 51, 51, 0.06);
+ padding: 0px 6px;
+ border: none;
+ height: 22px;
+ line-height: 21px;
+ // background: rgba(51, 51, 51, 0.06);
border-radius: 4px;
}
}
+ .jobtag1 {
+ span {
+ background-color: #f5f5f5;
+ }
+ }
.jobpricemonth {
margin-top: 16px;
- font-size: 16px;
+ font-size: 18px;
font-weight: 400;
text-align: left;
color: #4d575e;
- line-height: 22px;
+ line-height: 26px;
}
.jobpricehour {
margin-top: 16px;
@@ -709,87 +1088,6 @@ export default {
}
}
}
- // .jobinfobox {
- // .jobname {
- // // margin: 12px 0;
- // font-size: 20px;
- // font-weight: 400;
- // text-align: left;
- // color: #4d575e;
- // line-height: 30px;
- // }
- // .jobinfo {
- // margin-top: 16px;
- // opacity: 0.5;
- // font-size: 16px;
- // font-weight: 400;
- // text-align: left;
- // color: #4d575e;
- // line-height: 22px;
- // }
- // .jobtag {
- // margin-top: 16px;
- // span:first-child {
- // color: #ff6a00;
- // background: rgba(254, 97, 0, 0.06);
- // }
- // span {
- // margin-right: 8px;
- // font-size: 16px;
- // padding: 2px 14px;
- // text-align: left;
- // background: rgba(51, 51, 51, 0.06);
- // border-radius: 4px;
- // }
- // }
- // .jobpricemonth {
- // margin-top: 16px;
- // font-size: 18px;
- // text-align: left;
- // color: #4d575e;
- // line-height: 22px;
- // }
- // .jobpricehour {
- // margin-top: 20px;
- // font-size: 18px;
- // font-weight: normal;
- // text-align: left;
- // color: #ff6a00;
- // line-height: 18px;
- // span {
- // vertical-align: bottom;
- // font-size: 24px;
- // line-height: 18px;
- // }
- // }
- // .billbutton {
- // display: flex;
- // justify-content: flex-start;
- // margin-top: 20px;
- // span {
- // padding: 0 16px;
- // height: 36px;
- // margin-right: 20px;
- // border-radius: 4px;
- // background-color: rgba(254, 97, 0, 0.1);
- // font-size: 18px;
- // font-weight: normal;
- // color: #ff6a00;
- // line-height: 34px;
- // }
- // button {
- // width: 160px;
- // // padding: 0 16px;
- // height: 36px;
- // border: none;
- // background-color: #ff6a00;
- // color: #fff;
- // font-weight: normal;
- // font-size: 18px;
- // border-radius: 4px;
- // }
- // }
- // }
}
.subsetright {
display: flex;
@@ -835,6 +1133,7 @@ export default {
.bottombox1 {
width: 116px;
height: 32px;
+ line-height: 30px;
font-size: 16px;
// border: 1px solid rgba(77, 87, 94, 0.3);
border-radius: 4px;
@@ -863,35 +1162,125 @@ export default {
// border: 1px solid #eeefef;
overflow: hidden;
border-radius: 4px;
- padding: 0 20px 20px 20px;
+ padding: 20px;
background-color: #fff;
h1 {
- font-size: 20px;
- text-align: left;
- color: #4d575e;
- line-height: 33px;
+ font-size: 18px;
margin-bottom: 20px;
- font-weight: normal;
- padding: 10px 0;
- border-bottom: 1px solid #eeefef;
-
+ .infotitle {
+ margin-top: -2px;
+ border-bottom: 1px solid #eeefef;
+ display: flex;
+ span {
+ margin-bottom: -1px;
+ height: 30px;
+ padding: 1px 12px 0 12px;
+ margin-right: 6px;
+ background-color: #fafafa;
+ border: 1px solid #e8e8e8;
+ border-bottom: none;
+ cursor: pointer;
+ border-radius: 4px 4px 0 0;
+ }
+ .active {
+ background-color: #fafafa;
+ // font-weight: bold;0
+ color: #ff6a00;
+ }
+ }
span {
height: 25px;
}
}
- dl {
- dt {
- margin: 30px 0 20px 0;
- font-size: 20px;
- text-align: left;
- color: #4d575e;
- line-height: 28px;
+ }
+ .jobinformationbox {
+ .navigation {
+ width: 55px !important;
+ margin-left: 25px;
+ margin-top: 30px;
+ .ant-affix {
+ left: calc(50% + 278px) !important; // 手动定位固定位置
}
- dd {
- ul {
- li {
- line-height: 32px;
+ .ant-anchor-wrapper {
+ padding-left: 5px !important;
+ }
+ .ant-anchor-ink-ball {
+ // border-color: #ff6a00;
+ width: 10px;
+ height: 10px;
+ border: 2px solid #ff6a00;
+ }
+ .ant-anchor-link {
+ padding: 7px 0 7px 12px !important;
+ a {
+ color: #787878;
+ font-size: 18px;
+ }
+ }
+ .ant-anchor-link-active {
+ a {
+ color: #ff6a00 !important;
+ // font-weight: bold;
+ }
+ }
+ }
+ .baseInfoContent {
+ width: 840px;
+ > div {
+ > div:first-child {
+ color: #4d575e;
+ font-weight: normal;
+ }
+ }
+ .condition {
+ .conditiontable {
+ display: flex;
+ flex-direction: column;
+ font-size: 16px;
+ border: 1px solid #e8e8e8;
+ > li {
+ display: flex;
+ align-items: center;
+ border-bottom: 1px solid #e8e8e8;
+ > div {
+ width: 120px;
+ // font-weight: bold;
+ text-align: center;
+ }
+ &:last-child {
+ border-bottom: 0px;
+ }
+ ul {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ border-left: 1px solid #e8e8e8;
+ flex: 1;
+
+ li {
+ display: flex;
+ min-height: 44px;
+ width: 100%;
+ span:first-child {
+ padding: 12px 15px;
+ width: 100px;
+ border-right: 1px solid #e8e8e8;
+ // font-weight: bold;
+ }
+ span:last-child {
+ flex: 1;
+ display: flex;
+ color: #878787;
+ padding: 12px 16px;
+ white-space: break-space;
+ align-items: center;
+ }
+ }
+ li:not(li:last-child) {
+ border-bottom: 1px solid #e8e8e8;
+ }
+ }
}
}
}
@@ -976,5 +1365,43 @@ export default {
}
}
}
+ .leftDesc.ant-descriptions-bordered table {
+ // min-height: 352px !important;
+ tbody {
+ tr {
+ height: 44px;
+ }
+ }
+ }
+ .leftDesc.ant-descriptions-bordered .ant-descriptions-item-label {
+ width: 120px;
+ text-align: left;
+ font-weight: normal;
+ background-color: #fff;
+ font-size: 16px;
+ color: #4d575e;
+ letter-spacing: 1px;
+ /*vertical-align: baseline;*/
+ }
+
+ .leftDesc.ant-descriptions-bordered .ant-descriptions-item-content {
+ text-align: left;
+ font-size: 16px;
+ color: #878787;
+ }
+ .boubleLevel
+ > .ant-descriptions-view
+ > table
+ > tbody
+ > .ant-descriptions-row:last-child
+ > .ant-descriptions-item-content {
+ padding: 0 !important;
+ .noborder {
+ .ant-descriptions-view {
+ border: 0 !important;
+ }
+ }
+ }
+ // .right
}
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 3ee21c4..e2c8102 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -516,6 +516,7 @@ export default {
*/
created() {
console.log(this.proxyinfo);
+ // this.reload();
this.getJobList();
this.getJobSpecial();
this.getProvince();
@@ -547,8 +548,8 @@ export default {
// console.log(scrollTop); // 获取到页面滚动的值,
let navigation = document.getElementById("navigation");
let content = document.querySelector(".maincontent");
- let filterbox = document.querySelector(".w");
- console.log(filterbox);
+ // let filterbox = document.querySelector(".w");
+ // console.log(filterbox);
// console.log(content);
// let left = ("100vw" - "1200px") / 2;
if (scrollTop >= 81) {
@@ -918,8 +919,8 @@ export default {
border-color: #d9d9d9;
/deep/ .ant-form-item-children {
line-height: 40px;
- .ant-radio-checked {
- }
+ // .ant-radio-checked {
+ // }
// display: flex !important;
}
// &:hover {
@@ -1076,7 +1077,7 @@ export default {
padding: 20px 0 8px 0;
li {
padding: 4px 16px;
- margin: 0px 24px 12px 0;
+ margin: 0px 16px 12px 0;
cursor: pointer;
float: left;
background: rgba(216, 216, 216, 0.3);
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index ea33343..9133400 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -6,7 +6,7 @@
-
+
一手职位
@@ -105,7 +105,7 @@
>
{{ i.aliasName }}
@@ -366,7 +366,7 @@
-
+
+
+ ![]()
{
// const that = this;
// do something
// console.log(data)
const imgFile = new FileReader();
imgFile.readAsDataURL(data);
- imgFile.onload = function (e) {
- console.log(e);
- console.log(this);
- console.log(this.result);
+ imgFile.onload = function () {
+ let formData1 = new FormData();
+ formData1.append("imgName", "abc.png");
+ formData1.append("userImg", this.result);
+
+ request({
+ method: "post",
+ url: "/yishoudan/user/changeUserImgsrc",
+ data: formData1,
+ withCredentials: true,
+ // headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+
+ headers: {
+ "Content-Type":
+ "multipart/form-data;boundary = " + new Date().getTime(),
+ },
+ })
+ .then(({ data }) => {
+ console.log(data);
+ console.log();
+ if (data.status === 200) {
+ let userinfo = JSON.parse(sessionStorage.getItem("LOGIN_DATA"));
+ userinfo.imgSrc = data.data.url;
+ sessionStorage.setItem("LOGIN_DATA", JSON.stringify(userinfo));
+ that.reload();
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ console.log(data);
};
this.visible = false;
});
@@ -482,22 +518,32 @@ export default {
.avatarbox {
margin: 0 auto;
width: 64px;
+ position: relative;
&:hover {
.mask {
display: block;
}
}
+ img {
+ display: block;
+ width: 64px;
+ height: 64px;
+ border-radius: 50%;
+ }
i {
- position: relative;
- font-size: 64px;
- line-height: 64px;
+ width: 64px;
+ height: 64px;
color: #ff6a00;
+ > span {
+ font-size: 64px;
+ line-height: 64px;
+ }
.mask {
position: absolute;
display: none;
- width: 100%;
- height: 100%;
+ width: 64px;
+ height: 64px;
left: 0;
top: 0;
border-radius: 50%;
diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue
index 6cf44b9..d37bed6 100644
--- a/src/components/userinfo/usercenter/components/mybill.vue
+++ b/src/components/userinfo/usercenter/components/mybill.vue
@@ -18,25 +18,25 @@
@click="pagination.status = 20"
:class="{ townsmanactive: pagination.status === 20 }"
>
- 跟面试
+ 待面试
- 跟入职
+ 待入职
- 跟在职
+ 在职中
- 跟离职
+ 待离职
已完成
-
已放弃
-
+ -->
@@ -79,7 +79,7 @@
状态
-
+
@@ -88,17 +88,20 @@
- 创建时间: {{ item.createTime }}
- 工单号: {{ item.orderNum }}
- - {{ item.agencyUserName }}
- - 更新时间: {{ item.updateTime }}
+ - {{ item.agencyName }}
+ -
+ 更新时间: {{ item.updateTime }}
+ ({{ item.diffTime }})
+
-
+
-
{{ item.userName }}/{{ item.sex }}/{{ item.age }}
{{ item.tel }}
- - {{ item.storeJobName }}
- - {{ item.policy }}
+ -
+
{{ item.storeJobName }}
+
+ -
+
{{ item.policy }}
+
+ 展开收起
+
+
-
{{ item.statusTag }}面试时间: {{ item.interviewTime }}
@@ -208,6 +224,7 @@ export default {
},
billList: [],
+ isunfold: false,
};
},
// 计算属性
@@ -251,6 +268,7 @@ export default {
},
async getBill() {
console.log("click");
+ // let that = this;
console.log(this.pagination.status);
try {
this.isspinning = true;
@@ -258,48 +276,90 @@ export default {
console.log(data);
if (data.status === 200) {
// console.log();
-
this.billList = data.data.recordList;
- this.billList.forEach((item, index) => {
- console.log(item);
- if (item.sex === 1) {
- item.sex = "男";
- } else if (item.sex === 2) {
- item.sex = "女";
- } else {
- item.sex = "未知";
- }
- // if (index % 2 === 0) {
- // item.status = 60;
- // }
- if (!isEmptyCheck(item.tel)) {
- let first = item.tel.slice(0, 3);
- let second = item.tel.slice(3, 7);
- let thirdly = item.tel.slice(7, 12);
- console.log(first);
- console.log(second);
- console.log(thirdly);
- item.tel = first + " " + second + " " + thirdly;
- }
- if (item.status === 60 || item.status === 70) {
- item.isDown = true;
- } else {
- item.isDown = false;
- }
- item.statusTag = getUserApplyOrderStatusById(item.status);
- item.interviewTime = formatDateYMDHMS(item.interviewTime);
- // item.updateTime = formatDateYMDHMS(item.updateTime);
- // item.createTime = formatDateYMDHMS(item.createTime);
- item.updateTime = isEmptyCheck(item.updateTime)
- ? "2022-03-16 14:19"
- : formatDateYMDHMS(item.updateTime);
- item.createTime = isEmptyCheck(item.createTime)
- ? "2022-03-16 14:19"
- : formatDateYMDHMS(item.createTime);
- item.index = index + 1;
- });
console.log(this.billList);
- console.log(true);
+ setTimeout(() => {
+ this.billList.forEach((item, index) => {
+ // let updateTime = ;
+ let differenceTime =
+ new Date().getTime() - new Date(item.updateTime).getTime();
+ var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
+ var leave1 = differenceTime % (24 * 3600 * 1000);
+ var H = Math.floor(leave1 / (3600 * 1000));
+ var leave2 = leave1 % (3600 * 1000);
+ var M = Math.floor(leave2 / (60 * 1000));
+ var leave3 = leave2 % (60 * 1000);
+ var S = Math.floor(leave3 / 1000);
+ item.diffTime = null;
+ if (D > 0) {
+ item.diffTime = D + "天前";
+ } else if (H > 0) {
+ item.diffTime = H + "小时前";
+ } else if (M > 0) {
+ item.diffTime = M + "分钟前";
+ } else {
+ item.diffTime = S + "秒前";
+ }
+ // console.log(new Date(differenceTime).getDate());
+ // console.log(item.userName, D, H, M);
+ // console.log(item);
+ if (item.sex === 1) {
+ item.sex = "男";
+ } else if (item.sex === 2) {
+ item.sex = "女";
+ } else {
+ item.sex = "未知";
+ }
+ // if (index % 2 === 0) {
+ // item.status = 60;
+ // }
+ if (!isEmptyCheck(item.tel)) {
+ let first = item.tel.slice(0, 3);
+ let second = item.tel.slice(3, 7);
+ let thirdly = item.tel.slice(7, 12);
+ // console.log(first);
+ // console.log(second);
+ // console.log(thirdly);
+ item.tel = first + " " + second + " " + thirdly;
+ }
+ if (item.status === 60 || item.status === 70) {
+ item.isDown = true;
+ } else {
+ item.isDown = false;
+ }
+ item.statusTag = getUserApplyOrderStatusById(item.status);
+ item.interviewTime = formatDateYMDHMS(item.interviewTime);
+ // item.updateTime = formatDateYMDHMS(item.updateTime);
+ // item.createTime = formatDateYMDHMS(item.createTime);
+ item.updateTime = isEmptyCheck(item.updateTime)
+ ? "2022-03-16 14:19"
+ : formatDateYMDHMS(item.updateTime);
+ item.createTime = isEmptyCheck(item.createTime)
+ ? "2022-03-16 14:19"
+ : formatDateYMDHMS(item.createTime);
+ item.index = index + 1;
+
+ // console.log(that.$refs["Control" + index][0]);
+ let parent = this.$refs["Control" + index][0].parentNode;
+ let sibling =
+ this.$refs["Control" + index][0].previousElementSibling;
+ // console.log(window.getComputedStyle(sibling));
+ // console.log(parent.offsetHeight);
+ // console.log(sibling.offsetHeight);
+ // console.log(window.getComputedStyle(parent).height);
+ if (sibling.offsetHeight > parent.offsetHeight) {
+ // sibling.style.height = "100%";
+ sibling.style.overflow = "hidden";
+ parent.style.paddingBottom = "20px";
+ item.isunfold = true;
+ } else {
+ item.isunfold = false;
+ }
+ item.controlUnfold = true;
+ // console.log("controlUnfold", item.controlUnfold);
+ // console.log("isunfold", item.isunfold);
+ });
+ }, 0);
this.pagination.total = data.data.recordCount;
this.totop();
}
@@ -451,6 +511,26 @@ export default {
document.documentElement.scrollTop = 0;
// window.body.scrollY = 0;
},
+ changeStatus(item, index) {
+ // 控制政策的展开
+ console.log(item);
+ console.log(index);
+ let parent = this.$refs["Control" + index][0].parentNode;
+ let sibling = this.$refs["Control" + index][0].previousElementSibling;
+ if (item.controlUnfold) {
+ parent.style.maxHeight = "none";
+ sibling.style.height = "100%";
+ console.log(parent);
+ } else {
+ parent.style.maxHeight = "156px";
+ sibling.style.height = "146px";
+ sibling.style.overflow = "hidden";
+ console.log(parent);
+ }
+ item.controlUnfold = !item.controlUnfold;
+ this.$forceUpdate();
+ console.log(item.controlUnfold);
+ },
},
};
@@ -602,6 +682,9 @@ export default {
// transform: translateY(-50%);
background-color: #eeeeee;
}
+ &:last-child::after {
+ display: none;
+ }
}
button {
width: 100px;
@@ -764,7 +847,7 @@ export default {
}
}
.infoSubset {
- height: 174px;
+ // height: 174px;
// background-color: pink;
margin-top: 16px;
font-size: 14px;
@@ -781,7 +864,15 @@ export default {
li {
flex: 1;
&:nth-child(2) {
- margin-left: 50px;
+ margin-left: 5px;
+ }
+ &:nth-child(3) {
+ // margin-left: 100px;
+ position: relative;
+ transform: translateX(52px);
+ }
+ &:last-child {
+ text-align: right;
}
// flex: 1;
}
@@ -789,11 +880,12 @@ export default {
.billInfo {
display: flex;
justify-content: space-between;
- height: calc(100% - 40px);
+
li {
display: flex;
flex-direction: column;
- justify-content: space-around;
+ justify-content: center;
+ align-items: center;
text-align: center;
border: 1px solid #ccc;
border-top: none;
@@ -803,13 +895,12 @@ export default {
}
li:first-child {
width: 213px;
- display: flex;
- flex-direction: column;
+ // flex-direction: column;
- align-items: center;
- justify-content: space-around;
- padding: 28px 0 32px;
+ // justify-content: space-around;
+ // padding: 28px 0 32px;
i {
+ text-align: center;
width: 24px;
font-size: 24px;
&:before {
@@ -828,16 +919,46 @@ export default {
}
li:nth-child(2) {
width: 246px;
- line-height: 100px;
+ // line-height: 100px;
// background-color: red;
}
li:nth-child(3) {
- // width: 213px;
- flex: 1;
+ width: 400px;
+ // display: block;
+ position: relative;
+ max-height: 156px;
+ min-height: 156px;
+ text-align: left;
+ padding: 6px 16px 6px 16px;
+
+ overflow: hidden;
+ > p {
+ white-space: break-space;
+ text-align: center;
+ word-break: break-all;
+ font-size: 14px;
+ width: 100%;
+ }
+ div {
+ position: absolute;
+ width: 42px;
+ height: 20px;
+ right: 19px;
+ bottom: 3px;
+ text-align: right;
+ background-color: #fff;
+ color: #ff6a00;
+ cursor: pointer;
+ }
// background-color: green;
}
+ li.unfold {
+ }
li:nth-child(4) {
- padding: 40px 0;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ // padding-top: 62px;
width: 321px;
// background-color: purple;
}
diff --git a/src/permission.js b/src/permission.js
index 8020d43..4feacf2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,6 +1,7 @@
// 路由权限的配置
import router from "./router";
-
+import Vue from "vue";
+console.dir(Vue);
router.beforeEach(async (to, from, next) => {
// console.log(to);
// console.log(from);
@@ -32,6 +33,10 @@ router.beforeEach(async (to, from, next) => {
if (isLogin) {
if (to.path === "/login") {
next("/login");
+ } else if (to.path === "/list") {
+ next();
+
+ // window.location.reload();
} else {
next();
}
@@ -47,4 +52,15 @@ router.beforeEach(async (to, from, next) => {
}
}
});
-router.afterEach(() => {});
+router.afterEach(() => {
+ // const isLogin = sessionStorage.getItem("LOGIN_DATA") !== null ? true : false;
+ // if (isLogin) {
+ // if (to.path === "/list") {
+ // // next();
+ // window.location.reload();
+ // }
+ // }
+ // console.log(to);
+ // console.log(from);
+ // console.log(next);
+});
diff --git a/src/style/index.less b/src/style/index.less
index 9520225..3a1a566 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -27,7 +27,7 @@ td,
div {
margin: 0;
padding: 0;
- color: #475d5e;
+ color: #4d575e;
font-family: PingFangSC, PingFangSC-Regular;
}
body,
@@ -362,6 +362,12 @@ i {
width: 1200px;
margin: 0 auto;
}
+.mb12 {
+ margin-bottom: 12px;
+}
+.mt20 {
+ margin-top: 20px;
+}
// 日期选择框
.ant-calendar-picker-container-content {
margin-top: 3px;
diff --git a/src/style/index.wxss b/src/style/index.wxss
index 029335f..78596f1 100644
--- a/src/style/index.wxss
+++ b/src/style/index.wxss
@@ -26,7 +26,7 @@ td,
div {
margin: 0;
padding: 0;
- color: #475d5e;
+ color: #4d575e;
font-family: PingFangSC, PingFangSC-Regular;
}
body,
@@ -295,6 +295,12 @@ i {
width: 1200px;
margin: 0 auto;
}
+.mb12 {
+ margin-bottom: 12px;
+}
+.mt20 {
+ margin-top: 20px;
+}
.ant-calendar-picker-container-content {
margin-top: 3px;
width: 341px !important;
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 26f9eea..ea7852d 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1156,13 +1156,12 @@ function getJobSpecialLabelNamesArray(jobSpecialLabelNames) {
*/
export function userApplyOrderStatusArray() {
let orderStatus = [
- { id: "10", name: "审核中" },
- { id: "20", name: "跟面试" },
- { id: "30", name: "跟入职" },
- { id: "40", name: "跟在职" },
- { id: "50", name: "跟离职" },
- { id: "60", name: "已完成" },
- { id: "70", name: "已放弃" },
+ { id: "10", name: "审核中", value: "10", text: "审核中" },
+ { id: "20", name: "待面试", value: "20", text: "待面试" },
+ { id: "30", name: "待入职", value: "30", text: "待入职" },
+ { id: "40", name: "在职中", value: "40", text: "在职中" },
+ { id: "50", name: "待离职", value: "50", text: "待离职" },
+ { id: "60", name: "已完成", value: "60", text: "已完成" },
];
return orderStatus;
}
@@ -1206,7 +1205,7 @@ export function disposeJobListData(jobList) {
//服务费
// console.log(item);
- if (item.returnFeeType || item.returnFeeType === 0) {
+ if (item.returnFeeType) {
if (item.returnFeeType === 0) {
item.servetype = "元/小时";
} else if (item.returnFeeType === 1) {
@@ -1215,6 +1214,8 @@ export function disposeJobListData(jobList) {
item.servetype = "元/月";
} else if (item.returnFeeType === 3) {
item.servetype = "元/次";
+ } else {
+ item.servetype = "元/小时";
}
// console.log(item);
// item["returnFee"] = item.returnFee / 100;
diff --git a/src/views/main.vue b/src/views/main.vue
index b2e634f..470c0ec 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,7 +1,7 @@
-
+
@@ -22,7 +22,7 @@
>
-
-
-
+
![]()
+
-
+ {{
loginValue.userName || loginValue.nickName || loginValue.tel
}}
@@ -305,7 +317,7 @@ export default {
*/
created() {
this.isLogin = sessionStorage.getItem("LOGIN_DATA") !== null ? true : false;
-
+ console.log(JSON.parse(sessionStorage.getItem("LOGIN_DATA")));
this.getJobList();
this.isLaoxiangshow();
this.getRecommendJob();
@@ -328,11 +340,11 @@ export default {
// 组件方法
methods: {
// 获取工作列表
- async getJobList() {
+ async getJobList(newdata) {
this.isspinning = true;
console.log(this.formvalue);
try {
- var newdata = {
+ newdata = {
district: "",
monthlyPayStr: "",
ageStr: "",
@@ -462,6 +474,12 @@ export default {
this.isbannershow = false;
}
},
+ toList() {
+ console.log(this.$router);
+ // this.$router.go(0);
+ // window.location.reload();
+ this.reload();
+ },
},
};
@@ -560,9 +578,14 @@ export default {
.loginbtn {
width: 70px;
}
+
> span {
width: 36px;
height: 36px;
+ img {
+ width: 36px;
+ height: 36px;
+ }
span {
width: 36px;
height: 36px;
@@ -771,6 +794,11 @@ export default {
display: flex;
align-items: center;
padding: 16px 0;
+ img {
+ width: 24px;
+ height: 24px;
+ margin-right: 8px;
+ }
}
.username {
max-width: 120px;
|
