切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
刘朕
6 years ago
提交
7205b51377cd68a54849b79eee052d1a0025cd83
1 个父辈
f07a6a06
1 个管道 的构建
通过
耗费 28 秒
后台用户、业务员余额明细调整
变更
7
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
7 行增加
和
17 行删除
app/admin/controller/SalesmanController.php
app/admin/controller/UsersController.php
public/themes/admin_simpleboot3/admin/platformorders/plat_list.html
public/themes/admin_simpleboot3/admin/salesman/salesman_list.html
public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
public/themes/admin_simpleboot3/admin/users/user_list.html
public/themes/admin_simpleboot3/admin/users/users_money.html
app/admin/controller/SalesmanController.php
查看文件 @
7205b51
...
...
@@ -388,8 +388,7 @@ class SalesmanController extends AdminBaseController{
public
function
salesman_money
(){
$uid
=
$this
->
request
->
param
();
$data
=
Db
::
name
(
'money_income'
)
->
where
(
'uid'
,
$uid
[
'uid'
])
->
select
()
->
toArray
();
$money_ratio
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
find
();
$data
=
Db
::
name
(
'money_income'
)
->
where
(
'uid'
,
$uid
[
'uid'
])
->
order
(
'create_time'
,
'DESC'
)
->
select
()
->
toArray
();
if
(
!
empty
(
$data
)){
foreach
(
$data
as
$key
=>
$val
){
if
(
$val
[
'type'
]
==
2
){
...
...
@@ -404,7 +403,6 @@ class SalesmanController extends AdminBaseController{
$data
[
$key
][
'indent'
]
=
Db
::
name
(
'indent'
)
->
where
(
'id'
,
$val
[
'indent_id'
])
->
find
();
$data
[
$key
][
'indent_good'
]
=
$val
[
'book_name'
];
}
$data
[
$key
][
'money'
]
=
$val
[
'money'
]
*
$money_ratio
[
'salesman_ratio'
];
}
}
$this
->
assign
(
'data'
,
$data
);
...
...
app/admin/controller/UsersController.php
查看文件 @
7205b51
...
...
@@ -176,9 +176,7 @@ class UsersController extends AdminBaseController{
public
function
users_money
(){
$uid
=
$this
->
request
->
param
();
$data
=
Db
::
name
(
'money_income'
)
->
where
(
'uid'
,
$uid
[
'uid'
])
->
select
()
->
toArray
();
$my_user
=
Db
::
name
(
'my_user'
)
->
where
(
'uid'
,
$uid
[
'uid'
])
->
find
();
$money_ratio
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
find
();
$data
=
Db
::
name
(
'money_income'
)
->
where
(
'uid'
,
$uid
[
'uid'
])
->
order
(
'create_time'
,
'DESC'
)
->
select
()
->
toArray
();
if
(
!
empty
(
$data
)){
foreach
(
$data
as
$key
=>
$val
){
if
(
$val
[
'type'
]
==
2
){
...
...
@@ -193,12 +191,6 @@ class UsersController extends AdminBaseController{
$data
[
$key
][
'indent'
]
=
Db
::
name
(
'indent'
)
->
where
(
'id'
,
$val
[
'indent_id'
])
->
find
();
$data
[
$key
][
'indent_good'
]
=
$val
[
'book_name'
];
}
if
(
$my_user
[
'status'
]
==
2
)
{
$data
[
$key
][
'money'
]
=
$val
[
'money'
]
*
$money_ratio
[
'salesman_ratio'
];
}
if
(
$my_user
[
'status'
]
==
3
)
{
$data
[
$key
][
'money'
]
=
$val
[
'money'
]
*
$money_ratio
[
'teacher_ratio'
];
}
}
}
$this
->
assign
(
'data'
,
$data
);
...
...
public/themes/admin_simpleboot3/admin/platformorders/plat_list.html
查看文件 @
7205b51
...
...
@@ -33,7 +33,7 @@
<a
class=
"btn btn-danger"
href=
"{:url('Platformorders/plat_list')}"
>
清空
</a>
<input
type=
"button"
class=
"btn btn-primary"
id=
"excel"
value=
"导出"
/>
</form>
<table
class=
"table table-
bordered
"
>
<table
class=
"table table-
hover table-bordered table-list
"
>
<thead>
<tr>
<th>
序号
</th>
...
...
public/themes/admin_simpleboot3/admin/salesman/salesman_list.html
查看文件 @
7205b51
...
...
@@ -28,7 +28,7 @@
<input
type=
"submit"
class=
"btn btn-primary"
value=
"搜索"
/>
<a
class=
"btn btn-danger"
href=
"{:url('Salesman/salesman_list')}"
>
清空
</a>
</form>
<table
class=
"table table-
bordered
"
>
<table
class=
"table table-
hover table-bordered table-list
"
>
<thead>
<tr>
<th>
序号
</th>
...
...
public/themes/admin_simpleboot3/admin/salesmanorder/sale_order_list.html
查看文件 @
7205b51
...
...
@@ -50,7 +50,7 @@
<div
style=
"margin-left: 1200px;"
>
<span>
总盈利:¥{$money}
</span>
</div>
<table
class=
"table table-
bordered
"
style=
"margin-top: 20px;"
>
<table
class=
"table table-
hover table-bordered table-list
"
style=
"margin-top: 20px;"
>
<thead>
<tr>
<th>
序号
</th>
...
...
public/themes/admin_simpleboot3/admin/users/user_list.html
查看文件 @
7205b51
...
...
@@ -36,7 +36,7 @@
<input
type=
"submit"
class=
"btn btn-primary"
value=
"搜索"
/>
<a
class=
"btn btn-danger"
href=
"{:url('Users/user_list')}"
>
清空
</a>
</form>
<table
class=
"table table-
bordered
"
>
<table
class=
"table table-
hover table-bordered table-list
"
>
<caption>
边框表格布局
</caption>
<thead>
<tr>
...
...
public/themes/admin_simpleboot3/admin/users/users_money.html
查看文件 @
7205b51
...
...
@@ -6,7 +6,7 @@
<li><a
href=
"{:url('Users/user_list')}"
>
用户列表
</a></li>
<li
class=
"active"
><a
href=
"#"
>
余额明细列表
</a></li>
</ul>
<table
class=
"table table-
bordered
"
>
<table
class=
"table table-
hover table-bordered table-list
"
>
<thead>
<tr>
<th>
收入时间
</th>
...
...
请
注册
或
登录
后发表评论