From d4b8c148a1c7669591f2f19f84488c8a3d3e1d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?what=5F=E6=9D=91=E9=95=BF?= <178277164@qq.com>
Date: Tue, 11 Apr 2023 06:23:12 +0000
Subject: [PATCH] =?UTF-8?q?!78=20=E5=A2=9E=E5=8A=A0=E5=87=A0=E5=A4=84hook?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=AE=9E=E7=8E=B0=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=96=B9=E5=BC=8F=E5=8F=8A=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=20*=20Merge=20branch=20'dev'=20of=20https://gitee.com?=
 =?UTF-8?q?/what520/beikeshop=20into=20dev=20*=20=E5=A2=9E=E5=8A=A0=20@hoo?=
 =?UTF-8?q?kwrapper('account.sidebar.email')=20*=20=E5=A2=9E=E5=8A=A0=20ho?=
 =?UTF-8?q?ok=5Ffilter('account.edit.index',=20$data);=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=20*=20@hookwrapper('accoun?=
 =?UTF-8?q?t.edit.email')=20*=20=E5=A2=9E=E5=8A=A0@stack('login.vue.data')?=
 =?UTF-8?q?=EF=BC=8C@stack('login.vue.method')=20*=20=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=8F=92=E4=BB=B6=E5=A2=9E=E5=8A=A0hook=20*?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A02=E4=B8=AAhook=20=20admin.product.name.aft?=
 =?UTF-8?q?er=20=20=20admin.product.content.after=20=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=BF=BB=E8=AF=91=E6=8F=92=E4=BB=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20*=201.=E5=A2=9E=E5=8A=A0=20@hook('file=5Fmanager.co?=
 =?UTF-8?q?ntent.head.btns.after')=20*=201.=E5=A2=9E=E5=8A=A0=20@hook('fil?=
 =?UTF-8?q?e=5Fmanager.content.head.btns.after')=20*=20=E5=9C=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E5=99=A8=E4=B8=8A=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?@hook('file=5Fmanager.content.head.btns.after')?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Controllers/Account/EditController.php | 2 +-
 themes/default/account/edit.blade.php                  | 2 ++
 themes/default/account/login.blade.php                 | 6 ++++--
 themes/default/components/account/sidebar.blade.php    | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/beike/Shop/Http/Controllers/Account/EditController.php b/beike/Shop/Http/Controllers/Account/EditController.php
index e3cdb94d..bc4f7ca4 100644
--- a/beike/Shop/Http/Controllers/Account/EditController.php
+++ b/beike/Shop/Http/Controllers/Account/EditController.php
@@ -22,7 +22,7 @@ class EditController extends Controller
     {
         $customer         = current_customer();
         $data['customer'] = $customer;
-
+        $data = hook_filter('account.edit.index', $data);
         return view('account/edit', $data);
     }
 
diff --git a/themes/default/account/edit.blade.php b/themes/default/account/edit.blade.php
index 78d658f2..d518dd34 100644
--- a/themes/default/account/edit.blade.php
+++ b/themes/default/account/edit.blade.php
@@ -50,6 +50,7 @@
                   <span class="invalid-feedback"
                     role="alert">{{ $errors->has('name') ? $errors->first('name') : __('common.error_required', ['name' => __('shop/account.edit.name')]) }}</span>
                 </div>
+                @hookwrapper('account.edit.email')
                 <div class="col-sm-6">
                   <label class="form-label">{{ __('shop/account.edit.email') }}</label>
                   <input class="form-control {{ $errors->has('email') ? 'is-invalid' : '' }}" type="email"
@@ -57,6 +58,7 @@
                   <span class="invalid-feedback"
                     role="alert">{{ $errors->has('email') ? $errors->first('email') : __('common.error_required', ['name' => __('shop/account.edit.email')]) }}</span>
                 </div>
+                @endhookwrapper
                 <div class="col-12 mt-4">
                   <button class="btn btn-primary mt-sm-0" type="submit">{{ __('common.submit') }}</button>
                 </div>
diff --git a/themes/default/account/login.blade.php b/themes/default/account/login.blade.php
index 3d71f9ab..212f5e80 100644
--- a/themes/default/account/login.blade.php
+++ b/themes/default/account/login.blade.php
@@ -156,7 +156,8 @@
           password_confirmation: [
             {required: true, validator: validatePass2, trigger: 'change'}
           ]
-        }
+        },
+        @stack('login.vue.data')
       },
 
       beforeMount () {
@@ -192,7 +193,8 @@
               @endif
             })
           });
-        }
+        },
+        @stack('login.vue.method')
       }
     })
 
diff --git a/themes/default/components/account/sidebar.blade.php b/themes/default/components/account/sidebar.blade.php
index b28b9381..9ae7eacc 100644
--- a/themes/default/components/account/sidebar.blade.php
+++ b/themes/default/components/account/sidebar.blade.php
@@ -3,7 +3,9 @@
     <div class="head">
       <div class="portrait"><img src="{{ image_resize($customer->avatar, 200, 200) }}" class="img-fluid"></div>
       <div class="account-name">{{ $customer->name }}</div>
+      @hookwrapper('account.sidebar.email')
       <div class="account-email">{{ $customer->email }}</div>
+      @endhookwrapper
     </div>
 
     <nav class="list-group account-links">