Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-05 16cee07f274c039bf0dcb5da347859053b7c2586

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js

@@ -30,7 +30,7 @@
            formatter: function (value, row) {
                    var btn = [];
                    btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewUser(' + row.driverId + ')" style="color: #0e9aef">查看下级用户</a>&nbsp;&nbsp;';
                    btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewMoney(' + row.driverId + ')" style="color: #0e9aef">查看收益明细</a>&nbsp;&nbsp;';
                    btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewMoney(' + row.driverId+","+row.activityId + ')" style="color: #0e9aef">查看收益明细</a>&nbsp;&nbsp;';
                    return btn;
                }

@@ -86,14 +86,14 @@
/**
 * 打开查看详情
 */
TDriverPromotionActivity.viewMoney = function (e) {
TDriverPromotionActivity.viewMoney = function (e,e1) {
    var index = layer.open({
        type: 2,
        title: '推广收益明细',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tDriverPromotionActivity/tDriverPromotionActivity_viewMoney/' + e
        content: Feng.ctxPath + '/tDriverPromotionActivity/tDriverPromotionActivity_viewMoney/' + e+"/"+e1
    });
    this.layerIndex = index;
};