alroyso 7 月之前
父節點
當前提交
9bcf46780b

+ 0 - 1
.idea/dataSources.local.xml

@@ -5,7 +5,6 @@
       <database-info product="MySQL" version="5.7.43-log" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="5.7.43" exact-driver-version="8.2">
         <extra-name-characters>#@</extra-name-characters>
         <identifier-quote-string>`</identifier-quote-string>
-        <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
       </database-info>
       <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>

+ 9 - 2
app/Http/Controllers/UserController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Components\Helpers;
+use App\Components\IP;
 use App\Models\Article;
 use App\Models\Coupon;
 use App\Models\Goods;
@@ -178,8 +179,14 @@ class UserController extends Controller
             // 修改联系方式
             if ($request->has(['email','username', 'wechat', 'qq'])) {
                 $data = $request->only(['email','username', 'wechat', 'qq']);
-
-                if ($data['email'] === $user->email) {
+//                $ip = IP::getClientIP();
+//                $vercode = Cache::get('send_verify_code_'.md5($ip), $ip);
+//
+//                if ($data['verify_code'] !== $vercode) {
+//                    return Redirect::back()->withErrors(trans('common.update_action', ['action' => trans('common.failed_code')]));
+//                }
+
+                if ( User::where('email', $data['email'])->count() >= 1) {
                     return Redirect::back()->withErrors(trans('common.update_action', ['action' => trans('common.failed_email')]));
                 }
 

+ 1 - 0
resources/lang/zh-CN/common.php

@@ -40,6 +40,7 @@ return [
     'success'        => '成功',
     'failed'         => '失败',
     'failed_email'         => '失败邮箱存在',
+    'failed_code'         => '验证码失败',
     'update'         => '更 新',
     'update_action'  => '更新:action',
     'none'           => '无',

+ 66 - 0
resources/views/user/profile.blade.php

@@ -69,6 +69,18 @@
                                         <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 form-material floating" data-plugin="formMaterial">--}}
+{{--                                        <div class="input-group" data-plugin="inputGroupFile">--}}
+{{--                                            <input type="text" class="form-control" name="verify_code" value="{{Request::old('verify_code')}}" required/>--}}
+{{--                                            <label class="floating-label" for="verify_code">{{trans('auth.captcha.attribute')}}</label>--}}
+{{--                                            <span class="input-group-btn">--}}
+{{--                            <button class="btn btn-success" id="sendCode" onclick="sendVerifyCode()">--}}
+{{--                                {{trans('auth.request')}}--}}
+{{--                            </button>--}}
+{{--                        </span>--}}
+{{--                                        </div>--}}
+{{--                                    </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}}"/>
@@ -107,4 +119,58 @@
 @endsection
 @section('javascript')
     <script src="/assets/custom/jump-tab.js"></script>
+{{--    <script>--}}
+
+
+{{--        // 发送注册验证码--}}
+{{--        function sendVerifyCode() {--}}
+{{--            let flag = true; // 请求成功与否标记--}}
+{{--            let email = $('#email').val().trim();--}}
+
+
+{{--            if (email === '') {--}}
+{{--                swal.fire({title: '{{trans('validation.required', ['attribute' => trans('validation.attributes.email')])}}', icon: 'warning', timer: 1500});--}}
+{{--                return false;--}}
+{{--            }--}}
+
+{{--            $.ajax({--}}
+{{--                method: 'POST',--}}
+{{--                url: '{{route('sendVerificationCode')}}',--}}
+{{--                dataType: 'json',--}}
+{{--                data: {_token: '{{csrf_token()}}', email: email},--}}
+{{--                success: function(ret) {--}}
+{{--                    if (ret.status === 'success') {--}}
+{{--                        swal.fire({title: ret.message, icon: 'success'});--}}
+{{--                        $('#sendCode').attr('disabled', true);--}}
+{{--                        flag = true;--}}
+{{--                    } else {--}}
+{{--                        swal.fire({title: ret.message, icon: 'error', timer: 1000, showConfirmButton: false});--}}
+{{--                        $('#sendCode').attr('disabled', false);--}}
+{{--                        flag = false;--}}
+{{--                    }--}}
+{{--                },--}}
+{{--                error: function() {--}}
+{{--                    swal.fire({title: '发送失败', icon: 'error'});--}}
+{{--                    flag = false;--}}
+{{--                },--}}
+{{--            });--}}
+
+{{--            // 请求成功才开始倒计时--}}
+{{--            if (flag) {--}}
+{{--                // 60秒后才能重新申请发送--}}
+{{--                let left_time = 60;--}}
+{{--                const tt = window.setInterval(function() {--}}
+{{--                    left_time--;--}}
+{{--                    if (left_time <= 0) {--}}
+{{--                        window.clearInterval(tt);--}}
+{{--                        $('#sendCode').removeAttr('disabled').text('{{trans('auth.request')}}');--}}
+{{--                    } else {--}}
+{{--                        $('#sendCode').text(left_time + ' s');--}}
+{{--                    }--}}
+{{--                }, 1000);--}}
+{{--            }--}}
+{{--        }--}}
+
+
+{{--    </script>--}}
 @endsection