diff --git a/components/job-sub/index.js b/components/job-sub/index.js
index 0d9131b..dc769ce 100644
--- a/components/job-sub/index.js
+++ b/components/job-sub/index.js
@@ -1,6 +1,9 @@
const app = getApp();
Component({
- data: {},
+ data: {
+ labelColor: ["#c41d7f", "#096dd9", "#531dab", "#d46b08", "#389e0d", "#08979c", "#cf1322"],
+ bgColor: ["#fff0f6", "#e6f7ff", "#f9f0ff", "#fff7e6", "#f6ffed", "#e6fffb", "#fff1f0"],
+ },
properties: {
// 抽屉高度
recordList: {
diff --git a/components/job-sub/index.wxml b/components/job-sub/index.wxml
index 22bbd2f..af543e5 100644
--- a/components/job-sub/index.wxml
+++ b/components/job-sub/index.wxml
@@ -10,7 +10,7 @@
{{item.jobName || item.aliasName}}
{{item.update}}
-
+
@@ -24,8 +24,8 @@
-
-
+
+
{{itm || '-'}}
@@ -45,34 +45,34 @@
￥
- {{item.salaryClassifyValue}}
+ {{item.salaryClassifyValue}}
/时
￥
- {{item.salaryClassifyValue}}
+ {{item.salaryClassifyValue}}
/天
￥
- {{item.salaryClassifyValue}}
+ {{item.salaryClassifyValue}}
补
￥
- {{item.salaryClassifyValue}}
+ {{item.salaryClassifyValue}}
返
计件
￥
- {{item.salaryClassifyValue}}
+ {{item.salaryClassifyValue}}
保底
面议
￥
- {{item.monthlyPay}}
+ {{item.monthlyPay}}
/月
diff --git a/pages/detail/index.js b/pages/detail/index.js
index 074ac6b..6bae5ae 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -1010,7 +1010,7 @@ Page({
that.setData({
jobDetail: result,
isMaskShow: !(result.record.recruitment == "1"),
- citys: citys ,
+ citys: citys,
// addressNew: result.storeDistrict.replace(/,/g, "") + result.store.detailPosition,
});
that.data.jobDetail.record["storeName"] = that.data.jobDetail.storeName ? that.data.jobDetail.storeName : that.data.jobDetail.record["storeName"];
@@ -1743,9 +1743,11 @@ Page({
},
showFee () {
let that = this
+ console.log('that.data.bclr', that.data.bclr);
wx.showModal({
- // title: "确认要转让创建人吗？",
- content: that.data.jobDetail.record.returnFeeDesp,
+ title: '佣金: ' + that.data.fuWuFei,
+ content: that.data.jobDetail.record.returnFeeDesp,
+ // content: that.data.bclr,
contentColor: "#ccc",
confirmColor: "#1890ff",
confirmText: "确定",
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index 2e7e972..c73c3e0 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -51,7 +51,7 @@
仅代理可见-->
-
+
@@ -66,14 +66,13 @@
- {{citys}}
+ {{citys ? citys + '丨' :''}}
- {{citys ? '丨' :''}}
{{jobDetail.record.genderRestrict}}
- 丨{{jobDetail.record.age}}
+ {{'丨' +( jobDetail.record.age || '-')}}
@@ -92,8 +91,8 @@
暂无特色
-
-
+
+
￥
@@ -129,9 +128,9 @@
-
+
- {{jobDetail.record.monthlyPay || '--'}}
+ {{jobDetail.record.monthlyPay ? '丨' + jobDetail.record.monthlyPay : '--'}}
@@ -142,7 +141,7 @@
{{(jobDetail.store.detailPosition ? jobDetail.store.detailPosition :jobDetail.record.storeAddr) || '暂无地址信息'}}
-
+
@@ -237,18 +236,18 @@
对接信息
-
+
面试地点
{{jobDetail.record.interviewAddr}}
-
+
@@ -446,7 +445,7 @@
-->
-
+
客服
@@ -454,7 +453,7 @@
-
+
@@ -464,7 +463,7 @@
-
+
diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss
index b4a680c..3e0fac1 100644
--- a/pages/detail/index.wxss
+++ b/pages/detail/index.wxss
@@ -251,7 +251,7 @@ button.collectBtn {
margin-right: 8px;
margin-bottom: 0;
color: #888;
- line-height: 18px;
+ line-height: 20px;
padding: 0px 4px;
}
.t-icon-ziying1 {
diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js
index d2030e1..078103d 100644
--- a/pages/firstBill/index.js
+++ b/pages/firstBill/index.js
@@ -11,6 +11,7 @@ import {
Page({
data: {
toped: "1",
+ jobNum: 0, // 48小时更新职位数
currCode: '',
colorList: [{
color: '#1890ff',
@@ -80,7 +81,7 @@ Page({
checkedlabelItems: [],
hasMoreData: true, //下拉是否还有更多数据
inputShowed: false,
- inputVal: "搜索工作",
+ inputVal: "",
wxCode: "",
isCollect: false,
collectTxt: "收藏",
@@ -613,7 +614,7 @@ Page({
},
clearInput: function () {
this.setData({
- inputVal: "搜索工作",
+ inputVal: "",
chaShowed: false,
inputShowed: false,
hasMoreData: true,
@@ -634,6 +635,11 @@ Page({
this.data.storeJobListSearchForm.pageNum = 1;
this.data.storeJobListSearchForm.keys = "";
this.getJobList();
+ } else if (!this.data.chaShowed) {
+
+ this.setData({
+ chaShowed: true,
+ });
}
},
/**
@@ -2241,7 +2247,7 @@ Page({
// that.getJobList();
// }
-
+ this.getJobNum()
wx.removeStorage({
key: "townsManInfo",
});
@@ -2561,13 +2567,14 @@ Page({
if (app.isEmptyCheck(that.data.searchCityParamStorage.name)) {
that.data.storeJobListSearchForm.cityName = "全国";
}
- that.data.storeJobListSearchForm.keys = that.data.inputVal == "搜索工作" ? "" : that.data.inputVal;
+ that.data.storeJobListSearchForm.keys = that.data.inputVal;
// debugger;
wx.showLoading({
title: "加载中...",
});
console.log(that.data.storeJobListSearchForm);
-
+ // 置空收藏的筛选
+ that.data.storeJobListSearchForm.ucj = ''
customRequest("/yishoudan/custom/job/listV2", {
method: 'post',
header: 'headers',
@@ -2620,7 +2627,7 @@ Page({
that.data.recordList.forEach((item, index) => {
if (item.jobSpecialLabelNames && item.jobSpecialLabelNames.length > 0) {
item.labelGroup = item.jobSpecialLabelNames.split(', ').filter((item, index) => {
- return index < 3
+ return index < 6
}).map(item => {
return item
})
@@ -4164,7 +4171,8 @@ Page({
) {
if (e.currentTarget.dataset.id) {
that.data.choiceCollect = e.currentTarget.dataset.id;
- that.data.storeJobListSearchForm.ucj = e.currentTarget.dataset.id;
+ // that.data.storeJobListSearchForm.ucj = e.currentTarget.dataset.id;
+ that.data.storeJobListSearchForm.sortTag = e.currentTarget.dataset.id;
that.data.storeJobListSearchForm.pageNum = 1;
that.setData({
choiceCollect: that.data.choiceCollect,
@@ -4742,4 +4750,18 @@ Page({
url: "/pages/filterPage/index",
});
},
+ getJobNum () {
+ // 获取48小时内职位更新数
+ customRequest("/yishoudan/custom/job/countUpdateNumByHour/48", {
+ header: 'headers',
+ method: 'get',
+ }).then((res) => {
+ console.log('getJobNum', res);
+ this.setData({
+ jobNum: res.data.data
+ })
+ }).catch(() => {
+
+ })
+ }
});
\ No newline at end of file
diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml
index 9741c77..d9443d9 100644
--- a/pages/firstBill/index.wxml
+++ b/pages/firstBill/index.wxml
@@ -6,30 +6,33 @@
-
-
- {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}}
-
-
-
-
-
-
-
-
- {{item}}
-
-
-
+
+
+ {{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
-
-
- 搜索
-
-
-
-
-
-
-
-
- 全部
-
-
-
+
+
+
+
+ 最新
+
+
+
+ 工价
+
+
+ 佣金
+
+
+
-
-
-
-
-
-
+
+
+
-
+
-
+ -->
+
-
+
+
没有符合条件的职位
-
+
已经到底啦～
@@ -619,10 +629,10 @@
-
+
diff --git a/pages/firstBill/index.wxss b/pages/firstBill/index.wxss
index 2bb6d40..df0be1f 100644
--- a/pages/firstBill/index.wxss
+++ b/pages/firstBill/index.wxss
@@ -943,8 +943,8 @@ button.collect icon::before {
.xgxg {
/* height: 44px; */
/* position: relative; */
- padding: 8px 0px;
- margin-left: 24px;
+ /* padding: 8px 0px; */
+ /* margin-left: 24px; */
/* position: sticky; */
/* top: 103px; */
/* z-index: 9999; */
diff --git a/pages/jobListSearch/index.js b/pages/jobListSearch/index.js
index f701214..13b7dd0 100644
--- a/pages/jobListSearch/index.js
+++ b/pages/jobListSearch/index.js
@@ -1500,7 +1500,7 @@ Page({
if (data.recordList == null || data.recordList.length == 0 || data.recordList.length < that.data.storeJobListSearchForm.pageSize) {
var jobListTemp = commonUtil.disposeJobListData(data.recordList);
that.data.recordList = that.data.recordList.concat(jobListTemp);
-
+
that.setData({
recordList: that.data.recordList,
hasMoreData: false,
@@ -1509,7 +1509,17 @@ Page({
} else {
var jobListTemp = commonUtil.disposeJobListData(data.recordList);
that.data.recordList = that.data.recordList.concat(jobListTemp);
-
+ that.data.recordList.forEach((item, index) => {
+ if (item.jobSpecialLabelNames && item.jobSpecialLabelNames.length > 0) {
+ item.labelGroup = item.jobSpecialLabelNames.split(', ').filter((item, index) => {
+ return index < 6
+ }).map(item => {
+ return item
+ })
+ } else {
+ item.labelGroup = [];
+ }
+ })
that.setData({
recordList: that.data.recordList,
hasMoreData: true,
diff --git a/pages/jobListSearch/index.wxml b/pages/jobListSearch/index.wxml
index 03250a1..372b865 100644
--- a/pages/jobListSearch/index.wxml
+++ b/pages/jobListSearch/index.wxml
@@ -214,7 +214,7 @@
-
+
@@ -248,7 +248,7 @@
-
+
diff --git a/utils/commonUtil.js b/utils/commonUtil.js
index e3677fd..348968a 100644
--- a/utils/commonUtil.js
+++ b/utils/commonUtil.js
@@ -165,7 +165,7 @@ export function getWorkTypeById (id) {
*/
export function getGenderByMinAge (res) {
- console.log("==================", res);
+ // console.log("==================", res);
let str = "";
if (res.minAgeMan && res.minAgeWoman) {
str = "男女不限";
@@ -1168,7 +1168,7 @@ export function setJobInfoPosition (pos) {
citys.push(i);
}
});
- citys = citys.join(",").replace(/,/g, " | ");
+ citys = citys.join(",").replace(/,/g, "丨");
return citys ;
}
/*
@@ -1281,7 +1281,7 @@ export function disposeJobListData (recordList) {
item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue);
// x天前更新
item["update"] = dateUtil.timeShowXXX2(item.updateTime);
- console.log('item["update"]',item["update"]);
+ // console.log('item["update"]',item["update"]);
item.genderRestrict = getGenderByMinAge(item);
// //时薪
@@ -1327,7 +1327,7 @@ export function disposeJobListData (recordList) {
//地址深圳丨龙岗区丨
let citys = setJobInfoPosition(item.storeDistrict);
- console.log('citys',citys);
+ // console.log('citys',citys);
var districtStr = "";
if (isNotEmptyCheck(item.district)) {
var districtArr = item.district.split(",");