From 260034a73245b676b772d7166f9ccd4ffb750c07 Mon Sep 17 00:00:00 2001 From: Karson Date: Mon, 19 Jun 2017 18:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=B8=B2=E6=9F=93=E6=9D=A1=E7=9B=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=20=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=9C=AA=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=88=90=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E5=9B=BE=E8=A1=A8=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=20=E4=BF=AE=E6=94=B9requrejs?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=B6=85=E6=97=B6=E4=B8=BA30=E7=A7=92=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcommonsearch=E5=AD=98=E5=9C=A8=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=97=B6=E5=AF=BC=E8=87=B4=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=8A=A0=E8=BD=BD=E7=9A=84?= =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E7=89=88=E9=97=AE=E9=A2=98=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=AF=AD=E8=A8=80=E5=8C=85=E6=96=87=E5=AD=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/example/Tabletemplate.php | 60 ++++++ application/admin/lang/zh-cn.php | 2 + .../admin/lang/zh-cn/wechat/autoreply.php | 7 + .../admin/lang/zh-cn/wechat/response.php | 8 + application/admin/view/common/header.html | 4 +- .../view/example/bootstraptable/index.html | 2 +- .../view/example/tabletemplate/index.html | 67 ++++++ .../admin/view/general/attachment/add.html | 2 +- .../admin/view/general/config/index.html | 11 + application/admin/view/wechat/menu/index.html | 92 ++++---- application/extra/site.php | 2 + public/assets/css/backend.css | 22 ++ public/assets/css/backend.min.css | 2 +- public/assets/css/wechat/menu.css | 31 ++- public/assets/js/backend.js | 6 +- public/assets/js/backend/dashboard.js | 39 +++- .../js/backend/example/bootstraptable.js | 10 +- .../js/backend/example/tabletemplate.js | 126 +++++++++++ public/assets/js/backend/wechat/autoreply.js | 3 +- .../assets/js/bootstrap-table-commonsearch.js | 38 ++-- public/assets/js/bootstrap-table-template.js | 60 ++++++ public/assets/js/require-backend.js | 6 + public/assets/js/require-backend.min.js | 196 ++++++++++++++---- public/assets/js/require-form.js | 7 + public/assets/js/require-frontend.js | 1 + public/assets/js/require-frontend.min.js | 1 + public/assets/js/require-table.js | 42 +++- public/assets/less/backend.less | 22 ++ 28 files changed, 724 insertions(+), 145 deletions(-) create mode 100644 application/admin/controller/example/Tabletemplate.php create mode 100644 application/admin/lang/zh-cn/wechat/autoreply.php create mode 100644 application/admin/lang/zh-cn/wechat/response.php create mode 100644 application/admin/view/example/tabletemplate/index.html create mode 100644 public/assets/js/backend/example/tabletemplate.js create mode 100644 public/assets/js/bootstrap-table-template.js diff --git a/application/admin/controller/example/Tabletemplate.php b/application/admin/controller/example/Tabletemplate.php new file mode 100644 index 00000000..fcc5c35f --- /dev/null +++ b/application/admin/controller/example/Tabletemplate.php @@ -0,0 +1,60 @@ +model = model('AdminLog'); + } + + /** + * 查看 + */ + public function index() + { + if ($this->request->isAjax()) + { + list($where, $sort, $order, $offset, $limit) = $this->buildparams(NULL); + $total = $this->model + ->where($where) + ->order($sort, $order) + ->count(); + $list = $this->model + ->where($where) + ->order($sort, $order) + ->limit($offset, $limit) + ->select(); + $result = array("total" => $total, "rows" => $list); + + return json($result); + } + return $this->view->fetch(); + } + + /** + * 详情 + */ + public function detail($ids) + { + $row = $this->model->get(['id' => $ids]); + if (!$row) + $this->error(__('No Results were found')); + $this->view->assign("row", $row->toArray()); + return $this->view->fetch(); + } + +} diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 6ca614ce..76b1335a 100644 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -69,6 +69,7 @@ return [ 'Status' => '状态', 'Operate' => '操作', 'Append' => '追加', + 'Select' => '选择', 'Memo' => '备注', 'Parent' => '父级', 'Params' => '参数', @@ -78,6 +79,7 @@ return [ 'Begin time' => '开始时间', 'End time' => '结束时间', 'Create time' => '创建时间', + 'Update time' => '更新时间', 'Flag' => '标志', 'Redirect now' => '立即跳转', 'Operation completed' => '操作成功!', diff --git a/application/admin/lang/zh-cn/wechat/autoreply.php b/application/admin/lang/zh-cn/wechat/autoreply.php new file mode 100644 index 00000000..883aed2c --- /dev/null +++ b/application/admin/lang/zh-cn/wechat/autoreply.php @@ -0,0 +1,7 @@ + '文本', + 'Event key' => '响应标识', + 'Remark' => '备注', +]; diff --git a/application/admin/lang/zh-cn/wechat/response.php b/application/admin/lang/zh-cn/wechat/response.php new file mode 100644 index 00000000..37bb3bd7 --- /dev/null +++ b/application/admin/lang/zh-cn/wechat/response.php @@ -0,0 +1,8 @@ + '资源标题', + 'Event key' => '事件标识', + 'Text' => '文本', + 'App' => '应用', +]; diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index aa6eed51..962ea8ac 100644 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -1,9 +1,9 @@