From 59eb050d11b75fb047edd106904fb97b575fb778 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 12 Aug 2022 15:53:50 +0800
Subject: [PATCH] https://guangdagit.com/beike/beikeshop/issues/64

---
 .../views/pages/admin_users/index.blade.php      |  2 +-
 .../admin/views/pages/brands/index.blade.php     | 16 +++-------------
 .../admin/views/pages/currencies/index.blade.php |  2 +-
 .../views/pages/customer_groups/index.blade.php  |  2 +-
 .../admin/views/pages/languages/index.blade.php  |  2 +-
 .../views/pages/tax_classes/index.blade.php      |  2 +-
 .../admin/views/pages/tax_rates/index.blade.php  |  2 +-
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/resources/beike/admin/views/pages/admin_users/index.blade.php b/resources/beike/admin/views/pages/admin_users/index.blade.php
index ad99d173..f5cbc652 100644
--- a/resources/beike/admin/views/pages/admin_users/index.blade.php
+++ b/resources/beike/admin/views/pages/admin_users/index.blade.php
@@ -189,11 +189,11 @@
         },
 
         closeCustomersDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.form.roles = [];
           this.dialog.form.locale =  @json($admin_language['code'] ?? 'en');
           this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })
diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php
index c8ff51b6..73d65e80 100644
--- a/resources/beike/admin/views/pages/brands/index.blade.php
+++ b/resources/beike/admin/views/pages/brands/index.blade.php
@@ -66,7 +66,7 @@
 
         <el-form-item>
           <el-button type="primary" @click="submit('form')">保存</el-button>
-          <el-button @click="closeDialog('form')">取消</el-button>
+          <el-button @click="dialog.show = false">取消</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -129,16 +129,7 @@
           this.dialog.index = index
 
           if (type == 'edit') {
-            let brand = this.brands.data[index];
-
-            this.dialog.form = {
-              id: brand.id,
-              name: brand.name,
-              logo: brand.logo,
-              logo: brand.logo,
-              first: brand.first,
-              status: brand.status,
-            }
+            this.dialog.form = this.brands.data[index]
           }
         },
 
@@ -181,10 +172,9 @@
         },
 
         closeDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.form.status = 1
-          this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })
diff --git a/resources/beike/admin/views/pages/currencies/index.blade.php b/resources/beike/admin/views/pages/currencies/index.blade.php
index 09f1fd1f..a181cf45 100644
--- a/resources/beike/admin/views/pages/currencies/index.blade.php
+++ b/resources/beike/admin/views/pages/currencies/index.blade.php
@@ -167,9 +167,9 @@
         },
 
         closeCustomersDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })
diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php
index a195263a..521591d0 100644
--- a/resources/beike/admin/views/pages/customer_groups/index.blade.php
+++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php
@@ -200,11 +200,11 @@
         },
 
         closeCustomersDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.form.name = {};
           this.dialog.form.description = {};
           this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })
diff --git a/resources/beike/admin/views/pages/languages/index.blade.php b/resources/beike/admin/views/pages/languages/index.blade.php
index e172452a..4e452221 100644
--- a/resources/beike/admin/views/pages/languages/index.blade.php
+++ b/resources/beike/admin/views/pages/languages/index.blade.php
@@ -162,9 +162,9 @@
         },
 
         closeCustomersDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })
diff --git a/resources/beike/admin/views/pages/tax_classes/index.blade.php b/resources/beike/admin/views/pages/tax_classes/index.blade.php
index b44047a4..fae6ee34 100644
--- a/resources/beike/admin/views/pages/tax_classes/index.blade.php
+++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php
@@ -204,10 +204,10 @@
         },
 
         closeCustomersDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.form.tax_rules = []
           this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })
diff --git a/resources/beike/admin/views/pages/tax_rates/index.blade.php b/resources/beike/admin/views/pages/tax_rates/index.blade.php
index 4e8757e3..436bcb08 100644
--- a/resources/beike/admin/views/pages/tax_rates/index.blade.php
+++ b/resources/beike/admin/views/pages/tax_rates/index.blade.php
@@ -179,10 +179,10 @@
         },
 
         closeCustomersDialog(form) {
+          this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
           this.dialog.form.type = 'percent';
           this.dialog.show = false
-          this.$refs[form].resetFields();
         }
       }
     })