From 20a68bfbdeea806a7dc75041c62f15b6c828e32f Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 11 May 2019 00:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/Appminialipaylist.php | 2 +- .../admin/controller/Appminiweixinlist.php | 2 +- application/admin/controller/Goods.php | 2 +- application/admin/controller/Power.php | 2 +- application/admin/controller/User.php | 2 +- .../admin/view/default/admin/index.html | 64 ++++++---- .../admin/view/default/answer/index.html | 89 ++++++++----- .../admin/view/default/apphomenav/index.html | 103 +++++++++------ .../view/default/appminialipaylist/index.html | 9 +- .../view/default/appminiweixinlist/index.html | 9 +- .../admin/view/default/article/index.html | 103 +++++++++------ .../admin/view/default/brand/index.html | 81 +++++++----- .../admin/view/default/customview/index.html | 103 +++++++++------ .../admin/view/default/goods/index.html | 91 +++++++++----- .../admin/view/default/integrallog/index.html | 85 ++++++++----- .../admin/view/default/link/index.html | 5 +- .../admin/view/default/message/index.html | 103 +++++++++------ .../admin/view/default/navigation/index.html | 5 +- .../admin/view/default/order/index.html | 117 +++++++++++------- .../admin/view/default/paylog/index.html | 107 ++++++++++------ .../admin/view/default/payment/index.html | 5 +- .../admin/view/default/power/role.html | 9 +- .../admin/view/default/slide/index.html | 99 ++++++++++----- .../admin/view/default/user/index.html | 91 +++++++++----- .../index/view/default/answer/index.html | 11 +- .../index/view/default/message/index.html | 11 +- .../index/view/default/order/index.html | 14 ++- .../index/view/default/userfavor/goods.html | 2 +- .../view/default/usergoodsbrowse/index.html | 2 +- .../view/default/userintegral/index.html | 19 +-- .../view/answers/admin/admin/slider.html | 5 +- .../admin/admin/dataindex.html | 5 +- .../homemiddleadv/admin/admin/dataindex.html | 5 +- .../membershiplevel/admin/level/index.html | 5 +- .../plugins/view/wallet/admin/cash/index.html | 44 ++++--- .../view/wallet/admin/recharge/index.html | 44 ++++--- .../view/wallet/admin/wallet/index.html | 44 ++++--- .../view/wallet/admin/walletlog/index.html | 63 +++++++++- .../view/wallet/index/cash/createinfo.html | 2 +- .../plugins/view/wallet/index/cash/index.html | 9 +- .../plugins/view/wallet/index/public/nav.html | 12 +- .../plugins/wallet/service/CashService.php | 46 ++++--- .../plugins/wallet/service/WalletService.php | 2 +- application/service/AdminService.php | 4 +- public/static/common/css/common.css | 10 +- public/static/index/default/css/answer.css | 33 ----- public/static/index/default/css/message.css | 32 ----- public/static/index/default/css/order.css | 33 ----- public/static/index/default/css/userfavor.css | 10 -- .../index/default/css/usergoodsbrowse.css | 10 -- .../static/index/default/css/userintegral.css | 50 ++------ .../plugins/css/wallet/index/common.css | 10 +- 52 files changed, 1088 insertions(+), 737 deletions(-) delete mode 100755 public/static/index/default/css/message.css diff --git a/application/admin/controller/Appminialipaylist.php b/application/admin/controller/Appminialipaylist.php index 2fc7cf8c3..029bcc42b 100755 --- a/application/admin/controller/Appminialipaylist.php +++ b/application/admin/controller/Appminialipaylist.php @@ -57,7 +57,7 @@ class AppMiniAlipayList extends Common */ public function Index() { - $this->assign('data', AppMiniService::DataList($this->params)); + $this->assign('data_list', AppMiniService::DataList($this->params)); return $this->fetch(); } diff --git a/application/admin/controller/Appminiweixinlist.php b/application/admin/controller/Appminiweixinlist.php index 44a5ee533..50c356d62 100755 --- a/application/admin/controller/Appminiweixinlist.php +++ b/application/admin/controller/Appminiweixinlist.php @@ -57,7 +57,7 @@ class AppMiniWeixinList extends Common */ public function Index() { - $this->assign('data', AppMiniService::DataList($this->params)); + $this->assign('data_list', AppMiniService::DataList($this->params)); return $this->fetch(); } diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index 7a3468202..58a2c9eb1 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -90,7 +90,7 @@ class Goods extends Common $this->assign('params', $params); $this->assign('page_html', $page->GetPageHtml()); - $this->assign('data', $ret['data']); + $this->assign('data_list', $ret['data']); return $this->fetch(); } diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index 5ee0aff68..9f17bba13 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -117,7 +117,7 @@ class Power extends Common ]; $data = AdminPowerService::RoleList($data_params); - $this->assign('data', $data); + $this->assign('data_list', $data); return $this->fetch(); } diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index f44fd2054..f290f1c0c 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -89,7 +89,7 @@ class User extends Common $this->assign('params', $params); $this->assign('page_html', $page->GetPageHtml()); - $this->assign('data', $data['data']); + $this->assign('data_list', $data['data']); return $this->fetch(); } diff --git a/application/admin/view/default/admin/index.html b/application/admin/view/default/admin/index.html index 6b704a73c..a4b8fe85f 100755 --- a/application/admin/view/default/admin/index.html +++ b/application/admin/view/default/admin/index.html @@ -4,12 +4,16 @@
-
-
- - - +
+ + + + + + + +
+ 权限： + + + 性别： + +
@@ -89,11 +102,12 @@ {{/foreach}} - {{else /}} - 没有相关数据 {{/if}} + {{if empty($data)}} +
没有相关数据
+ {{/if}} diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html index c628302b6..730c4b08e 100755 --- a/application/admin/view/default/answer/index.html +++ b/application/admin/view/default/answer/index.html @@ -4,12 +4,16 @@
-
-
- - - +
+ + + + + + + + + + + +
+ 显隐： + + + 回复： + +
+ 时间： + + + + ~ + + + + + + 清除条件 +
@@ -209,11 +233,12 @@ {{/foreach}} - {{else /}} - 没有相关数据 {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html index 2e9751e52..0f335db06 100755 --- a/application/admin/view/default/apphomenav/index.html +++ b/application/admin/view/default/apphomenav/index.html @@ -4,12 +4,16 @@
-
-
- - -
diff --git a/application/admin/view/default/appminiweixinlist/index.html b/application/admin/view/default/appminiweixinlist/index.html index a370409f9..6bbf4a4be 100755 --- a/application/admin/view/default/appminiweixinlist/index.html +++ b/application/admin/view/default/appminiweixinlist/index.html @@ -35,8 +35,8 @@ - {{if !empty($data)}} - {{foreach $data as $v}} + {{if !empty($data_list)}} + {{foreach $data_list as $v}} {{$v.name}} {{$v.size}} @@ -51,11 +51,12 @@ {{/foreach}} - {{else /}} - 没有相关数据 {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}}
diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html index 30aa42403..1e0252049 100755 --- a/application/admin/view/default/article/index.html +++ b/application/admin/view/default/article/index.html @@ -4,12 +4,16 @@
-
-
- - - +
+ + + + + + + + + + + + + + + +
+ 启用： + + + 分类： + +
+ 推荐： + + + 时间： + + + + ~ + + + +
+ + 清除条件 +
@@ -123,11 +153,12 @@ {{/foreach}} - {{else /}} - 没有相关数据 {{/if}} + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} diff --git a/application/admin/view/default/brand/index.html b/application/admin/view/default/brand/index.html index 855bf111b..35e7d466c 100755 --- a/application/admin/view/default/brand/index.html +++ b/application/admin/view/default/brand/index.html @@ -4,12 +4,16 @@
-
-
- - -