Browse Source

修复前台显示关键配置的BUG
修复打包压缩后的JS未更新的BUG

Karson 7 years ago
parent
commit
a0a9590134
2 changed files with 61 additions and 22 deletions
  1. 4 2
      application/common/controller/Frontend.php
  2. 57 20
      public/assets/js/require-backend.min.js

+ 4 - 2
application/common/controller/Frontend.php

@@ -51,9 +51,11 @@ class Frontend extends Controller
         // 语言检测
         $lang = Lang::detect();
 
+        $site = Config::get("site");
+
         // 配置信息
         $config = [
-            'site'           => Config::get("site"),
+            'site'           => array_intersect_key($site, array_flip(['name', 'cdnurl', 'version', 'timezone', 'languages'])),
             'upload'         => Configvalue::upload(),
             'modulename'     => $modulename,
             'controllername' => $controllername,
@@ -63,7 +65,7 @@ class Frontend extends Controller
             'language'       => $lang
         ];
         $this->loadlang($controllername);
-        $this->assign('site', Config::get("site"));
+        $this->assign('site', $site);
         $this->assign('config', $config);
     }
     

File diff suppressed because it is too large
+ 57 - 20
public/assets/js/require-backend.min.js