diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index 62b9d93..97a06a0 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -2814,19 +2814,19 @@ Page({ that.data.recordList.forEach((item, index) => { // console.log(item); // item.logoStr = item.jobName.slice(0,2) - if ( - app.isNotEmptyCheck(item.returnFeeType) || - item.returnFeeType == "0" || - item.returnFee == "0" - ) { - item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById( - item.returnFeeType, - item.returnFee / 100 - ); - - } else { - item["fuWuFei"] = ""; - } + // if ( + // app.isNotEmptyCheck(item.returnFeeType) || + // item.returnFeeType == "0" || + // item.returnFee == "0" + // ) { + // item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById( + // item.returnFeeType, + // item.returnFee / 100 + // ); + + // } else { + // item["fuWuFei"] = ""; + // } // 简版弹窗通告显示 if (item.id == that.data.currentJobDrawer.id) { item["jobDesp"] = item.jobDesp @@ -4333,6 +4333,7 @@ Page({ storeJobListSearchForm: that.data.storeJobListSearchForm, recordList: [], hasMoreData: true, + // topNum: 1, }); that.getJobList(); } diff --git a/pages/shareList/index.js b/pages/shareList/index.js index 8e895e8..23116df 100644 --- a/pages/shareList/index.js +++ b/pages/shareList/index.js @@ -1349,7 +1349,7 @@ Page({ // debugger let that = this; that.setData({ - isLogin: app.globalData.isLogin + isLogin: wx.getStorageSync('loginUser') ? true : false }); that.getJobList(); }, @@ -1588,13 +1588,29 @@ Page({ title: "加载中...", }); console.log(that.data.storeJobListSearchForm); - customRequest("/yishoudan/store/job/getShareJobs?storeJobIds=" + app.globalData.sceneStoreJobId, { header: 'headers', method: 'POST', data: {} }).then((res) => { + customRequest("/yishoudan/custom/job/getShareJobsV2?storeJobIds=" + app.globalData.sceneStoreJobId, { header: 'headers', method: 'get', data: {} }).then((res) => { setTimeout(function () { that.setData({ triggered: false, }); }, 1000); // var jobListTemp = commonUtil.disposeJobListData(); + if (res.data.data.list) { + res.data.data.list.forEach((i) => { + + i.minMonthlyPay = i.minMonthlyPay / 100 + i.maxMonthlyPay = i.maxMonthlyPay / 100 + if (i.jobSpecialLabelNames && i.jobSpecialLabelNames.length > 0) { + i.labelGroup = i.jobSpecialLabelNames.split(', ').filter((itm, inx) => { + return inx < 6 + }).map(itm => { + return itm + }) + } else { + i.labelGroup = []; + } + }) + } var jobListTemp = commonUtil.disposeJobListData(res.data.data.list); that.data.recordList = jobListTemp; @@ -1617,11 +1633,11 @@ Page({ that.data.recordList.forEach((item, index) => { // console.log(item); - if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") { - item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee); - } else { - item["fuWuFei"] = ""; - } + // if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") { + // item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee); + // } else { + // item["fuWuFei"] = ""; + // } // 简版弹窗通告显示 if (item.id == that.data.currentJobDrawer.id) { item["jobDesp"] = item.jobDesp.replace(/\*\*\*\*\*/g, "").split("————————")[0]; @@ -1794,9 +1810,6 @@ Page({ goDetail (e) { console.log(e); var that = this; - - console.log(app.globalData.isLogin); - console.log(app.globalData.isLogin); // wx.navigateTo({ // url: "../detail/index?storeJobId=" + e.currentTarget.dataset.id + "&wxCode=" + that.data.wxCode, // }); @@ -2355,7 +2368,7 @@ Page({ } console.log(app.globalData.headers); //发起网络请求 - customRequest(url, { header: 'headers', method: 'GET', data: { storeJobId: storeJobId,jobClassify:1 } }).then((res) => { + customRequest(url, { header: 'headers', method: 'GET', data: { storeJobId: storeJobId, jobClassify: 1 } }).then((res) => { var txt; if (collected - 1 == 0) { //取消收藏 diff --git a/pages/shareList/index.json b/pages/shareList/index.json index 595bfe1..15f3ca4 100644 --- a/pages/shareList/index.json +++ b/pages/shareList/index.json @@ -1,4 +1,7 @@ { + "usingComponents": { + "job-sub": "../../components/job-sub/index" + }, "navigationBarTitleText": "职位列表", "backgroundColor": "#f5f5f5" diff --git a/pages/shareList/index.wxml b/pages/shareList/index.wxml index daade58..ae552a9 100644 --- a/pages/shareList/index.wxml +++ b/pages/shareList/index.wxml @@ -8,9 +8,11 @@ - + + - + + diff --git a/utils/commonUtil.js b/utils/commonUtil.js index bb5912f..387d6b9 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -1063,7 +1063,7 @@ export function getSalaryClassifyValue1 (salaryClassify, salaryClassifyValue) { export function getReturnFeeTypeName1ById (id, value) { let str = ""; // console.log(id+'returnFeeType'); - let array = this.returnFeeTypeArray(value); + let array = returnFeeTypeArray(value); str = "--"; array.forEach((item) => { @@ -1328,6 +1328,20 @@ export function disposeJobListData (recordList) { // console.log('item["update"]',item["update"]); item.genderRestrict = getGenderByMinAge(item); + // 服务费 + if ( + isNotEmptyCheck(item.returnFeeType) || + item.returnFeeType == "0" || + item.returnFee == "0" + ) { + item["fuWuFei"] = getReturnFeeTypeName1ById( + item.returnFeeType, + item.returnFee / 100 + ); + + } else { + item["fuWuFei"] = ""; + } // //时薪 // var hourlyPayStr = ''; // var hasHourlyPay = false;