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 @@ {{$L('必填')}}
{{$L('必填:发送聊天内容前必须设置昵称。')}}
+
{{$L('如果必填,发送聊天前必须设置昵称。')}}
{{$L('开启')}} {{$L('关闭')}} +
{{$L('任务完成后自动归档。')}}
@@ -64,6 +66,7 @@ {{$L('开启')}} {{$L('关闭')}} +
{{$L('仅支持网页版。')}}