From c143deb55103da9bc90d907121170fa88c9ef395 Mon Sep 17 00:00:00 2001
From: pan <1029559041@qq.com>
Date: Wed, 17 Feb 2021 20:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=94=99=E8=AF=AF=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss | 7 +++++++
 src/components/Email.vue   | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index af86527..59ae7fd 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -9,3 +9,10 @@
   width: 100%;
 }
 
+.el-input + span{
+  font:{
+    weight: bold;
+  }
+  color: red;
+}
+
diff --git a/src/components/Email.vue b/src/components/Email.vue
index 7411bc6..cfe7e7c 100644
--- a/src/components/Email.vue
+++ b/src/components/Email.vue
@@ -11,6 +11,7 @@
       <el-input v-model="newEmail" :disabled="second>0">
         <template v-slot:prepend>新邮箱</template>
       </el-input>
+      <span v-if="userEmail === newEmail">新邮箱不能和当前邮箱一致</span>
     </el-col>
   </el-row>
   <el-row type="flex" justify="center" class="mt-1">
@@ -41,7 +42,7 @@ import {changeEmail as _changeEmail, sendCode as _sendCode} from "../request";
 import {useStore} from "vuex";
 import {Message} from 'element3/src/components/Message'
 
-export default defineComponent<{ userEmail: { require: boolean, type: StringConstructor }, second: { require: boolean, type: NumberConstructor } }>({
+export default defineComponent({
   name: 'Email',
   setup(props) {
     const newEmail = ref<string>('')
@@ -82,13 +83,14 @@ export default defineComponent<{ userEmail: { require: boolean, type: StringCons
 
     const changeEmail=()=> _changeEmail(store.state.user.email,newEmail.value,code.value)
 
-    const allowSendCode = computed<boolean>(() => second.value === 0 && props.userEmail !== newEmail.value && /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(newEmail.value))
+    const userEmail= computed(() => store.state.user.email)
+
+    const allowSendCode = computed<boolean>(() => second.value === 0 && userEmail !== newEmail.value && /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(newEmail.value))
 
     const sendCodeTip = computed<string>(() => second.value > 0 ? second.value + '秒后重发' : '发送验证码')
 
     const checkCode = computed<boolean>(() => /^\d{6}$/.test(code.value))
 
-    const userEmail= computed(() => store.state.user.email)
 
     return {
       newEmail,