Merge remote-tracking branch 'origin/master'

jiangping

2025-01-23 9adce67dc6af1c6cf4a0d0528eced986771c2d64

 h5/pages/staffLogin/login.vue

@@ -81,7 +81,7 @@
      loginH5ByPhone,

      getUserInfo,

      getSystemDictData,

      saveHkUserOpenid,
      saveHkUserOpenid,

      sendSms

   } from '@/api'

   import {

@@ -95,7 +95,7 @@
         return {

            form: {

               // username: '18655749830',

               username: null,
               username: null,

               phone: null,

               password: null,

               code: null

@@ -159,7 +159,7 @@
                  title: '验证码不能为空',

                  icon: 'none'

               })

            }
            }

            let fn = activeTab == 0 ? loginPost : loginH5ByPhone

            fn({

               ...form,

@@ -175,8 +175,7 @@
                     })

                  })

                  saveHkUserOpenid({})

               } else {

               }

               } else {}

            })

         },

         ...mapMutations(["setToken", "setUserInfo"]),

@@ -215,11 +214,13 @@
            sendSms({

               phone: this.form.phone

            }).then(res => {

               this.countDown = 60

               setInterval(() => {

                  if (this.countDown == 0) return

                  this.countDown--

               }, 1000)

               if (res.code === 200) {

                  this.countDown = 60

                  setInterval(() => {

                     if (this.countDown == 0) return

                     this.countDown--

                  }, 1000)

               }

            })

         }

      }