diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 6cae12ade..26454ae85 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1074,7 +1074,7 @@ class UsersController extends AbstractController
      * @apiGroup users
      * @apiName delete__account
      *
-     * @apiParam {String} email          账号邮箱
+     * @apiParam {String} email          帐号邮箱
      * @apiParam {String} code           邮箱验证码
      * @apiParam {String} reason         注销理由
      * @apiParam {String} password       登录密码
diff --git a/app/Models/UserDelete.php b/app/Models/UserDelete.php
index f9c393716..8a2edad94 100644
--- a/app/Models/UserDelete.php
+++ b/app/Models/UserDelete.php
@@ -9,7 +9,7 @@ namespace App\Models;
  *
  * @property int $id
  * @property int|null $userid 用户id
- * @property string|null $email 邮箱账号
+ * @property string|null $email 邮箱帐号
  * @property string|null $reason 注销原因
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
diff --git a/app/Models/UserEmailVerification.php b/app/Models/UserEmailVerification.php
index 1dff69259..8f98cfffd 100644
--- a/app/Models/UserEmailVerification.php
+++ b/app/Models/UserEmailVerification.php
@@ -43,35 +43,39 @@ class UserEmailVerification extends AbstractModel
      */
     public static function userEmailSend(User $user, $type = 1, $email = null)
     {
-        $email = $type != 1 ? $email : $user->email;
+        $email = $type == 1 ? $user->email : $email;
         $res = self::whereEmail($email)->where('created_at', '>', Carbon::now()->subMinutes(30))->whereType($type)->first();
         if ($res) return;
         //删除
         self::whereUserid($email)->delete();
-        $code = $type != 1 ? rand(100000, 999999) : Base::generatePassword(64);
-        $userEmailVerification = self::createInstance([
+        $code = $type == 1 ? Base::generatePassword(64) : rand(100000, 999999);
+        $row = self::createInstance([
             'userid' => $user->userid,
             'email' => $email,
             'code' => $code,
             'status' => 0,
             'type' => $type
         ]);
-        $userEmailVerification->save();
+        $row->save();
         $setting = Base::setting('emailSetting');
-        $url = Base::fillUrl('single/valid/email') . '?code=' . $userEmailVerification->code;
         try {
             if (!Base::isEmail($email)) {
                 throw new \Exception("User email '{$email}' address error");
             }
-            if ($type == 2) {
-                $subject = env('APP_NAME') . "修改邮箱验证";
-                $content = "<p>{$user->nickname} 您好，您正在修改 " . env('APP_NAME') . " 的邮箱，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD; margin-left: 10%;'>$code</p><p>如果不是本人操作，您的账号可能存在风险，请及时修改密码!</p>";
-            } elseif ($type == 3) {
-                $subject = env('APP_NAME') . "注销账号验证";
-                $content = "<p>{$user->nickname} 您好，您正在注销 " . env('APP_NAME') . " 的账号，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD; margin-left: 10%;'>$code</p><p>如果不是本人操作，您的账号可能存在风险，请及时修改密码!</p>";
-            } else {
-                $subject = env('APP_NAME') . "绑定邮箱验证";
-                $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
+            switch ($type) {
+                case 2:
+                    $subject = env('APP_NAME') . "修改邮箱验证";
+                    $content = "<p>{$user->nickname} 您好，您正在修改 " . env('APP_NAME') . " 的邮箱，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    break;
+                case 3:
+                    $subject = env('APP_NAME') . "注销帐号验证";
+                    $content = "<p>{$user->nickname} 您好，您正在注销 " . env('APP_NAME') . " 的帐号，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    break;
+                default:
+                    $url = Base::fillUrl('single/valid/email') . '?code=' . $row->code;
+                    $subject = env('APP_NAME') . "绑定邮箱验证";
+                    $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
+                    break;
             }
             Factory::mailer()
                 ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
diff --git a/database/migrations/2022_07_13_145504_create_user_deletes_table.php b/database/migrations/2022_07_13_145504_create_user_deletes_table.php
index c4cbb9e70..04af201c8 100644
--- a/database/migrations/2022_07_13_145504_create_user_deletes_table.php
+++ b/database/migrations/2022_07_13_145504_create_user_deletes_table.php
@@ -16,7 +16,7 @@ class CreateUserDeletesTable extends Migration
         Schema::create('user_deletes', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->bigInteger('userid')->nullable()->default(0)->comment('用户id');
-            $table->string('email', 100)->nullable()->default('')->comment('邮箱账号');
+            $table->string('email', 100)->nullable()->default('')->comment('邮箱帐号');
             $table->text('reason')->nullable()->comment('注销原因');
             $table->timestamps();
         });
diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
index 978831e41..0a886d497 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
@@ -32,7 +32,7 @@
                     <div v-if="formData.reg_verify == 'open'" class="form-tip">
                         {{$L('开启后：')}}<br/>
                         {{$L('① 帐号需验证通过才可登录')}}<br/>
-                        {{$L('② 修改邮箱和删除账号需要邮箱验证码')}}
+                        {{$L('② 修改邮箱和删除帐号需要邮箱验证码')}}
                     </div>
                 </FormItem>
                 <FormItem :label="$L('任务提醒')" prop="notice">
diff --git a/resources/assets/js/pages/manage/setting/delete.vue b/resources/assets/js/pages/manage/setting/delete.vue
index cbd551563..b6bdf2503 100644
--- a/resources/assets/js/pages/manage/setting/delete.vue
+++ b/resources/assets/js/pages/manage/setting/delete.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="setting-item submit">
         <Form ref="formDatum" :model="formDatum" :rules="ruleDatum" label-width="auto" @submit.native.prevent>
-            <FormItem :label="$L('账号')" prop="email">
+            <FormItem :label="$L('帐号')" prop="email">
                 <div class="setting-email">
                     <Input v-if="isRegVerify == 1" v-model="formDatum.email"
                            :class="count > 0 ? 'setting-send-input':'setting-input'" search @on-search="sendEmailCode"
                            :enter-button="$L(sendBtnText)" :placeholder="$L('请输入邮箱')"/>
-                    <Input v-else class="setting-input" v-model="formDatum.email" :placeholder="$L('请输入邮箱账号')"/>
+                    <Input v-else class="setting-input" v-model="formDatum.email" :placeholder="$L('请输入邮箱帐号')"/>
                 </div>
             </FormItem>
             <FormItem :label="$L('邮箱验证码')" prop="code" v-if="isRegVerify == 1">
@@ -26,15 +26,15 @@
         </div>
         <Modal
             v-model="warningShow"
-            :title="$L(`删除${appTitle}账号`)"
+            :title="$L(`删除${appTitle}帐号`)"
             class="page-setting-delete-box">
-            <div class="big-text">{{ $L('账号删除后，该账号将无法正常登录且无法恢复，账号下的所有数据也将被删除。') }}</div>
+            <div class="big-text">{{ $L('帐号删除后，该帐号将无法正常登录且无法恢复，帐号下的所有数据也将被删除。') }}</div>
             <div class="small-text">
                 <div>{{ $L('注销前，请确认一下事项：') }}</div>
-                <div>{{ $L('1、您将无法查看该账号内的任何信息，包括账号信息、文件记录、聊天记录、项目信息、团队成员信息等。') }}</div>
+                <div>{{ $L('1、您将无法查看该帐号内的任何信息，包括帐号信息、文件记录、聊天记录、项目信息、团队成员信息等。') }}</div>
                 <div>{{ $L('2、若你是团队的所有者，请在注销您的账户前转移所有权。例如该账户所创建的项目（可将项目移交他人或删除项目）以及文件夹。') }}</div>
                 <div>{{ $L('3、您将退出所有群聊，无法查到过往消息和人员。') }}</div>
-                <div>{{ $L('4、请保证账号未被暂停使用。') }}</div>
+                <div>{{ $L('4、请保证帐号未被暂停使用。') }}</div>
             </div>
             <div slot="footer" class="button-box">
                 <Button type="primary" :loading="loadIng > 0" @click="submitForm('confirm')">{{ $L('已清楚风险，确定注销') }}
@@ -63,9 +63,9 @@ export default {
                     {
                         validator: (rule, value, callback) => {
                             if (value.trim() === '') {
-                                callback(new Error(this.$L('请输入邮箱账号！')));
+                                callback(new Error(this.$L('请输入邮箱帐号！')));
                             } else if (!$A.isEmail(value.trim())) {
-                                callback(new Error(this.$L('请输入正确邮箱账号！')));
+                                callback(new Error(this.$L('请输入正确邮箱帐号！')));
                             } else {
                                 callback();
                             }
diff --git a/resources/assets/js/pages/pro.vue b/resources/assets/js/pages/pro.vue
index 960f3ac9e..6222a9d66 100644
--- a/resources/assets/js/pages/pro.vue
+++ b/resources/assets/js/pages/pro.vue
@@ -72,7 +72,7 @@
                         <div class="plans-table-info-desc">{{$L('拥有最新版本所有功能')}}</div>
                         <div class="plans-table-info-desc">{{$L('无限制')}}</div>
                         <div class="plans-table-info-btn">
-                            <Tooltip :content="$L('账号：%、密码：%', 'admin', '123456')" transfer>
+                            <Tooltip :content="$L('帐号：%、密码：%', 'admin', '123456')" transfer>
                                 <a href="https://www.dootask.com" class="btn" target="_blank">{{$L('体验DEMO')}}</a>
                             </Tooltip>
                         </div>
@@ -247,7 +247,7 @@
                             <div class="plans-table-td"><span> - </span></div>
                             <div class="plans-table-td"><span> - </span></div>
                             <div class="plans-table-info-btn">
-                                <Tooltip :content="$L('账号：%、密码：%', 'admin', '123456')" transfer>
+                                <Tooltip :content="$L('帐号：%、密码：%', 'admin', '123456')" transfer>
                                     <a href="https://www.dootask.com" class="btn" target="_blank">{{$L('体验DEMO')}}</a>
                                 </Tooltip>
                             </div>