fetch(modify): 中英文以及黑屏
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 2m19s
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 2m19s
This commit is contained in:
@@ -405,6 +405,7 @@
|
|||||||
"agent": "Agent Management",
|
"agent": "Agent Management",
|
||||||
"customerAccount": "Customer Account",
|
"customerAccount": "Customer Account",
|
||||||
"enterpriseCustomer": "Enterprise Customer",
|
"enterpriseCustomer": "Enterprise Customer",
|
||||||
|
"enterpriseCards": "Enterprise Card Management",
|
||||||
"customerCommission": "Customer Commission"
|
"customerCommission": "Customer Commission"
|
||||||
},
|
},
|
||||||
"account": {
|
"account": {
|
||||||
@@ -412,7 +413,8 @@
|
|||||||
"customerAccount": "Customer Account",
|
"customerAccount": "Customer Account",
|
||||||
"withdrawal": "Commission Withdrawal",
|
"withdrawal": "Commission Withdrawal",
|
||||||
"withdrawalSettings": "Withdrawal Settings",
|
"withdrawalSettings": "Withdrawal Settings",
|
||||||
"myAccount": "My Account"
|
"myAccount": "My Account",
|
||||||
|
"carrierManagement": "Carrier Management"
|
||||||
},
|
},
|
||||||
"deviceManagement": {
|
"deviceManagement": {
|
||||||
"title": "Device Management",
|
"title": "Device Management",
|
||||||
@@ -429,11 +431,19 @@
|
|||||||
},
|
},
|
||||||
"assetManagement": {
|
"assetManagement": {
|
||||||
"title": "Asset Management",
|
"title": "Asset Management",
|
||||||
|
"cardSearch": "Card Search",
|
||||||
|
"deviceSearch": "Device Search",
|
||||||
"singleCard": "Single Card Info",
|
"singleCard": "Single Card Info",
|
||||||
"cardList": "Card Management",
|
"standaloneCardList": "Standalone Card List",
|
||||||
|
"taskManagement": "Task Management",
|
||||||
|
"taskDetail": "Task Details",
|
||||||
"devices": "Device Management",
|
"devices": "Device Management",
|
||||||
"assetAssign": "Asset Assignment",
|
"deviceDetail": "Device Details",
|
||||||
"cardReplacementRequest": "Card Replacement Request"
|
"assetAssign": "Allocation Records",
|
||||||
|
"allocationRecordDetail": "Allocation Record Details",
|
||||||
|
"cardReplacementRequest": "Card Replacement Request",
|
||||||
|
"authorizationRecords": "Authorization Records",
|
||||||
|
"authorizationDetail": "Authorization Details"
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"title": "Settings Management",
|
"title": "Settings Management",
|
||||||
@@ -447,6 +457,15 @@
|
|||||||
"deviceImport": "Device Import",
|
"deviceImport": "Device Import",
|
||||||
"offlineBatchRecharge": "Offline Batch Recharge",
|
"offlineBatchRecharge": "Offline Batch Recharge",
|
||||||
"cardChangeNotice": "Card Change Notice"
|
"cardChangeNotice": "Card Change Notice"
|
||||||
|
},
|
||||||
|
"commission": {
|
||||||
|
"menu": {
|
||||||
|
"management": "Commission Management",
|
||||||
|
"withdrawal": "Withdrawal Approval",
|
||||||
|
"withdrawalSettings": "Withdrawal Settings",
|
||||||
|
"myCommission": "My Commission",
|
||||||
|
"agentCommission": "Agent Commission Management"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"table": {
|
"table": {
|
||||||
@@ -567,5 +586,160 @@
|
|||||||
"passwordHint": "Please use change password function to modify password",
|
"passwordHint": "Please use change password function to modify password",
|
||||||
"disabledLoginHint": "Account has been disabled, please contact administrator"
|
"disabledLoginHint": "Account has been disabled, please contact administrator"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"commission": {
|
||||||
|
"menu": {
|
||||||
|
"management": "Commission Management",
|
||||||
|
"withdrawal": "Withdrawal Approval",
|
||||||
|
"withdrawalSettings": "Withdrawal Settings",
|
||||||
|
"myCommission": "My Commission",
|
||||||
|
"agentCommission": "Agent Commission Management"
|
||||||
|
},
|
||||||
|
"table": {
|
||||||
|
"withdrawalNo": "Withdrawal No.",
|
||||||
|
"applicant": "Applicant",
|
||||||
|
"applicantAccount": "Applicant Account",
|
||||||
|
"withdrawalAmount": "Withdrawal Amount",
|
||||||
|
"fee": "Fee",
|
||||||
|
"actualAmount": "Actual Amount",
|
||||||
|
"withdrawalMethod": "Withdrawal Method",
|
||||||
|
"accountInfo": "Account Info",
|
||||||
|
"accountName": "Account Name",
|
||||||
|
"accountNumber": "Account Number",
|
||||||
|
"bankName": "Bank Name",
|
||||||
|
"status": "Status",
|
||||||
|
"rejectReason": "Reject Reason",
|
||||||
|
"applyTime": "Apply Time",
|
||||||
|
"approveTime": "Approve Time",
|
||||||
|
"transferTime": "Transfer Time",
|
||||||
|
"actions": "Actions",
|
||||||
|
"commissionNo": "Commission No.",
|
||||||
|
"commissionType": "Commission Type",
|
||||||
|
"commissionAmount": "Commission Amount",
|
||||||
|
"orderNo": "Order No.",
|
||||||
|
"sourceUser": "Source User",
|
||||||
|
"beneficiary": "Beneficiary",
|
||||||
|
"settleTime": "Settle Time",
|
||||||
|
"withdrawTime": "Withdraw Time",
|
||||||
|
"remark": "Remark"
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"pending": "Pending",
|
||||||
|
"approved": "Approved",
|
||||||
|
"rejected": "Rejected",
|
||||||
|
"completed": "Completed",
|
||||||
|
"frozen": "Frozen",
|
||||||
|
"unfreezing": "Unfreezing",
|
||||||
|
"settled": "Settled",
|
||||||
|
"invalid": "Invalid"
|
||||||
|
},
|
||||||
|
"type": {
|
||||||
|
"oneTime": "One-time Commission",
|
||||||
|
"longTerm": "Long-term Commission"
|
||||||
|
},
|
||||||
|
"method": {
|
||||||
|
"alipay": "Alipay",
|
||||||
|
"wechat": "WeChat",
|
||||||
|
"bank": "Bank Card"
|
||||||
|
},
|
||||||
|
"form": {
|
||||||
|
"withdrawalAmount": "Withdrawal Amount",
|
||||||
|
"withdrawalAmountPlaceholder": "Please enter withdrawal amount",
|
||||||
|
"withdrawalMethod": "Withdrawal Method",
|
||||||
|
"withdrawalMethodPlaceholder": "Please select withdrawal method",
|
||||||
|
"accountName": "Account Name",
|
||||||
|
"accountNamePlaceholder": "Please enter account name",
|
||||||
|
"accountNumber": "Account Number",
|
||||||
|
"accountNumberPlaceholder": "Please enter account number",
|
||||||
|
"bankName": "Bank Name",
|
||||||
|
"bankNamePlaceholder": "Please enter bank name",
|
||||||
|
"alipayAccount": "Alipay Account",
|
||||||
|
"alipayAccountPlaceholder": "Please enter Alipay account",
|
||||||
|
"wechatAccount": "WeChat Account",
|
||||||
|
"wechatAccountPlaceholder": "Please enter WeChat account",
|
||||||
|
"rejectReason": "Reject Reason",
|
||||||
|
"rejectReasonPlaceholder": "Please enter reject reason",
|
||||||
|
"remark": "Remark",
|
||||||
|
"remarkPlaceholder": "Please enter remark",
|
||||||
|
"minWithdrawal": "Min Withdrawal",
|
||||||
|
"minWithdrawalPlaceholder": "Please enter min withdrawal amount",
|
||||||
|
"maxWithdrawal": "Max Withdrawal",
|
||||||
|
"maxWithdrawalPlaceholder": "Please enter max withdrawal amount",
|
||||||
|
"feeRate": "Fee Rate",
|
||||||
|
"feeRatePlaceholder": "Please enter fee rate (%)",
|
||||||
|
"availableBalance": "Available Balance",
|
||||||
|
"totalCommission": "Total Commission",
|
||||||
|
"frozenAmount": "Frozen Amount",
|
||||||
|
"withdrawnAmount": "Withdrawn Amount"
|
||||||
|
},
|
||||||
|
"buttons": {
|
||||||
|
"approve": "Approve",
|
||||||
|
"reject": "Reject",
|
||||||
|
"applyWithdrawal": "Apply Withdrawal",
|
||||||
|
"viewDetail": "View Details",
|
||||||
|
"export": "Export",
|
||||||
|
"batchApprove": "Batch Approve",
|
||||||
|
"batchReject": "Batch Reject"
|
||||||
|
},
|
||||||
|
"messages": {
|
||||||
|
"approveSuccess": "Approved successfully",
|
||||||
|
"rejectSuccess": "Rejected successfully",
|
||||||
|
"withdrawalSuccess": "Withdrawal application submitted successfully",
|
||||||
|
"updateSuccess": "Updated successfully",
|
||||||
|
"deleteSuccess": "Deleted successfully",
|
||||||
|
"approveConfirm": "Are you sure to approve this withdrawal?",
|
||||||
|
"rejectConfirm": "Are you sure to reject this withdrawal?",
|
||||||
|
"batchApproveConfirm": "Are you sure to approve {count} withdrawals?",
|
||||||
|
"batchRejectConfirm": "Are you sure to reject {count} withdrawals?",
|
||||||
|
"insufficientBalance": "Insufficient balance",
|
||||||
|
"belowMinAmount": "Amount below minimum withdrawal",
|
||||||
|
"exceedMaxAmount": "Amount exceeds maximum withdrawal",
|
||||||
|
"noData": "No data"
|
||||||
|
},
|
||||||
|
"validation": {
|
||||||
|
"withdrawalAmountRequired": "Please enter withdrawal amount",
|
||||||
|
"withdrawalAmountInvalid": "Withdrawal amount must be greater than 0",
|
||||||
|
"withdrawalMethodRequired": "Please select withdrawal method",
|
||||||
|
"accountNameRequired": "Please enter account name",
|
||||||
|
"accountNumberRequired": "Please enter account number",
|
||||||
|
"bankNameRequired": "Please enter bank name",
|
||||||
|
"rejectReasonRequired": "Please enter reject reason",
|
||||||
|
"minWithdrawalRequired": "Please enter min withdrawal amount",
|
||||||
|
"maxWithdrawalRequired": "Please enter max withdrawal amount",
|
||||||
|
"feeRateRequired": "Please enter fee rate",
|
||||||
|
"feeRateInvalid": "Fee rate must be between 0-100"
|
||||||
|
},
|
||||||
|
"searchForm": {
|
||||||
|
"withdrawalNo": "Withdrawal No.",
|
||||||
|
"withdrawalNoPlaceholder": "Please enter withdrawal no.",
|
||||||
|
"applicant": "Applicant",
|
||||||
|
"applicantPlaceholder": "Please enter applicant",
|
||||||
|
"shopName": "Shop Name",
|
||||||
|
"shopNamePlaceholder": "Please enter shop name",
|
||||||
|
"status": "Status",
|
||||||
|
"statusPlaceholder": "Please select status",
|
||||||
|
"withdrawalMethod": "Withdrawal Method",
|
||||||
|
"withdrawalMethodPlaceholder": "Please select withdrawal method",
|
||||||
|
"dateRange": "Date Range",
|
||||||
|
"dateRangePlaceholder": ["Start Date", "End Date"],
|
||||||
|
"commissionType": "Commission Type",
|
||||||
|
"commissionTypePlaceholder": "Please select commission type"
|
||||||
|
},
|
||||||
|
"dialog": {
|
||||||
|
"approve": "Approve Withdrawal",
|
||||||
|
"reject": "Reject Withdrawal",
|
||||||
|
"detail": "Withdrawal Details",
|
||||||
|
"applyWithdrawal": "Apply Withdrawal",
|
||||||
|
"withdrawalSettings": "Withdrawal Settings"
|
||||||
|
},
|
||||||
|
"summary": {
|
||||||
|
"title": "Commission Summary",
|
||||||
|
"totalCommission": "Total Commission",
|
||||||
|
"availableBalance": "Available Balance",
|
||||||
|
"frozenAmount": "Frozen Amount",
|
||||||
|
"withdrawnAmount": "Withdrawn Amount",
|
||||||
|
"pendingAmount": "Pending Amount",
|
||||||
|
"todayCommission": "Today's Commission"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -435,6 +435,8 @@
|
|||||||
},
|
},
|
||||||
"assetManagement": {
|
"assetManagement": {
|
||||||
"title": "资产管理",
|
"title": "资产管理",
|
||||||
|
"cardSearch": "单卡查询",
|
||||||
|
"deviceSearch": "设备查询",
|
||||||
"singleCard": "单卡信息",
|
"singleCard": "单卡信息",
|
||||||
"standaloneCardList": "单卡列表",
|
"standaloneCardList": "单卡列表",
|
||||||
"taskManagement": "任务管理",
|
"taskManagement": "任务管理",
|
||||||
@@ -442,6 +444,7 @@
|
|||||||
"devices": "设备管理",
|
"devices": "设备管理",
|
||||||
"deviceDetail": "设备详情",
|
"deviceDetail": "设备详情",
|
||||||
"assetAssign": "分配记录",
|
"assetAssign": "分配记录",
|
||||||
|
"allocationRecordDetail": "分配记录详情",
|
||||||
"cardReplacementRequest": "换卡申请",
|
"cardReplacementRequest": "换卡申请",
|
||||||
"authorizationRecords": "授权记录",
|
"authorizationRecords": "授权记录",
|
||||||
"authorizationDetail": "授权记录详情"
|
"authorizationDetail": "授权记录详情"
|
||||||
@@ -449,7 +452,8 @@
|
|||||||
"account": {
|
"account": {
|
||||||
"title": "账户管理",
|
"title": "账户管理",
|
||||||
"customerAccount": "客户账号",
|
"customerAccount": "客户账号",
|
||||||
"myAccount": "我的账户"
|
"myAccount": "我的账户",
|
||||||
|
"carrierManagement": "运营商管理"
|
||||||
},
|
},
|
||||||
"commission": {
|
"commission": {
|
||||||
"menu": {
|
"menu": {
|
||||||
|
|||||||
@@ -834,26 +834,6 @@ export const asyncRoutes: AppRouteRecord[] = [
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: '/my-simcard',
|
|
||||||
name: 'MySimcard',
|
|
||||||
component: RoutesAlias.Home,
|
|
||||||
meta: {
|
|
||||||
title: '我的网卡',
|
|
||||||
icon: ''
|
|
||||||
},
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
path: 'single-card',
|
|
||||||
name: 'SingleCard',
|
|
||||||
component: RoutesAlias.SingleCard,
|
|
||||||
meta: {
|
|
||||||
title: '单卡信息',
|
|
||||||
keepAlive: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: '/asset-management',
|
path: '/asset-management',
|
||||||
name: 'AssetManagement',
|
name: 'AssetManagement',
|
||||||
@@ -868,7 +848,7 @@ export const asyncRoutes: AppRouteRecord[] = [
|
|||||||
name: 'CardSearch',
|
name: 'CardSearch',
|
||||||
component: RoutesAlias.CardSearch,
|
component: RoutesAlias.CardSearch,
|
||||||
meta: {
|
meta: {
|
||||||
title: '单卡查询',
|
title: 'menus.assetManagement.cardSearch',
|
||||||
keepAlive: true
|
keepAlive: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -877,7 +857,7 @@ export const asyncRoutes: AppRouteRecord[] = [
|
|||||||
name: 'DeviceSearch',
|
name: 'DeviceSearch',
|
||||||
component: RoutesAlias.DeviceSearch,
|
component: RoutesAlias.DeviceSearch,
|
||||||
meta: {
|
meta: {
|
||||||
title: '设备查询',
|
title: 'menus.assetManagement.deviceSearch',
|
||||||
keepAlive: true
|
keepAlive: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -942,7 +922,7 @@ export const asyncRoutes: AppRouteRecord[] = [
|
|||||||
name: 'AllocationRecordDetail',
|
name: 'AllocationRecordDetail',
|
||||||
component: RoutesAlias.AllocationRecordDetail,
|
component: RoutesAlias.AllocationRecordDetail,
|
||||||
meta: {
|
meta: {
|
||||||
title: '分配记录详情',
|
title: 'menus.assetManagement.allocationRecordDetail',
|
||||||
isHide: true,
|
isHide: true,
|
||||||
keepAlive: false
|
keepAlive: false
|
||||||
}
|
}
|
||||||
@@ -1009,7 +989,7 @@ export const asyncRoutes: AppRouteRecord[] = [
|
|||||||
name: 'CarrierManagement',
|
name: 'CarrierManagement',
|
||||||
component: RoutesAlias.CarrierManagement,
|
component: RoutesAlias.CarrierManagement,
|
||||||
meta: {
|
meta: {
|
||||||
title: '运营商管理',
|
title: 'menus.account.carrierManagement',
|
||||||
keepAlive: true
|
keepAlive: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<div class="agent-commission-container">
|
||||||
<ArtTableFullScreen>
|
<ArtTableFullScreen>
|
||||||
<div class="agent-commission-page" id="table-full-screen">
|
<div class="agent-commission-page" id="table-full-screen">
|
||||||
<!-- 搜索栏 -->
|
<!-- 搜索栏 -->
|
||||||
@@ -212,10 +213,12 @@
|
|||||||
</ElTabPane>
|
</ElTabPane>
|
||||||
</ElTabs>
|
</ElTabs>
|
||||||
</ElDrawer>
|
</ElDrawer>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { h } from 'vue'
|
import { h, watch, onBeforeUnmount } from 'vue'
|
||||||
|
import { useRoute } from 'vue-router'
|
||||||
import { CommissionService } from '@/api/modules'
|
import { CommissionService } from '@/api/modules'
|
||||||
import { ElMessage, ElTag } from 'element-plus'
|
import { ElMessage, ElTag } from 'element-plus'
|
||||||
import type {
|
import type {
|
||||||
@@ -235,6 +238,8 @@
|
|||||||
|
|
||||||
defineOptions({ name: 'AgentCommission' })
|
defineOptions({ name: 'AgentCommission' })
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
|
|
||||||
// 主表格状态
|
// 主表格状态
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const tableRef = ref()
|
const tableRef = ref()
|
||||||
@@ -464,6 +469,23 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 监听路由变化,关闭抽屉
|
||||||
|
watch(
|
||||||
|
() => route.path,
|
||||||
|
() => {
|
||||||
|
if (detailDrawerVisible.value) {
|
||||||
|
detailDrawerVisible.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// 组件卸载前关闭抽屉
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
if (detailDrawerVisible.value) {
|
||||||
|
detailDrawerVisible.value = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
// 加载佣金明细
|
// 加载佣金明细
|
||||||
const loadCommissionRecords = async () => {
|
const loadCommissionRecords = async () => {
|
||||||
if (!currentShop.value) return
|
if (!currentShop.value) return
|
||||||
@@ -540,6 +562,10 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.agent-commission-container {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.agent-commission-page {
|
.agent-commission-page {
|
||||||
.search-card {
|
.search-card {
|
||||||
margin-bottom: 16px;
|
margin-bottom: 16px;
|
||||||
|
|||||||
Reference in New Issue
Block a user