瀏覽代碼

Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

linwu 1 年之前
父節點
當前提交
39ec81713c

+ 39 - 0
app/Http/Controllers/Mobile/Auth/LoginController.php

@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Mobile\Auth;
 
 use Aix\Sms\Contracts\Smser;
 use App\Http\Controllers\Mobile\MobileBaseController;
+use App\Models\Member;
 use App\Services\Auth\AuthService;
+use App\Services\Auth\RegisterService;
 use App\Services\Common\GeetestService;
 use App\Services\Common\SmsService;
 use App\Services\CommonService;
@@ -201,5 +203,42 @@ class LoginController extends MobileBaseController
         return redirect(route($this->sub_site . 'mobile.home'));
     }
 
+    public function loginMZT(){
+        if(request()->isMethod('POST')){
+            $params = request()->post();
+            $member      = Member::where('mobile', '=', $params['user_mobile'])->orderBy('id', 'desc')->first();
+            if ($member) {
+                //登录
+                $this->authService->login($member, 1);
+            } else {
+                $registerService = new RegisterService();
+                // 注册
+                $member           = $registerService->registerPerson([
+                    'reg_type'      => 1,
+                    'mobile'        => $params['user_mobile'],
+                    'password'      => '000000',
+                    'utype'         => 2,
+                    'reg_source'    => 2,
+                    'member_status' => 0,
+                ]);
+                $member->email    = empty($params['user_email']) ? '' : $params['user_email'];
+                $member->username = $params['user_name'];
+                $member->save();
+                $this->authService->login($member, 1);
+            }
+
+            return $this->sendSuccessResponse([
+                'status' => 1,
+                'msg' => '登录成功',
+                'url' => route('mobile.home')
+            ]);
+
+        }else{
+            return view('mobile.app.auth.mzt', ['wap_title' => "闽政通快捷登录"]);
+        }
+    }
+
+
+
 
 }

+ 1 - 0
app/Http/Controllers/Mobile/HomeController.php

@@ -90,6 +90,7 @@ class HomeController extends MobileBaseController
         $is_mzt     = 0;
         $user_token = $request->get('USER_TOKEN');
         $user_id    = $request->get('USER_ID');
+
         if (!empty($user_token) && !empty($user_id)) {
             //闽政通隐藏头部
             $is_mzt = 1;

File diff suppressed because it is too large
+ 9 - 0
public/themes/default/assets/mobile/js/vconsole.min.js


+ 11 - 11
public/themes/default/views/app/auth/login.blade.php

@@ -170,20 +170,20 @@
                 });
             };
 
-
-            var captcha_callback = function(res){
-                console.log('callback:', res);
-            }
-
-            var captcha = new TencentCaptcha('196587903', captcha_callback, {});
-            $('.login-account').on('click', function () {
-                captcha.show();
-
-            });
+            //
+            // var captcha_callback = function(res){
+            //     console.log('callback:', res);
+            // }
+            //
+            // var captcha = new TencentCaptcha('196587903', captcha_callback, {});
+            // $('.login-account').on('click', function () {
+            //     captcha.show();
+            //
+            // });
 
 
 
-            //gt_init(gt_call_back);//初始化极验
+            gt_init(gt_call_back);//初始化极验
 
             $(".input-login").keydown(function(ev){
                 ev = ev || window.event;

+ 84 - 0
public/themes/default/views/mobile/app/auth/mzt.blade.php

@@ -0,0 +1,84 @@
+@extends('mobile.module.layouts.content')
+
+@push('meta')
+
+@endpush
+
+@push('css')
+    <style>
+        .output{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            font-size: 24px;
+        }
+    </style>
+@endpush
+
+@push('js')
+    <script src="https://mztapp.fujian.gov.cn:8190/mztAppWeb/app/js/mztHybrid.js"></script>
+    <script src="https://mztapp.fujian.gov.cn:8190/mztAppWeb/app/js/jsencrypt.js"></script>
+    <script src="{{ theme_asset('mobile/js/vconsole.min.js') }}"></script>
+    <script>
+        // VConsole 默认会挂载到 `window.VConsole` 上
+        //var vConsole = new window.VConsole();
+    </script>
+@endpush
+
+@section('content')
+    <div class="output">
+        登录中
+    </div>
+@endsection
+
+
+@section('script')
+    <script>
+
+        app.page.onLoad = function () {
+
+            var param = {};
+            param.isReturnPage = false;
+            app.link.goLogin(function(result) {
+                console.log(result)
+                $.post("{{route($sub_site.'mobile.login_mzt')}}",result,function(res){
+
+                    if(res.data.status){
+                        window.location.href = res.data.url;
+                    }else{
+                        console.log(res.data.msg)
+                    }
+                });
+
+            }, function(result) {
+                $(".output").html("登录失败" + result)
+            },param);
+            {{--app.link.getLoginInfo(function(result) {--}}
+            {{--    var userinfo = result;--}}
+            {{--    var encrypt = new JSEncrypt();--}}
+            {{--    encrypt.setPrivateKey(keyUtil.getPrivateKey());--}}
+            {{--    let data = {--}}
+            {{--        userId: encrypt.decrypt(userinfo.userId),--}}
+            {{--        userToken: encrypt.decrypt(userinfo.USER_TOKEN),--}}
+            {{--        userIdCard: encrypt.decrypt(userinfo.cardNum),--}}
+            {{--        userName: encrypt.decrypt(userinfo.name),--}}
+            {{--        userMobile: encrypt.decrypt(userinfo.mobile),--}}
+            {{--        userEmail: encrypt.decrypt(userinfo.email)--}}
+            {{--    };--}}
+            {{--    $.post("{{route($sub_site.'mobile.login_mzt')}}",data,function(res){--}}
+
+            {{--        if(res.data.status){--}}
+            {{--            window.location.href = res.data.url;--}}
+            {{--        }else{--}}
+            {{--            console.log(res.data.msg)--}}
+            {{--        }--}}
+            {{--    });--}}
+
+            {{--}, function(result) {--}}
+            {{--    alert(result);--}}
+            {{--})--}}
+        };
+    </script>
+
+@endsection

+ 1 - 0
routes/mobile.php

@@ -27,6 +27,7 @@ Route::group([
     'prefix' => '/auth',
 ], function (Router $router) {
     $router->get('login', 'Mobile\Auth\LoginController@showLoginForm')->name('mobile.login');
+    $router->any('login_mzt', 'Mobile\Auth\LoginController@loginMZT')->name('mobile.login_mzt');
     $router->post('login', 'Mobile\Auth\LoginController@loginByAccount');
     $router->get('logout', 'Mobile\Auth\LoginController@logout')->name('mobile.logout');
     $router->get('login/mobile', 'Mobile\Auth\LoginController@showLoginMobileForm')->name('mobile.login.mobile');

Some files were not shown because too many files changed in this diff