From 6018b71562aa3237b12b7203ff4b6ce4b0bb6a54 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Thu, 8 May 2025 15:34:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=A8=E5=86=8C=E6=A8=A1=E5=9D=97->?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=80=92=E8=AE=A1=E6=97=B660=E7=A7=92?=
 =?UTF-8?q?=E5=90=8E=E6=98=BE=E7=A4=BANAN=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8CmapActions?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=BC=95=E5=85=A5=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E6=B2=A1=E6=9C=89S=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/register/register.vue                     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/java-mall-app-shop-admin/pages/register/register.vue b/java-mall-app-shop-admin/pages/register/register.vue
index 10d3750..b4ffb71 100644
--- a/java-mall-app-shop-admin/pages/register/register.vue
+++ b/java-mall-app-shop-admin/pages/register/register.vue
@@ -45,7 +45,7 @@
                   :hair-line="false"
                   size="mini"
                   @click="getSmsCode"
-                  >{{ verifyText }}</u-button
+                  >{{ parseInt(verifyText) > 0 ? `${verifyText}S` : verifyText }}</u-button
                 >
               </template>
             </u-input>
@@ -82,6 +82,7 @@
 <script>
 import { mapActions, mapState } from "vuex";
 import { GetSmsCode } from "../../api/login";
+
 export default {
   name: "login",
   data() {
@@ -102,7 +103,7 @@ export default {
   },
   onLoad(options) {},
   computed: {
-    ...mapState("user", ["ukey", "approvalStatus"]),
+    ...mapState(["userInfo"]),
   },
   onShow() {
     if (this.ukey && [1, 2, 3].includes(this.approvalStatus)) {
@@ -121,6 +122,7 @@ export default {
   },
   onHide() {},
   methods: {
+    ...mapActions("user", ["GetLogin", "GetSmsCode", "GetAccountLogin"]),
     // 手机注册
     async handleRegister() {
       if (!this.account) {
@@ -159,12 +161,13 @@ export default {
       await this.GetLogin(params);
     },
     loadSmsTime() {
+      clearInterval(this.time);
       this.time = setInterval(() => {
         this.verifyText--;
 
         uni.setStorageSync("registerSmsTime", this.verifyText);
 
-        if (this.verifyText == 0) {
+        if (this.verifyText <= 0) {
           clearInterval(this.time);
           this.verifyText = "获取验证码";
           uni.removeStorageSync("registerSmsTime");
@@ -196,12 +199,12 @@ export default {
       if (Number(this.verifyText) > 0) return;
 
       this.verifyText = 60;
+      clearInterval(this.time);
       this.time = setInterval(() => {
         this.verifyText--;
-
         uni.setStorageSync("registerSmsTime", this.verifyText);
 
-        if (this.verifyText == 0) {
+        if (this.verifyText <= 0) {
           clearInterval(this.time);
           this.verifyText = "获取验证码";
           uni.removeStorageSync("registerSmsTime");