xiongzhu 3 éve
szülő
commit
472341c171
4 módosított fájl, 12 hozzáadás és 9 törlés
  1. 2 0
      src/locales/en.json
  2. 4 3
      src/locales/zh.json
  3. 2 2
      src/stores/user.js
  4. 4 4
      src/views/RegisterPage.vue

+ 2 - 0
src/locales/en.json

@@ -94,6 +94,8 @@
     "phone": "phone number",
     "phone": "phone number",
     "phoneError": "Wrong format of phone number",
     "phoneError": "Wrong format of phone number",
     "phonePla": "Please enter phone number",
     "phonePla": "Please enter phone number",
+    "username":"Username",
+    "enterUsername": "Enter your username",
     "psd": "password",
     "psd": "password",
     "psdAgainError": "The two passwords entered are inconsistent",
     "psdAgainError": "The two passwords entered are inconsistent",
     "psdAgainPla": "please enter password again",
     "psdAgainPla": "please enter password again",

+ 4 - 3
src/locales/zh.json

@@ -150,7 +150,7 @@
         "joinTeamAt": "加入团队时间",
         "joinTeamAt": "加入团队时间",
         "saveImg": "保存图片",
         "saveImg": "保存图片",
         "empty": "暂无",
         "empty": "暂无",
-        "invite":"去邀请"
+        "invite": "去邀请"
     },
     },
     "home": {
     "home": {
         "all": "全部"
         "all": "全部"
@@ -171,10 +171,11 @@
         "loginByCode": "验证码登录",
         "loginByCode": "验证码登录",
         "phone": "手机号",
         "phone": "手机号",
         "phonePla": "请输入手机号",
         "phonePla": "请输入手机号",
+        "enterUsername": "请输入用户名",
         "phoneError": "手机号码格式错误",
         "phoneError": "手机号码格式错误",
         "psd": "密码",
         "psd": "密码",
         "psdPla": "请输入密码",
         "psdPla": "请输入密码",
-        "nameError":"账号长度6-20,只能包含数字字母下划线,不能为纯数字",
+        "nameError": "账号长度6-20,只能包含数字字母下划线,不能为纯数字",
         "psdAgainPla": "请再次输入密码",
         "psdAgainPla": "请再次输入密码",
         "psdAgainError": "两次密码输入不一致",
         "psdAgainError": "两次密码输入不一致",
         "invitorPla": "邀请码(选填)",
         "invitorPla": "邀请码(选填)",
@@ -191,7 +192,7 @@
         "registerSuccess": "注册成功",
         "registerSuccess": "注册成功",
         "register": "注册账号",
         "register": "注册账号",
         "loginNow": "已有账号,立即登录",
         "loginNow": "已有账号,立即登录",
-        "psdEorror":"密码长度6-20,只能包含数字字母下划线,不能为纯数字"
+        "psdEorror": "密码长度6-20,只能包含数字字母下划线,不能为纯数字"
     },
     },
     "news": {
     "news": {
         "newsNull": "没有任何新闻哦~"
         "newsNull": "没有任何新闻哦~"

+ 2 - 2
src/stores/user.js

@@ -52,9 +52,9 @@ export const useUserStore = defineStore('user', () => {
                 })
                 })
         })
         })
     }
     }
-    const register = (phone, code, password, invitor) => {
+    const register = (username, code, password, invitor) => {
         return new Promise((resolve, reject) => {
         return new Promise((resolve, reject) => {
-            http.post('/auth/userRegister', { username: phone, password, invitor })
+            http.post('/auth/userRegister', { username, password, invitor })
                 .then(token => {
                 .then(token => {
                     http.setToken(token)
                     http.setToken(token)
                     return http.get('/user/my')
                     return http.get('/user/my')

+ 4 - 4
src/views/RegisterPage.vue

@@ -13,11 +13,11 @@
                 <van-cell-group :border="false">
                 <van-cell-group :border="false">
                     <van-field
                     <van-field
                         v-model="formData.username"
                         v-model="formData.username"
-                        name="phone"
-                        :placeholder="$t('loginPage.phonePla')"
+                        name="username"
+                        :placeholder="$t('loginPage.username')"
                         type="tel"
                         type="tel"
                         :rules="[
                         :rules="[
-                            { required: true, message: $t('loginPage.phonePla') },
+                            { required: true, message: $t('loginPage.enterUsername') },
                             {
                             {
                                 pattern: /^(?![0-9]+$)[0-9A-Za-z_]{6,20}$/,
                                 pattern: /^(?![0-9]+$)[0-9A-Za-z_]{6,20}$/,
                                 message: $t('loginPage.nameError')
                                 message: $t('loginPage.nameError')
@@ -215,7 +215,7 @@ export default {
             })
             })
 
 
             this.userStore
             this.userStore
-                .register(this.formData.phone, this.formData.code, this.formData.password, this.formData.invitor)
+                .register(this.formData.username, this.formData.code, this.formData.password, this.formData.invitor)
                 .then(() => {
                 .then(() => {
                     this.$toast.success(this.$t('loginPage.registerSuccess'))
                     this.$toast.success(this.$t('loginPage.registerSuccess'))
                     setTimeout(() => {
                     setTimeout(() => {