diff --git a/.env.development b/.env.development
index ed3017e..c57bc09 100644
--- a/.env.development
+++ b/.env.development
@@ -6,4 +6,4 @@ VITE_APP_TITLE = 超管系统
 VITE_APP_ENV = 'development'
 
 # 代理管理系统/开发环境
-VITE_APP_BASE_API = '/dev-api'
+VITE_APP_BASE_API = '/ff-api'
diff --git a/dist.rar b/dist.rar
index 023a21e..3edf8dc 100644
Binary files a/dist.rar and b/dist.rar differ
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 15085e3..8638609 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -119,6 +119,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 bd06cd8..f9e0754 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/login.vue b/src/views/login.vue
index 69648d1..e1f05d7 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>
@@ -70,7 +70,7 @@
     <el-dialog v-model="goodDialogVisible" align-center :title="t('温馨提示')" width="418" :before-close="handleClose">
       <div style="width: 90%;margin-bottom: 20px;">{{ t('请用手机打开客服端Google身份验证器,输入验证码') }}</div>
       <div class="">
-        <CodeInput v-model="gooleCode" style="width: 90%" :maxlength="6" :placeholder="t('验证码只能为数字')" ></CodeInput>
+        <CodeInput v-model="gooleCode" style="width: 90%" :maxlength="6" :placeholder="t('请输入6位Google验证码')" ></CodeInput>
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -90,7 +90,7 @@
       </div>
       <el-form ref="authenticatorRef" :model="authenticatorForm" :rules="authenticatorRules">
         <el-form-item label="谷歌验证码" prop="authenticatorCode">
-          <CodeInput v-model="authenticatorForm.authenticatorCode" :maxlength="6" style="width: 100%;height: 36px;" :placeholder="t('验证码只能为数字')" ></CodeInput>
+          <CodeInput v-model="authenticatorForm.authenticatorCode" :maxlength="6" style="width: 100%;height: 36px;" :placeholder="t('请输入6位Google验证码')" ></CodeInput>
         </el-form-item>
       </el-form>
       <div class="" style="margin-top: 20px;margin-bottom: 20px;">
@@ -138,8 +138,22 @@ const loginForm = ref({
 });
 
 const loginRules = {
-  username: [{ required: true, trigger: "change", message: proxy.t('请输入您的账号') }],
-  password: [{ required: true, trigger: "change", 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: [
   {
@@ -165,7 +179,7 @@ const register = ref(false);
 const redirect = ref(undefined);
 const goodDialogVisible = ref(false);
 const goodDialogShow = ref(false);
-const gooleCode = ref('666666');// google验证码
+const gooleCode = ref('');// google验证码
 const tokenCode = ref('');
 
 watch(route, (newRoute) => {
@@ -230,6 +244,8 @@ const clickVisible = () => {
 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/report/billingRecords/billingRecords/list.vue b/src/views/report/billingRecords/billingRecords/list.vue
index 384d318..5055121 100644
--- a/src/views/report/billingRecords/billingRecords/list.vue
+++ b/src/views/report/billingRecords/billingRecords/list.vue
@@ -55,17 +55,21 @@
           {{ row.siteName }}
        </template>
        </el-table-column>
-     <el-table-column :label="t('账变类型')" width="100" align="center" prop="changeType" >
-       <template #default="{row}">
-          {{ row.changeType }}
-       </template>
-       </el-table-column>
-     <el-table-column :label="t('账变细项')" width="70" align="center" prop="operationType" >
-       <template #default="{row}">
-         {{ row.operationType }}
-       </template>
-       </el-table-column>
-     <el-table-column :label="t('交易对象')" width="180" align="center" prop="changeTarget" />
+       <el-table-column :label="t('账变类型')" width="100" align="center" prop="changeType" >
+      <template #default="{row}">
+        <dict-text :optionsArr="changeTypeArr" :value="row.changeType"></dict-text>
+      </template>
+      </el-table-column>
+    <el-table-column :label="t('账变细项')" min-width="130" align="center" prop="operationType" >
+      <template #default="{row}">
+        <dict-text :optionsArr="operationTypeArr" :value="row.operationType"></dict-text>
+      </template>
+      </el-table-column>
+    <el-table-column :label="t('交易对象')" width="180" align="center" prop="changeTarget" >
+      <template #default="{row}">
+        <dict-text :optionsArr="changeTargetArr" :value="row.changeTarget"></dict-text>
+      </template>
+    </el-table-column>
      <el-table-column :label="t('变动前余额')" align="center" width="160" prop="balanceBefore" :show-overflow-tooltip="true">
         <template #default="scope">{{ scope.row.balanceBefore||'--' }}</template>
      </el-table-column>
@@ -98,6 +102,7 @@
 <script setup name="BillingRecords">
 import {getSiteFlowQuotasList} from "@/api/report";
 import CustomSelect from '@/components/CustomSelect';
+import DictText from '@/components/DictText';
 import CheckboxSelect from "@/components/CheckboxSelect"; // 多选框
 import TableSearchDate from '@/components/TableSearchDate'
 import AddSiteDialog from "./components/AddSiteDialog"; // 新增站点弹窗
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 => {
diff --git a/vite.config.js b/vite.config.js
index ce977fb..707502d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -24,25 +24,25 @@ export default defineConfig(({ mode, command }) => {
          port: 80,
          host: true,
          open: true,
-         proxy: {
-            '/dev-api': {
-               // target: 'http://192.168.50.139:9080',
-               target: 'http://192.168.50.234:8081',
-              //  target: 'http://192.168.50.178:8080',
-               // target: 'http://192.168.50.11:8081',
-               changeOrigin: true,
-               rewrite: (p) => p.replace(/^\/dev-api/, '')
-            }
-         },
          // proxy: {
-         //    '/ff-api': {
-         //       target: 'https://osssuper.kk9game.com', // 线上接口地址
-         //       changeOrigin: true, // 是否允许跨域
-         //       pathRewrite: {
-         //          '^/ff-api': '' // 如果你需要去掉前缀，例如将 /api/xxx 替换为 /xxx
-         //       }
+         //    '/dev-api': {
+         //       // target: 'http://192.168.50.139:9080',
+         //       target: 'http://192.168.50.234:8081',
+         //      //  target: 'http://192.168.50.178:8080',
+         //       // target: 'http://192.168.50.11:8081',
+         //       changeOrigin: true,
+         //       rewrite: (p) => p.replace(/^\/dev-api/, '')
          //    }
-         // }
+         // },
+         proxy: {
+            '/ff-api': {
+               target: 'https://osssuper.kk9game.com', // 线上接口地址
+               changeOrigin: true, // 是否允许跨域
+               pathRewrite: {
+                  '^/ff-api': '' // 如果你需要去掉前缀，例如将 /api/xxx 替换为 /xxx
+               }
+            }
+         }
       },
       css: {
          postcss: {