From 959685db8ceb60f6db743dc5cf00ac95237dcd70 Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Fri, 25 Feb 2022 08:55:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8C=E6=AD=A5diamante?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js                  |  2 +-
 src/views/person/PersonForm.vue   |  2 +-
 src/views/user/Register.vue       |  2 +-
 src/views/user/RegisterResult.vue | 19 +++++++++++++++----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 9dbfa38..ac0b7f3 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -48,7 +48,7 @@ export function logout () {
 }
 export function getSmsCaptcha (parameter) {
   return request({
-    url: '/getSmsCaptcha',
+    url: '/sys/sms/getCode',
     method: 'get',
     params: parameter
   })
diff --git a/src/views/person/PersonForm.vue b/src/views/person/PersonForm.vue
index c8c9968..5d4292c 100644
--- a/src/views/person/PersonForm.vue
+++ b/src/views/person/PersonForm.vue
@@ -26,7 +26,7 @@
               :wrapperCol="wrapperCol"
               has-feedback
             >
-              <a-input placeholder="请输入用户名" :disabled="registerDisabled" v-decorator="['userName', {rules: [{required: true, min: 5, message: '请输入至少五个字符的账号！'}]}]" />
+              <a-input placeholder="请输入用户名" :disabled="registerDisabled" v-decorator="['userName', {rules: [{required: true, message: '请输入用户名!'}]}]" />
             </a-form-item>
           </a-form>
         </a-col>
diff --git a/src/views/user/Register.vue b/src/views/user/Register.vue
index dffd3b0..4515ae8 100644
--- a/src/views/user/Register.vue
+++ b/src/views/user/Register.vue
@@ -344,7 +344,7 @@ export default {
 
           const hide = $message.loading('验证码发送中..', 0)
 
-          getSmsCaptcha({ mobile: values.mobile })
+          getSmsCaptcha({ phone: values.mobile, type: 'register' })
             .then(res => {
               setTimeout(hide, 2500)
               $notification['success']({
diff --git a/src/views/user/RegisterResult.vue b/src/views/user/RegisterResult.vue
index 70e1de9..4502d2a 100644
--- a/src/views/user/RegisterResult.vue
+++ b/src/views/user/RegisterResult.vue
@@ -5,7 +5,7 @@
         <a-button size="large" type="primary" style="margin-right: 8px" @click="goUserInfo">
           完善信息
         </a-button>
-        <a-button size="large" style="margin-left: 8px" @click="goHomeHandle">返回首页</a-button>
+        <a-button size="large" style="margin-left: 8px" @click="goHomeHandle">返回登录页</a-button>
       </template>
     </a-result>
     <PersonForm ref="personForm"></PersonForm>
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import storage from 'store'
 import PersonForm from '@/views/person/PersonForm.vue'
 
 export default {
@@ -20,7 +21,8 @@ export default {
   components: { PersonForm },
   data () {
     return {
-      description: '您的账号已经注册成功,但是还有很多信息未完善,您可以继续完善您的个人信息~',
+      description:
+        '您的账号已经注册成功,但是还需要管理员审核才能登录,请点击下面的"完善信息"按钮完善个人信息方便管理员审核~',
       form: {}
     }
   },
@@ -33,13 +35,22 @@ export default {
   created () {
     this.form = this.$route.query
   },
+  beforeRouteLeave (to, from, next) {
+    this.$store.dispatch('Logout').then(() => {
+      this.$router.push({ name: 'login' })
+      next()
+    })
+    next()
+  },
   methods: {
     goHomeHandle () {
-      this.$router.push({ name: 'login' })
+      this.$store.dispatch('Logout').then(() => {
+        this.$router.push({ name: 'login' })
+      })
     },
     goUserInfo () {
       // 打开编辑弹出框
-      this.$refs.personForm.edit({id: this.form.personId})
+      this.$refs.personForm.edit({ id: this.form.personId })
     }
   }
 }