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 | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/views/demography/login.vue b/src/views/demography/login.vue
index 33851d6..742d84d 100644
--- a/src/views/demography/login.vue
+++ b/src/views/demography/login.vue
@@ -17,12 +17,13 @@
paramsInfo: {},
parasInfos: [],
parasInfoIds: {},
- formDo: {},
+ // formDo: {},
reportTemplateType: null,
statusInfo: { '2': this.$t('statusInfo2'), '3': this.$t('statusInfo3'), '4': this.$t('statusInfo4') }
}
},
created () {
+ // 娓呴櫎鏈湴瀛樺偍鐨勮瑷�閫夐」
let _this = this
_this.getLangType()
// 璁板綍鐧婚檰鏃ュ織
@@ -31,6 +32,11 @@
})
// 宸茬粡绛斿畬浜嗕笉鑳界瓟棰�
examPaperApi.selectTokenId(_this.paraMemberToken).then(re => {
+ if (re.response.logoUrl === null || re.response.logoUrl === '') {
+ _this.setLogo('none')
+ } else {
+ _this.setLogo(re.response.logoUrl)
+ }
_this.setProductType(re.response.productType)
if (re.response.finish === 1) {
_this.$router.push({ path: '/exam/finish', query: { name: '', content: _this.$t('finishMsg'), tokenId: _this.paraMemberToken } })
@@ -59,7 +65,7 @@
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 } })
+ _this.$router.push({ path: '/demography/fill/index', query: { demographyMenber: _this.memberToken, isStart: false, langType: 'Chinese' } })
return
}
@@ -67,18 +73,21 @@
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
}
// 鍏堥�夋嫨瀵嗙爜
- _this.$router.push({ path: '/demography/fill/langOption', query: { langSelectValue: _this.langType } })
+ _this.$router.push({ path: '/demography/fill/langOption', query: { langSelectValue: _this.langType, fromDo: _this.fromDo } })
_this.setMemberTocken(_this.paraMemberToken)
return
}
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'
@@ -89,13 +98,16 @@
let answered = re.response.examItemOrderAndContentList
if (answered === null) {
examPaperApi.select(_this.memberToken, _this.langType).then(re => {
+ // _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' })
}).catch(e => {
_this.$message.error(_this.$t('noquestionMsg'))
})
} else {
+ // 鍚﹀垯娓呴櫎fromDo
_this.$router.push({ path: '/exam/' + _this.doUrl })
}
}).catch(e => {
@@ -110,6 +122,8 @@
...mapMutations('exam', ['setReportTemplateId']),
...mapMutations('user', ['setLangType']),
...mapMutations('user', ['getLangType']),
+ ...mapMutations('user', ['setLogo']),
+ ...mapMutations('user', ['setFormDo']),
...mapMutations('exam', ['setProductType'])
},
--
Gitblit v1.9.1