diff --git a/application/plugins/view/wallet/admin/cash/index.html b/application/plugins/view/wallet/admin/cash/index.html index bb1f1236c..c8ddd1cf9 100644 --- a/application/plugins/view/wallet/admin/cash/index.html +++ b/application/plugins/view/wallet/admin/cash/index.html @@ -41,12 +41,12 @@ - - + + - - + + @@ -54,10 +54,10 @@ {{if !empty($data_list)}} {{foreach $data_list as $v}} - - @@ -85,11 +85,75 @@ 时间:{{$v.pay_time_text}} {{/if}} - - + + diff --git a/application/plugins/view/wallet/admin/wallet/index.html b/application/plugins/view/wallet/admin/wallet/index.html index f2d7e0174..7bd505fd8 100644 --- a/application/plugins/view/wallet/admin/wallet/index.html +++ b/application/plugins/view/wallet/admin/wallet/index.html @@ -41,10 +41,10 @@
用户信息提现信息用户信息提现信息 收款信息 打款信息描述申请时间描述更多 操作
+ 单号:{{$v.cash_no}}
金额:{{$v.money}}
{{$v.msg}}{{$v.add_time_text}} + {{if empty($v['msg'])}}未填写{{else /}}{{$v.msg}}{{/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}} +
+ +
描述
+
{{if empty($v['msg'])}}未填写{{else /}}{{$v.msg}}{{/if}}
+ +
申请时间
+
{{$v.add_time_text}}
+ +
更新时间
+
{{if empty($v['upd_time_text'])}}未更新{{else /}}{{$v.upd_time_text}}{{/if}}
+
+
+
+
+
- +
- + - - + + @@ -52,10 +52,10 @@ {{if !empty($data_list)}} {{foreach $data_list as $v}} - - - + +
用户信息用户信息 账户金额(元)状态开通时间状态更多 操作
{{$v.status_text}}{{$v.add_time_text}}{{$v.status_text}} + 查看更多 +
+
+
+

详情内容

+ × +
+
+
+
用户信息
+ + +
账户金额(元)
+
+
    +
  • + 有效:{{$v.normal_money}} +
  • +
  • + 冻结:{{$v.frozen_money}} +
  • +
  • + 赠送:{{$v.give_money}} +
  • +
+
+ +
状态
+
{{$v.status_text}}
+ +
创建时间
+
{{$v.add_time_text}}
+ +
更新时间
+
{{if empty($v['upd_time_text'])}}未更新{{else /}}{{$v.upd_time_text}}{{/if}}
+
+
+
+
+
diff --git a/application/plugins/view/wallet/index/recharge/index.html b/application/plugins/view/wallet/index/recharge/index.html index 14a1377fd..255e27739 100755 --- a/application/plugins/view/wallet/index/recharge/index.html +++ b/application/plugins/view/wallet/index/recharge/index.html @@ -42,7 +42,7 @@ - + @@ -56,7 +56,7 @@ {{if !empty($data_list)}} {{foreach $data_list as $v}} - + diff --git a/application/plugins/view/wallet/index/wallet/index.html b/application/plugins/view/wallet/index/wallet/index.html index 8eb667e17..604e19878 100755 --- a/application/plugins/view/wallet/index/wallet/index.html +++ b/application/plugins/view/wallet/index/wallet/index.html @@ -80,10 +80,10 @@ - + - + @@ -94,7 +94,7 @@ {{foreach $data_list as $v}} - -
充值单号充值单号 充值金额(元) 支付金额(元) 状态
{{$v.recharge_no}}{{$v.recharge_no}} {{$v.money}} {{if $v['pay_money'] gt 0}}{{$v.pay_money}}{{/if}} {{$v.status_text}}
业务类型操作类型操作类型 金额类型 操作金额(元)原始金额(元)原始金额(元) 最新金额(元) 变更说明 操作时间
{{$v.business_type_text}} + {{if $v['operation_type'] eq 0}} {{$v.operation_type_text}} {{elseif $v['operation_type'] eq 1}} @@ -110,7 +110,7 @@ {{/if}} {{$v.operation_money}} + {{$v.original_money}} diff --git a/application/plugins/wallet/service/BaseService.php b/application/plugins/wallet/service/BaseService.php index 0f9a02f2f..066d7814c 100755 --- a/application/plugins/wallet/service/BaseService.php +++ b/application/plugins/wallet/service/BaseService.php @@ -55,8 +55,9 @@ class BaseService // 状态 $v['status_text'] = (isset($v['status']) && isset($wallet_status_list[$v['status']])) ? $wallet_status_list[$v['status']]['name'] : '未知'; - // 创建时间 + // 时间 $v['add_time_text'] = empty($v['add_time']) ? '' : date('Y-m-d H:i:s', $v['add_time']); + $v['upd_time_text'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); } } return DataReturn('处理成功', 0, $data); @@ -362,11 +363,10 @@ class BaseService // 备注 $v['msg'] = empty($v['msg']) ? '' : str_replace("\n", '
', $v['msg']); - // 打款时间 + // 时间 $v['pay_time_text'] = empty($v['pay_time']) ? '' : date('Y-m-d H:i:s', $v['pay_time']); - - // 创建时间 $v['add_time_text'] = empty($v['add_time']) ? '' : date('Y-m-d H:i:s', $v['add_time']); + $v['upd_time_text'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); } } return DataReturn('处理成功', 0, $data); diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 40ab6520d..9dbe7686f 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -11,7 +11,7 @@ .dl-content dt { float: left; padding-left: 5px; overflow: hidden; clear: left; width: 120px; } .dl-content dd { border-bottom: 1px solid #efefef; padding-left: 120px; } -.dl-content dt, .dl-content dd { font-weight: normal !important; text-align: left; margin-top: 0px; line-height: 36px; min-height: 46px; padding-top: 5px; padding-bottom: 5px; } +.dl-content dt, .dl-content dd { font-weight: normal !important; text-align: left; margin-top: 0px; line-height: 20px; min-height: 40px; padding-top: 10px; padding-bottom: 10px; } /** * 表单优化 diff --git a/public/static/plugins/css/wallet/admin/cash.css b/public/static/plugins/css/wallet/admin/cash.css index 08b1f8fa0..0ef318490 100644 --- a/public/static/plugins/css/wallet/admin/cash.css +++ b/public/static/plugins/css/wallet/admin/cash.css @@ -25,12 +25,12 @@ margin: 0; } .cash-content table.am-table .user-info img { - max-width: 75px; - max-height: 75px; - margin-right: 5px; + max-width: 35px; + max-height: 35px; + margin: 0 5px 2px 0; } .cash-content table.am-table .operation-msg { - width: 20%; + width: 15%; } /** diff --git a/public/static/plugins/css/wallet/admin/wallet.css b/public/static/plugins/css/wallet/admin/wallet.css index 3fe67f5d3..a8016cf17 100644 --- a/public/static/plugins/css/wallet/admin/wallet.css +++ b/public/static/plugins/css/wallet/admin/wallet.css @@ -25,9 +25,9 @@ margin: 0; } .wallet-content table.am-table .user-info img { - max-width: 75px; - max-height: 75px; - margin-right: 5px; + max-width: 35px; + max-height: 35px; + margin: 0 5px 2px 0; } /**