添加搜索

src/views/dashboard/components/view/index.vue

@@ -112,16 +112,10 @@
                   <AnimatedNumber :value="walletCapital.amount || 0" :decimals="2" />
                 </span>
               </div> 
-              <template v-if="isAgent">
                 <div class="detail-item">
-                  <span class="label">点差</span>
+                  <span class="label">冻结点差</span>
-                  <span class="value">{{ walletCapital.commission_point_diff || '0.00' }}</span>
+                  <span class="value">{{ walletCapital.freeze || '0.00' }}</span>
                 </div> 
-                <div class="detail-item">
-                  <span class="label">手续费</span>
-                  <span class="value">{{ walletCapital.commission_fee_handling || '0.00' }}</span>
-                </div>
-              </template>
             </div>
           </div>
           <div class="wallet-actions">
@@ -144,7 +138,7 @@
     </div>
 <!-- {{ userInfo.role_id }} -->
     <!-- 个人账户 -->
-    <section class="section my-accounts" v-if="userInfo.type*1 !== 2 && userInfo.role_id * 1 === 5" >
+      <section class="section my-accounts" v-if="(userInfo.type*1 !== 1 && userInfo.role_id * 1 === 5) || userInfo.role_id * 1 === 6" >
         <h2 class="section-title">
           <el-icon><User /></el-icon>
           个人账户
@@ -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([

src/views/mould/handleFee/index.vue

@@ -11,11 +11,12 @@
     </header>
     <div class="table-container">
       <div class="table-container-left">
-        <Table ref="singleTableRef" :show-column-setting="false" :table-data="tableData"  :columns="tableColumns" row-key="id" :loading="loading"
+        <Table ref="singleTableRef" :show-column-setting="false" :table-data="tableData" :columns="tableColumns"
-          :highlight-current-row="true" @current-change="handleCurrentChange" />
+          row-key="id" :loading="loading" :highlight-current-row="true" @current-change="handleCurrentChange" />
       </div>
       <div class="table-container-right">
-        <Table :show-column-setting="false" row-key="id" :table-data="tableDataDetail" :columns="tableColumnsDetail" :loading="detailLoading" />
+        <Table :show-column-setting="false" row-key="id" :table-data="tableDataDetail" :columns="tableColumnsDetail"
+          :loading="detailLoading" />
       </div>
     </div>
     <el-dialog v-model="dialogVisible" :title="dialogTitleType === 1 ? '添加手续费模板' : '编辑手续费模板'" width="500">
@@ -94,7 +95,8 @@ const { buttonLoading: submitDetailLoading, startButtonLoading: startSubmitDetai
 const tableData = ref<any[]>([])
 const tableColumns = [
   { prop: 'name', label: '名称' },
-  { prop: 'type', label: '状态' },
+  { prop: 'typeName', label: '状态' },
+  { prop: 'statusName', label: '是否默认' },
 ]
 const currentRow = ref<Record<string, any>>({})
 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 {
   }
 }
 </style>
-