rabin 2 år sedan
förälder
incheckning
5304670f2b
4 ändrade filer med 48 tillägg och 51 borttagningar
  1. 2 2
      index.php
  2. 39 42
      lib/Data.php
  3. 4 4
      lib/Manage.php
  4. 3 3
      src/Api.php

+ 2 - 2
index.php

@@ -1,8 +1,8 @@
 <?php
 
 if (!defined('DEVER_APP_NAME')) {
-	define('DEVER_APP_NAME', 'push');
-	define('DEVER_APP_LANG', '推送管理');
+	define('DEVER_APP_NAME', 'page');
+	define('DEVER_APP_LANG', '页面管理');
 }
 
 if (!defined('DEVER_MANAGE_ORDER')) {

+ 39 - 42
lib/Data.php

@@ -1,33 +1,31 @@
 <?php
 
-namespace Push\Lib;
+namespace Page\Lib;
 
 use Dever;
 
 class Data
 {
     # 直接获取某个页面的内容
-    public function getPage($path = 'module', $cdate = 'Y-m-d H:i')
+    public function getPage($path = 'module', $cdate = 'Y-m-d H:i', $config = array())
     {
         $page = Dever::input('page');
         if ($page) {
             $uri = $page;
         } else {
             $uri = Dever::uri();
-
-            if (!$uri) {
-                $uri = 'home';
-            }
+        }
+        if (!$uri) {
+            $uri = 'home';
         }
         
         $data = $this->getPageData($uri, $cdate);
 
         $result = array();
-        if ($data && $data['info']) {
-            foreach ($data['info'] as $k => $v) {
-                if ($v['template_id'] > 0 && isset($v['template'])) {
-                    $result[] = Dever::render($path . '/' . $v['template']['key'], $v);
-                }
+        if ($data && $data['module']) {
+            foreach ($data['module'] as $k => $v) {
+                $v['config'] = $config;
+                $result[] = Dever::render($path . '/' . $v['key'], $v);
             }
         }
         return implode("\r\n", $result);
@@ -42,21 +40,20 @@ class Data
         } else {
             $where['key'] = $page_id;
         }
-        $data = Dever::db('push/page')->find($where);
+        $data = Dever::db('page/page')->find($where);
         if ($data) {
-            $data['info'] = Dever::db('push/info')->select(array('page_id' => $data['id']));
-            if ($data['info']) {
-                foreach ($data['info'] as $k => $v) {
+            $data['module'] = Dever::db('page/page_module')->getData(array('page_id' => $data['id']));
+            if ($data['module']) {
+                foreach ($data['module'] as $k => $v) {
                     $where = array();
-                    $where['info_id'] = $v['id'];
+                    $where['module_id'] = $v['id'];
                     $where['limit'] = '0,' . $v['num'];
-                    $data['info'][$k]['data'] = Dever::db('push/data')->getAll($where);
-                    if ($data['info'][$k]['data']) {
-                        foreach ($data['info'][$k]['data'] as $k1 => $v1) {
-                            $data['info'][$k]['data'][$k1] = $this->getOne($v1, 2, $cdate);
+                    $data['module'][$k]['data'] = Dever::db('page/data')->getAll($where);
+                    if ($data['module'][$k]['data']) {
+                        foreach ($data['module'][$k]['data'] as $k1 => $v1) {
+                            $data['module'][$k]['data'][$k1] = $this->getOne($v1, 2, $cdate);
                         }
                     }
-                    $data['info'][$k]['template'] = Dever::db('push/template')->find($v['template_id']);
                 }
             }
         }
@@ -67,36 +64,36 @@ class Data
     # 获取某个推送位的所有数据
     public function get($key, $name, $total = 10, $col = '1,2,3', $func = '-1', $page = false, $limit = false, $cdate = 'Y-m-d H:i')
     {
-        $info = Dever::db('push/info')->one(array('key' => $key));
+        $module = Dever::db('page/module')->one(array('key' => $key));
 
-        if (!$info) {
+        if (!$module) {
             $insert['key'] = $key;
             $insert['name'] = $name;
             $insert['num'] = $total;
             $insert['col'] = $col;
             $insert['func'] = $func;
-            $info['id'] = Dever::db('push/info')->insert($insert);
-            $info['num'] = $insert['num'];
+            $module['id'] = Dever::db('page/module')->insert($insert);
+            $module['num'] = $insert['num'];
         }
 
         $data = array();
-        if ($info) {
-            if (!$info['num']) {
-                $info['num'] = 20;
+        if ($module) {
+            if (!$module['num']) {
+                $module['num'] = 20;
             }
             if ($limit > 0) {
-                $info['num'] = $limit;
+                $module['num'] = $limit;
             }
 
             $where = array();
-            $where['info_id'] = $info['id'];
+            $where['module_id'] = $module['id'];
 
             if ($page) {
-                $where['page'] = array($info['num'], 'list');
-                $data = Dever::db('push/data')->getAllPage($where);
+                $where['page'] = array($module['num'], 'list');
+                $data = Dever::db('page/data')->getAllPage($where);
             } else {
-                $where['limit'] = '0,' . $info['num'];
-                $data = Dever::db('push/data')->getAll($where);
+                $where['limit'] = '0,' . $module['num'];
+                $data = Dever::db('page/data')->getAll($where);
             }
 
             if ($data) {
@@ -110,15 +107,15 @@ class Data
     }
 
     # 获取某条推送位的数据
-    public function getOne($info, $state = 2, $cdate = 'Y-m-d H:i')
+    public function getOne($module, $state = 2, $cdate = 'Y-m-d H:i')
     {
-        $data = is_array($info) ? $info : Dever::db('push/data')->one($info);
+        $data = is_array($module) ? $module : Dever::db('page/data')->one($module);
 
         $source = array();
-        $info = array();
+        $module = array();
         $col = array();
         if ($data['type'] > 0) {
-            $func = Dever::db('push/func')->one($data['type']);
+            $func = Dever::db('page/func')->one($data['type']);
             if ($func) {
                 if ($func['type'] == 1) {
                     $method = $func['api'];
@@ -151,9 +148,9 @@ class Data
             }
             if ($s) {
                 $id = str_replace($key, '', $k);
-                $col_info = Dever::db('push/col')->one($id);
+                $col_module = Dever::db('page/col')->one($id);
 
-                if (!$col_info) {
+                if (!$col_module) {
                     continue;
                 }
                 if (!$v && $source && $col) {
@@ -172,9 +169,9 @@ class Data
                         $result[$k] = array();
                     }
 
-                    $result[$k][$col_info['name']] = $v;
+                    $result[$k][$col_module['name']] = $v;
                 } else {
-                    $result[$col_info['key']] = $v;
+                    $result[$col_module['key']] = $v;
                 }
             }
         }

+ 4 - 4
lib/Manage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Push\Lib;
+namespace Page\Lib;
 
 use Dever;
 
@@ -16,7 +16,7 @@ class Manage
 
         $type = Dever::input('type');
 
-        $func = Dever::db('push/info')->config['func'];
+        $func = Dever::db('page/module')->config['func'];
         $func = $func();
         $method = false;
         if ($func && $type && isset($func[$type])) {
@@ -78,7 +78,7 @@ class Manage
 
     public function show($id)
     {
-        $table = Dever::load('push/lib/data')->getOne($id, 1);
+        $table = Dever::load('page/lib/data')->getOne($id, 1);
         if (count($table) == 1) {
             $table = $table[0];
         }
@@ -88,7 +88,7 @@ class Manage
     # 查看模板
     public function template()
     {
-        $data = Dever::db('push/template')->state();
+        $data = Dever::db('page/template')->state();
 
         foreach ($data as $k => $v) {
             if (!$v['pic']) {

+ 3 - 3
src/Api.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Push\Src;
+namespace Page\Src;
 
 use Dever;
 
@@ -8,11 +8,11 @@ class Api
 {
 	public function test()
 	{
-		return Dever::load('push/lib/data')->get('focus', '焦点图', 5);
+		return Dever::load('page/lib/data')->get('focus', '焦点图', 5);
 	}
 
 	public function test_1()
 	{
-		return Dever::load('push/lib/data')->getPage(1);
+		return Dever::load('page/lib/data')->getPage(1);
 	}
 }