Merge branch 'dev'
This commit is contained in:
@@ -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"));
|
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')) {
|
if (strpos($domain, 'orico.cc')) {
|
||||||
|
|||||||
Reference in New Issue
Block a user