diff --git a/pages/index/index.vue b/pages/index/index.vue index f909132..6f07c8e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -422,7 +422,7 @@ } else { // uni.showToast({ title: '功能即将上线,敬请期待', icon: 'none', duration: 1000 }); const userinform = uni.getStorageSync('wxUserInfo'); - if (userinform.companyStatus == 2) { + if (userinform && userinform.companyStatus == 2) { uni.navigateTo({ url: '/pages/index/outsourcing/outsourcing' }) diff --git a/pages/index/outsourcing/cloudUserdetail.vue b/pages/index/outsourcing/cloudUserdetail.vue index 64fdfae..0674941 100644 --- a/pages/index/outsourcing/cloudUserdetail.vue +++ b/pages/index/outsourcing/cloudUserdetail.vue @@ -1,7 +1,8 @@ - + + {{ jonInfo.title }} @@ -64,6 +65,7 @@ + @@ -93,21 +95,29 @@ this.tokenshow = true } else { const wxUserInfo = uni.getStorageSync('wxUserInfo'); - this.http.quickPost( - `/job/apply/${this.jonInfo.jobId}`, { - userId: wxUserInfo.userId - }, - true).then(res => { - uni.showToast({ - title: '职位申请成功', - icon: 'none' + if (wxUserInfo.testerStatus == 2) { + this.http.quickPost( + `/job/apply/${this.jonInfo.jobId}`, { + userId: wxUserInfo.userId + }, + true).then(res => { + uni.showToast({ + title: '职位申请成功', + icon: 'none' + }) + }).catch(error => { + uni.showToast({ + title: '职位申请失败', + icon: 'none' + }) }) - }).catch(error => { + } else { uni.showToast({ - title: '职位申请失败', - icon: 'none' + icon: 'none', + title: '请先入驻为云员工', }) - }) + } + } diff --git a/pages/index/outsourcing/outsourcing.vue b/pages/index/outsourcing/outsourcing.vue index 19106e2..e8ff80d 100644 --- a/pages/index/outsourcing/outsourcing.vue +++ b/pages/index/outsourcing/outsourcing.vue @@ -17,7 +17,7 @@ - + + alt="" @click="goCompanyInfo" /> {{crowddata.task.company_name}} @@ -152,14 +152,15 @@ 发包总数: {{crowddata.task.publish_task_count}} - l + l 评分: {{crowddata.task.commentsStar}} - + 暂无评价 - + @@ -498,41 +499,8 @@ this.http.quickGet(`/tester/cert/apply/${this.userinform.userId}`, true).then(res => { // console.log('竞标实名认证信息---',res) if (res.data.code == 200) { - this.testerdata = res.data.data - if (parseInt(this.userinform.userId) == this.crowddata.task.publisher_id) { - uni.showToast({ - title: '您是发布者,无法竞标自己发布的任务。', - icon: 'warning', - duration: 2000 - }); - return; - } - console.log('testerdata.status---', this.testerdata) - if (this.testerdata) { - if (this.testerdata.status != 1) { //不是测试者或认证尚未成功 - this.certifshow = true; - } else { - if (this.crowddata.task.applicant_type != 2) { //2是个人测试者或企业测试都都可以 - if (this.crowddata.task.applicant_type == 0) { //要求个人测试者 - if (this.userinform.companyStatus != 0) { - uni.showToast({ - title: '您是认证测试公司或正在申请成为认证测试公司,无法认证该任务,该任务只允许个人测试者竞标。', - icon: 'none', - duration: 1000 - }); - return; - } - } else { //要求企业测试者 - if (this.userinform.companyStatus != 2) { - uni.showToast({ - title: '对不起,您是个人测试者,该任务只允许认证测试公司竞标。', - icon: 'none', - duration: 3000 - }); - return; - } - } - } + if (res.data.data.applyId) { + if (res.data.data.status == 1) { this.isPopupShow = true this.biddingobj = { taskId: '', @@ -541,10 +509,69 @@ competitionEdge: '', attachment: '' } + } else { + this.certifshow = true; } } else { this.certifshow = true; } + if (res.data.data.companyApplyId) { + uni.showToast({ + title: '仅支持个人用户竞标报名', + icon: 'none', + duration: 2000 + }); + } + + + // this.testerdata = res.data.data + // if (parseInt(this.userinform.userId) == this.crowddata.task.publisher_id) { + // uni.showToast({ + // title: '您是发布者,无法竞标自己发布的任务。', + // icon: 'warning', + // duration: 2000 + // }); + // return; + // } + // console.log('testerdata.status---', this.testerdata) + // if (this.testerdata) { + // if (this.testerdata.status != 1) { //不是测试者或认证尚未成功 + // this.certifshow = true; + // } else { + // if (this.crowddata.task.applicant_type != 2) { //2是个人测试者或企业测试都都可以 + // if (this.crowddata.task.applicant_type == 0) { //要求个人测试者 + // if (this.userinform.companyStatus != 0) { + // uni.showToast({ + // title: '您是认证测试公司或正在申请成为认证测试公司,无法认证该任务,该任务只允许个人测试者竞标。', + // icon: 'none', + // duration: 1000 + // }); + // return; + // } + // } else { //要求企业测试者 + // if (this.userinform.companyStatus != 2) { + // uni.showToast({ + // title: '对不起,您是个人测试者,该任务只允许认证测试公司竞标。', + // icon: 'none', + // duration: 3000 + // }); + // return; + // } + // } + // } + // this.isPopupShow = true + // this.biddingobj = { + // taskId: '', + // applicantId: '', + // period: '', + // competitionEdge: '', + // attachment: '' + // } + // } + // } else { + // this.certifshow = true; + // } + } }) @@ -769,6 +796,7 @@ .ratebox ::v-deep .u-icon { font-size: 13px !important; } + .logobg { width: 100vw; object-fit: contain; diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue index c69c460..259e458 100644 --- a/pages/personal/personal.vue +++ b/pages/personal/personal.vue @@ -36,7 +36,7 @@ - + @@ -45,8 +45,17 @@ + + + + + + 个人认证不通过 + + + - + @@ -55,6 +64,24 @@ + + + + + + 企业认证中 + + + + + + + + + 企业认证不通过 + + + @@ -62,7 +89,7 @@ - + 点击登录 @@ -130,7 +157,7 @@ 报名管理 - 待完善 @@ -141,7 +168,7 @@ 企业简介 - + @@ -421,7 +448,7 @@ } .userapplytext { - width: 86rpx; + padding: 0 20rpx; height: 32rpx; background: linear-gradient(90deg, #5EA6FD, #1A81F9); border-radius: 16rpx; @@ -431,6 +458,17 @@ font-size: 22rpx; color: #FEFEFE; } + .userapplytexterror { + padding: 0 20rpx; + height: 32rpx; + background: linear-gradient(90deg, #fd8686, #fc3333); + border-radius: 16rpx; + line-height: 32rpx; + text-align: center; + font-weight: 500; + font-size: 22rpx; + color: #FEFEFE; + } .clouduserapplytext { width: 86rpx; @@ -460,7 +498,7 @@ } .companyapplytext { - width: 86rpx; + padding: 0 20rpx; height: 32rpx; background: linear-gradient(90deg, #F9BD55, #F49C45); border-radius: 16rpx; @@ -470,6 +508,17 @@ font-size: 22rpx; color: #FEFEFE; } + .companyapplytexterror { + padding: 0 20rpx; + height: 32rpx; + background: linear-gradient(90deg, #fd8686, #fc3333); + border-radius: 16rpx; + line-height: 32rpx; + text-align: center; + font-weight: 500; + font-size: 22rpx; + color: #FEFEFE; + } } .seticon { diff --git a/pages/personal/personalresume/personalresume.vue b/pages/personal/personalresume/personalresume.vue index d750dc8..78ab20f 100644 --- a/pages/personal/personalresume/personalresume.vue +++ b/pages/personal/personalresume/personalresume.vue @@ -207,7 +207,7 @@ }) } else if (type == 'work') { uni.navigateTo({ - url: '/pages/personal/personalresume/workexperience' + url: '/pages/personal/personalresume/workexperience?type=1' }) } else if (type == 'pro') { uni.navigateTo({ diff --git a/pages/personal/personalresume/projectexperience.vue b/pages/personal/personalresume/projectexperience.vue index 24a80a2..1fb7057 100644 --- a/pages/personal/personalresume/projectexperience.vue +++ b/pages/personal/personalresume/projectexperience.vue @@ -19,7 +19,7 @@ - + diff --git a/pages/personal/setup/companyApply.vue b/pages/personal/setup/companyApply.vue index ec68728..fa2c832 100644 --- a/pages/personal/setup/companyApply.vue +++ b/pages/personal/setup/companyApply.vue @@ -117,8 +117,8 @@ if (res.data.data.companyApplyId) { this.form = { ...res.data.data, - name: res.data.data.companyContactName, - contactName: res.data.data.companyName, + name: res.data.data.companyName, + contactName: res.data.data.companyContactName, businessLicenseUrl: [{ url: this.http.baseUrl + res.data.data .companyBusinessLicense
{{crowddata.task.company_name}} @@ -152,14 +152,15 @@ 发包总数: {{crowddata.task.publish_task_count}} - l + l 评分: {{crowddata.task.commentsStar}} - + 暂无评价 - +
点击登录