jsasg/orico-official-website-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jsasg:dev
Branches Tags
jsasg:master jsasg:dev
..
compare: jsasg:6865b6bea5382e045e35446bf2a643ec2d6438a6
Branches Tags
jsasg:master jsasg:dev

14 Commits
dev ... 6865b6bea5

Author SHA1 Message Date
jsasg
6865b6bea5 Merge branch 'dev' 2025-04-17 10:08:31 +08:00
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
8 changed files with 682 additions and 691 deletions
Expand all files Collapse all files

4
app/common/controller/BaseController.php
View File

@@ -85,9 +85,9 @@ class BaseController extends Controller
$ctrl = \think\helper\Str::snake($this->controller); $ctrl = \think\helper\Str::snake($this->controller);
if ($ctrl == 'tops_nas') { if ($ctrl == 'tops_nas') {
if ($this->country_code == 'US') { if ($this->country_code == 'US') {
return $this->redirect(url("@usmobile/$ctrl/$action", $this->request->param())); return $this->redirect(url("@usmobile/$ctrl/$action"));
} }
return $this->redirect(url("@mobile/$ctrl/$action", $this->request->param())); return $this->redirect(url("@mobile/$ctrl/$action"));
} }
if (strpos($domain, 'orico.cc')) { if (strpos($domain, 'orico.cc')) {

4
app/index/controller/TopsNas.php
View File

@@ -341,7 +341,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a'); $model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) { foreach ($categorys as $key => $val) {
if ($key == 0) continue; if ($key == 0) continue;
$model->union(function($query) use($key, $val, $limit) { $model->union(function($query) use($val, $limit) {
$query->name('article')->field([ $query->name('article')->field([
'id', 'id',
'cid', 'cid',
@@ -355,8 +355,6 @@ class TopsNas extends BaseController
if (!empty($limit)) { if (!empty($limit)) {
$query->limit($limit); $query->limit($limit);
} }
// 嵌套子查询，解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
}); });
} }

5
app/mobile/controller/TopsNas.php
View File

@@ -264,7 +264,6 @@ class TopsNas extends BaseController
return $this->fetch(); return $this->fetch();
} }
// 根据分类获取文章 // 根据分类获取文章
private function getArticleByCategory($categorys, $limit = null) private function getArticleByCategory($categorys, $limit = null)
{ {
@@ -294,7 +293,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a'); $model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) { foreach ($categorys as $key => $val) {
if ($key == 0) continue; if ($key == 0) continue;
$model->union(function($query) use($key, $val, $limit) { $model->union(function($query) use($val, $limit) {
$query->name('article')->field([ $query->name('article')->field([
'id', 'id',
'cid', 'cid',
@@ -308,8 +307,6 @@ class TopsNas extends BaseController
if (!empty($limit)) { if (!empty($limit)) {
$query->limit($limit); $query->limit($limit);
} }
// 嵌套子查询，解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
}); });
} }

0
app/mobile/view/tops_nas/helper.phtml Normal file → Executable file
View File

0
app/mobile/view/tops_nas/helper_detail.phtml Normal file → Executable file
View File

4
app/us/controller/TopsNas.php
View File

@@ -123,7 +123,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a'); $model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) { foreach ($categorys as $key => $val) {
if ($key == 0) continue; if ($key == 0) continue;
$model->union(function ($query) use ($key, $val, $limit) { $model->union(function ($query) use ($val, $limit) {
$query->name('article')->field([ $query->name('article')->field([
'id', 'id',
'cid', 'cid',
@@ -137,8 +137,6 @@ class TopsNas extends BaseController
if (!empty($limit)) { if (!empty($limit)) {
$query->limit($limit); $query->limit($limit);
} }
// 嵌套子查询，解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
}); });
} }

4
app/usmobile/controller/TopsNas.php
View File

@@ -184,7 +184,7 @@ class TopsNas extends BaseController
$model = \think\Db::table($sub_query . ' a'); $model = \think\Db::table($sub_query . ' a');
foreach ($categorys as $key => $val) { foreach ($categorys as $key => $val) {
if ($key == 0) continue; if ($key == 0) continue;
$model->union(function ($query) use ($key, $val, $limit) { $model->union(function ($query) use ($val, $limit) {
$query->name('article')->field([ $query->name('article')->field([
'id', 'id',
'cid', 'cid',
@@ -198,8 +198,6 @@ class TopsNas extends BaseController
if (!empty($limit)) { if (!empty($limit)) {
$query->limit($limit); $query->limit($limit);
} }
// 嵌套子查询，解决union没有limit时排序问题
$query->table($query->buildSql() . 'a' . $key);
}); });
} }