Merge branch 'dev'

2025-04-17 09:42:18 +08:00 · 2025-04-11 14:20:00 +08:00 · 2025-04-11 11:45:56 +08:00 · 2025-02-18 09:20:54 +08:00 · 2025-01-24 10:32:55 +08:00 · 2025-01-24 10:25:32 +08:00
4 changed files with 676 additions and 677 deletions
--- a/app/index/view/tops_nas/helper.phtml
+++ b/app/index/view/tops_nas/helper.phtml
@@ -435,7 +435,7 @@
 					{/if}
 					<span class="t1">{$banners[6]['name']}</span>
 					<span class="t2">{$banners[6]['desc']}</span>
-                 </a>
+        </a>
 				{/if}
 			</div>
 		</div>
--- a/app/mobile/controller/TopsNas.php
+++ b/app/mobile/controller/TopsNas.php
@@ -264,7 +264,6 @@ class TopsNas extends BaseController

        return $this->fetch();
    }
-
    // 根据分类获取文章
    private function getArticleByCategory($categorys, $limit = null)
    {
--- a/app/mobile/view/tops_nas/helper.phtml
+++ b/app/mobile/view/tops_nas/helper.phtml
--- a/app/mobile/view/tops_nas/helper_detail.phtml
+++ b/app/mobile/view/tops_nas/helper_detail.phtml
Author	SHA1	Message	Date
jsasg	5b700434b8	Merge branch 'dev'	2025-04-17 09:42:18 +08:00
jsasg	47d7832c12	Merge branch 'dev'	2025-04-11 14:20:00 +08:00
jsasg	ba4a2211c6	Merge branch 'dev'	2025-04-11 11:45:56 +08:00
jsasg	ec7ee48be8	处理master与dev不一致	2025-02-18 09:20:54 +08:00
liqian	ed58ffa3d6	Merge branch 'dev'	2025-01-24 10:32:55 +08:00
jsasg	e993caaa2c	2025-01-25 10:25:30	2025-01-24 10:25:32 +08:00
jsasg	9df93a243f	Merge branch 'dev'	2024-11-18 09:56:09 +08:00
jsasg	2de1aad5c6	Merge branch 'dev'	2024-11-16 17:41:54 +08:00
jsasg	cca4eddbe8	Merge branch 'dev'	2024-11-02 17:18:17 +08:00
jsasg	e1d8b67001	Merge branch 'dev'	2024-10-29 17:58:10 +08:00
jsasg	f558dcf478	Merge branch 'dev'	2024-10-29 17:52:19 +08:00
jsasg	6df8d23686	fix: bug修复	2024-10-29 17:50:09 +08:00
jsasg	cadb9dbcc4	fix: bug修复	2024-10-29 17:38:47 +08:00