diff --git a/application/plugins/view/wallet/index/wallet/index.html b/application/plugins/view/wallet/index/wallet/index.html
index 604e19878051616042bada8d08ba434af58f9b1f..5e92dcc36f9905e962fc75e71e3fcdef60798978 100755
--- a/application/plugins/view/wallet/index/wallet/index.html
+++ b/application/plugins/view/wallet/index/wallet/index.html
@@ -26,7 +26,8 @@
{{include file="../../../plugins/view/wallet/index/public/nav" /}}
-
+
diff --git a/application/plugins/wallet/admin/Cash.php b/application/plugins/wallet/admin/Cash.php
index 4a86aa0d01269aa269562d79b41ec9598627d147..a72e4c67846f64f03d4f9b1215e43019c9f8f0ef 100644
--- a/application/plugins/wallet/admin/Cash.php
+++ b/application/plugins/wallet/admin/Cash.php
@@ -49,7 +49,7 @@ class Cash extends Controller
'total' => $total,
'where' => $params,
'page' => isset($params['page']) ? intval($params['page']) : 1,
- 'url' => PluginsHomeUrl('wallet', 'cash', 'index'),
+ 'url' => PluginsAdminUrl('wallet', 'cash', 'index'),
);
$page = new \base\Page($page_params);
$this->assign('page_html', $page->GetPageHtml());
diff --git a/application/plugins/wallet/admin/Recharge.php b/application/plugins/wallet/admin/Recharge.php
new file mode 100644
index 0000000000000000000000000000000000000000..63858e60f060e1fcdef21adf55d77d49481654cc
--- /dev/null
+++ b/application/plugins/wallet/admin/Recharge.php
@@ -0,0 +1,99 @@
+ $number,
+ 'total' => $total,
+ 'where' => $params,
+ 'page' => isset($params['page']) ? intval($params['page']) : 1,
+ 'url' => PluginsAdminUrl('wallet', 'recharge', 'index'),
+ );
+ $page = new \base\Page($page_params);
+ $this->assign('page_html', $page->GetPageHtml());
+
+ // 获取列表
+ if($total > 0)
+ {
+ $data_params = array(
+ 'm' => $page->GetPageStarNumber(),
+ 'n' => $number,
+ 'where' => $where,
+ );
+ $data = BaseService::RechargeList($data_params);
+ $this->assign('data_list', $data['data']);
+ } else {
+ $this->assign('data_list', []);
+ }
+
+ // 静态数据
+ $this->assign('recharge_status_list', RechargeService::$recharge_status_list);
+
+ // 参数
+ $this->assign('params', $params);
+ return $this->fetch('../../../plugins/view/wallet/admin/recharge/index');
+ }
+
+ /**
+ * 充值纪录删除
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-09-14
+ * @desc description
+ * @param [array] $params [输入参数]
+ */
+ public function delete($params = [])
+ {
+ // 是否ajax请求
+ if(!IS_AJAX)
+ {
+ $this->error('非法访问');
+ }
+
+ // 开始处理
+ return RechargeService::RechargeDelete($params);
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/wallet/admin/Wallet.php b/application/plugins/wallet/admin/Wallet.php
index d64140b7e3d2adef05020c4ed27f278bfb89e13d..e232cbe172e2fe3f23ac98b372ba007de3e546a5 100644
--- a/application/plugins/wallet/admin/Wallet.php
+++ b/application/plugins/wallet/admin/Wallet.php
@@ -48,7 +48,7 @@ class Wallet extends Controller
'total' => $total,
'where' => $params,
'page' => isset($params['page']) ? intval($params['page']) : 1,
- 'url' => PluginsHomeUrl('wallet', 'wallet', 'index'),
+ 'url' => PluginsAdminUrl('wallet', 'wallet', 'index'),
);
$page = new \base\Page($page_params);
$this->assign('page_html', $page->GetPageHtml());
diff --git a/application/plugins/wallet/admin/Walletlog.php b/application/plugins/wallet/admin/Walletlog.php
new file mode 100644
index 0000000000000000000000000000000000000000..13b4bd19f898c562adf19b3f82971eacdcd6012a
--- /dev/null
+++ b/application/plugins/wallet/admin/Walletlog.php
@@ -0,0 +1,75 @@
+ $number,
+ 'total' => $total,
+ 'where' => $params,
+ 'page' => isset($params['page']) ? intval($params['page']) : 1,
+ 'url' => PluginsAdminUrl('wallet', 'walletlog', 'index'),
+ );
+ $page = new \base\Page($page_params);
+ $this->assign('page_html', $page->GetPageHtml());
+
+ // 获取列表
+ $data_params = array(
+ 'm' => $page->GetPageStarNumber(),
+ 'n' => $number,
+ 'where' => $where,
+ );
+ $data = BaseService::WalletLogList($data_params);
+ $this->assign('data_list', $data['data']);
+
+ // 静态数据
+ $this->assign('business_type_list', WalletService::$business_type_list);
+ $this->assign('operation_type_list', WalletService::$operation_type_list);
+ $this->assign('money_type_list', WalletService::$money_type_list);
+
+ // 参数
+ $this->assign('params', $params);
+ return $this->fetch('../../../plugins/view/wallet/admin/walletlog/index');
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/plugins/wallet/index/Cash.php b/application/plugins/wallet/index/Cash.php
index 3296a405a544865236f818e8e80fee9b93833fdf..e46b22d39b171af94f840c01e7439b57aa1ab8ef 100644
--- a/application/plugins/wallet/index/Cash.php
+++ b/application/plugins/wallet/index/Cash.php
@@ -50,7 +50,7 @@ class Cash extends Common
$params['user'] = $this->user;
// 分页
- $number = MyC('admin_page_number', 10, true);
+ $number = 10;
// 条件
$where = BaseService::CashWhere($params);
diff --git a/application/plugins/wallet/index/Recharge.php b/application/plugins/wallet/index/Recharge.php
index be977da4636da5fc697b223057ea8e39fa55b204..5359f2319977364eb6cf2b80d5102d745a1a844f 100755
--- a/application/plugins/wallet/index/Recharge.php
+++ b/application/plugins/wallet/index/Recharge.php
@@ -51,7 +51,7 @@ class Recharge extends Common
$params['user'] = $this->user;
// 分页
- $number = MyC('admin_page_number', 10, true);
+ $number = 10;
// 条件
$where = BaseService::RechargeWhere($params);
diff --git a/application/plugins/wallet/index/Wallet.php b/application/plugins/wallet/index/Wallet.php
index 7a85d245cee4f4d6783e41560c6899cccc87eec0..e384d5f0d36962e5eba3e9353c393c7757cd8219 100644
--- a/application/plugins/wallet/index/Wallet.php
+++ b/application/plugins/wallet/index/Wallet.php
@@ -50,7 +50,7 @@ class Wallet extends Common
$params['user'] = $this->user;
// 分页
- $number = MyC('admin_page_number', 10, true);
+ $number = 10;
// 条件
$where = BaseService::WalletLogWhere($params);
diff --git a/application/plugins/wallet/service/BaseService.php b/application/plugins/wallet/service/BaseService.php
index 066d7814c78fba3a0dfe045860de0b645afebdcf..47894399eb6dcd3595da934e3b07d6ecc5270281 100755
--- a/application/plugins/wallet/service/BaseService.php
+++ b/application/plugins/wallet/service/BaseService.php
@@ -224,10 +224,26 @@ class BaseService
$where[] = ['user_id', '=', $params['user']['id']];
}
- // 关键字
+ // 关键字根据用户筛选
if(!empty($params['keywords']))
{
- $where[] = ['recharge_no', '=', $params['keywords']];
+ if(empty($params['user']))
+ {
+ $user_ids = Db::name('User')->where('username|nickname|mobile|email', '=', $params['keywords'])->column('id');
+ if(!empty($user_ids))
+ {
+ $where[] = ['user_id', 'in', $user_ids];
+ } else {
+ // 无数据条件，走单号条件
+ $where[] = ['recharge_no', '=', $params['keywords']];
+ }
+ }
+ }
+
+ // 状态
+ if(isset($params['status']) && $params['status'] > -1)
+ {
+ $where[] = ['status', '=', $params['status']];
}
return $where;
@@ -405,10 +421,20 @@ class BaseService
$where[] = ['user_id', '=', $params['user']['id']];
}
- // 关键字
+ // 关键字根据用户筛选
if(!empty($params['keywords']))
{
- $where[] = ['cash_no', '=', $params['keywords']];
+ if(empty($params['user']))
+ {
+ $user_ids = Db::name('User')->where('username|nickname|mobile|email', '=', $params['keywords'])->column('id');
+ if(!empty($user_ids))
+ {
+ $where[] = ['user_id', 'in', $user_ids];
+ } else {
+ // 无数据条件，走单号条件
+ $where[] = ['cash_no', '=', $params['keywords']];
+ }
+ }
}
// 状态
diff --git a/application/plugins/wallet/service/RechargeService.php b/application/plugins/wallet/service/RechargeService.php
index c7fed7503ac091890ee5d4dacc710fe9afae60e4..632b5e9c972c113224ccfd3dfd1f12f0d4c89bf5 100644
--- a/application/plugins/wallet/service/RechargeService.php
+++ b/application/plugins/wallet/service/RechargeService.php
@@ -111,6 +111,7 @@ class RechargeService
],
[
'checked_type' => 'empty',
+ 'is_checked' => 2,
'key_name' => 'user',
'error_msg' => '用户信息有误',
],
@@ -124,8 +125,11 @@ class RechargeService
// 删除
$where = [
'id' => intval($params['id']),
- 'user_id' => $params['user']['id']
];
+ if(!empty($params['user']['id']))
+ {
+ $where['user_id'] = $params['user']['id'];
+ }
if(Db::name('PluginsWalletRecharge')->where($where)->delete())
{
return DataReturn('删除成功', 0);
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 9dbe7686f15cca2931ad8f16b3094852a0d8f35b..e18ffc010c667be9b06981c8c1e16f224e644d1d 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -293,4 +293,40 @@ button.colorpicker-submit:active {
}
button.colorpicker-submit img {
margin-right: 10px;
+}
+
+
+/**
+ * 搜索表单
+ */
+.form-search .thin { overflow:hidden; }
+.form-search .thin .so { width:66%; }
+.form-search .thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
+.form-search .so-list { width:100%; margin-top: 10px; }
+.form-search .so-list * { font-size:1.2rem !important; }
+.form-search .so-list input { height:28px; display:inline !important; }
+.form-search .time input, .form-search .so-list .chosen-container { background:#FFF !important; }
+.form-search .time input { width:100px !important; }
+.form-search .time i { position:absolute; margin:4px 0px 0px -15px; }
+.form-search .price input { width:101px !important; }
+.form-search .time { width:50%; }
+.form-search .so-list tr+tr>td { padding-top:10px; }
+.form-search .so-list .chosen-container { border-radius:2px; }
+.form-search .text-grey { color: #999; }
+.form-search .chosen-container-single .chosen-single, .form-search .so-list select { height: 28px; line-height: 28px; width: 100%; }
+.form-search .reset-submit { margin-left: 20px; }
+.form-search .so-list select { padding: 0 0 0 8px; }
+@media only screen and (min-width: 641px) {
+ .form-search .so-list .chosen-container, .form-search .so-list select { width:217px !important; display: -webkit-inline-box; }
+ .form-search .thin_sub:hover { color:#F60; }
+}
+@media only screen and (max-width: 641px) {
+ .form-search .so-list input { width:40% !important; }
+ .form-search .so-list td { width:100%; display:block; }
+ .form-search .so-list tr td:last-child { margin-top:10px; }
+ .form-search .so-list .chosen-container { width:85%; }
+ .form-search .so-list .chosen-container { width:100%; }
+ .form-search .so-list tr td:last-child { padding-top:0px !important; }
+ .form-search .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
+ .form-search .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
}
\ No newline at end of file
diff --git a/public/static/plugins/css/wallet/admin/cash.css b/public/static/plugins/css/wallet/admin/cash.css
index 1a4ef24a2888f9f86e5b2f5b01e08b0ed831261f..3fce3dd633c52da563524a4302b013dcdb34d8e0 100644
--- a/public/static/plugins/css/wallet/admin/cash.css
+++ b/public/static/plugins/css/wallet/admin/cash.css
@@ -1,35 +1,3 @@
-/**
- * 搜索表单
- */
-.form-search .form-keyword { display: initial !important; }
-.form-search .more-submit input { display: none; }
-.form-search .param-date input { display: initial !important; }
-@media only screen and (max-width: 641px) {
- .form-search .form-keyword { width: calc(100% - 140px) !important; }
- .form-search .param-where { width: 100% !important; margin-left: 0px !important; }
- .form-search .param-date input { width: 47% !important; }
-}
-@media only screen and (min-width: 641px) {
- .form-search .form-keyword { width: 35% !important; }
- .form-search .param-where { width: 32% !important; float: left; }
- .form-search .param-date input { width: 45% !important; }
- .form-search .param-where:nth-child(1), .param-where:nth-child(4) { margin-left: 0px !important; }
-}
-
-/**
- * 用户信息
- */
-.cash-content .user-info img {
- max-width: 35px;
- max-height: 35px;
- margin: 0 5px 2px 0;
-}
-.cash-content ul {
- list-style: none;
- padding: 0;
- margin: 0;
-}
-
/**
* 列表
*/
diff --git a/public/static/plugins/css/wallet/admin/common.css b/public/static/plugins/css/wallet/admin/common.css
new file mode 100644
index 0000000000000000000000000000000000000000..9d1650c31b85f987d28a30b4054c07a7c422ab96
--- /dev/null
+++ b/public/static/plugins/css/wallet/admin/common.css
@@ -0,0 +1,31 @@
+/**
+ * 搜索表单
+ */
+.form-search .form-keyword { display: initial !important; }
+.form-search .more-submit input { display: none; }
+.form-search .param-date input { display: initial !important; }
+@media only screen and (max-width: 641px) {
+ .form-search .form-keyword { width: calc(100% - 140px) !important; }
+ .form-search .param-where { width: 100% !important; margin-left: 0px !important; }
+ .form-search .param-date input { width: 47% !important; }
+}
+@media only screen and (min-width: 641px) {
+ .form-search .form-keyword { width: 35% !important; }
+ .form-search .param-where { width: 32% !important; float: left; }
+ .form-search .param-date input { width: 45% !important; }
+ .form-search .param-where:nth-child(1), .param-where:nth-child(4) { margin-left: 0px !important; }
+}
+
+/**
+ * 用户信息
+ */
+.content-right .user-info img {
+ max-width: 35px;
+ max-height: 35px;
+ margin: 0 5px 2px 0;
+}
+.content-right ul {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
\ No newline at end of file
diff --git a/public/static/plugins/css/wallet/admin/wallet.css b/public/static/plugins/css/wallet/admin/wallet.css
index a8016cf174d1fa52d5b010be8fa6c27471aa63ae..da054ca22cd6ce47f7161dba4bd03d98c007bd7e 100644
--- a/public/static/plugins/css/wallet/admin/wallet.css
+++ b/public/static/plugins/css/wallet/admin/wallet.css
@@ -1,35 +1,3 @@
-/**
- * 搜索表单
- */
-.form-search .form-keyword { display: initial !important; }
-.form-search .more-submit input { display: none; }
-.form-search .param-date input { display: initial !important; }
-@media only screen and (max-width: 641px) {
- .form-search .form-keyword { width: calc(100% - 140px) !important; }
- .form-search .param-where { width: 100% !important; margin-left: 0px !important; }
- .form-search .param-date input { width: 47% !important; }
-}
-@media only screen and (min-width: 641px) {
- .form-search .form-keyword { width: 35% !important; }
- .form-search .param-where { width: 32% !important; float: left; }
- .form-search .param-date input { width: 45% !important; }
- .form-search .param-where:nth-child(1), .param-where:nth-child(4) { margin-left: 0px !important; }
-}
-
-/**
- * 列表
- */
-.wallet-content table.am-table ul {
- list-style: none;
- padding: 0;
- margin: 0;
-}
-.wallet-content table.am-table .user-info img {
- max-width: 35px;
- max-height: 35px;
- margin: 0 5px 2px 0;
-}
-
/**
* 金额
*/
diff --git a/public/static/plugins/css/wallet/admin/walletlog.css b/public/static/plugins/css/wallet/admin/walletlog.css
new file mode 100644
index 0000000000000000000000000000000000000000..dc5e78e3734b80e6a5558fb3f5efb203e713304d
--- /dev/null
+++ b/public/static/plugins/css/wallet/admin/walletlog.css
@@ -0,0 +1,21 @@
+/**
+ * 列表
+ */
+.walletlog-content table.am-table {
+ margin-top: 10px;
+}
+.walletlog-content table.am-table .money-bold {
+ font-weight: 700;
+}
+.walletlog-content table.am-table .money {
+ color: #E4393C;
+}
+.walletlog-content table.am-table .operation-reduce-icon {
+ color: #f00;
+}
+.walletlog-content table.am-table .operation-increase-icon {
+ color: #0a9610;
+}
+.walletlog-content table.am-table .operation-msg {
+ width: 30%;
+}
\ No newline at end of file