diff --git a/pages/login/login.vue b/pages/login/login.vue index d9239b6..7a989da 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -11,10 +11,10 @@ 登录中 立即登录 立即登录 - + @@ -73,12 +73,14 @@ }, login(e) { if (this.validate) { - if (!this.userChecked) { - uni.showToast({ - title:'请先阅读并同意《服务及隐私协议》', - icon:'none', - }) - } else { + this.userChecked = true; + console.log(this.userChecked) + // if (!this.userChecked) { + // uni.showToast({ + // title:'请先阅读并同意《服务及隐私协议》', + // icon:'none', + // }) + // } else { var that = this this.loading = true this.$store.dispatch("LoginByUsername", { @@ -103,8 +105,9 @@ }).catch((err) => { this.loading = false // this.$refs.code.refushCode() + location.href = "https://dy12333.org.cn/h5/" }); - } + // } } }, // 步骤 diff --git a/pages/login/template.vue b/pages/login/template.vue index 8a40867..95b9c31 100644 --- a/pages/login/template.vue +++ b/pages/login/template.vue @@ -5,11 +5,11 @@ - + diff --git a/pages/my/my.vue b/pages/my/my.vue index 0bfd0b5..261494a 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -81,11 +81,14 @@ 帮助与反馈 - + + + + 退出登录 客服电话 18500206848 工作时间 9:00-18:00 @@ -130,6 +133,16 @@ this.federationStatus = e.data.data.joined }) }, + logout() { + this.$store.dispatch('LogOut').then(() => { + // uni.reLaunch({ + // url: '/pages/login/login' + // }) + this.$store.dispatch('clearAuthState') + this.$store.dispatch('endRefreshNewsTimer') + location.href = "https://dy12333.org.cn/h5/" + }) + }, go(url) { uni.navigateTo({ url @@ -294,4 +307,13 @@ position: relative; overflow: auto; } + .btn-out { + background-color: #fefefe; + margin-top: 20rpx; + padding: 20rpx 0; + text-align: center; + font-family: PingFangSC-Regular; + font-size: 32rpx; + color: #F46161; + } diff --git a/pages/recruit/subPage/MessageList.vue b/pages/recruit/subPage/MessageList.vue index 3d74437..9b9e220 100644 --- a/pages/recruit/subPage/MessageList.vue +++ b/pages/recruit/subPage/MessageList.vue @@ -126,7 +126,7 @@ export default { }, }, { id: "1", - title: "个人户申请", + title: "个体户申请", icon: "../../../static/img/own_recruit.svg", page: { current: 0, @@ -199,8 +199,7 @@ export default { uni.navigateTo({ url: './jobProjectList' }) - } else if (item.title == '个人户申请') { - console.log('个人户申请') + } else if (item.title == '个体户申请') { uni.navigateTo({ url: './policyList' }) diff --git a/pages/recruit/subPage/person.vue b/pages/recruit/subPage/person.vue index 77d538a..489abb9 100644 --- a/pages/recruit/subPage/person.vue +++ b/pages/recruit/subPage/person.vue @@ -81,8 +81,8 @@ - - + + @@ -187,7 +187,7 @@ educationLabel: '', // 学历要求前端显示 experienceDesc: '', // 经验要求 jobCompanyName: '', // 企业名称 - jobCompanyScale: '', // 企业规模 + jobCompanyScale: '', // 企业信用代码 jobCompanyIndustry: '', // 所属行业 jobCompanyNature: '', // 企业性质 jobCompanyDescription: '', // 企业介绍 diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue index 3c4f6c9..7d1ac94 100644 --- a/pages/recruit/subPage/task.vue +++ b/pages/recruit/subPage/task.vue @@ -1,16 +1,16 @@ - + + diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue index 06f1f00..a0b0d3f 100644 --- a/pages/recruit/subPage/work.vue +++ b/pages/recruit/subPage/work.vue @@ -1,9 +1,9 @@ - + + diff --git a/pages/user/policyContent.vue b/pages/user/policyContent.vue index 2343ef9..95e25a8 100644 --- a/pages/user/policyContent.vue +++ b/pages/user/policyContent.vue @@ -38,8 +38,11 @@ diff --git a/untils/AxiosUtils.js b/untils/AxiosUtils.js index 0f92493..d62574c 100644 --- a/untils/AxiosUtils.js +++ b/untils/AxiosUtils.js @@ -162,23 +162,24 @@ export function Promisify(func) { export function GoLogin() { if (showModal) { showModal = false - uni.showModal({ - title: "提示", - content: "您还未登录,点击确认去登录", - success({ - confirm - }) { - if (confirm) { - uni.redirectTo({ - url: "/pages/login/login" - }); - } - showModal = true - }, - fail() { - showModal = true - } - }) + location.href = "https://dy12333.org.cn/h5/" + // uni.showModal({ + // title: "提示", + // content: "您还未登录,点击确认去登录", + // success({ + // confirm + // }) { + // if (confirm) { + // uni.redirectTo({ + // url: "/pages/login/login" + // }); + // } + // showModal = true + // }, + // fail() { + // showModal = true + // } + // }) } }