Merge branch 'test'

src/views/settlement/jf_list/index.vue

@@ -65,7 +65,6 @@
 
 <script setup>
 import api from './api'
-import { NEllipsis } from 'naive-ui'
 
 const loading = ref(false)
 
@@ -136,24 +135,8 @@ const getList = async () => {
             align: 'center',
           },
           {
-            title: '商品名称',
+            title: '订单号',
-            align: 'center',
+            key: 'oid',
-            slot: 'goods_name',
-            render: (row) => {
-              return h(
-                NEllipsis,
-                {
-                  style: 'max-width: 240px',
-                },
-                {
-                  default: () => row.goods_name,
-                }
-              )
-            },
-          },
-          {
-            title: '商品数量',
-            key: 'count',
             align: 'center',
           },
           {
@@ -167,13 +150,13 @@ const getList = async () => {
             align: 'center',
           },
           {
-            title: '获取积分',
+            title: '服务费',
-            key: 'number',
+            key: 'commission',
             align: 'center',
           },
           {
-            title: '服务费',
+            title: '获取积分',
-            key: 'commission',
+            key: 'number',
             align: 'center',
           },
           {

src/views/settlement/tx_list/index.vue

@@ -29,7 +29,7 @@
           />
         </n-statistic>
       </n-card>
-      <div ml-10 flex flex-col items-center justify-center>
+      <div ml-10 w-300 flex flex-col items-center justify-center>
         <n-input-number v-model:value="formData.integral" clearable placeholder="请输入提现积分" />
         <n-button mt-10 w-full type="primary" @click="ok">立即提现</n-button>
       </div>
@@ -60,12 +60,61 @@ const columns = ref([
     key: 'ID',
     align: 'center',
   },
-
   {
-    title: '提现积分',
+    title: '提现金额',
     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',
+        {},
+        {
+          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 ? '百分比' : '固定值'),
+        }
+      )
+    },
+  },
   {
     title: '银行名称',
     key: 'bank',