From 850e306f2bf9c028ba475d9d065210a044629b5b Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Wed, 10 Aug 2022 15:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Account/AccountController.php     | 12 ------------
 .../Http/Controllers/Account/EditController.php   | 15 +++++++++++++++
 beike/Shop/Routes/shop.php                        |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/beike/Shop/Http/Controllers/Account/AccountController.php b/beike/Shop/Http/Controllers/Account/AccountController.php
index 7088bd22..301b5964 100644
--- a/beike/Shop/Http/Controllers/Account/AccountController.php
+++ b/beike/Shop/Http/Controllers/Account/AccountController.php
@@ -47,16 +47,4 @@ class AccountController extends Controller
 
         return json_success('密码修改成功');
     }
-
-    /**
-     * 顾客修改个人信息
-     * @param EditRequest $request
-     * @return array
-     */
-    public function update(EditRequest $request)
-    {
-        CustomerRepo::update($request->only('name'));
-
-        return json_success('修改成功');
-    }
 }
diff --git a/beike/Shop/Http/Controllers/Account/EditController.php b/beike/Shop/Http/Controllers/Account/EditController.php
index c6fe04ef..c6f28aea 100644
--- a/beike/Shop/Http/Controllers/Account/EditController.php
+++ b/beike/Shop/Http/Controllers/Account/EditController.php
@@ -12,7 +12,9 @@
 namespace Beike\Shop\Http\Controllers\Account;
 
 use Beike\Models\Customer;
+use Beike\Repositories\CustomerRepo;
 use Beike\Shop\Http\Controllers\Controller;
+use Beike\Shop\Http\Requests\EditRequest;
 use http\Env\Request;
 
 class EditController extends Controller
@@ -23,4 +25,17 @@ class EditController extends Controller
         $data['customer'] = $customer;
         return view('account/edit', $data);
     }
+
+
+    /**
+     * 顾客修改个人信息
+     * @param EditRequest $request
+     * @return array
+     */
+    public function update(EditRequest $request)
+    {
+        CustomerRepo::update($request->only('name', 'email'));
+
+        return json_success('修改成功');
+    }
 }
diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php
index 253c2e67..7e8e5d2e 100644
--- a/beike/Shop/Routes/shop.php
+++ b/beike/Shop/Routes/shop.php
@@ -77,9 +77,9 @@ Route::prefix('/')
                 Route::get('/', [AccountController::class, 'index'])->name('account.index');
                 Route::resource('addresses', AddressController::class);
                 Route::get('edit', [EditController::class, 'index'])->name('account.edit.index');
+                Route::put('edit', [EditController::class, 'update'])->name('account.edit.update');
                 Route::get('orders', [OrderController::class, 'index'])->name('account.order.index');
                 Route::get('orders/{number}', [OrderController::class, 'show'])->name('account.order.show');
-                Route::post('update', [AccountController::class, 'update'])->name('account.update');
                 Route::get('update_password', [AccountController::class, 'updatePassword'])->name('account.update_password');
                 Route::get('wishlist', [WishlistController::class, 'index'])->name('account.wishlist.index');
                 Route::post('wishlist', [WishlistController::class, 'add'])->name('account.wishlist.add');