From a4e8761addcdc489fbb47a8953fa5053e526d5f5 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 23 Mar 2022 11:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=98=BE=E7=A4=BA=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/php/php.conf                                        | 4 ++--
 resources/assets/js/pages/index.vue                        | 7 +------
 .../js/pages/manage/setting/components/SystemSetting.vue   | 3 +++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docker/php/php.conf b/docker/php/php.conf
index 14a4861a6..0837cbf54 100644
--- a/docker/php/php.conf
+++ b/docker/php/php.conf
@@ -2,10 +2,10 @@
 directory=/var/www
 
 # 生产环境
-command=php bin/laravels start -i
+#command=php bin/laravels start -i
 
 # 开发环境
-#command=./bin/inotify ./app
+command=./bin/inotify ./app
 
 numprocs=1
 autostart=true
diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue
index 8d3b24cd6..e6d2cff0e 100644
--- a/resources/assets/js/pages/index.vue
+++ b/resources/assets/js/pages/index.vue
@@ -203,11 +203,6 @@ export default {
     },
 
     methods: {
-        isNotServer() {
-            let apiHome = $A.getDomain(window.systemInfo.apiUrl)
-            return this.$Electron && (apiHome == "" || apiHome == "public")
-        },
-
         setTheme(mode) {
             this.$store.dispatch("setTheme", mode)
         },
@@ -221,7 +216,7 @@ export default {
         },
 
         getNeedStartHome() {
-            if (this.isNotServer()) {
+            if (this.$Electron) {
                 this.needStartHome = false;
                 this.goForward({name: 'login'}, true);
                 return;
diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
index d1d8c0da5..70c395812 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue
@@ -44,12 +44,14 @@
                     <Radio label="required">{{$L('必填')}}</Radio>
                 </RadioGroup>
                 <div v-if="formDatum.chat_nickname == 'required'" class="form-tip">{{$L('必填：发送聊天内容前必须设置昵称。')}}</div>
+                <div v-else 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">
                     <div class="setting-auto-day">
                         <Input v-model="formDatum.archived_day" type="number">
@@ -64,6 +66,7 @@
                     <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"