From a57181d3868339d9ad17e976f496f61692535a42 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 28 Jul 2022 20:50:24 +0800
Subject: [PATCH] wip

---
 .../Http/Controllers/BrandController.php      |  2 +-
 beike/Repositories/BrandRepo.php              |  2 +-
 ...022_06_23_075504_create_customer_table.php |  2 +-
 .../admin/views/pages/brands/index.blade.php  | 27 ++++++++++++-------
 .../views/pages/customers/index.blade.php     |  6 +----
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/beike/Admin/Http/Controllers/BrandController.php b/beike/Admin/Http/Controllers/BrandController.php
index 9cf3aaf0..42069b92 100644
--- a/beike/Admin/Http/Controllers/BrandController.php
+++ b/beike/Admin/Http/Controllers/BrandController.php
@@ -36,7 +36,7 @@ class BrandController extends Controller
         return json_success("创建成功", $brand);
     }
 
-    public function update(Request $request, int $customerId, int $id)
+    public function update(Request $request, int $id)
     {
         $brand = BrandRepo::update($id, $request->all());
 
diff --git a/beike/Repositories/BrandRepo.php b/beike/Repositories/BrandRepo.php
index fd09d7b1..0cf65a84 100644
--- a/beike/Repositories/BrandRepo.php
+++ b/beike/Repositories/BrandRepo.php
@@ -84,7 +84,7 @@ class BrandRepo
             $builder->where('status', $data['status']);
         }
 
-        return $builder->paginate(20)->withQueryString();
+        return $builder->paginate(10)->withQueryString();
     }
 
     public static function listGroupByFirst()
diff --git a/database/migrations/2022_06_23_075504_create_customer_table.php b/database/migrations/2022_06_23_075504_create_customer_table.php
index 5c058aff..35554a6f 100644
--- a/database/migrations/2022_06_23_075504_create_customer_table.php
+++ b/database/migrations/2022_06_23_075504_create_customer_table.php
@@ -20,7 +20,7 @@ class CreateCustomerTable extends Migration
             $table->string('name');
             $table->string('avatar')->default('');
             $table->unsignedInteger('customer_group_id');
-            $table->unsignedInteger('address_id');
+            $table->unsignedInteger('address_id')->default(0);
             $table->string('locale', 10);
             $table->tinyInteger('status')->default(0);
             $table->string('code', 40)->default('');
diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php
index 1de3c2cf..e43beaf7 100644
--- a/resources/beike/admin/views/pages/brands/index.blade.php
+++ b/resources/beike/admin/views/pages/brands/index.blade.php
@@ -24,7 +24,7 @@
           <tr v-for="brand, index in brands.data" :key="index">
             <td>@{{ brand.id }}</td>
             <td>@{{ brand.name }}</td>
-            <td><div class="wh-70"><img :src="thumbnail(brand.logo)" class="img-fluid"></div></td>
+            <td><div class="wh-50"><img :src="thumbnail(brand.logo)" class="img-fluid"></div></td>
             <td>@{{ brand.sort_order }}</td>
             <td>@{{ brand.first }}</td>
             <td>@{{ brand.status }}</td>
@@ -48,11 +48,11 @@
           <el-input class="mb-0" v-model="dialog.form.name" placeholder="名称"></el-input>
         </el-form-item>
 
-        <el-form-item label="图标">
+        <el-form-item label="图标" prop="logo" required>
           <vue-image v-model="dialog.form.logo"></vue-image>
         </el-form-item>
 
-        <el-form-item label="首字母">
+        <el-form-item label="首字母" prop="first">
           <el-input class="mb-0" v-model="dialog.form.first" placeholder="首字母"></el-input>
         </el-form-item>
 
@@ -99,22 +99,30 @@
             logo: '',
             first: '',
             sort_order: '',
-            status: '',
+            status: 1,
           },
         },
 
         rules: {
-          // password: [{required: true,message: '请输入密码',trigger: 'blur'}, ],
+          name: [{required: true,message: '请输入名称',trigger: 'blur'}, ],
+          first: [{required: true,message: '请输入首字母',trigger: 'blur'}, ],
+          logo: [{required: true,message: '请上传图标',trigger: 'change'}, ],
         }
       },
 
-      mounted() {
-        // $http.get('brands?page=1').then((res) => {
-        //   console.log(res)
-        // })
+      watch: {
+        page: function() {
+          this.loadData();
+        },
       },
 
       methods: {
+        loadData() {
+          $http.get(`brands?page=${this.page}`).then((res) => {
+            this.brands = res.data.brands;
+          })
+        },
+
         checkedCreate(type, index) {
           this.dialog.show = true
           this.dialog.type = type
@@ -174,6 +182,7 @@
 
         closeDialog(form) {
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
+          this.dialog.form.status = 1
           this.dialog.show = false
         }
       }
diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php
index a663a7e2..cd6e8077 100644
--- a/resources/beike/admin/views/pages/customers/index.blade.php
+++ b/resources/beike/admin/views/pages/customers/index.blade.php
@@ -130,11 +130,7 @@
 
             $http.post('customers', this.dialogCustomers.form).then((res) => {
               this.$message.success(res.message);
-              if (this.dialog.type == 'add') {
-                this.customers.push(res.data)
-              } else {
-                this.customers[this.dialog.index] = res.data
-              }
+              this.customers.push(res.data);
               this.dialogCustomers.show = false
             })
           });