diff --git a/app.wxss b/app.wxss index 9e3842c..4770950 100644 --- a/app.wxss +++ b/app.wxss @@ -1751,7 +1751,7 @@ button.loginOut { } .weui-search-bar__form .icon-sousuo { position: absolute; - left: 14px; + left: 8px; width: 16px; top: 1px; height: 16px; diff --git a/pages/detail/index.js b/pages/detail/index.js index c0126d5..5d8da4a 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -374,17 +374,42 @@ Page({ } }, toMapChoice(e) { - var that = this; - console.log(e); - try { - wx.setStorageSync("onSiteRemark", that.data.onSiteRemark); - wx.setStorageSync("addressList", e.currentTarget.dataset.address); - } catch (error) { - console.log(error); - } - wx.navigateTo({ - url: "../mine/addressPage/index", - }); + var that = this; + console.log(e.currentTarget.dataset.address); + var address = e.currentTarget.dataset.address + + wx.getLocation({ + type: 'gcj02', //返回可以用于wx.openLocation的经纬度 + success (res) { + console.log(res) + wx.openLocation({ + latitude: Number(address.storeLat), + longitude: Number(address.storeLng), + name: address.storeName, + address: address.storeAddr, + scale: 15, + success (res) { + console.log(res) + }, + fail (res) { + console.log(res) + } + }); + }, + fail(res){ + console.log(res); + } + }) + // console.log(e); + // try { + // wx.setStorageSync("onSiteRemark", that.data.onSiteRemark); + // wx.setStorageSync("addressList", e.currentTarget.dataset.address); + // } catch (error) { + // console.log(error); + // } + // wx.navigateTo({ + // url: "../mine/addressPage/index", + // }); }, // openMap(e) { // wx.showLoading({ @@ -696,7 +721,7 @@ Page({ roundRect1(ctx, 24 * 2, baseTop - 100, 1104, roundRectHeight, 32, "#fff"); console.log(that.data.jobDetail.store); - that.data.jobDetail.storeJob.jobSpecialLabelNames.forEach((item1, index) => { + that.data.jobDetail.jobSpecialLabelNames.forEach((item1, index) => { // console.log(item1); // console.log(ctx.measureText(item1).width); if (index <= 2) { @@ -710,10 +735,10 @@ Page({ fillTextLineBreak(ctx, that.data.jobDetail.store.aliasName, logoLeft, baseTop, 500 * 2, 20, "#333", titleSize, "600"); // 岗位标题 console.log(630); - fillTextLineBreak(ctx, that.data.jobDetail.storeJob.hourlyPay, salaryClassifyValueLeft, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", titleSize, "600"); // 时薪 - fillTextLineBreak(ctx, that.data.jobDetail.storeJob.monthlyPay, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.storeJob.monthlyPay).width, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资 + fillTextLineBreak(ctx, that.data.jobDetail.hourlyPay, salaryClassifyValueLeft, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", titleSize, "600"); // 时薪 + fillTextLineBreak(ctx, that.data.jobDetail.monthlyPay, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.monthlyPay).width, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资 fillTextLineBreak(ctx, that.data.jobDetail.store.districtStr + "丨", salaryClassifyValueLeft, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄 - fillTextLineBreak(ctx, that.data.jobDetail.storeJob.age, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.store.districtStr + "丨").width, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄 + fillTextLineBreak(ctx, that.data.jobDetail.age, salaryClassifyValueLeft + ctx.measureText(that.data.jobDetail.store.districtStr + "丨").width, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄 // let src // src = that.data.jobDetail.store.logo.indexOf("https") > -1 ? that.data.jobDetail.store.logo : that.data.jobDetail.store.logo.replace("http", "https") console.log(that.data.jobDetail.store.logo); @@ -828,34 +853,35 @@ Page({ }); wx.request({ // url: app.globalData.ip + "/store/job/getStoreJobDetailById?storeJobId=" + that.data.searchForm.storeJobId, - url: app.globalData.ip + "/overall/store/job/getStoreJobDetailById?storeJobId=" + that.data.searchForm.storeJobId, - method: "POST", + url: app.globalData.ip + "/yishoudan/custom/job/detailApp/" + that.data.searchForm.storeJobId, + method: "get", header: app.globalData.headers, - data: that.data.searchForm, success: function (res) { console.log(res); if (res.data.status == 200) { - var result = res.data.data; - var title = result.storeJob.jobName; + var result = {}; + result = res.data.data.record; + var title = result.jobName; // var title1 = result.store.aliasName; // that.data.logo2 // wx.setStorageSync({ // key: "onSiteRemark", - // data: result.storeJob.onSiteRemark, + // data: result.onSiteRemark, // }) - - that.setData({ - shareTitle: title, - onSiteRemark: result.storeJob.onSiteRemark, - }); - let regs = /\.(jpg|jpeg|png)(\?.*)?$/; - res.data.data.storeImage.forEach((item) => { + res.data.data.images.forEach((item) => { item.isImg = regs.test(item.url.toLowerCase()); }); - result.storeJob.genderRestrict = commonUtil.getGenderByMinAge(result.storeJob); + result.genderRestrict = commonUtil.getGenderByMinAge(result); + that.setData({ + shareTitle: title, + images:res.data.data.images, + onSiteRemark: result.onSiteRemark, + }); + + if (app.isNotEmptyCheck(title)) { - title = result.storeJob.jobName; + title = result.jobName; } else { title = result.store.aliasName; } @@ -864,45 +890,45 @@ Page({ title, }); - result.storeJob.workType = commonUtil.getWorkTypeById(result.storeJob.workTypeMulti); + result.workType = commonUtil.getWorkTypeById(result.workTypeMulti); - if (app.isNotEmptyCheck(result.storeJob.calculationSalaryType)) { - result.storeJob.calculationSalaryType = result.storeJob.calculationSalaryType.split("#")[0]; + if (app.isNotEmptyCheck(result.calculationSalaryType)) { + result.calculationSalaryType = result.calculationSalaryType.split("#")[0]; } - if (app.isNotEmptyCheck(result.storeJob.jobDesp)) { - result.storeJob.jobDesp = result.storeJob.jobDesp.replaceAll("*****", "").split("————————")[0]; - result.storeJob["jobDesp1"] = result.storeJob.jobDesp.replace("⚠", ""); - result.storeJob["jobDesp1"] = result.storeJob.jobDesp1.replace("[红包]", ""); + if (app.isNotEmptyCheck(result.jobDesp)) { + result.jobDesp = result.jobDesp.replaceAll("*****", "").split("————————")[0]; + result["jobDesp1"] = result.jobDesp.replace("⚠", ""); + result["jobDesp1"] = result.jobDesp1.replace("[红包]", ""); } - if (app.isNotEmptyCheck(result.storeJob.paymentSalaryType)) { - result.storeJob.paymentSalaryType = result.storeJob.paymentSalaryType.split("，"); + if (app.isNotEmptyCheck(result.paymentSalaryType)) { + result.paymentSalaryType = result.paymentSalaryType.split("，"); } - if (app.isNotEmptyCheck(result.storeJob.salaryDesp)) { - result.storeJob.salaryDesp = result.storeJob.salaryDesp.split("；"); + if (app.isNotEmptyCheck(result.salaryDesp)) { + result.salaryDesp = result.salaryDesp.split("；"); } - if (app.isNotEmptyCheck(result.storeJob.workDurationDesp)) { - result.storeJob.workDurationDesp = result.storeJob.workDurationDesp.split("；"); + if (app.isNotEmptyCheck(result.workDurationDesp)) { + result.workDurationDesp = result.workDurationDesp.split("；"); } - if (app.isNotEmptyCheck(result.storeJob.probationDesp)) { - result.storeJob.probationDesp = result.storeJob.probationDesp.split("；"); + if (app.isNotEmptyCheck(result.probationDesp)) { + result.probationDesp = result.probationDesp.split("；"); } - if (app.isNotEmptyCheck(result.storeJob.workingLunchDesp)) { - result.storeJob.workingLunchDesp = result.storeJob.workingLunchDesp.split("；"); + if (app.isNotEmptyCheck(result.workingLunchDesp)) { + result.workingLunchDesp = result.workingLunchDesp.split("；"); } - if (app.isNotEmptyCheck(result.storeJob.dormitoryDesp)) { - result.storeJob.dormitoryDesp = result.storeJob.dormitoryDesp.split("；"); + if (app.isNotEmptyCheck(result.dormitoryDesp)) { + result.dormitoryDesp = result.dormitoryDesp.split("；"); } - if (app.isNotEmptyCheck(result.storeJob.foregift)) { - result.storeJob.foregift = result.storeJob.foregift.split("；"); + if (app.isNotEmptyCheck(result.foregift)) { + result.foregift = result.foregift.split("；"); var arrTemp = []; - result.storeJob.foregift.forEach((item) => { + result.foregift.forEach((item) => { var arr = item.split("，"); if (app.length > 0) { @@ -912,15 +938,15 @@ Page({ }); } }); - result.storeJob.foregift = arrTemp; + result.foregift = arrTemp; } else { - result.storeJob.foregift = "无押金"; + result.foregift = "无押金"; } - result.store.distance = commonUtil.getDistanceName(result.store.distance); - if (app.isNotEmptyCheck(result.store.distance)) { - result.store.distance = "丨" + result.store.distance; - } + // result.store.distance = commonUtil.getDistanceName(result.store.distance); + // if (app.isNotEmptyCheck(result.store.distance)) { + // result.store.distance = "丨" + result.store.distance; + // } /*if (app.isNotEmptyCheck(result.store.district)) { var tempArr = result.store.district.split(","); @@ -936,22 +962,22 @@ Page({ // getStoreAddress that.disposeJobListData(result); - if (app.isNotEmptyCheck(result.store.logo)) { - result["logo2"] = result.store.logo.replace("http:", "https:"); - result.store.logo.indexOf("https") > -1 ? result.store.logo : result.store.logo.replace("http", "https") - } else { - result["logo2"] = ""; - } - // console.log(commonUtil.getReturnFeeTypeName1ById(result.storeJob.returnFeeType, result.storeJob.returnFee)); + // if (app.isNotEmptyCheck(result.store.logo)) { + // result["logo2"] = result.store.logo.replace("http:", "https:"); + // result.store.logo.indexOf("https") > -1 ? result.store.logo : result.store.logo.replace("http", "https") + // } else { + // result["logo2"] = ""; + // } + // console.log(commonUtil.getReturnFeeTypeName1ById(result.returnFeeType, result.returnFee)); console.log("isout"); - if (app.isNotEmptyCheck(result.storeJob.returnFeeType) || result.storeJob.returnFeeType == "0" || result.storeJob.returnFee == "0") { + if (app.isNotEmptyCheck(result.returnFeeType) || result.returnFeeType == "0" || result.returnFee == "0") { that.setData({ - fuWuFei: commonUtil.getReturnFeeTypeName1ById(result.storeJob.returnFeeType, result.storeJob.returnFee), + fuWuFei: commonUtil.getReturnFeeTypeName1ById(result.returnFeeType, result.returnFee), }); } - // else if (result.storeJob.returnFeeType == 7) { + // else if (result.returnFeeType == 7) { // that.setData({ - // fuWuFei: commonUtil.getReturnFeeTypeNameById(result.storeJob.returnFeeType), + // fuWuFei: commonUtil.getReturnFeeTypeNameById(result.returnFeeType), // }); // } else { @@ -962,33 +988,33 @@ Page({ console.log(result); console.log(commonUtil); - let citys = commonUtil.setJobInfoPosition(result.store.district); - // city = city.replace(/,/g, " | ") - result.storeImage.splice(0,1) - + let citys = commonUtil.setJobInfoPosition(result.storeDistrict); + // result.storeImage.splice(0,1) + that.data.jobDetail["storeName"] = result.storeName; + that.data.jobDetail["notes"] = result.jobInfo; that.setData({ jobDetail: result, - isMaskShow: !(result.storeJob.recruitment == "1"), + isMaskShow: !(result.recruitment == "1"), citys: citys || "-", - addressNew: result.store.district.replace(/,/g, "") + result.store.detailPosition, + // addressNew: result.store.district.replace(/,/g, "") + result.store.detailPosition, }); - that.data.jobDetail.storeJob["storeName"] = that.data.jobDetail.store.storeName; + that.showSexAge(); // that.getAgencyInfo(res.data.data.storeJob); - if (app.isEmptyCheck(res.data.data.storeJob.handoverInfo)) { - that.setData({ - djxx: "暂无对接信息", - }); - } else { - that.setData({ - djxx: res.data.data.storeJob.handoverInfo, - }); - } + // if (app.isEmptyCheck(res.data.data.storeJob.handoverInfo)) { + // that.setData({ + // djxx: "暂无对接信息", + // }); + // } else { + // that.setData({ + // djxx: res.data.data.storeJob.handoverInfo, + // }); + // } console.log(that.data.jobDetail); } wx.hideLoading(); @@ -1001,25 +1027,25 @@ Page({ var manStr = ""; var womanStr = ""; - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeMan) || app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeMan)) { + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeMan) || app.isNotEmptyCheck(that.data.jobDetail.maxAgeMan)) { manStr = "男 "; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeMan)) { - manStr = manStr + that.data.jobDetail.storeJob.minAgeMan; + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeMan)) { + manStr = manStr + that.data.jobDetail.minAgeMan; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeMan)) { - manStr = manStr + "-" + that.data.jobDetail.storeJob.maxAgeMan; + if (app.isNotEmptyCheck(that.data.jobDetail.maxAgeMan)) { + manStr = manStr + "-" + that.data.jobDetail.maxAgeMan; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeWoman) || app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeWoman)) { + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeWoman) || app.isNotEmptyCheck(that.data.jobDetail.maxAgeWoman)) { womanStr = "女 "; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.minAgeWoman)) { - womanStr = womanStr + that.data.jobDetail.storeJob.minAgeWoman; + if (app.isNotEmptyCheck(that.data.jobDetail.minAgeWoman)) { + womanStr = womanStr + that.data.jobDetail.minAgeWoman; } - if (app.isNotEmptyCheck(that.data.jobDetail.storeJob.maxAgeWoman)) { - womanStr = womanStr + "-" + that.data.jobDetail.storeJob.maxAgeWoman; + if (app.isNotEmptyCheck(that.data.jobDetail.maxAgeWoman)) { + womanStr = womanStr + "-" + that.data.jobDetail.maxAgeWoman; } if (womanStr != "") { @@ -1035,7 +1061,7 @@ Page({ */ disposeJobListData(jobDetail) { var that = this; - + console.log(jobDetail); // item["workType"] = commonUtil.getWorkTypeById( // item.workTypeMulti // ); @@ -1047,80 +1073,77 @@ Page({ // } //年龄 var ageStr = ""; - if (app.isNotEmptyCheck(jobDetail.storeJob.minAge) && app.isNotEmptyCheck(jobDetail.storeJob.maxAge)) { - ageStr = jobDetail.storeJob.minAge + "-" + jobDetail.storeJob.maxAge + "岁"; - } else if (app.isNotEmptyCheck(jobDetail.storeJob.minAge)) { - ageStr = jobDetail.storeJob.minAge + "岁以上"; - } else if (app.isNotEmptyCheck(jobDetail.storeJob.maxAge)) { - ageStr = jobDetail.storeJob.maxAge + "岁以下"; + if (app.isNotEmptyCheck(jobDetail.minAge) && app.isNotEmptyCheck(jobDetail.maxAge)) { + ageStr = jobDetail.minAge + "-" + jobDetail.maxAge + "岁"; + } else if (app.isNotEmptyCheck(jobDetail.minAge)) { + ageStr = jobDetail.minAge + "岁以上"; + } else if (app.isNotEmptyCheck(jobDetail.maxAge)) { + ageStr = jobDetail.maxAge + "岁以下"; } - jobDetail.storeJob["age"] = ageStr; + jobDetail["age"] = ageStr; //时薪 // var hourlyPayStr = ""; var hasHourlyPay = true; - console.log(jobDetail.storeJob); - // if (app.isNotEmptyCheck(jobDetail.storeJob.hourlyPay)) { - // hourlyPayStr = jobDetail.storeJob.hourlyPay + "元/小时"; + console.log(jobDetail); + // if (app.isNotEmptyCheck(jobDetail.hourlyPay)) { + // hourlyPayStr = jobDetail.hourlyPay + "元/小时"; // hasHourlyPay = true; - // } else if (app.isNotEmptyCheck(jobDetail.storeJob.dayPay)) { - // hourlyPayStr = jobDetail.storeJob.dayPay + "元/日"; + // } else if (app.isNotEmptyCheck(jobDetail.dayPay)) { + // hourlyPayStr = jobDetail.dayPay + "元/日"; // hasHourlyPay = true; // } else { - // if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - // if (jobDetail.storeJob.minMonthlyPay == jobDetail.storeJob.maxMonthlyPay) { - // hourlyPayStr = jobDetail.storeJob.minMonthlyPay; + // if (app.isNotEmptyCheck(jobDetail.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + // if (jobDetail.minMonthlyPay == jobDetail.maxMonthlyPay) { + // hourlyPayStr = jobDetail.minMonthlyPay; // } else { - // hourlyPayStr = jobDetail.storeJob.minMonthlyPay + "-" + jobDetail.storeJob.maxMonthlyPay; + // hourlyPayStr = jobDetail.minMonthlyPay + "-" + jobDetail.maxMonthlyPay; // } - // } else if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay)) { - // hourlyPayStr = jobDetail.storeJob.minMonthlyPay; - // } else if (app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - // hourlyPayStr = jobDetail.storeJob.maxMonthlyPay; + // } else if (app.isNotEmptyCheck(jobDetail.minMonthlyPay)) { + // hourlyPayStr = jobDetail.minMonthlyPay; + // } else if (app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + // hourlyPayStr = jobDetail.maxMonthlyPay; // } // } - // if (app.isNotEmptyCheck(jobDetail.storeJob.dayPay)){ + // if (app.isNotEmptyCheck(jobDetail.dayPay)){ // } - // if (app.isNotEmptyCheck(jobDetail.storeJob.salaryClassify) && app.isNotEmptyCheck(jobDetail.storeJob.salaryClassifyValue)) { + // if (app.isNotEmptyCheck(jobDetail.salaryClassify) && app.isNotEmptyCheck(jobDetail.salaryClassifyValue)) { - jobDetail.storeJob["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.storeJob.salaryClassify, jobDetail.storeJob.salaryClassifyValue); + jobDetail["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue); // } //月薪 var monthlyPayStr = ""; if (hasHourlyPay) { - if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - if (jobDetail.storeJob.minMonthlyPay == jobDetail.storeJob.maxMonthlyPay) { - monthlyPayStr = jobDetail.storeJob.minMonthlyPay; + if (app.isNotEmptyCheck(jobDetail.minMonthlyPay) && app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + if (jobDetail.minMonthlyPay == jobDetail.maxMonthlyPay) { + monthlyPayStr = jobDetail.minMonthlyPay/100; } else { - monthlyPayStr = jobDetail.storeJob.minMonthlyPay + "-" + jobDetail.storeJob.maxMonthlyPay; + monthlyPayStr = jobDetail.minMonthlyPay/100 + "-" + jobDetail.maxMonthlyPay/100; } - } else if (app.isNotEmptyCheck(jobDetail.storeJob.minMonthlyPay)) { - monthlyPayStr = jobDetail.storeJob.minMonthlyPay; - } else if (app.isNotEmptyCheck(jobDetail.storeJob.maxMonthlyPay)) { - monthlyPayStr = jobDetail.storeJob.maxMonthlyPay; + } else if (app.isNotEmptyCheck(jobDetail.minMonthlyPay)) { + monthlyPayStr = jobDetail.minMonthlyPay/100; + } else if (app.isNotEmptyCheck(jobDetail.maxMonthlyPay)) { + monthlyPayStr = jobDetail.maxMonthlyPay/100; } } - jobDetail.storeJob["monthlyPay"] = monthlyPayStr; + jobDetail["monthlyPay"] = monthlyPayStr; //地址深圳丨龙岗区丨 - var districtStr = ""; - if (app.isNotEmptyCheck(jobDetail.store.district)) { - var districtArr = jobDetail.store.district.split(","); - if (districtArr.length < 3) { - districtStr = districtArr[districtArr.length - 1]; - } else { - districtStr = districtArr[1] + "丨" + districtArr[2]; - } - //districtStr = districtArr[1] + '丨' + districtArr[2]; - } - jobDetail.store["districtStr"] = districtStr; - jobDetail.storeJob["districtDetail"] = commonUtil.getStoreAddress(jobDetail.storeJob.district, jobDetail.storeJob.detailPosition); + // var districtStr = ""; + // if (app.isNotEmptyCheck(jobDetail.store.district)) { + // var districtArr = jobDetail.store.district.split(","); + // if (districtArr.length < 3) { + // districtStr = districtArr[districtArr.length - 1]; + // } else { + // districtStr = districtArr[1] + "丨" + districtArr[2]; + // } + // } + // jobDetail.store["districtStr"] = districtStr; + // jobDetail["districtDetail"] = commonUtil.getStoreAddress(jobDetail.district, jobDetail.detailPosition); //职位特色 - if (app.isNotEmptyCheck(jobDetail.storeJob.jobSpecialLabelNames)) { - jobDetail.storeJob["jobSpecialLabelNames"] = that.getJobSpecialLabelNamesArray(jobDetail.storeJob.jobSpecialLabelNames); + if (app.isNotEmptyCheck(jobDetail.jobSpecialLabelNames)) { + jobDetail["jobSpecialLabelNames"] = that.getJobSpecialLabelNamesArray(jobDetail.jobSpecialLabelNames); } - // if (app.isNotEmptyCheck(jobDetail.storeJob.jobRequestLabelNames)) { - // jobDetail.storeJob['jobRequestLabelNames'] = that.getJobRequestLabelNamesArray(jobDetail.storeJob.jobRequestLabelNames); - // } + }, getJobSpecialLabelNamesArray(jobSpecialLabelNames) { if (app.isNotEmptyCheck(jobSpecialLabelNames)) { @@ -1139,10 +1162,10 @@ Page({ var that = this; console.log(that.data.jobDetail); - console.log(that.data.jobDetail.storeJob.jobLabelId); + console.log(that.data.jobDetail.jobLabelId); wx.navigateTo({ - url: "../similar/index?brandId=" + that.data.jobDetail.store.brandId + "&jobLabelId=" + that.data.jobDetail.storeJob.jobLabelId + "&classify=99", + url: "../similar/index?brandId=" + that.data.jobDetail.store.brandId + "&jobLabelId=" + that.data.jobDetail.jobLabelId + "&classify=99", }); }, @@ -1244,7 +1267,7 @@ Page({ let that = this; let argument; - argument = JSON.stringify(that.data.jobDetail.storeJob).replace(/\=|\&/g, "3D"); + argument = JSON.stringify(that.data.jobDetail).replace(/\=|\&/g, "3D"); if (!this.data.isLogin) { wx.setStorageSync("comeFromPage", "detailBaoming"); @@ -1281,12 +1304,12 @@ Page({ var that = this; console.log(e); console.log(e.detail.errMsg); - console.log(that.data.jobDetail.storeJob); + console.log(that.data.jobDetail); /*wx.setStorageSync({ key: "jobDetailStorage", - data: that.data.jobDetail.storeJob, + data: that.data.jobDetail, });*/ - wx.setStorageSync("jobDetailStorage", that.data.jobDetail.storeJob); + wx.setStorageSync("jobDetailStorage", that.data.jobDetail); // console.log(e); // console.log(e.detail.errMsg) console.log(e.detail.iv); @@ -1327,7 +1350,7 @@ Page({ });*/ promise.then((res) => { let argument; - argument = JSON.stringify(that.data.jobDetail.storeJob).replace(/\=|\&/g, "3D"); + argument = JSON.stringify(that.data.jobDetail).replace(/\=|\&/g, "3D"); wx.navigateTo({ url: `../newEnroll/enroll/index?applyType=1&info=${argument}`, }); @@ -1380,7 +1403,7 @@ Page({ } else { promise.then((res) => { let argument; - argument = JSON.stringify(that.data.jobDetail.storeJob).replace(/\=|\&/g, "3D"); + argument = JSON.stringify(that.data.jobDetail).replace(/\=|\&/g, "3D"); wx.navigateTo({ url: `../newEnroll/enroll/index?applyType=1&info=${argument}`, }); @@ -1504,11 +1527,11 @@ Page({ var txt; if (collected - 1 == 0) { //取消收藏 - that.data.jobDetail.storeJob.collected = 2; + that.data.jobDetail.collected = 2; txt = "取消收藏"; } else { //收藏 - that.data.jobDetail.storeJob.collected = 1; + that.data.jobDetail.collected = 1; txt = "收藏成功"; } diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 61ab69c..4853986 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -4,7 +4,7 @@ - {{jobDetail.storeJob.jobName}} + {{jobDetail.jobName}} @@ -21,33 +21,33 @@ - {{jobDetail.storeJob.genderRestrict}} - 丨{{jobDetail.storeJob.age}} - + {{jobDetail.genderRestrict}} + 丨{{jobDetail.age}} + - - {{jobDetail.storeJob.hourlyPay || '--'}} + + {{jobDetail.hourlyPay || '--'}} - {{jobDetail.storeJob.monthlyPay || '--'}} + {{jobDetail.monthlyPay || '--'}} - - {{item1}} + {{item1}} - {{item1}} + {{item1}} @@ -55,36 +55,27 @@ - {{jobDetail.poses.store.posContent ? jobDetail.poses.store.posContent :'暂无地址信息'}} + {{jobDetail.storeAddr ? jobDetail.storeAddr :'暂无地址信息'}} - - - - - - + + + + - - - + 职位描述 - 70%长白班， - 夫妻房满月报销 - 体检费满月可报销路费男 16-53；女 16-49， - (卡年卡月)无文化要求，不识字也可以，需要身 - 份证原件，可接收身份证临时，消磁，纹身烟疤需提前确认，不接收案底，不接收 - 黑户，维族、藏族和新疆的少数民族名额已满，其他少数民族继续接收薪资待遇：员工同工同酬，计件工资+工龄工资+全勤奖+岗位津贴+高温补贴等，月综合工资5000-7000元，月出勤28天 + {{jobDetail.jobInfo}} @@ -96,73 +87,73 @@ 面试时间 - {{jobDetail.storeJob.interviewDuration}} + {{jobDetail.interviewDuration}} 出行方式 - {{jobDetail.storeJob.tripMode}} + {{jobDetail.tripMode}} 面试说明 - {{jobDetail.storeJob.interviewDesp}} + {{jobDetail.interviewDesp}} 入离职 入职说明 - {{jobDetail.storeJob.entryDesp}} + {{jobDetail.entryDesp}} 入职说明 - {{jobDetail.storeJob.leaveRequire}} + {{jobDetail.leaveRequire}} 返厂 - {{jobDetail.storeJob.leaveDesp}} + {{jobDetail.leaveDesp}} 报名须知 - {{jobDetail.storeJob.agencyStatement}} + {{jobDetail.agencyStatement}} @@ -170,7 +161,7 @@ 服务费详情 - {{jobDetail.storeJob.agencyProfit}} + {{jobDetail.agencyProfit}} 扣税说明 - {{jobDetail.storeJob.deductTaxDesp}} + {{jobDetail.deductTaxDesp}} 账单日 (出名单时间) - {{jobDetail.storeJob.outListTime}} + {{jobDetail.outListTime}} 结算日 (结算时间) - {{jobDetail.storeJob.settlementTime}} + {{jobDetail.settlementTime}} 仅代理可见 - + 复制 - + {{userInfo.agencyStatus == 1 ? (userInfo.noticeEndStr ? userInfo.noticeEndStr : ('详情咨询：' + userInfo.tel)) : ('详情咨询：' + serviceInfo.aliasName + (serviceInfo.workPhone || '-'))}} 以上联系人，可以 @@ -231,15 +222,15 @@ - + - \ No newline at end of file + + \ No newline at end of file diff --git a/pages/newEnroll/enroll/index.js b/pages/newEnroll/enroll/index.js index 6341731..35d5c59 100644 --- a/pages/newEnroll/enroll/index.js +++ b/pages/newEnroll/enroll/index.js @@ -796,7 +796,7 @@ Page({ // } paramData["agencyId"] = '3087'; - paramData["storeJobId"] = jobInfo.storeJobId; + paramData["jobId"] = jobInfo.storeJobId; paramData["policy"] = jobInfo.policy; paramData["interviewTime"] = jobInfo.currentTime; paramData["receptionTime"] = jobInfo.currentTime2; @@ -814,7 +814,7 @@ Page({ }).then((paramData) => { console.log(paramData); wx.request({ - url: app.globalData.ip + "/user/apply/order/addByAgency", + url: app.globalData.ip + "/yishoudan/common/order/add", header: app.globalData.headers, data: paramData, method: "POST", diff --git a/pages/newEnroll/enroll/index.wxml b/pages/newEnroll/enroll/index.wxml index 1fea86a..06a1019 100644 --- a/pages/newEnroll/enroll/index.wxml +++ b/pages/newEnroll/enroll/index.wxml @@ -164,7 +164,7 @@ - +