From b5ec9133d84d91d7c77c44aa1e7ef32f5d2806b5 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 10 May 2019 18:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/wallet/admin/admin/index.html        |   4 +-
 .../plugins/view/wallet/admin/cash/index.html |   2 +-
 .../view/wallet/admin/recharge/index.html     | 163 ++++++++++++++++++
 .../view/wallet/admin/walletlog/index.html    | 126 ++++++++++++++
 .../plugins/view/wallet/index/cash/index.html |   4 +-
 .../view/wallet/index/recharge/index.html     |   2 +-
 .../view/wallet/index/wallet/index.html       |   4 +-
 application/plugins/wallet/admin/Cash.php     |   2 +-
 application/plugins/wallet/admin/Recharge.php |  99 +++++++++++
 application/plugins/wallet/admin/Wallet.php   |   2 +-
 .../plugins/wallet/admin/Walletlog.php        |  75 ++++++++
 application/plugins/wallet/index/Cash.php     |   2 +-
 application/plugins/wallet/index/Recharge.php |   2 +-
 application/plugins/wallet/index/Wallet.php   |   2 +-
 .../plugins/wallet/service/BaseService.php    |  34 +++-
 .../wallet/service/RechargeService.php        |   6 +-
 public/static/common/css/common.css           |  36 ++++
 .../static/plugins/css/wallet/admin/cash.css  |  32 ----
 .../plugins/css/wallet/admin/common.css       |  31 ++++
 .../plugins/css/wallet/admin/wallet.css       |  32 ----
 .../plugins/css/wallet/admin/walletlog.css    |  21 +++
 21 files changed, 601 insertions(+), 80 deletions(-)
 create mode 100644 application/plugins/view/wallet/admin/recharge/index.html
 create mode 100644 application/plugins/view/wallet/admin/walletlog/index.html
 create mode 100644 application/plugins/wallet/admin/Recharge.php
 create mode 100644 application/plugins/wallet/admin/Walletlog.php
 create mode 100644 public/static/plugins/css/wallet/admin/common.css
 create mode 100644 public/static/plugins/css/wallet/admin/walletlog.css

diff --git a/application/plugins/view/wallet/admin/admin/index.html b/application/plugins/view/wallet/admin/admin/index.html
index c20cbf101..702c9eab1 100755
--- a/application/plugins/view/wallet/admin/admin/index.html
+++ b/application/plugins/view/wallet/admin/admin/index.html
@@ -134,7 +134,7 @@
                                     <span>待支付</span>
                                     <span class="animation-count-to" data-to="12" data-speed="1500">12</span>
                                 </div>
-                                <a href="#" class="view-to">查看 <i class="am-icon-angle-double-right"></i></a>
+                                <a href="{{:PluginsAdminUrl('wallet', 'recharge', 'index')}}" class="view-to">查看 <i class="am-icon-angle-double-right"></i></a>
                             </div>
                         </li>
                         <li class="module-cash">
@@ -149,7 +149,7 @@
                                     <span>今日</span>
                                     <span class="animation-count-to" data-to="35" data-speed="1500">35</span>
                                 </div>
-                                <a href="#" class="view-to">查看 <i class="am-icon-angle-double-right"></i></a>
+                                <a href="{{:PluginsAdminUrl('wallet', 'walletlog', 'index')}}" class="view-to">查看 <i class="am-icon-angle-double-right"></i></a>
                             </div>
                         </li>
                     </ul>
diff --git a/application/plugins/view/wallet/admin/cash/index.html b/application/plugins/view/wallet/admin/cash/index.html
index c8bd248f8..7828175d2 100644
--- a/application/plugins/view/wallet/admin/cash/index.html
+++ b/application/plugins/view/wallet/admin/cash/index.html
@@ -12,7 +12,7 @@
             <!-- form start -->
             <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'cash', 'index')}}" method="POST">
                 <div class="am-g">
-                    <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="申请单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
+                    <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名/昵称/手机/邮箱/申请单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
                     <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
                     <label class="fs-12 m-l-5 c-p fw-100 more-submit">
                         更多筛选
diff --git a/application/plugins/view/wallet/admin/recharge/index.html b/application/plugins/view/wallet/admin/recharge/index.html
new file mode 100644
index 000000000..f7232fc72
--- /dev/null
+++ b/application/plugins/view/wallet/admin/recharge/index.html
@@ -0,0 +1,163 @@
+{{include file="public/header" /}}
+
+<!-- right content start  -->
+<div class="content-right">
+    <div class="content">
+        <legend>
+            <span class="fs-16">充值管理</span>
+            <a href="{{:PluginsAdminUrl('wallet', 'admin', 'index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+        </legend>
+
+        <div class="cash-content">
+            <!-- form start -->
+            <form class="am-form form-search" action="{{:PluginsAdminUrl('wallet', 'recharge', 'index')}}" method="POST">
+                <div class="am-g">
+                    <input type="text" autocomplete="off" class="am-radius form-keyword" placeholder="用户名/昵称/手机/邮箱/充值单号" name="keywords" {{if !empty($params['keywords'])}} value="{{$params.keywords}}"{{/if}} />
+                    <button type="submit" class="am-btn am-btn-secondary am-btn-sm am-radius form-submit">查询</button>
+                    <label class="fs-12 m-l-5 c-p fw-100 more-submit">
+                        更多筛选
+                        {{if isset($params['is_more']) and $params['is_more'] eq 1}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" checked />
+                            <i class="am-icon-angle-up"></i>
+                        {{else /}}
+                            <input type="checkbox" name="is_more" value="1" id="is_more" />
+                            <i class="am-icon-angle-down"></i>
+                        {{/if}}
+                    </label>
+
+                    <div class="more-where {{if !isset($params['is_more']) or $params['is_more'] neq 1}} none{{/if}}">
+                        <select name="status" class="am-radius m-t-10 chosen-select param-where" data-placeholder="状态...">
+                            <option value="-1">状态...</option>
+                            {{foreach $recharge_status_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($params['status']) and $params['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                </div>
+            </form>
+            <!-- form end -->
+
+            <!-- 列表 -->
+            <table class="am-table am-table-striped">
+                <thead>
+                    <tr>
+                        <th class="am-hide-md-down">用户信息</th>
+                        <th>充值信息</th>
+                        <th class="am-hide-md-down">支付信息</th>
+                        <th>更多</th>
+                        <th>操作</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{if !empty($data_list)}}
+                        {{foreach $data_list as $v}}
+                            <tr id="data-list-{{$v.id}}">
+                                <td class="user-info am-hide-md-down">
+                                    {{if !empty($v['user'])}}
+                                        <img src="{{$v.user.avatar}}" alt="{{$v.user.user_name_view}}" class="am-img-thumbnail am-radius am-align-left" />
+                                        <ul class="user-base">
+                                            <li>名称：{{if empty($v['user']['username'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.username}}{{/if}}</li>
+                                            <li>昵称：{{if empty($v['user']['nickname'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.nickname}}{{/if}}</li>
+                                            <li>手机：{{if empty($v['user']['mobile'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.mobile}}{{/if}}</li>
+                                            <li>邮箱：{{if empty($v['user']['email'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.email}}{{/if}}</li>
+                                        </ul>
+                                    {{else /}}
+                                        用户信息异常
+                                    {{/if}}
+                                </td>
+                                <td>
+                                    单号：{{$v.recharge_no}}<br />
+                                    金额：{{$v.money}} 元
+                                </td>
+                                <td class="am-hide-md-down">
+                                    状态：{{$v.status_text}}<br />
+                                    {{if !empty($v['payment_name'])}}
+                                        方式：{{$v.payment_name}}<br />
+                                    {{/if}}
+                                    {{if !empty($v['pay_time_text'])}}
+                                        时间：{{$v.pay_time_text}}<br />
+                                    {{/if}}
+                                    {{if $v['pay_money'] gt 0}}
+                                        金额：<span class="money-bold money">{{$v.pay_money}} 元</span>
+                                    {{/if}}
+                                </td>
+                                <td>
+                                    <span class="am-icon-caret-down c-p" data-am-modal="{target: '#my-popup{{$v.id}}'}"> 查看更多</span>
+                                    <div class="am-popup am-radius" id="my-popup{{$v.id}}">
+                                        <div class="am-popup-inner">
+                                            <div class="am-popup-hd">
+                                                <h4 class="am-popup-title">详情内容</h4>
+                                                <span data-am-modal-close
+                                                class="am-close">&times;</span>
+                                            </div>
+                                            <div class="am-popup-bd">
+                                                <dl class="dl-content">
+                                                    <dt>用户信息</dt>
+                                                    <dd class="user-info">
+                                                        {{if !empty($v['user'])}}
+                                                            <img src="{{$v.user.avatar}}" alt="{{$v.user.user_name_view}}" class="am-img-thumbnail am-radius am-align-left" />
+                                                            <ul class="user-base">
+                                                                <li>名称：{{if empty($v['user']['username'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.username}}{{/if}}</li>
+                                                                <li>昵称：{{if empty($v['user']['nickname'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.nickname}}{{/if}}</li>
+                                                                <li>手机：{{if empty($v['user']['mobile'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.mobile}}{{/if}}</li>
+                                                                <li>邮箱：{{if empty($v['user']['email'])}}<span class="cr-ccc">未填写</span>{{else /}}{{$v.user.email}}{{/if}}</li>
+                                                            </ul>
+                                                        {{else /}}
+                                                            用户信息异常
+                                                        {{/if}}
+                                                    </dd>
+
+                                                    <dt>充值信息</dt>
+                                                    <dd>
+                                                        单号：{{$v.recharge_no}}<br />
+                                                        金额：{{$v.money}} 元
+                                                    </dd>
+
+                                                    <dt>支付信息</dt>
+                                                    <dd>
+                                                        {{$v.status_text}}<br />
+                                                        {{if !empty($v['payment_name'])}}
+                                                            方式：{{$v.payment_name}}<br />
+                                                        {{/if}}
+                                                        {{if !empty($v['pay_time_text'])}}
+                                                            时间：{{$v.pay_time_text}}<br />
+                                                        {{/if}}
+                                                        {{if $v['pay_money'] gt 0}}
+                                                            金额：<span class="money-bold money">{{$v.pay_money}} 元</span>
+                                                        {{/if}}
+                                                    </dd>
+
+                                                    <dt>创建时间</dt>
+                                                    <dd>{{$v.add_time_text}}</dd>
+                                                </dl>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
+                                <td>
+                                    {{if $v['status'] eq 0}}
+                                        <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:PluginsAdminUrl('wallet', 'recharge', 'delete')}}" data-id="{{$v.id}}" data-view="delete"> 删除</button>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                        {{/foreach}}
+                    {{/if}}
+                </tbody>
+            </table>
+
+            {{if empty($data_list)}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+
+            <!-- 分页 -->
+            {{if !empty($data_list)}}
+                {{$page_html|raw}}
+            {{/if}}
+        </div>
+    </div>
+</div>
+<!-- right content end  -->
+        
+<!-- footer start -->
+{{include file="public/footer" /}}
+<!-- footer end -->
\ No newline at end of file
diff --git a/application/plugins/view/wallet/admin/walletlog/index.html b/application/plugins/view/wallet/admin/walletlog/index.html
new file mode 100644
index 000000000..78dd241a3
--- /dev/null
+++ b/application/plugins/view/wallet/admin/walletlog/index.html
@@ -0,0 +1,126 @@
+{{include file="public/header" /}}
+
+<!-- right content start  -->
+<div class="content-right">
+    <div class="content">
+        <legend>
+            <span class="fs-16">充值管理</span>
+            <a href="{{:PluginsAdminUrl('wallet', 'admin', 'index')}}" class="fr fs-14 m-t-5 am-icon-mail-reply"> 返回</a>
+        </legend>
+
+        <div class="walletlog-content">
+            <!-- form start -->
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsAdminUrl('wallet', 'walletlog', 'index')}}" request-type="form">
+                <table class="so-list more-where">
+                    <tbody>
+                        <tr>
+                            <td>
+                                <span>业务：</span>
+                                <select name="business_type" class="chosen-select" data-placeholder="业务类型...">
+                                    <option value="-1">业务类型...</option>
+                                    {{if !empty($business_type_list)}}
+                                        {{foreach $business_type_list as $v}}
+                                            <option value="{{$v.value}}" {{if isset($params['business_type']) and $params['business_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                        {{/foreach}}
+                                    {{/if}}
+                                </select>
+                            </td>
+                            <td>
+                                <span>操作：</span>
+                                <select name="operation_type" class="chosen-select" data-placeholder="操作类型...">
+                                    <option value="-1">操作类型...</option>
+                                    {{if !empty($operation_type_list)}}
+                                        {{foreach $operation_type_list as $v}}
+                                            <option value="{{$v.value}}" {{if isset($params['operation_type']) and $params['operation_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                        {{/foreach}}
+                                    {{/if}}
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>金额：</span>
+                                <select name="money_type" class="chosen-select" data-placeholder="金额类型...">
+                                    <option value="-1">金额类型...</option>
+                                    {{if !empty($money_type_list)}}
+                                        {{foreach $money_type_list as $v}}
+                                            <option value="{{$v.value}}" {{if isset($params['money_type']) and $params['money_type'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                        {{/foreach}}
+                                    {{/if}}
+                                </select>
+                            </td>
+                            <td>
+                                <button type="submit" class="am-btn am-btn-secondary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
+                                <a href="{{:PluginsAdminUrl('wallet', 'walletlog', 'index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </form>
+            <!-- form end -->
+
+            <!-- 列表 -->
+            <table class="am-table am-table-striped">
+                <thead>
+                    <tr>
+                        <th class="am-hide-sm-only">业务类型</th>
+                        <th class="am-hide-sm-only">操作类型</th>
+                        <th>金额类型</th>
+                        <th>操作金额(元)</th>
+                        <th class="am-hide-sm-only">原始金额(元)</th>
+                        <th>最新金额(元)</th>
+                        <th class="am-hide-sm-only">变更说明</th>
+                        <th class="am-hide-sm-only">操作时间</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{if !empty($data_list)}}
+                        {{foreach $data_list as $v}}
+                            <tr>
+                                <td class="am-hide-sm-only">{{$v.business_type_text}}</td>
+                                <td class="am-hide-sm-only">
+                                    {{if $v['operation_type'] eq 0}}
+                                        <span class="operation-reduce-icon">{{$v.operation_type_text}}</span>
+                                    {{elseif $v['operation_type'] eq 1}}
+                                        <span class="operation-increase-icon">{{$v.operation_type_text}}</span>
+                                    {{/if}}
+                                </td>
+                                <td>{{$v.money_type_text}}</td>
+                                <td>
+                                    {{if $v['operation_type'] eq 0}}
+                                        <span class="operation-reduce-icon">-</span>
+                                    {{elseif $v['operation_type'] eq 1}}
+                                        <span class="operation-increase-icon">+</span>
+                                    {{/if}}
+                                    <span class="money-bold money">{{$v.operation_money}}</span>
+                                </td>
+                                <td class="am-hide-sm-only">
+                                    <span class="money-bold">{{$v.original_money}}</span>
+                                </td>
+                                <td>
+                                    <span class="money-bold">{{$v.latest_money}}</span>
+                                </td>
+                                <td class="am-hide-sm-only operation-msg">{{$v.msg|raw}}</td>
+                                <td class="am-hide-sm-only">{{$v.add_time_text}}</td>
+                            </tr>
+                        {{/foreach}}
+                    {{/if}}
+                </tbody>
+            </table>
+
+            {{if empty($data_list)}}
+                <div class="table-no"><i class="am-icon-warning"></i> 没有相关数据</div>
+            {{/if}}
+
+            <!-- 分页 -->
+            {{if !empty($data_list)}}
+                {{$page_html|raw}}
+            {{/if}}
+        </div>
+    </div>
+</div>
+<!-- right content end  -->
+        
+<!-- footer start -->
+{{include file="public/footer" /}}
+<!-- footer end -->
\ No newline at end of file
diff --git a/application/plugins/view/wallet/index/cash/index.html b/application/plugins/view/wallet/index/cash/index.html
index a82b33bb5..6f8e4b8c0 100755
--- a/application/plugins/view/wallet/index/cash/index.html
+++ b/application/plugins/view/wallet/index/cash/index.html
@@ -26,7 +26,8 @@
             {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
-            <form class="am-form form-validation" method="post" action="{{:PluginsHomeUrl('wallet', 'cash', 'index')}}" request-type="form">
+            <!-- form start -->
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsHomeUrl('wallet', 'cash', 'index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="申请单号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
@@ -62,6 +63,7 @@
                     </tbody>
                 </table>
             </form>
+            <!-- form end -->
 
             <!-- 列表 -->
             <div class="data-list">
diff --git a/application/plugins/view/wallet/index/recharge/index.html b/application/plugins/view/wallet/index/recharge/index.html
index 255e27739..fad8a7fcf 100755
--- a/application/plugins/view/wallet/index/recharge/index.html
+++ b/application/plugins/view/wallet/index/recharge/index.html
@@ -26,7 +26,7 @@
             {{include file="../../../plugins/view/wallet/index/public/nav" /}}
             <!-- user menu end -->
 
-            <form class="am-form form-validation" method="post" action="{{:PluginsHomeUrl('wallet', 'recharge', 'index')}}" request-type="form">
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsHomeUrl('wallet', 'recharge', 'index')}}" request-type="form">
                 <div class="thin">
                     <div class="am-input-group am-input-group-sm am-fl so">
                         <input type="text" autocomplete="off" name="keywords" class="am-radius" placeholder="充值单号" value="{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}" />
diff --git a/application/plugins/view/wallet/index/wallet/index.html b/application/plugins/view/wallet/index/wallet/index.html
index 604e19878..5e92dcc36 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" /}}
             <!-- user menu end -->
 
-            <form class="am-form form-validation" method="post" action="{{:PluginsHomeUrl('wallet', 'wallet', 'index')}}" request-type="form">
+            <!-- form start -->
+            <form class="am-form form-validation form-search" method="post" action="{{:PluginsHomeUrl('wallet', 'wallet', 'index')}}" request-type="form">
                 <table class="so-list more-where">
                     <tbody>
                         <tr>
@@ -73,6 +74,7 @@
                     </tbody>
                 </table>
             </form>
+            <!-- form end -->
 
             <!-- 列表 -->
             <div class="data-list">
diff --git a/application/plugins/wallet/admin/Cash.php b/application/plugins/wallet/admin/Cash.php
index 4a86aa0d0..a72e4c678 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 000000000..63858e60f
--- /dev/null
+++ b/application/plugins/wallet/admin/Recharge.php
@@ -0,0 +1,99 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\plugins\wallet\admin;
+
+use think\Controller;
+use app\plugins\wallet\service\BaseService;
+use app\plugins\wallet\service\RechargeService;
+
+/**
+ * 钱包 - 充值管理
+ * @author   Devil
+ * @blog     http://gong.gg/
+ * @version  0.0.1
+ * @datetime 2016-12-01T21:51:08+0800
+ */
+class Recharge extends Controller
+{
+    /**
+     * 充值明细
+     * @author   Devil
+     * @blog     http://gong.gg/
+     * @version  1.0.0
+     * @datetime 2019-03-15T23:51:50+0800
+     * @param   [array]          $params [输入参数]
+     */
+    public function index($params = [])
+    {
+        // 分页
+        $number = MyC('admin_page_number', 10, true);
+
+        // 条件
+        $where = BaseService::RechargeWhere($params);
+
+        // 获取总数
+        $total = BaseService::RechargeTotal($where);
+
+        // 分页
+        $page_params = array(
+                'number'    =>  $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 d64140b7e..e232cbe17 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 000000000..13b4bd19f
--- /dev/null
+++ b/application/plugins/wallet/admin/Walletlog.php
@@ -0,0 +1,75 @@
+<?php
+// +----------------------------------------------------------------------
+// | ShopXO 国内领先企业级B2C免费开源电商系统
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Devil
+// +----------------------------------------------------------------------
+namespace app\plugins\wallet\admin;
+
+use think\Controller;
+use app\plugins\wallet\service\BaseService;
+use app\plugins\wallet\service\WalletService;
+
+/**
+ * 钱包 - 账户明细管理
+ * @author   Devil
+ * @blog     http://gong.gg/
+ * @version  0.0.1
+ * @datetime 2016-12-01T21:51:08+0800
+ */
+class Walletlog extends Controller
+{
+    /**
+     * 充值明细
+     * @author   Devil
+     * @blog     http://gong.gg/
+     * @version  1.0.0
+     * @datetime 2019-03-15T23:51:50+0800
+     * @param   [array]          $params [输入参数]
+     */
+    public function index($params = [])
+    {
+        // 分页
+        $number = MyC('admin_page_number', 10, true);
+
+        // 条件
+        $where = BaseService::WalletLogWhere($params);
+
+        // 获取总数
+        $total = BaseService::WalletLogTotal($where);
+
+        // 分页
+        $page_params = array(
+                'number'    =>  $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 3296a405a..e46b22d39 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 be977da46..5359f2319 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 7a85d245c..e384d5f0d 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 066d7814c..47894399e 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 c7fed7503..632b5e9c9 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 9dbe7686f..e18ffc010 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 1a4ef24a2..3fce3dd63 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 000000000..9d1650c31
--- /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 a8016cf17..da054ca22 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 000000000..dc5e78e37
--- /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
-- 
GitLab