diff --git a/src/views/research/login.vue b/src/views/research/login.vue index 8009844c..9981902b 100644 --- a/src/views/research/login.vue +++ b/src/views/research/login.vue @@ -42,8 +42,8 @@ {{ $t('trials:researchForm:button:updateQsForm') }} - - + + {{ $t('trials:researchForm:button:cancelUpdateQsForm') }} @@ -214,7 +214,11 @@ export default { let { email, oldEMail, trialSiteId } = this.$route.query if (trialSiteId) this.form.TrialSiteId = trialSiteId if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail - if (email) this.form.EmailOrPhone = email + if (email && email !== 'null') { + this.form.EmailOrPhone = email + } else { + this.form.EmailOrPhone = oldEMail + } } }, methods: { diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue index 6a3fa3f0..6c37f5b1 100644 --- a/src/views/trials/trials-panel/site/index.vue +++ b/src/views/trials/trials-panel/site/index.vue @@ -193,7 +193,7 @@ {{ $t('common:button:confirm') }} - + {{ $t('common:button:cancel') }}