From d12a7edc7d997465f695fb6f5480f55099bb8f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com>
Date: Sun, 27 Mar 2022 14:33:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BD=99=E9=A2=9D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=BC=9A=E5=91=98=E6=97=B6=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B7=9F=E9=9A=8F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/user/MoneyLog.php        |  2 +-
 web/src/components/table/index.vue            |  2 +-
 web/src/views/backend/user/moneyLog/form.vue  | 13 ++++++++++---
 web/src/views/backend/user/moneyLog/index.vue |  7 -------
 web/src/views/backend/user/user/form.vue      |  1 +
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/admin/controller/user/MoneyLog.php b/app/admin/controller/user/MoneyLog.php
index e2cbfba6..32d49cb0 100644
--- a/app/admin/controller/user/MoneyLog.php
+++ b/app/admin/controller/user/MoneyLog.php
@@ -19,7 +19,7 @@ class MoneyLog extends Backend
     // 排除字段
     protected $preExcludeFields = ['createtime'];
 
-    protected $quickSearchField = ['username', 'nickname'];
+    protected $quickSearchField = ['user.username', 'user.nickname'];
 
     public function initialize()
     {
diff --git a/web/src/components/table/index.vue b/web/src/components/table/index.vue
index 0808b1e4..5190d7c3 100644
--- a/web/src/components/table/index.vue
+++ b/web/src/components/table/index.vue
@@ -205,7 +205,7 @@ defineExpose({
 .ba-data-table :deep(.el-button + .el-button) {
     margin-left: 6px;
 }
-:deep(.table-header-cell) .cell {
+:deep(.ba-data-table) .table-header-cell .cell {
     color: var(--color-text-primary);
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/web/src/views/backend/user/moneyLog/form.vue b/web/src/views/backend/user/moneyLog/form.vue
index 7459a2fc..27eb5432 100644
--- a/web/src/views/backend/user/moneyLog/form.vue
+++ b/web/src/views/backend/user/moneyLog/form.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, inject } from 'vue'
+import { reactive, ref, inject, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import type baTableClass from '/@/utils/baTable'
 import type { ElForm } from 'element-plus'
@@ -145,7 +145,7 @@ const getAdd = () => {
 }
 
 const changeMoney = (value: string) => {
-    if (!state.userInfo.money) {
+    if (!state.userInfo || typeof state.userInfo == 'undefined') {
         state.after = 0
         return
     }
@@ -153,7 +153,14 @@ const changeMoney = (value: string) => {
     state.after = parseFloat(state.userInfo.money) + newValue
 }
 
-getAdd()
+watch(
+    () => baTable.form.operate,
+    (newValue) => {
+        if (newValue) {
+            getAdd()
+        }
+    }
+)
 </script>
 
 <style scoped lang="scss">
diff --git a/web/src/views/backend/user/moneyLog/index.vue b/web/src/views/backend/user/moneyLog/index.vue
index 27f11f0a..e2bce610 100644
--- a/web/src/views/backend/user/moneyLog/index.vue
+++ b/web/src/views/backend/user/moneyLog/index.vue
@@ -66,11 +66,4 @@ baTable.getIndex()
 provide('baTable', baTable)
 </script>
 
-<script lang="ts">
-import { defineComponent } from 'vue'
-export default defineComponent({
-    name: 'user/moneyLog',
-})
-</script>
-
 <style scoped lang="scss"></style>
diff --git a/web/src/views/backend/user/user/form.vue b/web/src/views/backend/user/user/form.vue
index 44ea33aa..921c5617 100644
--- a/web/src/views/backend/user/user/form.vue
+++ b/web/src/views/backend/user/user/form.vue
@@ -207,6 +207,7 @@ const onAvatarBeforeUpload = (file: any) => {
 }
 
 const changeAccount = (type: string) => {
+    baTable.toggleForm()
     router.push({
         name: type == 'money' ? 'user/moneyLog' : 'user/scoreLog',
         query: {