Changes

app/Http/Controllers/UserController.php

@@ -176,8 +176,13 @@ class UserController extends Controller
             }
 
             // 修改联系方式
-            if ($request->has(['username', 'wechat', 'qq'])) {
-                $data = $request->only(['username', 'wechat', 'qq']);
+            if ($request->has(['email','username', 'wechat', 'qq'])) {
+                $data = $request->only(['email','username', 'wechat', 'qq']);
+
+                if ($data['email'] === $user->email) {
+                    return Redirect::back()->withErrors(trans('common.update_action', ['action' => trans('common.failed_email')]));
+                }
+
                 if (empty($data['username'])) {
                     return Redirect::back()->withErrors(trans('validation.required', ['attribute' => trans('validation.attributes.username')]));
                 }
@@ -187,6 +192,8 @@ class UserController extends Controller
                 }
             }
 
+
+
             return Redirect::back()->with('successMsg', trans('common.update_action', ['action' => trans('common.success')]));
         }
 

resources/lang/en/common.php

@@ -39,6 +39,7 @@ return [
     'warning'        => 'Warning',
     'success'        => 'Successfully',
     'failed'         => 'Failed',
+    'failed_email'         => 'Failed email is exists ',
     'update'         => 'Update',
     'update_action'  => 'Update :action',
     'none'           => 'None',

resources/lang/zh-CN/common.php

@@ -39,6 +39,7 @@ return [
     'warning'        => '警 告',
     'success'        => '成功',
     'failed'         => '失败',
+    'failed_email'         => '失败邮箱存在',
     'update'         => '更 新',
     'update_action'  => '更新:action',
     'none'           => '无',

resources/views/user/profile.blade.php

@@ -10,7 +10,7 @@
                             <img src="/assets/images/avatar.svg" alt="头像" title="" style="">
                         </span>
                         <div class="float-left">
-                            <div class="font-size-20 mb-15">{{Auth::getUser()->username}}</div>
+                            <div class="font-size-20 mb-15">{{Auth::getUser()->email}}</div>
                             <p class="mb-5 text-nowrap"><i class="icon bd-webchat mr-10" aria-hidden="true"></i>
                                 <span class="text-break">{{trans('common.payment.wechat')}}：
                                     @if(Auth::getUser()->wechat) {{Auth::getUser()->wechat}} @else {{trans('common.none')}} @endif
@@ -65,6 +65,10 @@
                             <div class="tab-pane animation-slide-left" id="tab_2" role="tabpanel">
                                 <form action="{{route('profile')}}" method="post" enctype="multipart/form-data" class="form-horizontal">
                                     @csrf
+                                    <div class="form-group row">
+                                        <label for="email" class="col-md-2 col-form-label">邮箱</label>
+                                        <input type="text" class="form-control col-md-5 round" name="email" id="email" value="{{Auth::getUser()->email}}"/>
+                                    </div>
                                     <div class="form-group row">
                                         <label for="username" class="col-md-2 col-form-label">{{trans('validation.attributes.username')}}</label>
                                         <input type="text" class="form-control col-md-5 round" name="username" id="username" value="{{Auth::getUser()->username}}"/>