From 9e22cd10946982f5e27bcd63feb374cd4dc23efc Mon Sep 17 00:00:00 2001 From: src48597962 <48597962@qq.com> Date: Wed, 5 Jul 2023 17:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'SrcJu.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SrcJu.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/SrcJu.js b/SrcJu.js index 1dec6638..508e1712 100644 --- a/SrcJu.js +++ b/SrcJu.js @@ -918,16 +918,17 @@ function sousuo() { //搜索接口 function search(keyword, mode, sdata, group, type) { //mode:sousuo(聚阅聚合)、sousuotest(接口测试)、erji(二级换源)、sousuopage(嗅觉新搜索页)、jusousuo(视界聚合) - if(mode=="sousuo" && getMyVar('SrcJuSearching')=="1"){ + let updateItemid = mode=="sousuo" ? "sousuoloading" : mode=="sousuopage"?"sousuoloading"+getMyVar('sousuoPageType',''):"listloading"; + if((mode=="sousuo"||mode=="sousuopage") && getMyVar('SrcJuSearching')=="1"){ if(MY_PAGE==1){ putMyVar("SrcJu_停止搜索线程", "1"); let waittime = 10; for (let i = 0; i < waittime; i++) { if(getMyVar("SrcJu_停止搜索线程","0")=="0"){ - updateItem("sousuoloading", { title: '搜索中...' }); + updateItem(updateItemid, { title: '搜索中...' }); break; } - updateItem("sousuoloading", { title: '等待上次线程结束,'+(waittime-i-1)+'s' }); + updateItem(updateItemid, { title: '等待上次线程结束,'+(waittime-i-1)+'s' }); java.lang.Thread.sleep(1000); } } @@ -1115,9 +1116,9 @@ function search(keyword, mode, sdata, group, type) { } hideLoading(); }else if(mode=="sousuo"){ - addItemBefore("sousuoloading", data); + addItemBefore(updateItemid, data); }else if(mode=="sousuopage"){ - addItemBefore("sousuoloading"+getMyVar('sousuoPageType',''), data); + addItemBefore(updateItemid, data); }else if(mode=="sousuotest"||mode=="jusousuo"){ results = data; } @@ -1138,7 +1139,7 @@ function search(keyword, mode, sdata, group, type) { return results; }else{ let sousuosm = mode=="sousuo"||mode=="sousuopage" ? success + "/" + list.length + ",第"+page+"页搜索完成" : "‘‘’’" + success + "/" + list.length + ",搜索完成"; - updateItem(mode=="sousuo" ? "sousuoloading" : mode=="sousuopage"?"sousuoloading"+getMyVar('sousuoPageType',''):"listloading", { title: sousuosm }); + updateItem(updateItemid, { title: sousuosm }); } } else { clearMyVar('SrcJuSearching');