diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php index fbc7eddde..21846c3e3 100644 --- a/app/Tasks/BotReceiveMsgTask.php +++ b/app/Tasks/BotReceiveMsgTask.php @@ -446,6 +446,7 @@ class BotReceiveMsgTask extends AbstractTask 'gemini_key' => $setting['gemini_key'], 'gemini_model' => $setting['gemini_model'], 'gemini_agency' => $setting['gemini_agency'], + 'gemini_timeout' => 20, 'server_url' => $serverUrl, ]; if (empty($extras['gemini_key'])) { @@ -470,7 +471,7 @@ class BotReceiveMsgTask extends AbstractTask } // try { - $res = Ihttp::ihttp_post($webhookUrl, [ + $data = [ 'text' => $command, 'token' => User::generateToken($botUser), 'dialog_id' => $dialog->id, @@ -481,7 +482,8 @@ class BotReceiveMsgTask extends AbstractTask 'bot_uid' => $botUser->userid, 'version' => Base::getVersion(), 'extras' => Base::array2json($extras) - ], 10); + ]; + $res = Ihttp::ihttp_post($webhookUrl, $data, 10); if ($userBot) { $userBot->webhook_num++; $userBot->save(); diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 4d7726c30..796a46b3b 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -492,21 +492,22 @@ export default { // 列表点击事件 clickList(item){ - this.unreadList.map(h=>{ h._active = false; }) - this.doneList.map(h=>{ h._active = false; }) - this.notifyList.map(h=>{ h._active = false; }) - this.initiatedList.map(h=>{ h._active = false; }) - item._active = true; + this.unreadList.map(h => { h._active = false; }) + this.doneList.map(h => { h._active = false; }) + this.notifyList.map(h => { h._active = false; }) + this.initiatedList.map(h => { h._active = false; }) // - if( window.innerWidth < 426 ){ - this.goForward({name: 'manage-approve-details', query: { id: item.id } }); + if (window.innerWidth < 426) { + this.goForward({ name: 'manage-approve-details', query: { id: item.id } }); return; } - if( window.innerWidth < 1010 ){ + if (window.innerWidth < 1010) { this.detailsShow = true; + } else { + item._active = true; } this.details = {} - this.$nextTick(()=>{ + this.$nextTick(() => { this.details = item }) }, @@ -649,19 +650,21 @@ export default { // 更新数据 updateData(key,data,type) { let listKey = key + 'List' - let activeIndex = this[listKey].map((h, index) => h._active ? index : -1).filter(h => h > -1)[0] || 0 this[key + 'Total'] = data.total; type != 'scroll' ? (this[listKey] = data.rows) : data.rows.map(h => { if (this[listKey].map(item => { return item.id }).indexOf(h.id) == -1) { this[listKey].push(h) } }); - if(this[listKey].length > 0){ - this[listKey][activeIndex]._active = true; - if (this.tabsValue == key) { - this.$nextTick(() => { - this.details = this[listKey][activeIndex] || {} - }) + if (window.innerWidth > 1010){ + let activeIndex = this[listKey].map((h, index) => h._active ? index : -1).filter(h => h > -1)[0] || 0 + if (this[listKey].length > 0){ + this[listKey][activeIndex]._active = true; + if (this.tabsValue == key) { + this.$nextTick(() => { + this.details = this[listKey][activeIndex] || {} + }) + } } } }, diff --git a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue index 33f013763..82c1f379f 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue @@ -83,7 +83,6 @@
{{$L('查看说明')}} https://ai.google.dev/models?hl=zh-cn
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index c5e81527a..695376d94 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -166,6 +166,9 @@ .approve-list-active { border: 1px solid #8bcf70; + @media (max-width: 1010px) { + border: 1px solid #eeeeee; + } } } @@ -405,9 +408,7 @@ bottom: 1px; display: flex; z-index: 9; - // background: #ffffff; background: #00000005; - } .comment {