diff --git a/src/views/dashboard/components/view/index.vue b/src/views/dashboard/components/view/index.vue index c05776b..776aaad 100644 --- a/src/views/dashboard/components/view/index.vue +++ b/src/views/dashboard/components/view/index.vue @@ -111,17 +111,11 @@ - - + 冻结点差 + {{ walletCapital.freeze || '0.00' }} +
@@ -144,67 +138,67 @@
-
-

- - 个人账户 - - - 添加子账户 - -

-
-
@@ -310,7 +304,6 @@ import AnimatedNumber from '@/views/agent/user/AnimatedNumber.vue' const userStore = useUserStore() // 判断是否为代理(role_id === 5) -const isAgent = computed(() => userStore.userInfo?.role_id === 5) // 如何开始步骤 const startSteps = ref([ diff --git a/src/views/mould/handleFee/index.vue b/src/views/mould/handleFee/index.vue index e19dd4f..7000a1d 100644 --- a/src/views/mould/handleFee/index.vue +++ b/src/views/mould/handleFee/index.vue @@ -11,11 +11,12 @@
- +
-
+
@@ -94,7 +95,8 @@ const { buttonLoading: submitDetailLoading, startButtonLoading: startSubmitDetai const tableData = ref([]) const tableColumns = [ { prop: 'name', label: '名称' }, - { prop: 'type', label: '状态' }, + { prop: 'typeName', label: '状态' }, + { prop: 'statusName', label: '是否默认' }, ] const currentRow = ref>({}) const singleTableRef = ref() @@ -117,6 +119,7 @@ const setCurrent = (row: any) => { // 主表格行选中变化 const handleCurrentChange = (row: any) => { currentRow.value = row + console.log('currentRow.value:', currentRow.value); fetchItemDetail(row.id) } @@ -133,7 +136,13 @@ const getTableData = async () => { startLoading() try { const res = await getFeeSettingList() - tableData.value = Array.isArray(res) ? res : [] + tableData.value = Array.isArray(res) ? res.map((item) => { + return { + ...item, + typeName: item.type === 1 ? '是' : "否", + statusName: item.type === 1 ? '正常' : "封禁" + } + }) : [] handleTableDataAfterLoad() } finally { stopLoading() @@ -182,6 +191,7 @@ const editFee = () => { id: currentRow.value.id, name: currentRow.value.name, type: currentRow.value.type, + status: currentRow.value.status * 1, description: currentRow.value.description, } } @@ -277,4 +287,3 @@ header { } } -