diff --git a/app.json b/app.json index 25d3b0d..40ed111 100644 --- a/app.json +++ b/app.json @@ -35,6 +35,7 @@ "pages/mine/myJob/index", "pages/mine/opinion/index", "pages/mine/opinionList/index", + "pages/mine/listManagement/index", "pages/mine/wxMoney/index", "pages/message/index", diff --git a/app.wxss b/app.wxss index 4770950..4a903a8 100644 --- a/app.wxss +++ b/app.wxss @@ -336,7 +336,9 @@ page { .pt0 { padding-top: 0px !important; } - +.pt16{ + padding-top: 16px; +} .pl20 { padding-left: 20px; } @@ -1177,8 +1179,8 @@ button::after { .mb18 { margin-bottom: 36rpx; } -.br8 { - border-radius: 8px; +.br4 { + border-radius: 4px; } .tc { text-align: center; @@ -1803,7 +1805,7 @@ button.loginOut { transform: translateY(-50%); background-color: #ddd; } -.weui-search-bar .icon-qingchu1 { +.weui-search-bar .icon-qingchu { position: absolute; top: 50%; right: 62px; @@ -1816,7 +1818,7 @@ button.loginOut { /* -webkit-mask-size: 16px; */ /* mask-size: 16px; */ } -.weui-search-bar .icon-qingchu1::before { +.weui-search-bar .icon-qingchu::before { color: rgba(0, 0, 0, 0.25); } .navigatortool { diff --git a/pages/index/index.js b/pages/index/index.js index a14d5e3..440110e 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -831,7 +831,7 @@ Page({ }, onLoad (options) { var that = this; - console.log(options); + // console.log('options+++++++++++++++++++++++++++++++++',options); console.log(wx.getSystemInfoSync()); // Array.prototype.logResult = function(){ // console.log('Array'); diff --git a/pages/index/index.wxml b/pages/index/index.wxml index a09617e..970bd87 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -10,7 +10,7 @@ {{inputVal}} - + 搜索 @@ -224,14 +224,14 @@ - + {{maxAge == minAge ? maxAge + '岁' : storeJobListSearchForm.ageRangeStr + (maxAge == 60 ? '+' : '')}} @@ -239,14 +239,14 @@ {{secondMenu}} - + {{item.name}} - + @@ -254,7 +254,7 @@ {{item.name}} - + diff --git a/pages/jobListSearch/index.js b/pages/jobListSearch/index.js index cd9f795..b567f57 100644 --- a/pages/jobListSearch/index.js +++ b/pages/jobListSearch/index.js @@ -1367,7 +1367,7 @@ Page({ }); console.log(that.data.storeJobListSearchForm); wx.request({ - url: app.globalData.ip + "/overall/store/job/list", + url: app.globalData.ip + "/assistant/custom/job/v2/list", method: "POST", header: app.globalData.headers, data: that.data.storeJobListSearchForm, diff --git a/pages/jobListSearch/index.wxml b/pages/jobListSearch/index.wxml index 2a16f1e..5e21e12 100644 --- a/pages/jobListSearch/index.wxml +++ b/pages/jobListSearch/index.wxml @@ -3,7 +3,7 @@ - + 搜索 diff --git a/pages/jobListSearch/index.wxss b/pages/jobListSearch/index.wxss index d775d9c..615c60f 100644 --- a/pages/jobListSearch/index.wxss +++ b/pages/jobListSearch/index.wxss @@ -30,11 +30,11 @@ page { .weui-search-bar.be { background-color: #ff4400; } -.weui-search-bar .icon-qingchu1 { +.weui-search-bar .icon-qingchu { position: absolute !important; z-index: 9999999; } -.weui-search-bar .icon-qingchu1::after { +.weui-search-bar .icon-qingchu::after { z-index: 9999; } .agencyRoleContainer { diff --git a/pages/mine/collect/index.wxml b/pages/mine/collect/index.wxml index 9c666a5..1f5de3f 100644 --- a/pages/mine/collect/index.wxml +++ b/pages/mine/collect/index.wxml @@ -21,7 +21,7 @@ {{inputVal}} - + 搜索 diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 75cd1e0..b932a56 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -61,6 +61,19 @@ + + + + + + + 职位管理 + + + + + + diff --git a/pages/mine/myJob/index.wxml b/pages/mine/myJob/index.wxml index 03487bc..45ae0fb 100644 --- a/pages/mine/myJob/index.wxml +++ b/pages/mine/myJob/index.wxml @@ -6,7 +6,7 @@ - + 搜索 diff --git a/project.private.config.json b/project.private.config.json index 6b245b5..c1cd18a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -8,6 +8,20 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/index/index", + "pathName": "pages/index/index", + "query": "name=测试", + "launchMode": "default", + "scene": null + }, + { + "name": "pages/mine/listManagement/index", + "pathName": "pages/mine/listManagement/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "实名认证", "pathName": "pages/realName1/index", diff --git a/utils/commonUtil.js b/utils/commonUtil.js index 2e876db..c99a451 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -1262,25 +1262,26 @@ export function disposeJobListData(recordList) { // if (hasHourlyPay) { if (isNotEmptyCheck(item.minMonthlyPay) && isNotEmptyCheck(item.maxMonthlyPay)) { if (item.minMonthlyPay == item.maxMonthlyPay) { - monthlyPayStr = item.minMonthlyPay; + monthlyPayStr = item.minMonthlyPay / 100; } else { - monthlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay; + monthlyPayStr = item.minMonthlyPay / 100 + "-" + item.maxMonthlyPay / 100; } } else if (isNotEmptyCheck(item.minMonthlyPay)) { - monthlyPayStr = item.minMonthlyPay; + monthlyPayStr = item.minMonthlyPay / 100; } else if (isNotEmptyCheck(item.maxMonthlyPay)) { - monthlyPayStr = item.maxMonthlyPay; + monthlyPayStr = item.maxMonthlyPay / 100; } // console.log(monthlyPayStr); // } item["monthlyPay"] = monthlyPayStr; + // console.log('月薪月薪月薪月薪月薪月薪月薪月薪月薪',monthlyPayStr); //地址深圳丨龙岗区丨 - let citys = setJobListInfoPosition(item.district); + let citys = setJobListInfoPosition(item.district || item.storeDistrict); // console.log(citys); var districtStr = ""; - if (isNotEmptyCheck(item.district)) { - var districtArr = item.district.split(","); + if (isNotEmptyCheck(item.district || item.storeDistrict)) { + var districtArr = item.district ? item.district.split(",") : item.storeDistrict.split(","); if (districtArr.length < 3) { districtStr = districtArr[districtArr.length - 1]; } else {