diff --git a/app.js b/app.js index a97f3c1..4f30300 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,8 @@ App({ globalData: { userInfo: null, - ip: 'https://test.renminshitang.com.cn/daotian/api_dev', - // ip: "https://daotian.matripe.com.cn", + // ip: 'https://test.renminshitang.com.cn/daotian/api_dev', + ip: "https://daotian.matripe.com.cn", // ip: 'http://localhost:8001', sessionId: "", header: { diff --git a/pages/city/index.js b/pages/city/index.js index 61c4484..93bfa40 100644 --- a/pages/city/index.js +++ b/pages/city/index.js @@ -283,7 +283,8 @@ Page({ that.clearAllChecked(); that.data.selectedQuanGuo.checked = true; - temp = that.data.selectedQuanGuo; + // temp = that.data.selectedQuanGuo; + temp = that.data.selectedQuanGuo; } else if (that.data.selectedCity.checked) { that.clearAllChecked(); that.data.selectedCity.checked = true; diff --git a/pages/detail/index.js b/pages/detail/index.js index c8e7dc6..1707804 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1120,7 +1120,7 @@ Page({ //时薪 // var hourlyPayStr = ""; var hasHourlyPay = true; - console.log(jobDetail); + // console.log(jobDetail); // if (app.isNotEmptyCheck(jobDetail.hourlyPay)) { // hourlyPayStr = jobDetail.hourlyPay + "元/小时"; // hasHourlyPay = true; diff --git a/pages/index/index.js b/pages/index/index.js index 80498af..d4066dd 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1062,6 +1062,10 @@ Page({ this.setData({ copyList: JSON.parse(JSON.stringify(this.data.filterData)), }); + that.setData({ + recordList: [], + }); + that.getJobList(); // that.getJobList(); }, onReady () { @@ -1509,10 +1513,10 @@ Page({ } wx.removeStorageSync("FROMCITY"); } else { - that.setData({ - recordList: [], - }); - that.getJobList(); + // that.setData({ + // recordList: [], + // }); + // that.getJobList(); } if (typeof this.getTabBar === "function" && this.getTabBar()) { this.getTabBar().setData({ @@ -1781,7 +1785,9 @@ Page({ console.log(that.data.inputVal); that.data.storeJobListSearchForm.cityName = that.data.searchCityParamStorage.name; - if (app.isEmptyCheck(that.data.searchCityParamStorage.name)) { + console.log(that.data.storeJobListSearchForm.cityName) + + if (app.isEmptyCheck(that.data.searchCityParamStorage.name) || that.data.storeJobListSearchForm.cityName == '全国') { that.data.storeJobListSearchForm.cityName = ""; } that.data.storeJobListSearchForm.keys = that.data.inputVal == "搜索职位" ? "" : that.data.inputVal; @@ -1841,7 +1847,7 @@ Page({ that.getTag(); that.data.recordList.forEach((item, index) => { - console.log(item.storeDistrict); + // console.log(item.storeDistrict); item['citys'] = commonUtil.setJobInfoPosition(item.storeDistrict) // console.log(item); if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") { diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 73eb1b2..26a8718 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -62,7 +62,8 @@ - + diff --git a/pages/mine/listManagement/index.js b/pages/mine/listManagement/index.js index c196bbb..1f7d2ab 100644 --- a/pages/mine/listManagement/index.js +++ b/pages/mine/listManagement/index.js @@ -13,10 +13,16 @@ Page({ inputVal: '', hasMoreData: true, //下拉是否还有更多数据 navigatorBarHeight: 0, // 头部整体高度信息 + // editJobList: [ + // "复制内容", + // "编辑", + // "删除" + // ], editJobList: [ "复制内容", - "编辑", "删除"], - + // "编辑", + "删除" + ], totalPage: 0, currPage: 0, isTrigger: 0, @@ -84,12 +90,14 @@ Page({ if (res.tapIndex == 0) { that.getJobDetail(item.id); - } else if (res.tapIndex == 1) { + } + //else if (res.tapIndex == 1) { // uni.navigateTo({ // url: "/root/home/jobForm?id=" + e.jobId, // }); // that.delJob(item.id); - } else if (res.tapIndex == 2) { + //} + else if (res.tapIndex == 1) { that.delJob(item.id); } }, diff --git a/pages/mine/listManagement/index.wxml b/pages/mine/listManagement/index.wxml index 29183a9..a63661c 100644 --- a/pages/mine/listManagement/index.wxml +++ b/pages/mine/listManagement/index.wxml @@ -2,7 +2,7 @@ - + 搜索 diff --git a/utils/commonUtil.js b/utils/commonUtil.js index f1e04ef..fc06250 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -996,8 +996,6 @@ export function formatDateYMD(val) { */ export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue,monthlyPayStr) { var hourlyPay = moneyToFixed(salaryClassifyValue); - console.log("=====1===="); - // console.log(salaryClassify); if (salaryClassify == 0) { return `${hourlyPay}元/时`; @@ -1272,7 +1270,7 @@ export function disposeJobListData(recordList) { } else if (isNotEmptyCheck(item.maxMonthlyPay)) { monthlyPayStr = item.maxMonthlyPay / 100; } - console.log(monthlyPayStr); + // console.log(monthlyPayStr); // } item["monthlyPay"] = monthlyPayStr; item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue,monthlyPayStr);