Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
loveisland
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘小敏
loveisland
Commits
8179c67a
Commit
8179c67a
authored
Jul 02, 2026
by
刘小敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(agent): 增加佣金流水搜索、导出及批量修改功能
parent
e626a715
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
12 deletions
+14
-12
Agent.php
application/admin/controller/shopro/agent/Agent.php
+0
-0
apply.php
application/admin/lang/zh-cn/shopro/agent/apply.php
+1
-1
AgentOrderCommission.php
...ication/admin/model/shopro/agent/AgentOrderCommission.php
+6
-6
detail.html
application/admin/view/shopro/agent/agent/detail.html
+0
-0
detail.html
application/admin/view/shopro/agent/apply/detail.html
+2
-2
agent.js
public/assets/js/backend/shopro/agent/agent.js
+0
-0
apply.js
public/assets/js/backend/shopro/agent/apply.js
+5
-3
No files found.
application/admin/controller/shopro/agent/Agent.php
View file @
8179c67a
This diff is collapsed.
Click to expand it.
application/admin/lang/zh-cn/shopro/agent/apply.php
View file @
8179c67a
...
...
@@ -6,7 +6,7 @@ return [
'Province_name'
=>
'省份名称'
,
'Real_name'
=>
'真实姓名'
,
'Id_card'
=>
'身份证号'
,
'Id_card_images'
=>
'身份证照片
(JSON数组)
'
,
'Id_card_images'
=>
'身份证照片'
,
'Status'
=>
'审核状态'
,
'Status pending'
=>
'审核中'
,
'Set status to pending'
=>
'设为审核中'
,
...
...
application/admin/model/shopro/agent/AgentOrderCommission.php
View file @
8179c67a
...
...
@@ -30,12 +30,12 @@ class AgentOrderCommission extends Common
];
}
public
function
getStatusTextAttr
(
$value
,
$data
)
{
$value
=
$value
??
(
$data
[
'status'
]
??
null
);
$map
=
$this
->
statusList
();
return
$map
[
$value
]
??
'-'
;
}
//
public function getStatusTextAttr($value, $data)
//
{
//
$value = $value ?? ($data['status'] ?? null);
//
$map = $this->statusList();
//
return $map[$value] ?? '-';
//
}
// 奖励金额 = 订单金额 * 5%
public
function
getRewardAmountAttr
(
$value
,
$data
)
...
...
application/admin/view/shopro/agent/agent/detail.html
View file @
8179c67a
This diff is collapsed.
Click to expand it.
application/admin/view/shopro/agent/apply/detail.html
View file @
8179c67a
...
...
@@ -14,10 +14,10 @@
<td>
{:__('User_id')}
</td>
<td>
{$row.user_id}
</td>
</tr>
<tr>
<
!-- <
tr>
<td>{:__('Province_name')}</td>
<td>{$row.province_name}</td>
</tr>
</tr>
-->
<tr>
<td>
{:__('Real_name')}
</td>
<td>
{$row.real_name}
</td>
...
...
public/assets/js/backend/shopro/agent/agent.js
View file @
8179c67a
This diff is collapsed.
Click to expand it.
public/assets/js/backend/shopro/agent/apply.js
View file @
8179c67a
...
...
@@ -51,7 +51,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
field
:
'real_name'
,
title
:
__
(
'Real_name'
),
operate
:
'LIKE'
},
{
field
:
'id_card'
,
title
:
__
(
'Id_card'
),
operate
:
'LIKE'
},
{
field
:
'status'
,
title
:
__
(
'Status'
),
searchList
:
{
"pending"
:
__
(
'Status pending'
),
"approved"
:
__
(
'Status approved'
),
"rejected"
:
__
(
'Status rejected'
)},
formatter
:
Table
.
api
.
formatter
.
status
},
{
field
:
'reject_reason'
,
title
:
__
(
'Reject_reason'
),
operate
:
'LIKE'
,
table
:
table
,
class
:
'autocontent'
,
formatter
:
Table
.
api
.
formatter
.
content
},
{
field
:
'reject_reason'
,
title
:
__
(
'Reject_reason'
),
operate
:
'LIKE'
,
table
:
table
,
class
:
'autocontent'
,
formatter
:
function
(
value
)
{
return
value
?
value
:
'-'
;
}
},
{
field
:
'audit_user_id'
,
title
:
__
(
'Audit_user_id'
)},
{
field
:
'audit_time'
,
title
:
__
(
'Audit_time'
),
operate
:
'RANGE'
,
addclass
:
'datetimerange'
,
autocomplete
:
false
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
{
field
:
'createtime'
,
title
:
__
(
'Createtime'
),
operate
:
'RANGE'
,
addclass
:
'datetimerange'
,
autocomplete
:
false
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
...
...
@@ -73,14 +73,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
title
:
__
(
'Approve'
),
text
:
__
(
'Approve'
),
icon
:
'fa fa-check'
,
classname
:
'btn btn-success btn-xs btn-approve-one'
classname
:
'btn btn-success btn-xs btn-approve-one'
,
hidden
:
function
(
row
)
{
return
row
.
status
!==
'pending'
;
}
},
{
name
:
'reject'
,
title
:
__
(
'Reject'
),
text
:
__
(
'Reject'
),
icon
:
'fa fa-times'
,
classname
:
'btn btn-danger btn-xs btn-reject-one'
classname
:
'btn btn-danger btn-xs btn-reject-one'
,
hidden
:
function
(
row
)
{
return
row
.
status
!==
'pending'
;
}
}
],
table
:
table
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment