diff --git a/application/plugins/view/wallet/admin/admin/index.html b/application/plugins/view/wallet/admin/admin/index.html index d89ee425c30cf2013ea7cb6df9d7db38e453ffe7..c20cbf101acc135266ef633b80176acf437996d5 100755 --- a/application/plugins/view/wallet/admin/admin/index.html +++ b/application/plugins/view/wallet/admin/admin/index.html @@ -115,7 +115,7 @@ 待处理 12 - 查看 + 查看
  • diff --git a/application/plugins/view/wallet/admin/cash/index.html b/application/plugins/view/wallet/admin/cash/index.html new file mode 100644 index 0000000000000000000000000000000000000000..bb1f1236ceba933465c92d68fc2348a5cf8802cd --- /dev/null +++ b/application/plugins/view/wallet/admin/cash/index.html @@ -0,0 +1,117 @@ +{{include file="public/header" /}} + + +
    +
    + + 钱包 + 返回 + + +
    + + + + + + + + + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + + + {{/foreach}} + {{/if}} + +
    用户信息提现信息收款信息打款信息描述申请时间操作
    + 单号:{{$v.cash_no}}
    + 金额:{{$v.money}} 元 +
    + 银行:{{$v.bank_name}}
    + 账号:{{$v.bank_accounts}}
    + 姓名:{{$v.bank_username}}
    +
    + {{$v.status_text}}
    + {{if $v['pay_money'] gt 0}} + 金额:{{$v.pay_money}}
    + {{/if}} + {{if !empty($v['pay_time_text'])}} + 时间:{{$v.pay_time_text}} + {{/if}} +
    {{$v.msg}}{{$v.add_time_text}} + + + +
    + + + {{if empty($data_list)}} +
    没有相关数据
    + {{/if}} + + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
    +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/admin/wallet/index.html b/application/plugins/view/wallet/admin/wallet/index.html index b8bfd54cb11b0eaa46d1a114a853e9ea34268ed6..f2d7e01745844ba558e3f816282267a7d83576f9 100644 --- a/application/plugins/view/wallet/admin/wallet/index.html +++ b/application/plugins/view/wallet/admin/wallet/index.html @@ -87,13 +87,15 @@ {{/foreach}} - {{else /}} - 没有相关数据 {{/if}} + {{if empty($data_list)}} +
    没有相关数据
    + {{/if}} + {{if !empty($data_list)}} {{$page_html|raw}} diff --git a/application/plugins/view/wallet/index/cash/index.html b/application/plugins/view/wallet/index/cash/index.html index 92d0735130549650d03e76feaa6203243302fb9f..a7548308b35e4237f9c652c66d5700224e78fc1a 100755 --- a/application/plugins/view/wallet/index/cash/index.html +++ b/application/plugins/view/wallet/index/cash/index.html @@ -68,26 +68,27 @@ - - + - + - + {{if !empty($data_list)}} {{foreach $data_list as $v}} - - + -
    提现单号提现金额(元)提现信息 收款信息打款信息打款信息 描述创建时间申请时间
    {{$v.cash_no}}{{$v.money}} + 单号:{{$v.cash_no}}
    + 金额:{{$v.money}} 元 +
    银行:{{$v.bank_name}}
    账号:{{$v.bank_accounts}}
    姓名:{{$v.bank_username}}
    + {{$v.status_text}}
    {{if $v['pay_money'] gt 0}} 金额:{{$v.pay_money}}
    diff --git a/application/plugins/wallet/admin/Cash.php b/application/plugins/wallet/admin/Cash.php new file mode 100644 index 0000000000000000000000000000000000000000..3fbbb078b39b567bc536201ff8e491b35c482a5d --- /dev/null +++ b/application/plugins/wallet/admin/Cash.php @@ -0,0 +1,129 @@ + $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => PluginsHomeUrl('wallet', 'cash', '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::CashList($data_params); + $this->assign('data_list', $data['data']); + } else { + $this->assign('data_list', []); + } + + // 静态数据 + $this->assign('cash_status_list', CashService::$cash_status_list); + + // 参数 + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/wallet/admin/cash/index'); + } + + /** + * 钱包编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-05-05 + * @desc description + * @param [array] $params [输入参数] + */ + public function saveinfo($params = []) + { + $data = []; + if(!empty($params['id'])) + { + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['id'=>intval($params['id'])], + ); + $ret = BaseService::WalletList($data_params); + if(!empty($ret['data'][0])) + { + $data = $ret['data'][0]; + + // 静态数据 + $this->assign('wallet_status_list', WalletService::$wallet_status_list); + } else { + $this->assign('msg', '钱包有误'); + } + } else { + $this->assign('msg', '钱包id有误'); + } + + $this->assign('data', $data); + return $this->fetch('../../../plugins/view/wallet/admin/wallet/saveinfo'); + } + + /** + * 钱包编辑 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-05-06 + * @desc description + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + return WalletService::WalletEdit($params); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/service/BaseService.php b/application/plugins/wallet/service/BaseService.php index 0726ddafdf477b085c7863e20fed2f844ba2aeb3..0f9a02f2f20546d7927be09a46b847f21ac36d86 100755 --- a/application/plugins/wallet/service/BaseService.php +++ b/application/plugins/wallet/service/BaseService.php @@ -175,15 +175,7 @@ class BaseService foreach($data as &$v) { // 用户信息 - if(!empty($v['user_id'])) - { - $user = Db::name('User')->where(['id'=>$v['user_id']])->field('username,nickname,mobile,gender,avatar')->find(); - $v['username'] = empty($user['username']) ? '' : $user['username']; - $v['nickname'] = empty($user['nickname']) ? '' : $user['nickname']; - $v['mobile'] = empty($user['mobile']) ? '' : $user['mobile']; - $v['avatar'] = empty($user['avatar']) ? '' : $user['avatar']; - $v['gender_text'] = isset($user['gender']) ? $common_gender_list[$user['gender']]['name'] : ''; - } + $v['user'] = self::GetUserInfo($v['user_id']); // 支付状态 $v['status_text'] = isset($v['status']) ? RechargeService::$recharge_status_list[$v['status']]['name'] : ''; @@ -362,15 +354,7 @@ class BaseService foreach($data as &$v) { // 用户信息 - if(!empty($v['user_id'])) - { - $user = Db::name('User')->where(['id'=>$v['user_id']])->field('username,nickname,mobile,gender,avatar')->find(); - $v['username'] = empty($user['username']) ? '' : $user['username']; - $v['nickname'] = empty($user['nickname']) ? '' : $user['nickname']; - $v['mobile'] = empty($user['mobile']) ? '' : $user['mobile']; - $v['avatar'] = empty($user['avatar']) ? '' : $user['avatar']; - $v['gender_text'] = isset($user['gender']) ? $common_gender_list[$user['gender']]['name'] : ''; - } + $v['user'] = self::GetUserInfo($v['user_id']); // 提现状态 $v['status_text'] = isset($v['status']) ? CashService::$cash_status_list[$v['status']]['name'] : ''; diff --git a/public/static/plugins/css/wallet/admin/cash.css b/public/static/plugins/css/wallet/admin/cash.css new file mode 100644 index 0000000000000000000000000000000000000000..08b1f8fa024dd07c1261b4c27956a88f8a415949 --- /dev/null +++ b/public/static/plugins/css/wallet/admin/cash.css @@ -0,0 +1,47 @@ +/** + * 搜索表单 + */ +.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 table.am-table ul { + list-style: none; + padding: 0; + margin: 0; +} +.cash-content table.am-table .user-info img { + max-width: 75px; + max-height: 75px; + margin-right: 5px; +} +.cash-content table.am-table .operation-msg { + width: 20%; +} + +/** + * 金额 + */ +.cash-content .money-bold { + font-weight: 700; +} +.cash-content .money { + color: #4CAF50; +} +.cash-content .cash-money { + color: #FF9800; +} \ 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 9a9e9d69103ff5d5b16b823f011ab16ef2459fd0..3fe67f5d383871c6eeb460e4500bbd287ecff22b 100644 --- a/public/static/plugins/css/wallet/admin/wallet.css +++ b/public/static/plugins/css/wallet/admin/wallet.css @@ -16,7 +16,6 @@ .form-search .param-where:nth-child(1), .param-where:nth-child(4) { margin-left: 0px !important; } } - /** * 列表 */ @@ -52,8 +51,6 @@ /** * 编辑 */ - - @media only screen and (min-width: 641px) { .wallet-content form .am-alert { margin: 0; diff --git a/public/static/plugins/css/wallet/index/cash.css b/public/static/plugins/css/wallet/index/cash.css index 06d304c0832026e1c6b3efd27ffee46426de80b8..a10a2a922c7e48e837aa2704651b9e0d21fb3f55 100644 --- a/public/static/plugins/css/wallet/index/cash.css +++ b/public/static/plugins/css/wallet/index/cash.css @@ -44,4 +44,7 @@ */ .user-content-body .data-list .operation-msg { width: 20%; +} +.user-content-body .data-list .cash-money { + color: #FF9800; } \ No newline at end of file