diff --git a/components/companyList/applyList.vue b/components/companyList/applyList.vue
index 9e7793b..6333f99 100644
--- a/components/companyList/applyList.vue
+++ b/components/companyList/applyList.vue
@@ -1,226 +1,230 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}
-
-
-
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
- {{ companyitem.missionCompanyName }}
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ companyitem.missionCompanyName }}
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/companyList/collectionList.vue b/components/companyList/collectionList.vue
index 75dc880..325f1f1 100644
--- a/components/companyList/collectionList.vue
+++ b/components/companyList/collectionList.vue
@@ -1,236 +1,244 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}
-
-
-
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
- {{ companyitem.missionCompanyName }}
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ companyitem.missionCompanyName }}
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue
index 270915f..71564bb 100644
--- a/components/companyList/companyList.vue
+++ b/components/companyList/companyList.vue
@@ -1,222 +1,226 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
- {{ companyitem.missionCompanyName }}
-
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }} {{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+ {{ companyitem.missionCompanyName }}
+
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/companyList/newJobList.vue b/components/companyList/newJobList.vue
index db26ce6..d03154e 100644
--- a/components/companyList/newJobList.vue
+++ b/components/companyList/newJobList.vue
@@ -1,226 +1,230 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}
-
-
-
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
- {{ companyitem.jobCompanyName }}
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ companyitem.jobCompanyName }}
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/companyList/newTaskList.vue b/components/companyList/newTaskList.vue
index 04e07db..001888f 100644
--- a/components/companyList/newTaskList.vue
+++ b/components/companyList/newTaskList.vue
@@ -1,226 +1,230 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}
-
-
-
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
- {{ companyitem.missionCompanyName }}
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ companyitem.missionCompanyName }}
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/companyList/workList.vue b/components/companyList/workList.vue
index 0b08203..1c57a0d 100644
--- a/components/companyList/workList.vue
+++ b/components/companyList/workList.vue
@@ -1,230 +1,234 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
- {{ companyitem.jobCompanyName }}
-
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+ {{ companyitem.jobCompanyName }}
+
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main.js b/main.js
index 3d91d00..6a34dcb 100644
--- a/main.js
+++ b/main.js
@@ -33,6 +33,7 @@ const msg = (title, duration = 1500, mask = false, icon = 'none') => {
icon
});
}
+const sleep = (time) => new Promise(resolve => setTimeout(resolve, time))
// 注册全局组件
import JlButton from "@/components/jl-button/main.vue"
@@ -45,7 +46,8 @@ Vue.component('jl-form-item', JlFormItem)
Vue.component('cs-button', CSButton)
Vue.component('empty', empty)
Vue.prototype.$api = {
- msg
+ msg,
+ sleep
}
Vue.prototype.$config = config
Vue.prototype.navTo = navTo
diff --git a/pages/project/userrecruitList.vue b/pages/project/userrecruitList.vue
index 2bf2613..11ee747 100644
--- a/pages/project/userrecruitList.vue
+++ b/pages/project/userrecruitList.vue
@@ -1,230 +1,234 @@
-
-
-
-
-
-
-
-
-
- {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-
-
-
-
- {{ companyitem.tradeNames }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
- {{ companyitem.jobAddress }}
-
-
-
-
- 2.2km
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+
+
+
+
+ {{ companyitem.tradeNames }}
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+ {{ companyitem.jobAddress }}
+
+
+
+
+ 2.2km
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/recruit/recruit.vue b/pages/recruit/recruit.vue
index aea9a6c..db68c09 100644
--- a/pages/recruit/recruit.vue
+++ b/pages/recruit/recruit.vue
@@ -23,7 +23,12 @@
import {
mapState
} from 'vuex'
-
+ let reviewStatus = {
+ '-1': '全部',
+ '0': "待审",
+ '1': "已审",
+ '9': "驳回",
+ };
export default {
data() {
return {}
@@ -60,13 +65,29 @@
})
uni.hideLoading()
if (resData.data.code === 200) {
- if (resData.data.data) {
+ if (resData.data.data.haveCode) {
resolve()
} else {
- // this.$api.msg('您未申请开通该功能,请联系工作人员')
- this.navTo(
- '/pages/recruit/subPage/enterpriceCertification/enterpriceCertification'
- )
+ switch (resData.data.data.reviewStatus) {
+ case 0:
+ this.$api.msg('您的企业信息正在审核,请稍后再试')
+ break
+ case 1:
+ this.$api.msg('您的企业信息已经通过审核但未启用,请联系工作人员')
+ break
+ case 9:
+ this.navTo(
+ '/pages/recruit/subPage/enterpriceCertification/enterpriceCertification'
+ )
+ this.$api.sleep(1000).then(() => {
+ this.$api.msg('您的企业信息已被系统驳回,请重新上传')
+ })
+ break
+ default: // -1 未提交
+ this.navTo(
+ '/pages/recruit/subPage/enterpriceCertification/enterpriceCertification'
+ )
+ }
}
} else {
reject()
diff --git a/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue b/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue
index e287b7e..a3f7b40 100644
--- a/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue
+++ b/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue
@@ -216,11 +216,6 @@
cityId: Number(this.formData.cityId),
tradeId: Number(this.formData.tradeId),
}
- let resData = await addInviteCompanyAuth(params)
- console.log(resData)
- if (resData.data.code === 200) {
- _this.$api.msg('已完成企业信息认证')
- }
const _this = this
this.$refs.formOne.validate().then(async (res) => {
let params = {
@@ -233,8 +228,10 @@
}
let resData = await addInviteCompanyAuth(params)
if (resData.data.code === 200) {
- _this.$api.msg('已完成企业信息认证')
- uni.navigateBack()
+ uni.navigateBack(1)
+ _this.$api.sleep(1000).then(() => {
+ _this.$api.msg('已完成企业信息认证')
+ })
}
}).catch(errors => {
console.log(errors)
diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue
index 66210a1..0a1b2bf 100644
--- a/pages/recruit/subPage/work.vue
+++ b/pages/recruit/subPage/work.vue
@@ -120,6 +120,12 @@
+
@@ -158,12 +164,17 @@