From 62e8ac602faddf4fef0b50288ce63ecad291b3b9 Mon Sep 17 00:00:00 2001
From: liuminjian <517059477@qq.com>
Date: Sun, 21 Mar 2021 17:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E5=86=8C=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/register/index.js |  1 +
 src/store/modules/user.js | 20 +++++++++++++++-
 src/views/login.vue       |  2 +-
 src/views/register.vue    | 49 ++++++++++++++++++++++-----------------
 4 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/api/register/index.js b/src/api/register/index.js
index f77c44e1..96ff34aa 100644
--- a/src/api/register/index.js
+++ b/src/api/register/index.js
@@ -7,6 +7,7 @@ export function registerCheck(memberName, idcard, mobile) {
     idcard,
     mobile
   }
+  console.log(data)
   return request({
     url: '/register/check',
     method: 'post',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c2524485..a9a765e2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,5 @@
-import { login, logout, getInfo, smsLogin } from '@/api/login'
+import { login, logout, getInfo, smsLogin } from '@/api/login';
+import { registerOn } from "@/api/register";
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const user = {
@@ -73,7 +74,24 @@ const user = {
           reject(error)
         })
       })
+    },
 
+    //注册
+    Register({ commit }, userInfo) {
+      const mobile = userInfo.mobile.trim()
+      const smsCode = userInfo.smsCode
+      const uuid = userInfo.uuid
+      const memberName = userInfo.memberName
+      const idcard = userInfo.idcard
+      return new Promise((resolve, reject) => {
+        registerOn(memberName, idcard, mobile, smsCode, uuid).then(res => {
+          setToken(res.token)
+          commit('SET_TOKEN', res.token)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
     },
 
     // 获取用户信息
diff --git a/src/views/login.vue b/src/views/login.vue
index 0bffc523..b559c98c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -99,7 +99,7 @@
 </template>
 
 <script>
-import { getCodeImg, getSmsCode, smsLogin } from "@/api/login";
+import { getCodeImg, getSmsCode } from "@/api/login";
 import Cookies from "js-cookie";
 //引用wx sdk
 import wx from "weixin-js-sdk";
diff --git a/src/views/register.vue b/src/views/register.vue
index 448f2cdb..a75e31d2 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -66,7 +66,8 @@
 </template>
 
 <script>
-import { registerCheck,registerOn } from "@/api/register";
+import { registerCheck } from "@/api/register";
+import {  getSmsCode } from "@/api/login";
 export default {
     name: "register",
     data() {
@@ -74,9 +75,9 @@ export default {
             formData: {
                 memberName: '张月旺', //姓名
                 idcard: '14022619700803051X', //身份证号码
-                // uuid: null, //识别uuid
+                uuid: null, //识别uuid
                 mobile: '15254587248', //手机号
-                // smsCode: null, //短信验证码
+                smsCode: null, //短信验证码
             },
             loading: false,
             computeTime: 0,
@@ -86,36 +87,43 @@ export default {
         handleRegister(){
             if(this.checkFun()){
                 let oData = this.formData;
-                  if(oData.smsCode==''){
+                if(oData.smsCode==''){
                     this.$dialog.alert({
                         message: '请输入短信验证码',
                     });
                     return false;
                 }
-                
-                registerOn(this.formData).then((res) => {
-                    console.log(res)
+              this.$store
+                .dispatch("Register", this.formData)
+                .then(() => {
+                    this.$router.push({ path: this.redirect || "/" }).catch(() => {});
                 })
-
-
+                .catch(() => {
+                    this.loading = false;
+                });
             }
         },
         getSmsCode() {
             if (!this.computeTime) {
                 if(this.checkFun()){
-                   registerCheck(this.formData).then((res) => {
+                    let oData = this.formData;
+                   registerCheck(oData.memberName,oData.idcard,oData.mobile).then((res) => {
                     if (res.code === 200) {
-                        this.$dialog.alert({
-                            message: '验证码已发送',
+                       getSmsCode(this.formData.mobile).then((res) => {
+                            if (res.code === 200) {
+                                this.$dialog.alert({
+                                message: '验证码已发送',
+                                });
+                                this.loginForm.uuid = res.uuid;
+                                this.computeTime = 60;
+                                this.timer = setInterval(() => {
+                                this.computeTime--;
+                                if (this.computeTime <= 0) {
+                                    clearInterval(this.timer);
+                                }
+                                }, 1000);
+                            }
                         });
-                        this.loginForm.uuid = res.uuid;
-                        this.computeTime = 60;
-                        this.timer = setInterval(() => {
-                        this.computeTime--;
-                        if (this.computeTime <= 0) {
-                            clearInterval(this.timer);
-                        }
-                        }, 1000);
                     }
                     });
                 }
@@ -126,7 +134,6 @@ export default {
             let memberName_Regexp=/^[\u4e00-\u9fa5]{1,6}(·[\u4e00-\u9fa5]{1,6}){0,2}$/; //校验姓名
             let idcard_Regexp = /^[1-9][0-9]{5}([1][9][0-9]{2}|[2][0][0|1][0-9])([0][1-9]|[1][0|1|2])([0][1-9]|[1|2][0-9]|[3][0|1])[0-9]{3}([0-9]|[X])$/; //身份证
             let mobile_Regexp=/^1[3|4|5|7|8]\d{9}$/;
-            console.log(oData.mobile)
             if (!memberName_Regexp.test(oData.memberName)) {
                 this.$dialog.alert({
                     message: '姓名格式不正确',