From 0235d72e44ae91ad60c792dacc20e1ace7e38607 Mon Sep 17 00:00:00 2001 From: molong Date: Sun, 1 Sep 2019 22:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/admin/Menu.php | 5 + app/controller/admin/User.php | 8 + view/admin/base.html | 2 +- view/admin/category/index.html | 156 +++++++------- view/admin/config/group.html | 119 ++++++----- view/admin/index/index.html | 10 +- view/admin/menu/edit.html | 3 - view/admin/model/index.html | 136 ++++++------- view/admin/seo/index.html | 105 ++++++---- view/admin/seo/rewrite.html | 104 +++++++--- view/admin/user/index.html | 157 +++++++-------- view/admin/user/profile.html | 357 +++++++++++++++++++++++++++++++++ 12 files changed, 789 insertions(+), 373 deletions(-) create mode 100644 view/admin/user/profile.html diff --git a/app/controller/admin/Menu.php b/app/controller/admin/Menu.php index f02f6b99..d6505b98 100644 --- a/app/controller/admin/Menu.php +++ b/app/controller/admin/Menu.php @@ -38,6 +38,8 @@ class Menu extends Admin{ $this->data['data'] = $res; return $this->data; + }else{ + return $this->data; } } @@ -52,6 +54,9 @@ class Menu extends Admin{ $this->data['data'] = $res; return $this->data; + }else{ + $this->data['template'] = 'edit'; + return $this->data; } } diff --git a/app/controller/admin/User.php b/app/controller/admin/User.php index 7adad421..90233ee5 100644 --- a/app/controller/admin/User.php +++ b/app/controller/admin/User.php @@ -16,7 +16,15 @@ class User extends Admin{ * @title 系统首页 */ public function index(){ + if ($this->request->isAjax()) { + return $this->data; + } + } + /** + * @title 个人资料 + */ + public function profile(){ } /** diff --git a/view/admin/base.html b/view/admin/base.html index 7e5ca659..0d50320c 100644 --- a/view/admin/base.html +++ b/view/admin/base.html @@ -13,7 +13,7 @@ - + diff --git a/view/admin/category/index.html b/view/admin/category/index.html index 9bc09012..264905f5 100644 --- a/view/admin/category/index.html +++ b/view/admin/category/index.html @@ -1,101 +1,91 @@ {extend name="admin/base"/} -{block name="style"} - +{block name="head"} + {/block} {block name="body"} -
+
-

{$meta_title|default='新功能'}

+

栏目管理

- -
-
- -
-
- - - - - - - - - - - - - - - {volist name="tree" id="list"} - - - - - - - - - - - {/volist} - -
ID名称排序发布状态生成导航操作
{$list['id']} - {$list['level_show']} - {$list['title']} - - - - {$list['sort']}{$list['allow_publish']?'是':'否'} - {if $list['status']} - 启用 - {else/} - 禁用 - {/if} - - {if $list['ismenu']} - 已生成 - {else/} - 未生成 - {/if} - - 编辑 - {if $list['status']} - 禁用 - {else/} - 启用 - {/if} - 删除 - 移动 - 合并 -
-
-
-
+ - +
+
+
+
{/block} {block name="script"} - {/block} \ No newline at end of file diff --git a/view/admin/config/group.html b/view/admin/config/group.html index cfadb3bf..7f616e8f 100644 --- a/view/admin/config/group.html +++ b/view/admin/config/group.html @@ -1,76 +1,73 @@ {extend name="admin/base"/} {block name="body"} +

{$mate_title|default="新功能"}

- 配置列表 - 添加配置 +
- -
-
-
- {volist name="list" id="item"} -
- -
- {switch name="item['type']"} - {case value="text"} - - {/case} - {case value="num"} - - {/case} - {case value="string"} - - {/case} - {case value="textarea"} - - {/case} - {case value="select"} - - {/case} - {case value="bool"} - - {/case} - {case value="image"} - {:widget('common/Form/showConfig',array($item,$item))} - {/case} - {/switch} - {if condition="$item['remark']"} - ({$item['remark']}) - {/if} -
-
- {/volist} -
-
- - -
-
-
-
+ +
+ {volist name="list" id="item"} +
+ +
+ {switch name="item['type']"} + {case value="text"} + + {/case} + {case value="num"} + + {/case} + {case value="string"} + + {/case} + {case value="textarea"} + + {/case} + {case value="select"} + + {/case} + {case value="bool"} + + {/case} + {case value="image"} + {:widget('common/Form/showConfig',array($item,$item))} + {/case} + {/switch} + {if condition="$item['remark']"} + ({$item['remark']}) + {/if} +
+
+ {/volist} +
+
+ + +
+
+
diff --git a/view/admin/index/index.html b/view/admin/index/index.html index 42395c97..6823daaf 100644 --- a/view/admin/index/index.html +++ b/view/admin/index/index.html @@ -70,13 +70,13 @@ folder instead of downloading all of them to reduce the load. -->
  • @@ -84,10 +84,10 @@ folder instead of downloading all of them to reduce the load. -->
  • diff --git a/view/admin/menu/edit.html b/view/admin/menu/edit.html index 93e7f980..21925fa2 100644 --- a/view/admin/menu/edit.html +++ b/view/admin/menu/edit.html @@ -39,9 +39,6 @@
    (所属的上级菜单)
    diff --git a/view/admin/model/index.html b/view/admin/model/index.html index f8bdeaf9..fd5dc5a2 100644 --- a/view/admin/model/index.html +++ b/view/admin/model/index.html @@ -1,87 +1,87 @@ {extend name="admin/base"/} - {block name="body"}

    {$meta_title|default='新功能'}

    - 新 增 -
    -
    - - - - - - - - - - - - - - {notempty name="list"} - {volist name="list" id="item"} - - - - - - - - - - {/volist} - {else/} - - {/notempty} - -
    - - 编号标识名称创建时间状态操作
    - - {$item['id']} {$item['name']} - {$item.title} - - {$item.create_time|time_format} - - {if $item['status']} - {$item['status_text']} - {else/} - {$item['status_text']} - {/if} - - 字段 - {$item['status']|show_status_op} - 编辑 - 删除 - 数据 -
    aOh! 暂时还没有创建模型!
    - + + + +
    +
    - {$page|raw}
    {/block} {block name="script"} + + + + + + + -{/block} +{/block} \ No newline at end of file diff --git a/view/admin/seo/index.html b/view/admin/seo/index.html index d01ede75..fd5dc5a2 100644 --- a/view/admin/seo/index.html +++ b/view/admin/seo/index.html @@ -4,49 +4,84 @@

    {$meta_title|default='新功能'}

    - 新 增 -
    -
    - - - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - - {/volist} - -
    ID名称规则排序SEO标题操作
    {$item['id']}{$item['title']}{$item['rule_name']}{$item['sort']}{$item['seo_title']} - 编辑 - 删除 -
    - {$page|raw} + + + +
    +
    {/block} - {block name="script"} + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/seo/rewrite.html b/view/admin/seo/rewrite.html index bff61f39..fd5dc5a2 100644 --- a/view/admin/seo/rewrite.html +++ b/view/admin/seo/rewrite.html @@ -1,47 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

    {$meta_title|default='新功能'}

    - 新 增 -
    -
    - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - {/volist} - -
    ID规则地址操作
    {$item['id']}{$item['rule']}{$item['url']} - 编辑 - 删除 -
    + + + +
    +
    {/block} - {block name="script"} + + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/user/index.html b/view/admin/user/index.html index 1c5e465c..fd508832 100644 --- a/view/admin/user/index.html +++ b/view/admin/user/index.html @@ -4,96 +4,83 @@

    {$meta_title|default='新功能'}

    - +{/block} +{block name="script"} + + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/user/profile.html b/view/admin/user/profile.html new file mode 100644 index 00000000..a52182dc --- /dev/null +++ b/view/admin/user/profile.html @@ -0,0 +1,357 @@ +{extend name="admin/base"/} + +{block name="body"} +
    +
    + + +
    +
    + User profile picture + +

    Nina Mcintire

    + +

    Software Engineer

    + + + + Follow +
    + +
    + + + +
    +
    +

    About Me

    +
    + +
    + Education + +

    + B.S. in Computer Science from the University of Tennessee at Knoxville +

    + +
    + + Location + +

    Malibu, California

    + +
    + + Skills + +

    + UI Design + Coding + Javascript + PHP + Node.js +

    + +
    + + Notes + +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam fermentum enim neque.

    +
    + +
    + +
    + +
    + + +
    + +
    + +{/block} \ No newline at end of file