From 6b6d8174d04da8a4947e2e261c40f26351202b3e Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 24 Mar 2020 11:27:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[fix]=20GFRS-808=E3=80=90=E4=BA=BA=E5=8A=9B?= =?UTF-8?q?=E5=8F=91=E5=B1=95-=E5=A2=9E=E5=91=98=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E3=80=91iOS=EF=BC=8C=E5=85=AC=E5=8F=B8=E4=BB=8B=E7=BB=8D/?= =?UTF-8?q?=E8=81=98=E6=89=8D=E6=96=B9=E6=A1=88/=E6=B4=A5=E8=B4=B4?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=88=86=E4=BA=AB=E5=90=8E=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=88=86=E4=BA=AB=E5=90=8E=E7=9A=84=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A2=AB=E7=99=BB=E5=87=BA=20=E5=88=86=E4=BA=AB=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=B0=86token=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=20url=20=E4=B8=8A=EF=BC=8C=20=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BA=BA=E6=89=93=E5=BC=80=E5=90=8E=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=B0token=E5=8F=82=E6=95=B0=EF=BC=8C=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E5=88=B0localStorage=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../increaseStaffTools/CompanyIntroduction.vue | 11 ++++++++--- .../ebiz/manpower/increaseStaffTools/PdfShare.vue | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue b/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue index 482d9e5bb..bad3a4224 100644 --- a/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue +++ b/src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue @@ -73,8 +73,12 @@ export default { }, mounted() { this.redisKey = this.$route.query.redisKey - if (this.redisKey) this.saveShareRecord('1') - else this.getShareKey() + if (this.redisKey) { + this.saveShareRecord('1') + localStorage.setItem('token', this.$route.query.token) + } else { + this.getShareKey() + } setTimeout(() => { // 右上角的显示 this.$jump({ @@ -94,13 +98,14 @@ export default { appCallBack(data) { if (data.trigger == 'right_button_click') { this.saveShareRecord('0') + let token = window.localStorage.getItem('token') // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('bridge', { flag: 'share', extra: { title: '国富人寿保险股份有限公司', content: '公司介绍', - url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction?redisKey=${this.redisKey}`, + url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction?redisKey=${this.redisKey}&token=${token}`, img: this.$assetsUrl + 'images/logo.png' } }) diff --git a/src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue b/src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue index f73179f91..a76b7bfeb 100644 --- a/src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue +++ b/src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue @@ -36,8 +36,12 @@ export default { mounted() { this.init() this.redisKey = this.$route.query.redisKey - if (this.redisKey) this.saveShareRecord('1') - else this.getShareKey() + if (this.redisKey) { + this.saveShareRecord('1') + localStorage.setItem('token', this.$route.query.token) + } else { + this.getShareKey() + } }, methods: { init() { @@ -60,13 +64,14 @@ export default { if (data.trigger == 'right_button_click') { this.saveShareRecord('0') let pdf = this.$route.query.pdf + let token = window.localStorage.getItem('token') // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('bridge', { flag: 'share', extra: { title: '国富人寿欢迎您！', content: this.shareContent, - url: `${location.origin}/#/manpower/increaseStaffTools/PdfShare?pdf=${pdf}&redisKey=${this.redisKey}`, + url: `${location.origin}/#/manpower/increaseStaffTools/PdfShare?pdf=${pdf}&redisKey=${this.redisKey}&token=${token}`, img: this.$assetsUrl + 'images/logo.png' } }) From 16561d0d481eee340eb0b6235b598bc31fe063e1 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 24 Mar 2020 11:34:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[fix]=20GFRS-809=E3=80=90=E4=BA=BA=E5=8A=9B?= =?UTF-8?q?=E5=8F=91=E5=B1=95-=E6=B4=BB=E5=8A=A8=E9=87=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E7=9B=AE=E5=89=8D=EF=BC=8C=E5=9C=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=A5=E5=BF=97=E6=97=B6=EF=BC=8C=E9=9D=A2=E8=B0=88?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E8=BE=93=E5=85=A5=E4=B8=BA=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E8=B6=85=E6=97=B6=EF=BC=8C=E8=AF=B7=E7=A8=8D=E5=90=8E=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E2=80=9D=EF=BC=9B=E9=9D=A2=E8=B0=88=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E8=BE=93=E5=85=A5=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=20GFRS-810=E3=80=90=E4=BA=BA=E5=8A=9B=E5=8F=91=E5=B1=95-?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=87=8F=E7=AE=A1=E7=90=86=E3=80=91=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=B9=B4=E9=BE=84=E8=BE=93=E5=85=A5=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C=E5=B9=B4=E9=BE=84=E4=B8=8D?= =?UTF-8?q?=E5=BE=97=E5=A4=A7=E4=BA=8E100=E5=91=A8=E5=B2=81=E2=80=9D?= =?UTF-8?q?=EF=BC=9B=E5=B9=B4=E9=BE=84=E5=BA=94=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=B0=8F=E6=95=B0=20=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20onlyInteger=20=EF=BC=88=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B4=E6=95=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/manpower/activityLog/Edit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/manpower/activityLog/Edit.vue b/src/views/ebiz/manpower/activityLog/Edit.vue index ddfb90dd4..fffc86ab1 100644 --- a/src/views/ebiz/manpower/activityLog/Edit.vue +++ b/src/views/ebiz/manpower/activityLog/Edit.vue @@ -19,7 +19,7 @@ type="digit" label="年龄" placeholder="请输入年龄" - v-validate="'required|onlyNumber|maxAge'" + v-validate="'required|onlyNumber|onlyInteger|maxAge'" data-vv-name="年龄" /> @@ -30,7 +30,7 @@ type="digit" label="面谈次数" placeholder="请输入面谈次数" - v-validate="'required|onlyNumber'" + v-validate="'required|onlyNumber|onlyInteger'" data-vv-name="面谈次数" /> Date: Thu, 26 Mar 2020 10:57:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E5=88=AB=E5=AD=97=20=E2=80=9C=E5=A2=9E=E6=8F=B4=E2=80=9D=20-->?= =?UTF-8?q?=20=20=E2=80=9C=E5=A2=9E=E5=91=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/manpower/PersonalCenter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/manpower/PersonalCenter.vue b/src/views/ebiz/manpower/PersonalCenter.vue index 6cf3f6db0..9d112876b 100644 --- a/src/views/ebiz/manpower/PersonalCenter.vue +++ b/src/views/ebiz/manpower/PersonalCenter.vue @@ -15,7 +15,7 @@ - +