From 93f30ecb74eea1c7ed460d45bc01df2ef14d69a3 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 10 五月 2023 14:53:57 +0800
Subject: [PATCH] Merge branch 'v13-20230413'
---
src/views/demography/login.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/demography/login.vue b/src/views/demography/login.vue
index b3e95b1..407a505 100644
--- a/src/views/demography/login.vue
+++ b/src/views/demography/login.vue
@@ -18,7 +18,8 @@
parasInfos: [],
parasInfoIds: {},
formDo: {},
- statusInfo: { '2': this.$t('statusInfo2'), '3': this.$t('statusInfo3'), '4': this.$t('statusInfo4') }
+ statusInfo: { '2': this.$t('statusInfo2'), '3': this.$t('statusInfo3'), '4': this.$t('statusInfo4') },
+ doUrl: null
}
},
created () {
@@ -31,10 +32,11 @@
// 宸茬粡绛斿畬浜嗕笉鑳界瓟棰�
examPaperApi.selectTokenId(_this.paraMemberToken).then(re => {
if (re.response.finish === 1) {
- _this.$router.push({ path: '/exam/finish', query: { name: '', content: _this.$t('finishMsg') } })
+ _this.$router.push({ path: '/exam/finish', query: { name: '', content: _this.$t('finishMsg'), tokenId: _this.paraMemberToken } })
} else if (re.response.status !== '1') {
_this.$router.push({ path: '/exam/exception', query: { name: '', content: _this.statusInfo[re.response.status] } })
} else {
+ _this.doUrl = re.response.doUrl
_this.setMemberTocken(_this.paraMemberToken)
_this.setDoUrl(re.response.doUrl)
_this.setReportTemplateId(re.response.reportTemplateId)
@@ -50,6 +52,14 @@
demographyApi.queryDemographyParamInfo(_this.paraMemberToken).then(
reParam => {
if (reParam.code !== 1) {
+ // 鑱屼笟鍏磋叮鎶ュ憡鐗规畩鍖栧鐞� 鍙湁涓枃
+ if(_this.doUrl === 'career_interests') {
+ _this.$i18n.locale = 'zh'
+ _this.setLangType('Chinese')
+ _this.$router.push({ path: '/demography/fill/index', query: { demographyMenber: _this.memberToken, isStart: false } })
+ return
+ }
+
// 鍏堥�夋嫨瀵嗙爜
_this.$router.push({ path: '/demography/fill/langOption', query: { langSelectValue: _this.langType } })
_this.setMemberTocken(_this.paraMemberToken)
--
Gitblit v1.9.1