fix bug

KevinJay · May 8, 2017 · 04f87af · 04f87af
1 parent 5c3d9ef
commit 04f87af
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/app/backend/views/public/left_sidebar.phtml b/app/backend/views/public/left_sidebar.phtml
@@ -67,7 +67,7 @@
                 </a>
             </li>
             <li>
-                <a href="{{ url('menu/backendindex') }}">
+                <a href="{{ url('menu/index') }}">
                     <i class="icon-double-angle-right"></i>菜单管理
                 </a>
             </li>

diff --git a/app/config/system/system_dev.php b/app/config/system/system_dev.php
@@ -35,6 +35,9 @@
 
             //模板路径
             'compiled_path' => ROOT_PATH . '/app/cache/compiled/frontend/',
+
+            //前台静态资源URL
+            'assets_url' => '/home/',
         ),
 
         //后台配置

diff --git a/app/config/system/system_pro.php b/app/config/system/system_pro.php
@@ -35,6 +35,9 @@
 
             //模板路径
             'compiled_path' => ROOT_PATH . '/app/cache/compiled/frontend/',
+
+            //前台静态资源URL
+            'assets_url' => '/home/',
         ),
 
         //后台配置

diff --git a/app/config/system/system_test.php b/app/config/system/system_test.php
@@ -35,6 +35,9 @@
 
             //模板路径
             'compiled_path' => ROOT_PATH . '/app/cache/compiled/frontend/',
+
+            //前台静态资源URL
+            'assets_url' => '/home/',
         ),
 
         //后台配置

diff --git a/app/frontend/controllers/BaseController.php b/app/frontend/controllers/BaseController.php
@@ -35,7 +35,9 @@ public function set_common_vars(){
             'assetsVersion' => strtotime(date('Y-m-d H', time()) . ":00:00"),
         ));
 
-        $this -> url -> setStaticBaseUri($this -> get_repository('Options') -> get_option('cdn_url'));
+        $staticUrl = $this -> get_repository('Options') -> get_option('cdn_url');
+        empty($staticUrl) && $staticUrl = $this->systemConfig->app->frontend->assets_url;
+        $this -> url -> setStaticBaseUri($staticUrl);
     }
 
     /**

diff --git a/phalconCMS.sql b/phalconCMS.sql
@@ -2,7 +2,8 @@
 SQLyog 企业版 - MySQL GUI v8.14 
 MySQL - 5.7.11-log : Database - PhalconCMS
 *********************************************************************
-*/
+*/
+
 
 /*!40101 SET NAMES utf8 */;
 
@@ -129,7 +130,7 @@ CREATE TABLE `options` (
   UNIQUE KEY `UQ_OP_KEY` (`op_key`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COMMENT='配置表';
 
-insert  into `options`(`id`,`op_key`,`op_value`,`create_by`,`create_time`,`modify_by`,`modify_time`) values (1,'site_name','Marser',1,'2016-11-28 10:48:58',1,'2016-12-01 12:01:33'),(2,'site_url','http://www.marser.cn/',1,'2016-11-28 10:49:20',1,'2016-12-22 12:22:35'),(3,'site_description','描述',1,'2016-11-28 10:49:33',1,'2016-11-28 10:53:10'),(4,'site_keywords','关键字',1,'2016-11-28 10:49:45',1,'2016-11-28 10:53:10'),(5,'page_article_number','10',1,'2016-11-28 11:05:10',1,'2016-12-29 16:11:46'),(6,'recommend_article_number','10',1,'2016-11-28 11:05:19',1,'2016-12-29 16:11:43'),(7,'site_title','标题',1,'2016-12-01 11:54:17',1,'2016-12-01 12:01:33'),(8,'relate_article_number','8',1,'2016-12-21 10:00:38',1,'2016-12-21 10:00:38'),(9,'cdn_url','http://www.marser.cn',1,'2016-12-22 12:16:41',1,'2016-12-24 15:51:59');
+insert  into `options`(`id`,`op_key`,`op_value`,`create_by`,`create_time`,`modify_by`,`modify_time`) values (1,'site_name','Marser',1,'2016-11-28 10:48:58',1,'2016-12-01 12:01:33'),(2,'site_url','http://www.marser.cn/',1,'2016-11-28 10:49:20',1,'2016-12-22 12:22:35'),(3,'site_description','描述',1,'2016-11-28 10:49:33',1,'2016-11-28 10:53:10'),(4,'site_keywords','关键字',1,'2016-11-28 10:49:45',1,'2016-11-28 10:53:10'),(5,'page_article_number','10',1,'2016-11-28 11:05:10',1,'2016-12-29 16:11:46'),(6,'recommend_article_number','10',1,'2016-11-28 11:05:19',1,'2016-12-29 16:11:43'),(7,'site_title','标题',1,'2016-12-01 11:54:17',1,'2016-12-01 12:01:33'),(8,'relate_article_number','8',1,'2016-12-21 10:00:38',1,'2016-12-21 10:00:38'),(9,'cdn_url','',1,'2016-12-22 12:16:41',1,'2016-12-24 15:51:59');
 
 /*Table structure for table `tags` */
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ @@
                     </a>
                 </li>
                 <li>
-                    <a href="{{ url('menu/backendindex') }}">
+                    <a href="{{ url('menu/index') }}">
                         <i class="icon-double-angle-right"></i>菜单管理
                     </a>
                 </li>
@@ Expand Down @@