diff --git a/beike/Helpers.php b/beike/Helpers.php
index 4c943a26..3963601d 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use Beike\Models\Customer;
+use Beike\Models\Language;
 use Beike\Models\AdminUser;
 use Illuminate\Support\Str;
 use Beike\Services\CurrencyService;
@@ -264,7 +265,18 @@ function current_language_id(): int
  */
 function current_language_code(): string
 {
-    return 'zh_cn';
+    return Session::get('locale') ?? system_setting('base.locale');
+}
+
+/**
+ * 当前语言
+ *
+ * @return string
+ */
+function current_language(): string
+{
+    $code = current_language_code();
+    return Language::query()->where('code', $code)->first()->name;
 }
 
 /**
diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php
index db7de2d2..56f0e5f7 100644
--- a/beike/Shop/Providers/ShopServiceProvider.php
+++ b/beike/Shop/Providers/ShopServiceProvider.php
@@ -90,7 +90,7 @@ class ShopServiceProvider extends ServiceProvider
     protected function loadShareViewData()
     {
         View::share('design', request('design') == 1);
-        View::share('languages', languages());
+        View::share('languages', \Beike\Repositories\LanguageRepo::enabled());
         View::share('shop_base_url', shop_route('home.index'));
 
         $menuCategories = CategoryRepo::getTwoLevelCategories();
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php
index 67113fb0..56dcbb24 100644
--- a/themes/default/layout/header.blade.php
+++ b/themes/default/layout/header.blade.php
@@ -17,13 +17,13 @@
         <div class="dropdown">
           <a class="btn dropdown-toggle" href="#" role="button" id="language-dropdown" data-toggle="dropdown"
             aria-expanded="false">
-            Language
+            {{ current_language() }}
           </a>
 
           <div class="dropdown-menu" aria-labelledby="language-dropdown">
-            <a class="dropdown-item" href="#">Action</a>
-            <a class="dropdown-item" href="#">Another action</a>
-            <a class="dropdown-item" href="#">Something else here</a>
+            @foreach ($languages as $language)
+            <a class="dropdown-item" href="{{ shop_route('lang.switch', [$language->code]) }}">{{ $language->name }}</a>
+            @endforeach
           </div>
         </div>
       </div>