sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

钱包优化

feat/task1-c-wallet
gongfuxiang 2019-05-10 01:19:21 +08:00
parent 75982982d4
commit 3b06734dd5
8 changed files with 154 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
application/plugins/view/wallet/admin/cash/index.html
View File

@ -41,12 +41,12 @@
<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
<thead>
<tr>
<th class="am-hide-sm-only">用户信息</th>
<th>提现信息</th>
<th class="am-hide-md-down">用户信息</th>
<th class="am-hide-sm-only">提现信息</th>
<th>收款信息</th>
<th class="am-hide-sm-only">打款信息</th>
<th class="am-hide-sm-only">描述</th>
<th class="am-hide-sm-only">申请时间</th>
<th class="am-hide-md-down">描述</th>
<th>更多</th>
<th>操作</th>
</tr>
</thead>
@ -54,10 +54,10 @@
{{if !empty($data_list)}}
{{foreach $data_list as $v}}
<tr>
<td class="user-info am-hide-sm-only">
<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-fl am-img-thumbnail am-radius am-hide-md" />
<ul class="user-base am-fl">
<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>
@ -67,7 +67,7 @@
用户信息异常
{{/if}}
</td>
<td>
<td class="am-hide-sm-only">
单号：{{$v.cash_no}}<br />
金额：<span class="money-bold cash-money">{{$v.money}}</span> 元
</td>
@ -85,11 +85,75 @@
时间：{{$v.pay_time_text}}
{{/if}}
</td>
<td class="am-hide-sm-only operation-msg">{{$v.msg}}</td>
<td class="am-hide-sm-only">{{$v.add_time_text}}</td>
<td class="am-hide-md-down operation-msg">
{{if empty($v['msg'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.msg}}{{/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.cash_no}}<br />
金额：<span class="money-bold cash-money">{{$v.money}}</span> 元
</dd>
<dt>收款信息</dt>
<dd>
银行：{{$v.bank_name}}<br />
账号：{{$v.bank_accounts}}<br />
姓名：{{$v.bank_username}}<br />
</dd>
<dt>打款信息</dt>
<dd>
{{$v.status_text}}<br />
{{if $v['pay_money'] gt 0}}
金额：<span class="money-bold money">{{$v.pay_money}}</span> 元<br />
{{/if}}
{{if !empty($v['pay_time_text'])}}
时间：{{$v.pay_time_text}}
{{/if}}
</dd>
<dt>描述</dt>
<dd>{{if empty($v['msg'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.msg}}{{/if}}</dd>
<dt>申请时间</dt>
<dd>{{$v.add_time_text}}</dd>
<dt>更新时间</dt>
<dd>{{if empty($v['upd_time_text'])}}<span class="cr-ddd">未更新</span>{{else /}}{{$v.upd_time_text}}{{/if}}</dd>
</dl>
</div>
</div>
</div>
</td>
<td class="view-operation">
<a href="{{:PluginsAdminUrl('wallet', 'wallet', 'saveinfo', ['id'=>$v['id']])}}">
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-gavel"> 审核</button>
</a>
</td>
</tr>

69
application/plugins/view/wallet/admin/wallet/index.html
View File

@ -41,10 +41,10 @@
<table class="am-table am-table-striped am-table-hover am-text-middle m-t-10">
<thead>
<tr>
<th>用户信息</th>
<th class="am-hide-md-down">用户信息</th>
<th>账户金额(元)</th>
<th>状态</th>
<th class="am-hide-sm-only">开通时间</th>
<th class="am-hide-sm-only">状态</th>
<th>更多</th>
<th>操作</th>
</tr>
</thead>
@ -52,10 +52,10 @@
{{if !empty($data_list)}}
{{foreach $data_list as $v}}
<tr id="data-list-{{$v.id}}" {{if isset($v['status']) and $v['status'] neq 0}}{{if $v['status'] eq 1}} class="am-danger"{{elseif $v['status'] eq 2}} class="am-active"{{else /}} class="am-warning"{{/if}}{{/if}}>
<td class="user-info">
<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-fl am-img-thumbnail am-radius am-hide-sm-only" />
<ul class="user-base am-fl">
<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>
@ -78,8 +78,61 @@
</li>
</ul>
</td>
<td>{{$v.status_text}}</td>
<td class="am-hide-sm-only">{{$v.add_time_text}}</td>
<td class="am-hide-sm-only">{{$v.status_text}}</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 class="money">
<ul>
<li>
有效：<span class="normal-money">{{$v.normal_money}}</span>
</li>
<li>
冻结：<span class="frozen-money">{{$v.frozen_money}}</span>
</li>
<li>
赠送：<span class="give-money">{{$v.give_money}}</span>
</li>
</ul>
</dd>
<dt>状态</dt>
<dd>{{$v.status_text}}</dd>
<dt>创建时间</dt>
<dd>{{$v.add_time_text}}</dd>
<dt>更新时间</dt>
<dd>{{if empty($v['upd_time_text'])}}<span class="cr-ddd">未更新</span>{{else /}}{{$v.upd_time_text}}{{/if}}</dd>
</dl>
</div>
</div>
</div>
</td>
<td class="view-operation">
<a href="{{:PluginsAdminUrl('wallet', 'wallet', 'saveinfo', ['id'=>$v['id']])}}">
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>

4
application/plugins/view/wallet/index/recharge/index.html
View File

@ -42,7 +42,7 @@
<table class="am-table am-table-striped">
<thead>
<tr>
<th>充值单号</th>
<th class="am-hide-sm-only">充值单号</th>
<th>充值金额(元)</th>
<th class="am-hide-sm-only">支付金额(元)</th>
<th>状态</th>
@ -56,7 +56,7 @@
{{if !empty($data_list)}}
{{foreach $data_list as $v}}
<tr id="data-list-{{$v.id}}">
<td>{{$v.recharge_no}}</td>
<td class="am-hide-sm-only">{{$v.recharge_no}}</td>
<td class="money-bold">{{$v.money}}</td>
<td class="am-hide-sm-only money-bold money">{{if $v['pay_money'] gt 0}}{{$v.pay_money}}{{/if}}</td>
<td>{{$v.status_text}}</td>

8
application/plugins/view/wallet/index/wallet/index.html
View File

@ -80,10 +80,10 @@
<thead>
<tr>
<th class="am-hide-sm-only">业务类型</th>
<th>操作类型</th>
<th class="am-hide-sm-only">操作类型</th>
<th>金额类型</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>
@ -94,7 +94,7 @@
{{foreach $data_list as $v}}
<tr>
<td class="am-hide-sm-only">{{$v.business_type_text}}</td>
<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}}
@ -110,7 +110,7 @@
{{/if}}
<span class="money-bold money">{{$v.operation_money}}</span>
</td>
<td>
<td class="am-hide-sm-only">
<span class="money-bold">{{$v.original_money}}</span>
</td>
<td>

8
application/plugins/wallet/service/BaseService.php
View File

@ -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", '<br />', $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);

2
public/static/common/css/common.css
View File

@ -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; }
/**
* 表单优化

8
public/static/plugins/css/wallet/admin/cash.css
View File

@ -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%;
}
/**

6
public/static/plugins/css/wallet/admin/wallet.css
View File

@ -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;
}
/**