Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env.development

src/views/register.vue

@@ -265,7 +265,7 @@ export default {
         console.log("response", response);
         if (response.code == 20000) {
           this.validateBtn();
-          this.$message.success("验证码发送成功");
+          this.$message.success(response.data);
         } else {
           this.$message.error(response.message);
         }
@@ -281,7 +281,6 @@ export default {
             console.log("444");
             if (response.code === 20000) {
               this.$router.push("/userInformation");
-
               this.$message.error("提交成功");
             } else {
               this.$message.error(response.message);
@@ -289,7 +288,6 @@ export default {
           });
         }
       });
-      this.$router.push("/userInformation");
     },
 
     //用户信息填写  表单