From f1dc8f5a7f3a661ce19513a9ad47fe18e3e883ff Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Mon, 12 Aug 2024 11:47:14 +0800
Subject: [PATCH] 1

---
 src/views/login/register.vue |   54 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index 2ea2923..c2c6d6a 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -15,10 +15,10 @@
               style="margin-bottom: 20px"
               v-for="(val, index) in funcArr"
               :key="index"
-              @click="clickChange(index)"
+              @click="clickChange(index+1)"
             >
               <div
-                :class="[recordActive == index ? 'active' : '', 'css-1cahv52']"
+                :class="[recordActive == index+1 ? 'active' : '', 'css-1cahv52']"
               >
                 {{ val }}
               </div>
@@ -53,7 +53,7 @@
                       ? t('qsr_shoujihao')
                       : recordActive == 1
                       ? t('qsr_youxiang')
-                      : t('qsr_zhanghao6wei')
+                      : t('qsr_zhanghao6weiD')
                   "
                   clearable
                   v-model.trim="register.username"
@@ -121,7 +121,7 @@
               </div>
             </div>
 
-            <!-- 6.验证码 Verification code -->
+<!--            &lt;!&ndash; 6.验证码 Verification code &ndash;&gt;
             <div
               class="css-15651n7"
               v-if="recordActive == 0 || recordActive == 1"
@@ -142,7 +142,7 @@
                   </template>
                 </el-input>
               </div>
-            </div>
+            </div>-->
             <!-- 注册  -->
             <button
               data-bn-type="button"
@@ -153,7 +153,7 @@
             </button>
           </div>
           <div class="css-jhkvqo">
-            {{ t("zhuceguo") }}?&nbsp;
+            {{ t("zhuceguo") }}&nbsp;
             <div class="css-r3o9q9" @click="goLogin">
               {{ t("denglu") }}
             </div>
@@ -213,6 +213,8 @@
     type.value = 1;
   } else if (index == 1) {
     type.value = 2;
+  }else if (index == 2){
+    type.value = 1;
   }
   register.value = {
     username: "",
@@ -275,10 +277,10 @@
     return;
   }
 
-  if ([0, 1].includes(recordActive.value) && !verifcode) {
-    ElMessage.error(t("qsr_yanzhengma"));
-    return;
-  }
+  // if ([0, 1].includes(recordActive.value) && !verifcode) {
+  //   ElMessage.error(t("qsr_yanzhengma"));
+  //   return;
+  // }
 
   // 以上为验证不为空
   // 以下验证数据对不对
@@ -310,29 +312,47 @@
       Axios.resgister({
         username: account,
         password,
-        verifcode,
+        re_password: password,
+        // verifcode,
         usercode,
-        safeword,
         type: type.value,
       }).then((res) => {
         // 注册成功,存储账户信息
         if (res.code == 0) {
-          ElMessage.success(t("message.home.zhucechenggong"));
           setStorage("spToken", res.data.token);
           setStorage("username", res.data.username);
           userStore.updateUserInfo(res.data);
-          router.push("/idSet"); //去实名认证
+          Axios.setSafewordReg({safeword}).then((response) => {
+            console.log(response)
+            ElMessage.success(t("message.home.zhucechenggong"));
+            router.push("/idSet"); //去实名认证
+          })
         }
       });
     } else if (recordActive.value == 2) {
-      Axios.imageVerifica().then((res) => {
+      Axios.resgister({
+        username: account,
+        password,
+        re_password: password,
+        // verifcode,
+        usercode,
+        type: 3,
+      }).then((res) => {
         if (res.code == "0") {
-          ImageVerRef.value.isShowFunc(res.data, {
+          setStorage("spToken", res.data.token);
+          setStorage("username", res.data.username);
+          userStore.updateUserInfo(res.data);
+          Axios.setSafewordReg({safeword}).then((response) => {
+            console.log(response)
+            ElMessage.success(t("message.home.zhucechenggong"));
+            router.push("/idSet"); //去实名认证
+          })
+         /* ImageVerRef.value.isShowFunc(res.data, {
             username: account,
             password,
             usercode,
             safeword,
-          });
+          });*/
         }
       });
     }

--
Gitblit v1.9.3