Merge branch 'dev'

app/common/controller/BaseController.php

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

app/index/controller/TopsNas.php

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

app/mobile/controller/TopsNas.php

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

app/us/controller/TopsNas.php

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

app/usmobile/controller/TopsNas.php

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