diff --git a/app/Module/Base.php b/app/Module/Base.php
index 8593a03b9..4a3e03ee0 100755
--- a/app/Module/Base.php
+++ b/app/Module/Base.php
@@ -2734,7 +2734,7 @@ class Base
         }
 
         $src = $createfun($src_img);
-        $dst = imagecreatetruecolor($width ? $width : $dst_w, $height ? $height : $dst_h);
+        $dst = imagecreatetruecolor($width ?: $dst_w, $height ?: $dst_h);
         try {
             $white = imagecolorallocate($dst, 255, 255, 255);
             imagefill($dst, 0, 0, $white);
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index c09c85ea8..36848fb74 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -209,5 +209,4 @@ store.dispatch("init").then(_ => {
     $A.Message = app.$Message;
     $A.Notice = app.$Notice;
     $A.Modal = app.$Modal;
-    $A.Store = app.$store;
 })
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index f68867753..a4a655354 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -196,7 +196,7 @@
             <div v-else-if="quickShow" class="chat-bottom-menu">
                 <ul class="scrollbar-hidden">
                     <li v-for="item in quickMsgs" @click.stop="sendQuick(item)">
-                        <div class="bottom-menu-desc no-dark-content">{{item.label}}</div>
+                        <div class="bottom-menu-desc no-dark-content" :style="item.style || null">{{item.label}}</div>
                     </li>
                 </ul>
             </div>
@@ -890,6 +890,7 @@ export default {
                     this.msgNew = 0
                     this.msgType = ''
                     this.replyActiveId = 0
+                    this.searchShow = false
                     //
                     if (this.allMsgList.length > 0) {
                         this.allMsgs = this.allMsgList
diff --git a/resources/assets/js/pages/manage/setting/components/SystemAppPush.vue b/resources/assets/js/pages/manage/setting/components/SystemAppPush.vue
index 17d1752f2..f94cb4297 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemAppPush.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemAppPush.vue
@@ -3,28 +3,30 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('友盟推送') }}</h3>
-                <FormItem :label="$L('开启推送')" prop="push">
-                    <RadioGroup v-model="formData.push">
-                        <Radio label="open">{{ $L('开启') }}</Radio>
-                        <Radio label="close">{{ $L('关闭') }}</Radio>
-                    </RadioGroup>
-                </FormItem>
-                <template v-if="formData.push === 'open'">
-                    <Divider orientation="left">iOS {{$L('参数配置')}}</Divider>
-                    <FormItem label="Appkey" prop="ios_appkey">
-                        <Input :maxlength="255" v-model="formData.ios_key"/>
+                <div class="form-box">
+                    <FormItem :label="$L('开启推送')" prop="push">
+                        <RadioGroup v-model="formData.push">
+                            <Radio label="open">{{ $L('开启') }}</Radio>
+                            <Radio label="close">{{ $L('关闭') }}</Radio>
+                        </RadioGroup>
                     </FormItem>
-                    <FormItem label="App Master Secret" prop="secret">
-                        <Input :maxlength="255" v-model="formData.ios_secret" type="password"/>
-                    </FormItem>
-                    <Divider orientation="left">Android {{$L('参数配置')}}</Divider>
-                    <FormItem label="Appkey" prop="android_appkey">
-                        <Input :maxlength="255" v-model="formData.android_key"/>
-                    </FormItem>
-                    <FormItem label="App Master Secret" prop="secret">
-                        <Input :maxlength="255" v-model="formData.android_secret" type="password"/>
-                    </FormItem>
-                </template>
+                    <template v-if="formData.push === 'open'">
+                        <Divider orientation="left">iOS {{$L('参数配置')}}</Divider>
+                        <FormItem label="Appkey" prop="ios_appkey">
+                            <Input :maxlength="255" v-model="formData.ios_key"/>
+                        </FormItem>
+                        <FormItem label="App Master Secret" prop="secret">
+                            <Input :maxlength="255" v-model="formData.ios_secret" type="password"/>
+                        </FormItem>
+                        <Divider orientation="left">Android {{$L('参数配置')}}</Divider>
+                        <FormItem label="Appkey" prop="android_appkey">
+                            <Input :maxlength="255" v-model="formData.android_key"/>
+                        </FormItem>
+                        <FormItem label="App Master Secret" prop="secret">
+                            <Input :maxlength="255" v-model="formData.android_secret" type="password"/>
+                        </FormItem>
+                    </template>
+                </div>
             </div>
         </Form>
         <div class="setting-footer">
diff --git a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
index 695053db4..b778efffd 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
@@ -3,74 +3,78 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('签到设置') }}</h3>
-                <FormItem :label="$L('功能开启')" prop="open">
-                    <RadioGroup v-model="formData.open">
-                        <Radio label="open">{{ $L('开启') }}</Radio>
-                        <Radio label="close">{{ $L('关闭') }}</Radio>
-                    </RadioGroup>
-                    <div class="export-data">
-                        <p @click="allUserShow=true">{{$L('管理成员MAC地址')}}</p>
-                        <p @click="exportShow=true">{{$L('导出签到数据')}}</p>
-                    </div>
-                </FormItem>
-                <template v-if="formData.open === 'open'">
-                    <FormItem :label="$L('签到时间')" prop="time">
-                        <TimePicker
-                            v-model="formData.time"
-                            type="timerange"
-                            format="HH:mm"
-                            :placeholder="$L('请选择签到时间')"/>
-                        <Form @submit.native.prevent>
-                            <FormItem :label="$L('最早可提前')" prop="advance">
-                                <div class="input-number-box">
-                                    <InputNumber v-model="formData.advance" :min="0" :step="1"/>
-                                    <label>{{ $L('分钟') }}</label>
-                                </div>
-                            </FormItem>
-                            <FormItem :label="$L('最晚可延后')" prop="delay">
-                                <div class="input-number-box">
-                                    <InputNumber v-model="formData.delay" :min="0" :step="1"/>
-                                    <label>{{ $L('分钟') }}</label>
-                                </div>
-                            </FormItem>
-                            <div class="form-tip">{{$L('签到前后时间收到消息通知')}}</div>
-                            <FormItem :label="$L('签到打卡提醒')" prop="remindin">
-                                <div class="input-number-box">
-                                    <InputNumber v-model="formData.remindin" :min="0" :step="1"/>
-                                    <label>{{ $L('分钟') }}</label>
-                                </div>
-                            </FormItem>
-                            <FormItem :label="$L('签到缺卡提醒')" prop="remindexceed">
-                                <div class="input-number-box">
-                                    <InputNumber v-model="formData.remindexceed" :min="0" :step="1"/>
-                                    <label>{{ $L('分钟') }}</label>
-                                </div>
-                            </FormItem>
-                            <div class="form-tip">{{$L('签到提醒对象：3天内有签到的成员（法定工作日）')}}</div>
-                        </Form>
-                    </FormItem>
-                    <FormItem :label="$L('允许修改')" prop="edit">
-                        <RadioGroup v-model="formData.edit">
-                            <Radio label="open">{{ $L('允许') }}</Radio>
-                            <Radio label="close">{{ $L('禁止') }}</Radio>
+                <div class="form-box">
+                    <FormItem :label="$L('功能开启')" prop="open">
+                        <RadioGroup v-model="formData.open">
+                            <Radio label="open">{{ $L('开启') }}</Radio>
+                            <Radio label="close">{{ $L('关闭') }}</Radio>
                         </RadioGroup>
-                        <div class="form-tip">{{$L('允许成员自己修改MAC地址')}}</div>
+                        <div class="export-data">
+                            <p @click="allUserShow=true">{{$L('管理成员MAC地址')}}</p>
+                            <p @click="exportShow=true">{{$L('导出签到数据')}}</p>
+                        </div>
                     </FormItem>
-                </template>
+                    <template v-if="formData.open === 'open'">
+                        <FormItem :label="$L('签到时间')" prop="time">
+                            <TimePicker
+                                v-model="formData.time"
+                                type="timerange"
+                                format="HH:mm"
+                                :placeholder="$L('请选择签到时间')"/>
+                            <Form @submit.native.prevent>
+                                <FormItem :label="$L('最早可提前')" prop="advance">
+                                    <div class="input-number-box">
+                                        <InputNumber v-model="formData.advance" :min="0" :step="1"/>
+                                        <label>{{ $L('分钟') }}</label>
+                                    </div>
+                                </FormItem>
+                                <FormItem :label="$L('最晚可延后')" prop="delay">
+                                    <div class="input-number-box">
+                                        <InputNumber v-model="formData.delay" :min="0" :step="1"/>
+                                        <label>{{ $L('分钟') }}</label>
+                                    </div>
+                                </FormItem>
+                                <div class="form-tip">{{$L('签到前后时间收到消息通知')}}</div>
+                                <FormItem :label="$L('签到打卡提醒')" prop="remindin">
+                                    <div class="input-number-box">
+                                        <InputNumber v-model="formData.remindin" :min="0" :step="1"/>
+                                        <label>{{ $L('分钟') }}</label>
+                                    </div>
+                                </FormItem>
+                                <FormItem :label="$L('签到缺卡提醒')" prop="remindexceed">
+                                    <div class="input-number-box">
+                                        <InputNumber v-model="formData.remindexceed" :min="0" :step="1"/>
+                                        <label>{{ $L('分钟') }}</label>
+                                    </div>
+                                </FormItem>
+                                <div class="form-tip">{{$L('签到提醒对象：3天内有签到的成员（法定工作日）')}}</div>
+                            </Form>
+                        </FormItem>
+                        <FormItem :label="$L('允许修改')" prop="edit">
+                            <RadioGroup v-model="formData.edit">
+                                <Radio label="open">{{ $L('允许') }}</Radio>
+                                <Radio label="close">{{ $L('禁止') }}</Radio>
+                            </RadioGroup>
+                            <div class="form-tip">{{$L('允许成员自己修改MAC地址')}}</div>
+                        </FormItem>
+                    </template>
+                </div>
             </div>
 
             <template v-if="formData.open === 'open'">
                 <div class="block-setting-placeholder"></div>
                 <div class="block-setting-box">
                     <h3>{{ $L('自动签到') }}</h3>
-                    <FormItem :label="$L('安装说明')" prop="explain">
-                        <p>1. {{ $L('自动签到延迟时长为±1分钟。') }}</p>
-                        <p>2. {{ $L('设备连接上指定路由器（WiFi）后自动签到。') }}</p>
-                        <p>3. {{ $L('仅支持Openwrt系统的路由器。') }}</p>
-                        <p>4. {{ $L('关闭签到功能再开启需要重新安装。') }}</p>
-                        <p>5. {{ $L('进入路由器终端执行以下命令即可完成安装：') }}</p>
-                        <Input ref="cmd" @on-focus="clickCmd" style="margin-top:6px" type="textarea" readonly :value="formData.cmd"/>
-                    </FormItem>
+                    <div class="form-box">
+                        <FormItem :label="$L('安装说明')" prop="explain">
+                            <p>1. {{ $L('自动签到延迟时长为±1分钟。') }}</p>
+                            <p>2. {{ $L('设备连接上指定路由器（WiFi）后自动签到。') }}</p>
+                            <p>3. {{ $L('仅支持Openwrt系统的路由器。') }}</p>
+                            <p>4. {{ $L('关闭签到功能再开启需要重新安装。') }}</p>
+                            <p>5. {{ $L('进入路由器终端执行以下命令即可完成安装：') }}</p>
+                            <Input ref="cmd" @on-focus="clickCmd" style="margin-top:6px" type="textarea" readonly :value="formData.cmd"/>
+                        </FormItem>
+                    </div>
                 </div>
             </template>
         </Form>
diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
index 5eb0cbac3..520046720 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
@@ -3,69 +3,75 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('邮箱服务器设置') }}</h3>
-                <FormItem :label="$L('SMTP服务器')" prop="smtp_server">
-                    <Input v-model="formData.smtp_server"/>
-                </FormItem>
-                <FormItem :label="$L('端口')" prop="port">
-                    <Input :maxlength="20" v-model="formData.port"/>
-                </FormItem>
-                <FormItem :label="$L('帐号')" prop="account">
-                    <Input :maxlength="128" v-model="formData.account"/>
-                </FormItem>
-                <FormItem :label="$L('密码')" prop="password">
-                    <Input :maxlength="128" v-model="formData.password" type="password"/>
-                </FormItem>
-                <FormItem>
-                    <Button @click="checkEmailSend">{{ $L('邮件发送测试') }}</Button>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('SMTP服务器')" prop="smtp_server">
+                        <Input v-model="formData.smtp_server"/>
+                    </FormItem>
+                    <FormItem :label="$L('端口')" prop="port">
+                        <Input :maxlength="20" v-model="formData.port"/>
+                    </FormItem>
+                    <FormItem :label="$L('帐号')" prop="account">
+                        <Input :maxlength="128" v-model="formData.account"/>
+                    </FormItem>
+                    <FormItem :label="$L('密码')" prop="password">
+                        <Input :maxlength="128" v-model="formData.password" type="password"/>
+                    </FormItem>
+                    <FormItem>
+                        <Button @click="checkEmailSend">{{ $L('邮件发送测试') }}</Button>
+                    </FormItem>
+                </div>
             </div>
 
             <div class="block-setting-placeholder"></div>
 
             <div class="block-setting-box">
                 <h3>{{ $L('邮件通知设置') }}</h3>
-                <FormItem :label="$L('开启注册验证')" prop="reg_verify">
-                    <RadioGroup v-model="formData.reg_verify">
-                        <Radio label="open">{{ $L('开启') }}</Radio>
-                        <Radio label="close">{{ $L('关闭') }}</Radio>
-                    </RadioGroup>
-                    <div v-if="formData.reg_verify == 'open'" class="form-tip">
-                        {{$L('开启后：')}}<br/>
-                        ① {{$L('帐号需验证通过才可登录')}}<br/>
-                        ② {{$L('修改邮箱和删除帐号需要邮箱验证码')}}
-                    </div>
-                </FormItem>
-                <FormItem :label="$L('消息提醒')" prop="notice_msg">
-                    <RadioGroup v-model="formData.notice_msg">
-                        <Radio label="open">{{ $L('开启') }}</Radio>
-                        <Radio label="close">{{ $L('关闭') }}</Radio>
-                    </RadioGroup>
-                    <Form v-if="formData.notice_msg == 'open'" @submit.native.prevent>
-                        <FormItem :label="$L('未读个人消息')" prop="msg_unread_user_minute">
-                            <div class="input-number-box">
-                                <InputNumber v-model="formData.msg_unread_user_minute" :min="0" :step="1"/>
-                                <label>{{ $L('分钟') }}(m)</label>
-                            </div>
-                        </FormItem>
-                        <FormItem :label="$L('未读群聊消息')" prop="msg_unread_group_minute">
-                            <div class="input-number-box">
-                                <InputNumber v-model="formData.msg_unread_group_minute" :min="0" :step="1"/>
-                                <label>{{ $L('分钟') }}(m)</label>
-                            </div>
-                        </FormItem>
-                        <div class="form-tip">{{$L('填写-1则不通知，误差±10分钟')}}</div>
-                    </Form>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('开启注册验证')" prop="reg_verify">
+                        <RadioGroup v-model="formData.reg_verify">
+                            <Radio label="open">{{ $L('开启') }}</Radio>
+                            <Radio label="close">{{ $L('关闭') }}</Radio>
+                        </RadioGroup>
+                        <div v-if="formData.reg_verify == 'open'" class="form-tip">
+                            {{$L('开启后：')}}<br/>
+                            ① {{$L('帐号需验证通过才可登录')}}<br/>
+                            ② {{$L('修改邮箱和删除帐号需要邮箱验证码')}}
+                        </div>
+                    </FormItem>
+                    <FormItem :label="$L('消息提醒')" prop="notice_msg">
+                        <RadioGroup v-model="formData.notice_msg">
+                            <Radio label="open">{{ $L('开启') }}</Radio>
+                            <Radio label="close">{{ $L('关闭') }}</Radio>
+                        </RadioGroup>
+                        <Form v-if="formData.notice_msg == 'open'" @submit.native.prevent>
+                            <FormItem :label="$L('未读个人消息')" prop="msg_unread_user_minute">
+                                <div class="input-number-box">
+                                    <InputNumber v-model="formData.msg_unread_user_minute" :min="0" :step="1"/>
+                                    <label>{{ $L('分钟') }}(m)</label>
+                                </div>
+                            </FormItem>
+                            <FormItem :label="$L('未读群聊消息')" prop="msg_unread_group_minute">
+                                <div class="input-number-box">
+                                    <InputNumber v-model="formData.msg_unread_group_minute" :min="0" :step="1"/>
+                                    <label>{{ $L('分钟') }}(m)</label>
+                                </div>
+                            </FormItem>
+                            <div class="form-tip">{{$L('填写-1则不通知，误差±10分钟')}}</div>
+                        </Form>
+                    </FormItem>
+                </div>
             </div>
 
             <div class="block-setting-placeholder"></div>
 
             <div class="block-setting-box">
                 <h3>{{ $L('忽略邮箱地址') }}</h3>
-                <FormItem :label="$L('忽略邮箱')" prop="ignore_addr">
-                    <Input v-model="formData.ignore_addr" type="textarea" :autosize="{ minRows: 3, maxRows: 50 }" />
-                    <div class="form-tip">{{$L('不会向忽略的邮箱地址发送邮件，可使用换行分割多个地址。')}}</div>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('忽略邮箱')" prop="ignore_addr">
+                        <Input v-model="formData.ignore_addr" type="textarea" :autosize="{ minRows: 3, maxRows: 50 }" />
+                        <div class="form-tip">{{$L('不会向忽略的邮箱地址发送邮件，可使用换行分割多个地址。')}}</div>
+                    </FormItem>
+                </div>
             </div>
         </Form>
         <div class="setting-footer">
diff --git a/resources/assets/js/pages/manage/setting/components/SystemMeeting.vue b/resources/assets/js/pages/manage/setting/components/SystemMeeting.vue
index 665d6ffcf..a4ff153a3 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemMeeting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemMeeting.vue
@@ -3,20 +3,22 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('AgoraIO') }}</h3>
-                <FormItem :label="$L('会议功能')" prop="open">
-                    <RadioGroup v-model="formData.open">
-                        <Radio label="open">{{ $L('开启') }}</Radio>
-                        <Radio label="close">{{ $L('关闭') }}</Radio>
-                    </RadioGroup>
-                </FormItem>
-                <template v-if="formData.open === 'open'">
-                    <FormItem label="App ID " prop="appid">
-                        <Input :maxlength="255" v-model="formData.appid"/>
+                <div class="form-box">
+                    <FormItem :label="$L('会议功能')" prop="open">
+                        <RadioGroup v-model="formData.open">
+                            <Radio label="open">{{ $L('开启') }}</Radio>
+                            <Radio label="close">{{ $L('关闭') }}</Radio>
+                        </RadioGroup>
                     </FormItem>
-                    <FormItem label="App certificate" prop="app_certificate">
-                        <Input :maxlength="255" v-model="formData.app_certificate" type="password"/>
-                    </FormItem>
-                </template>
+                    <template v-if="formData.open === 'open'">
+                        <FormItem label="App ID " prop="appid">
+                            <Input :maxlength="255" v-model="formData.appid"/>
+                        </FormItem>
+                        <FormItem label="App certificate" prop="app_certificate">
+                            <Input :maxlength="255" v-model="formData.app_certificate" type="password"/>
+                        </FormItem>
+                    </template>
+                </div>
             </div>
         </Form>
         <div class="setting-footer">
diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
index d3139dc14..b61812065 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
@@ -3,133 +3,141 @@
         <Form ref="formDatum" :model="formDatum" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('帐号相关') }}</h3>
-                <FormItem :label="$L('允许注册')" prop="reg">
-                    <RadioGroup v-model="formDatum.reg">
-                        <Radio label="open">{{$L('允许')}}</Radio>
-                        <Radio label="invite">{{$L('邀请码')}}</Radio>
-                        <Radio label="close">{{$L('禁止')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.reg == 'open'" class="form-tip">{{$L('允许：开放注册功能。')}}</div>
-                    <template v-else-if="formDatum.reg == 'invite'">
-                        <div class="form-tip">{{$L('邀请码：注册时需填写下方邀请码。')}}</div>
-                        <Input v-model="formDatum.reg_invite" style="width:200px;margin-top:6px">
-                            <span slot="prepend">{{$L('邀请码')}}</span>
-                        </Input>
-                    </template>
-                </FormItem>
-                <FormItem v-if="['open', 'invite'].includes(formDatum.reg)" :label="$L('注册身份')" prop="reg_identity">
-                    <RadioGroup v-model="formDatum.reg_identity">
-                        <Radio label="normal">{{$L('正常帐号')}}</Radio>
-                        <Radio label="temp">{{$L('临时帐号')}}</Radio>
-                    </RadioGroup>
-                    <div class="form-tip form-list">
-                        <p>{{$L('临时帐号')}}：</p>
-                        <ol>
-                            <li>{{$L('禁止查看共享所有人的文件。')}}</li>
-                            <li>{{$L('禁止发起会话。')}}</li>
-                            <li>{{$L('禁止创建群聊。')}}</li>
-                            <li>{{$L('禁止拨打电话。')}}</li>
-                        </ol>
-                    </div>
-                </FormItem>
-                <FormItem :label="$L('登录验证码')" prop="loginCode">
-                    <RadioGroup v-model="formDatum.login_code">
-                        <Radio label="auto">{{$L('自动')}}</Radio>
-                        <Radio label="open">{{$L('开启')}}</Radio>
-                        <Radio label="close">{{$L('关闭')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.login_code == 'auto'" class="form-tip">{{$L('自动：密码输入错误后必须添加验证码。')}}</div>
-                    <div v-else-if="formDatum.login_code == 'open'" class="form-tip">{{$L('开启：每次登录都需要图形验证码。')}}</div>
-                    <div v-else-if="formDatum.login_code == 'close'" class="form-tip">{{$L('关闭：不需要输入图形验证。')}}</div>
-                </FormItem>
-                <FormItem :label="$L('密码策略')" prop="passwordPolicy">
-                    <RadioGroup v-model="formDatum.password_policy">
-                        <Radio label="simple">{{$L('简单')}}</Radio>
-                        <Radio label="complex">{{$L('复杂')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.password_policy == 'simple'" class="form-tip">{{$L('简单：大于或等于6个字符。')}}</div>
-                    <div v-else-if="formDatum.password_policy == 'complex'" class="form-tip">{{$L('复杂：大于或等于6个字符，包含数字、字母大小写或者特殊字符。')}}</div>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('允许注册')" prop="reg">
+                        <RadioGroup v-model="formDatum.reg">
+                            <Radio label="open">{{$L('允许')}}</Radio>
+                            <Radio label="invite">{{$L('邀请码')}}</Radio>
+                            <Radio label="close">{{$L('禁止')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.reg == 'open'" class="form-tip">{{$L('允许：开放注册功能。')}}</div>
+                        <template v-else-if="formDatum.reg == 'invite'">
+                            <div class="form-tip">{{$L('邀请码：注册时需填写下方邀请码。')}}</div>
+                            <Input v-model="formDatum.reg_invite" style="width:200px;margin-top:6px">
+                                <span slot="prepend">{{$L('邀请码')}}</span>
+                            </Input>
+                        </template>
+                    </FormItem>
+                    <FormItem v-if="['open', 'invite'].includes(formDatum.reg)" :label="$L('注册身份')" prop="reg_identity">
+                        <RadioGroup v-model="formDatum.reg_identity">
+                            <Radio label="normal">{{$L('正常帐号')}}</Radio>
+                            <Radio label="temp">{{$L('临时帐号')}}</Radio>
+                        </RadioGroup>
+                        <div class="form-tip form-list">
+                            <p>{{$L('临时帐号')}}：</p>
+                            <ol>
+                                <li>{{$L('禁止查看共享所有人的文件。')}}</li>
+                                <li>{{$L('禁止发起会话。')}}</li>
+                                <li>{{$L('禁止创建群聊。')}}</li>
+                                <li>{{$L('禁止拨打电话。')}}</li>
+                            </ol>
+                        </div>
+                    </FormItem>
+                    <FormItem :label="$L('登录验证码')" prop="loginCode">
+                        <RadioGroup v-model="formDatum.login_code">
+                            <Radio label="auto">{{$L('自动')}}</Radio>
+                            <Radio label="open">{{$L('开启')}}</Radio>
+                            <Radio label="close">{{$L('关闭')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.login_code == 'auto'" class="form-tip">{{$L('自动：密码输入错误后必须添加验证码。')}}</div>
+                        <div v-else-if="formDatum.login_code == 'open'" class="form-tip">{{$L('开启：每次登录都需要图形验证码。')}}</div>
+                        <div v-else-if="formDatum.login_code == 'close'" class="form-tip">{{$L('关闭：不需要输入图形验证。')}}</div>
+                    </FormItem>
+                    <FormItem :label="$L('密码策略')" prop="passwordPolicy">
+                        <RadioGroup v-model="formDatum.password_policy">
+                            <Radio label="simple">{{$L('简单')}}</Radio>
+                            <Radio label="complex">{{$L('复杂')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.password_policy == 'simple'" class="form-tip">{{$L('简单：大于或等于6个字符。')}}</div>
+                        <div v-else-if="formDatum.password_policy == 'complex'" class="form-tip">{{$L('复杂：大于或等于6个字符，包含数字、字母大小写或者特殊字符。')}}</div>
+                    </FormItem>
+                </div>
             </div>
             <div class="block-setting-box">
                 <h3>{{ $L('项目相关') }}</h3>
-                <FormItem :label="$L('邀请项目')" prop="projectInvite">
-                    <RadioGroup v-model="formDatum.project_invite">
-                        <Radio label="open">{{$L('开启')}}</Radio>
-                        <Radio label="close">{{$L('关闭')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.project_invite == 'open'" class="form-tip">{{$L('开启：项目管理员可生成链接邀请成员加入项目。')}}</div>
-                </FormItem>
-                <FormItem :label="$L('自动归档任务')" prop="autoArchived">
-                    <RadioGroup :value="formDatum.auto_archived" @on-change="formArchived">
-                        <Radio label="open">{{$L('开启')}}</Radio>
-                        <Radio label="close">{{$L('关闭')}}</Radio>
-                    </RadioGroup>
-                    <div class="form-tip">{{$L('任务完成后自动归档。')}}</div>
-                    <ETooltip v-if="formDatum.auto_archived=='open'" placement="right" :disabled="windowSmall || $isEEUiApp">
-                        <div class="setting-auto-day">
-                            <Input v-model="formDatum.archived_day" type="number">
-                                <span slot="append">{{$L('天')}}</span>
-                            </Input>
-                        </div>
-                        <div slot="content">{{$L('任务完成 (*) 天后自动归档。', formDatum.archived_day)}}</div>
-                    </ETooltip>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('邀请项目')" prop="projectInvite">
+                        <RadioGroup v-model="formDatum.project_invite">
+                            <Radio label="open">{{$L('开启')}}</Radio>
+                            <Radio label="close">{{$L('关闭')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.project_invite == 'open'" class="form-tip">{{$L('开启：项目管理员可生成链接邀请成员加入项目。')}}</div>
+                    </FormItem>
+                    <FormItem :label="$L('自动归档任务')" prop="autoArchived">
+                        <RadioGroup :value="formDatum.auto_archived" @on-change="formArchived">
+                            <Radio label="open">{{$L('开启')}}</Radio>
+                            <Radio label="close">{{$L('关闭')}}</Radio>
+                        </RadioGroup>
+                        <div class="form-tip">{{$L('任务完成后自动归档。')}}</div>
+                        <ETooltip v-if="formDatum.auto_archived=='open'" placement="right" :disabled="windowSmall || $isEEUiApp">
+                            <div class="setting-auto-day">
+                                <Input v-model="formDatum.archived_day" type="number">
+                                    <span slot="append">{{$L('天')}}</span>
+                                </Input>
+                            </div>
+                            <div slot="content">{{$L('任务完成 (*) 天后自动归档。', formDatum.archived_day)}}</div>
+                        </ETooltip>
+                    </FormItem>
+                </div>
             </div>
             <div class="block-setting-box">
                 <h3>{{ $L('消息相关') }}</h3>
-                <FormItem :label="$L('全员群组禁言')" prop="allGroupMute">
-                    <RadioGroup v-model="formDatum.all_group_mute">
-                        <Radio label="open">{{$L('开放')}}</Radio>
-                        <Radio label="user">{{$L('成员禁言')}}</Radio>
-                        <Radio label="all">{{$L('全部禁言')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.all_group_mute == 'open'" class="form-tip">{{$L('开放：所有人都可以发言。')}}</div>
-                    <div v-else-if="formDatum.all_group_mute == 'user'" class="form-tip">{{$L('成员禁言：仅管理员可以发言。')}}</div>
-                    <div v-else-if="formDatum.all_group_mute == 'all'" class="form-tip">{{$L('全部禁言：所有人都禁止发言。')}}</div>
-                </FormItem>
-                <FormItem :label="$L('自动进入全员群')" prop="allGroupAutoin">
-                    <RadioGroup v-model="formDatum.all_group_autoin">
-                        <Radio label="yes">{{$L('自动')}}</Radio>
-                        <Radio label="no">{{$L('关闭')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.all_group_autoin == 'yes'" class="form-tip">{{$L('自动：注册成功后自动进入全员群。')}}</div>
-                    <div v-else-if="formDatum.all_group_autoin == 'no'" class="form-tip">{{$L('关闭：其他成员通过@邀请进入。')}}</div>
-                </FormItem>
-                <FormItem :label="$L('聊天资料')" prop="chatInformation">
-                    <RadioGroup v-model="formDatum.chat_information">
-                        <Radio label="optional">{{$L('可选')}}</Radio>
-                        <Radio label="required">{{$L('必填')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.chat_information == 'required'" class="form-tip">{{$L('必填：发送聊天内容前必须设置昵称、电话。')}}</div>
-                    <div v-else class="form-tip">{{$L('如果必填，发送聊天前必须设置昵称、电话。')}}</div>
-                </FormItem>
-                <FormItem :label="$L('匿名消息')" prop="anonMessage">
-                    <RadioGroup v-model="formDatum.anon_message">
-                        <Radio label="open">{{$L('开启')}}</Radio>
-                        <Radio label="close">{{$L('关闭')}}</Radio>
-                    </RadioGroup>
-                    <div v-if="formDatum.anon_message == 'open'" class="form-tip">{{$L('允许匿名发送消息给其他成员。')}}</div>
-                    <div v-else class="form-tip">{{$L('禁止匿名发送消息。')}}</div>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('全员群组禁言')" prop="allGroupMute">
+                        <RadioGroup v-model="formDatum.all_group_mute">
+                            <Radio label="open">{{$L('开放')}}</Radio>
+                            <Radio label="user">{{$L('成员禁言')}}</Radio>
+                            <Radio label="all">{{$L('全部禁言')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.all_group_mute == 'open'" class="form-tip">{{$L('开放：所有人都可以发言。')}}</div>
+                        <div v-else-if="formDatum.all_group_mute == 'user'" class="form-tip">{{$L('成员禁言：仅管理员可以发言。')}}</div>
+                        <div v-else-if="formDatum.all_group_mute == 'all'" class="form-tip">{{$L('全部禁言：所有人都禁止发言。')}}</div>
+                    </FormItem>
+                    <FormItem :label="$L('自动进入全员群')" prop="allGroupAutoin">
+                        <RadioGroup v-model="formDatum.all_group_autoin">
+                            <Radio label="yes">{{$L('自动')}}</Radio>
+                            <Radio label="no">{{$L('关闭')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.all_group_autoin == 'yes'" class="form-tip">{{$L('自动：注册成功后自动进入全员群。')}}</div>
+                        <div v-else-if="formDatum.all_group_autoin == 'no'" class="form-tip">{{$L('关闭：其他成员通过@邀请进入。')}}</div>
+                    </FormItem>
+                    <FormItem :label="$L('聊天资料')" prop="chatInformation">
+                        <RadioGroup v-model="formDatum.chat_information">
+                            <Radio label="optional">{{$L('可选')}}</Radio>
+                            <Radio label="required">{{$L('必填')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.chat_information == 'required'" class="form-tip">{{$L('必填：发送聊天内容前必须设置昵称、电话。')}}</div>
+                        <div v-else class="form-tip">{{$L('如果必填，发送聊天前必须设置昵称、电话。')}}</div>
+                    </FormItem>
+                    <FormItem :label="$L('匿名消息')" prop="anonMessage">
+                        <RadioGroup v-model="formDatum.anon_message">
+                            <Radio label="open">{{$L('开启')}}</Radio>
+                            <Radio label="close">{{$L('关闭')}}</Radio>
+                        </RadioGroup>
+                        <div v-if="formDatum.anon_message == 'open'" class="form-tip">{{$L('允许匿名发送消息给其他成员。')}}</div>
+                        <div v-else class="form-tip">{{$L('禁止匿名发送消息。')}}</div>
+                    </FormItem>
+                </div>
             </div>
             <div class="block-setting-box">
                 <h3>{{ $L('其他设置') }}</h3>
-                <FormItem :label="$L('是否启动首页')" prop="startHome">
-                    <RadioGroup v-model="formDatum.start_home">
-                        <Radio label="open">{{$L('开启')}}</Radio>
-                        <Radio label="close">{{$L('关闭')}}</Radio>
-                    </RadioGroup>
-                    <div class="form-tip">{{$L('仅支持网页版。')}}</div>
-                    <Input
-                        v-if="formDatum.start_home == 'open'"
-                        v-model="formDatum.home_footer"
-                        type="textarea"
-                        style="margin:8px 0 -8px"
-                        :rows="2"
-                        :autosize="{ minRows: 2, maxRows: 8 }"
-                        :placeholder="$L('首页底部：首页底部网站备案号等信息')"/>
-                </FormItem>
+                <div class="form-box">
+                    <FormItem :label="$L('是否启动首页')" prop="startHome">
+                        <RadioGroup v-model="formDatum.start_home">
+                            <Radio label="open">{{$L('开启')}}</Radio>
+                            <Radio label="close">{{$L('关闭')}}</Radio>
+                        </RadioGroup>
+                        <div class="form-tip">{{$L('仅支持网页版。')}}</div>
+                        <Input
+                            v-if="formDatum.start_home == 'open'"
+                            v-model="formDatum.home_footer"
+                            type="textarea"
+                            style="margin:8px 0 -8px"
+                            :rows="2"
+                            :autosize="{ minRows: 2, maxRows: 8 }"
+                            :placeholder="$L('首页底部：首页底部网站备案号等信息')"/>
+                    </FormItem>
+                </div>
             </div>
         </Form>
         <div class="setting-footer">
diff --git a/resources/assets/js/pages/manage/setting/components/SystemThirdAccess.vue b/resources/assets/js/pages/manage/setting/components/SystemThirdAccess.vue
index 0220541c4..758c9c3b7 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemThirdAccess.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemThirdAccess.vue
@@ -3,41 +3,43 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('LDAP') }}</h3>
-                <FormItem :label="$L('启用 LDAP 认证')" prop="ldap_open">
-                    <RadioGroup v-model="formData.ldap_open">
-                        <Radio label="open">{{ $L('开启') }}</Radio>
-                        <Radio label="close">{{ $L('关闭') }}</Radio>
-                    </RadioGroup>
-                    <div class="form-tip">{{$L('开启后可以直接使用 LDAP 帐号密码登录')}}</div>
-                </FormItem>
-                <template v-if="formData.ldap_open === 'open'">
-                    <FormItem :label="$L('LDAP 地址')" prop="ldap_host">
-                        <Input v-model="formData.ldap_host"/>
-                        <div class="form-tip">{{$L('例如')}}: 192.168.1.200、www.ldap.com</div>
-                    </FormItem>
-                    <FormItem :label="$L('LDAP 端口')" prop="ldap_port">
-                        <Input v-model="formData.ldap_port" type="number" :placeholder="`${$L('默认')}: 389`"/>
-                    </FormItem>
-                    <FormItem label="Base DN" prop="ldap_base_dn">
-                        <Input v-model="formData.ldap_base_dn"/>
-                    </FormItem>
-                    <FormItem label="User DN" prop="ldap_user_dn">
-                        <Input v-model="formData.ldap_user_dn"/>
-                    </FormItem>
-                    <FormItem :label="$L('密码')" prop="ldap_password">
-                        <Input v-model="formData.ldap_password" type="password"/>
-                    </FormItem>
-                    <FormItem :label="$L('同步本地帐号')" prop="ldap_sync_local">
-                        <RadioGroup v-model="formData.ldap_sync_local">
+                <div class="form-box">
+                    <FormItem :label="$L('启用 LDAP 认证')" prop="ldap_open">
+                        <RadioGroup v-model="formData.ldap_open">
                             <Radio label="open">{{ $L('开启') }}</Radio>
                             <Radio label="close">{{ $L('关闭') }}</Radio>
                         </RadioGroup>
-                        <div class="form-tip">{{$L('开启同步本地帐号登录后将同步到 LDAP 服务器')}}</div>
+                        <div class="form-tip">{{$L('开启后可以直接使用 LDAP 帐号密码登录')}}</div>
                     </FormItem>
-                    <FormItem>
-                        <Button :loading="testLoad" @click="checkTest">{{ $L('测试链接') }}</Button>
-                    </FormItem>
-                </template>
+                    <template v-if="formData.ldap_open === 'open'">
+                        <FormItem :label="$L('LDAP 地址')" prop="ldap_host">
+                            <Input v-model="formData.ldap_host"/>
+                            <div class="form-tip">{{$L('例如')}}: 192.168.1.200、www.ldap.com</div>
+                        </FormItem>
+                        <FormItem :label="$L('LDAP 端口')" prop="ldap_port">
+                            <Input v-model="formData.ldap_port" type="number" :placeholder="`${$L('默认')}: 389`"/>
+                        </FormItem>
+                        <FormItem label="Base DN" prop="ldap_base_dn">
+                            <Input v-model="formData.ldap_base_dn"/>
+                        </FormItem>
+                        <FormItem label="User DN" prop="ldap_user_dn">
+                            <Input v-model="formData.ldap_user_dn"/>
+                        </FormItem>
+                        <FormItem :label="$L('密码')" prop="ldap_password">
+                            <Input v-model="formData.ldap_password" type="password"/>
+                        </FormItem>
+                        <FormItem :label="$L('同步本地帐号')" prop="ldap_sync_local">
+                            <RadioGroup v-model="formData.ldap_sync_local">
+                                <Radio label="open">{{ $L('开启') }}</Radio>
+                                <Radio label="close">{{ $L('关闭') }}</Radio>
+                            </RadioGroup>
+                            <div class="form-tip">{{$L('开启同步本地帐号登录后将同步到 LDAP 服务器')}}</div>
+                        </FormItem>
+                        <FormItem>
+                            <Button :loading="testLoad" @click="checkTest">{{ $L('测试链接') }}</Button>
+                        </FormItem>
+                    </template>
+                </div>
             </div>
         </Form>
         <div class="setting-footer">
diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss
index 83b555580..2bbcf3210 100644
--- a/resources/assets/sass/pages/page-file.scss
+++ b/resources/assets/sass/pages/page-file.scss
@@ -363,7 +363,7 @@
                         justify-content: space-between;
                         cursor: pointer;
                         .file-input {
-                            margin: 0 4px 4px;
+                            margin: 11px 4px 4px;
                             position: relative;
                             input {
                                 margin: 0;
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 8a32f7243..41d29d086 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -281,6 +281,10 @@
                                     transform: translateY(-50%);
                                 }
 
+                                .form-box {
+                                    overflow: auto;
+                                }
+
                                 .ivu-form-item {
                                     .ivu-form {
                                         padding: 12px 0 0 0;