[渠道管理]-优化样式,新增手动结算

优化样式
2026-04-16 13:39:08 +08:00 · 2026-04-16 11:17:01 +08:00
37 changed files with 1654 additions and 119 deletions
--- a/app/admin/controller/Channel.php
+++ b/app/admin/controller/Channel.php
@@ -13,6 +13,11 @@ use Webman\Http\Request as WebmanRequest;
 */
 class Channel extends Backend
 {
+    /**
+     * 预览接口与手动结算共用「手动结算」按钮权限（避免额外菜单节点）
+     */
+    protected array $noNeedPermission = ['manualSettlePreview'];
+
    /**
     * Channel模型对象
     * @var object|null
@@ -137,6 +142,10 @@ class Channel extends Backend
            $data = $this->applyInputFilter($data);
            $data = $this->excludeFields($data);
            $data = $this->normalizeAgentModeFields($data);
+            $bizErr = $this->validateAndNormalizeBusinessFields($data);
+            if ($bizErr !== null) {
+                return $this->error($bizErr);
+            }
            unset($data['invite_code']);

            $adminId = $data['admin_id'] ?? null;
@@ -160,7 +169,6 @@ class Channel extends Backend
            }
            $data['admin_group_id'] = $topGroupId;
            if (!$this->auth->isSuperAdmin()) {
-                $data['top_admin_id'] = $this->auth->id;
                $data['admin_id'] = $this->auth->id;
            }

@@ -226,6 +234,10 @@ class Channel extends Backend
            $data = $this->applyInputFilter($data);
            $data = $this->excludeFields($data);
            $data = $this->normalizeAgentModeFields($data);
+            $bizErr = $this->validateAndNormalizeBusinessFields($data);
+            if ($bizErr !== null) {
+                return $this->error($bizErr);
+            }
            unset($data['invite_code']);

            if (array_key_exists('admin_group_id', $data)) {
@@ -247,7 +259,6 @@ class Channel extends Backend
                $data['admin_group_id'] = $topGroupId;
            }
            if (!$this->auth->isSuperAdmin()) {
-                $data['top_admin_id'] = $this->auth->id;
                $data['admin_id'] = $this->auth->id;
            }

@@ -312,6 +323,353 @@ class Channel extends Backend
        ]);
    }

+    /**
+     * 手动结算预览：区间=上次结算周期结束～当前时间；金额来自已结算注单汇总（服务端计算）
+     */
+    public function manualSettlePreview(WebmanRequest $request): Response
+    {
+        $response = $this->initializeBackend($request);
+        if ($response !== null) {
+            return $response;
+        }
+        if (!$this->auth->check('channel/manualSettle')) {
+            return $this->error(__('You have no permission'));
+        }
+
+        $id = (int) ($request->get('id', 0));
+        if ($id <= 0) {
+            return $this->error(__('Parameter error'));
+        }
+        $row = $this->model->find($id);
+        if (!$row) {
+            return $this->error(__('Record not found'));
+        }
+        if (!$this->auth->isSuperAdmin() && !in_array((int) $row['id'], $this->currentChannelIds, true)) {
+            return $this->error(__('You have no permission'));
+        }
+
+        $payload = $this->buildManualSettlePayload($row->toArray());
+        if (is_string($payload)) {
+            return $this->error($payload);
+        }
+
+        return $this->success('', $payload);
+    }
+
+    /**
+     * 手动结算（渠道维度）：仅接收备注；周期与金额全部由服务端按注单汇总计算，并写入结算周期与佣金记录
+     */
+    public function manualSettle(WebmanRequest $request): Response
+    {
+        $response = $this->initializeBackend($request);
+        if ($response !== null) {
+            return $response;
+        }
+
+        $id = (int) ($request->post('id', $request->get('id', 0)));
+        if ($id <= 0) {
+            return $this->error(__('Parameter error'));
+        }
+        $row = $this->model->find($id);
+        if (!$row) {
+            return $this->error(__('Record not found'));
+        }
+        if (!$this->auth->isSuperAdmin() && !in_array((int) $row['id'], $this->currentChannelIds, true)) {
+            return $this->error(__('You have no permission'));
+        }
+
+        $remark = (string) $request->post('remark', '');
+
+        $payload = $this->buildManualSettlePayload($row->toArray());
+        if (is_string($payload)) {
+            return $this->error($payload);
+        }
+
+        $settlementNo = $payload['settlement_no'];
+        if (Db::name('agent_settlement_period')->where('settlement_no', $settlementNo)->value('id')) {
+            return $this->error('结算单号已存在，请稍后重试');
+        }
+
+        $adminId = $row['admin_id'] ?? null;
+        if ($adminId === null || $adminId === '' || (int) $adminId <= 0) {
+            return $this->error('渠道未绑定代理管理员，无法生成佣金记录');
+        }
+
+        $now = time();
+        Db::startTrans();
+        try {
+            $periodId = (int) Db::name('agent_settlement_period')->insertGetId([
+                'settlement_no' => $settlementNo,
+                'period_start_at' => $payload['period_start_ts'],
+                'period_end_at' => $payload['period_end_ts'],
+                'total_bet_amount' => $payload['total_bet_amount'],
+                'total_payout_amount' => $payload['total_payout_amount'],
+                'platform_profit_amount' => $payload['platform_profit_amount'],
+                'status' => 2,
+                'remark' => trim($remark) !== '' ? $remark : ('手动结算-渠道#' . $row['id'] . '-' . $row['name']),
+                'create_time' => $now,
+                'update_time' => $now,
+            ]);
+
+            Db::name('agent_commission_record')->insert([
+                'settlement_period_id' => $periodId,
+                'channel_id' => (int) $row['id'],
+                'admin_id' => (int) $adminId,
+                'commission_rate' => $payload['commission_rate'],
+                'calc_base_amount' => $payload['calc_base_amount'],
+                'commission_amount' => $payload['commission_amount'],
+                'status' => 0,
+                'settled_at' => null,
+                'remark' => trim($remark) !== '' ? $remark : ('手动结算佣金-CH' . $row['id']),
+                'create_time' => $now,
+                'update_time' => $now,
+            ]);
+
+            Db::name('channel')->where('id', $row['id'])->update([
+                'update_time' => $now,
+            ]);
+            Db::commit();
+        } catch (Throwable $e) {
+            Db::rollback();
+            return $this->error($e->getMessage());
+        }
+
+        return $this->success('手动结算已完成，已生成结算周期与佣金记录');
+    }
+
+    /**
+     * @return array|string 成功返回预览数据数组，失败返回错误文案
+     */
+    private function buildManualSettlePayload(array $row): array|string
+    {
+        $channelId = (int) ($row['id'] ?? 0);
+        if ($channelId <= 0) {
+            return '渠道数据异常';
+        }
+
+        $endTs = time();
+        $lastEnd = $this->getLastSettlementEndForChannel($channelId);
+        $channelCreateTs = (int) ($row['create_time'] ?? 0);
+        if ($lastEnd === null) {
+            $periodStartTs = $channelCreateTs > 0 ? $channelCreateTs : 0;
+        } else {
+            $periodStartTs = (int) $lastEnd;
+        }
+
+        if ($periodStartTs >= $endTs) {
+            return '结算区间无效（开始时间不早于当前）';
+        }
+
+        $stats = $this->aggregateBetOrderForChannel($channelId, $periodStartTs, $lastEnd !== null, $endTs);
+        $totalBet = $stats['total_bet'];
+        $totalPayout = $stats['total_payout'];
+        $profit = bcsub($totalBet, $totalPayout, 4);
+
+        $mode = (string) ($row['agent_mode'] ?? 'turnover');
+        $commission = $this->computeCommissionAmounts($row, $totalBet, $profit, $mode);
+        if (is_string($commission)) {
+            return $commission;
+        }
+
+        $settlementNo = $this->generateAgentSettlementNo('M', $channelId, $endTs);
+
+        return [
+            'settlement_no' => $settlementNo,
+            'period_start_ts' => $periodStartTs,
+            'period_end_ts' => $endTs,
+            'period_start_at' => date('Y-m-d H:i:s', $periodStartTs),
+            'period_end_at' => date('Y-m-d H:i:s', $endTs),
+            'total_bet_amount' => $totalBet,
+            'total_payout_amount' => $totalPayout,
+            'platform_profit_amount' => $profit,
+            'commission_rate' => $commission['commission_rate'],
+            'calc_base_amount' => $commission['calc_base_amount'],
+            'commission_amount' => $commission['commission_amount'],
+            'agent_mode' => $mode,
+        ];
+    }
+
+    /**
+     * 生成代理结算周期单号：仅大写字母与数字、无分隔符；首字符 M=手动结算，A=自动结算（定时任务等复用）
+     */
+    private function generateAgentSettlementNo(string $sourceFlag, int $channelId, int $endTs): string
+    {
+        $flag = strtoupper(trim($sourceFlag));
+        if ($flag !== 'M' && $flag !== 'A') {
+            $flag = 'M';
+        }
+        $channelPart = str_pad((string) max(0, $channelId), 6, '0', STR_PAD_LEFT);
+        $timePart = str_pad((string) max(0, $endTs), 10, '0', STR_PAD_LEFT);
+
+        $base = $flag . $channelPart . $timePart;
+        for ($i = 0; $i < 8; $i++) {
+            $randPart = strtoupper(substr(bin2hex(random_bytes(4)), 0, 8));
+            $no = $base . $randPart;
+            if (!Db::name('agent_settlement_period')->where('settlement_no', $no)->value('id')) {
+                return $no;
+            }
+        }
+
+        return $base . strtoupper(substr(bin2hex(random_bytes(8)), 0, 16));
+    }
+
+    private function getLastSettlementEndForChannel(int $channelId): ?int
+    {
+        $row = Db::name('agent_commission_record')
+            ->alias('acr')
+            ->join('agent_settlement_period asp', 'acr.settlement_period_id = asp.id')
+            ->where('acr.channel_id', $channelId)
+            ->field('MAX(asp.period_end_at) AS m')
+            ->find();
+        if (!$row) {
+            return null;
+        }
+        $m = $row['m'] ?? null;
+        if ($m === null || $m === '') {
+            return null;
+        }
+        return (int) $m;
+    }
+
+    /**
+     * @return array{total_bet:string,total_payout:string}
+     */
+    private function aggregateBetOrderForChannel(int $channelId, int $periodStartTs, bool $hasPriorSettlement, int $endTs): array
+    {
+        $query = Db::name('bet_order')
+            ->where('channel_id', $channelId)
+            ->where('status', 2)
+            ->where('create_time', '<=', $endTs);
+        if ($hasPriorSettlement) {
+            $query->where('create_time', '>', $periodStartTs);
+        } else {
+            $query->where('create_time', '>=', $periodStartTs);
+        }
+
+        $row = $query->field('SUM(total_amount) AS tb, SUM(win_amount) AS tw, SUM(jackpot_extra_amount) AS tj')->find();
+        $tb = $row && $row['tb'] !== null && $row['tb'] !== '' ? (string) $row['tb'] : '0.0000';
+        $tw = $row && $row['tw'] !== null && $row['tw'] !== '' ? (string) $row['tw'] : '0.0000';
+        $tj = $row && $row['tj'] !== null && $row['tj'] !== '' ? (string) $row['tj'] : '0.0000';
+        $totalPayout = bcadd($tw, $tj, 4);
+
+        return [
+            'total_bet' => number_format((float) $tb, 4, '.', ''),
+            'total_payout' => number_format((float) $totalPayout, 4, '.', ''),
+        ];
+    }
+
+    /**
+     * @return array{commission_rate:string,calc_base_amount:string,commission_amount:string}|string
+     */
+    private function computeCommissionAmounts(array $row, string $totalBet, string $platformProfit, string $mode): array|string
+    {
+        if ($mode === 'turnover') {
+            $ratePercent = $row['turnover_share_rate'] ?? null;
+            if ($ratePercent === null || $ratePercent === '') {
+                return '普通返水代理未配置返水分红比例';
+            }
+            $rateDec = bcdiv((string) $ratePercent, '100', 6);
+            $amount = bcmul($totalBet, $rateDec, 4);
+            return [
+                'commission_rate' => $rateDec,
+                'calc_base_amount' => $totalBet,
+                'commission_amount' => $amount,
+            ];
+        }
+
+        if ($mode === 'affiliate') {
+            $fee = $row['affiliate_fee_rate'] ?? null;
+            $rulesRaw = $row['affiliate_ladder_rules'] ?? null;
+            if ($fee === null || $fee === '') {
+                return '联营代理未配置成本扣除比例';
+            }
+            $rules = $this->normalizeLadderRulesForSettlement($rulesRaw);
+            if ($rules === []) {
+                return '联营阶梯规则无效或为空';
+            }
+
+            if (bccomp($platformProfit, '0', 4) <= 0) {
+                return [
+                    'commission_rate' => '0.000000',
+                    'calc_base_amount' => '0.0000',
+                    'commission_amount' => '0.0000',
+                ];
+            }
+
+            $afterFee = bcmul($platformProfit, bcsub('1', (string) $fee, 8), 4);
+            if (bccomp($afterFee, '0', 4) <= 0) {
+                return [
+                    'commission_rate' => '0.000000',
+                    'calc_base_amount' => '0.0000',
+                    'commission_amount' => '0.0000',
+                ];
+            }
+
+            $playerLoss = $platformProfit;
+            $share = $this->pickAffiliateShareRateFromLadder($rules, $playerLoss);
+            $rateDec = number_format($share, 6, '.', '');
+            $amount = bcmul($afterFee, $rateDec, 4);
+
+            return [
+                'commission_rate' => $rateDec,
+                'calc_base_amount' => $afterFee,
+                'commission_amount' => $amount,
+            ];
+        }
+
+        return '未知的代理模式';
+    }
+
+    /**
+     * @return array<int, array{minLoss: string, shareRate: string}>
+     */
+    private function normalizeLadderRulesForSettlement(mixed $rulesRaw): array
+    {
+        if ($rulesRaw === null || $rulesRaw === '') {
+            return [];
+        }
+        if (is_string($rulesRaw)) {
+            $decoded = json_decode($rulesRaw, true);
+            $rulesRaw = is_array($decoded) ? $decoded : [];
+        }
+        if (!is_array($rulesRaw)) {
+            return [];
+        }
+        $out = [];
+        foreach ($rulesRaw as $rule) {
+            if (!is_array($rule)) {
+                continue;
+            }
+            $minLoss = $rule['minLoss'] ?? ($rule['min_loss'] ?? null);
+            $shareRate = $rule['shareRate'] ?? ($rule['share_rate'] ?? null);
+            if ($minLoss === null || $shareRate === null || !is_numeric((string) $minLoss) || !is_numeric((string) $shareRate)) {
+                continue;
+            }
+            $out[] = [
+                'minLoss' => number_format((float) $minLoss, 4, '.', ''),
+                'shareRate' => number_format((float) $shareRate, 6, '.', ''),
+            ];
+        }
+        usort($out, function ($a, $b) {
+            return bccomp($a['minLoss'], $b['minLoss'], 4);
+        });
+        return $out;
+    }
+
+    /**
+     * @param array<int, array{minLoss: string, shareRate: string}> $rules
+     */
+    private function pickAffiliateShareRateFromLadder(array $rules, string $playerLoss): float
+    {
+        $chosen = (float) $rules[0]['shareRate'];
+        foreach ($rules as $rule) {
+            if (bccomp($playerLoss, $rule['minLoss'], 4) >= 0) {
+                $chosen = (float) $rule['shareRate'];
+            }
+        }
+        return $chosen;
+    }
+
    private function getCurrentChannelIds(): array
    {
        if ($this->auth->isSuperAdmin()) {
@@ -325,18 +683,31 @@ class Channel extends Backend
        if ($admin && !empty($admin['channel_id'])) {
            $ids[] = $admin['channel_id'];
        }
-        $owned = Db::name('channel')->where('top_admin_id', $this->auth->id)->column('id');
-        $created = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
-        return array_values(array_unique(array_merge($ids, $owned, $created)));
+        $byAdmin = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
+        return array_values(array_unique(array_merge($ids, $byAdmin)));
    }

    private function normalizeAgentModeFields(array $data): array
    {
        $mode = $data['agent_mode'] ?? null;
+        if (empty($data['settle_cycle'])) {
+            $data['settle_cycle'] = 'weekly';
+        }
+        if (empty($data['settle_weekday'])) {
+            $data['settle_weekday'] = 1;
+        }
+        if (empty($data['settle_time'])) {
+            $data['settle_time'] = '02:00:00';
+        }
        if ($mode === 'turnover') {
            $data['affiliate_share_rate'] = null;
            $data['affiliate_fee_rate'] = null;
            $data['carryover_balance'] = 0;
+            $data['affiliate_contract_no'] = null;
+            $data['affiliate_contract_name'] = null;
+            $data['affiliate_ladder_rules'] = null;
+            $data['affiliate_effective_start_at'] = null;
+            $data['affiliate_effective_end_at'] = null;
            return $data;
        }
        if ($mode === 'affiliate') {
@@ -344,4 +715,123 @@ class Channel extends Backend
        }
        return $data;
    }
+
+    private function validateAndNormalizeBusinessFields(array &$data): ?string
+    {
+        $cycle = isset($data['settle_cycle']) ? trim((string) $data['settle_cycle']) : 'weekly';
+        if (!in_array($cycle, ['daily', 'weekly', 'monthly'], true)) {
+            return '结算周期不合法';
+        }
+        $data['settle_cycle'] = $cycle;
+
+        $settleTime = isset($data['settle_time']) ? trim((string) $data['settle_time']) : '02:00:00';
+        if (!preg_match('/^\d{2}:\d{2}:\d{2}$/', $settleTime)) {
+            return '结算时间格式不正确（HH:mm:ss）';
+        }
+        $data['settle_time'] = $settleTime;
+
+        if ($cycle === 'weekly') {
+            $weekday = isset($data['settle_weekday']) ? (int) $data['settle_weekday'] : 1;
+            if ($weekday < 1 || $weekday > 7) {
+                return '周结必须选择周一到周日';
+            }
+            $data['settle_weekday'] = $weekday;
+        } else {
+            $data['settle_weekday'] = 1;
+        }
+
+        if ($cycle === 'monthly') {
+            $monthday = isset($data['settle_monthday']) ? (int) $data['settle_monthday'] : 1;
+            if ($monthday < 1 || $monthday > 31) {
+                return '月结日期必须在1到31之间';
+            }
+            $data['settle_monthday'] = $monthday;
+        } else {
+            $data['settle_monthday'] = 1;
+        }
+
+        $mode = isset($data['agent_mode']) ? (string) $data['agent_mode'] : '';
+        if ($mode === 'turnover') {
+            if (isset($data['turnover_share_rate']) && $data['turnover_share_rate'] !== '' && $data['turnover_share_rate'] !== null) {
+                $num = (float) $data['turnover_share_rate'];
+                if ($num < 0 || $num > 100) {
+                    return '返水分红比例必须在0到100之间';
+                }
+            }
+            return null;
+        }
+
+        if ($mode === 'affiliate') {
+            foreach (['affiliate_share_rate' => '联营占成比例', 'affiliate_fee_rate' => '联营成本扣除比例'] as $field => $label) {
+                if (!isset($data[$field]) || $data[$field] === '' || $data[$field] === null) {
+                    return $label . '不能为空';
+                }
+                $num = (float) $data[$field];
+                if ($num < 0 || $num > 1) {
+                    return $label . '必须在0到1之间';
+                }
+            }
+            $ladderErr = $this->validateLadderRulesField($data);
+            if ($ladderErr !== null) {
+                return $ladderErr;
+            }
+        }
+
+        return null;
+    }
+
+    private function validateLadderRulesField(array &$data): ?string
+    {
+        $rulesRaw = $data['affiliate_ladder_rules'] ?? null;
+        if ($rulesRaw === null || $rulesRaw === '') {
+            return '联营阶梯规则不能为空';
+        }
+
+        if (is_string($rulesRaw)) {
+            $decoded = json_decode($rulesRaw, true);
+            if (!is_array($decoded)) {
+                return '联营阶梯规则必须是有效JSON数组';
+            }
+            $rulesRaw = $decoded;
+        }
+
+        if (!is_array($rulesRaw) || $rulesRaw === []) {
+            return '联营阶梯规则至少需要一条';
+        }
+
+        $normalized = [];
+        $prevMinLoss = null;
+        foreach ($rulesRaw as $idx => $rule) {
+            if (!is_array($rule)) {
+                return '联营阶梯规则第' . ($idx + 1) . '行格式错误';
+            }
+            $minLoss = $rule['minLoss'] ?? ($rule['min_loss'] ?? null);
+            $shareRate = $rule['shareRate'] ?? ($rule['share_rate'] ?? null);
+            if ($minLoss === null || $minLoss === '' || !is_numeric((string) $minLoss)) {
+                return '联营阶梯规则第' . ($idx + 1) . '行起始客损格式错误';
+            }
+            if ($shareRate === null || $shareRate === '' || !is_numeric((string) $shareRate)) {
+                return '联营阶梯规则第' . ($idx + 1) . '行占成比例格式错误';
+            }
+            $minLossNum = (float) $minLoss;
+            $shareRateNum = (float) $shareRate;
+            if ($minLossNum < 0) {
+                return '联营阶梯规则第' . ($idx + 1) . '行起始客损不能为负';
+            }
+            if ($shareRateNum < 0 || $shareRateNum > 1) {
+                return '联营阶梯规则第' . ($idx + 1) . '行占成比例必须在0到1之间';
+            }
+            if ($prevMinLoss !== null && $minLossNum <= $prevMinLoss) {
+                return '联营阶梯规则需按起始客损递增';
+            }
+            $prevMinLoss = $minLossNum;
+            $normalized[] = [
+                'minLoss' => number_format($minLossNum, 4, '.', ''),
+                'shareRate' => number_format($shareRateNum, 6, '.', ''),
+            ];
+        }
+
+        $data['affiliate_ladder_rules'] = $normalized;
+        return null;
+    }
 }
--- a/app/admin/controller/auth/Admin.php
+++ b/app/admin/controller/auth/Admin.php
@@ -464,7 +464,7 @@ class Admin extends Backend
            return $currentAdmin['channel_id'];
        }
        $channelId = Db::name('channel')
-            ->where('top_admin_id', $this->auth->id)
+            ->where('admin_id', $this->auth->id)
            ->value('id');
        return $channelId ?: null;
    }
--- a/app/admin/controller/order/BetOrder.php
+++ b/app/admin/controller/order/BetOrder.php
@@ -122,8 +122,7 @@ class BetOrder extends Backend
        if ($admin && !empty($admin['channel_id'])) {
            $ids[] = $admin['channel_id'];
        }
-        $owned = Db::name('channel')->where('top_admin_id', $this->auth->id)->column('id');
-        $created = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
-        return array_values(array_unique(array_merge($ids, $owned, $created)));
+        $byAdmin = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
+        return array_values(array_unique(array_merge($ids, $byAdmin)));
    }
 }
--- a/app/admin/controller/order/DepositOrder.php
+++ b/app/admin/controller/order/DepositOrder.php
@@ -79,8 +79,7 @@ class DepositOrder extends Backend
        if ($admin && !empty($admin['channel_id'])) {
            $ids[] = $admin['channel_id'];
        }
-        $owned = Db::name('channel')->where('top_admin_id', $this->auth->id)->column('id');
-        $created = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
-        return array_values(array_unique(array_merge($ids, $owned, $created)));
+        $byAdmin = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
+        return array_values(array_unique(array_merge($ids, $byAdmin)));
    }
 }
--- a/app/admin/controller/order/WithdrawOrder.php
+++ b/app/admin/controller/order/WithdrawOrder.php
@@ -80,8 +80,7 @@ class WithdrawOrder extends Backend
        if ($admin && !empty($admin['channel_id'])) {
            $ids[] = $admin['channel_id'];
        }
-        $owned = Db::name('channel')->where('top_admin_id', $this->auth->id)->column('id');
-        $created = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
-        return array_values(array_unique(array_merge($ids, $owned, $created)));
+        $byAdmin = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
+        return array_values(array_unique(array_merge($ids, $byAdmin)));
    }
 }
--- a/app/admin/controller/record/UserWalletRecord.php
+++ b/app/admin/controller/record/UserWalletRecord.php
@@ -124,8 +124,7 @@ class UserWalletRecord extends Backend
        if ($admin && !empty($admin['channel_id'])) {
            $ids[] = $admin['channel_id'];
        }
-        $owned = Db::name('channel')->where('top_admin_id', $this->auth->id)->column('id');
-        $created = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
-        return array_values(array_unique(array_merge($ids, $owned, $created)));
+        $byAdmin = Db::name('channel')->where('admin_id', $this->auth->id)->column('id');
+        return array_values(array_unique(array_merge($ids, $byAdmin)));
    }
 }
--- a/app/common/model/Channel.php
+++ b/app/common/model/Channel.php
@@ -19,6 +19,10 @@ class Channel extends Model
    protected $type = [
        'create_time' => 'integer',
        'update_time' => 'integer',
+        'affiliate_effective_start_at' => 'integer',
+        'affiliate_effective_end_at' => 'integer',
+        'settle_weekday' => 'integer',
+        'settle_monthday' => 'integer',
    ];

    public function getprofitAmountAttr($value): ?float
--- a/web/src/components/baInput/index.vue
+++ b/web/src/components/baInput/index.vue
@@ -2,6 +2,7 @@
 import { isArray, isString } from 'lodash-es'
 import type { PropType, VNode } from 'vue'
 import { computed, createVNode, defineComponent, reactive, resolveComponent } from 'vue'
+import { dayjs } from 'element-plus'
 import { getArea } from '/@/api/common'
 import type { InputAttr, InputData, ModelValueTypes } from '/@/components/baInput'
 import { inputTypes } from '/@/components/baInput'
@@ -40,6 +41,29 @@ export default defineComponent({
    },
    emits: ['update:modelValue'],
    setup(props, { emit, slots }) {
+        const normalizeDateTimeValue = (value: unknown, format: string) => {
+            if (value === null || value === undefined || value === '') {
+                return value
+            }
+            if (typeof value === 'number' && Number.isFinite(value)) {
+                const ms = value > 9999999999 ? value : value * 1000
+                const d = dayjs(ms)
+                return d.isValid() ? d.format(format) : value
+            }
+            if (typeof value === 'string') {
+                const trimmed = value.trim()
+                if (/^\d{10,13}$/.test(trimmed)) {
+                    const num = Number(trimmed)
+                    if (Number.isFinite(num)) {
+                        const ms = trimmed.length === 13 ? num : num * 1000
+                        const d = dayjs(ms)
+                        return d.isValid() ? d.format(format) : value
+                    }
+                }
+            }
+            return value
+        }
+
        // 合并 props.attr 和 props.data
        const attrs = computed(() => {
            return { ...props.attr, ...props.data }
@@ -186,6 +210,7 @@ export default defineComponent({
                    valueFormat = 'YYYY'
                    break
            }
+            const valueComputed = computed(() => normalizeDateTimeValue(props.modelValue, valueFormat))
            return () =>
                createVNode(
                    resolveComponent('el-date-picker'),
@@ -194,7 +219,7 @@ export default defineComponent({
                        type: props.type,
                        'value-format': valueFormat,
                        ...attrs.value,
-                        modelValue: props.modelValue,
+                        modelValue: valueComputed.value,
                        'onUpdate:modelValue': onValueUpdate,
                    },
                    slots
@@ -300,7 +325,7 @@ export default defineComponent({
                'year',
                () => {
                    return () => {
-                        const valueComputed = computed(() => (!props.modelValue ? null : '' + props.modelValue))
+                        const valueComputed = computed(() => normalizeDateTimeValue(props.modelValue, 'YYYY'))
                        return createVNode(
                            resolveComponent('el-date-picker'),
                            {
--- a/web/src/lang/backend/en/agent/commissionRecord.ts
+++ b/web/src/lang/backend/en/agent/commissionRecord.ts
@@ -1,9 +1,12 @@
 export default {
    'quick Search Fields': 'ID/Settlement period ID/Remark',
    id: 'ID',
-    settlement_period_id: 'Settlement period ID',
-    channel_id: 'Channel ID',
-    admin_id: 'Agent admin ID',
+    settlement_period_id: 'Settlement period',
+    settlement_period_no: 'Settlement no.',
+    channel_id: 'Channel',
+    channel_name: 'Channel',
+    admin_id: 'Agent admin',
+    admin_username: 'Agent username',
    commission_rate: 'Commission rate',
    calc_base_amount: 'Calculation base amount',
    commission_amount: 'Commission amount',
--- a/web/src/lang/backend/en/channel.ts
+++ b/web/src/lang/backend/en/channel.ts
@@ -3,7 +3,6 @@ export default {
    code: 'code',
    invite_code: 'invite_code',
    name: 'name',
-    top_admin_id: 'top_admin_id',
    agent_mode: 'agent_mode',
    'agent_mode turnover': 'turnover',
    'agent_mode affiliate': 'affiliate',
@@ -18,6 +17,34 @@ export default {
    turnover_share_rate: 'turnover_share_rate',
    affiliate_share_rate: 'affiliate_share_rate',
    affiliate_fee_rate: 'affiliate_fee_rate',
+    affiliate_contract_no: 'affiliate_contract_no',
+    affiliate_contract_name: 'affiliate_contract_name',
+    settle_cycle: 'settlement_cycle',
+    settle_cycle_placeholder: 'Select settlement cycle (daily/weekly day/monthly date)',
+    'settle_cycle daily': 'daily',
+    'settle_cycle weekly': 'weekly',
+    'settle_cycle monthly': 'monthly',
+    settle_weekday: 'settlement_weekday',
+    settle_time: 'settlement_time',
+    'weekday 1': 'Mon',
+    'weekday 2': 'Tue',
+    'weekday 3': 'Wed',
+    'weekday 4': 'Thu',
+    'weekday 5': 'Fri',
+    'weekday 6': 'Sat',
+    'weekday 7': 'Sun',
+    affiliate_effective_start_at: 'affiliate_effective_start_at',
+    affiliate_effective_end_at: 'affiliate_effective_end_at',
+    affiliate_ladder_rules: 'affiliate_ladder_rules',
+    affiliate_ladder_rules_placeholder: 'Input JSON, e.g. [{\"minLoss\":\"0.0000\",\"shareRate\":\"0.200000\"}]',
+    ladder_min_loss: 'min loss',
+    ladder_share_rate: 'share rate',
+    ladder_rule_required: 'At least one ladder rule is required',
+    ladder_min_loss_invalid: 'Ladder min loss must be a number >= 0',
+    ladder_share_rate_invalid: 'Ladder share rate must be between 0 and 1',
+    ladder_min_loss_order_invalid: 'Ladder rules must be sorted by min loss ascending',
+    settle_day_daily: 'Every day',
+    day_suffix: 'd',
    carryover_balance: 'carryover_balance',
    user_count: 'user_count',
    profit_amount: 'profit_amount',
@@ -30,6 +57,20 @@ export default {
    admin_group_id: 'admin_group_id',
    admingroup__name: 'name',
    admin_id: 'admin_id',
+    admin_tree_tip: 'Admins are grouped by channel. Pick a leaf under a channel name. One channel maps to one admin.',
+    manual_settle: 'Manual settle',
+    manual_settle_confirm: 'Confirm trigger manual settlement for this channel?',
+    manual_settle_settlement_no: 'Settlement No.',
+    manual_settle_period_start: 'Period start',
+    manual_settle_period_end: 'Period end (now)',
+    manual_settle_total_bet: 'Total bet (settled bets)',
+    manual_settle_total_payout: 'Total payout',
+    manual_settle_platform_profit: 'Platform PnL',
+    manual_settle_commission_rate: 'Commission rate (decimal)',
+    manual_settle_calc_base: 'Settlement base',
+    manual_settle_commission_amount: 'Commission amount',
+    manual_settle_remark: 'Remark',
+    admin_id_placeholder: 'Select a channel admin account',
    admin__username: 'username',
    create_time: 'create_time',
    update_time: 'update_time',
--- a/web/src/lang/backend/en/order/betOrder.ts
+++ b/web/src/lang/backend/en/order/betOrder.ts
@@ -1,4 +1,4 @@
-export default {
+export default {
    'quick Search Fields': 'ID / Period / Idempotency',
    id: 'ID',
    period_id: 'Period ID',
@@ -24,6 +24,12 @@ export default {
    update_time: 'Updated',
    gamePeriod_period_no: 'Period (relation)',
    gamePeriod_status: 'Period status',
+    'gamePeriod_status 0': 'Open for betting',
+    'gamePeriod_status 1': 'Closed',
+    'gamePeriod_status 2': 'Settling tickets',
+    'gamePeriod_status 3': 'Paying out',
+    'gamePeriod_status 4': 'Finished',
+    'gamePeriod_status 5': 'Voided',
    user_username: 'Username',
    channel_name: 'Channel',
 }
--- a/web/src/lang/backend/zh-cn/agent/commissionRecord.ts
+++ b/web/src/lang/backend/zh-cn/agent/commissionRecord.ts
@@ -1,9 +1,12 @@
 export default {
    'quick Search Fields': 'ID/结算周期ID/备注',
    id: 'ID',
-    settlement_period_id: '结算周期ID',
-    channel_id: '渠道ID',
-    admin_id: '代理管理员ID',
+    settlement_period_id: '结算周期',
+    settlement_period_no: '结算周期号',
+    channel_id: '渠道',
+    channel_name: '渠道名称',
+    admin_id: '代理管理员',
+    admin_username: '代理账号',
    commission_rate: '佣金比例',
    calc_base_amount: '结算基数',
    commission_amount: '佣金金额',
--- a/web/src/lang/backend/zh-cn/channel.ts
+++ b/web/src/lang/backend/zh-cn/channel.ts
@@ -3,7 +3,6 @@ export default {
    code: '渠道标识',
    invite_code: '渠道邀请码',
    name: '渠道名',
-    top_admin_id: '顶级代理',
    agent_mode: '代理模式',
    'agent_mode turnover': '普通返水代理',
    'agent_mode affiliate': '联营代理',
@@ -18,6 +17,34 @@ export default {
    turnover_share_rate: '返水分红比例',
    affiliate_share_rate: '联营占成比例',
    affiliate_fee_rate: '联营成本扣除比例',
+    affiliate_contract_no: '联营契约编号',
+    affiliate_contract_name: '联营契约名称',
+    settle_cycle: '结算周期',
+    settle_cycle_placeholder: '请选择结算周期（可细化到周几/几号）',
+    'settle_cycle daily': '日结',
+    'settle_cycle weekly': '周结',
+    'settle_cycle monthly': '月结',
+    settle_weekday: '结算周几',
+    settle_time: '结算时间',
+    'weekday 1': '周一',
+    'weekday 2': '周二',
+    'weekday 3': '周三',
+    'weekday 4': '周四',
+    'weekday 5': '周五',
+    'weekday 6': '周六',
+    'weekday 7': '周日',
+    affiliate_effective_start_at: '联营生效开始',
+    affiliate_effective_end_at: '联营生效结束',
+    affiliate_ladder_rules: '联营阶梯规则',
+    affiliate_ladder_rules_placeholder: '请输入 JSON，例如 [{\"minLoss\":\"0.0000\",\"shareRate\":\"0.200000\"}]',
+    ladder_min_loss: '起始客损',
+    ladder_share_rate: '占成比例',
+    ladder_rule_required: '联营阶梯规则至少需要一条',
+    ladder_min_loss_invalid: '联营阶梯规则起始客损必须为大于等于0的数字',
+    ladder_share_rate_invalid: '联营阶梯规则占成比例必须在0到1之间',
+    ladder_min_loss_order_invalid: '联营阶梯规则需按起始客损递增',
+    settle_day_daily: '每天',
+    day_suffix: '号',
    carryover_balance: '联营负结转余额',
    user_count: '用户数',
    profit_amount: '当期利润',
@@ -30,6 +57,20 @@ export default {
    admin_group_id: '管理角色组',
    admingroup__name: '组名',
    admin_id: '管理员',
+    admin_tree_tip: '按渠道分组展示可关联的管理员账号，请在「渠道名称」下选择具体管理员（叶子节点）。渠道负责人仅对应一名管理员。',
+    manual_settle: '手动结算',
+    manual_settle_confirm: '确认触发当前渠道手动结算？',
+    manual_settle_settlement_no: '结算单号',
+    manual_settle_period_start: '周期开始',
+    manual_settle_period_end: '周期结束（当前时间）',
+    manual_settle_total_bet: '总投注额（已结算注单）',
+    manual_settle_total_payout: '总派彩额',
+    manual_settle_platform_profit: '平台盈亏',
+    manual_settle_commission_rate: '佣金比例（小数）',
+    manual_settle_calc_base: '结算基数',
+    manual_settle_commission_amount: '佣金金额',
+    manual_settle_remark: '备注',
+    admin_id_placeholder: '请选择渠道下的管理员账号',
    admin__username: '用户名',
    create_time: '创建时间',
    update_time: '修改时间',
--- a/web/src/lang/backend/zh-cn/game/betOrder.ts
+++ b/web/src/lang/backend/zh-cn/game/betOrder.ts
@@ -1,7 +1,7 @@
 export default {
    'quick Search Fields': 'ID/期号/幂等键',
    id: 'ID',
-    period_id: '期ID',
+    period_id: '对局ID',
    period_no: '期号',
    user_id: '用户ID',
    channel_id: '渠道ID',
--- a/web/src/lang/backend/zh-cn/order/betOrder.ts
+++ b/web/src/lang/backend/zh-cn/order/betOrder.ts
@@ -1,7 +1,7 @@
-export default {
+export default {
    'quick Search Fields': 'ID/期号/幂等键',
    id: 'ID',
-    period_id: '期ID',
+    period_id: '对局ID',
    period_no: '期号',
    user_id: '用户ID',
    channel_id: '渠道ID',
@@ -24,6 +24,12 @@ export default {
    update_time: '更新时间',
    gamePeriod_period_no: '对局期号',
    gamePeriod_status: '期状态',
+    'gamePeriod_status 0': '下注开放',
+    'gamePeriod_status 1': '已封盘',
+    'gamePeriod_status 2': '算票中',
+    'gamePeriod_status 3': '派彩中',
+    'gamePeriod_status 4': '已结束',
+    'gamePeriod_status 5': '已作废',
    user_username: '用户名',
    channel_name: '渠道',
 }
--- a/web/src/views/backend/agent/commissionRecord/index.vue
+++ b/web/src/views/backend/agent/commissionRecord/index.vue
@@ -37,9 +37,43 @@ const baTable = new baTableClass(
        column: [
            { type: 'selection', align: 'center', operator: false },
            { label: t('agent.commissionRecord.id'), prop: 'id', align: 'center', width: 80, operator: 'RANGE', sortable: 'custom' },
-            { label: t('agent.commissionRecord.settlement_period_id'), prop: 'settlement_period_id', align: 'center', width: 130, operator: 'RANGE' },
-            { label: t('agent.commissionRecord.channel_id'), prop: 'channel_id', align: 'center', width: 100, operator: 'RANGE' },
-            { label: t('agent.commissionRecord.admin_id'), prop: 'admin_id', align: 'center', width: 100, operator: 'RANGE' },
+            {
+                label: t('agent.commissionRecord.settlement_period_id'),
+                prop: 'settlement_period_id',
+                align: 'center',
+                width: 130,
+                operator: 'RANGE',
+                show: false,
+            },
+            {
+                label: t('agent.commissionRecord.settlement_period_no'),
+                prop: 'settlementPeriod.settlement_no',
+                align: 'center',
+                minWidth: 170,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+                render: 'tags',
+            },
+            { label: t('agent.commissionRecord.channel_id'), prop: 'channel_id', align: 'center', width: 100, operator: 'RANGE', show: false },
+            {
+                label: t('agent.commissionRecord.channel_name'),
+                prop: 'channel.name',
+                align: 'center',
+                minWidth: 120,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+                render: 'tags',
+            },
+            { label: t('agent.commissionRecord.admin_id'), prop: 'admin_id', align: 'center', width: 100, operator: 'RANGE', show: false },
+            {
+                label: t('agent.commissionRecord.admin_username'),
+                prop: 'admin.username',
+                align: 'center',
+                minWidth: 120,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+                render: 'tags',
+            },
            { label: t('agent.commissionRecord.commission_rate'), prop: 'commission_rate', align: 'center', minWidth: 110, operator: 'RANGE' },
            { label: t('agent.commissionRecord.calc_base_amount'), prop: 'calc_base_amount', align: 'center', minWidth: 120, operator: 'RANGE' },
            { label: t('agent.commissionRecord.commission_amount'), prop: 'commission_amount', align: 'center', minWidth: 120, operator: 'RANGE' },
@@ -48,15 +82,59 @@ const baTable = new baTableClass(
                prop: 'status',
                align: 'center',
                width: 100,
+                effect: 'dark',
+                custom: { 0: 'info', 1: 'warning', 2: 'success' },
                operator: 'eq',
                render: 'tag',
-                replaceValue: { '0': t('agent.commissionRecord.status 0'), '1': t('agent.commissionRecord.status 1'), '2': t('agent.commissionRecord.status 2') },
+                replaceValue: {
+                    '0': t('agent.commissionRecord.status 0'),
+                    '1': t('agent.commissionRecord.status 1'),
+                    '2': t('agent.commissionRecord.status 2'),
                },
-            { label: t('agent.commissionRecord.settled_at'), prop: 'settled_at', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
-            { label: t('agent.commissionRecord.remark'), prop: 'remark', align: 'center', minWidth: 160, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), showOverflowTooltip: true },
-            { label: t('agent.commissionRecord.create_time'), prop: 'create_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
-            { label: t('agent.commissionRecord.update_time'), prop: 'update_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
-            { label: t('Operate'), align: 'center', width: 100, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
+            },
+            {
+                label: t('agent.commissionRecord.settled_at'),
+                prop: 'settled_at',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            {
+                label: t('agent.commissionRecord.remark'),
+                prop: 'remark',
+                align: 'center',
+                minWidth: 160,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+                showOverflowTooltip: true,
+            },
+            {
+                label: t('agent.commissionRecord.create_time'),
+                prop: 'create_time',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            {
+                label: t('agent.commissionRecord.update_time'),
+                prop: 'update_time',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            { label: t('Operate'), align: 'center', minWidth: 80, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
        ],
    },
    {
@@ -77,4 +155,3 @@ onMounted(() => {
 </script>

 <style scoped lang="scss"></style>
-
--- a/web/src/views/backend/agent/commissionRecord/popupForm.vue
+++ b/web/src/views/backend/agent/commissionRecord/popupForm.vue
@@ -6,9 +6,45 @@
        <el-scrollbar v-loading="baTable.form.loading" class="ba-table-form-scrollbar">
            <div class="ba-operate-form" :class="'ba-' + baTable.form.operate + '-form'" :style="config.layout.shrink ? '' : 'width: calc(100% - ' + baTable.form.labelWidth! / 2 + 'px)'">
                <el-form v-if="!baTable.form.loading" ref="formRef" @submit.prevent="" @keyup.enter="baTable.onSubmit(formRef)" :model="baTable.form.items" :label-position="config.layout.shrink ? 'top' : 'right'" :label-width="baTable.form.labelWidth + 'px'" :rules="rules">
-                    <FormItem :label="t('agent.commissionRecord.settlement_period_id')" type="number" v-model="baTable.form.items!.settlement_period_id" prop="settlement_period_id" :input-attr="{ min: 1, step: 1 }" />
-                    <FormItem :label="t('agent.commissionRecord.channel_id')" type="number" v-model="baTable.form.items!.channel_id" prop="channel_id" :input-attr="{ min: 1, step: 1 }" />
-                    <FormItem :label="t('agent.commissionRecord.admin_id')" type="number" v-model="baTable.form.items!.admin_id" prop="admin_id" :input-attr="{ min: 1, step: 1 }" />
+                    <FormItem
+                        :label="t('agent.commissionRecord.settlement_period_id')"
+                        type="remoteSelect"
+                        v-model="baTable.form.items!.settlement_period_id"
+                        prop="settlement_period_id"
+                        :key="'sp-' + (baTable.form.items!.id ?? 'new')"
+                        :input-attr="{
+                            pk: 'id',
+                            field: 'settlement_no',
+                            remoteUrl: '/admin/agent.SettlementPeriod/index',
+                            placeholder: t('Click select'),
+                        }"
+                    />
+                    <FormItem
+                        :label="t('agent.commissionRecord.channel_id')"
+                        type="remoteSelect"
+                        v-model="baTable.form.items!.channel_id"
+                        prop="channel_id"
+                        :key="'ch-' + (baTable.form.items!.id ?? 'new')"
+                        :input-attr="{
+                            pk: 'id',
+                            field: 'name',
+                            remoteUrl: '/admin/channel/index',
+                            placeholder: t('Click select'),
+                        }"
+                    />
+                    <FormItem
+                        :label="t('agent.commissionRecord.admin_id')"
+                        type="remoteSelect"
+                        v-model="baTable.form.items!.admin_id"
+                        prop="admin_id"
+                        :key="'adm-' + (baTable.form.items!.id ?? 'new')"
+                        :input-attr="{
+                            pk: 'id',
+                            field: 'username',
+                            remoteUrl: '/admin/auth/admin/index',
+                            placeholder: t('Click select'),
+                        }"
+                    />
                    <FormItem :label="t('agent.commissionRecord.commission_rate')" type="number" v-model="baTable.form.items!.commission_rate" prop="commission_rate" :input-attr="{ min: 0, precision: 4, step: 0.0001 }" />
                    <FormItem :label="t('agent.commissionRecord.calc_base_amount')" type="number" v-model="baTable.form.items!.calc_base_amount" prop="calc_base_amount" :input-attr="{ min: 0, precision: 4, step: 0.0001 }" />
                    <FormItem :label="t('agent.commissionRecord.commission_amount')" type="number" v-model="baTable.form.items!.commission_amount" prop="commission_amount" :input-attr="{ precision: 4, step: 0.0001 }" />
@@ -42,8 +78,9 @@ const { t } = useI18n()

 const rules: Partial<Record<string, FormItemRule[]>> = reactive({
    settlement_period_id: [{ required: true, message: t('Please input field', { field: t('agent.commissionRecord.settlement_period_id') }) }],
+    channel_id: [{ required: true, message: t('Please input field', { field: t('agent.commissionRecord.channel_id') }) }],
+    admin_id: [{ required: true, message: t('Please input field', { field: t('agent.commissionRecord.admin_id') }) }],
 })
 </script>

 <style scoped lang="scss"></style>
-
--- a/web/src/views/backend/agent/settlementPeriod/index.vue
+++ b/web/src/views/backend/agent/settlementPeriod/index.vue
@@ -37,25 +37,99 @@ const baTable = new baTableClass(
        column: [
            { type: 'selection', align: 'center', operator: false },
            { label: t('agent.settlementPeriod.id'), prop: 'id', align: 'center', width: 80, operator: 'RANGE', sortable: 'custom' },
-            { label: t('agent.settlementPeriod.settlement_no'), prop: 'settlement_no', align: 'center', minWidth: 160, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
-            { label: t('agent.settlementPeriod.period_start_at'), prop: 'period_start_at', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
-            { label: t('agent.settlementPeriod.period_end_at'), prop: 'period_end_at', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
+            {
+                label: t('agent.settlementPeriod.settlement_no'),
+                prop: 'settlement_no',
+                align: 'center',
+                minWidth: 160,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+            },
+            {
+                label: t('agent.settlementPeriod.period_start_at'),
+                prop: 'period_start_at',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            {
+                label: t('agent.settlementPeriod.period_end_at'),
+                prop: 'period_end_at',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
            { label: t('agent.settlementPeriod.total_bet_amount'), prop: 'total_bet_amount', align: 'center', operator: 'RANGE', minWidth: 120 },
-            { label: t('agent.settlementPeriod.total_payout_amount'), prop: 'total_payout_amount', align: 'center', operator: 'RANGE', minWidth: 120 },
-            { label: t('agent.settlementPeriod.platform_profit_amount'), prop: 'platform_profit_amount', align: 'center', operator: 'RANGE', minWidth: 120 },
+            {
+                label: t('agent.settlementPeriod.total_payout_amount'),
+                prop: 'total_payout_amount',
+                align: 'center',
+                operator: 'RANGE',
+                minWidth: 120,
+            },
+            {
+                label: t('agent.settlementPeriod.platform_profit_amount'),
+                prop: 'platform_profit_amount',
+                align: 'center',
+                operator: 'RANGE',
+                minWidth: 120,
+            },
            {
                label: t('agent.settlementPeriod.status'),
                prop: 'status',
                align: 'center',
                width: 100,
+                effect: 'dark',
+                custom: { 0: 'info', 1: 'warning', 2: 'success', 3: 'danger' },
                operator: 'eq',
                render: 'tag',
-                replaceValue: { '0': t('agent.settlementPeriod.status 0'), '1': t('agent.settlementPeriod.status 1'), '2': t('agent.settlementPeriod.status 2'), '3': t('agent.settlementPeriod.status 3') },
+                replaceValue: {
+                    '0': t('agent.settlementPeriod.status 0'),
+                    '1': t('agent.settlementPeriod.status 1'),
+                    '2': t('agent.settlementPeriod.status 2'),
+                    '3': t('agent.settlementPeriod.status 3'),
                },
-            { label: t('agent.settlementPeriod.remark'), prop: 'remark', align: 'center', minWidth: 160, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), showOverflowTooltip: true },
-            { label: t('agent.settlementPeriod.create_time'), prop: 'create_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
-            { label: t('agent.settlementPeriod.update_time'), prop: 'update_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', width: 170, sortable: 'custom', timeFormat: 'yyyy-mm-dd hh:MM:ss' },
-            { label: t('Operate'), align: 'center', width: 100, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
+            },
+            {
+                label: t('agent.settlementPeriod.remark'),
+                prop: 'remark',
+                align: 'center',
+                minWidth: 160,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+                showOverflowTooltip: true,
+            },
+            {
+                label: t('agent.settlementPeriod.create_time'),
+                prop: 'create_time',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            {
+                label: t('agent.settlementPeriod.update_time'),
+                prop: 'update_time',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                width: 170,
+                sortable: 'custom',
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            { label: t('Operate'), align: 'center', minWidth: 80, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
        ],
    },
    {
@@ -76,4 +150,3 @@ onMounted(() => {
 </script>

 <style scoped lang="scss"></style>
-
--- a/web/src/views/backend/auth/admin/index.vue
+++ b/web/src/views/backend/auth/admin/index.vue
@@ -90,16 +90,18 @@ const baTable = new baTableClass(
                prop: 'status',
                align: 'center',
                render: 'tag',
+                effect: 'dark',
                custom: { disable: 'danger', enable: 'success' },
                replaceValue: { disable: t('Disable'), enable: t('Enable') },
            },
            {
                label: t('Operate'),
                align: 'center',
-                width: '100',
+                minWidth: '80',
                render: 'buttons',
                buttons: optButtons,
                operator: false,
+                fixed: 'right',
            },
        ],
        dblClickNotEditColumn: [undefined, 'status'],
--- a/web/src/views/backend/auth/adminLog/index.vue
+++ b/web/src/views/backend/auth/adminLog/index.vue
@@ -90,7 +90,17 @@ const baTable = new baTableClass(new baTableApi('/admin/auth.AdminLog/'), {
            showOverflowTooltip: true,
            render: 'url',
        },
-        { label: t('auth.adminLog.ip'), prop: 'ip', align: 'center', operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), render: 'tag' },
+        {
+            label: t('auth.adminLog.ip'),
+            prop: 'ip',
+            align: 'center',
+            operator: 'LIKE',
+            operatorPlaceholder: t('Fuzzy query'),
+            render: 'tag',
+            customRenderAttr: {
+                tag: () => ({ type: 'info' }),
+            },
+        },
        {
            label: t('auth.adminLog.useragent'),
            prop: 'useragent',
@@ -111,10 +121,11 @@ const baTable = new baTableClass(new baTableApi('/admin/auth.AdminLog/'), {
        {
            label: t('Operate'),
            align: 'center',
-            width: '100',
+            minWidth: '80',
            render: 'buttons',
            buttons: optButtons,
            operator: false,
+            fixed: 'right',
        },
    ],
    dblClickNotEditColumn: [undefined],
--- a/web/src/views/backend/auth/group/index.vue
+++ b/web/src/views/backend/auth/group/index.vue
@@ -67,12 +67,20 @@ const baTable: baTableClass = new baTableClass(
                prop: 'status',
                align: 'center',
                render: 'tag',
+                effect: 'dark',
                custom: { 0: 'danger', 1: 'success' },
                replaceValue: { 0: t('Disable'), 1: t('Enable') },
            },
            { label: t('Update time'), prop: 'update_time', align: 'center', width: '160', render: 'datetime' },
            { label: t('Create time'), prop: 'create_time', align: 'center', width: '160', render: 'datetime' },
-            { label: t('Operate'), align: 'center', width: '130', render: 'buttons', buttons: defaultOptButtons(['edit', 'delete']) },
+            {
+                label: t('Operate'),
+                align: 'center',
+                width: '80',
+                render: 'buttons',
+                buttons: defaultOptButtons(['edit', 'delete']),
+                fixed: 'right',
+            },
        ],
    },
    {
--- a/web/src/views/backend/auth/rule/index.vue
+++ b/web/src/views/backend/auth/rule/index.vue
@@ -68,9 +68,10 @@ const baTable = new baTableClass(
            {
                label: t('Operate'),
                align: 'center',
-                width: '130',
+                width: '120',
                render: 'buttons',
                buttons: defaultOptButtons(),
+                fixed: 'right',
            },
        ],
        dragSortLimitField: 'pid',
--- a/web/src/views/backend/channel/index.vue
+++ b/web/src/views/backend/channel/index.vue
@@ -10,18 +10,66 @@
        <Table ref="tableRef"></Table>

        <PopupForm />
+
+        <el-dialog class="ba-operate-dialog" :close-on-click-modal="false" :model-value="manualSettle.visible" @close="closeManualSettleDialog">
+            <template #header>
+                <div class="title">{{ t('channel.manual_settle') }}</div>
+            </template>
+            <div v-loading="manualSettle.previewLoading" class="manual-settle-dialog-body">
+                <el-form :model="manualSettle.form" label-width="140px">
+                    <el-form-item :label="t('channel.manual_settle_settlement_no')">
+                        <el-input v-model="manualSettle.form.settlement_no" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_period_start')">
+                        <el-input v-model="manualSettle.form.period_start_at" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_period_end')">
+                        <el-input v-model="manualSettle.form.period_end_at" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_total_bet')">
+                        <el-input v-model="manualSettle.form.total_bet_amount" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_total_payout')">
+                        <el-input v-model="manualSettle.form.total_payout_amount" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_platform_profit')">
+                        <el-input v-model="manualSettle.form.platform_profit_amount" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_commission_rate')">
+                        <el-input v-model="manualSettle.form.commission_rate" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_calc_base')">
+                        <el-input v-model="manualSettle.form.calc_base_amount" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_commission_amount')">
+                        <el-input v-model="manualSettle.form.commission_amount" readonly />
+                    </el-form-item>
+                    <el-form-item :label="t('channel.manual_settle_remark')">
+                        <el-input v-model="manualSettle.form.remark" type="textarea" :rows="2" />
+                    </el-form-item>
+                </el-form>
+            </div>
+            <template #footer>
+                <el-button @click="closeManualSettleDialog">{{ t('Cancel') }}</el-button>
+                <el-button type="primary" :disabled="manualSettle.previewLoading" :loading="manualSettle.loading" @click="submitManualSettle">
+                    {{ t('Save') }}
+                </el-button>
+            </template>
+        </el-dialog>
    </div>
 </template>

 <script setup lang="ts">
-import { onMounted, provide, useTemplateRef } from 'vue'
+import { onMounted, provide, reactive, useTemplateRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 import PopupForm from './popupForm.vue'
 import { baTableApi } from '/@/api/common'
+import { auth } from '/@/utils/common'
 import { defaultOptButtons } from '/@/components/table'
 import TableHeader from '/@/components/table/header/index.vue'
 import Table from '/@/components/table/index.vue'
 import baTableClass from '/@/utils/baTable'
+import createAxios from '/@/utils/axios'

 defineOptions({
    name: 'channel',
@@ -29,7 +77,23 @@ defineOptions({

 const { t } = useI18n()
 const tableRef = useTemplateRef('tableRef')
-const optButtons: OptButton[] = defaultOptButtons(['edit', 'delete'])
+let optButtons: OptButton[] = [
+    {
+        render: 'tipButton',
+        name: 'manualSettle',
+        title: 'channel.manual_settle',
+        text: '',
+        type: 'warning',
+        icon: 'el-icon-Clock',
+        class: 'table-row-manual-settle',
+        disabledTip: false,
+        display: () => auth('manualSettle'),
+        click: (row: TableRow) => {
+            void openManualSettleDialog(row)
+        },
+    },
+]
+optButtons = optButtons.concat(defaultOptButtons(['edit', 'delete']))
 const formatRatePercent = (_row: any, _column: any, cellValue: number | string | null) => {
    if (cellValue === null || cellValue === undefined || cellValue === '') return '-'
    const num = Number(cellValue)
@@ -42,6 +106,110 @@ const formatAmountInt = (_row: any, _column: any, cellValue: number | string | n
    if (Number.isNaN(num)) return '-'
    return `${num}`
 }
+const formatSettleDay = (row: anyObj) => {
+    if (row.settle_cycle === 'weekly') {
+        return t(`channel.weekday ${row.settle_weekday ?? 1}`)
+    }
+    if (row.settle_cycle === 'monthly') {
+        return `${row.settle_monthday ?? 1}${t('channel.day_suffix')}`
+    }
+    return t('channel.settle_day_daily')
+}
+
+const manualSettle = reactive({
+    visible: false,
+    loading: false,
+    previewLoading: false,
+    channelId: 0,
+    form: {
+        settlement_no: '',
+        period_start_at: '',
+        period_end_at: '',
+        total_bet_amount: '',
+        total_payout_amount: '',
+        platform_profit_amount: '',
+        commission_rate: '',
+        calc_base_amount: '',
+        commission_amount: '',
+        remark: '',
+    },
+})
+
+const resetManualSettleForm = () => {
+    manualSettle.form.settlement_no = ''
+    manualSettle.form.period_start_at = ''
+    manualSettle.form.period_end_at = ''
+    manualSettle.form.total_bet_amount = ''
+    manualSettle.form.total_payout_amount = ''
+    manualSettle.form.platform_profit_amount = ''
+    manualSettle.form.commission_rate = ''
+    manualSettle.form.calc_base_amount = ''
+    manualSettle.form.commission_amount = ''
+    manualSettle.form.remark = ''
+}
+
+const closeManualSettleDialog = () => {
+    manualSettle.visible = false
+    resetManualSettleForm()
+}
+
+const openManualSettleDialog = async (row: TableRow) => {
+    manualSettle.channelId = row.id
+    resetManualSettleForm()
+    manualSettle.visible = true
+    manualSettle.previewLoading = true
+    try {
+        const res = await createAxios(
+            {
+                url: '/admin/channel/manualSettlePreview',
+                method: 'get',
+                params: { id: row.id },
+            },
+            { showErrorMessage: true }
+        )
+        if (res.code !== 1 || !res.data) {
+            manualSettle.visible = false
+            return
+        }
+        const d = res.data as anyObj
+        manualSettle.form.settlement_no = d.settlement_no ?? ''
+        manualSettle.form.period_start_at = d.period_start_at ?? ''
+        manualSettle.form.period_end_at = d.period_end_at ?? ''
+        manualSettle.form.total_bet_amount = d.total_bet_amount ?? ''
+        manualSettle.form.total_payout_amount = d.total_payout_amount ?? ''
+        manualSettle.form.platform_profit_amount = d.platform_profit_amount ?? ''
+        manualSettle.form.commission_rate = d.commission_rate ?? ''
+        manualSettle.form.calc_base_amount = d.calc_base_amount ?? ''
+        manualSettle.form.commission_amount = d.commission_amount ?? ''
+        manualSettle.form.remark = `${t('channel.manual_settle')}-CH${row.id}`
+    } catch {
+        manualSettle.visible = false
+    } finally {
+        manualSettle.previewLoading = false
+    }
+}
+
+const submitManualSettle = async () => {
+    if (!manualSettle.channelId) return
+    manualSettle.loading = true
+    try {
+        await createAxios(
+            {
+                url: '/admin/channel/manualSettle',
+                method: 'post',
+                data: {
+                    id: manualSettle.channelId,
+                    remark: manualSettle.form.remark,
+                },
+            },
+            { showSuccessMessage: true }
+        )
+        closeManualSettleDialog()
+        baTable.onTableHeaderAction('refresh', { event: 'manual-settle' })
+    } finally {
+        manualSettle.loading = false
+    }
+}

 const baTable = new baTableClass(
    new baTableApi('/admin/channel/'),
@@ -74,6 +242,10 @@ const baTable = new baTableClass(
                operator: 'eq',
                sortable: false,
                render: 'tag',
+                custom: {
+                    turnover: 'primary',
+                    affiliate: 'success',
+                },
                replaceValue: {
                    turnover: t('channel.agent_mode turnover'),
                    affiliate: t('channel.agent_mode affiliate'),
@@ -115,6 +287,70 @@ const baTable = new baTableClass(
                operator: 'RANGE',
                formatter: formatAmountInt,
            },
+            {
+                label: t('channel.affiliate_contract_no'),
+                prop: 'affiliate_contract_no',
+                align: 'center',
+                minWidth: 140,
+                sortable: false,
+                operator: 'LIKE',
+                operatorPlaceholder: t('Fuzzy query'),
+                showOverflowTooltip: true,
+            },
+            {
+                label: t('channel.settle_cycle'),
+                prop: 'settle_cycle',
+                align: 'center',
+                width: 110,
+                operator: 'eq',
+                sortable: false,
+                render: 'tag',
+                custom: { daily: 'info', weekly: 'primary', monthly: 'success' },
+                replaceValue: {
+                    daily: t('channel.settle_cycle daily'),
+                    weekly: t('channel.settle_cycle weekly'),
+                    monthly: t('channel.settle_cycle monthly'),
+                },
+            },
+            {
+                label: t('channel.settle_weekday'),
+                prop: 'settle_day',
+                align: 'center',
+                width: 110,
+                operator: false,
+                sortable: false,
+                formatter: (row: anyObj) => formatSettleDay(row),
+            },
+            {
+                label: t('channel.settle_time'),
+                prop: 'settle_time',
+                align: 'center',
+                width: 100,
+                operator: 'LIKE',
+                sortable: false,
+            },
+            {
+                label: t('channel.affiliate_effective_start_at'),
+                prop: 'affiliate_effective_start_at',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                sortable: 'custom',
+                width: 160,
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
+            {
+                label: t('channel.affiliate_effective_end_at'),
+                prop: 'affiliate_effective_end_at',
+                align: 'center',
+                render: 'datetime',
+                operator: 'RANGE',
+                comSearchRender: 'datetime',
+                sortable: 'custom',
+                width: 160,
+                timeFormat: 'yyyy-mm-dd hh:MM:ss',
+            },
            {
                label: t('channel.user_count'),
                prop: 'user_count',
@@ -200,12 +436,19 @@ const baTable = new baTableClass(
                width: 160,
                timeFormat: 'yyyy-mm-dd hh:MM:ss',
            },
-            { label: t('Operate'), align: 'center', width: 80, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
+            { label: t('Operate'), align: 'center', width: 120, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
        ],
        dblClickNotEditColumn: [undefined, 'status'],
    },
    {
-        defaultItems: { status: '1', agent_mode: 'turnover' },
+        defaultItems: {
+            status: '1',
+            agent_mode: 'turnover',
+            settle_cycle: 'weekly',
+            settle_weekday: 1,
+            settle_monthday: 1,
+            settle_time: '02:00:00',
+        },
    }
 )

--- a/web/src/views/backend/channel/popupForm.vue
+++ b/web/src/views/backend/channel/popupForm.vue
@@ -69,14 +69,30 @@
                        :input-attr="{ step: 0.01, precision: 2, min: 0, max: 100 }"
                        :placeholder="`${t('Please input field', { field: t('channel.turnover_share_rate') })} (例如 30.5)`"
                    />
+                    <FormItem
+                        v-if="currentAgentMode === 'affiliate'"
+                        :label="t('channel.affiliate_contract_no')"
+                        type="string"
+                        v-model="baTable.form.items!.affiliate_contract_no"
+                        prop="affiliate_contract_no"
+                        :placeholder="t('Please input field', { field: t('channel.affiliate_contract_no') })"
+                    />
+                    <FormItem
+                        v-if="currentAgentMode === 'affiliate'"
+                        :label="t('channel.affiliate_contract_name')"
+                        type="string"
+                        v-model="baTable.form.items!.affiliate_contract_name"
+                        prop="affiliate_contract_name"
+                        :placeholder="t('Please input field', { field: t('channel.affiliate_contract_name') })"
+                    />
                    <FormItem
                        v-if="currentAgentMode === 'affiliate'"
                        :label="t('channel.affiliate_share_rate')"
                        type="number"
                        v-model="baTable.form.items!.affiliate_share_rate"
                        prop="affiliate_share_rate"
-                        :input-attr="{ step: 0.01, precision: 2, min: 0, max: 100 }"
-                        :placeholder="`${t('Please input field', { field: t('channel.affiliate_share_rate') })} (例如 55.5)`"
+                        :input-attr="{ step: 0.000001, precision: 6, min: 0, max: 1 }"
+                        :placeholder="`${t('Please input field', { field: t('channel.affiliate_share_rate') })} (例如 0.240000)`"
                    />
                    <FormItem
                        v-if="currentAgentMode === 'affiliate'"
@@ -84,9 +100,52 @@
                        type="number"
                        v-model="baTable.form.items!.affiliate_fee_rate"
                        prop="affiliate_fee_rate"
-                        :input-attr="{ step: 0.01, precision: 2, min: 0, max: 100 }"
-                        :placeholder="`${t('Please input field', { field: t('channel.affiliate_fee_rate') })} (例如 15.0)`"
+                        :input-attr="{ step: 0.000001, precision: 6, min: 0, max: 1 }"
+                        :placeholder="`${t('Please input field', { field: t('channel.affiliate_fee_rate') })} (例如 0.070000)`"
                    />
+                    <el-form-item :label="t('channel.settle_cycle')" prop="settle_plan">
+                        <el-tree-select
+                            v-model="settlePlanValue"
+                            class="w100"
+                            clearable
+                            filterable
+                            :data="settlePlanTree"
+                            :props="settlePlanTreeProps"
+                            :render-after-expand="false"
+                            :placeholder="t('channel.settle_cycle_placeholder')"
+                            @change="onSettlePlanChange"
+                        />
+                    </el-form-item>
+                    <FormItem :label="t('channel.settle_time')" type="time" v-model="baTable.form.items!.settle_time" prop="settle_time" />
+                    <FormItem
+                        v-if="currentAgentMode === 'affiliate'"
+                        :label="t('channel.affiliate_effective_start_at')"
+                        type="datetime"
+                        v-model="baTable.form.items!.affiliate_effective_start_at"
+                        prop="affiliate_effective_start_at"
+                    />
+                    <FormItem
+                        v-if="currentAgentMode === 'affiliate'"
+                        :label="t('channel.affiliate_effective_end_at')"
+                        type="datetime"
+                        v-model="baTable.form.items!.affiliate_effective_end_at"
+                        prop="affiliate_effective_end_at"
+                    />
+                    <el-form-item v-if="currentAgentMode === 'affiliate'" :label="t('channel.affiliate_ladder_rules')" prop="affiliate_ladder_rules">
+                        <div class="ladder-rule-box">
+                            <div class="ladder-rule-row ladder-rule-head">
+                                <span>{{ t('channel.ladder_min_loss') }}</span>
+                                <span>{{ t('channel.ladder_share_rate') }}</span>
+                                <span>{{ t('Operate') }}</span>
+                            </div>
+                            <div v-for="(item, idx) in ladderRuleList" :key="idx" class="ladder-rule-row">
+                                <el-input-number v-model="item.minLoss" class="w100" :precision="4" :step="0.0001" :min="0" />
+                                <el-input-number v-model="item.shareRate" class="w100" :precision="6" :step="0.000001" :min="0" :max="1" />
+                                <el-button type="danger" link @click="removeLadderRule(idx)">{{ t('Delete') }}</el-button>
+                            </div>
+                            <el-button type="primary" link @click="addLadderRule">{{ t('Add') }}</el-button>
+                        </div>
+                    </el-form-item>
                    <FormItem
                        v-if="currentAgentMode === 'affiliate'"
                        :label="t('channel.carryover_balance')"
@@ -113,22 +172,21 @@
                        @keyup.ctrl.enter="baTable.onSubmit(formRef)"
                        :placeholder="t('Please input field', { field: t('channel.remark') })"
                    />
-                    <FormItem
-                        :label="t('channel.admin_id')"
-                        type="remoteSelect"
+                    <el-alert type="info" :closable="false" show-icon class="channel-admin-tree-tip">
+                        {{ t('channel.admin_tree_tip') }}
+                    </el-alert>
+                    <el-form-item :label="t('channel.admin_id')" prop="admin_id">
+                        <el-tree-select
                            v-model="baTable.form.items!.admin_id"
-                        prop="admin_id"
-                        :input-attr="{ pk: 'admin.id', field: 'username', remoteUrl: '/admin/auth.Admin/index', params: { top_group: '1' } }"
-                        :placeholder="t('Please select field', { field: t('channel.admin_id') })"
-                    />
-                    <FormItem
-                        :label="t('channel.top_admin_id')"
-                        type="remoteSelect"
-                        v-model="baTable.form.items!.top_admin_id"
-                        prop="top_admin_id"
-                        :input-attr="{ pk: 'admin.id', field: 'username', remoteUrl: '/admin/auth.Admin/index', params: { top_group: '1' } }"
-                        :placeholder="t('Please select field', { field: t('channel.top_admin_id') })"
+                            class="w100"
+                            clearable
+                            filterable
+                            :data="channelAdminTree"
+                            :props="channelAdminTreeProps"
+                            :render-after-expand="false"
+                            :placeholder="t('channel.admin_id_placeholder')"
                        />
+                    </el-form-item>
                </el-form>
            </div>
        </el-scrollbar>
@@ -145,11 +203,13 @@

 <script setup lang="ts">
 import type { FormItemRule } from 'element-plus'
-import { computed, inject, reactive, useTemplateRef, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { computed, inject, nextTick, onMounted, reactive, ref, useTemplateRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import FormItem from '/@/components/formItem/index.vue'
 import { useConfig } from '/@/stores/config'
 import type baTableClass from '/@/utils/baTable'
+import createAxios from '/@/utils/axios'
 import { buildValidatorData } from '/@/utils/validate'

 const config = useConfig()
@@ -157,6 +217,114 @@ const formRef = useTemplateRef('formRef')
 const baTable = inject('baTable') as baTableClass

 const { t } = useI18n()
+
+type ChannelAdminTreeNode = {
+    value: string
+    label: string
+    disabled?: boolean
+    children?: ChannelAdminTreeNode[]
+    channel_id?: number
+    is_leaf?: boolean
+}
+
+const channelAdminTree = ref<ChannelAdminTreeNode[]>([])
+const channelAdminTreeProps = {
+    value: 'value',
+    label: 'label',
+    children: 'children',
+    disabled: 'disabled',
+}
+
+type LadderRuleRow = { minLoss: number; shareRate: number }
+const ladderRuleList = ref<LadderRuleRow[]>([])
+
+const settlePlanTree = computed(() => [
+    { value: 'daily', label: t('channel.settle_cycle daily'), children: [] },
+    {
+        value: 'weekly',
+        label: t('channel.settle_cycle weekly'),
+        disabled: true,
+        children: [1, 2, 3, 4, 5, 6, 7].map((n) => ({ value: `weekly:${n}`, label: t(`channel.weekday ${n}`), is_leaf: true })),
+    },
+    {
+        value: 'monthly',
+        label: t('channel.settle_cycle monthly'),
+        disabled: true,
+        children: Array.from({ length: 31 }).map((_, i) => {
+            const day = i + 1
+            return { value: `monthly:${day}`, label: `${day}${t('channel.day_suffix')}`, is_leaf: true }
+        }),
+    },
+])
+const settlePlanTreeProps = { value: 'value', label: 'label', children: 'children', disabled: 'disabled' }
+const settlePlanValue = ref<string | null>(null)
+
+const syncSettlePlanToItems = () => {
+    const items = baTable.form.items
+    if (!items) return
+    ;(items as any).settle_plan = settlePlanValue.value ?? ''
+}
+
+const syncSettlePlanFromItems = () => {
+    const items = baTable.form.items
+    if (!items) return
+    const cycle = items.settle_cycle || 'weekly'
+    if (cycle === 'daily') {
+        settlePlanValue.value = 'daily'
+        syncSettlePlanToItems()
+        return
+    }
+    if (cycle === 'monthly') {
+        settlePlanValue.value = `monthly:${items.settle_monthday || 1}`
+        syncSettlePlanToItems()
+        return
+    }
+    settlePlanValue.value = `weekly:${items.settle_weekday || 1}`
+    syncSettlePlanToItems()
+}
+
+watch(settlePlanValue, (val) => {
+    if (!baTable.form.items) return
+    if (!val) {
+        syncSettlePlanToItems()
+        return
+    }
+    if (val === 'daily') {
+        baTable.form.items.settle_cycle = 'daily'
+        baTable.form.items.settle_weekday = 1
+        baTable.form.items.settle_monthday = 1
+        return
+    }
+    if (val.startsWith('weekly:')) {
+        const day = parseInt(val.split(':')[1] || '1', 10)
+        baTable.form.items.settle_cycle = 'weekly'
+        baTable.form.items.settle_weekday = Number.isNaN(day) ? 1 : day
+        baTable.form.items.settle_monthday = 1
+        return
+    }
+    if (val.startsWith('monthly:')) {
+        const day = parseInt(val.split(':')[1] || '1', 10)
+        baTable.form.items.settle_cycle = 'monthly'
+        baTable.form.items.settle_monthday = Number.isNaN(day) ? 1 : day
+        baTable.form.items.settle_weekday = 1
+    }
+    syncSettlePlanToItems()
+})
+
+const onSettlePlanChange = () => {
+    nextTick(() => {
+        formRef.value?.validateField('settle_plan')
+    })
+}
+
+const loadChannelAdminTree = async () => {
+    const res = await createAxios({
+        url: '/admin/channel/adminTree',
+        method: 'get',
+    })
+    channelAdminTree.value = (res.data?.list ?? []) as ChannelAdminTreeNode[]
+}
+
 const currentAgentMode = computed(() => baTable.form.items?.agent_mode ?? 'turnover')
 const currentAgentModeDescList = computed(() => {
    if (currentAgentMode.value === 'turnover') {
@@ -165,6 +333,92 @@ const currentAgentModeDescList = computed(() => {
    return [t('channel.agent_mode_desc_affiliate_1'), t('channel.agent_mode_desc_affiliate_2'), t('channel.agent_mode_desc_affiliate_3')]
 })

+const normalizeLadderRulesToText = (val: unknown): string | null => {
+    if (val === null || val === undefined || val === '') {
+        return null
+    }
+    if (typeof val === 'string') {
+        return val
+    }
+    try {
+        return JSON.stringify(val, null, 2)
+    } catch {
+        return String(val)
+    }
+}
+
+const parseLadderRulesText = (val: unknown): unknown => {
+    if (val === null || val === undefined) {
+        return null
+    }
+    if (typeof val !== 'string') {
+        return val
+    }
+    const text = val.trim()
+    if (!text) {
+        return null
+    }
+    try {
+        return JSON.parse(text)
+    } catch {
+        return text
+    }
+}
+
+const syncLadderRuleRowsFromItems = () => {
+    const items = baTable.form.items
+    if (!items) return
+    const raw = parseLadderRulesText(items.affiliate_ladder_rules)
+    if (!Array.isArray(raw)) {
+        ladderRuleList.value = []
+        return
+    }
+    ladderRuleList.value = raw
+        .map((r: any) => ({
+            minLoss: Number(r.minLoss ?? r.min_loss ?? 0),
+            shareRate: Number(r.shareRate ?? r.share_rate ?? 0),
+        }))
+        .filter((r: LadderRuleRow) => Number.isFinite(r.minLoss) && Number.isFinite(r.shareRate))
+}
+
+const addLadderRule = () => {
+    ladderRuleList.value.push({ minLoss: 0, shareRate: 0 })
+}
+
+const removeLadderRule = (idx: number) => {
+    ladderRuleList.value.splice(idx, 1)
+}
+
+onMounted(() => {
+    loadChannelAdminTree()
+    syncSettlePlanFromItems()
+})
+
+watch(
+    () => baTable.form.operate,
+    (op) => {
+        if (op === 'Add' || op === 'Edit') {
+            loadChannelAdminTree()
+        }
+    }
+)
+
+watch(
+    () => [baTable.form.operate, baTable.form.items?.id] as const,
+    () => {
+        const items = baTable.form.items
+        if (!items || baTable.form.operate !== 'Edit') {
+            return
+        }
+        if (items.admin_id !== undefined && items.admin_id !== null && items.admin_id !== '') {
+            items.admin_id = String(items.admin_id) as any
+        }
+        items.affiliate_ladder_rules = normalizeLadderRulesToText(items.affiliate_ladder_rules) as any
+        syncSettlePlanFromItems()
+        syncLadderRuleRowsFromItems()
+    }
+)
+
 watch(
    () => baTable.form.items?.agent_mode,
    (mode) => {
@@ -175,23 +429,38 @@ watch(
            baTable.form.items.affiliate_share_rate = null
            baTable.form.items.affiliate_fee_rate = null
            baTable.form.items.carryover_balance = 0
+            baTable.form.items.affiliate_contract_no = null
+            baTable.form.items.affiliate_contract_name = null
+            baTable.form.items.affiliate_ladder_rules = null
+            baTable.form.items.affiliate_effective_start_at = null
+            baTable.form.items.affiliate_effective_end_at = null
+            ladderRuleList.value = []
            return
        }
        if (mode === 'affiliate') {
            baTable.form.items.turnover_share_rate = null
+            if (!baTable.form.items.settle_cycle) {
+                baTable.form.items.settle_cycle = 'weekly'
            }
+            syncLadderRuleRowsFromItems()
+        }
+        syncSettlePlanFromItems()
    }
 )

-const percentValidator = (label: string) => {
+const turnoverRateValidator = (label: string) => {
    return (_rule: any, value: string | number | null, callback: (error?: Error) => void) => {
+        if (currentAgentMode.value !== 'turnover') {
+            callback()
+            return
+        }
        if (value === null || value === undefined || value === '') {
            callback()
            return
        }
        const str = String(value).trim()
-        if (!/^\d+(\.\d{1,2})?$/.test(str)) {
-            callback(new Error(`${label}仅支持最多两位小数`))
+        if (!/^\d+(\.\d{1,6})?$/.test(str)) {
+            callback(new Error(`${label}仅支持最多六位小数`))
            return
        }
        const num = Number(str)
@@ -203,16 +472,92 @@ const percentValidator = (label: string) => {
    }
 }

+const settlePlanValidator = (_rule: unknown, _value: unknown, callback: (error?: Error) => void) => {
+    const v = settlePlanValue.value
+    if (v !== null && v !== undefined && v !== '') {
+        callback()
+        return
+    }
+    callback(new Error(t('Please input field', { field: t('channel.settle_cycle') })))
+}
+
+const affiliateRateValidator = (label: string) => {
+    return (_rule: any, value: string | number | null, callback: (error?: Error) => void) => {
+        if (currentAgentMode.value !== 'affiliate') {
+            callback()
+            return
+        }
+        if (value === null || value === undefined || value === '') {
+            callback()
+            return
+        }
+        const str = String(value).trim()
+        if (!/^\d+(\.\d{1,6})?$/.test(str)) {
+            callback(new Error(`${label}仅支持最多六位小数`))
+            return
+        }
+        const num = Number(str)
+        if (Number.isNaN(num) || num < 0 || num > 1) {
+            callback(new Error(`${label}必须在0到1之间`))
+            return
+        }
+        callback()
+    }
+}
+
+baTable.before.onSubmit = ({ items }) => {
+    if (!items) {
+        return
+    }
+    if (Object.prototype.hasOwnProperty.call(items, 'settle_plan')) {
+        delete (items as any).settle_plan
+    }
+    if (items.agent_mode === 'affiliate') {
+        if (ladderRuleList.value.length === 0) {
+            ElMessage.error(t('channel.ladder_rule_required'))
+            return false
+        }
+        const sorted = [...ladderRuleList.value].sort((a, b) => a.minLoss - b.minLoss)
+        for (let i = 0; i < sorted.length; i++) {
+            const row = sorted[i]
+            if (!Number.isFinite(row.minLoss) || row.minLoss < 0) {
+                ElMessage.error(t('channel.ladder_min_loss_invalid'))
+                return false
+            }
+            if (!Number.isFinite(row.shareRate) || row.shareRate < 0 || row.shareRate > 1) {
+                ElMessage.error(t('channel.ladder_share_rate_invalid'))
+                return false
+            }
+            if (i > 0 && row.minLoss <= sorted[i - 1].minLoss) {
+                ElMessage.error(t('channel.ladder_min_loss_order_invalid'))
+                return false
+            }
+        }
+        items.affiliate_ladder_rules = sorted.map((r) => ({
+            minLoss: Number(r.minLoss).toFixed(4),
+            shareRate: Number(r.shareRate).toFixed(6),
+        }))
+    } else {
+        items.affiliate_ladder_rules = null
+    }
+    items.settle_cycle = items.settle_cycle || 'weekly'
+    items.settle_weekday = items.settle_weekday || 1
+    items.settle_monthday = items.settle_monthday || 1
+    items.settle_time = items.settle_time || '02:00:00'
+}
+
 const rules: Partial<Record<string, FormItemRule[]>> = reactive({
    code: [buildValidatorData({ name: 'required', title: t('channel.code') })],
    name: [buildValidatorData({ name: 'required', title: t('channel.name') })],
    agent_mode: [buildValidatorData({ name: 'required', title: t('channel.agent_mode') })],
-    turnover_share_rate: [{ validator: percentValidator(t('channel.turnover_share_rate')), trigger: 'blur' }],
-    affiliate_share_rate: [{ validator: percentValidator(t('channel.affiliate_share_rate')), trigger: 'blur' }],
-    affiliate_fee_rate: [{ validator: percentValidator(t('channel.affiliate_fee_rate')), trigger: 'blur' }],
+    turnover_share_rate: [{ validator: turnoverRateValidator(t('channel.turnover_share_rate')), trigger: 'blur' }],
+    affiliate_share_rate: [{ validator: affiliateRateValidator(t('channel.affiliate_share_rate')), trigger: 'blur' }],
+    affiliate_fee_rate: [{ validator: affiliateRateValidator(t('channel.affiliate_fee_rate')), trigger: 'blur' }],
+    settle_plan: [{ validator: settlePlanValidator, trigger: ['change', 'blur'] }],
+    settle_time: [buildValidatorData({ name: 'required', title: t('channel.settle_time') })],
+    affiliate_effective_start_at: [buildValidatorData({ name: 'required', title: t('channel.affiliate_effective_start_at') })],
    carryover_balance: [buildValidatorData({ name: 'number', title: t('channel.carryover_balance') })],
    admin_id: [buildValidatorData({ name: 'required', title: t('channel.admin_id') })],
-    top_admin_id: [buildValidatorData({ name: 'required', title: t('channel.top_admin_id') })],
 })
 </script>

@@ -226,4 +571,8 @@ const rules: Partial<Record<string, FormItemRule[]>> = reactive({
    padding-left: 18px;
    line-height: 1.6;
 }
+
+.channel-admin-tree-tip {
+    margin-bottom: 12px;
+}
 </style>
--- a/web/src/views/backend/config/gameConfig/index.vue
+++ b/web/src/views/backend/config/gameConfig/index.vue
@@ -63,6 +63,12 @@ const baTable = new baTableClass(
                width: 110,
                operator: 'eq',
                render: 'tag',
+                custom: {
+                    string: 'primary',
+                    int: 'success',
+                    decimal: 'warning',
+                    json: 'info',
+                },
                replaceValue: {
                    string: t('config.gameConfig.value_type string'),
                    int: t('config.gameConfig.value_type int'),
@@ -101,7 +107,7 @@ const baTable = new baTableClass(
                width: 170,
                timeFormat: 'yyyy-mm-dd hh:MM:ss',
            },
-            { label: t('Operate'), align: 'center', width: 100, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
+            { label: t('Operate'), align: 'center', width: 80, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
        ],
        dblClickNotEditColumn: [undefined],
    },
--- a/web/src/views/backend/crud/log.vue
+++ b/web/src/views/backend/crud/log.vue
@@ -385,13 +385,14 @@ const baTable = new baTableClass(
                align: 'center',
                render: 'tag',
                sortable: false,
+                effect: 'dark',
                replaceValue: {
                    delete: t('crud.log.status delete'),
                    success: t('crud.log.status success'),
                    error: t('crud.log.status error'),
                    start: t('crud.log.status start'),
                },
-                custom: { delete: 'danger', success: 'success', error: 'warning', start: '' },
+                custom: { delete: 'danger', success: 'success', error: 'warning', start: 'info' },
            },
            {
                label: t('crud.log.create_time'),
--- a/web/src/views/backend/game/config/index.vue
+++ b/web/src/views/backend/game/config/index.vue
@@ -63,6 +63,12 @@ const baTable = new baTableClass(
                width: 110,
                operator: 'eq',
                render: 'tag',
+                custom: {
+                    string: 'primary',
+                    int: 'success',
+                    decimal: 'warning',
+                    json: 'info',
+                },
                replaceValue: {
                    string: t('game.config.value_type string'),
                    int: t('game.config.value_type int'),
--- a/web/src/views/backend/game/period/index.vue
+++ b/web/src/views/backend/game/period/index.vue
@@ -100,6 +100,15 @@ const baTable = new baTableClass(
                width: 110,
                operator: 'eq',
                render: 'tag',
+                effect: 'dark',
+                custom: {
+                    '0': 'success',
+                    '1': 'warning',
+                    '2': 'info',
+                    '3': 'primary',
+                    '4': 'warning',
+                    '5': 'danger',
+                },
                replaceValue: {
                    '0': t('game.period.status 0'),
                    '1': t('game.period.status 1'),
@@ -116,6 +125,10 @@ const baTable = new baTableClass(
                width: 110,
                operator: 'eq',
                render: 'tag',
+                custom: {
+                    '0': 'info',
+                    '1': 'warning',
+                },
                replaceValue: {
                    '0': t('game.period.draw_mode 0'),
                    '1': t('game.period.draw_mode 1'),
--- a/web/src/views/backend/order/betOrder/index.vue
+++ b/web/src/views/backend/order/betOrder/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
    <div class="default-main ba-table-box">
        <el-alert class="ba-table-alert" v-if="baTable.table.remark" :title="baTable.table.remark" type="info" show-icon />

@@ -83,21 +83,37 @@ const baTable = new baTableClass(
                width: 100,
                operator: 'eq',
                render: 'tag',
+                effect: 'dark',
+                custom: {
+                    '0': 'success',
+                    '1': 'warning',
+                    '2': 'info',
+                    '3': 'primary',
+                    '4': 'warning',
+                    '5': 'danger',
+                },
                replaceValue: {
-                    '0': '下注开放',
-                    '1': '已封盘',
-                    '2': '算票中',
-                    '3': '派彩中',
-                    '4': '已结束',
-                    '5': '已作废',
+                    '0': t('order.betOrder.gamePeriod_status 0'),
+                    '1': t('order.betOrder.gamePeriod_status 1'),
+                    '2': t('order.betOrder.gamePeriod_status 2'),
+                    '3': t('order.betOrder.gamePeriod_status 3'),
+                    '4': t('order.betOrder.gamePeriod_status 4'),
+                    '5': t('order.betOrder.gamePeriod_status 5'),
                },
            },
-            { label: t('order.betOrder.user_id'), prop: 'user_id', align: 'center', width: 90, operator: 'RANGE' },
+            {
+                label: t('order.betOrder.user_id'),
+                prop: 'user_id',
+                align: 'center',
+                show: false,
+                width: 90,
+                operator: 'RANGE',
+            },
            {
                label: t('order.betOrder.user_username'),
                prop: 'user.username',
                align: 'center',
-                minWidth: 100,
+                minWidth: 120,
                operatorPlaceholder: t('Fuzzy query'),
                operator: 'LIKE',
                render: 'tags',
@@ -144,6 +160,10 @@ const baTable = new baTableClass(
                width: 90,
                operator: 'eq',
                render: 'tag',
+                custom: {
+                    '0': 'info',
+                    '1': 'primary',
+                },
                replaceValue: {
                    '0': t('order.betOrder.is_auto 0'),
                    '1': t('order.betOrder.is_auto 1'),
@@ -172,6 +192,12 @@ const baTable = new baTableClass(
                width: 100,
                operator: 'eq',
                render: 'tag',
+                effect: 'dark',
+                custom: {
+                    '1': 'warning',
+                    '2': 'success',
+                    '3': 'danger',
+                },
                replaceValue: {
                    '1': t('order.betOrder.status 1'),
                    '2': t('order.betOrder.status 2'),
@@ -228,6 +254,3 @@ onMounted(() => {
 </script>

 <style scoped lang="scss"></style>
-
-
-
--- a/web/src/views/backend/order/depositOrder/index.vue
+++ b/web/src/views/backend/order/depositOrder/index.vue
@@ -73,6 +73,13 @@ const baTable = new baTableClass(
                width: 100,
                operator: 'eq',
                render: 'tag',
+                effect: 'dark',
+                custom: {
+                    '0': 'info',
+                    '1': 'warning',
+                    '2': 'success',
+                    '3': 'danger',
+                },
                replaceValue: {
                    '0': t('order.depositOrder.status 0'),
                    '1': t('order.depositOrder.status 1'),
@@ -130,7 +137,15 @@ const baTable = new baTableClass(
                width: 170,
                timeFormat: 'yyyy-mm-dd hh:MM:ss',
            },
-            { label: t('Operate'), align: 'center', width: 90, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
+            {
+                label: t('Operate'),
+                align: 'center',
+                width: 90,
+                render: 'buttons',
+                buttons: optButtons,
+                operator: false,
+                fixed: 'right',
+            },
        ],
    },
    {
--- a/web/src/views/backend/order/withdrawOrder/index.vue
+++ b/web/src/views/backend/order/withdrawOrder/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
    <div class="default-main ba-table-box">
        <el-alert class="ba-table-alert" v-if="baTable.table.remark" :title="baTable.table.remark" type="info" show-icon />

@@ -52,6 +52,13 @@ const baTable = new baTableClass(
                width: 100,
                operator: 'eq',
                render: 'tag',
+                effect: 'dark',
+                custom: {
+                    '0': 'info',
+                    '1': 'warning',
+                    '2': 'success',
+                    '3': 'danger',
+                },
                replaceValue: { '0': t('order.withdrawOrder.status 0'), '1': t('order.withdrawOrder.status 1'), '2': t('order.withdrawOrder.status 2'), '3': t('order.withdrawOrder.status 3') },
            },
            { label: t('order.withdrawOrder.review_admin_username'), prop: 'reviewAdmin.username', align: 'center', minWidth: 100, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), render: 'tags' },
--- a/web/src/views/backend/record/userWalletRecord/index.vue
+++ b/web/src/views/backend/record/userWalletRecord/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
    <div class="default-main ba-table-box">
        <el-alert class="ba-table-alert" v-if="baTable.table.remark" :title="baTable.table.remark" type="info" show-icon />

@@ -54,6 +54,22 @@ const bizReplace = {
    adjust: t('record.userWalletRecord.biz adjust'),
 }

+const bizTypeTagCustom = {
+    deposit: 'success',
+    withdraw: 'warning',
+    withdraw_freeze: 'info',
+    withdraw_unfreeze: 'info',
+    platform_in: 'success',
+    platform_out: 'danger',
+    admin_credit: 'success',
+    admin_deduct: 'danger',
+    bet: 'primary',
+    payout: 'success',
+    fee: 'warning',
+    void_refund: 'info',
+    adjust: 'warning',
+}
+
 const dirReplace = {
    '1': t('record.userWalletRecord.direction in'),
    '2': t('record.userWalletRecord.direction out'),
@@ -70,6 +86,7 @@ const baTable = new baTableClass(
                prop: 'user_id',
                align: 'center',
                width: 90,
+                show: false,
                operator: 'RANGE',
                sortable: false,
            },
@@ -100,6 +117,7 @@ const baTable = new baTableClass(
                minWidth: 120,
                operator: 'eq',
                render: 'tag',
+                custom: bizTypeTagCustom,
                replaceValue: bizReplace,
            },
            {
@@ -109,11 +127,36 @@ const baTable = new baTableClass(
                width: 90,
                operator: 'eq',
                render: 'tag',
+                custom: {
+                    '1': 'success',
+                    '2': 'danger',
+                },
                replaceValue: dirReplace,
            },
-            { label: t('record.userWalletRecord.amount'), prop: 'amount', align: 'center', minWidth: 110, operator: 'RANGE', formatter: formatAmount },
-            { label: t('record.userWalletRecord.balance_before'), prop: 'balance_before', align: 'center', minWidth: 110, operator: 'RANGE', formatter: formatAmount },
-            { label: t('record.userWalletRecord.balance_after'), prop: 'balance_after', align: 'center', minWidth: 110, operator: 'RANGE', formatter: formatAmount },
+            {
+                label: t('record.userWalletRecord.amount'),
+                prop: 'amount',
+                align: 'center',
+                minWidth: 110,
+                operator: 'RANGE',
+                formatter: formatAmount,
+            },
+            {
+                label: t('record.userWalletRecord.balance_before'),
+                prop: 'balance_before',
+                align: 'center',
+                minWidth: 110,
+                operator: 'RANGE',
+                formatter: formatAmount,
+            },
+            {
+                label: t('record.userWalletRecord.balance_after'),
+                prop: 'balance_after',
+                align: 'center',
+                minWidth: 110,
+                operator: 'RANGE',
+                formatter: formatAmount,
+            },
            {
                label: t('record.userWalletRecord.ref_type'),
                prop: 'ref_type',
@@ -178,5 +221,3 @@ onMounted(() => {
 </script>

 <style scoped lang="scss"></style>
-
-
--- a/web/src/views/backend/routine/attachment/index.vue
+++ b/web/src/views/backend/routine/attachment/index.vue
@@ -154,10 +154,11 @@ const baTable = new baTableClass(new baTableApi('/admin/routine.Attachment/'), {
        {
            label: t('Operate'),
            align: 'center',
-            width: '100',
+            width: '80',
            render: 'buttons',
            buttons: optBtn,
            operator: false,
+            fixed: 'right',
        },
    ],
    defaultOrder: { prop: 'last_upload_time', order: 'desc' },
--- a/web/src/views/backend/security/dataRecycle/index.vue
+++ b/web/src/views/backend/security/dataRecycle/index.vue
@@ -76,6 +76,7 @@ const baTable = new baTableClass(
                prop: 'status',
                align: 'center',
                render: 'tag',
+                effect: 'dark',
                custom: { 0: 'danger', 1: 'success' },
                replaceValue: { 0: t('Disable'), 1: t('security.dataRecycle.Deleting monitoring') },
            },
@@ -84,10 +85,11 @@ const baTable = new baTableClass(
            {
                label: t('Operate'),
                align: 'center',
-                width: '130',
+                width: '80',
                render: 'buttons',
                buttons: defaultOptButtons(['edit', 'delete']),
                operator: false,
+                fixed: 'right',
            },
        ],
        dblClickNotEditColumn: [undefined, 'status'],
--- a/web/src/views/backend/security/dataRecycleLog/index.vue
+++ b/web/src/views/backend/security/dataRecycleLog/index.vue
@@ -167,6 +167,7 @@ const baTable = new baTableClass(new baTableApi(url), {
            render: 'buttons',
            buttons: optButtons,
            operator: false,
+            fixed: 'right',
        },
    ],
    dblClickNotEditColumn: [undefined],
--- a/web/src/views/backend/security/sensitiveData/index.vue
+++ b/web/src/views/backend/security/sensitiveData/index.vue
@@ -85,6 +85,7 @@ const baTable = new sensitiveDataClass(
                prop: 'status',
                align: 'center',
                render: 'tag',
+                effect: 'dark',
                custom: { 0: 'danger', 1: 'success' },
                replaceValue: { 0: t('Disable'), 1: t('security.sensitiveData.Modifying monitoring') },
            },
@@ -93,10 +94,11 @@ const baTable = new sensitiveDataClass(
            {
                label: t('Operate'),
                align: 'center',
-                width: '130',
+                width: '80',
                render: 'buttons',
                buttons: defaultOptButtons(['edit', 'delete']),
                operator: false,
+                fixed: 'right',
            },
        ],
        dblClickNotEditColumn: [undefined],
--- a/web/src/views/backend/security/sensitiveDataLog/index.vue
+++ b/web/src/views/backend/security/sensitiveDataLog/index.vue
@@ -180,6 +180,7 @@ const baTable = new baTableClass(new baTableApi(url), {
            render: 'buttons',
            buttons: optButtons,
            operator: false,
+            fixed: 'right',
        },
    ],
    dblClickNotEditColumn: [undefined],
Author	SHA1	Message	Date
zhenhui	54f460a242	[渠道管理]-优化样式,新增手动结算	2026-04-16 13:39:08 +08:00
zhenhui	5bf948e309	优化样式	2026-04-16 11:17:01 +08:00