diff --git a/module/aiapp/control.php b/module/aiapp/control.php index f01d9f1858..2dd024c3ba 100644 --- a/module/aiapp/control.php +++ b/module/aiapp/control.php @@ -140,8 +140,6 @@ class aiapp extends control else if($category === 'latest') $miniPrograms = $this->aiapp->getLatestMiniPrograms($pager); else $miniPrograms = $this->ai->getMiniPrograms($category, 'active', 'createdDate_desc', $pager); - if(empty($miniPrograms)) return $this->locate($this->createLink('aiapp', 'square', array('category' => 'discovery'))); - $squareCategoryArray = $this->aiapp->getSquareCategoryArray(); $usedCategoryArray = $this->aiapp->getUsedCategoryArray(); diff --git a/module/aiapp/js/square.ui.js b/module/aiapp/js/square.ui.js index cefcd64d58..ee104baa38 100644 --- a/module/aiapp/js/square.ui.js +++ b/module/aiapp/js/square.ui.js @@ -19,6 +19,5 @@ window.aiSquare.handleStarBtnClick = function(e) $btn.children('img').attr('src', 'static/svg/star-empty.svg'); $btn.attr('data-url', $btn.attr('data-url').replace('true', 'false')); } - loadCurrentPage({selector : '#mainMenu'}); }, 'json'); }; diff --git a/module/aiapp/model.php b/module/aiapp/model.php index 64e267f12b..4d8a368f1c 100644 --- a/module/aiapp/model.php +++ b/module/aiapp/model.php @@ -173,7 +173,6 @@ class aiappModel extends model if($collectedIDs === null) $collectedIDs = $this->getCollectedMiniProgramIDs($this->app->user->id); if($latestSum === null) $latestSum = $this->countLatestMiniPrograms(); - if(empty($collectedIDs)) unset($squareCategoryArray['collection']); if($latestSum == 0) unset($squareCategoryArray['latest']); return $squareCategoryArray; } diff --git a/module/aiapp/ui/square.html.php b/module/aiapp/ui/square.html.php index f9016525ed..0d60f7bd99 100644 --- a/module/aiapp/ui/square.html.php +++ b/module/aiapp/ui/square.html.php @@ -125,13 +125,31 @@ $miniProgramCard = function($miniProgram) use ($categoryList, $collectedIDs, $sh ) ); }; - -div( +if(empty($miniPrograms)) +{ + panel( + div( + setClass('dtable-empty-tip'), + div( + setClass('row gap-4 items-center'), + span + ( + setClass('text-gray'), + $lang->noData + ), + ) + ) + ); +} +else +{ + div( setClass('miniprogram-container'), array_map($miniProgramCard, $miniPrograms), -); + ); +} -div( +empty($miniPrograms) ? null : div( setClass('pager-container'), pager(set(usePager())) );