Эх сурвалжийг харах

注册点击无反应,注册提交按钮bug修复

jackson 4 сар өмнө
parent
commit
23af732148

+ 11 - 1
.idea/sonarlint/issuestore/index.pb

@@ -93,4 +93,14 @@ L
 n
 n
 >src/pages/conversation/index/components/ConversationHeader.vue,4/a/4af37255c0c652a1204d6cf1b67c96252ae86916
 >src/pages/conversation/index/components/ConversationHeader.vue,4/a/4af37255c0c652a1204d6cf1b67c96252ae86916
 E
 E
-src/pages/rtc/data.ts,4/3/43e04e878f0926320b9d2ff9d4528083e2ac35ec
+src/pages/rtc/data.ts,4/3/43e04e878f0926320b9d2ff9d4528083e2ac35ec
+O
+src/pages/login/index/index.vue,4/d/4de2cf5c671963c98f60d055c2b18e4ced652f5f
+K
+src/router/modules/login.ts,e/d/edc004f0faf20814a6b96911378704cb7267ad15
+Q
+!src/pages/login/getCode/index.vue,4/f/4f4ae0009da54438a6cd058fd8317de366d8cf38
+Q
+!src/pages/profile/index/index.vue,1/4/14bb3aa7f2fa1e01b3845eb666e8dd9afe51b8cd
+U
+%src/pages/login/setBaseInfo/index.vue,1/5/1596928214f3f3dcc4592d6f5cf15eb1b126a8a6

+ 11 - 1
.idea/sonarlint/securityhotspotstore/index.pb

@@ -93,4 +93,14 @@ L
 n
 n
 >src/pages/conversation/index/components/ConversationHeader.vue,4/a/4af37255c0c652a1204d6cf1b67c96252ae86916
 >src/pages/conversation/index/components/ConversationHeader.vue,4/a/4af37255c0c652a1204d6cf1b67c96252ae86916
 E
 E
-src/pages/rtc/data.ts,4/3/43e04e878f0926320b9d2ff9d4528083e2ac35ec
+src/pages/rtc/data.ts,4/3/43e04e878f0926320b9d2ff9d4528083e2ac35ec
+O
+src/pages/login/index/index.vue,4/d/4de2cf5c671963c98f60d055c2b18e4ced652f5f
+K
+src/router/modules/login.ts,e/d/edc004f0faf20814a6b96911378704cb7267ad15
+Q
+!src/pages/login/getCode/index.vue,4/f/4f4ae0009da54438a6cd058fd8317de366d8cf38
+Q
+!src/pages/profile/index/index.vue,1/4/14bb3aa7f2fa1e01b3845eb666e8dd9afe51b8cd
+U
+%src/pages/login/setBaseInfo/index.vue,1/5/1596928214f3f3dcc4592d6f5cf15eb1b126a8a6

+ 6 - 6
src/pages/login/getCode/index.vue

@@ -8,7 +8,7 @@
     />
     />
 
 
     <div class="text-2xl text-primary font-semibold my-12">
     <div class="text-2xl text-primary font-semibold my-12">
-      {{ isRegiste ? $t("register") : $t("forgetPasswordTitle") }}
+      {{ route.query.isRegiste ? $t("register") : $t("forgetPasswordTitle") }}
     </div>
     </div>
 
 
     <van-form @submit="onSubmit">
     <van-form @submit="onSubmit">
@@ -33,7 +33,7 @@
         </div>
         </div>
       </div>
       </div>
 
 
-      <div class="mt-5" v-if="isRegiste"></div>
+      <div class="mt-5" v-if="route.query.isRegiste"></div>
 
 
       <div class="mt-5" v-else>
       <div class="mt-5" v-else>
         <div class="text-sm mb-1 text-sub-text">{{ $t("reAcquireDesc") }}</div>
         <div class="text-sm mb-1 text-sub-text">{{ $t("reAcquireDesc") }}</div>
@@ -90,8 +90,8 @@ const phoneRegExp = /^1[3-9]\d{9}$/;
 
 
 const { t } = useI18n();
 const { t } = useI18n();
 const router = useRouter();
 const router = useRouter();
+const route = useRoute();
 
 
-const props = defineProps<{ isRegiste: boolean }>();
 const formData = reactive({
 const formData = reactive({
   phoneNumber: "",
   phoneNumber: "",
   areaCode: "+86",
   areaCode: "+86",
@@ -111,7 +111,7 @@ const onSubmit = () => {
     });
     });
     return;
     return;
   }
   }
-  if (!props.isRegiste) {
+  if (!route.query.isRegiste) {
     verifyCode({
     verifyCode({
       phoneNumber: formData.phoneNumber,
       phoneNumber: formData.phoneNumber,
       areaCode: formData.areaCode,
       areaCode: formData.areaCode,
@@ -123,7 +123,7 @@ const onSubmit = () => {
         query: {
         query: {
           baseData: JSON.stringify({
           baseData: JSON.stringify({
             ...formData,
             ...formData,
-            isRegiste: props.isRegiste,
+            isRegiste: route.query.isRegiste,
           }),
           }),
         },
         },
       });
       });
@@ -140,7 +140,7 @@ const onSubmit = () => {
       query: {
       query: {
         baseData: JSON.stringify({
         baseData: JSON.stringify({
           ...formData,
           ...formData,
-          isRegiste: props.isRegiste,
+          isRegiste: route.query.isRegiste,
         }),
         }),
       },
       },
     });
     });

+ 1 - 1
src/pages/login/setBaseInfo/index.vue

@@ -131,7 +131,7 @@ const login = async () => {
     setTMUserID(userID);
     setTMUserID(userID);
     router.push("login");
     router.push("login");
   } catch (error) {
   } catch (error) {
-    console.log(error);
+    loading.value = false;
     // feedbackToast({ error, message: t('messageTip.registerFailed') })
     // feedbackToast({ error, message: t('messageTip.registerFailed') })
   }
   }
 };
 };

+ 2 - 2
src/pages/profile/index/index.vue

@@ -111,7 +111,7 @@ const tryLogout = () => {
         userStore.userLogout()
         userStore.userLogout()
           .finally(() => {
           .finally(() => {
             resolve(true)
             resolve(true)
-            router.push("/login");
+            window.location.href = '/login'
           })
           })
       })
       })
     }
     }
@@ -120,4 +120,4 @@ const tryLogout = () => {
 
 
 </script>
 </script>
 
 
-<style lang='scss' scoped></style>
+<style lang='scss' scoped></style>

+ 0 - 9
src/router/modules/login.ts

@@ -22,15 +22,6 @@ const loginRouters: Array<RouteRecordRaw> = [
   {
   {
     path: "/getCode",
     path: "/getCode",
     name: "GetCode",
     name: "GetCode",
-    props: ({ query }) => {
-      let isRegiste;
-      try {
-        isRegiste = JSON.parse(query.isRegiste as string);
-      } catch (error) {}
-      return {
-        isRegiste,
-      };
-    },
     component: () => import("@pages/login/getCode/index.vue"),
     component: () => import("@pages/login/getCode/index.vue"),
   },
   },
   {
   {