From 534ab68bd29b6c6aea32093163286fc3da68e59b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 12 六月 2023 09:59:45 +0800
Subject: [PATCH] 修改提现bug。
---
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js
index ac01992..1fa51ea 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js
@@ -18,21 +18,11 @@
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '手机号', field: 'phone', visible: true, align: 'center', valign: 'middle'},
{title: '所属代理商', field: 'agentName', visible: true, align: 'center', valign: 'middle'},
- {title: '性别', field: 'sex', visible: false, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- if (row.sex === 1){
- return '<span>男</span>'
- }else if (row.sex === 2){
- return '<span>女</span>'
- }else {
- return '<span>未知</span>'
- }
- }},
- {title: '推广人数', field: 'cumulativeOrderCount', visible: true, align: 'center', valign: 'middle'},
- {title: '关联人数', field: 'cumulativeOrderCount', visible: true, align: 'center', valign: 'middle'},
- {title: '累计获得佣金', field: 'cumulativeOrderCount', visible: true, align: 'center', valign: 'middle'},
- {title: '可提现佣金', field: 'monthOrderCount', visible: true, align: 'center', valign: 'middle'},
- {title: '已提现金额', field: 'integral', visible: true, align: 'center', valign: 'middle'},
+ {title: '推广人数', field: 'numberPromoters', visible: true, align: 'center', valign: 'middle'},
+ {title: '关联人数', field: 'connectedPersons', visible: true, align: 'center', valign: 'middle'},
+ {title: '累计获得佣金', field: 'accumulatedCommission', visible: true, align: 'center', valign: 'middle'},
+ {title: '可提现佣金', field: 'commission', visible: true, align: 'center', valign: 'middle'},
+ {title: '已提现金额', field: 'withdrawnAmount', visible: true, align: 'center', valign: 'middle'},
{title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
if (row.status === 1){
@@ -45,11 +35,7 @@
}},
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
- if (row.status === 1){
- return '<a href="#" onclick="TDriverCommission.searchTDriverDetail('+row.id+')" style="color:green">详情</a>'
- }else if (row.status === 2){
- return '<a href="#" onclick="TDriverCommission.searchTDriverDetail('+row.id+')" style="color:green">详情</a>'
- }
+ return '<a href="#" onclick="TDriverCommission.searchTDriverDetail('+row.id+')" style="color:green">详情</a>'
}
}
];
@@ -105,13 +91,29 @@
* 打开查看详情(使用中)
*/
TDriverCommission.searchTDriverDetail = function (id) {
+ var levelFlag = $('#levelFlag').val();
+
+ if(levelFlag == null || levelFlag == ''){
+ levelFlag = 0;
+ }else if(levelFlag == 0){
+ levelFlag = 1;
+ }else if (levelFlag == 1){
+ levelFlag = 2;
+ }else if (levelFlag == 2){
+ levelFlag = 3
+ }
+
+ if(levelFlag == 3){
+ Feng.info("最多可查看三级!")
+ return;
+ }
var index = layer.open({
type: 2,
title: '详情',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tDriver/driverDetail?tDriverId=' + id
+ content: Feng.ctxPath + '/tDriver/commission/driverCommissionDetail?tDriverId=' + id + '&levelFlag=' + levelFlag
});
this.layerIndex = index;
};
@@ -188,10 +190,10 @@
* 司机信息导出
*/
TDriverCommission.export=function(){
- var createTime=$("#name").val()
+ var name=$("#name").val()
var phone=$("#phone").val()
var status=$("#status").val()
- window.location.href=Feng.ctxPath + "/tDriver/export?name="+name
+ window.location.href=Feng.ctxPath + "/tDriver/export-commission?name="+name
+"&status="+status
+"&phone="+phone
;
--
Gitblit v1.7.1