From a778d5e53e74b2170e37607b2536a957dbc1d664 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期一, 25 十一月 2024 13:59:58 +0800
Subject: [PATCH] 合并本地修改
---
src/views/demography/login.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/demography/login.vue b/src/views/demography/login.vue
index f5d909d..742d84d 100644
--- a/src/views/demography/login.vue
+++ b/src/views/demography/login.vue
@@ -62,7 +62,7 @@
reParam => {
if (reParam.code !== 1) {
// 鑱屼笟鍏磋叮鎶ュ憡鐗规畩鍖栧鐞� 鍙湁涓枃
- if (_this.doUrl === 'career_interests' || _this.doUrl === 'job') {
+ 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, langType: 'Chinese' } })
@@ -73,7 +73,7 @@
if (_this.reportTemplateType === 'API_Fan') {
_this.$i18n.locale = 'zh'
_this.setLangType('Chinese')
- _this.$router.push({ path: '/demography/fill/logo', query: { demographyMenber: _this.memberToken, isStart: false } })
+ _this.$router.push({ path: '/demography/fill/logo', query: { demographyMenber: _this.memberToken, isStart: false, langType: 'Chinese' } })
return
}
@@ -85,6 +85,9 @@
if (reParam.response[0].langType === 'Chinese') {
this.$i18n.locale = 'zh'
_this.setLangType('Chinese')
+ } else if (reParam.response[0].langType === 'Thai') {
+ _this.setLangType('Thai')
+ this.$i18n.locale = 'th'
} else {
_this.setLangType('English')
this.$i18n.locale = 'en'
@@ -95,10 +98,11 @@
let answered = re.response.examItemOrderAndContentList
if (answered === null) {
examPaperApi.select(_this.memberToken, _this.langType).then(re => {
- _this.setFormDo(re.response)
+ // _this.setFormDo(re.response)
+ _this.formDo = re.response
_this.setDoUrl(re.response.questionTemplateId)
- // _this.$router.push({ path: '/guide/index', query: { formDo: _this.formDo } })
- _this.$router.push({ path: '/guide/index' })
+ _this.$router.push({ path: '/guide/index', query: { formDo: _this.formDo } })
+ // _this.$router.push({ path: '/guide/index' })
}).catch(e => {
_this.$message.error(_this.$t('noquestionMsg'))
})
--
Gitblit v1.9.1