diff --git a/pages/collect/index.wxml b/pages/collect/index.wxml index 66a4b36..c9ccf1a 100644 --- a/pages/collect/index.wxml +++ b/pages/collect/index.wxml @@ -38,7 +38,7 @@ {{item.jobName || item.aliasName}} - {{item.monthlyPay}}元/月 + {{item.salaryClassifyValue}} diff --git a/pages/detail/index.js b/pages/detail/index.js index 4bc1d2e..fb02c17 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1142,7 +1142,6 @@ Page({ // } // if (app.isNotEmptyCheck(jobDetail.salaryClassify) && app.isNotEmptyCheck(jobDetail.salaryClassifyValue)) { - jobDetail["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue); // } //月薪 var monthlyPayStr = ""; @@ -1159,7 +1158,9 @@ Page({ monthlyPayStr = jobDetail.maxMonthlyPay/100; } } - jobDetail["monthlyPay"] = monthlyPayStr; + jobDetail["monthlyPay"] = monthlyPayStr; + jobDetail["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue,monthlyPayStr); + //地址深圳丨龙岗区丨 // var districtStr = ""; // if (app.isNotEmptyCheck(jobDetail.store.district)) { diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 921bd4b..19118b0 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -29,7 +29,7 @@ - {{jobDetail.monthlyPay || '--'}}元/月 + {{jobDetail.hourlyPay || '--'}} @@ -50,11 +50,11 @@ - + - {{jobDetail.storeAddr ? jobDetail.storeAddr :'暂无地址信息'}} + {{jobDetail.storeAddr != '北京市东城区东华门街道天安门' && jobDetail.storeAddr ? jobDetail.storeAddr :'暂无地址信息'}} diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 27a8913..51581a1 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -295,7 +295,7 @@ {{item.jobName || item.aliasName}} - {{item.monthlyPay}}元/月 + {{item.salaryClassifyValue}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 513bda7..2f4bb0b 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1237,12 +1237,12 @@ button.collect icon::before { color: var(--color-ysd); } .miniBtn { - width: 64px; - height: 20px; + width: 72px; + height: 24px; background-color: var(--color-f40); - font-size: 12px; + font-size: 14px; border-radius: 99px; - line-height: 20px; + line-height: 24px; color: #fff; text-align: center; } diff --git a/pages/jobListSearch/index.wxml b/pages/jobListSearch/index.wxml index d13cb33..4da59d6 100644 --- a/pages/jobListSearch/index.wxml +++ b/pages/jobListSearch/index.wxml @@ -275,7 +275,7 @@ {{item.jobName}} {{item.aliasName}} - {{item.monthlyPay}}元/月 + {{item.salaryClassifyValue}} diff --git a/pages/type/type/index.wxml b/pages/type/type/index.wxml index b8f4540..0472beb 100644 --- a/pages/type/type/index.wxml +++ b/pages/type/type/index.wxml @@ -35,7 +35,7 @@ {{item.jobName || item.aliasName}} - {{item.monthlyPay}}元/月 + {{item.salaryClassifyValue}} diff --git a/project.private.config.json b/project.private.config.json index 699b89e..3fae5d0 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,7 +1,7 @@ { "setting": { "compileHotReLoad": true, - "urlCheck": false + "urlCheck": true }, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "projectname": "dandelionPlatform", diff --git a/utils/commonUtil.js b/utils/commonUtil.js index c99a451..96fa341 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -994,9 +994,10 @@ export function formatDateYMD(val) { /** * 根据薪资类型和薪资值获取薪资展示 */ -export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) { - var hourlyPay = moneyToFixed(salaryClassifyValue); - // console.log(hourlyPay); +export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue,monthlyPayStr) { + var hourlyPay = moneyToFixed(salaryClassifyValue); + console.log("=====1===="); + // console.log(salaryClassify); if (salaryClassify == 0) { return `${hourlyPay}元/时`; @@ -1013,7 +1014,7 @@ export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) { } else if (salaryClassify == 6) { return `面议`; } else if (salaryClassify == 7) { - return `月薪`; + return `${monthlyPayStr}元/月`; } else { // return '请配置薪资'; return "-"; @@ -1233,7 +1234,6 @@ export function disposeJobListData(recordList) { } item["age"] = ageStr; // console.log(item.salaryClassify,'=============', item.salaryClassifyValue); - item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue); // //时薪 // var hourlyPayStr = ''; // var hasHourlyPay = false; @@ -1273,7 +1273,9 @@ export function disposeJobListData(recordList) { } // console.log(monthlyPayStr); // } - item["monthlyPay"] = monthlyPayStr; + item["monthlyPay"] = monthlyPayStr; + item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue,monthlyPayStr); + // console.log('月薪月薪月薪月薪月薪月薪月薪月薪月薪',monthlyPayStr); //地址深圳丨龙岗区丨 let citys = setJobListInfoPosition(item.district || item.storeDistrict);