Merge branch 'test'

src/views/finance/index.vue

@@ -188,10 +188,57 @@ const columns = ref([
   },
   {
     title: '提现金额',
-    slot: 'integral',
+    key: 'integral',
+    align: 'center',
+  },
+  {
+    title: '上次留存积分',
+    key: 'balance',
+    align: 'center',
+  },
+  {
+    title: '服务费',
+    key: 'commission',
+    align: 'center',
+  },
+  {
+    title: '实际到账',
+    key: 'number',
+    align: 'center',
+  },
+  {
+    title: '剩余余额',
+    key: 'residue',
+    align: 'center',
+  },
+  {
+    title: '手续费比例',
+    slot: 'commission_number',
     align: 'center',
     render: (row) => {
-      return h('span', {}, row.integral)
+      return h(
+        'span',
+        {},
+        {
+          default: () => `${row.commission_number}%`,
+        }
+      )
+    },
+  },
+  {
+    title: '手续费类型',
+    key: 'commission_type',
+    align: 'center',
+    render: (row) => {
+      return h(
+        NTag,
+        {
+          type: row.commission_type === 1 ? 'success' : 'warning',
+        },
+        {
+          default: () => (row.commission_type === 1 ? '百分比' : '固定值'),
+        }
+      )
     },
   },
   {