Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
纵之格
ShopXO
提交
17bbe870
ShopXO
项目概览
纵之格
/
ShopXO
通知
394
Star
16
Fork
11
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
17bbe870
编写于
5月 13, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
细节优化
上级
90fea6f5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
94 addition
and
7 deletion
+94
-7
application/plugins/view/wallet/admin/wallet/index.html
application/plugins/view/wallet/admin/wallet/index.html
+16
-3
application/plugins/view/wallet/admin/walletlog/index.html
application/plugins/view/wallet/admin/walletlog/index.html
+51
-4
application/plugins/wallet/service/BaseService.php
application/plugins/wallet/service/BaseService.php
+16
-0
public/static/plugins/css/wallet/admin/wallet.css
public/static/plugins/css/wallet/admin/wallet.css
+11
-0
未找到文件。
application/plugins/view/wallet/admin/wallet/index.html
浏览文件 @
17bbe870
...
@@ -148,9 +148,22 @@
...
@@ -148,9 +148,22 @@
</div>
</div>
</td>
</td>
<td
class=
"view-operation"
>
<td
class=
"view-operation"
>
<a
href=
"{{:PluginsAdminUrl('wallet', 'wallet', 'saveinfo', ['id'=>$v['id']])}}"
>
<div>
<button
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"
>
编辑
</button>
<a
href=
"{{:PluginsAdminUrl('wallet', 'wallet', 'saveinfo', ['id'=>$v['id']])}}"
>
</a>
<button
class=
"am-btn am-btn-primary am-btn-xs am-radius m-r-5 am-icon-edit"
>
编辑
</button>
</a>
<a
href=
"{{:PluginsAdminUrl('wallet', 'recharge', 'index', ['keywords'=>$v['user']['user_name_view']])}}"
>
<button
class=
"am-btn am-btn-secondary am-btn-xs am-radius am-icon-shield"
>
充值
</button>
</a>
</div>
<div>
<a
href=
"{{:PluginsAdminUrl('wallet', 'cash', 'index', ['keywords'=>$v['user']['user_name_view']])}}"
>
<button
class=
"am-btn am-btn-warning am-btn-xs am-radius m-t-10 m-r-5 am-icon-money"
>
提现
</button>
</a>
<a
href=
"{{:PluginsAdminUrl('wallet', 'walletlog', 'index', ['keywords'=>$v['user']['user_name_view']])}}"
>
<button
class=
"am-btn am-btn-default am-btn-xs am-radius m-t-10 am-icon-history"
>
明细
</button>
</a>
</div>
</td>
</td>
</tr>
</tr>
{{/foreach}}
{{/foreach}}
...
...
application/plugins/view/wallet/admin/walletlog/index.html
浏览文件 @
17bbe870
...
@@ -11,7 +11,25 @@
...
@@ -11,7 +11,25 @@
<div
class=
"walletlog-content"
>
<div
class=
"walletlog-content"
>
<!-- form start -->
<!-- form start -->
<form
class=
"am-form form-validation form-search"
method=
"post"
action=
"{{:PluginsAdminUrl('wallet', 'walletlog', 'index')}}"
request-type=
"form"
>
<form
class=
"am-form form-validation form-search"
method=
"post"
action=
"{{:PluginsAdminUrl('wallet', 'walletlog', 'index')}}"
request-type=
"form"
>
<table
class=
"so-list more-where"
>
<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}}"
/>
<span
class=
"am-input-group-btn"
>
<button
class=
"am-btn am-btn-default am-radius"
type=
"submit"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
</span>
</div>
<label
class=
"am-fl thin_sub 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>
<table
class=
"so-list more-where {{if !isset($params['is_more'])}}none{{/if}}"
>
<tbody>
<tbody>
<tr>
<tr>
<td>
<td>
...
@@ -63,9 +81,10 @@
...
@@ -63,9 +81,10 @@
<table
class=
"am-table am-table-striped am-table-hover m-t-10"
>
<table
class=
"am-table am-table-striped am-table-hover m-t-10"
>
<thead>
<thead>
<tr>
<tr>
<th
class=
"am-hide-sm-only"
>
业务类型
</th>
<th
class=
"am-hide-md-down"
>
用户信息
</th>
<th
class=
"am-hide-sm-only"
>
操作类型
</th>
<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
class=
"am-hide-sm-only"
>
原始金额(元)
</th>
<th>
最新金额(元)
</th>
<th>
最新金额(元)
</th>
...
@@ -77,6 +96,19 @@
...
@@ -77,6 +96,19 @@
{{if !empty($data_list)}}
{{if !empty($data_list)}}
{{foreach $data_list as $v}}
{{foreach $data_list as $v}}
<tr>
<tr>
<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
class=
"am-hide-sm-only"
>
{{$v.business_type_text}}
</td>
<td
class=
"am-hide-sm-only"
>
{{$v.business_type_text}}
</td>
<td
class=
"am-hide-sm-only"
>
<td
class=
"am-hide-sm-only"
>
{{if $v['operation_type'] eq 0}}
{{if $v['operation_type'] eq 0}}
...
@@ -112,6 +144,21 @@
...
@@ -112,6 +144,21 @@
</div>
</div>
<div
class=
"am-popup-bd"
>
<div
class=
"am-popup-bd"
>
<dl
class=
"dl-content"
>
<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>
<dt>
业务类型
</dt>
<dd>
{{$v.business_type_text}}
</dd>
<dd>
{{$v.business_type_text}}
</dd>
...
...
application/plugins/wallet/service/BaseService.php
浏览文件 @
17bbe870
...
@@ -273,6 +273,9 @@ class BaseService
...
@@ -273,6 +273,9 @@ class BaseService
$money_type_list
=
WalletService
::
$money_type_list
;
$money_type_list
=
WalletService
::
$money_type_list
;
foreach
(
$data
as
&
$v
)
foreach
(
$data
as
&
$v
)
{
{
// 用户信息
$v
[
'user'
]
=
self
::
GetUserInfo
(
$v
[
'user_id'
]);
// 业务类型
// 业务类型
$v
[
'business_type_text'
]
=
(
isset
(
$v
[
'business_type'
])
&&
isset
(
$business_type_list
[
$v
[
'business_type'
]]))
?
$business_type_list
[
$v
[
'business_type'
]][
'name'
]
:
'未知'
;
$v
[
'business_type_text'
]
=
(
isset
(
$v
[
'business_type'
])
&&
isset
(
$business_type_list
[
$v
[
'business_type'
]]))
?
$business_type_list
[
$v
[
'business_type'
]][
'name'
]
:
'未知'
;
...
@@ -325,6 +328,19 @@ class BaseService
...
@@ -325,6 +328,19 @@ class BaseService
$where
[]
=
[
'user_id'
,
'='
,
$params
[
'user'
][
'id'
]];
$where
[]
=
[
'user_id'
,
'='
,
$params
[
'user'
][
'id'
]];
}
}
// 用户
if
(
!
empty
(
$params
[
'keywords'
]))
{
$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
[]
=
[
'id'
,
'='
,
0
];
}
}
// 业务类型
// 业务类型
if
(
isset
(
$params
[
'business_type'
])
&&
$params
[
'business_type'
]
>
-
1
)
if
(
isset
(
$params
[
'business_type'
])
&&
$params
[
'business_type'
]
>
-
1
)
{
{
...
...
public/static/plugins/css/wallet/admin/wallet.css
浏览文件 @
17bbe870
/**
* 列表
*/
.wallet-content
.view-operation
{
width
:
160px
;
}
.wallet-content
.view-operation
button
{
width
:
calc
(
50%
-
5px
);
}
/**
/**
* 金额
* 金额
*/
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录