no message

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);

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;
 })

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

resources/assets/js/pages/manage/setting/components/SystemAppPush.vue

@@ -3,6 +3,7 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('友盟推送') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('开启推送')" prop="push">
                         <RadioGroup v-model="formData.push">
                             <Radio label="open">{{ $L('开启') }}</Radio>
@@ -26,6 +27,7 @@
                         </FormItem>
                     </template>
                 </div>
+            </div>
         </Form>
         <div class="setting-footer">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{ $L('提交') }}</Button>

resources/assets/js/pages/manage/setting/components/SystemCheckin.vue

@@ -3,6 +3,7 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('签到设置') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('功能开启')" prop="open">
                         <RadioGroup v-model="formData.open">
                             <Radio label="open">{{ $L('开启') }}</Radio>
@@ -58,11 +59,13 @@
                         </FormItem>
                     </template>
                 </div>
+            </div>
 
             <template v-if="formData.open === 'open'">
                 <div class="block-setting-placeholder"></div>
                 <div class="block-setting-box">
                     <h3>{{ $L('自动签到') }}</h3>
+                    <div class="form-box">
                         <FormItem :label="$L('安装说明')" prop="explain">
                             <p>1. {{ $L('自动签到延迟时长为±1分钟。') }}</p>
                             <p>2. {{ $L('设备连接上指定路由器（WiFi）后自动签到。') }}</p>
@@ -72,6 +75,7 @@
                             <Input ref="cmd" @on-focus="clickCmd" style="margin-top:6px" type="textarea" readonly :value="formData.cmd"/>
                         </FormItem>
                     </div>
+                </div>
             </template>
         </Form>
         <div class="setting-footer">

resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue

@@ -3,6 +3,7 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('邮箱服务器设置') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('SMTP服务器')" prop="smtp_server">
                         <Input v-model="formData.smtp_server"/>
                     </FormItem>
@@ -19,11 +20,13 @@
                         <Button @click="checkEmailSend">{{ $L('邮件发送测试') }}</Button>
                     </FormItem>
                 </div>
+            </div>
 
             <div class="block-setting-placeholder"></div>
 
             <div class="block-setting-box">
                 <h3>{{ $L('邮件通知设置') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('开启注册验证')" prop="reg_verify">
                         <RadioGroup v-model="formData.reg_verify">
                             <Radio label="open">{{ $L('开启') }}</Radio>
@@ -57,16 +60,19 @@
                         </Form>
                     </FormItem>
                 </div>
+            </div>
 
             <div class="block-setting-placeholder"></div>
 
             <div class="block-setting-box">
                 <h3>{{ $L('忽略邮箱地址') }}</h3>
+                <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">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{ $L('提交') }}</Button>

resources/assets/js/pages/manage/setting/components/SystemMeeting.vue

@@ -3,6 +3,7 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('AgoraIO') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('会议功能')" prop="open">
                         <RadioGroup v-model="formData.open">
                             <Radio label="open">{{ $L('开启') }}</Radio>
@@ -18,6 +19,7 @@
                         </FormItem>
                     </template>
                 </div>
+            </div>
         </Form>
         <div class="setting-footer">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{ $L('提交') }}</Button>

resources/assets/js/pages/manage/setting/components/SystemSetting.vue

@@ -3,6 +3,7 @@
         <Form ref="formDatum" :model="formDatum" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('帐号相关') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('允许注册')" prop="reg">
                         <RadioGroup v-model="formDatum.reg">
                             <Radio label="open">{{$L('允许')}}</Radio>
@@ -51,8 +52,10 @@
                         <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>
+                <div class="form-box">
                     <FormItem :label="$L('邀请项目')" prop="projectInvite">
                         <RadioGroup v-model="formDatum.project_invite">
                             <Radio label="open">{{$L('开启')}}</Radio>
@@ -76,8 +79,10 @@
                         </ETooltip>
                     </FormItem>
                 </div>
+            </div>
             <div class="block-setting-box">
                 <h3>{{ $L('消息相关') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('全员群组禁言')" prop="allGroupMute">
                         <RadioGroup v-model="formDatum.all_group_mute">
                             <Radio label="open">{{$L('开放')}}</Radio>
@@ -113,8 +118,10 @@
                         <div v-else class="form-tip">{{$L('禁止匿名发送消息。')}}</div>
                     </FormItem>
                 </div>
+            </div>
             <div class="block-setting-box">
                 <h3>{{ $L('其他设置') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('是否启动首页')" prop="startHome">
                         <RadioGroup v-model="formDatum.start_home">
                             <Radio label="open">{{$L('开启')}}</Radio>
@@ -131,6 +138,7 @@
                             :placeholder="$L('首页底部：首页底部网站备案号等信息')"/>
                     </FormItem>
                 </div>
+            </div>
         </Form>
         <div class="setting-footer">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{$L('提交')}}</Button>

resources/assets/js/pages/manage/setting/components/SystemThirdAccess.vue

@@ -3,6 +3,7 @@
         <Form ref="formData" :model="formData" :rules="ruleData" label-width="auto" @submit.native.prevent>
             <div class="block-setting-box">
                 <h3>{{ $L('LDAP') }}</h3>
+                <div class="form-box">
                     <FormItem :label="$L('启用 LDAP 认证')" prop="ldap_open">
                         <RadioGroup v-model="formData.ldap_open">
                             <Radio label="open">{{ $L('开启') }}</Radio>
@@ -39,6 +40,7 @@
                         </FormItem>
                     </template>
                 </div>
+            </div>
         </Form>
         <div class="setting-footer">
             <Button :loading="loadIng > 0" type="primary" @click="submitForm">{{ $L('提交') }}</Button>

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;

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;