From b26044abd6da1def9434b159916bda7e6a142cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 29 Oct 2024 17:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=85=A5=E8=B4=A6=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/mixins.js                |  8 ++++++++
 src/views/system/smUser/detail.vue |  1 +
 src/views/system/smUser/index.vue  | 14 ++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/src/utils/mixins.js b/src/utils/mixins.js
index b752685..a1f07aa 100644
--- a/src/utils/mixins.js
+++ b/src/utils/mixins.js
@@ -76,6 +76,10 @@ export const $showColumns = {
     }
   },
   methods: {
+    /**
+     * 隐藏某些列
+     * @param columns
+     */
     hideColumn(columns) {
       if (this.columns != null) {
         this.columns.filter(item => columns.includes(item.key))
@@ -84,6 +88,10 @@ export const $showColumns = {
           })
       }
     },
+    /**
+     * 删除某些列
+     * @param columns
+     */
     removeColumn(columns) {
       if (columns != null) {
         columns.forEach(column => {
diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue
index 3bd8e1e..e6a50fb 100644
--- a/src/views/system/smUser/detail.vue
+++ b/src/views/system/smUser/detail.vue
@@ -28,6 +28,7 @@
                 <el-statistic title="设备数" :value="detail.deviceCount" :precision="0" suffix="台"/>
                 <el-statistic title="账户余额" :value="detail.balance" :precision="2" suffix="元"/>
                 <el-statistic title="总收入" :value="detail.totalIncome" :precision="2" suffix="元"/>
+                <el-statistic title="未入账" :value="detail.waitBonusAmount" :precision="2" suffix="元"/>
                 <el-statistic title="总提现" :value="detail.withDrawlAmount" :precision="2" suffix="元"/>
                 <el-statistic title="总消费" :value="detail.rechargeAmount" :precision="2" suffix="元"/>
               </el-row>
diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue
index 107fb85..7bc05ed 100644
--- a/src/views/system/smUser/index.vue
+++ b/src/views/system/smUser/index.vue
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="用户名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -126,6 +134,9 @@
             <template v-else-if="column.key === 'balance'">
               {{d.row.balance | money}} 元
             </template>
+            <template v-else-if="column.key === 'waitBonusAmount'">
+              {{d.row.waitBonusAmount | money}} 元
+            </template>
             <template v-else-if="column.key === 'realServiceRate'">
               {{d.row.realServiceRate | money | defaultValue}} %
             </template>
@@ -320,6 +331,7 @@ export default {
         {key: 'totalIncome', visible: true, label: '收入金额', align: 'center', minWidth: null, sortable: false, width: "120"},
         {key: 'withDrawlAmount', visible: true, label: '提现金额', align: 'center', minWidth: null, sortable: false, width: "120"},
         {key: 'balance', visible: true, label: '余额', align: 'center', minWidth: null, sortable: true, width: null},
+        {key: 'waitBonusAmount', visible: true, label: '未入账', align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'realServiceRate', visible: true, label: '商户服务费', align: 'center', minWidth: null, sortable: false, width: "120"},
         {key: 'agentServiceRate', visible: true, label: '代理服务费', align: 'center', minWidth: null, sortable: false, width: "120"},
         {key: 'withdrawServiceRate', visible: true, label: '提现服务费', align: 'center', minWidth: null, sortable: false, width: "120"},
@@ -375,6 +387,8 @@ export default {
     };
   },
   created() {
+    this.removeColumn(['status'])
+
     this.getList();
   },
   methods: {