diff --git a/app/index/common.php b/app/index/common.php index 81d86119..f17ea775 100644 --- a/app/index/common.php +++ b/app/index/common.php @@ -1,6 +1,8 @@ controller() . '/' . request()->action()); - $name = $path . '.' . $name; - return lang($name, $vars, $lang); + $path = strtolower(request()->controller() . '/' . request()->action()); + $full_name = $path . '.' . $name; + if (!Lang::has($full_name, $lang)) { + return $name; + } + return Lang::get($full_name, $vars, $lang); } } diff --git a/app/index/controller/ContactUs.php b/app/index/controller/ContactUs.php index 17a6addf..d61da2b1 100644 --- a/app/index/controller/ContactUs.php +++ b/app/index/controller/ContactUs.php @@ -103,6 +103,7 @@ class ContactUs extends Common ->where('status', '=', 1) ->order(['sort' => 'asc', 'id' => 'desc']); }]) + ->atPlatform(request()->from) ->uniqueLabel([ 'BANNER_6801be1e7d686', 'BANNER_6801c053ce12e',