From 66a31e1c6ce00cd5ce6535d277a58557a3e27013 Mon Sep 17 00:00:00 2001
From: YuanJian <792487760@qq.com>
Date: Wed, 24 Sep 2025 20:41:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201=EF=BC=8C=E4=BF=AE=E6=94=B9taptbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/SidebarItem.vue |  1 +
 src/layout/components/Sidebar/index.vue       |  2 +-
 src/views/agent/agentInformation/index.vue    |  4 +--
 src/views/agent/index.vue                     |  2 +-
 src/views/commission/index.vue                |  2 +-
 src/views/login.vue                           | 26 +++++++++++++++----
 .../components/AdjustmentDialog copy.vue      |  2 +-
 .../components/AdjustmentDialog.vue           |  2 +-
 .../user/user/components/GoogleCodeDialog.vue |  4 +--
 9 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 38e62ad..e11d3a5 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -117,6 +117,7 @@ function hasTitle(title) {
 .submenu-title-noDropdown {
   height: var(--el-menu-item-height) !important;
   padding: 0;
+  min-width: 80px;
 }
 
 
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index e7f8cfa..05291af 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -94,7 +94,7 @@
                   <el-input v-model="passwordFormData.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
                </el-form-item>
                <el-form-item label="谷歌验证码" prop="codeGoogle">
-                  <CodeInput v-model="passwordFormData.codeGoogle" maxlength="6" placeholder="请输入谷歌验证码"/>
+                  <CodeInput v-model="passwordFormData.codeGoogle" maxlength="6" placeholder="请输入6位Google验证码"/>
                </el-form-item>
             </el-form>
          </el-scrollbar>
diff --git a/src/views/agent/agentInformation/index.vue b/src/views/agent/agentInformation/index.vue
index 7fbc0fc..0c26e71 100644
--- a/src/views/agent/agentInformation/index.vue
+++ b/src/views/agent/agentInformation/index.vue
@@ -111,7 +111,7 @@
                   </el-input-number>
                </el-form-item>
                <el-form-item :label="t('谷歌验证码')" prop="googleCode">
-                  <CodeInput v-model="form.googleCode" :maxlength="6" style="width: 260px;" :placeholder="t('请输入谷歌验证码')" />
+                  <CodeInput v-model="form.googleCode" :maxlength="6" style="width: 260px;" :placeholder="t('请输入6位Google验证码')" />
 
                </el-form-item>
                <!-- <div class="label-scoreRatio">
@@ -163,7 +163,7 @@
                   </el-input-number>
                </el-form-item>
                <el-form-item :label="t('谷歌验证码')" prop="googleCode">
-                  <CodeInput v-model="form.googleCode" :maxlength="6" style="width: 260px;" :placeholder="t('请输入谷歌验证码')" />
+                  <CodeInput v-model="form.googleCode" :maxlength="6" style="width: 260px;" :placeholder="t('请输入6位Google验证码')" />
                </el-form-item>
             <!-- <el-form-item :label="t('商户模式')" prop="tenantType">
                <el-radio-group v-model="form.tenantType" :disabled="openView">
diff --git a/src/views/agent/index.vue b/src/views/agent/index.vue
index 8b290ea..f22ba7c 100644
--- a/src/views/agent/index.vue
+++ b/src/views/agent/index.vue
@@ -73,7 +73,7 @@
               {{ t(' (万法定货币=1万通用额度)') }}
             </el-form-item>
             <el-form-item :label="t('谷歌验证码')" prop="googleCode">
-                  <CodeInput v-model="form.googleCode" :maxlength="6" style="width: 260px;" :placeholder="t('请输入谷歌验证码')" />
+                  <CodeInput v-model="form.googleCode" :maxlength="6" style="width: 260px;" :placeholder="t('请输入6位Google验证码')" />
             </el-form-item>
             <div class="label-scoreRatio">
                <span>{{ t('平台比例') }}</span>
diff --git a/src/views/commission/index.vue b/src/views/commission/index.vue
index 67aa3df..6b241bc 100644
--- a/src/views/commission/index.vue
+++ b/src/views/commission/index.vue
@@ -83,7 +83,7 @@
                <el-input v-model="userInfos.walletAddress" disabled auto-complete="off"  placeholder="请输入钱包地址" />
             </el-form-item>
             <el-form-item :label="t('谷歌验证码')" prop="googleCode">
-               <CodeInput v-model="form.googleCode" :maxlength="6" :placeholder="t('请输入谷歌验证码')" />
+               <CodeInput v-model="form.googleCode" :maxlength="6" :placeholder="t('请输入6位Google验证码')" />
             </el-form-item>
          </el-form>
          <template #footer>
diff --git a/src/views/login.vue b/src/views/login.vue
index d72488b..810ff80 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -20,7 +20,7 @@
       </div>
       <el-form-item prop="username" class="el-form-item-class">
         <el-input v-model="loginForm.username" type="text" size="large" style="height: 52px;" class="backgr-class"
-        :autocomplete="'new-password'" auto-complete="off" placeholder="账号">
+        :autocomplete="'new-password'" auto-complete="off" placeholder="账号" @keydown.space.prevent>
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
@@ -91,7 +91,7 @@
     <el-dialog v-model="goodDialogVisible" style="margin-top: 45vh !important;" :title="t('温馨提示')" width="418" :before-close="handleClose">
       <div style="width: 90%;margin-bottom: 20px;">{{ t('请用手机打开客服端Google身份验证器,输入验证码') }}</div>
       <div class="">
-        <CodeInput  v-model="gooleCode" :maxlength="6" style="width: 90%" :placeholder="t('验证码只能为数字')" />
+        <CodeInput  v-model="gooleCode" :maxlength="6" style="width: 90%" :placeholder="t('请输入6位Google验证码')" />
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -111,7 +111,7 @@
       </div>
       <el-form ref="authenticatorRef" :model="authenticatorForm" :rules="authenticatorRules">
         <el-form-item label="谷歌验证码" prop="authenticatorCode">
-          <CodeInput v-model="authenticatorForm.authenticatorCode" :maxlength="6" :digit="2" style="width: 100%;height: 36px;" :placeholder="t('验证码只能为数字')" />
+          <CodeInput v-model="authenticatorForm.authenticatorCode" :maxlength="6" :digit="2" style="width: 100%;height: 36px;" :placeholder="t('请输入6位Google验证码')" />
         </el-form-item>
       </el-form>
       <div class="" style="margin-top: 20px;margin-bottom: 20px;">
@@ -160,8 +160,22 @@ const loginForm = ref({
 });
 
 const loginRules = {
-  username: [{ required: true, trigger: "blur", message: proxy.t('请输入您的账号') }],
-  password: [{ required: true, trigger: "blur", message: proxy.t('请输入您的密码') }],
+  username: [
+    { required: true, trigger: "change", message: proxy.t('请输入您的账号') },
+    { 
+      pattern: /^[A-Za-z0-9!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+$/,
+      message: proxy.t('账号只能输入字母、数字和英文符号'),
+      trigger: "change"
+    }
+  ],
+  password: [
+    { required: true, trigger: "change", message: proxy.t('请输入您的密码') },
+    { 
+      pattern: /^[A-Za-z0-9!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+$/,
+      message: proxy.t('密码只能输入字母、数字和英文符号'),
+      trigger: "change"
+    }
+  ],
   code: [{ required: true, trigger: "change", message: proxy.t('请输入验证码') }],
   isShowEnabled: [
   {
@@ -216,6 +230,8 @@ watch(route, (newRoute) => {
 function handleLogin() {
   proxy.$refs.loginRef.validate(valid => {
     if (valid) {
+      gooleCode.value = '';
+      authenticatorForm.value.authenticatorCode = '';
       loading.value = true;
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
diff --git a/src/views/merchant/businessInformation/components/AdjustmentDialog copy.vue b/src/views/merchant/businessInformation/components/AdjustmentDialog copy.vue
index d4d394f..01dea65 100644
--- a/src/views/merchant/businessInformation/components/AdjustmentDialog copy.vue	
+++ b/src/views/merchant/businessInformation/components/AdjustmentDialog copy.vue	
@@ -111,7 +111,7 @@
                 {{ t('如需扣余额，则输入负数，例如：-10.50') }}
             </div>
             <el-form-item :label="t('谷歌验证码')" prop="googleCode">
-                <CodeInput v-model="formAdjustment.googleCode" :maxlength="6" :placeholder="t('请输入谷歌验证码')" />
+                <CodeInput v-model="formAdjustment.googleCode" :maxlength="6" :placeholder="t('请输入6位Google验证码')" />
             </el-form-item>
             <el-form-item :label="t('备注')" prop="remark">
                 <el-input type="textarea" rows="4" v-model="formAdjustment.remark" :placeholder="t('请输入备注')" />
diff --git a/src/views/merchant/businessInformation/components/AdjustmentDialog.vue b/src/views/merchant/businessInformation/components/AdjustmentDialog.vue
index 689aef7..32075ef 100644
--- a/src/views/merchant/businessInformation/components/AdjustmentDialog.vue
+++ b/src/views/merchant/businessInformation/components/AdjustmentDialog.vue
@@ -28,7 +28,7 @@
                 </div>
             </el-form-item>
             <el-form-item :label="t('谷歌验证码')" prop="googleCode">
-                <CodeInput v-model="formAdjustment.googleCode" :maxlength="6" :placeholder="t('请输入谷歌验证码')" />
+                <CodeInput v-model="formAdjustment.googleCode" :maxlength="6" :placeholder="t('请输入6位Google验证码')" />
             </el-form-item>
             <el-form-item :label="t('备注')" prop="remark">
                 <el-input type="textarea" rows="4" v-model="formAdjustment.remark" :placeholder="t('请输入备注')" />
diff --git a/src/views/system/user/user/components/GoogleCodeDialog.vue b/src/views/system/user/user/components/GoogleCodeDialog.vue
index 6e398a3..a04f38c 100644
--- a/src/views/system/user/user/components/GoogleCodeDialog.vue
+++ b/src/views/system/user/user/components/GoogleCodeDialog.vue
@@ -7,7 +7,7 @@
             </template>
                <el-form :model="formGoogle" :rules="rulesGoogle" ref="googleRef" label-width="130px">
                   <el-form-item label="Google验证码" prop="googleCode">
-                     <CodeInput v-model="formGoogle.googleCode" placeholder="请输入您的Google验证码" maxlength="6" />
+                     <CodeInput v-model="formGoogle.googleCode" placeholder="请输入6位Google验证码" maxlength="6" />
                   </el-form-item>
                </el-form>
                <template #footer>
@@ -53,7 +53,7 @@ const formGoogle = reactive({
 
 //数据更新区域
 nextTick(() => {
-   
+    formGoogle.googleCode = '';
 })
 const submitGoogle = () => { 
     proxy.$refs["googleRef"].validate(valid => {