diff --git a/root/detail/job.vue b/root/detail/job.vue index a6eb1c3..b211860 100644 --- a/root/detail/job.vue +++ b/root/detail/job.vue @@ -7,7 +7,7 @@
- +
项目方 @@ -31,7 +31,7 @@ - +
{{ jobDetail.jobName }} @@ -556,7 +556,8 @@ export default { let that = this; let path; console.log("that.loginInfo", that.loginInfo); - path = `/root/detail/job?scene=id=${that.jobDetail.id}_${that.loginInfo.user.id}_${1}`; + // 职位id_职位项目方_分享人_分享人团队 + path = `/root/detail/job?scene=id=${that.jobDetail.id}_${that.jobDetail.agencyId}_${that.shareUserId || that.loginInfo.user.id}_${that.sharreUserAgencyId || that.loginInfo.agencyId}`; return { promise: new Promise((resolve, reject) => { uni.showLoading({ @@ -586,8 +587,10 @@ export default { globalData: getApp().globalData, videoContextTemp: {}, isSharePage: false, // 是否是分享页面的判断 - + isFans: false, shareUserId: null, // 分享人id + shareJobAgencyId: null, // 分享人id + shareUserAgencyId: null, // 分享人id corpUserFlag: false, agreeRadio: ["agree"], isPerson: false, @@ -675,25 +678,30 @@ export default { }, onLoad(options) { console.log("详情", options); + if (options.id) { this.uid = options.id; } else if (options.scene) { var sceneStr = decodeURIComponent(options.scene); var sceneJson = this.G.sceneToJson(sceneStr); console.log("sceneJson===", sceneJson); + // 职位id_职位项目方_分享人_分享人团队 this.uid = sceneJson.id.split("_")[0]; //职位id - this.shareUserId = sceneJson.id.split("_")[1]; //分享人id + this.shareJobAgencyId = sceneJson.id.split("_")[1]; //职位项目方id + this.shareUserId = sceneJson.id.split("_")[2]; //分享人id + this.shareUserAgencyId = sceneJson.id.split("_")[3]; //分享人团队id this.isSharePage = true; - this.checkIsFans(this.shareUserId); } this.from = options.from || "home"; if (!uni.getStorageSync("apply-token")) { console.log("apply-token"); - uni.navigateTo({ + uni.reLaunch({ url: "/root/person/loginIndex?type=detail&path=/root/detail/job&scene=" + options.scene, }); return; } + this.shareJobAgencyId && this.checkIsFans(this.shareJobAgencyId); + this.loginInfo = uni.getStorageSync("apply-userinfo"); // if (uni.getStorageSync("apply-AGENCY_MAMBER_LIST")) { // this.applyList = uni.getStorageSync("apply-AGENCY_MAMBER_LIST"); @@ -749,7 +757,9 @@ export default { num1++; } }); - this.toKnowInfo(res.agencyId); + that.speed = 1; + that.attention = true; + // this.toKnowInfo(res.agencyId); }); } uni.getSystemInfo({ @@ -968,8 +978,9 @@ export default { if (!this.attention) { return false; } + // 处理isfans字段传 1是 或 0不是 uni.navigateTo({ - url: "/root/home/quickApplication?jobId=" + this.jobDetail.id + "&jobName=" + this.jobDetail.jobName + "&title=报名&type=" + that.jobDetail.jobType + "&agencyId=" + that.jobDetail.agencyId, + url: `/root/home/quickApplication?jobId=${this.jobDetail.id}&jobName=${this.jobDetail.jobName}&title=报名&type=${that.jobDetail.jobType}&agencyId=${that.jobDetail.agencyId}${that.isFans === false ? '' : `&isFans=${that.isFans }`}`, }); // if (this.jobDetail.recruitment == 1) { // this.formInfo = { @@ -1463,7 +1474,8 @@ export default { checkIsFans(upAgencyId) { let that = this; that.G.Post("/assistant/circle/agency/checkUserTypeForAssistant", { upAgencyId }, (res) => { - console.log(res); + console.log("isFans", res); + that.isFans = res; }); }, }, diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue index 40fffbe..7d603d1 100644 --- a/root/home/quickApplication.vue +++ b/root/home/quickApplication.vue @@ -5,8 +5,7 @@ 老乡信息 - + @@ -19,8 +18,7 @@ - + @@ -46,8 +44,7 @@ - + @@ -56,9 +53,7 @@ - + @@ -68,18 +63,13 @@ 职位信息 - - + 报名备注 - - + + @@ -99,8 +89,7 @@ - 取消 + 取消 @@ -110,89 +99,163 @@ \ No newline at end of file +} + diff --git a/root/person/loginIndex.vue b/root/person/loginIndex.vue index 1202b2a..839850e 100644 --- a/root/person/loginIndex.vue +++ b/root/person/loginIndex.vue @@ -306,9 +306,9 @@ export default { uni.reLaunch({ url: `${that.path}?scene=${that.currentId}`, }) - uni.navigateBack({ - delta: 1, - }) + // uni.navigateBack({ + // delta: 1, + // }) return } else { // 固定跳首页 diff --git a/utils/ajax.js b/utils/ajax.js index f709e58..34bce69 100644 --- a/utils/ajax.js +++ b/utils/ajax.js @@ -1,5 +1,5 @@ -// let ajaxUrl = "http://192.168.3.83:8001"; -let ajaxUrl = "https://daotian.matripe.com.cn"; +let ajaxUrl = "http://192.168.3.83:8001"; +// let ajaxUrl = "https://daotian.matripe.com.cn"; let data = { ajaxUrl: ajaxUrl, Get ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {