From 0705410617308cf8c7c50d6b8af9553011590ea0 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Wed, 20 Mar 2024 20:25:45 +0800 Subject: [PATCH 1/6] 11 --- vue.config.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vue.config.js b/vue.config.js index 02a90a9..d942576 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,9 +3,7 @@ module.exports = { port: 1887, proxy: { '/api': { - // target: 'http://192.168.3.108:8000', // 本地服务接口地址 - target: 'http://192.168.3.112:8000', // 本地服务接口地址 - // target: 'http://10.165.0.173:8000', // 本地服务接口地址 + target: 'http://10.165.0.173:8000', ws: true, pathRewrite: { '^/api': '/' From 1064bb425f542e01e0d8c82c5e28d34ca31e2726 Mon Sep 17 00:00:00 2001 From: zxy <353513737@qq.com> Date: Thu, 21 Mar 2024 09:14:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=88=B7=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=AA=E4=BD=93=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/recruit/subPage/MessageList.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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' }) From 960f1ddc201fe0b6458250f9388a977d778a86b4 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Thu, 21 Mar 2024 11:49:30 +0800 Subject: [PATCH 3/6] 11 --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index d942576..e4e5e2c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,7 +3,7 @@ module.exports = { port: 1887, proxy: { '/api': { - target: 'http://10.165.0.173:8000', + target: 'http://localhost:8000', ws: true, pathRewrite: { '^/api': '/' From 881ea05ce7b71a7ce816536bdd03728977420aa3 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Thu, 21 Mar 2024 11:58:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E8=A7=84=E6=A8=A1=EF=BC=8C=E5=8F=98=E6=9B=B4=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=BA=E4=BC=81=E4=B8=9A=E4=BF=A1=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/recruit/subPage/person.vue | 6 +- pages/recruit/subPage/task.vue | 382 +++++++++++++++---------------- pages/recruit/subPage/work.vue | 370 +++++++++++++++--------------- 3 files changed, 379 insertions(+), 379 deletions(-) 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 @@ - + + From 5733a0b2992765c4c91e3c96ebfc1833ed8a9112 Mon Sep 17 00:00:00 2001 From: zxy <353513737@qq.com> Date: Sat, 23 Mar 2024 14:43:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B3=A8=E5=86=8C=E3=80=81=E5=BF=98=E8=AE=B0?= =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=9B2=E3=80=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8E=BB=E9=99=A4=E5=BA=95=E9=83=A8=E9=9A=90?= =?UTF-8?q?=E7=A7=81=E5=8D=8F=E8=AE=AE=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=80=89?= =?UTF-8?q?=E4=B8=AD=EF=BC=9B3=E3=80=81=E4=BC=98=E5=8C=96=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=94=BF=E7=AD=96=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=9B4=E3=80=81token=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=80=BB=E9=9B=86?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/login.vue | 21 ++++++++++++--------- pages/login/template.vue | 4 ++-- pages/user/policyContent.vue | 5 ++++- untils/AxiosUtils.js | 35 ++++++++++++++++++----------------- 4 files changed, 36 insertions(+), 29 deletions(-) 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/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 + // } + // }) } } From 7e55ff5a0ae61d3df395ca4029a324b717762515 Mon Sep 17 00:00:00 2001 From: zxy <353513737@qq.com> Date: Sun, 24 Mar 2024 16:31:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=94=B9=E4=B8=BA=E9=80=80=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/my.vue | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) 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; + }